Happy 2014

[squirrelmail.git] / plugins / mail_fetch / fetch.php

diff --git a/plugins/mail_fetch/fetch.php b/plugins/mail_fetch/fetch.php
index 13f68d224e0429a9fa2e97e9caa6903acdedc58f..0383559c543eed24aa762501f408e01b37820b5f 100644 (file)
--- a/plugins/mail_fetch/fetch.php
+++ b/plugins/mail_fetch/fetch.php
@@ -5,7 +5,7 @@
  *
  * Fetch code.
  *
- * @copyright © 1999-2009 The SquirrelMail Project Team
+ * @copyright 1999-2014 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package plugins
@@ -30,12 +30,12 @@ sqgetGlobalVar('delimiter',  $delimiter,  SQ_SESSION);
 /* end globals */
 
 /**
- * @param string $msg mail
+ * @param string $msg message
  */
 function Mail_Fetch_Status($msg) {
     echo html_tag( 'table',
              html_tag( 'tr',
-                 html_tag( 'td', htmlspecialchars( $msg ) , 'left' )
+                 html_tag( 'td', sm_encode_html_special_chars( $msg ) , 'left' )
                  ),
              '', '', 'width="90%"' );
     flush();
@@ -97,7 +97,7 @@ function Mail_Fetch_Select_Server($mailfetch) {
         '<option value="all" selected="selected">..' . _("All") . "...\n";
     for ($i = 0;$i < $mailfetch['server_number'];$i++) {
         echo "<option value=\"$i\">" .
-            htmlspecialchars($mailfetch[$i]['alias']) .
+            sm_encode_html_special_chars($mailfetch[$i]['alias']) .
             '</option>' . "\n";
     }
     echo            '</select>' .
@@ -109,7 +109,7 @@ function Mail_Fetch_Select_Server($mailfetch) {
         if ($mailfetch[$i]['pass'] == '') {
             echo html_tag( 'tr',
                      html_tag( 'td', _("Password for") . ' <b>' .
-                         htmlspecialchars($mailfetch[$i]['alias']) .
+                         sm_encode_html_special_chars($mailfetch[$i]['alias']) .
                          '</b>: &nbsp; &nbsp; ',
                          'right' ) .
                      html_tag( 'td', '<input type="password" name="pass_' . $i . '" />', 'left' )
@@ -177,7 +177,7 @@ for ($i_loop=$i_start;$i_loop<$i_stop;$i_loop++) {
             html_tag( 'tr',
                 html_tag( 'td', '<b>' .
                     sprintf(_("Fetching from %s"),
-                        htmlspecialchars($mailfetch[$i_loop]['alias'])) .
+                        sm_encode_html_special_chars($mailfetch[$i_loop]['alias'])) .
                     '</b>',
                 'center' ) ,
             '', $color[9] ) ,
@@ -209,13 +209,13 @@ for ($i_loop=$i_start;$i_loop<$i_stop;$i_loop++) {
 
     /* log into pop server*/
     if (! $pop3->login($mailfetch_user, $mailfetch_pass)) {
-        Mail_Fetch_Status(_("Login Failed:") . ' ' . htmlspecialchars($pop3->error));
+        Mail_Fetch_Status(_("Login Failed:") . ' ' . sm_encode_html_special_chars($pop3->error));
         continue;
     }
 
     $aMsgStat = $pop3->command_stat();
     if (is_bool($aMsgStat)) {
-        Mail_Fetch_Status(_("Can't get mailbox status:") . ' ' . htmlspecialchars($pop3->error) );
+        Mail_Fetch_Status(_("Can't get mailbox status:") . ' ' . sm_encode_html_special_chars($pop3->error) );
         continue;
     }
 
@@ -224,18 +224,18 @@ for ($i_loop=$i_start;$i_loop<$i_stop;$i_loop++) {
     $i = 1;
 
     if ($Count>0) {
-        // If we leave mails on server, try using UIDL
+        // If we leave messages on server, try using UIDL
         if ($mailfetch_lmos == 'on') {
             Mail_Fetch_Status(_("Fetching UIDL..."));
             $msglist = $pop3->command_uidl();
             if (is_bool($msglist)) {
-                Mail_Fetch_Status(_("Server does not support UIDL.") . ' '.htmlspecialchars($pop3->error));
-                // User asked to leave mails on server, but we can't do that.
+                Mail_Fetch_Status(_("Server does not support UIDL.") . ' '.sm_encode_html_special_chars($pop3->error));
+                // User asked to leave messages on server, but we can't do that.
                 $pop3->command_quit();
                 continue;
                 // $mailfetch_lmos = 'off';
             } else {
-                // calculate number of new mails
+                // calculate number of new messages
                 for ($j = 1; $j <= sizeof($msglist); $j++) {
                     // do strict comparison ('1111.10' should not be equal to '1111.100')
                     if ($msglist[$j] === $mailfetch_uidl) {
@@ -245,17 +245,17 @@ for ($i_loop=$i_start;$i_loop<$i_stop;$i_loop++) {
                 }
             }
         }
-        // fetch list of mails with LIST
+        // fetch list of messages with LIST
         // we can use else control, but we can also set $mailfetch_lmos 
         // to off if server does not support UIDL.
         if ($mailfetch_lmos != 'on') {
-            Mail_Fetch_Status(_("Fetching list of mails..."));
+            Mail_Fetch_Status(_("Fetching list of messages..."));
             $msglist = $pop3->command_list();
         }
     }
 
     if ($Count < $i) {
-        Mail_Fetch_Status(_("Login OK: No new mails"));
+        Mail_Fetch_Status(_("Login OK: No new messages"));
         $pop3->command_quit();
         continue;
     }
@@ -265,26 +265,26 @@ for ($i_loop=$i_start;$i_loop<$i_stop;$i_loop++) {
         continue;
     } else {
         $newmsgcount = $Count - $i + 1;
-        Mail_Fetch_Status(sprintf(ngettext("Login OK: Inbox contains %s mail",
-                                           "Login OK: Inbox contains %s mails",$newmsgcount), $newmsgcount));
+        Mail_Fetch_Status(sprintf(ngettext("Login OK: Inbox contains %s message",
+                                           "Login OK: Inbox contains %s messages",$newmsgcount), $newmsgcount));
     }
 
     if ($mailfetch_lmos == 'on') {
-        Mail_Fetch_Status(_("Leaving mail on server..."));
+        Mail_Fetch_Status(_("Leaving messages on server..."));
     } else {
-        Mail_Fetch_Status(_("Deleting mails from server..."));
+        Mail_Fetch_Status(_("Deleting messages from server..."));
     }
 
     for (; $i <= $Count; $i++) {
-        Mail_Fetch_Status(sprintf(_("Fetching mail %s."), $i));
+        Mail_Fetch_Status(sprintf(_("Fetching message %s."), $i));
 
         if (!ini_get('safe_mode'))
-            set_time_limit(20); // 20 seconds per mail max
+            set_time_limit(20); // 20 seconds per message max
 
         $Message = $pop3->command_retr($i);
 
         if (is_bool($Message)) {
-            Mail_Fetch_Status(htmlspecialchars($pop3->error));
+            Mail_Fetch_Status(sm_encode_html_special_chars($pop3->error));
             continue;
         }
 
@@ -297,7 +297,7 @@ for ($i_loop=$i_start;$i_loop<$i_stop;$i_loop++) {
             $response=(implode('',$response));
             $message=(implode('',$message));
             if ($response != 'OK') {
-                Mail_Fetch_Status(_("Error Appending Mail!")." ".htmlspecialchars($message) );
+                Mail_Fetch_Status(_("Error Appending Message!")." ".sm_encode_html_special_chars($message) );
                 Mail_Fetch_Status(_("Closing POP"));
                 $pop3->command_quit();
                 Mail_Fetch_Status(_("Logging out from IMAP"));
@@ -309,19 +309,19 @@ for ($i_loop=$i_start;$i_loop<$i_stop;$i_loop++) {
                 }
                 exit;
             } else {
-                Mail_Fetch_Status(_("Mail appended to mailbox"));
+                Mail_Fetch_Status(_("Message appended to mailbox"));
             }
 
             if ($mailfetch_lmos != 'on') {
                 if( $pop3->command_dele($i) ) {
-                    Mail_Fetch_Status(sprintf(_("Mail %d deleted from remote server!"), $i));
+                    Mail_Fetch_Status(sprintf(_("Message %d deleted from remote server!"), $i));
                 } else {
-                    Mail_Fetch_Status(_("Delete failed:") . htmlspecialchars($pop3->error) );
+                    Mail_Fetch_Status(_("Delete failed:") . sm_encode_html_special_chars($pop3->error) );
                 }
             }
         } else {
             echo $Line;
-            Mail_Fetch_Status(_("Error Appending Mail!"));
+            Mail_Fetch_Status(_("Error Appending Message!"));
             Mail_Fetch_Status(_("Closing POP"));
             $pop3->command_quit();
             Mail_Fetch_Status(_("Logging out from IMAP"));