From: philippe_mingo Date: Sat, 17 Nov 2001 18:47:18 +0000 (+0000) Subject: Internationalization X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=a9aa7ab752b604cd0682b5eb45bc7bad9cb2919f;hp=692155b7fd835420fda759bff62c0f34f6b1d583 Internationalization git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1771 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/plugins/filters/filters.php b/plugins/filters/filters.php index 03079699..f52bb34f 100644 --- a/plugins/filters/filters.php +++ b/plugins/filters/filters.php @@ -127,21 +127,21 @@ if ($Value['enabled']) $run ++; } - + // short-circuit if ($run == 0) { return; } - + sqimap_mailbox_select($imap_stream, 'INBOX'); - - // Ask for a big list of all "Received" headers in the inbox with + + // Ask for a big list of all "Received" headers in the inbox with // flags for each message. Kinda big. fputs($imap_stream, 'A3999 FETCH 1:* (FLAGS BODY.PEEK[HEADER.FIELDS ' . "(RECEIVED)])\r\n"); - + $read = sqimap_read_data ($imap_stream, 'A3999', true, $response, $message); - + if ($response != 'OK') return; @@ -159,46 +159,46 @@ $i ++; $IsSpam = 0; $Scan = 1; - - // Check for normal IMAP servers + + // Check for normal IMAP servers if ($filters_spam_scan == 'new') { if (is_int(strpos($Chunks[4], '\Seen'))) { $Scan = 0; } } - - // Look through all of the Received headers for IP addresses - // Stop when I get ")" on a line - // Stop if I get "*" on a line (don't advance) + + // Look through all of the Received headers for IP addresses + // Stop when I get ")" on a line + // Stop if I get "*" on a line (don't advance) // and above all, stop if $i is bigger than the total # of lines while (($i < count($read)) && ($read[$i][0] != ')' && $read[$i][0] != '*' && - $read[$i][0] != "\n") && (! $IsSpam)) - { + $read[$i][0] != "\n") && (! $IsSpam)) + { // Check to see if this line is the right "Received from" line // to check if (is_int(strpos($read[$i], $SpamFilters_YourHop))) { - // short-circuit and skip work if we don't scan this one + // short-circuit and skip work if we don't scan this one if ($Scan) { $read[$i] = ereg_replace('[^0-9\.]', ' ', $read[$i]); $elements = explode(' ', $read[$i]); foreach ($elements as $value) { - if ($value != '' && + if ($value != '' && ereg('[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}', - $value, $regs)) { - $Chunks = explode('.', $value); - if ("$SpamFilters_DNScache[$value]" == "") { + $value, $regs)) { + $Chunks = explode('.', $value); + if ("$SpamFilters_DNScache[$value]" == "") { $SpamFilters_DNScache[$value] = filters_spam_check_site($Chunks[0], $Chunks[1], - $Chunks[2], $Chunks[3], $filters); - } - if ($SpamFilters_DNScache[$value]) { - $IsSpam ++; + $Chunks[2], $Chunks[3], $filters); + } + if ($SpamFilters_DNScache[$value]) { + $IsSpam ++; break; // no sense in checking more IPs - } + } } - } + } } } $i ++; @@ -209,12 +209,12 @@ if (sqimap_mailbox_exists ($imap_stream, $filters_spam_folder)) { sqimap_messages_copy ($imap_stream, $MsgNum, $MsgNum, $filters_spam_folder); - sqimap_messages_flag ($imap_stream, $MsgNum, $MsgNum, + sqimap_messages_flag ($imap_stream, $MsgNum, $MsgNum, 'Deleted'); } } } - + sqimap_mailbox_expunge($imap_stream, 'INBOX'); } diff --git a/plugins/newmail/newmail.php b/plugins/newmail/newmail.php index ce3a9247..240f78b3 100644 --- a/plugins/newmail/newmail.php +++ b/plugins/newmail/newmail.php @@ -14,10 +14,11 @@ chdir ('../'); require_once('../src/validate.php'); require_once('../src/load_prefs.php'); - - echo "\n". - '' . _("New Mail") . "\n". - "\n". + require_once('../functions/page_header.php'); + + displayHtmlHeader( _("New Mail"), '', FALSE ); + + echo "\n". '
'. "\n". "\n". @@ -25,8 +26,8 @@ '
' . _("SquirrelMail Notice:") . "
\n". "\n". "\n". - "

" . - _("You have new mail!") . "
\n". + "

" . + _("You have new mail!") . "

\n". "
\n". ''. "
\n". @@ -36,5 +37,5 @@ "-->\n". "\n". "\n"; - + ?> \ No newline at end of file diff --git a/plugins/newmail/testsound.php b/plugins/newmail/testsound.php index 583dd8f1..1ae75739 100644 --- a/plugins/newmail/testsound.php +++ b/plugins/newmail/testsound.php @@ -17,21 +17,23 @@ if (!isset($sound)) { $sound = "Click.wav"; } - $sound = str_replace("../plugins/newmail/", "", $sound); - $sound = str_replace("../", "", $sound); - $sound = str_replace("..\\", "", $sound); -?> - -Test Sound - topmargin=0 leftmargin=0 -rightmargin=0 marginwidth=0 marginheight=0> -
- -
- -Loading the sound...

-
- -
-
- + $sound = str_replace('../plugins/newmail/', '', $sound); + $sound = str_replace('../', '', $sound); + $sound = str_replace("..\\", '', $sound); + + displayHtmlHeader( _("Test Sound"), '', FALSE ); + + echo "\n". + '
'. + "". + '
'. + '' . _("Loading the sound...") . '

'. + '
'. + ''. + '
'. + '
'. + ''; + +?> \ No newline at end of file diff --git a/po/squirrelmail.po b/po/squirrelmail.po index 395f6022..c573e2d7 100644 --- a/po/squirrelmail.po +++ b/po/squirrelmail.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-11-17 14:56+0100\n" +"POT-Creation-Date: 2001-11-17 18:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2029,6 +2029,7 @@ msgstr "" msgid "The spellcheck is not finished. Really close and discard changes?" msgstr "" +#: squirrelmail/plugins/newmail/testsound.php:33 #: squirrelmail/plugins/squirrelspell/modules/check_me.mod.php:285 #: squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod.php:50 msgid "Close" @@ -2657,11 +2658,11 @@ msgstr "" msgid "New Mail" msgstr "" -#: squirrelmail/plugins/newmail/newmail.php:25 +#: squirrelmail/plugins/newmail/newmail.php:26 msgid "SquirrelMail Notice:" msgstr "" -#: squirrelmail/plugins/newmail/newmail.php:29 +#: squirrelmail/plugins/newmail/newmail.php:30 msgid "You have new mail!" msgstr "" @@ -2688,3 +2689,11 @@ msgstr "" #, c-format msgid "%s New Message" msgstr "" + +#: squirrelmail/plugins/newmail/testsound.php:24 +msgid "Test Sound" +msgstr "" + +#: squirrelmail/plugins/newmail/testsound.php:30 +msgid "Loading the sound..." +msgstr ""