X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fmail_fetch%2Ffetch.php;h=898cecc0275c33c2f3c46c34e569af001278703d;hp=de9e1f7a6f816f8c80ec61085a48a5ff9490a5d6;hb=6c84ba1ec45ab854c37b6f65c5b4d84ab1c7aad4;hpb=27e1f1efefe83a04ce9fd50596d25b5c24955fe0
diff --git a/plugins/mail_fetch/fetch.php b/plugins/mail_fetch/fetch.php
index de9e1f7a..898cecc0 100644
--- a/plugins/mail_fetch/fetch.php
+++ b/plugins/mail_fetch/fetch.php
@@ -3,7 +3,7 @@
/**
* mail_fetch/fetch.php
*
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Fetch code.
@@ -24,7 +24,7 @@ require_once(SM_PATH . 'plugins/mail_fetch/class.POP3.php');
require_once(SM_PATH . 'plugins/mail_fetch/functions.php' );
require_once(SM_PATH . 'functions/html.php' );
-/* globals */
+/* globals */
sqgetGlobalVar('username', $username, SQ_SESSION);
sqgetGlobalVar('key', $key, SQ_COOKIE);
sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
@@ -74,19 +74,19 @@ sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
function Mail_Fetch_Select_Server($mailfetch) {
global $PHP_SELF;
- echo '
' .
- "
';
}
@@ -113,7 +113,7 @@ sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
$mailfetch = Mail_Fetch_Servers();
displayPageHeader($color, 'None');
- echo '
';
+ echo '
';
echo html_tag( 'table',
html_tag( 'tr',
@@ -160,11 +160,11 @@ sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
$pop3 = new POP3($mailfetch_server, 60);
- echo '
' .
+ echo '
' .
html_tag( 'table',
html_tag( 'tr',
- html_tag( 'td', '' . _("Fetching from ") .
- htmlspecialchars($mailfetch[$i_loop]['alias']) .
+ html_tag( 'td', '' . _("Fetching from ") .
+ htmlspecialchars($mailfetch[$i_loop]['alias']) .
'',
'center' ) ,
'', $color[9] ) ,
@@ -210,7 +210,8 @@ sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
continue;
} else {
$newmsgcount = $Count - $i + 1;
- Mail_Fetch_Status(sprintf(_("Login OK: Inbox contains %s messages"), $newmsgcount));
+ Mail_Fetch_Status(sprintf(ngettext("Login OK: Inbox contains %s message",
+ "Login OK: Inbox contains %s messages",$newmsgcount), $newmsgcount));
}
Mail_Fetch_Status(_("Fetching UIDL..."));
@@ -270,8 +271,8 @@ sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
fputs($imap_stream, $Message);
fputs($imap_stream, "\r\n");
sqimap_read_data($imap_stream, "A3$i", false, $response, $message);
- $response=(implode('',$response));
- $message=(implode('',$message));
+ $response=(implode('',$response));
+ $message=(implode('',$message));
if ($response != 'OK') {
Mail_Fetch_Status(_("Error Appending Message!")." ".htmlspecialchars($message) );
Mail_Fetch_Status(_("Closing POP"));
@@ -324,4 +325,4 @@ sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
?>