adding address book sorting function

[squirrelmail.git] / src / left_main.php

diff --git a/src/left_main.php b/src/left_main.php
index dda2b3c7221c5a338e92c6eff79499ea21f225b1..24d9e4a0b66bdae02216a6dfd8491482f0777735 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -3,17 +3,20 @@
 /**
  * left_main.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.
  *
  * 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. */
@@ -101,12 +104,15 @@ function formatMailboxName($imapConnection, $box_array) {
             $line .= "\n<small>\n" .
                     "&nbsp;&nbsp;(<A HREF=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</A>)" .
                     "</small>";
-        } else {
-          $line .= concat_hook_function('left_main_after_each_folder',
-                 array(isset($numMessages) ? $numMessages : '',$real_box,$imapConnection));
         }
     }
 
+
+    // let plugins fiddle with end of line
+    $line .= concat_hook_function('left_main_after_each_folder',
+        array(isset($numMessages) ? $numMessages : '', $real_box, $imapConnection));
+
+
     /* Return the final product. */
     return ($line);
 }
@@ -167,23 +173,27 @@ function compute_folder_children(&$parbox, $boxcount) {
  * currently appropriate.
  */
 function create_collapse_link($boxnum) {
-    global $boxes, $imapConnection, $unseen_notify, $color;
+    global $boxes, $imapConnection, $unseen_notify, $color, $use_icons, $icon_theme;
     $mailbox = urlencode($boxes[$boxnum]['unformatted']);
 
     /* Create the link for this collapse link. */
     $link = '<a target="left" style="text-decoration:none" ' .
             'href="left_main.php?';
     if ($boxes[$boxnum]['collapse'] == SM_BOX_COLLAPSED) {
-        $link .= "unfold=$mailbox\">+";
+        if ($use_icons && $icon_theme != 'none') {
+            $link .= "unfold=$mailbox\"><IMG src=\"" . SM_PATH . "images/plus.png\" border=\"0\" height=\"7\" width=\"7\">";
+        } else {
+            $link .= "unfold=$mailbox\">+";
+        }
     } else {
-        $link .= "fold=$mailbox\">-";
+        if ($use_icons && $icon_theme != 'none') {
+            $link .= "fold=$mailbox\"><IMG src=\"" . SM_PATH . "images/minus.png\" border=\"0\" height=\"7\" width=\"7\">";
+        } else {
+            $link .= "fold=$mailbox\">-";
+        }
     }
     $link .= '</a>';
 
-    $hooklink = do_hook_function('create_collapse_link',$link);
-    if ($hooklink != '')
-        $link = $hooklink;
-
     /* Return the finished product. */
     return ($link);
 }
@@ -287,7 +297,8 @@ 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;
+           $move_to_trash, $trash_folder, $collapse_folders, $imapConnection, 
+           $use_icons, $icon_theme;
 
     if (!isset($boxes) || empty($boxes))
         return;
@@ -343,9 +354,17 @@ function ListBoxes ($boxes, $j=0 ) {
 
         $link = '<a target="left" style="text-decoration:none" ' .'href="left_main.php?';
         if ($collapse) {
-            $link .= "unfold=$mailboxURL\">$leader+&nbsp;</tt>";
+            if ($use_icons && $icon_theme != 'none') {
+                $link .= "unfold=$mailboxURL\">$leader<IMG src=\"" . SM_PATH . "images/plus.png\" border=\"0\" height=\"7\" width=\"7\">&nbsp;</tt>";
+            } else {
+                $link .= "unfold=$mailboxURL\">$leader+&nbsp;</tt>";
+            }
         } else {
-            $link .= "fold=$mailboxURL\">$leader-&nbsp;</tt>";
+            if ($use_icons && $icon_theme != 'none') {
+                $link .= "fold=$mailboxURL\">$leader<IMG src=\"" . SM_PATH . "images/minus.png\" border=\"0\" height=\"7\" width=\"7\">&nbsp;</tt>";
+            } else {
+                $link .= "fold=$mailboxURL\">$leader-&nbsp;</tt>";
+            }
         }
         $link .= '</a>';
         $pre .= $link;
@@ -406,6 +425,12 @@ function ListBoxes ($boxes, $j=0 ) {
         $font = "<font color=\"$color[11]\">";
         $fontend = "</font>";
     }
+
+    // let plugins fiddle with end of line
+    $end .= concat_hook_function('left_main_after_each_folder',
+        array(isset($numMessages) ? $numMessages : '', 
+              $boxes->mailboxname_full, $imapConnection));
+
     $end .= '</nobr>';
 
     if (!$boxes->is_root) {
@@ -509,6 +534,12 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
         }
     }
 
+    // let plugins fiddle with end of line
+    global $imapConnection;
+    $end .= concat_hook_function('left_main_after_each_folder',
+        array(isset($numMessages) ? $numMessages : '', 
+              $boxes->mailboxname_full, $imapConnection));
+
     if (!$boxes->is_root) {
         if ($use_folder_images) {
             if ($boxes->is_inbox) {
@@ -951,6 +982,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;