Back out support for using SM without Frames

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

diff --git a/plugins/mail_fetch/fetch.php b/plugins/mail_fetch/fetch.php
index d51fea25b6eebc69e473bd34784dbd4c71e934a2..26260ed56d3337a6fc40648767c1973496c76029 100644 (file)
--- a/plugins/mail_fetch/fetch.php
+++ b/plugins/mail_fetch/fetch.php
@@ -9,8 +9,11 @@
  * 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();
     }
@@ -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);