X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders.php;h=34dc7f45906da04a55419a0b582e3cba5a1d80ae;hb=4dea7315db37a788bb396ce27788c394e6cba224;hp=69898a58988eb9ca0d9ac8696f9204ab822c4be6;hpb=245a6892bf5c780904ef9677f24d624ea17e0749;p=squirrelmail.git

diff --git a/src/folders.php b/src/folders.php
index 69898a58..34dc7f45 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -12,37 +12,31 @@
     **  $Id$
     **/
 
-   session_start();
+   require_once('../src/validate.php');
+   require_once('../functions/imap.php');
+   require_once('../functions/array.php');
+   require_once('../functions/plugin.php');
 
-   if (!isset($strings_php))
-      include("../functions/strings.php");
-   if (!isset($config_php))
-      include("../config/config.php");
-   if (!isset($page_header_php))
-      include("../functions/page_header.php");
-   if (!isset($imap_php))
-      include("../functions/imap.php");
-   if (!isset($array_php))
-      include("../functions/array.php");
-   if (!isset($plugin_php))
-      include("../functions/plugin.php");
+   displayPageHeader($color, _("None"));
 
-   include("../src/load_prefs.php");
+?>
+
+<br>
+<table bgcolor="<?php echo $color[0] ?>" width="95%" align="center" cellpadding="2" cellspacing="0" border="0">
+<tr><td align="center">
+
+      <b><?php echo _("Folders"); ?></b>
 
-   displayPageHeader($color, "None");
+    <table width="100%" border="0" cellpadding="5" cellspacing="0">
+    <tr><td bgcolor="<?php echo $color[4] ?>" align="center">
 
-   echo "<br>";
-   echo "<TABLE WIDTH=95% COLS=1 ALIGN=CENTER>\n";
-   echo "   <TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><b>\n";
-   echo _("Folders");
-   echo "   </b></TD></TR>\n";
-   echo "</TABLE>\n";
+<?php
 
    if ((isset($success) && $success) || 
        (isset($sent_create) && $sent_create == "true") || 
        (isset($trash_create) && $trash_create == "true")) {
-      echo "<table width=100% align=center cellpadding=3 cellspacing=0 border=0>\n";
-      echo "   <tr><td><center>\n";
+      echo "<table width=100% align=center cellpadding=2 cellspacing=0 border=0>\n";
+      echo "   <tr><td align=center>\n";
       if ($success == "subscribe") {
          echo "<b>" . _("Subscribed successfully!") . "</b><br>";
       } else if ($success == "unsubscribe") {
@@ -53,47 +47,15 @@
          echo "<b>" . _("Created folder successfully!") . "</b><br>";
       } else if ($success == "rename") {
          echo "<b>" . _("Renamed successfully!") . "</b><br>";
-      } else if (($sent_create == "true") || ($trash_create == "true")) {
-         $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-         if ($sent_create == "true") {
-            sqimap_mailbox_create ($imapConnection, $sent_folder, "");  
-         }
-         if ($trash_create == "true") {
-            sqimap_mailbox_create ($imapConnection, $trash_folder, "");
-         }
-         sqimap_logout($imapConnection);
-         echo _("Folders created successfully!");
       }
 
       echo "   <a href=\"../src/left_main.php\" target=left>" . _("refresh folder list") . "</a>";
-      echo "   </center></td></tr>\n";
+      echo "   </td></tr>\n";
       echo "</table><br>\n";
    }
    $imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0);
    $boxes = sqimap_mailbox_list($imapConnection);
 
-   //display form option for creating Sent and Trash folder
-   if ($imap_server_type == "cyrus" && ($sent_folder != "none" || $trash_folder != "none")) {
-      if ((!sqimap_mailbox_exists ($imapConnection, $sent_folder)) || 
-	  (!sqimap_mailbox_exists ($imapConnection, $trash_folder))) {
-         echo "<TABLE WIDTH=70% COLS=1 ALIGN=CENTER cellpadding=2 cellspacing=0 border=0>\n";
-         echo "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER><B>";
-         echo _("Special Folder Options");
-         echo "</B></TD></TR>";
-         echo "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>";
-         echo _("In order for SquirrelMail to provide the full set of options you need to create the special folders listed below.  Just click the check box and hit the create button.");
-         echo "<FORM ACTION=\"folders.php\" METHOD=\"POST\">\n";
-         if (!sqimap_mailbox_exists ($imapConnection, $sent_folder) && $sent_folder != "none") {
-            echo _("Create Sent") . "<INPUT TYPE=checkbox NAME=sent_create value=true><br>\n";
-         }
-         if (!sqimap_mailbox_exists ($imapConnection, $trash_folder) && $trash_folder != "none"){
-            echo _("Create Trash") . "<INPUT TYPE=checkbox NAME=trash_create value=true><br>\n";
-         }
-         echo "<INPUT TYPE=submit VALUE="._("Create").">";
-         echo "</FORM></TD></TR></TABLE><br>";
-      }
-   }
-
    /** DELETING FOLDERS **/
    echo "<TABLE WIDTH=70% COLS=1 ALIGN=CENTER cellpadding=2 cellspacing=0 border=0>\n";
    echo "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER><B>";
@@ -132,7 +94,7 @@
 	      strtolower($boxes[$i]["unformatted"]) != "inbox.trash"))
 	    {
 	       $box = $boxes[$i]["unformatted-dm"];
-	       $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
+	       $box2 = str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]);
 	       echo "         <OPTION VALUE=\"$box\">$box2\n";
 	    }
       }
@@ -159,50 +121,29 @@
    echo "<TT><SELECT NAME=subfolder>\n";
    if (strtolower($imap_server_type) != "courier"){
      if ($default_sub_of_inbox == false)
-       echo "<OPTION SELECTED>[ None ]\n";
+       echo '<OPTION SELECTED VALUE="">[ '._("None")." ]\n";
      else
-       echo "<OPTION>[ None ]\n";
+       echo '<OPTION VALUE="">[ '._("None")." ]\n";
    }
 
    for ($i = 0; $i < count($boxes); $i++) {
-      if (count($boxes[$i]["flags"]) > 0) {
-         $noinf = false;
-         for ($j = 0; $j < count($boxes[$i]["flags"]); $j++) {
-            if ($boxes[$i]["flags"][$j] == "noinferiors") {
-               $noinf = true;
-               continue;
-            }
-         }    
-         if ($noinf == false) {
-            if ((strtolower($boxes[$i]["unformatted"]) == "inbox") && ($default_sub_of_inbox == true)) {
-               $box = $boxes[$i]["unformatted"];
-               $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
-               echo "<OPTION SELECTED VALUE=\"$box\">$box2\n";
-            } else {
-               $box = $boxes[$i]["unformatted"];
-               $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
-               if (strtolower($imap_server_type) != "courier" ||
-                  strtolower($box) != "inbox.trash")
-                echo "<OPTION VALUE=\"$box\">$box2\n";
-            }
-         }
-      } else {
+      if (!in_array('noinferiors', $boxes[$i]['flags'])) {
          if ((strtolower($boxes[$i]["unformatted"]) == "inbox") && ($default_sub_of_inbox == true)) {
             $box = $boxes[$i]["unformatted"];
-            $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
+            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]);
             echo "<OPTION SELECTED VALUE=\"$box\">$box2\n";
          } else {
             $box = $boxes[$i]["unformatted"];
-            $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
+            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]);
            if (strtolower($imap_server_type) != "courier" ||
                strtolower($box) != "inbox.trash")
              echo "<OPTION VALUE=\"$box\">$box2\n";
          }
       }
    }
-   echo "</SELECT></TT><BR>\n";
+   echo "</SELECT></TT>\n";
    if ($show_contain_subfolders_option) {
-      echo "<INPUT TYPE=CHECKBOX NAME=\"contain_subs\"> &nbsp;";
+      echo "<br><INPUT TYPE=CHECKBOX NAME=\"contain_subs\"> &nbsp;";
       echo _("Let this folder contain subfolders");
       echo "<BR>";
    }   
@@ -227,7 +168,7 @@
 	     ($boxes[$i]["unformatted"] != $sent_folder)) 
 	    {	
 	       $box = $boxes[$i]["unformatted-dm"];
-	       $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
+	       $box2 = str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]);
 	       if (strtolower($imap_server_type) != "courier" || strtolower($box) != "inbox.trash")
 		  echo "<OPTION VALUE=\"$box\">$box2\n";
 	    }
@@ -245,11 +186,11 @@
    echo "<tr><td bgcolor=\"$color[4]\">&nbsp;</td></tr></table>\n";
    
    /** UNSUBSCRIBE FOLDERS **/
-   echo "<TABLE WIDTH=70% COLS=1 ALIGN=CENTER cellpadding=2 cellspacing=0 border=0>\n";
-   echo "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER colspan=3><B>";
+   echo "<TABLE WIDTH=70% COLS=2 ALIGN=CENTER cellpadding=2 cellspacing=1 border=0>\n";
+   echo "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER colspan=2><B>";
    echo _("Unsubscribe") . "/" . _("Subscribe");
-   echo "</B></TD></TR>";
-   echo "<TR><TD BGCOLOR=\"$color[0]\" width=49% ALIGN=CENTER>";
+   echo "</B></TD></TR>\n";
+   echo "<TR><TD BGCOLOR=\"$color[0]\" width=50% ALIGN=CENTER>\n";
    if ($count_special_folders < count($boxes)) {
       echo "<FORM ACTION=\"folders_subscribe.php?method=unsub\" METHOD=\"POST\">\n";
       echo "<TT><SELECT NAME=mailbox[] multiple size=8>\n";
@@ -260,7 +201,7 @@
 	     ($boxes[$i]["unformatted"] != $sent_folder)) 
 	    {	
 	       $box = $boxes[$i]["unformatted-dm"];
-	       $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
+	       $box2 = str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]);
 	       echo "         <OPTION VALUE=\"$box\">$box2\n";
 	    }
       }
@@ -274,10 +215,8 @@
    }
    $boxes_sub = $boxes;
 
-   echo "<td bgcolor=\"$color[9]\" width=2%>&nbsp;</td>";
-   
    /** SUBSCRIBE TO FOLDERS **/
-   echo "<TD BGCOLOR=\"$color[0]\" widtn=49% ALIGN=CENTER>";
+   echo "<TD BGCOLOR=\"$color[0]\" width=50% ALIGN=CENTER>";
    $imap_stream = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 1);
    $boxes_all = sqimap_mailbox_list_all ($imap_stream);
 
@@ -314,8 +253,20 @@
    } else {
       echo _("No folders were found to subscribe to!") . "</td></tr></table>";
    }
+?>
+
+
+  <?php do_hook("folders_bottom"); ?>
 
-   do_hook("folders_bottom");
+
+    </td></tr>
+    </table>
+
+</td></tr>
+</table>
+
+<?php
    sqimap_logout($imapConnection);
 ?>
-</BODY></HTML>
+
+</body></html>
\ No newline at end of file