String fix

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

diff --git a/plugins/mail_fetch/fetch.php b/plugins/mail_fetch/fetch.php
index d51fea25b6eebc69e473bd34784dbd4c71e934a2..de9e1f7a6f816f8c80ec61085a48a5ff9490a5d6 100644 (file)
--- a/plugins/mail_fetch/fetch.php
+++ b/plugins/mail_fetch/fetch.php
@@ -3,14 +3,17 @@
 /**
  * mail_fetch/fetch.php
  *
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Fetch code.
  *
  * $Id$
+ * @package plugins
+ * @subpackage mail_fetch
  */
 
+/** @ignore */
 define('SM_PATH','../../');
 
 require_once(SM_PATH . 'include/validate.php');
@@ -38,6 +41,8 @@ sqgetGlobalVar('delimiter',  $delimiter,  SQ_SESSION);
     }
 
     function Mail_Fetch_Servers() {
+        global $data_dir, $username;
+
         $mailfetch['server_number'] = getPref($data_dir, $username, "mailfetch_server_number");
         if (!isset($mailfetch['server_number']) || ($mailfetch['server_number'] < 1)) {
             $mailfetch['server_number'] = 0;
@@ -67,6 +72,8 @@ sqgetGlobalVar('delimiter',  $delimiter,  SQ_SESSION);
     }
 
     function Mail_Fetch_Select_Server($mailfetch) {
+        global $PHP_SELF;
+
         echo '<font size=-5><br></font>' .
              "<form action=\"$PHP_SELF\" method=\"post\" target=\"_self\">" .
              html_tag( 'table', '', 'center', '', 'width="70%" cols="2"' ) .
@@ -114,7 +121,18 @@ sqgetGlobalVar('delimiter',  $delimiter,  SQ_SESSION);
                ) ,
            'center', '', 'width="95%" cols="1"' );
 
-    if (!isset( $server_to_fetch ) ) {
+
+    /* there are no servers defined yet... */
+    if($mailfetch['server_number'] == 0) {
+        echo '<p>' . _("No POP3 servers configured yet.") . '</p>';
+        displayInternalLink('plugins/mail_fetch/options.php',
+            _("Click here to go to the options page.") );
+        echo '</body></html>';
+        exit();
+    }
+
+    // get $server_to_fetch from globals, if not set display a choice to the user
+    if (! sqgetGlobalVar('server_to_fetch', $server_to_fetch, SQ_POST) ) {
         Mail_Fetch_Select_Server($mailfetch);
         exit();
     }
@@ -165,7 +183,7 @@ sqgetGlobalVar('delimiter',  $delimiter,  SQ_SESSION);
         Mail_Fetch_Status(_("Opening POP server"));
         $Count = $pop3->login($mailfetch_user, $mailfetch_pass);
         if (($Count == false || $Count == -1) && $pop3->ERROR != '') {
-            Mail_Fetch_Status(_("Login Failed:") . ' ' . $pop3->ERROR );
+            Mail_Fetch_Status(_("Login Failed:") . ' ' . htmlspecialchars($pop3->ERROR) );
             continue;
         }
 
@@ -192,7 +210,7 @@ sqgetGlobalVar('delimiter',  $delimiter,  SQ_SESSION);
             continue;
         } else {
             $newmsgcount = $Count - $i + 1;
-            Mail_Fetch_Status(_("Login OK: Inbox contains [") . $newmsgcount . _("] messages"));
+            Mail_Fetch_Status(sprintf(_("Login OK: Inbox contains %s messages"), $newmsgcount));
         }
 
         Mail_Fetch_Status(_("Fetching UIDL..."));
@@ -210,7 +228,9 @@ sqgetGlobalVar('delimiter',  $delimiter,  SQ_SESSION);
 
         for (; $i <= $Count; $i++) {
             Mail_Fetch_Status(_("Fetching message ") . "$i" );
-            set_time_limit(20); // 20 seconds per message max
+
+            if (!ini_get('safe_mode'))
+                set_time_limit(20); // 20 seconds per message max
             $Message = '';
             $MessArray = $pop3->get($i);
 
@@ -250,8 +270,10 @@ 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));
                 if ($response != 'OK') {
-                    Mail_Fetch_Status(_("Error Appending Message!")." ".$message );
+                    Mail_Fetch_Status(_("Error Appending Message!")." ".htmlspecialchars($message) );
                     Mail_Fetch_Status(_("Closing POP"));
                     $pop3->quit();
                     Mail_Fetch_Status(_("Logging out from IMAP"));
@@ -268,7 +290,7 @@ sqgetGlobalVar('delimiter',  $delimiter,  SQ_SESSION);
                    if( $pop3->delete($i) ) {
                         Mail_Fetch_Status(_("Message ") . $i . _(" deleted from Remote Server!"));
                    } else {
-                        Mail_Fetch_Status(_("Delete failed:") . $pop3->ERROR );
+                        Mail_Fetch_Status(_("Delete failed:") . htmlspecialchars($pop3->ERROR) );
                    }
                 }
             } else {