Somebody messed up Czech locale name, corrected.

[squirrelmail.git] / src / left_main.php

diff --git a/src/left_main.php b/src/left_main.php
index 4bb0e0b6165f2dc373ea30c31f0a58da0b091420..f7c81b25e2652b62c9b47d20d5eac99adc0f9c7a 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -24,7 +24,9 @@
    
     displayHtmlHeader();
 
-   if ($auto_create_special && ! isset($auto_create_done)) {
+    /* If requested and not yet complete, attempt to autocreate folders. */
+    if ($auto_create_special && ! isset($auto_create_done)) {
+          /* Autocreate the sent folder, if needed. */
          if (isset ($sent_folder) && $sent_folder != 'none') {
                 if (!sqimap_mailbox_exists ($imapConnection, $sent_folder)) {
                        sqimap_mailbox_create ($imapConnection, $sent_folder, '');
@@ -32,13 +34,26 @@
                    sqimap_subscribe($imapConnection, $sent_folder);
                 }
          }
+
+          /* Autocreate the trash folder, if needed. */
          if (isset ($trash_folder) && $trash_folder != 'none') {
                 if (!sqimap_mailbox_exists ($imapConnection, $trash_folder)) {
                        sqimap_mailbox_create ($imapConnection, $trash_folder, '');
                 } else if (! sqimap_mailbox_is_subscribed($imapConnection, $trash_folder)) {
                    sqimap_subscribe($imapConnection, $trash_folder);
                 }
-   }
+          }
+
+          /* Autocreate the drafts folder, if needed. */
+          if (isset ($draft_folder) && $draft_folder != 'none') {
+                 if (!sqimap_mailbox_exists ($imapConnection, $draft_folder)) {
+                        sqimap_mailbox_create ($imapConnection, $draft_folder, '');
+                 } else if (! sqimap_mailbox_is_subscribed($imapConnection, $draft_folder)) {
+                    sqimap_subscribe($imapConnection, $draft_folder);
+                 }
+          }
+
+          /* Let the world know that autocreation is complete! Hurrah! */
          $auto_create_done = true;
          session_register('auto_create_done');
    }
@@ -47,6 +62,8 @@
       global $folder_prefix, $trash_folder, $sent_folder;
       global $color, $move_to_sent, $move_to_trash;
       global $unseen_notify, $unseen_type, $collapse_folders;
+      global $draft_folder, $save_as_draft;
+      global $use_special_folder_color;
 
       $real_box = $box_array['unformatted'];
       $mailbox = str_replace(' ','',$box_array['formatted']);
@@ -73,10 +90,14 @@
       }
       
       $special_color = false;
-      if ((strtolower($real_box) == 'inbox') ||
-          (($real_box == $trash_folder) && ($move_to_trash)) ||
-          (($real_box == $sent_folder) && ($move_to_sent)))
-         $special_color = true;
+      if ($use_special_folder_color) {
+          if ((strtolower($real_box) == 'inbox')
+                || (($real_box == $trash_folder) && ($move_to_trash))
+                || (($real_box == $sent_folder) && ($move_to_sent))
+                || (($real_box == $draft_folder) && ($save_as_draft))) {
+              $special_color = true;
+          }
+      }
          
       /* Start off with a blank line. */
       $line = '';
@@ -118,6 +139,10 @@
       return ($line);
    }
 
+   /**********************************/
+   /* END OF FUNCTION - BACK TO MAIN */
+   /**********************************/
+
     if (isset($left_refresh) && ($left_refresh != 'None') && ($left_refresh != '')) {
         echo "<META HTTP-EQUIV=\"Expires\" CONTENT=\"Thu, 01 Dec 1994 16:00:00 GMT\">\n";
         echo "<META HTTP-EQUIV=\"Pragma\" CONTENT=\"no-cache\">\n"; 
@@ -238,7 +263,7 @@
      * status and parent (or not parent) status for all children boxes.
      */
     function compute_folder_children(&$parbox, $boxcount) {
-        global $boxes;
+        global $boxes, $data_dir, $username;
         $nextbox = $parbox + 1;
 
         /* Retreive the name for the parent box. */
@@ -254,7 +279,10 @@
         $boxes[$parbox]['collapse'] = $collapse;
 
         /* Otherwise, get the name of the next box. */
-        $nextbox_name = $boxes[$nextbox]['unformatted'];
+       if (isset($boxes[$nextbox]['unformatted']))
+           $nextbox_name = $boxes[$nextbox]['unformatted'];
+       else
+          $nextbox_name = '';
 
         /* Compute any children boxes for this box. */
         while (($nextbox < $boxcount) &&
@@ -279,4 +307,4 @@
         $parbox = $nextbox;
     }
     echo "</BODY></HTML>\n";
-?>
\ No newline at end of file
+?>