X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders.php;h=cc1fc279b90176b81929929231230dcff095284c;hb=0d8a462c52d74cd93af7376ae5bbc994f4699054;hp=866f9d42aebf733566e8538ed10e91f851baf8f8;hpb=1d80c108a1d741b7dcb562ea1cf6d2214322b192;p=squirrelmail.git

diff --git a/src/folders.php b/src/folders.php
index 866f9d42..cc1fc279 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -3,18 +3,21 @@
 /**
  * folders.php
  *
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Handles all interaction between the user and the other folder
  * scripts which do most of the work. Also handles the Special
  * Folders.
  *
- * $Id$
+ * @version $Id$
  * @package squirrelmail
  */
 
-/** Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
@@ -22,6 +25,7 @@ require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'functions/plugin.php');
 require_once(SM_PATH . 'functions/html.php');
+require_once(SM_PATH . 'functions/forms.php');
 
 displayPageHeader($color, 'None');
 
@@ -36,7 +40,7 @@ sqgetGlobalVar('success', $success, SQ_GET);
 
 /* end of get globals */
 
-echo '<br>' .
+echo '<br />' .
     html_tag( 'table', '', 'center', $color[0], 'width="95%" cellpadding="1" cellspacing="0" border="0"' ) .
         html_tag( 'tr' ) .
             html_tag( 'td', '', 'center' ) . '<b>' . _("Folders") . '</b>' .
@@ -70,33 +74,23 @@ if ( isset($success) && $success ) {
             break;
     }
 
-    $td_str .= '</b><br>';        
-
-    if (isset($use_frames) && $use_frames) {
-        echo html_tag( 'table',
-                    html_tag( 'tr',
-                         html_tag( 'td', $td_str .
-                                   '<a href="' . SM_PATH . 'src/left_main.php" target=left>' .
-                                   _("refresh folder list") . '</a>' ,
-                         'center' )
-                    ) ,
-                'center', '', 'width="100%" cellpadding="4" cellspacing="0" border="0"' );
-    } else { 
-        echo html_tag( 'table',
-                    html_tag( 'tr',
-                         html_tag( 'td', $td_str .
-                                   '<a href="' . SM_PATH . 'src/folders.php">' .
-                                   _("refresh folder list") . '</a>' ,
-                         'center' )
-                    ) ,
-                'center', '', 'width="100%" cellpadding="4" cellspacing="0" border="0"' );
-    }
+    $td_str .= '</b><br />';
+
+
+    echo html_tag( 'table',
+                html_tag( 'tr',
+                     html_tag( 'td', $td_str .
+                               '<a href="../src/left_main.php" target="left">' .
+                               _("refresh folder list") . '</a>' ,
+                     'center' )
+                ) ,
+            'center', '', 'width="100%" cellpadding="4" cellspacing="0" border="0"' );
 }
 
-echo "\n<br>";
+echo "\n<br />";
 
 $imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0);
-$boxes = sqimap_mailbox_list($imapConnection);
+$boxes = sqimap_mailbox_list($imapConnection,true);
 
 /** CREATING FOLDERS **/
 echo html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="4" cellspacing="0" border="0"' ) .
@@ -105,12 +99,10 @@ echo html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="4" cellspaci
             ) .
             html_tag( 'tr' ) .
                 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".
-     _("as a subfolder of").
-     '<BR>'.
-     "<TT><SELECT NAME=subfolder>\n";
+     addForm('folders_create.php', 'POST', 'cf').
+     addInput('folder_name', '', 25).
+     "<br />\n". _("as a subfolder of"). '<br />'.
+     "<tt><select name=\"subfolder\">\n";
 
 $show_selected = array();
 $skip_folders = array();
@@ -123,9 +115,9 @@ if ( $server_type == 'courier' ) {
 }
 
 if ( $default_sub_of_inbox == false ) {
-    echo '<OPTION SELECTED VALUE="">[ '._("None")." ]\n";
+    echo '<option selected="selected" value="">[ '._("None")." ]</option>\n";
 } else {
-    echo '<OPTION VALUE="">[ '._("None")." ]\n";
+    echo '<option value="">[ '._("None")." ]</option>\n";
     $show_selected = array('inbox');
 }
 
@@ -135,14 +127,15 @@ if ( $default_sub_of_inbox == false ) {
 // use the long format to show subfolders in an intelligible way if parent is missing (special folder)
 echo sqimap_mailbox_option_list($imapConnection, $show_selected, $skip_folders, $boxes, 'noinferiors', true);
 
-echo "</SELECT></TT>\n";
+echo "</select></tt>\n";
 if ($show_contain_subfolders_option) {
-    echo '<br><input type=CHECKBOX NAME="contain_subs"> &nbsp;'
+    echo '<br />'.
+         addCheckBox('contain_subs', FALSE, '1') .' &nbsp;'
        . _("Let this folder contain subfolders")
-       . '<BR>';
+       . '<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] )
@@ -166,32 +159,31 @@ if ($save_as_draft) {
 // What if move_to_sent = false and $sent_folder is set? Should it still be skipped?
 
 for ($p = 0, $cnt = count($boxes); $p < $cnt && $count_special_folders < $num_max; $p++) {
-    switch ($boxes[$p]['unformatted'])
-    {
-       case (strtoupper($boxes[$p]['unformatted']) == 'INBOX'):
-          ++$count_special_folders;
-	  $skip_folders[] = $boxes[$p]['unformatted'];
-	  break;
-       // FIX ME inbox.trash should be set in conf.pl
-       case 'inbox.trash':
-          if (strtolower($imap_server_type) == 'courier') {
-	      ++$count_special_folders;
-	  }
-	  break;
-       case $trash_folder:
-           ++$count_special_folders;
-           $skip_folders[] = $trash_folder;
-	   break;
-       case $sent_folder:
-           ++$count_special_folders;
-           $skip_folders[] = $sent_folder;
-	   break;
-       case $draft_folder:
-           ++$count_special_folders;
-           $skip_folders[] = $draft_folder;
-	   break;
-       default: break;
-    }	  
+    switch ($boxes[$p]['unformatted']) {
+        case (strtoupper($boxes[$p]['unformatted']) == 'INBOX'):
+            ++$count_special_folders;
+            $skip_folders[] = $boxes[$p]['unformatted'];
+            break;
+        // FIX ME inbox.trash should be set in conf.pl
+        case 'inbox.trash':
+            if (strtolower($imap_server_type) == 'courier') {
+                ++$count_special_folders;
+            }
+            break;
+        case $trash_folder:
+            ++$count_special_folders;
+            $skip_folders[] = $trash_folder;
+            break;
+        case $sent_folder:
+            ++$count_special_folders;
+            $skip_folders[] = $sent_folder;
+            break;
+        case $draft_folder:
+            ++$count_special_folders;
+            $skip_folders[] = $draft_folder;
+            break;
+        default: break;
+    }
 }
 
 
@@ -203,9 +195,9 @@ echo html_tag( 'tr',
         html_tag( 'td', '', 'center', $color[0] );
 
 if ($count_special_folders < count($boxes)) {
-    echo "<FORM ACTION=\"folders_rename_getname.php\" METHOD=\"POST\">\n"
-       . "<TT><SELECT NAME=old>\n"
-       . '         <OPTION VALUE="">[ ' . _("Select a folder") . " ]</OPTION>\n";
+    echo addForm('folders_rename_getname.php')
+       . "<tt><select name=\"old\">\n"
+       . '         <option value="">[ ' . _("Select a folder") . " ]</option>\n";
 
     // use existing IMAP connection, we have no special values to show, 
     // but we do include values to skip. Use the pre-created $boxes to save an IMAP query.
@@ -213,13 +205,13 @@ if ($count_special_folders < count($boxes)) {
     // use long format to make sure folder names make sense when parents may be missing.
     echo sqimap_mailbox_option_list($imapConnection, 0, $skip_folders, $boxes, NULL, true);
 
-    echo "</SELECT></TT>\n".
-         "<input type=SUBMIT VALUE=\"".
+    echo "</select></tt>\n".
+         '<input type="submit" value="'.
          _("Rename").
-         "\">\n".
-         "</FORM></td></tr>\n";
+         "\" />\n".
+         "</form></td></tr>\n";
 } else {
-    echo _("No folders found") . '<br><br></td></tr>';
+    echo _("No folders found") . '<br /><br /></td></tr>';
 }
 $boxes_sub = $boxes;
 
@@ -235,21 +227,21 @@ echo html_tag( 'tr',
         html_tag( 'td', '', 'center', $color[0] );
 
 if ($count_special_folders < count($boxes)) {
-    echo "<FORM ACTION=\"folders_delete.php\" METHOD=\"POST\">\n"
-       . "<TT><SELECT NAME=mailbox>\n"
-       . '         <OPTION VALUE="">[ ' . _("Select a folder") . " ]</OPTION>\n";
+    echo addForm('folders_delete.php')
+       . "<tt><select name=\"mailbox\">\n"
+       . '         <option value="">[ ' . _("Select a folder") . " ]</option>\n";
 
     // send NULL for the flag - ALL folders are eligible for delete (except what we've got in skiplist)
     // use long format to make sure folder names make sense when parents may be missing.
     echo sqimap_mailbox_option_list($imapConnection, 0, $skip_folders, $boxes, NULL, true);
 
-    echo "</SELECT></TT>\n"
-       . '<input type=SUBMIT VALUE="'
+    echo "</select></tt>\n"
+       . '<input type="submit" value="'
        . _("Delete")
-       . "\">\n"
+       . "\" />\n"
        . "</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',
@@ -266,8 +258,8 @@ echo html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="4" cellspaci
                 html_tag( 'td', '', 'center', $color[0], 'width="50%"' );
 
 if ($count_special_folders < count($boxes)) {
-    echo "<FORM ACTION=\"folders_subscribe.php?method=unsub\" METHOD=\"POST\">\n"
-       . "<TT><SELECT NAME=\"mailbox[]\" multiple size=8>\n";
+    echo addForm('folders_subscribe.php?method=unsub')
+       . "<tt><select name=\"mailbox[]\" multiple=\"multiple\" size=\"8\">\n";
     for ($i = 0; $i < count($boxes); $i++) {
         $use_folder = true;
         if ((strtolower($boxes[$i]["unformatted"]) != "inbox") &&
@@ -277,14 +269,14 @@ if ($count_special_folders < count($boxes)) {
             $box = htmlspecialchars($boxes[$i]["unformatted-dm"]);
             $box2 = str_replace(' ', '&nbsp;',
                                 htmlspecialchars(imap_utf7_decode_local($boxes[$i]["unformatted-disp"])));
-            echo "         <OPTION VALUE=\"$box\">$box2\n";
+            echo "         <option value=\"$box\">$box2</option>\n";
         }
     }
-    echo "</SELECT></TT><br><br>\n"
-       . '<input type=SUBMIT VALUE="'
+    echo "</select></tt><br /><br />\n"
+       . '<input type="submit" value="'
        . _("Unsubscribe")
-       . "\">\n"
-       . "</FORM></td>\n";
+       . "\" />\n"
+       . "</form></td>\n";
 } else {
     echo _("No folders were found to unsubscribe from!") . '</td>';
 }
@@ -314,37 +306,34 @@ if(!$no_list_for_subscribe) {
     }
   }
   if ($box && $box2) {
-    echo "<FORM ACTION=\"folders_subscribe.php?method=sub\" METHOD=\"POST\">\n"
-       . '<tt><select name="mailbox[]" multiple size=8>';
+    echo addForm('folders_subscribe.php?method=sub')
+       . '<tt><select name="mailbox[]" multiple="multiple" size="8">';
 
     for ($q = 0; $q < count($box); $q++) {      
-       echo "         <OPTION VALUE=\"$box[$q]\">".$box2[$q]."\n";
+       echo '         <option value="' . $box[$q] . '">'.$box2[$q]."</option>\n";
     }      
-    echo '</select></tt><br><br>'
-       . '<input type=SUBMIT VALUE="'. _("Subscribe") . "\">\n"
-       . "</FORM></td></tr></table><BR>\n";
+    echo '</select></tt><br /><br />'
+       . '<input type="submit" value="'. _("Subscribe") . "\" />\n"
+       . "</form></td></tr></table><br />\n";
   } 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"
-     . _("Subscribe to:") . '<br>'
-     . '<tt><input type="text" name="mailbox[]" size=35>'
-     . '<INPUT TYPE=SUBMIT VALUE="'. _("Subscribe") . "\">\n"
-     . "</FORM></TD></TR></TABLE><BR>\n";
+  echo addForm('folders_subscribe.php?method=sub')
+     . _("Subscribe to:") . '<br />'
+     . '<tt><input type="text" name="mailbox[]" size="35" />'
+     . '<input type="submit" value="'. _("Subscribe") . "\" />\n"
+     . "</form></td></tr></table><br />\n";
 }
 
 do_hook('folders_bottom');
 ?>
-
     </td></tr>
     </table>
-
 </td></tr>
 </table>
-
 <?php
    sqimap_logout($imapConnection);
-   noframes_bottom();
-?>
\ No newline at end of file
+?>
+</body></html>