Changeset 2119 in subversion

Timestamp:

Dec 4, 2008 2:07:29 PM (4 years ago)

Author:

alec

Message:

• performance: connect to imap server only when needed (some mail actions do not require imap connection)

Location:

trunk/roundcubemail

Files:

• index.php (modified) (2 diffs)
• program/steps/mail/func.inc (modified) (2 diffs)

trunk/roundcubemail/index.php

@@ -117 +117 @@
   if (!$RCMAIL->authenticate_session()) {
     $OUTPUT->show_message('sessionerror', 'error');
-    $RCMAIL->kill_session();
-  }
-}
-
-
-// log in to imap server
-if (!empty($RCMAIL->user->ID) && $RCMAIL->task == 'mail') {
-  if (!$RCMAIL->imap_connect()) {
     $RCMAIL->kill_session();
   }
@@ -224 +216 @@
 
 
-// make sure the message count is refreshed (for default view)
-if ($RCMAIL->task == 'mail') {
-  $IMAP->messagecount($_SESSION['mbox'], 'ALL', true);
-}
-
 // parse main template (default)
 $OUTPUT->send($RCMAIL->task);

trunk/roundcubemail/program/steps/mail/func.inc

@@ -23 +23 @@
 require_once('include/rcube_smtp.inc');
 
-
 $EMAIL_ADDRESS_PATTERN = '/([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9]([a-z0-9\-][.]?)*[a-z0-9]\\.[a-z]{2,5})/i';
+
+// actions that do not require imap connection
+$NOIMAP_ACTIONS = array('spell', 'addcontact', 'autocomplete', 'upload');
+
+
+// log in to imap server
+if (!in_array($RCMAIL->action, $NOIMAP_ACTIONS) && !$RCMAIL->imap_connect()) {
+  $RCMAIL->kill_session();
+
+  if ($OUTPUT->ajax_call)
+    $OUTPUT->redirect(array(), 2000);
+
+  $OUTPUT->set_env('task', 'login');
+  $OUTPUT->send('login');
+}
+
+
 
 // set imap properties and session vars
@@ -65 +81 @@
       $OUTPUT->set_env('search_request', $search_request);
       }
+    
+      // make sure the message count is refreshed (for default view)
+      $IMAP->messagecount($mbox_name, 'ALL', true);
     }