X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fleft_main.php;h=39382ea096619b015c5099d110c3991845a2884d;hb=c95df3808257297105d60595ab869357359a89e7;hp=9e5cbc0379a69e74a2f2be45d13fe70cb3eda2ac;hpb=b9d121d2b12f5c9cc23f5a483b290c1966659114;p=squirrelmail.git
diff --git a/src/left_main.php b/src/left_main.php
index 9e5cbc03..39382ea0 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -1,6 +1,8 @@
";
- echo "
\n";
- $left_size = 250; //doesn't seem to work
- /**
- ** Array used to list the include .hlp files, we could use a dir function
- ** to step through the directory and list its contents but it doesn't order those.
- ** This should probably go in config.php but it might mess up conf.pl
- **/
- $helpdir[0] = "basic.hlp";
- $helpdir[1] = "main_folder.hlp";
- $helpdir[2] = "read_mail.hlp";
- $helpdir[3] = "addresses.hlp";
- $helpdir[4] = "compose.hlp";
- $helpdir[5] = "folders.hlp";
- $helpdir[6] = "options.hlp";
- $helpdir[7] = "FAQ.hlp";
-
- /**
- ** Build a menu dynamically for the left frame from the HTML tagged right frame include (.hlp) files listed in the $helpdir var.
- ** This is done by first listing all the .hlp files in the $helpdir array.
- ** Next, we loop through the array, for every value of $helpdir we loop through the file and look for anchor tags ( or ).
- **/
-
- if (!file_exists("../help/$user_language")) // If the selected language doesn't exist, use english
- $user_language = "en";
-
-
- while ( list( $key, $val ) = each( $helpdir ) ) { // loop through the array of files
- $fcontents = file("../help/$user_language/$val"); // assign each line of the above file to another array
- while ( list( $line_num, $line ) = each( $fcontents ) ) { // loop through the second array
- $temphed="";
- $tempanc="";
- if ( eregi("", "", $tempanc);
- echo "";
- }
- if ( eregi("", $line, $temphed)) { // grab a description for the link made above
- $temphed = $line;
- $temphed = ereg_replace("", "", $temphed);
- $temphed = ereg_replace("
", "", $temphed);
- echo "
";
- echo "" . _("$temphed") . "
\n"; // make it bigger since it is a heading type 1
- }
- if ( eregi("", $line, $temphed)) { // grab a description for the link made above
- $temphed = $line;
- $temphed = ereg_replace("", "", $temphed);
- $temphed = ereg_replace("
", "", $temphed);
- echo "" . _("$temphed") . "
\n"; // keep same size since it is a normal entry
- }
- }
- }
- } else {
+
if (!isset($config_php))
include("../config/config.php");
if (!isset($array_php))
@@ -91,18 +29,46 @@
include("../functions/page_header.php");
if (!isset($i18n_php))
include("../functions/i18n.php");
+ if (!isset($plugin_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();
+
function formatMailboxName($imapConnection, $mailbox, $real_box, $delimeter, $unseen) {
global $folder_prefix, $trash_folder, $sent_folder;
global $color, $move_to_sent, $move_to_trash;
+ global $unseen_notify, $unseen_type;
$mailboxURL = urlencode($real_box);
- if($real_box=="INBOX") {
+
+ if ($unseen_notify == 2 && $real_box == "INBOX") {
+ $unseen = sqimap_unseen_messages($imapConnection, $numUnseen, $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 = "($unseen/$numMessages)";
+ $unseen_found = true;
+ }
+ } else if ($unseen_notify == 3) {
$unseen = sqimap_unseen_messages($imapConnection, $numUnseen, $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 = "($unseen/$numMessages)";
+ $unseen_found = true;
+ }
+ }
$line .= "";
if ($unseen > 0)
@@ -127,33 +93,29 @@
if ($unseen > 0)
$line .= "";
- if ($unseen > 0) {
- $line .= " ($unseen)";
+ if ($unseen_found) {
+ $line .= " $unseen_string";
}
if (($move_to_trash == true) && ($real_box == $trash_folder)) {
$urlMailbox = urlencode($real_box);
$line .= "\n\n";
- $line .= " ("._("purge").")";
+ $line .= " ("._("purge").")";
$line .= "\n\n";
}
$line .= "";
return $line;
}
- // 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");
-
if (isset($left_refresh) && ($left_refresh != "None") && ($left_refresh != "")) {
echo "\n";
echo "\n";
echo "\n";
}
- echo "\n\n\n";
+ echo "\n\n";
+
+ do_hook("left_main_before");
$boxes = sqimap_mailbox_list($imapConnection);
@@ -185,12 +147,9 @@
} else {
$line .= formatMailboxName($imapConnection, $mailbox, $boxes[$i]["unformatted"], $delimeter, $boxes[$i]["unseen"]);
}
- echo "\n$line
\n";
+ echo "$line
\n";
}
-
-
- fclose($imapConnection);
-
- }
+ sqimap_logout($imapConnection);
+ do_hook("left_main_after");
?>