X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions.php;h=7dd666ff2dcd77a3da2649a5ec110909b74bafb9;hb=f00e7a9b0bc3d91f13f9c5752f1682f2959e9c8d;hp=a3dece042ab440fcc712982566d1f02308be1a1c;hpb=6e515418431c0a99f10705da21366fe7093f95b6;p=squirrelmail.git
diff --git a/src/options.php b/src/options.php
index a3dece04..7dd666ff 100644
--- a/src/options.php
+++ b/src/options.php
@@ -6,7 +6,7 @@
* Displays the options page. Pulls from proper user preference files
* and config.php. Displays preferences as selected and other options.
*
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright © 1999-2007 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
@@ -243,6 +243,7 @@ if ($optpage == SMOPT_PAGE_MAIN) {
}
if (isset($optpage_save_error) && $optpage_save_error!=array()) {
+//FIXME: REMOVE HTML FROM CORE
$notice = _("Error(s) occurred while saving your options") . "
\n
\n";
foreach ($optpage_save_error as $error_message) {
$notice.= '- ' . $error_message . "
\n";
@@ -256,9 +257,19 @@ if ($optpage == SMOPT_PAGE_MAIN) {
/* If $max_refresh != SMOPT_REFRESH_NONE, provide a refresh link. */
if ( !isset( $max_refresh ) ) {
} else if ($max_refresh == SMOPT_REFRESH_FOLDERLIST) {
- $notice .= '' . _("Refresh Folder List") . '
';
+//FIXME: REMOVE HTML FROM CORE - when migrating, keep in mind that the javascript below assumes the folder list is in a separate sibling frame under the same parent, and it is called "left"
+ if (checkForJavascript()) {
+ $notice .= sprintf(_("Folder list should automatically %srefresh%s."), '', '') . '
\n";
+ } else {
+ $notice .= '' . _("Refresh Folder List") . '
';
+ }
} else if ($max_refresh) {
- $notice .= '' . _("Refresh Page") . '
';
+ if (checkForJavascript()) {
+//FIXME: REMOVE HTML FROM CORE - when migrating, keep in mind that the javascript below assumes the parent is the top-most SM frame and is what should be refreshed with webmail.php
+ $notice .= sprintf(_("This page should automatically %srefresh%s."), '', '') . '
\n";
+ } else {
+ $notice .= '' . _("Refresh Page") . '
';
+ }
}
}
@@ -331,7 +342,7 @@ if ($optpage == SMOPT_PAGE_MAIN) {
foreach ($optpage_blocks as $cur_optpage) {
if (!isset($cur_optpage['js']) || !$cur_optpage['js']) {
$reg_optpage_blocks[] = $cur_optpage;
- } else if ($javascript_on == SMPREF_JS_ON) {
+ } else if (checkForJavascript()) {
$js_optpage_blocks[] = $cur_optpage;
}
}
@@ -395,6 +406,7 @@ if ($optpage == SMOPT_PAGE_MAIN) {
. create_optpage_element($optpage)
. create_optmode_element(SMOPT_MODE_SUBMIT);
+//FIXME: NO HTML IN THE CORE!!
// Wrap the template in a table to keep from breaking the hooks below
echo "