From cc61478a38c0d56346511026c34063262eb989c6 Mon Sep 17 00:00:00 2001
From: philippe_mingo <philippe_mingo@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 26 Nov 2001 14:17:04 +0000
Subject: [PATCH] These fixes were needed in order to make work save stuff from
 newmail. Please Paul, take a look at it.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1806 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 plugins/newmail/newmail_opt.php | 19 ++++--------
 plugins/newmail/setup.php       | 53 ++++++++++++++++-----------------
 src/options.php                 | 20 +++++++------
 3 files changed, 42 insertions(+), 50 deletions(-)

diff --git a/plugins/newmail/newmail_opt.php b/plugins/newmail/newmail_opt.php
index 7affbf7b..df1a7f85 100644
--- a/plugins/newmail/newmail_opt.php
+++ b/plugins/newmail/newmail_opt.php
@@ -21,20 +21,12 @@
 
     displayPageHeader($color, 'None');
 
-    $media_enable = getPref($data_dir,$username, 'newmail_enable');
-    if ($media_enable == '') {
-        $media_enable = 'FALSE';
-    }
-
+    $media_enable = getPref($data_dir,$username, 'newmail_enable', 'FALSE' );
     $media_popup = getPref($data_dir, $username,'newmail_popup');
     $media_allbox = getPref($data_dir,$username,'newmail_allbox');
     $media_recent = getPref($data_dir,$username,'newmail_recent');
     $media_changetitle = getPref($data_dir,$username,'newmail_changetitle');
-
-    $media = getPref($data_dir,$username,'newmail_media');
-    if ($media == '') {
-        $media = '../plugins/newmail/sounds/Notify.wav';
-    }
+    $media = getPref($data_dir,$username,'newmail_media', '../plugins/newmail/sounds/Notify.wav');
 
     echo '<br>' .
          "<table width=95% align=center border=0 cellpadding=2 cellspacing=0><tr><td bgcolor=\"$color[0]\">\n".
@@ -98,19 +90,19 @@ _("Select from the list of <b>server files</b> the media file to play when new m
             '<tr>'.
                 '<td align=right nowrap>' . _("Select server file:") . '</td>'.
                 '<td><SELECT NAME=media_sel>'.
-                    '<OPTION VALUE="(local media)">' . _("(local media)");
+                    '<OPTION VALUE="(local media)">' . _("(local media)") . '</option>';
 
     // Iterate sound files for options
 
     $d = dir('../plugins/newmail/sounds');
     while($entry=$d->read()) {
         $fname = $d->path . "/" . $entry;
-        if ($entry != ".." && $entry != ".") {
+        if ($entry != '..' && $entry != '.') {
             echo "<OPTION ";
             if ($fname == $media) {
                 echo "SELECTED ";
             }
-            echo "VALUE=\"" . $fname . "\">" . $entry . "\n";
+            echo "VALUE=\"" . $fname . "\">" . $entry . "</option>\n";
         }
     }
     $d->close();
@@ -136,6 +128,7 @@ _("Select from the list of <b>server files</b> the media file to play when new m
          '<tr>'.
             '<td>&nbsp;</td>'.
             '<td>'.
+               '<INPUT TYPE=HIDDEN NAME=optmode VALUE=submit>'. 
                '<input type="submit" value="' . _("Submit") . '" name="submit_newmail">'.
             '</td>'.
          '</tr>'.
diff --git a/plugins/newmail/setup.php b/plugins/newmail/setup.php
index 618a9314..ab52d7b6 100644
--- a/plugins/newmail/setup.php
+++ b/plugins/newmail/setup.php
@@ -1,27 +1,27 @@
 <?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
+    *  (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$
+    *
+    */
 
     function CheckNewMailboxSound($imapConnection, $mailbox, $real_box, $delimeter, $unseen, &$total_unseen) {
         global $folder_prefix, $trash_folder, $sent_folder;
@@ -88,7 +88,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 {
@@ -135,15 +136,11 @@
         
         $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() {
@@ -216,7 +213,7 @@
             }
 
             if ($status > 0 && $newmail_enable == 'on') {
-                echo "<EMBED SRC=\"$newmail_media\" HIDDEN=TRUE AUTOSTART=TRUE>";
+                echo "<EMBED SRC=\"$newmail_media\" HIDDEN=TRUE AUTOSTART=TRUE>\n";
             }
             if ($status >0 && $newmail_popup == 'on') {
                 echo "<SCRIPT LANGUAGE=\"JavaScript\">\n".
diff --git a/src/options.php b/src/options.php
index 1b296972..c018186a 100644
--- a/src/options.php
+++ b/src/options.php
@@ -143,15 +143,16 @@ if ($optpage != SMOPT_PAGE_MAIN) {
 /*** Next, process anything that needs to be processed. ***/
 /***********************************************************/
 
-switch ($optmode) {
-    case SMOPT_MODE_SUBMIT:
-        $max_refresh = process_optionmode_submit($optpage, $optpage_data);
-        break;
-    case SMOPT_MODE_LINK:
-        $max_refresh = process_optionmode_link($optpage, $optpage_data);
-        break;
+if ( isset( $optpage_data ) ) {
+    switch ($optmode) {
+        case SMOPT_MODE_SUBMIT:
+            $max_refresh = process_optionmode_submit($optpage, $optpage_data);
+            break;
+        case SMOPT_MODE_LINK:
+            $max_refresh = process_optionmode_link($optpage, $optpage_data);
+            break;
+    }
 }
-
 /*** MOVE THIS DISPLAY CODE DOWN EVENTUALLY!!! ***/
 
 $optpage_title = _("Options");
@@ -187,7 +188,8 @@ if ($optmode == SMOPT_MODE_SUBMIT)	 {
         case SMOPT_PAGE_FOLDER:
             $save_hook_name = 'options_folder_save';
             break;
-        default: $save_hook_name = 'options_save';
+        default: 
+            $save_hook_name = 'options_save';
             break;
     }
 
-- 
2.25.1