X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fnewmail%2Ffunctions.php;h=f92de319fc095da2800db6dcfb0245586ab3ddd8;hp=482f7197b9ef3543b9b3cdf43cf1f88342c82500;hb=505e00aad983adab70d4b001f450064cbda37b86;hpb=47ccfad452e8d345542d09e59112cac317cffed8 diff --git a/plugins/newmail/functions.php b/plugins/newmail/functions.php index 482f7197..f92de319 100644 --- a/plugins/newmail/functions.php +++ b/plugins/newmail/functions.php @@ -5,7 +5,7 @@ * * Functions * - * @copyright © 2001-2006 The SquirrelMail Project Team + * @copyright © 2001-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package plugins @@ -13,13 +13,6 @@ * @todo add midi support */ -/** @ignore */ -if (! defined('SM_PATH')) define('SM_PATH','../../'); - -/** - * sqm_baseuri() function for setups that don't load it by default - */ -include_once(SM_PATH . 'functions/display_messages.php'); /** file type defines */ define('SM_NEWMAIL_FILETYPE_WAV',2); @@ -67,7 +60,6 @@ function newmail_sav_function() { if ( sqgetGlobalVar('submit_newmail', $submit, SQ_POST) ) { $media_enable = ''; $media_popup = ''; - $media_allbox = ''; $media_recent = ''; $media_changetitle = ''; $media_sel = ''; @@ -76,7 +68,6 @@ function newmail_sav_function() { 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); sqgetGlobalVar('popup_width', $popup_width, SQ_POST); @@ -90,12 +81,16 @@ function newmail_sav_function() { 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); setPref($data_dir,$username,'newmail_popup_width',$popup_width); setPref($data_dir,$username,'newmail_popup_height',$popup_height); + if (sqgetGlobalVar('newmail_unseen_notify', $newmail_unseen_notify, SQ_POST)) { + $newmail_unseen_notify = (int) $newmail_unseen_notify; + setPref($data_dir,$username,'newmail_unseen_notify',$newmail_unseen_notify); + } + if( sqgetGlobalVar('media_sel', $media_sel, SQ_POST) && $media_sel == '(none)' ) { removePref($data_dir,$username,'newmail_media'); @@ -139,13 +134,14 @@ function newmail_sav_function() { */ function newmail_pref_function() { global $username,$data_dir; - global $newmail_media,$newmail_enable,$newmail_popup,$newmail_allbox; + global $newmail_media,$newmail_media_enable,$newmail_popup; global $newmail_recent, $newmail_changetitle; global $newmail_userfile_type, $newmail_userfile_name; global $newmail_popup_width, $newmail_popup_height; + global $newmail_unseen_notify; $newmail_recent = getPref($data_dir,$username,'newmail_recent'); - $newmail_enable = getPref($data_dir,$username,'newmail_enable'); + $newmail_media_enable = getPref($data_dir,$username,'newmail_enable'); $newmail_media = getPref($data_dir, $username, 'newmail_media', '(none)'); // remove full location from setting (since SM 1.5.1 plugin uses only filename). if ($newmail_media!='(none)') @@ -154,11 +150,12 @@ function newmail_pref_function() { $newmail_popup = getPref($data_dir, $username, 'newmail_popup'); $newmail_popup_width = getPref($data_dir, $username, 'newmail_popup_width',200); $newmail_popup_height = getPref($data_dir, $username, 'newmail_popup_height',130); - $newmail_allbox = getPref($data_dir, $username, 'newmail_allbox'); $newmail_changetitle = getPref($data_dir, $username, 'newmail_changetitle'); $newmail_userfile_type = getPref($data_dir, $username, 'newmail_userfile_type'); $newmail_userfile_name = getPref($data_dir,$username,'newmail_userfile_name',''); + + $newmail_unseen_notify = getPref($data_dir,$username,'newmail_unseen_notify',0); } /** @@ -173,72 +170,75 @@ function newmail_set_loadinfo_function() { } } + +/* Receive the status of the folder and do something with it */ +function newmail_folder_status($statusarr) { + global $newmail_media_enable,$newmail_popup,$newmail_changetitle,$trash_folder, + $sent_folder,$totalNewArr, $newmail_unseen_notify, $unseen_notify, $newmail_recent; + + /* if $newmail_unseen_notify is set to zero, plugin follows $unseen_notify */ + if ($newmail_unseen_notify == 0) + $newmail_unseen_notify = $unseen_notify; + + $mailbox=$statusarr['MAILBOX']; + + if (($newmail_media_enable == 'on' || + $newmail_popup == 'on' || + $newmail_changetitle == 'on') && + /** + * make sure that $newmail_unseen_notify is set to supported value, + * currently (1.5.2cvs) SMPREF_UNSEEN_NORMAL has highest integer value + * in SMPREF_UNSEEN constants + */ + ($newmail_unseen_notify > SMPREF_UNSEEN_NONE && $newmail_unseen_notify <= SMPREF_UNSEEN_NORMAL)) { + + // Skip folders for Sent and Trash + // TODO: make this optional + if ($statusarr['MAILBOX'] == $sent_folder || $statusarr['MAILBOX'] == $trash_folder) { + return 0; + } + + if ((($mailbox == 'INBOX') && ($newmail_unseen_notify == SMPREF_UNSEEN_INBOX)) || + ($newmail_unseen_notify == SMPREF_UNSEEN_SPECIAL && isSpecialMailbox($mailbox)) || + ($newmail_unseen_notify == SMPREF_UNSEEN_NORMAL && ! isSpecialMailbox($mailbox)) || + ($newmail_unseen_notify == SMPREF_UNSEEN_ALL)) { + if (($newmail_recent == 'on') && (!empty($statusarr['RECENT']))) { + $totalNewArr[$mailbox] = $statusarr['RECENT']; + } elseif ($newmail_recent != 'on' && !empty($statusarr['UNSEEN'])) { + $totalNewArr[$mailbox] = $statusarr['UNSEEN']; + } + } + } +} + /** * Insert needed data in left_main */ function newmail_plugin_function() { - global $username, $newmail_media, $newmail_enable, $newmail_popup, + global $username, $newmail_media, $newmail_media_enable, $newmail_popup, $newmail_recent, $newmail_changetitle, $imapConnection, $PHP_SELF; global $newmail_mmedia, $newmail_allowsound; global $newmail_userfile_type; global $newmail_popup_width, $newmail_popup_height; + global $totalNewArr; - if ($newmail_enable == 'on' || + if ($newmail_media_enable == 'on' || $newmail_popup == 'on' || $newmail_changetitle) { - // open a connection on the imap port (143) - - $boxes = sqimap_mailbox_list($imapConnection); - $delimeter = sqimap_get_delimiter($imapConnection); - - $status = 0; - $totalNew = 0; - - for ($i = 0;$i < count($boxes); $i++) { - - $mailbox = $boxes[$i]['formatted']; - - 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') { - $noselect = TRUE; - } - } - if (! $noselect) { - $status += CheckNewMailboxSound($imapConnection, - $mailbox, - $boxes[$i]['unformatted'], - $delimeter, - $boxes[$i]['unseen'], - $totalNew); - } - } else { - $status += CheckNewMailboxSound($imapConnection, - $mailbox, - $boxes[$i]['unformatted'], - $delimeter, - $boxes[$i]['unseen'], - $totalNew); - } - } - - // sqimap_logout($imapConnection); + if (!empty($totalNewArr)) { $totalNew=array_sum($totalNewArr); } + else { $totalNew=0; } // If we found unseen messages, then we // will play the sound as follows: if ($newmail_changetitle) { - echo "