X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders.php;h=ae3c89676d08a95aee16c1abe6575d69b80a6dd5;hb=6aeb566fbd0d66ec2ab7c84d6a9b18bd6af3dabe;hp=afa2203292e0b306d47e9eb17c938f3af43328ac;hpb=906f7e9fa070f6df07bd4ba8c72a9c7908039761;p=squirrelmail.git

diff --git a/src/folders.php b/src/folders.php
index afa22032..ae3c8967 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * folders.php
  *
@@ -7,7 +6,7 @@
  * scripts which do most of the work. Also handles the Special
  * Folders.
  *
- * @copyright &copy; 1999-2006 The SquirrelMail Project Team
+ * @copyright &copy; 1999-2007 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -23,7 +22,7 @@ require_once(SM_PATH . 'functions/imap_general.php');
 require_once(SM_PATH . 'functions/folder_manip.php');
 require_once(SM_PATH . 'functions/forms.php');
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 
 /* get globals we may need */
 sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
@@ -35,7 +34,6 @@ $imapConnection = sqimap_login ($username, false, $imapServerAddress, $imapPort,
 
 /* switch to the right function based on what the user selected */
 if ( sqgetGlobalVar('smaction', $action, SQ_POST) ) {
-
     switch ($action)
     {
         case 'create':
@@ -82,13 +80,18 @@ if ( sqgetGlobalVar('smaction', $action, SQ_POST) ) {
             $td_str =  _("Unsubscribed successfully.");
             break;
         default:
-            // TODO: add hook for plugin action processing.
-            $td_str = '';
+// TODO: this is a new hook for plugin action processing that has not been TESTED.
+            $td_str = do_hook('folder_action', $action);
             break;
     }
 
 }
 
+if (isset($td_str)) {
+    $oTemplate->assign('note', htmlspecialchars($td_str));
+    $oTemplate->display('note.tpl');
+}
+
 $boxes = sqimap_mailbox_list($imapConnection,true);
 
 /** CREATING FOLDERS **/
@@ -146,11 +149,13 @@ foreach ($boxes as $index => $aBoxData) {
 $rendel_folder_list = sqimap_mailbox_option_list($imapConnection, 0, $skip_folders, $boxes, NULL, true);
 
 
-$subbox_option_list = '';
+$subbox_option_list = array();
 
 if ($show_only_subscribed_folders && !$no_list_for_subscribe) {
     // FIXME: fix subscription options when top folder is not subscribed and sub folder is subscribed
+
     // TODO: use checkboxes instead of select options.
+    // DONE Steve Brown 2006-08-08
 
     /** SUBSCRIBE TO FOLDERS **/
     $boxes_all = sqimap_mailbox_list_all ($imapConnection);
@@ -159,34 +164,33 @@ if ($show_only_subscribed_folders && !$no_list_for_subscribe) {
     // so we keep only the unsubscribed ones.
     foreach ($boxes_all as $box_a) {
 
-	$use_folder = true;
-	foreach ( $boxes as $box ) {
-	    if ($box_a['unformatted'] == $box['unformatted'] ||
-		$box_a['unformatted-dm'] == $folder_prefix ) {
-		$use_folder = false;
-	    }
-	}
-
-	if ($use_folder) {
-	    $box_enc  = htmlspecialchars($box_a['unformatted-dm']);
-	    $box_disp = htmlspecialchars(imap_utf7_decode_local($box_a['unformatted-disp']));
-	    $subbox_option_list .= '<option value="' . $box_enc . '">'.$box_disp."</option>\n";
-	}
+    	$use_folder = true;
+    	foreach ( $boxes as $box ) {
+    	    if ($box_a['unformatted'] == $box['unformatted'] ||
+    		$box_a['unformatted-dm'] == $folder_prefix ) {
+    		$use_folder = false;
+    	    }
+    	}
+    
+    	if ($use_folder) {
+    	    $box_enc  = htmlspecialchars($box_a['unformatted-dm']);
+    	    $box_disp = htmlspecialchars(imap_utf7_decode_local($box_a['unformatted-disp']));
+            $subbox_option_list[] = array( 'Value' => $box_enc, 'Display' => $box_disp);
+    	}
     }
 }
 
 sqimap_logout($imapConnection);
 
-$oTemplate->assign('td_str', @$td_str);
-$oTemplate->assign('color', $color);
+$oTemplate->assign('show_subfolders_option', $show_contain_subfolders_option);
+$oTemplate->assign('show_only_subscribed_folders', $show_only_subscribed_folders==1);
+$oTemplate->assign('no_list_for_subscribe', $no_list_for_subscribe);
+
 $oTemplate->assign('mbx_option_list', $mbx_option_list);
-$oTemplate->assign('show_contain_subfolders_option', $show_contain_subfolders_option);
-$oTemplate->assign('show_only_subscribed_folders', $show_only_subscribed_folders);
 $oTemplate->assign('rendel_folder_list', $rendel_folder_list);
 $oTemplate->assign('subbox_option_list', $subbox_option_list);
-$oTemplate->assign('no_list_for_subscribe', $no_list_for_subscribe);
 
 $oTemplate->display('folder_manip.tpl');
 
 $oTemplate->display('footer.tpl');
-
+?>