Send the user to the options page if he clicks the Fetch link when

no servers are available.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5460 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/plugins/mail_fetch/fetch.php b/plugins/mail_fetch/fetch.php
index 45807588ae1b202413755fd1190e6a2c760a7ef4..03c9211b52b7f9ea6333999c98ada8651301463a 100644 (file)
--- a/plugins/mail_fetch/fetch.php
+++ b/plugins/mail_fetch/fetch.php
@@ -38,6 +38,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 +69,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,6 +118,16 @@ sqgetGlobalVar('delimiter',  $delimiter,  SQ_SESSION);
                ) ,
            'center', '', 'width="95%" cols="1"' );
 
+
+    /* 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);