projects / squirrelmail.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fixed the position of the + or - for collapsable folders.
[squirrelmail.git] / src / left_main.php
diff --git a/src/left_main.php b/src/left_main.php
index 2eabf0b77c67dc39b2ef671698566db7475fc7af..db51de2777a7b6365bf573e870d6a6d6859a560b 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -10,58 +10,49 @@
     **  $Id$
     **/
 
-   session_start();
-
-   if (!isset($i18n_php))
-      include ("../functions/i18n.php");
-
-   if(!isset($username)) {
-      set_up_language($squirrelmail_language, true);
-         include ("../themes/default_theme.php");
-         printf('<html><BODY TEXT="%s" BGCOLOR="%s" LINK="%s" VLINK="%s" ALINK="%s">',
-                         $color[8], $color[4], $color[7], $color[7], $color[7]);
-         echo "</body></html>";
-      exit;
-   }
-
-
-   if (!isset($strings_php))
-      include("../functions/strings.php");
-   if (!isset($config_php))
-      include("../config/config.php");
-   if (!isset($array_php))
-      include("../functions/array.php");
-   if (!isset($imap_php))
-      include("../functions/imap.php");
-   if (!isset($page_header_php))
-      include("../functions/page_header.php");
-   if (!isset($i18n_php))
-      include("../functions/i18n.php");
-   if (!isset($plugin_php))
-      include("../functions/plugin.php");
+   include('../src/validate.php');
+   include("../functions/array.php");
+   include("../functions/imap.php");
+   include("../functions/plugin.php");
 
    // open a connection on the imap port (143)
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10); // the 10 is to hide the output
-
-   /** If it was a successful login, lets load their preferences **/
-   include("../src/load_prefs.php");
-
+   
    displayHtmlHeader();
 
+   if ($auto_create_special && ! isset($auto_create_done)) {
+         if (isset ($sent_folder) && $sent_folder != "none") {
+                if (!sqimap_mailbox_exists ($imapConnection, $sent_folder)) {
+                       sqimap_mailbox_create ($imapConnection, $sent_folder, "");
+                } else if (! sqimap_mailbox_is_subscribed($imapConnection, $sent_folder)) {
+                   sqimap_subscribe($imapConnection, $sent_folder);
+                }
+         }
+         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);
+                }
+   }
+         $auto_create_done = true;
+         session_register('auto_create_done');
+   }
+
    function formatMailboxName($imapConnection, $box_array, $delimeter) {
       global $folder_prefix, $trash_folder, $sent_folder;
       global $color, $move_to_sent, $move_to_trash;
       global $unseen_notify, $unseen_type, $collapse_folders;
 
       $real_box = $box_array['unformatted'];
-      $mailbox = $box_array['formatted'];
+      $mailbox = str_replace('&nbsp;',' ',$box_array['formatted']);
       $mailboxURL = urlencode($real_box);
       
       $unseen = 0;
-      
+
       if (($unseen_notify == 2 && $real_box == "INBOX") ||
           $unseen_notify == 3) {
-        $unseen = sqimap_unseen_messages($imapConnection, $numUnseen, $real_box);
+         $unseen = sqimap_unseen_messages($imapConnection, $real_box);
          if ($unseen_type == 1 && $unseen > 0) {
             $unseen_string = "($unseen)";
             $unseen_found = true;
@@ -74,34 +65,32 @@
       
       $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;
-        
+          (($real_box == $trash_folder) && ($move_to_trash)) ||
+          (($real_box == $sent_folder) && ($move_to_sent)))
+         $special_color = true;
+         
       $spaces = '';
       $line = "<NOBR>";
-      if (ereg("^( *)([^ ]*)$", $mailbox, $regs))
-      {
+      if (ereg("^( *)([^ ]*)$", $mailbox, $regs)) {
           $spaces = $regs[1];
-         $mailbox = $regs[2];
+          $mailbox = $regs[2];
       }
       
       if ($unseen > 0)
           $line .= "<B>";
       $line .= str_replace(' ', '&nbsp;', $spaces);
       
-      if ($collapse_folders)
-      {
+      if ($collapse_folders) {
          if (isset($box_array['parent']))
-           $line .= FoldLink($box_array['unformatted'], $box_array['parent']);
+            $line .= FoldLink($box_array['unformatted'], $box_array['parent']);
          else
-            $line .= '&nbsp;&nbsp;';
+            $line .= '<tt>&nbsp;</tt>&nbsp;';
       }
-         
+      
       $line .= "<a href=\"right_main.php?sort=0&startMessage=1&mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
       if ($special_color == true)
          $line .= "<FONT COLOR=\"$color[11]\">";
-      $line .= str_replace(' ', '&nbsp;', $mailbox);
+      $line .= str_replace(' ','&nbsp;',$mailbox);
       if ($special_color == true)
          $line .= "</font>";
       $line .= "</a>";
@@ -114,10 +103,16 @@
       }
 
       if (($move_to_trash == true) && ($real_box == $trash_folder)) {
-         $urlMailbox = urlencode($real_box);
-         $line .= "\n<small>\n";
-         $line .= " &nbsp; (<B><A HREF=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</A></B>)";
-         $line .= "\n</small>\n";
+         if (! isset($numMessages))
+            $numMessages = sqimap_get_num_messages($imapConnection, $real_box);
+
+         if ($numMessages > 0)
+         {
+            $urlMailbox = urlencode($real_box);
+            $line .= "\n<small>\n";
+            $line .= " &nbsp; (<B><A HREF=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</A></B>)";
+            $line .= "\n</small>\n";
+         }
       }
       $line .= "</NOBR>";
       return $line;
@@ -143,26 +138,23 @@
    echo "</A>)</small></CENTER><BR>";
    $delimeter = sqimap_get_delimiter($imapConnection);
 
-   if ($collapse_folders)
-   {
+   if (isset($collapse_folders) && $collapse_folders) {
       if (isset($fold))
          setPref($data_dir, $username, 'collapse_folder_' . $fold, 1);
       if (isset($unfold))
          setPref($data_dir, $username, 'collapse_folder_' . $unfold, 0);
       $IAmAParent = array();
-      for ($i = 0; $i < count($boxes); $i ++)
-      {
+      for ($i = 0; $i < count($boxes); $i ++) {
           $parts = explode($delimeter, $boxes[$i]['unformatted']);
-         $box_name = array_pop($parts);
-         $box_parent = implode($delimeter, $parts);
-         $hidden = 0;
-         if (isset($box_parent))
-         {
-             $hidden = getPref($data_dir, $username, 
-                 'collapse_folder_' . $box_parent);
-             $IAmAParent[$box_parent] = $hidden;
-         }
-         $boxes[$i]['folded'] = $hidden;
+          $box_name = array_pop($parts);
+          $box_parent = implode($delimeter, $parts);
+          $hidden = 0;
+          if (isset($box_parent)) {
+              $hidden = getPref($data_dir, $username, 
+                  'collapse_folder_' . $box_parent);
+              $IAmAParent[$box_parent] = $hidden;
+          }
+          $boxes[$i]['folded'] = $hidden;
       }
    }
 
@@ -172,22 +164,19 @@
          $line = "";
          $mailbox = $boxes[$i]["formatted"];
 
-         if ($collapse_folders && 
-            isset($IAmAParent[$boxes[$i]['unformatted']]))
-         {
-           $boxes[$i]['parent'] = $IAmAParent[$boxes[$i]['unformatted']];
+         if (isset($collapse_folders) && $collapse_folders && isset($IAmAParent[$boxes[$i]['unformatted']])) {
+            $boxes[$i]['parent'] = $IAmAParent[$boxes[$i]['unformatted']];
          }
 
          if (in_array('noselect', $boxes[$i]['flags'])) {
             $line .= "<FONT COLOR=\"$color[10]\">";
-           if (ereg("^([\\s]*)([^\\s]*)$", $mailbox, $regs))
-           {
-               $line .= str_replace(' ', '&nbsp;', $regs[1]);
-               if ($boxes[$i]['parent'])
-                   $line .= FoldLink($boxes[$i]['unformatted'], 
-                       $boxes[$i]['parent']);
-               $line .= str_replace(' ', '&nbsp;', $regs[2]);
-           }
+            if (ereg("^( *)([^ ]*)", $mailbox, $regs)) {
+                $line .= str_replace(' ', '&nbsp;', $mailbox);
+                if (isset($boxes[$i]['parent']))
+                    $line .= FoldLink($boxes[$i]['unformatted'], $boxes[$i]['parent']);
+                elseif ($collapse_folders)
+                    $line .= '<tt>&nbsp;</tt>&nbsp;';
+            }
             $line .= '</FONT>';
          } else {
             $line .= formatMailboxName($imapConnection, $boxes[$i], $delimeter);
@@ -198,18 +187,16 @@
    sqimap_logout($imapConnection);
    do_hook("left_main_after");
 
-
-
-   function FoldLink($mailbox, $folded)
-   {
+   function FoldLink($mailbox, $folded) {
        $mailbox = urlencode($mailbox);
-       echo '<tt><a target="left" style="text-decoration:none" ';
-       echo 'href="left_main.php?';
+       $link = '<tt><a target="left" style="text-decoration:none" ';
+       $link .= 'href="left_main.php?';
        if ($folded)
-           echo "unfold=$mailbox\">+";
+           $link .= "unfold=$mailbox\">+";
        else
-           echo "fold=$mailbox\">-";
-       echo '</a></tt>&nbsp;';
+           $link .= "fold=$mailbox\">-";
+       $link .= '</a></tt>&nbsp;';
+       return ($link);
    }
    
 ?>
Unnamed repository; edit this file 'description' to name the repository.