X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders.php;h=ad9c7232799e3efae3269ddc5256466ccf83c0f2;hb=5bdd722368a3fac32defc2242e9dd3f1e567a527;hp=35b5a39fcc2c3c3108d689d823d9d6bb01939194;hpb=390372b45bd353cbfc6843382bc7f4291544fc49;p=squirrelmail.git

diff --git a/src/folders.php b/src/folders.php
index 35b5a39f..ad9c7232 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -22,6 +22,8 @@
       include("../functions/imap.php");
    if (!isset($array_php))
       include("../functions/array.php");
+   if (!isset($plugin_php))
+      include("../functions/plugin.php");
 
    include("../src/load_prefs.php");
 
@@ -34,7 +36,7 @@
    echo "   </b></TD></TR>\n";
    echo "</TABLE>\n";
 
-   if ($success) {
+   if ($success || $sent_create == "true" || $trash_create == "true") {
       echo "<table width=100% align=center cellpadding=3 cellspacing=0 border=0>\n";
       echo "   <tr><td><center>\n";
       if ($success == "subscribe") {
@@ -47,7 +49,18 @@
          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 "</table><br>\n";
@@ -55,65 +68,48 @@
    $imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0);
    $boxes = sqimap_mailbox_list($imapConnection);
 
-  /** Cyrus Folder Options**/
-//Creates the Sent and Trash folder
-   if (($sent_create == "true") || ($trash_create == "true")) {
-      if ($sent_create == "true") {
-         sqimap_mailbox_create ($imapConnection, $sent_folder, "");  
+   //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>";
       }
-   if ($trash_create == "true") {
-      sqimap_mailbox_create ($imapConnection, $trash_folder, "");
-   }
-   echo "<BR><BR><CENTER><b>";
-   echo _("Mailboxes Created Successfully!");
-   echo "<BR><A HREF=\"webmail.php?right_frame=folders.php\" TARGET=_top>";
-   echo _("Click here");
-   echo "</A> ";
-   echo _("to continue.");
-   echo "</CENTER>";
-   echo "</BODY></HTML>";
-	
-   exit;
-   }
-
-//display form option for creating Sent and Trash folder
-    if ($imap_server_type == "cyrus") {
-       if ((!sqimap_mailbox_exists ($imapConnection, $sent_folder)) || (!sqimap_mailbox_exists ($imapConnection, $trash_folder))) {
-       echo "<TABLE WIDTH=70% COLS=1 ALIGN=CENTER>\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)) {
-              echo _("Create Sent") . "<INPUT TYPE=checkbox NAME=sent_create value=true><br>\n";
-           }
-           if (!sqimap_mailbox_exists ($imapConnection, $trash_folder)){
-           echo _("Create Trash") . "<INPUT TYPE=checkbox NAME=trash_create value=true><br>\n";
-           echo "<INPUT TYPE=submit VALUE=Create>";
-           echo "</FORM></TD></TR>\n";
-           }
-       }
    }
 
    /** 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>";
+   echo "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER><B>";
    echo _("Delete Folder");
-   echo "</TD></TR>";
+   echo "</B></TD></TR>";
    echo "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>";
 
    $count_special_folders = 0;
-	$num_max = 1;
-	if ($move_to_trash)
-		$num_max++;
-	if ($move_to_sent)
-		$num_max++;
+       $num_max = 1;
+       if (strtolower($imap_server_type) == "courier" || $move_to_trash)
+               $num_max++;
+       if ($move_to_sent)
+               $num_max++;
 
-   for ($p = 0; $p < count($boxes) && $count_special_folders < $num_max; $p++) {
+   for ($p = 0; $p < count($boxes) && $count_special_folders < $num_max; $p++) {                                                                                 
       if (strtolower($boxes[$p]["unformatted"]) == "inbox")
          $count_special_folders++;
+      else if (strtolower($imap_server_type) == "courier" &&
+               strtolower($boxes[$p]["unformatted"]) == "inbox.trash")
+         $count_special_folders++;
       else if ($boxes[$p]["unformatted"] == $trash_folder && $trash_folder)
          $count_special_folders++;
       else if ($boxes[$p]["unformatted"] == $sent_folder && $sent_folder)
@@ -125,14 +121,16 @@
       echo "<TT><SELECT NAME=mailbox>\n";
       for ($i = 0; $i < count($boxes); $i++) {
          $use_folder = true;
-			if ((strtolower($boxes[$i]["unformatted"]) != "inbox") && 
-			    ($boxes[$i]["unformatted"] != $trash_folder) && 
-			    ($boxes[$i]["unformatted"] != $sent_folder)) 
-			{	
-            $box = $boxes[$i]["unformatted-dm"];
-            $box2 = replace_spaces($boxes[$i]["formatted"]);
-            echo "         <OPTION VALUE=\"$box\">$box2\n";
-         }
+	 if ((strtolower($boxes[$i]["unformatted"]) != "inbox") &&
+	     ($boxes[$i]["unformatted"] != $trash_folder) && 
+	     ($boxes[$i]["unformatted"] != $sent_folder) &&
+	     (strtolower($imap_server_type) != "courier" ||
+	      strtolower($boxes[$i]["unformatted"]) != "inbox.trash"))
+	    {
+	       $box = $boxes[$i]["unformatted-dm"];
+	       $box2 = replace_spaces($boxes[$i]["formatted"]);
+	       echo "         <OPTION VALUE=\"$box\">$box2\n";
+	    }
       }
       echo "</SELECT></TT>\n";
       echo "<INPUT TYPE=SUBMIT VALUE=\"";
@@ -140,25 +138,27 @@
       echo "\">\n";
       echo "</FORM></TD></TR>\n";
    } else {
-      echo _("No mailboxes found") . "<br><br></td><tr>";
+      echo _("No folders found") . "<br><br></td><tr>";
    }
 
    echo "<tr><td bgcolor=\"$color[4]\">&nbsp;</td></tr>\n";
 
    /** CREATING FOLDERS **/
-   echo "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER>";
+   echo "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER><B>";
    echo _("Create Folder");
-   echo "</TD></TR>";
+   echo "</B></TD></TR>";
    echo "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>";
-   echo "<FORM ACTION=\"folders_create.php\" METHOD=\"POST\">\n";
+   echo "<FORM NAME=cf ACTION=\"folders_create.php\" METHOD=\"POST\">\n";
    echo "<INPUT TYPE=TEXT SIZE=25 NAME=folder_name><BR>\n";
    echo _("as a subfolder of");
    echo "<BR>";
    echo "<TT><SELECT NAME=subfolder>\n";
-   if ($default_sub_of_inbox == false)
-      echo "<OPTION SELECTED>[ None ]\n";
-   else
-      echo "<OPTION>[ None ]\n";
+   if (strtolower($imap_server_type) != "courier"){
+     if ($default_sub_of_inbox == false)
+       echo "<OPTION SELECTED>[ None ]\n";
+     else
+       echo "<OPTION>[ None ]\n";
+   }
 
    for ($i = 0; $i < count($boxes); $i++) {
       if (count($boxes[$i]["flags"]) > 0) {
@@ -177,7 +177,9 @@
             } else {
                $box = $boxes[$i]["unformatted"];
                $box2 = replace_spaces($boxes[$i]["formatted"]);
-               echo "<OPTION VALUE=\"$box\">$box2\n";
+               if (strtolower($imap_server_type) != "courier" ||
+                  strtolower($box) != "inbox.trash")
+                echo "<OPTION VALUE=\"$box\">$box2\n";
             }
          }
       } else {
@@ -188,7 +190,9 @@
          } else {
             $box = $boxes[$i]["unformatted"];
             $box2 = replace_spaces($boxes[$i]["formatted"]);
-            echo "<OPTION VALUE=\"$box\">$box2\n";
+           if (strtolower($imap_server_type) != "courier" ||
+               strtolower($box) != "inbox.trash")
+             echo "<OPTION VALUE=\"$box\">$box2\n";
          }
       }
    }
@@ -204,9 +208,9 @@
    echo "<tr><td bgcolor=\"$color[4]\">&nbsp;</td></tr>\n";
 
    /** RENAMING FOLDERS **/
-   echo "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER>";
+   echo "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER><B>";
    echo _("Rename a Folder");
-   echo "</TD></TR>";
+   echo "</B></TD></TR>";
    echo "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>";
    if ($count_special_folders < count($boxes)) {
       echo "<FORM ACTION=\"folders_rename_getname.php\" METHOD=\"POST\">\n";
@@ -214,14 +218,15 @@
       for ($i = 0; $i < count($boxes); $i++) {
          $use_folder = true;
 
-			if ((strtolower($boxes[$i]["unformatted"]) != "inbox") && 
-			    ($boxes[$i]["unformatted"] != $trash_folder)  &&
-			    ($boxes[$i]["unformatted"] != $sent_folder)) 
-			{	
-            $box = $boxes[$i]["unformatted-dm"];
-            $box2 = replace_spaces($boxes[$i]["formatted"]);
-            echo "         <OPTION VALUE=\"$box\">$box2\n";
-         }
+	 if ((strtolower($boxes[$i]["unformatted"]) != "inbox") && 
+	     ($boxes[$i]["unformatted"] != $trash_folder)  &&
+	     ($boxes[$i]["unformatted"] != $sent_folder)) 
+	    {	
+	       $box = $boxes[$i]["unformatted-dm"];
+	       $box2 = replace_spaces($boxes[$i]["formatted"]);
+	       if (strtolower($imap_server_type) != "courier" || strtolower($box) != "inbox.trash")
+		  echo "<OPTION VALUE=\"$box\">$box2\n";
+	    }
       }
       echo "</SELECT></TT>\n";
       echo "<INPUT TYPE=SUBMIT VALUE=\"";
@@ -229,7 +234,7 @@
       echo "\">\n";
       echo "</FORM></TD></TR>\n";
    } else {
-      echo _("No mailboxes found") . "<br><br></td></tr>";
+      echo _("No folders found") . "<br><br></td></tr>";
    }
    $boxes_sub = $boxes;
 
@@ -237,23 +242,23 @@
    
    /** 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>";
+   echo "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER colspan=3><B>";
    echo _("Unsubscribe") . "/" . _("Subscribe");
-   echo "</TD></TR>";
+   echo "</B></TD></TR>";
    echo "<TR><TD BGCOLOR=\"$color[0]\" width=49% ALIGN=CENTER>";
    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";
       for ($i = 0; $i < count($boxes); $i++) {
          $use_folder = true;
-			if ((strtolower($boxes[$i]["unformatted"]) != "inbox") &&
-			    ($boxes[$i]["unformatted"] != $trash_folder) &&
-			    ($boxes[$i]["unformatted"] != $sent_folder)) 
-			{	
-            $box = $boxes[$i]["unformatted-dm"];
-            $box2 = replace_spaces($boxes[$i]["formatted"]);
-            echo "         <OPTION VALUE=\"$box\">$box2\n";
-         }
+	 if ((strtolower($boxes[$i]["unformatted"]) != "inbox") &&
+	     ($boxes[$i]["unformatted"] != $trash_folder) &&
+	     ($boxes[$i]["unformatted"] != $sent_folder)) 
+	    {	
+	       $box = $boxes[$i]["unformatted-dm"];
+	       $box2 = replace_spaces($boxes[$i]["formatted"]);
+	       echo "         <OPTION VALUE=\"$box\">$box2\n";
+	    }
       }
       echo "</SELECT></TT><br>\n";
       echo "<INPUT TYPE=SUBMIT VALUE=\"";
@@ -272,25 +277,25 @@
    $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"]) {
-					$use_folder = false;
-					continue;
-				} else if ($boxes_all[$i]["unformatted-dm"] == $folder_prefix) {
-					$use_folder = false;
-				}
-			}
-			if ($use_folder == true) {	
-            $box[$q] = $boxes_all[$i]["unformatted-dm"];
-            $box2[$q] = $boxes_all[$i]["formatted"];
-            $q++;
-         }
+   $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"]) {
+	    $use_folder = false;
+	    continue;
+	 } else if ($boxes_all[$i]["unformatted-dm"] == $folder_prefix) {
+	    $use_folder = false;
+	 }
       }
-      sqimap_logout($imap_stream);
+      if ($use_folder == true) {	
+	 $box[$q] = $boxes_all[$i]["unformatted-dm"];
+	 $box2[$q] = $boxes_all[$i]["unformatted"];
+	 $q++;
+      }
+   }
+   sqimap_logout($imap_stream);
 
    if ($box && $box2) {
       echo "<FORM ACTION=\"folders_subscribe.php?method=sub\" METHOD=\"POST\">\n";
@@ -306,6 +311,7 @@
       echo _("No folders were found to subscribe to!") . "</td></tr></table>";
    }
 
+   do_hook("folders_bottom");
    sqimap_logout($imapConnection);
 ?>
 </BODY></HTML>