Masato's Fix
[squirrelmail.git] / plugins / newmail / setup.php
index 618a931..666ef82 100644 (file)
@@ -1,33 +1,36 @@
 <?php
 
    /**
-    **  newmail.php
-    **  (c)2000 by Michael Huttinger
-    **
-    **  Quite a hack -- but my first attempt at a plugin.  We were
-    **  looking for a way to play a sound when there was unseen
-    **  messages to look at.  Nice for users who keep the squirrel
-    **  mail window up for long periods of time and want to know
-    **  when mail arrives.
-    **
-    **  Basically, I hacked much of left_main.php into a plugin that
-    **  goes through each mail folder and increments a flag if
-    **  there are unseen messages.  If the final count of unseen
-    **  folders is > 0, then we play a sound (using the HTML at the
-    **  far end of this script).
-    **
-    **  This was tested with IE5.0 - but I hear Netscape works well,
-    **  too (with a plugin).
-    **
-    **  $Id$
-    **
-    **/
+    * newmail.php
+    *
+    * Copyright (c) 1999-2002 The SquirrelMail Project Team
+    * Copyright (c) 2000 by Michael Huttinger
+    * Licensed under the GNU GPL. For full terms see the file COPYING.
+    *
+    * Quite a hack -- but my first attempt at a plugin.  We were
+    * looking for a way to play a sound when there was unseen
+    * messages to look at.  Nice for users who keep the squirrel
+    * mail window up for long periods of time and want to know
+    * when mail arrives.
+    *
+    * Basically, I hacked much of left_main.php into a plugin that
+    * goes through each mail folder and increments a flag if
+    * there are unseen messages.  If the final count of unseen
+    * folders is > 0, then we play a sound (using the HTML at the
+    * far end of this script).
+    *
+    * This was tested with IE5.0 - but I hear Netscape works well,
+    * too (with a plugin).
+    *
+    * $Id$
+    */
 
     function CheckNewMailboxSound($imapConnection, $mailbox, $real_box, $delimeter, $unseen, &$total_unseen) {
-        global $folder_prefix, $trash_folder, $sent_folder;
-        global $color, $move_to_sent, $move_to_trash;
-        global $unseen_notify, $unseen_type, $newmail_allbox, $newmail_recent;
-        global $newmail_changetitle;
+    
+        global $folder_prefix, $trash_folder, $sent_folder,
+               $color, $move_to_sent, $move_to_trash,
+               $unseen_notify, $unseen_type, $newmail_allbox, 
+               $newmail_recent, $newmail_changetitle;
 
         $mailboxURL = urlencode($real_box);
         $unseen_found = 0;
@@ -88,7 +91,8 @@
         global $media_recent,$media_sel;
         global $media_allbox, $media_changetitle;
 
-        if ($submit_newmail) {
+        if ( isset($submit_newmail) ) {
+         
             if(isset($media_enable)) {
                 setPref($data_dir,$username,'newmail_enable',$media_enable);
             } else {
             } else {
                 setPref($data_dir,$username,'newmail_media','');
             }
-            echo '<center> ' . _("New Mail Notification options saved") . '</center>';
+            echo html_tag( 'p', _("New Mail Notification options saved"), 'center' );
         }
     }
 
         
         $newmail_recent = getPref($data_dir,$username,'newmail_recent');
         $newmail_enable = getPref($data_dir,$username,'newmail_enable');
-        $newmail_media = getPref($data_dir, $username, 'newmail_media');
+        $newmail_media = getPref($data_dir, $username, 'newmail_media', '../plugins/newmail/sounds/Notify.wav');
         $newmail_popup = getPref($data_dir, $username, 'newmail_popup');
         $newmail_allbox = getPref($data_dir, $username, 'newmail_allbox');
         $newmail_changetitle = getPref($data_dir, $username, 'newmail_changetitle');
 
-        if ($newmail_media == '') {
-            $newmail_media = '../plugins/newmail/sounds/Notify.wav';
-        }
-
     }
 
     function newmail_plugin() {
 
-        global $username,$key,$imapServerAddress,$imapPort;
-        global $newmail_media,$newmail_enable,$newmail_popup,$newmail_recent;
-        global $newmail_changetitle;
-        global $imapConnection;
-
+        global $username, $key, $imapServerAddress, $imapPort,
+               $newmail_media, $newmail_enable, $newmail_popup,
+               $newmail_recent, $newmail_changetitle, $imapConnection;
+        
         if ($newmail_enable == 'on' ||
             $newmail_popup == 'on' ||
             $newmail_changetitle) {
                 $line = '';
                 $mailbox = $boxes[$i]['formatted'];
 
-                if (! isset($boxes[$i]['unseen']))
+                if (! isset($boxes[$i]['unseen'])) {
                     $boxes[$i]['unseen'] = '';
+                }
                 if ($boxes[$i]['flags']) {
                     $noselect = false;
                     for ($h = 0; $h < count($boxes[$i]['flags']); $h++) {
-                        if (strtolower($boxes[$i]["flags"][$h]) == 'noselect')
+                        if (strtolower($boxes[$i]["flags"][$h]) == 'noselect') {
                             $noselect = TRUE;
+                        }
                     }
                     if (! $noselect) {
-                        $status = $status + CheckNewMailboxSound($imapConnection, $mailbox,
-                        $boxes[$i]['unformatted'], $delimeter, $boxes[$i]['unseen'],
-                        $totalNew);
+                        $status += CheckNewMailboxSound($imapConnection, 
+                                                        $mailbox,
+                                                        $boxes[$i]['unformatted'], 
+                                                        $delimeter, 
+                                                        $boxes[$i]['unseen'],
+                                                        $totalNew);
                     }
                 } else {
-                    $status = $status + CheckNewMailboxSound($imapConnection, $mailbox, $boxes[$i]['unformatted'],
-                        $delimeter, $boxes[$i]['unseen'], $totalNew);
+                    $status += CheckNewMailboxSound($imapConnection, 
+                                                    $mailbox, 
+                                                    $boxes[$i]['unformatted'],
+                                                    $delimeter, 
+                                                    $boxes[$i]['unseen'], 
+                                                    $totalNew);
                 }
 
             }
             if ($newmail_changetitle) {
                 echo "<script language=\"javascript\">\n" .
                     "function ChangeTitleLoad() {\n";
-                if( $totalNew > 1 ) {
+                if( $totalNew > 1 || $totalNew == 0 ) {
                     echo 'window.parent.document.title = "' .
-                        sprintf(_("%s New Messages"), $totalNew ) .
+                        sprintf(_("%s New Messages"), $totalNew ) . 
                         "\";\n";
                 } else {
                     echo 'window.parent.document.title = "' .
-                        sprintf(_("%s New Message"), $totalNew ) .
+                        sprintf(_("%s New Message"), $totalNew ) . 
                         "\";\n";
                 }
                 echo    "if (BeforeChangeTitle != null)\n".
                     "</script>\n";
             }
 
-            if ($status > 0 && $newmail_enable == 'on') {
-                echo "<EMBED SRC=\"$newmail_media\" HIDDEN=TRUE AUTOSTART=TRUE>";
+            if ($totalNew > 0 && $newmail_enable == 'on') {
+                echo "<EMBED SRC=\"$newmail_media\" HIDDEN=TRUE AUTOSTART=TRUE>\n";
             }
-            if ($status >0 && $newmail_popup == 'on') {
+            if ($totalNew > 0 && $newmail_popup == 'on') {
                 echo "<SCRIPT LANGUAGE=\"JavaScript\">\n".
                     "<!--\n".
                     "function PopupScriptLoad() {\n".
-                    'window.open("../plugins/newmail/newmail.php", "SMPopup",'.
-                                "\"width=200,height=130,scrollbars=no\");\n".
-                    "if (BeforePopupScript != null)\n".
-                    "BeforePopupScript();\n".
+                        'window.open("../plugins/newmail/newmail.php", "SMPopup",'.
+                                     "\"width=200,height=130,scrollbars=no\");\n".
+                        "if (BeforePopupScript != null)\n".
+                            "BeforePopupScript();\n".
                     "}\n".
                     "BeforePopupScript = window.onload;\n".
                     "window.onload = PopupScriptLoad;\n".