folder speedup

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

diff --git a/src/folders.php b/src/folders.php
index 73d49b5ebbf2fc2cda225e4e87df7bfe55b1189e..e480a6b6e109b95212b51fe2e883beff6ccd1174 100644 (file)
--- a/src/folders.php
+++ b/src/folders.php
@@ -97,7 +97,7 @@ if ($default_sub_of_inbox == false) {
     echo '<OPTION VALUE="">[ '._("None")." ]\n";
 }
 
-for ($i = 0; $i < count($boxes); $i++) {
+for ($i = 0, $cnt=count($boxes); $i < $cnt; $i++) {
     if (!in_array('noinferiors', $boxes[$i]['flags'])) {
         if ((strtolower($boxes[$i]['unformatted']) == 'inbox') &&
             $default_sub_of_inbox) {
@@ -141,7 +141,7 @@ if ($move_to_sent) {
 if ($save_as_draft) {
         $num_max++;
 }
-for ($p = 0; $p < count($boxes) && $count_special_folders < $num_max; $p++) {
+for ($p = 0, $cnt = count($boxes); $p < $cnt && $count_special_folders < $num_max; $p++) {
     if (strtolower($boxes[$p]['unformatted']) == 'inbox')
         $count_special_folders++;
     else if (strtolower($imap_server_type) == 'courier' &&
@@ -273,9 +273,7 @@ $boxes_sub = $boxes;
 /** SUBSCRIBE TO FOLDERS **/
 echo html_tag( 'td', '', 'center', $color[0], 'width="50%"' );
 if(!$no_list_for_subscribe) {
-  $imap_stream = sqimap_login ($username, $key, $imapServerAddress,
-                               $imapPort, 1);
-  $boxes_all = sqimap_mailbox_list_all ($imap_stream);
+  $boxes_all = sqimap_mailbox_list_all ($imapConnection);
 
   $box = "";
   $box2 = "";
@@ -295,8 +293,6 @@ if(!$no_list_for_subscribe) {
         $q++;
     }
   }
-  sqimap_logout($imap_stream);
-
   if ($box && $box2) {
     echo "<FORM ACTION=\"folders_subscribe.php?method=sub\" METHOD=\"POST\">\n";
     echo "<tt><select name=\"mailbox[]\" multiple size=8>";