Error Dispaly fix: can't do set_time_limit() in safemode

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

diff --git a/plugins/mail_fetch/class.POP3.php b/plugins/mail_fetch/class.POP3.php
index 7305431897b3a23cd0cedb306aaa40fd71fee0e2..a61bfa8fc07d1fd58a6e77093ca06a9ffe2f488f 100644 (file)
--- a/plugins/mail_fetch/class.POP3.php
+++ b/plugins/mail_fetch/class.POP3.php
@@ -62,13 +62,15 @@ class POP3 {
         if(!empty($timeout)) {
             settype($timeout,"integer");
             $this->TIMEOUT = $timeout;
-            set_time_limit($timeout);
+            if (!ini_get('safe_mode'))
+                set_time_limit($timeout);
         }
         return true;
     }
 
     function update_timer () {
-        set_time_limit($this->TIMEOUT);
+        if (!ini_get('safe_mode'))
+            set_time_limit($this->TIMEOUT);
         return true;
     }
 

diff --git a/plugins/mail_fetch/fetch.php b/plugins/mail_fetch/fetch.php
index d2e6eaef5c81e2364689750efd7fb9fb75d5c2c2..26260ed56d3337a6fc40648767c1973496c76029 100644 (file)
--- a/plugins/mail_fetch/fetch.php
+++ b/plugins/mail_fetch/fetch.php
@@ -228,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);
 

diff --git a/plugins/mail_fetch/setup.php b/plugins/mail_fetch/setup.php
index cfe8c60671fc79e33b004fb5c03c9849df39a4f0..c84b3994c6e9b1c07854fa63c9428e96662be8e0 100644 (file)
--- a/plugins/mail_fetch/setup.php
+++ b/plugins/mail_fetch/setup.php
@@ -166,7 +166,8 @@
                     $outMsg .= _("Server does not support UIDL.");
 
                 for (; $i <= $Count; $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);