X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Fnewmail%2Fnewmail_opt.php;h=368cd28838d9be70fb169cb2ef3db293c935bca0;hb=66783e5581450bcbd507d8b0d169ea0140f1b220;hp=2a897b9dc17367801b2b5b3d7f9a80330438858c;hpb=4b4abf93a9624311afef0c385023724ee46a2b60;p=squirrelmail.git diff --git a/plugins/newmail/newmail_opt.php b/plugins/newmail/newmail_opt.php index 2a897b9d..368cd288 100644 --- a/plugins/newmail/newmail_opt.php +++ b/plugins/newmail/newmail_opt.php @@ -5,28 +5,34 @@ * * Displays all options relating to new mail sounds * - * @copyright © 1999-2005 The SquirrelMail Project Team + * @copyright © 1999-2009 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package plugins * @subpackage newmail */ -/** @ignore */ -define('SM_PATH','../../'); +/** + * Path for SquirrelMail required files. + * @ignore + */ +require('../../include/init.php'); + +/** + * Make sure plugin is activated! + */ +global $plugins; +if (!in_array('newmail', $plugins)) + exit; -/* SquirrelMail required files. */ -include_once(SM_PATH . 'include/validate.php'); -/* sqm_baseuri function */ -include_once(SM_PATH . 'functions/display_messages.php'); /** Plugin functions (also loads plugin's config) */ include_once(SM_PATH . 'plugins/newmail/functions.php'); -displayPageHeader($color, 'None'); +include_once(SM_PATH . 'functions/forms.php'); -// plugin uses squirrelmail loading_pref hook. -// vars are already loaded in include/validate.php +displayPageHeader($color); +//FIXME: Remove all HTML from core - put this all into a template file echo html_tag( 'table', '', 'center', $color[0], 'width="95%" cellpadding="1" cellspacing="0" border="0"' ) . "\n" . html_tag( 'tr' ) . "\n" . html_tag( 'td', '', 'center' ) . @@ -35,17 +41,15 @@ echo html_tag( 'table', '', 'center', $color[0], 'width="95%" cellpadding="1" ce html_tag( 'tr' ) . "\n" . html_tag( 'td', '', 'left', $color[4] ) . "
\n"; -echo html_tag( 'p', - sprintf(_("The %s option will check ALL of your folders for unseen mail, not just the inbox for notification."), '"'._("Check all boxes, not just INBOX").'"') - ) . "\n" . +echo html_tag( 'p',_("Based on the Folder Preferences option "Enable Unread Message Notification", you can be notified when new messages arrive in your account.")) . "\n" . html_tag( 'p', - sprintf(_("Selecting the %s option will enable the showing of a popup window when unseen mail is in your folders (requires JavaScript)."), '"'._("Show popup window on new mail").'"') + sprintf(_("Selecting the %s option will enable the showing of a popup window when unseen mail is in one of your folders (requires JavaScript)."), '"'._("Show popup window on new mail").'"') ) . "\n" . html_tag( 'p', sprintf(_("Use the %s option to only check for messages that are recent. Recent messages are those that have just recently showed up and have not been \"viewed\" or checked yet. This can prevent being continuously annoyed by sounds or popups for unseen mail."), '"'._("Count only messages that are RECENT").'"') ) . "\n" . html_tag( 'p', - sprintf(_("Selecting the %s option will change the title in some browsers to let you know when you have new mail (requires JavaScript, and only works in IE but you won't see errors with other browsers). This will always tell you if you have new mail, even if you have %s enabled."), '"'._("Change title on supported browsers").'"', '"'._("Count only messages that are RECENT").'"') + sprintf(_("Selecting the %s option will change the browser title bar to let you know when you have new mail (requires JavaScript and may only work in some browsers). This will always tell you if you have new mail, even if you have %s enabled."), '"'._("Change title on supported browsers").'"', '"'._("Count only messages that are RECENT").'"') ) . "\n"; if ($newmail_allowsound) { echo html_tag( 'p', @@ -63,45 +67,46 @@ echo '' . echo '
' . "\n" . html_tag( 'table', '', '', '', 'width="100%" cellpadding="5" cellspacing="0" border="0"' ) . "\n"; -// Option: media_allbox -echo html_tag( 'tr' ) . - html_tag( 'td', _("Check all boxes, not just INBOX").':', 'right', '', 'style="white-space: nowrap;"' ) . - html_tag( 'td', '', 'left' ) . - '' . "\n"; +/* newmail_unseen_notify */ +$newmail_unseen_opts = array( 0 => _("Follow folder preferences"), + SMPREF_UNSEEN_INBOX => _("INBOX"), + SMPREF_UNSEEN_ALL => _("All folders"), + SMPREF_UNSEEN_SPECIAL => _("Special folders"), + SMPREF_UNSEEN_NORMAL => _("Regular folders")); +echo html_tag('tr', + html_tag('td',_("Check for new messages in:"),'right', '', 'style="white-space: nowrap;"'). + html_tag('td',addSelect('newmail_unseen_notify',$newmail_unseen_opts,$newmail_unseen_notify,true),'left') + ); // Option: media_recent echo html_tag( 'tr' ) . - html_tag( 'td', _("Count only messages that are RECENT").':', 'right', '', 'style="white-space: nowrap;"' ) . + html_tag( 'td', '', 'right', '', 'style="white-space: nowrap;"' ) . html_tag( 'td', '', 'left' ) . '' . "\n"; +echo 'name="media_recent" id="media_recent" />' . "\n"; // Option: media_changetitle echo html_tag( 'tr' ) . - html_tag( 'td', _("Change title on supported browsers").':', 'right', '', 'style="white-space: nowrap;"' ) . + html_tag( 'td', '', 'right', '', 'style="white-space: nowrap;"' ) . html_tag( 'td', '', 'left' ) . ' ('._("requires JavaScript to work").')' . "\n"; +echo 'name="media_changetitle" id="media_changetitle" /> ' . "\n"; // Option: media_popup echo html_tag( 'tr' ) . - html_tag( 'td', _("Show popup window on new mail").':', 'right', '', 'style="white-space: nowrap;"' ) . + html_tag( 'td', '', 'right', '', 'style="white-space: nowrap;"' ) . html_tag( 'td', '', 'left' ) . ' ('._("requires JavaScript to work").')' . "\n"; +echo 'name="media_popup" id="media_popup" /> ' . "\n"; echo html_tag( 'tr' ) . html_tag('td',_("Width of popup window:"),'right','', 'style="white-space: nowrap;"') @@ -120,13 +125,13 @@ echo html_tag( 'tr' ) if ($newmail_allowsound) { // Option: media_enable echo html_tag( 'tr' ) . - html_tag( 'td', _("Enable Media Playing").':', 'right', '', 'style="white-space: nowrap;"' ) . + html_tag( 'td', '', 'right', '', 'style="white-space: nowrap;"' ) . html_tag( 'td', '', 'left' ) . '' . "\n"; + echo 'name="media_enable" id="media_enable" />' . "\n"; // Option: media_sel echo html_tag( 'tr' ) . @@ -142,7 +147,7 @@ if ($newmail_allowsound) { $d = dir(SM_PATH . 'plugins/newmail/sounds'); while($entry=$d->read()) { // $fname = get_location () . '/sounds/' . $entry; - if ($entry != '..' && $entry != '.' && $entry != 'CVS') { + if ($entry != '..' && $entry != '.' && $entry != 'CVS' && $entry != 'index.php') { echo '
\ No newline at end of file +