X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fnewmail%2Fsetup.php;h=9364b9a76ef2844fd4262a7d6cf07798654d3e4d;hp=f2f4a579fd50b1165183ffd36cfa9657dae6357c;hb=f269af181b7d9fde8f3c8583b834f7684200b753;hpb=15e6162eacc97158393bc75aed3afeb7b19c24a6
diff --git a/plugins/newmail/setup.php b/plugins/newmail/setup.php
index f2f4a579..9364b9a7 100644
--- a/plugins/newmail/setup.php
+++ b/plugins/newmail/setup.php
@@ -23,16 +23,23 @@
* too (with a plugin).
*
* $Id$
+ * @package plugins
+ * @subpackage newmail
*/
- 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;
+ /**
+ */
+ include_once(SM_PATH . 'functions/display_messages.php');
+
+ function CheckNewMailboxSound($imapConnection, $mailbox, $real_box, $delimeter, $unseen, &$total_new) {
+
+ 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;
+ $unseen = $recent = 0;
// Skip folders for Sent and Trash
@@ -44,18 +51,18 @@
if (($unseen_notify == 2 && $real_box == 'INBOX') ||
($unseen_notify == 3 && ($newmail_allbox == 'on' ||
$real_box == 'INBOX'))) {
- $unseen = sqimap_unseen_messages($imapConnection, $real_box);
- $total_unseen += $unseen;
-
+ $status = sqimap_status_messages( $imapConnection, $real_box);
if($newmail_recent == 'on') {
- $unseen = sqimap_mailbox_select( $imapConnection, $real_box, TRUE, TRUE);
+ $total_new += $status['RECENT'];
+ } else {
+ $total_new += $status['UNSEEN'];
}
-
- if ($unseen > 0) {
- $unseen_found = 1;
+ if ($total_new) {
+ return 1;
}
+
}
- return( $unseen_found );
+ return 0;
}
function squirrelmail_plugin_init_newmail() {
@@ -71,12 +78,11 @@
// Gets added to the user's OPTIONS page.
global $optpage_blocks;
- if ( !soupNazi() ) {
-
- /* Register Squirrelspell with the $optionpages array. */
+ if ( checkForJavascript() ) {
+ /* Register Squirrelspell with the $optionpages array. */
$optpage_blocks[] = array(
'name' => _("NewMail Options"),
- 'url' => '../plugins/newmail/newmail_opt.php',
+ 'url' => SM_PATH . 'plugins/newmail/newmail_opt.php',
'desc' => _("This configures settings for playing sounds and/or showing popup windows when new mail arrives."),
'js' => TRUE
);
@@ -84,49 +90,35 @@
}
function newmail_sav() {
-
- global $username,$data_dir;
- global $submit_newmail,$media_file,$media_reset,$media_enable,$media_popup;
- global $media_recent,$media_sel;
- global $media_allbox, $media_changetitle;
-
- if ( isset($submit_newmail) ) {
-
- if(isset($media_enable)) {
- setPref($data_dir,$username,'newmail_enable',$media_enable);
- } else {
- setPref($data_dir,$username,'newmail_enable','');
- }
- if(isset($media_popup)) {
- setPref($data_dir,$username,'newmail_popup',$media_popup);
- } else {
- setPref($data_dir,$username,'newmail_popup','');
- }
- if(isset($media_allbox)) {
- setPref($data_dir,$username,'newmail_allbox',$media_allbox);
- } else {
- setPref($data_dir,$username,'newmail_allbox','');
- }
- if(isset($media_recent)) {
- setPref($data_dir,$username,'newmail_recent',$media_recent);
+ global $data_dir, $username;
+
+ if ( sqgetGlobalVar('submit_newmail', $submit, SQ_POST) ) {
+ $media_enable = '';
+ $media_popup = '';
+ $media_allbox = '';
+ $media_recent = '';
+ $media_changetitle = '';
+ $media_sel = '';
+
+ sqgetGlobalVar('media_enable', $media_enable, SQ_POST);
+ sqgetGlobalVar('media_popup', $media_popup, SQ_POST);
+ sqgetGlobalVar('media_allbox', $media_allbox, SQ_POST);
+ sqgetGlobalVar('media_recent', $media_recent, SQ_POST);
+ sqgetGlobalVar('media_changetitle', $media_changetitle, SQ_POST);
+
+ setPref($data_dir,$username,'newmail_enable',$media_enable);
+ setPref($data_dir,$username,'newmail_popup', $media_popup);
+ setPref($data_dir,$username,'newmail_allbox',$media_allbox);
+ setPref($data_dir,$username,'newmail_recent',$media_recent);
+ setPref($data_dir,$username,'newmail_changetitle',$media_changetitle);
+
+ if( sqgetGlobalVar('media_sel', $media_sel, SQ_POST) &&
+ ($media_sel == '(none)' || $media_sel == '(local media)') ) {
+ removePref($data_dir,$username,'newmail_media');
} else {
- setPref($data_dir,$username,'newmail_recent','');
+ setPref($data_dir,$username,'newmail_media',$media_sel);
}
- if(isset($media_changetitle)) {
- setPref($data_dir,$username,'newmail_changetitle',$media_changetitle);
- } else {
- setPref($data_dir,$username,'newmail_changetitle','');
- }
- if(isset($media_sel)) {
- if($media_sel == '(local media)') {
- setPref($data_dir,$username,'newmail_media',StripSlashes($media_file));
- } else {
- setPref($data_dir,$username,'newmail_media',$media_sel);
- }
- } else {
- setPref($data_dir,$username,'newmail_media','');
- }
- echo ' ' . _("New Mail Notification options saved") . '';
+ echo html_tag( 'p', _("New Mail Notification options saved"), 'center' );
}
}
@@ -138,7 +130,7 @@
$newmail_recent = getPref($data_dir,$username,'newmail_recent');
$newmail_enable = getPref($data_dir,$username,'newmail_enable');
- $newmail_media = getPref($data_dir, $username, 'newmail_media', '../plugins/newmail/sounds/Notify.wav');
+ $newmail_media = getPref($data_dir, $username, 'newmail_media', '(none)');
$newmail_popup = getPref($data_dir, $username, 'newmail_popup');
$newmail_allbox = getPref($data_dir, $username, 'newmail_allbox');
$newmail_changetitle = getPref($data_dir, $username, 'newmail_changetitle');
@@ -147,10 +139,9 @@
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, $PHP_SELF;
if ($newmail_enable == 'on' ||
$newmail_popup == 'on' ||
@@ -169,22 +160,31 @@
$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);
}
}
@@ -197,13 +197,13 @@
if ($newmail_changetitle) {
echo "\n";
}
- if ($status > 0 && $newmail_enable == 'on') {
+ if ($totalNew > 0 && $newmail_enable == 'on' && $newmail_media != '' ) {
echo "