X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders.php;h=73d49b5ebbf2fc2cda225e4e87df7bfe55b1189e;hb=24fc49052db9408811aadf5b2e2740371553ace2;hp=f7d743741636cc2a24c2d858b8d610a7d9804b32;hpb=2441907dfffe13c82a89060f29da002e95fdc577;p=squirrelmail.git

diff --git a/src/folders.php b/src/folders.php
index f7d74374..73d49b5e 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -13,17 +13,33 @@
  * $Id$
  */
 
-require_once('../src/validate.php');
-require_once('../functions/imap_utf7_decode_local.php');
-require_once('../functions/imap.php');
-require_once('../functions/array.php');
-require_once('../functions/plugin.php');
-require_once('../functions/html.php');
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/imap_utf7_decode_local.php');
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/array.php');
+require_once(SM_PATH . 'functions/plugin.php');
+require_once(SM_PATH . 'functions/html.php');
 
 displayPageHeader($color, 'None');
 
+/* get globals we may need */
+
+$username = $_SESSION['username'];
+$key = $_COOKIE['key'];
+$delimiter = $_SESSION['delimiter'];
+$onetimepad = $_SESSION['onetimepad'];
+if (isset($_GET['success'])) {
+    $success = $_GET['success'];
+}
+
+/* end of get globals */
+
 echo '<br>' .
-    html_tag( 'table', '', 'center', $color[0], 'width="95%" cellpadding="2" cellspacing="0" border="0"' ) .
+    html_tag( 'table', '', 'center', $color[0], 'width="95%" cellpadding="1" cellspacing="0" border="0"' ) .
         html_tag( 'tr' ) .
             html_tag( 'td', '', 'center' ) . '<b>' . _("Folders") . '</b>' .
                 html_tag( 'table', '', 'center', '', 'width="100%" cellpadding="5" cellspacing="0" border="0"' ) .
@@ -43,6 +59,10 @@ if ((isset($success) && $success) ||
         $td_str = "<b>" . _("Created folder successfully!") . "</b><br>";
     } else if ($success == "rename") {
         $td_str = "<b>" . _("Renamed successfully!") . "</b><br>";
+    } else if ($success == "subscribe-doesnotexist") {
+        $td_str = "<b>" .
+                  _("Subscription Unsuccessful - Folder does not exist.") .
+                  "</b><br>";
     }
 
     echo html_tag( 'table',
@@ -59,7 +79,7 @@ $imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort,
 $boxes = sqimap_mailbox_list($imapConnection);
 
 /** CREATING FOLDERS **/
-echo html_tag( 'table', '', 'center', '', 'width="70%" cols="1" cellpadding="4" cellspacing="0" border="0"' ) .
+echo html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="4" cellspacing="0" border="0"' ) .
             html_tag( 'tr',
                 html_tag( 'td', '<b>' . _("Create Folder") . '</b>', 'center', $color[9] )
             ) .
@@ -67,7 +87,7 @@ echo html_tag( 'table', '', 'center', '', 'width="70%" cols="1" cellpadding="4"
                 html_tag( 'td', '', 'center', $color[0] ) .
 
      "<FORM NAME=cf ACTION=\"folders_create.php\" METHOD=\"POST\">\n".
-     "<INPUT TYPE=TEXT SIZE=25 NAME=folder_name><BR>\n".
+     "<input type=TEXT SIZE=25 NAME=folder_name><BR>\n".
      _("as a subfolder of").
      "<BR>".
      "<TT><SELECT NAME=subfolder>\n";
@@ -98,12 +118,12 @@ for ($i = 0; $i < count($boxes); $i++) {
 }
 echo "</SELECT></TT>\n";
 if ($show_contain_subfolders_option) {
-    echo "<br><INPUT TYPE=CHECKBOX NAME=\"contain_subs\"> &nbsp;";
+    echo "<br><input type=CHECKBOX NAME=\"contain_subs\"> &nbsp;";
     echo _("Let this folder contain subfolders");
     echo "<BR>";
 }
-echo "<INPUT TYPE=SUBMIT VALUE=\""._("Create")."\">\n";
-echo "</FORM></TD></TR>\n";
+echo "<input type=SUBMIT VALUE=\""._("Create")."\">\n";
+echo "</FORM></td></tr>\n";
 
 echo html_tag( 'tr',
             html_tag( 'td', '&nbsp;', 'left', $color[4] )
@@ -164,7 +184,7 @@ if ($count_special_folders < count($boxes)) {
         }
     }
     echo "</SELECT></TT>\n".
-         "<INPUT TYPE=SUBMIT VALUE=\"".
+         "<input type=SUBMIT VALUE=\"".
          _("Rename").
          "\">\n".
          "</FORM></td></tr>\n";
@@ -204,12 +224,12 @@ if ($count_special_folders < count($boxes)) {
         }
     }
     echo "</SELECT></TT>\n";
-    echo "<INPUT TYPE=SUBMIT VALUE=\"";
+    echo "<input type=SUBMIT VALUE=\"";
     echo _("Delete");
     echo "\">\n";
-    echo "</FORM></TD></TR>\n";
+    echo "</form></td></tr>\n";
 } else {
-    echo _("No folders found") . "<br><br></td><tr>";
+    echo _("No folders found") . "<br><br></td></tr>";
 }
 
 echo html_tag( 'tr',
@@ -241,7 +261,7 @@ if ($count_special_folders < count($boxes)) {
         }
     }
     echo "</SELECT></TT><br><br>\n";
-    echo "<INPUT TYPE=SUBMIT VALUE=\"";
+    echo "<input type=SUBMIT VALUE=\"";
     echo _("Unsubscribe");
     echo "\">\n";
     echo "</FORM></td>\n";
@@ -252,12 +272,14 @@ $boxes_sub = $boxes;
 
 /** SUBSCRIBE TO FOLDERS **/
 echo html_tag( 'td', '', 'center', $color[0], 'width="50%"' );
-$imap_stream = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 1);
-$boxes_all = sqimap_mailbox_list_all ($imap_stream);
-
-$box = "";
-$box2 = "";
-for ($i = 0, $q = 0; $i < count($boxes_all); $i++) {
+if(!$no_list_for_subscribe) {
+  $imap_stream = sqimap_login ($username, $key, $imapServerAddress,
+                               $imapPort, 1);
+  $boxes_all = sqimap_mailbox_list_all ($imap_stream);
+
+  $box = "";
+  $box2 = "";
+  for ($i = 0, $q = 0; $i < count($boxes_all); $i++) {
     $use_folder = true;
     for ($p = 0; $p < count ($boxes); $p++) {
         if ($boxes_all[$i]["unformatted"] == $boxes[$p]["unformatted"]) {
@@ -272,10 +294,10 @@ for ($i = 0, $q = 0; $i < count($boxes_all); $i++) {
         $box2[$q] = imap_utf7_decode_local($boxes_all[$i]["unformatted-disp"]);
         $q++;
     }
-}
-sqimap_logout($imap_stream);
+  }
+  sqimap_logout($imap_stream);
 
-if ($box && $box2) {
+  if ($box && $box2) {
     echo "<FORM ACTION=\"folders_subscribe.php?method=sub\" METHOD=\"POST\">\n";
     echo "<tt><select name=\"mailbox[]\" multiple size=8>";
 
@@ -283,10 +305,18 @@ if ($box && $box2) {
        echo "         <OPTION VALUE=\"$box[$q]\">".$box2[$q]."\n";
     }      
     echo "</select></tt><br><br>";
-    echo "<INPUT TYPE=SUBMIT VALUE=\"". _("Subscribe") . "\">\n";
+    echo "<input type=SUBMIT VALUE=\"". _("Subscribe") . "\">\n";
     echo "</FORM></td></tr></table><BR>\n";
-} else {
+  } else {
     echo _("No folders were found to subscribe to!") . "</td></tr></table>";
+  }
+} else {
+  /* don't perform the list action -- this is much faster */
+  echo "<FORM ACTION=\"folders_subscribe.php?method=sub\" METHOD=\"POST\">\n";
+  echo _("Subscribe to:") . "<br>";
+  echo "<tt><input type=\"text\" name=\"mailbox[]\" size=35>";
+  echo "<INPUT TYPE=SUBMIT VALUE=\"". _("Subscribe") . "\">\n";
+  echo "</FORM></TD></TR></TABLE><BR>\n";
 }
 
 do_hook("folders_bottom");