stupid error in checking the newsort value, also check if it validates as

[squirrelmail.git] / src / left_main.php

diff --git a/src/left_main.php b/src/left_main.php
index 83175f63ae67eaf741072c6deb4ff675ddadea95..39c3b9d89143d8e83205053d587be3f19c4fcc2b 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -9,11 +9,14 @@
  * This is the code for the left bar. The left bar shows the folders
  * available, and has cookie information.
  *
- * $Id$
+ * @version $Id$
  * @package squirrelmail
  */
 
-/** Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
@@ -74,7 +77,7 @@ function formatMailboxName($imapConnection, $box_array) {
     if ( $mailbox == 'INBOX' ) {
         $line .= _("INBOX");
     } else {
-        $line .= str_replace(' ',' ',$mailbox);
+        $line .= str_replace(array(' ','<','>'),array('&nbsp;','&lt;','&gt;'),$mailbox);
     }
     if ($special_color == TRUE)
         $line .= '</font>';
@@ -295,7 +298,7 @@ function is_parent_box($curbox_name, $parbox_name) {
 function ListBoxes ($boxes, $j=0 ) {
     global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type,
            $move_to_trash, $trash_folder, $collapse_folders, $imapConnection, 
-           $use_icons, $icon_theme;
+           $use_icons, $icon_theme, $use_special_folder_color;
 
     if (!isset($boxes) || empty($boxes))
         return;
@@ -418,7 +421,7 @@ function ListBoxes ($boxes, $j=0 ) {
 
     $font = '';
     $fontend = '';
-    if ($boxes->is_special) {
+    if ($use_special_folder_color && $boxes->is_special) {
         $font = "<font color=\"$color[11]\">";
         $fontend = "</font>";
     }
@@ -431,7 +434,7 @@ function ListBoxes ($boxes, $j=0 ) {
     $end .= '</nobr>';
 
     if (!$boxes->is_root) {
-        echo "" . $pre .$font. $boxes->mailboxname_sub .$fontend . $end. '<br />' . "\n";
+        echo "" . $pre .$font. str_replace(array(' ','<','>'),array('&nbsp;','&lt;','&gt;'),$boxes->mailboxname_sub) .$fontend . $end. '<br />' . "\n";
         $j++;
     }
 
@@ -444,7 +447,7 @@ function ListBoxes ($boxes, $j=0 ) {
 
 function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
     global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type,
-           $move_to_trash, $trash_folder, $collapse_folders;
+           $move_to_trash, $trash_folder, $collapse_folders, $use_special_folder_color;
 
     if (!isset($boxes) || empty($boxes))
         return;
@@ -499,7 +502,7 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
     if ($unseen > 0) { $pre .= '<b>'; }
 
     /* color special boxes */
-    if ($boxes->is_special) {
+    if ($use_special_folder_color && $boxes->is_special) {
         $pre .= "<font color=\"$color[11]\">";
         $end .= '</font>';
     }
@@ -558,7 +561,7 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
         }
         if (!isset($boxes->mbxs[0])) {
             echo '   ' . html_tag( 'div',
-                            '<tt>'. $pre . $folder_img . '</tt>'. $boxes->mailboxname_sub . $end,
+                            '<tt>'. $pre . $folder_img . '</tt>'. str_replace(array(' ','<','>'),array('&nbsp;','&lt;','&gt;'),$boxes->mailboxname_sub) . $end,
                             'left', '', 'class="mbx_sub" id="' .$j. '"' ) . "\n";
         } else {
             /* get collapse information */
@@ -921,7 +924,7 @@ ECHO;
 }
 
 displayHtmlHeader( 'SquirrelMail', $xtra );
-
+sqgetGlobalVar('auto_create_done',$auto_create_done,SQ_SESSION);
 /* If requested and not yet complete, attempt to autocreate folders. */
 if ($auto_create_special && !isset($auto_create_done)) {
     $autocreate = array($sent_folder, $trash_folder, $draft_folder);
@@ -929,8 +932,11 @@ if ($auto_create_special && !isset($auto_create_done)) {
         if (($folder != '') && ($folder != 'none')) {
             if ( !sqimap_mailbox_exists($imapConnection, $folder)) {
                 sqimap_mailbox_create($imapConnection, $folder, '');
-            } else if (!sqimap_mailbox_is_subscribed($imapConnection, $folder)) {
-                sqimap_subscribe($imapConnection, $folder);
+            } else {
+                //if (!sqimap_mailbox_is_subscribed($imapConnection, $folder)) {
+                // check for subscription is useless and expensive  just 
+                // surpress the NO response
+                sqimap_subscribe($imapConnection, $folder, false);
             }
         }
     }
@@ -979,6 +985,9 @@ if ($date_format != 6) {
     }
 
     switch( $date_format ) {
+    case 0:
+       $clk = date('Y-m-d '.$hr. ' T', time());
+       break;
     case 1:
         $clk = date('m/d/y '.$hr, time());
         break;