X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fleft_main.php;h=187b1ef19f99068178205018a071b80e21f9c67f;hp=12efed216be10aac3495a6ef48682ddfff576c8b;hb=0210ab4da65e25ee6873ec15fe6b6aedbfad6677;hpb=386e556f84e68c5cca3b936456f36473ad7c70a3

diff --git a/src/left_main.php b/src/left_main.php
index 12efed21..187b1ef1 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -12,11 +12,16 @@
  * $Id$
  */
 
-require_once('../src/validate.php');
-require_once('../functions/array.php');
-require_once('../functions/imap.php');
-require_once('../functions/plugin.php');
-require_once('../functions/page_header.php');
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/array.php');
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/plugin.php');
+require_once(SM_PATH . 'functions/page_header.php');
+require_once(SM_PATH . 'functions/html.php');
 
 /* These constants are used for folder stuff. */
 define('SM_BOX_UNCOLLAPSED', 0);
@@ -41,22 +46,8 @@ function formatMailboxName($imapConnection, $box_array) {
         $mailbox = $regs[2];
     }
 
-    $unseen = 0;
-
-    if (($unseen_notify == 2 && $real_box == 'INBOX') ||
-        $unseen_notify == 3) {
-        $unseen = sqimap_unseen_messages($imapConnection, $real_box);
-        if ($unseen_type == 1 && $unseen > 0) {
-            $unseen_string = "($unseen)";
-            $unseen_found = TRUE;
-        } else if ($unseen_type == 2) {
-            $numMessages = sqimap_get_num_messages($imapConnection, $real_box);
-            $unseen_string = "<font color=\"$color[11]\">($unseen/$numMessages)</font>";
-            $unseen_found = TRUE;
-        }
-    }
-
-    $special_color = ($use_special_folder_color && isSpecialMailbox( $real_box ) );
+    list($unseen_string, $unseen) = create_unseen_string($real_box, $box_array, $imapConnection);
+    $special_color = ($use_special_folder_color && isSpecialMailbox($real_box));
 
     /* Start off with a blank line. */
     $line = '';
@@ -64,10 +55,12 @@ function formatMailboxName($imapConnection, $box_array) {
     /* If there are unseen message, bold the line. */
     if ($unseen > 0) { $line .= '<B>'; }
 
-    /* Crate the link for this folder. */
-    $line .= "<A HREF=\"right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" TARGET=\"right\" STYLE=\"text-decoration:none\">";
+    /* Create the link for this folder. */
+    $line .= '<a href="right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox='.
+             $mailboxURL.'" TARGET="right" STYLE="text-decoration:none">';
+
     if ($special_color) {
-        $line .= "<FONT COLOR=\"$color[11]\">";
+        $line .= "<font color=\"$color[11]\">";
     }
     if ( $mailbox == 'INBOX' ) {
         $line .= _("INBOX");
@@ -75,14 +68,14 @@ function formatMailboxName($imapConnection, $box_array) {
         $line .= str_replace(' ','&nbsp;',$mailbox);
     }
     if ($special_color == TRUE)
-        $line .= "</FONT>";
-    $line .= '</A>';
+        $line .= '</font>';
+    $line .= '</a>';
 
     /* If there are unseen message, close bolding. */
     if ($unseen > 0) { $line .= "</B>"; }
 
     /* Print unseen information. */
-    if (isset($unseen_found) && $unseen_found) {
+    if ($unseen_string != '') {
         $line .= "&nbsp;<SMALL>$unseen_string</SMALL>";
     }
 
@@ -159,9 +152,9 @@ function compute_folder_children(&$parbox, $boxcount) {
  * currently appropriate.
  */
 function create_collapse_link($boxnum) {
-    global $boxes;
+    global $boxes, $imapConnection, $unseen_notify, $color;
     $mailbox = urlencode($boxes[$boxnum]['unformatted']);
-
+        
     /* Create the link for this collapse link. */
     $link = '<a target="left" style="text-decoration:none" ' .
             'href="left_main.php?';
@@ -176,6 +169,84 @@ function create_collapse_link($boxnum) {
     return ($link);
 }
 
+/**
+ * create_unseen_string:
+ *
+ * Create unseen and total message count for both this folder and
+ * it's subfolders.
+ *
+ * @param string $boxName name of the current mailbox
+ * @param array $boxArray array for the current mailbox
+ * @param $imapConnection current imap connection in use
+ * @return array[0] unseen message string (for display)
+ * @return array[1] unseen message count
+ */
+function create_unseen_string($boxName, $boxArray, $imapConnection) {
+    global $boxes, $unseen_type, $color;
+
+    /* Initialize the return value. */
+    $result = array(0,0);
+
+    /* Initialize the counts for this folder. */
+    $boxUnseenCount = 0;
+    $boxMessageCount = 0;
+    $totalUnseenCount = 0;
+    $totalMessageCount = 0;
+
+    /* Collect the counts for this box alone. */
+    $boxUnseenCount = sqimap_unseen_messages($imapConnection, $boxName);
+    if ($unseen_type == 2) {
+        $boxMessageCount = sqimap_get_num_messages($imapConnection, $boxName);
+    }
+
+    /* Initialize the total counts. */
+
+    if ($boxArray['collapse'] == SM_BOX_COLLAPSED) {
+        /* Collect the counts for this boxes subfolders. */
+        $curBoxLength = strlen($boxName);
+        $boxCount = count($boxes);
+
+        for ($i = 0; $i < $boxCount; ++$i) {
+            /* Initialize the counts for this subfolder. */
+            $subUnseenCount = 0;
+            $subMessageCount = 0;
+
+            /* Collect the counts for this subfolder. */
+            if (($boxName != $boxes[$i]['unformatted'])
+                   && (substr($boxes[$i]['unformatted'], 0, $curBoxLength) == $boxName)
+                   && !in_array('noselect', $boxes[$i]['flags'])) {
+                $subUnseenCount = sqimap_unseen_messages($imapConnection, $boxes[$i]['unformatted']);
+                if ($unseen_type == 2) {
+                    $subMessageCount = sqimap_get_num_messages($imapConnection, $boxes[$i]['unformatted']);
+                }
+
+                /* Add the counts for this subfolder to the total. */
+                $totalUnseenCount += $subUnseenCount;
+                $totalMessageCount += $subMessageCount;
+            }
+        }
+
+        /* Add the counts for all subfolders to that of the box. */
+        $boxUnseenCount += $totalUnseenCount;
+        $boxMessageCount += $totalMessageCount;
+    }
+
+    /* And create the magic unseen count string.     */
+    /* Really a lot more then just the unseen count. */
+    if (($unseen_type == 1) && ($boxUnseenCount > 0)) {
+        $result[0] = "($boxUnseenCount)";
+    } else if ($unseen_type == 2) {
+        $result[0] = "($boxUnseenCount/$boxMessageCount)";
+        $result[0] = "<font color=\"$color[11]\">$result[0]</font>";
+    }
+
+    /* Set the unseen count to return to the outside world. */
+    $result[1] = $boxUnseenCount;
+
+    /* Return our happy result. */
+    return ($result);
+}
+
 /**
  * This simple function checks if a box is another box's parent.
  */
@@ -252,7 +323,7 @@ function listBoxes ($boxes, $j=0 ) {
     	    }
 	} else {
 	    if (!$boxes->is_noselect) {
-		$pre .= "<A HREF=\"right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" TARGET=\"right\" STYLE=\"text-decoration:none\">";
+		$pre .= "<a HREF=\"right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" TARGET=\"right\">";
 		$end .= '</a>';
 	    }
 	}
@@ -285,12 +356,12 @@ function listBoxes ($boxes, $j=0 ) {
     }
 }
 
-function ListAdvancedBoxes ($boxes, $mbx, $j='ID.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;
 
     /* use_folder_images only works if the images exist in ../images */
-    $use_folder_images = false;
+    $use_folder_images = true;
 
     $pre = '';
     $end = '';
@@ -311,10 +382,23 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0' ) {
 	    }	    
 	} else $unseen = 0;
 
-
 	/* If there are unseen message, bold the line. */
 	if ($unseen > 0) { $pre .= '<B>'; }
 
+	/* color special boxes */
+	if ($boxes->is_special) {
+    	    $pre .= "<FONT COLOR=\"$color[11]\">";
+	    $end .= "</FONT>";    
+	}
+
+	/* If there are unseen message, close bolding. */
+	if ($unseen > 0) { $end .= "</B>"; }
+
+	/* Print unseen information. */
+	if (isset($unseen_found) && $unseen_found) {
+    	    $end .= "&nbsp;$unseen_string";
+	}
+
 	if (($move_to_trash) && ($mailbox == $trash_folder)) {
     	    if (! isset($numMessages)) {
         	$numMessages = $boxes->total;
@@ -322,32 +406,16 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0' ) {
     	    if ($numMessages > 0) {
         	$urlMailbox = urlencode($mailbox);
         	$pre .= "\n<small>\n" .
-                	"&nbsp;&nbsp;(<A HREF=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</A>)" .
+                	"&nbsp;&nbsp;(<a class=\"mbx_link\" HREF=\"empty_trash.php\">"._("purge")."</a>)" .
                 	"</small>";
     	    }
 	} else {
 	    if (!$boxes->is_noselect) { /* \Noselect boxes can't be selected */
-		$pre .= "<A HREF=\"right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" TARGET=\"right\" STYLE=\"text-decoration:none\">";
+		$pre .= "<a class=\"mbx_link\" HREF=\"right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" TARGET=\"right\">";
 		$end .= '</a>';
 	    }
 	}
 
-	/* If there are unseen message, close bolding. */
-	if ($unseen > 0) { $end .= "</B>"; }
-
-	/* Print unseen information. */
-	if (isset($unseen_found) && $unseen_found) {
-    	    $end .= "&nbsp;<SMALL>$unseen_string</SMALL>";
-	}
-
-	$font = '';
-	$fontend = '';
-
-	/* color special boxes */
-	if ($boxes->is_special) {
-    	    $font = "<FONT COLOR=\"$color[11]\">";
-	    $fontend = "</FONT>";    
-	}
 	if (!$boxes->is_root) {
 	    if ($use_folder_images) {
 	      if ($boxes->is_inbox) {
@@ -359,10 +427,13 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0' ) {
 	      } else if ($boxes->is_draft) {
 		$folder_img = '../images/draft.gif';
 	      } else $folder_img = '../images/folder.gif';
-	      $folder_img = '&nbsp<img src="'.$folder_img.'" heigth="15" valign="center">&nbsp';
+	      $folder_img = '&nbsp;<img src="'.$folder_img.'" height="15" valign="center">&nbsp;';
 	    } else $folder_img = '';
 	    if (!isset($boxes->mbxs[0])) {
-		echo '   <div class="mbx_sub" id='.$j. ' onmouseover="changerowcolor(this,true)" onmouseout="changerowcolor(this,false)">' . $folder_img .$pre .$font. $boxes->mailboxname_sub .$fontend . $end. '</div>'."\n";
+	        echo '   ' . html_tag( 'div',
+	                        $pre . $folder_img . $boxes->mailboxname_sub . $end ,
+	                'left', '', 'class="mbx_sub" id="' .$j. '"' )
+		        . "\n";
 	    } else {
     		/* get collapse information */
 		if ($collapse_folders) {
@@ -386,8 +457,11 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0' ) {
 		    }
 		    $collapse_link = $link;
 		} else $collapse_link='';
-		echo '   <div class="mbx_par" id='.$j. 'P onmouseover="changerowcolor(this,true)" onmouseout="changerowcolor(this,false)">' . $collapse_link . $folder_img .$pre.  $font. '&nbsp '. $boxes->mailboxname_sub .$fontend . $end. '</div>'."\n";
-		echo '   <INPUT TYPE="hidden" name=mbx['.$j. 'F] value="'.$collapse.'" id=mbx['.$j.'F>'."\n";
+	        echo '   ' . html_tag( 'div',
+	                        $collapse_link . $pre . $folder_img . '&nbsp;'. $boxes->mailboxname_sub . $end ,
+	                'left', '', 'class="mbx_par" id="' .$j. 'P"' )
+		        . "\n";
+		echo '   <INPUT TYPE="hidden" name=mbx['.$j. 'F] value="'.$collapse.'" id="mbx['.$j.'F]">'."\n";
 	    }
 	}
 	if ($collapse) {
@@ -397,9 +471,10 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0' ) {
 	}
 
 	if (isset($boxes->mbxs[0]) && !$boxes->is_root) /* mailbox contains childs */
-	    echo '<div class="par_area" id='.$j.'.0 '. $visible .'>'."\n"; 
-	    if ($j !='ID.0') {
-	       $j = $j .'.0';
+	    echo html_tag( 'div', '', 'left', '', 'class="par_area" id='.$j.'.0000 '. $visible ) . "\n";
+
+	    if ($j !='ID.0000') {
+	       $j = $j .'.0000';
 	}
     	for ($i = 0; $i <count($boxes->mbxs); $i++) {
 	    $j++;
@@ -414,7 +489,17 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0' ) {
 
 /* -------------------- MAIN ------------------------ */
 
-global $delimiter, $default_folder_prefix, $left_size;
+$key = $_COOKIE['key'];
+$onetimepad = $_SESSION['onetimepad'];
+$username = $_SESSION['username'];
+$delimiter = $_SESSION['delimiter'];
+
+if (isset($_GET['fold'])) {
+    $fold = $_GET['fold'];
+}
+if (isset($_GET['unfold'])) {
+    $unfold = $_GET['unfold'];
+}
 
 // open a connection on the imap port (143)
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10); // the 10 is to hide the output
@@ -458,7 +543,7 @@ $xtra .= <<<ECHO
 <!--
 
     function hidechilds(el) {
-    	id = el.id +".0";
+    	id = el.id+".0000";
         form_id = "mbx[" + el.id +"F]";
 	if (document.all) {
 	    ele = document.all[id];
@@ -466,29 +551,27 @@ $xtra .= <<<ECHO
 	       if(ele.style.display == "none") {
                   ele.style.display = "block";
 	          ele.style.visibility = "visible"
-                  document.all[el.id].src="../images/minus.gif";
+                  el.src="../images/minus.gif";
                   document.all[form_id].value=0;
                } else {
                   ele.style.display = "none";
 	          ele.style.visibility = "hidden"
-	          document.all[el.id].src="../images/plus.gif";
+	          el.src="../images/plus.gif";
 	          document.all[form_id].value=1;
 	       }
 	    }
 	} else if (document.getElementById) {
-	    id = el.id+".0";
             ele = document.getElementById(id);
-	    img_ele = document.getElementById(el.id);
 	    if (ele) {
 	       if(ele.style.display == "none") {
 	          ele.style.display = "block";
 	          ele.style.visibility = "visible"
-	          img_ele.src="../images/minus.gif";
+	          el.src="../images/minus.gif";
                   document.getElementById(form_id).value=0;
 	       } else {
 	          ele.style.display = "none";
 	          ele.style.visibility = "hidden"
-	          img_ele.src="../images/plus.gif";
+	          el.src="../images/plus.gif";
                   document.getElementById(form_id).value=1;
 	       }
 	    }   
@@ -505,28 +588,6 @@ $xtra .= <<<ECHO
      }
    }        
 	    	  
-   function changerowcolor(el,on) {
-      id = el.id;
-ECHO;
-$xtra.= "\nvar color1 = \"$color[0]\";\n".
-        "var color2 = \"$color[9]\";\n";
-$xtra .= <<<ECHO
-      if (document.all) {
-         if(!on) {
-             document.all[id].style.background = color1;
-	  } else {
-             document.all[id].style.background = color2;
-	  }
-       } else if (document.getElementById) {
-         if (!on) {  
-	    document.getElementById(id).style.background=color1; 
-	 } else {  
-	    document.getElementById(id).style.background=color2; 
-
-	 }
-      }
-   }
-
    function buttonover(el,on) {
       if (!on) {
          el.style.borderColor="blue";}
@@ -635,12 +696,13 @@ ECHO;
 
 $xtra .= <<<ECHO
 
-<STYLE>
+<STYLE TYPE="text/css">
 <!--
   body {
      margin: 0px 0px 0px 0px;
      padding: 5px 5px 5px 5px;
   }
+
   .button {
      border:outset;
      border-color:blue;
@@ -653,12 +715,23 @@ $xtra .= <<<ECHO
      font-size:0.8em;
      margin-left:4px;
      margin-right:0px;
+  }
+
+  a.mbx_link {
+      text-decoration: none;
+      background-color: $color[0];
+      display: inline;
+  }
+
+  a:hover.mbx_link {
+      background-color: $color[9];
+  }
 
+  a.mbx_link img {
+      border-style: none;
   }
 
   .mbx_sub {
-     voice-family: "\"}\"";
-     voice-family: inherit;
      padding-left:5px;
      padding-right:0px;
      margin-left:4px;
@@ -678,7 +751,7 @@ $xtra .= <<<ECHO
      border-bottom: solid;
      border-bottom-width:0.1em;
      border-bottom-color:blue;
-     display:block;
+     display: block;
   }
 
   .mailboxes {
@@ -690,10 +763,7 @@ $xtra .= <<<ECHO
      border: groove;
      border-width:0.1em;
      border-color:green;
-     
-ECHO;
-$xtra .=  "     background:$color[0];";
-$xtra .= <<<ECHO
+     background: $color[0];
   }
 
 -->
@@ -724,7 +794,7 @@ if ($auto_create_special && !isset($auto_create_done)) {
 
     /* Let the world know that autocreation is complete! Hurrah! */
     $auto_create_done = TRUE;
-    session_register('auto_create_done');
+    sqsession_register($auto_create_done, 'auto_create_done');
 }
 
 echo "\n<BODY BGCOLOR=\"$color[3]\" TEXT=\"$color[6]\" LINK=\"$color[6]\" VLINK=\"$color[6]\" ALINK=\"$color[6]\">\n";
@@ -740,8 +810,10 @@ if ($advanced_tree) {
    echo '<div ID="leftframe"><br><br>';
 }
 
-
-echo '<CENTER><FONT SIZE=4><B>'. _("Folders") . "</B><BR></FONT>\n\n";
+echo "\n\n" . html_tag( 'table', '', '', '', 'border="0" cellspacing="0" cellpadding="0" width="100%"' ) . 
+    html_tag( 'tr' ) . 
+    html_tag( 'td', '', 'left' ) . 
+    '<center><font size="4"><b>'. _("Folders") . "</b><br></font>\n\n";
 
 if ($date_format != 6) {
     /* First, display the clock. */
@@ -774,13 +846,13 @@ if ($date_format != 6) {
     }
     $clk = str_replace(' ','&nbsp;',$clk);
 
-    echo '<CENTER><SMALL>' . str_replace(' ','&nbsp;',_("Last Refresh")) .
-         ": $clk</SMALL></CENTER>";
+    echo '<center><small>' . str_replace(' ','&nbsp;',_("Last Refresh")) .
+         ": $clk</small></center>";
 }
 
 /* Next, display the refresh button. */
-echo '<SMALL>(<A HREF="../src/left_main.php" TARGET="left">'.
-     _("refresh folder list") . '</A>)</SMALL></CENTER><BR>';
+echo '<small>(<a href="../src/left_main.php" target="left">'.
+     _("refresh folder list") . '</a>)</small></center><br>';
 
 /* Lastly, display the folder list. */
 if ( $collapse_folders ) {
@@ -867,6 +939,7 @@ for ($i = 0; $i < count($boxes); $i++) {
 do_hook('left_main_after');
 sqimap_logout($imapConnection);
 
-echo "</div></BODY></HTML>\n";
+echo '</td></tr></table>' . "\n".
+    "</div></body></html>\n";
 
 ?>