Changeset 4641
- Timestamp:
- 06/29/11 19:10:21 (13 years ago)
- Location:
- branches/2.2.0.1/expressoMail1_2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.0.1/expressoMail1_2/inc/class.ScriptS.inc.php
r4576 r4641 215 215 216 216 function convert_specialchar($input) { 217 $special_char = false; 218 for ($i = 0; $i < strlen($input); $i++) { 219 if (preg_match('/[^a-z0-9.@~_+=&\'*^\ \-\[\]]/i', $input[$i])) { 220 $special_char = true; 221 $input = preg_replace('/\\' . $input[$i] . '/', '=' . bin2hex($input[$i]), $input); 222 } 223 } 224 225 if ($special_char) { 226 /* * 227 * When using arrays with pattern and replacement, 228 * the keys are processed in the order they appear in the array. 229 * See preg_replace in php.net/preg_replace 230 * */ 231 $patterns[0] = '/=c3/i'; 232 $patterns[1] = '/ /'; 233 $replacements[1] = ''; 234 $replacements[0] = '_'; 235 $input = preg_replace($patterns, $replacements, $input); 236 } 237 238 return($input); 217 $temp_input = $input; 218 $temp_input = imap_8bit($temp_input); 219 220 $patterns[0] = '/ /'; 221 $replacements[0] = '_'; 222 $temp_input = preg_replace($patterns, $replacements, $temp_input); 223 return ($temp_input); 239 224 } 240 225 … … 267 252 $rule['to'] = $this->convert_specialchar($tmp1[4]); 268 253 $tmpSubject = $tmp1[5]; 269 $rule['subject'] = $ this->convert_specialchar($tmp1[5]);254 $rule['subject'] = $rule['subject'] = " [\"" . $this->convert_specialchar($tmp1[5]) . "\", \"" . base64_encode($tmp1[5]) . "\"]"; 270 255 $rule['action'] = $tmp1[6]; 271 256 $rule['action_arg'] = utf8_encode(preg_replace("/\\r\\n/", "\r\n", $tmp1[7])); … … 361 346 $match = ':regex'; 362 347 $newruletext .= "header " . $match . " \"subject\""; 363 $newruletext .= " \"" . $rule['subject'] . "\"";348 $newruletext .= "" . $rule['subject'] . ""; 364 349 $started = 1; 365 350 } -
branches/2.2.0.1/expressoMail1_2/js/filter.js
r4600 r4641 566 566 } 567 567 568 if (569 ( /[^\x00-\x80]/.test( Element("field1").value ) || /[^\x00-\x80]/.test( Element("field2").value ) || /[^\x00-\x80]/.test( Element("field3").value ) )570 && ( ! confirm( get_lang ( 'Your rule contains any accented character. The filter may not work. Do you wish to continue?' ) ) )571 ) return false;572 573 568 if(LTrim(Element("field1").value) == "" && LTrim(Element("field2").value) == "" && LTrim(Element("field3").value) == "" && Element("field4").value == "") 574 569 { -
branches/2.2.0.1/expressoMail1_2/setup/phpgw_pt-br.lang
r4605 r4641 647 647 Increases the maximum size of show emails from 100kb to 1mb' expressoMail1_2 pt-br Essa opção aumenta o tamanho máximo dos emails mostrados de 100KB para 1MB. 648 648 If you want to install a desktop shortcut for accessing the offline ExpressoMail please confirm it after pressing the Install offline button. </br> The application also can be accessed using the URL: expressoMail1_2 pt-br Caso deseje instalar um ícone no desktop para acesso ao expressoMail offline, confirme a pergunta que aparecerá após clicar no botão "instalar offline". <br />A aplicação também pode ser acessada pela URL: 649 Your rule contains any accented character. The filter may not work. Do you wish to continue? expressoMail1_2 en Sua regra contem algum caracter acentuado. O filtro pode nao funcionar. Deseja continuar?650 649 The selected folder cotain any accented character. The filter dont work with accented folders. Please, rename the folder or choose another folder. expressoMail1_2 pt-br A pasta selecionada contém algum caracter acentuado. O filtro não funcionada com pastas acentuadas. Por favor, mude o nome da pasta ou escolha outra. 651 650 Do you want to use x origin in source menssage? admin pt-br Deseja utilizar o X-Origin na fonte da mensagem?
Note: See TracChangeset
for help on using the changeset viewer.