[SM-CVS] CVS: squirrelmail/src folders.php,1.148,1.149

[Steve B. <ste...@us...>]

Update of /cvsroot/squirrelmail/squirrelmail/src
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21019/src

Modified Files:
	folders.php 
Log Message:
Add CSS support to folder manipulation templates.  Also make subscribe folder list checkboxes rather than select per TODO in folders.php

Index: folders.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/folders.php,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -w -r1.148 -r1.149
--- folders.php	5 Aug 2006 14:39:15 -0000	1.148
+++ folders.php	9 Aug 2006 18:01:21 -0000	1.149
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * folders.php
  *
@@ -35,7 +34,6 @@
 
 /* switch to the right function based on what the user selected */
 if ( sqgetGlobalVar('smaction', $action, SQ_POST) ) {
-
     switch ($action)
     {
         case 'create':
@@ -89,6 +87,11 @@
 
 }
 
+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 @@
 $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);
@@ -170,23 +175,22 @@
 	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";
+            $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');
-
+?>
\ No newline at end of file