From 04fa3c41370a9af66de1f649cf2a25560d31ab56 Mon Sep 17 00:00:00 2001 From: jervfors Date: Mon, 9 Aug 2004 15:48:15 +0000 Subject: [PATCH] XHTML fixes git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7872 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/page_header.php | 4 +- plugins/squirrelspell/modules/check_me.mod | 50 +++++------ plugins/squirrelspell/modules/edit_dic.mod | 14 ++-- plugins/squirrelspell/modules/enc_setup.mod | 14 ++-- .../squirrelspell/modules/forget_me_not.mod | 4 +- plugins/squirrelspell/modules/init.mod | 12 +-- plugins/squirrelspell/modules/lang_setup.mod | 8 +- plugins/squirrelspell/setup.php | 82 +++++++++---------- plugins/squirrelspell/sqspell_functions.php | 22 ++--- src/addrbook_popup.php | 32 ++++---- themes/darkness.php | 2 +- 11 files changed, 122 insertions(+), 122 deletions(-) diff --git a/functions/page_header.php b/functions/page_header.php index 134d8254..9dc29bb7 100644 --- a/functions/page_header.php +++ b/functions/page_header.php @@ -49,7 +49,7 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE if ($squirrelmail_language == 'ja_JP') { echo "\n"; - echo '' . "\n"; + echo '' . "\n"; } if ($do_hook) { @@ -347,7 +347,7 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) { echo "\n"; } echo " \n". - "
\n\n"; + "
\n\n"; } /** diff --git a/plugins/squirrelspell/modules/check_me.mod b/plugins/squirrelspell/modules/check_me.mod index a6cb6e8a..3281d6ed 100644 --- a/plugins/squirrelspell/modules/check_me.mod +++ b/plugins/squirrelspell/modules/check_me.mod @@ -121,9 +121,9 @@ if ($sqspell_exitcode){ . sprintf(_("I tried to execute '%s', but it returned:"), $sqspell_command) . "
"
      . join("\n", htmlspecialchars($sqspell_output)) . "
" - . "
" - . "
"; + . '
' + . '
'; sqspell_makeWindow(null, _("SquirrelSpell is misconfigured."), null, $msg); exit; } @@ -225,7 +225,7 @@ if ($errors){ * Check if there are user-defined stylesheets. */ if ($theme_css != '') { - echo "\n"; + echo "\n"; } /** * Load the spelling errors into JavaScript arrays @@ -311,7 +311,7 @@ if ($errors){ -
+
@@ -365,7 +365,7 @@ if ($errors){ + onfocus="if(!this.value) this.value=document.forms[0].sqspell_error.value" /> - + -
+
@@ -406,21 +406,21 @@ if ($errors){ -
+
- - ' - . ' '; + + ' + . ' '; ?> @@ -435,9 +435,9 @@ if ($errors){ /** * AREN'T YOU SUCH A KNOW-IT-ALL! */ - $msg="
" - . "
"; + $msg='
'. + '
'; sqspell_makeWindow(null, _("No errors found"), null, $msg); } @@ -448,4 +448,4 @@ if ($errors){ * End: * vim: syntax=php et ts=4 */ -?> +?> \ No newline at end of file diff --git a/plugins/squirrelspell/modules/edit_dic.mod b/plugins/squirrelspell/modules/edit_dic.mod index ffbad568..90a7a6e9 100644 --- a/plugins/squirrelspell/modules/edit_dic.mod +++ b/plugins/squirrelspell/modules/edit_dic.mod @@ -58,9 +58,9 @@ if (!$words){ . sprintf( _("%s dictionary"), $langs[$i] ) . '' . '' . '
' - . '' + . '' . '' + . $langs[$i] . '" />' . '' . '' . "
\n"; @@ -82,14 +82,14 @@ if (!$words){ $msg .= "\n"; } $msg .= " ' - . htmlspecialchars($words_ary[$j]) . "
\n"; + . 'value="'.htmlspecialchars($words_ary[$j]). '" /> ' + . htmlspecialchars($words_ary[$j]) . "
\n"; } $msg .= '
' . "" . '
' - . '
' + . '" />' + . '
' . "\n"; } } @@ -112,4 +112,4 @@ if (!$words){ * vim: syntax=php */ -?> +?> \ No newline at end of file diff --git a/plugins/squirrelspell/modules/enc_setup.mod b/plugins/squirrelspell/modules/enc_setup.mod index 9b76cf76..dd5ad951 100644 --- a/plugins/squirrelspell/modules/enc_setup.mod +++ b/plugins/squirrelspell/modules/enc_setup.mod @@ -53,14 +53,14 @@ if ($SQSPELL_CRYPTO){ . _("If you forget your password, your personal dictionary will become unaccessible, since it can no longer be decrypted. If you change your mailbox password, SquirrelSpell will recognize it and prompt you for your old password in order to re-encrypt the dictionary with a new key.") . '

' . '
' - . '' + . '' . '

' + . 'value="decrypt" /> ' . _("Please decrypt my personal dictionary and store it in a clear-text format." ) . '

' . '

' + . ' " />

' . '
'; } else { /** @@ -78,13 +78,13 @@ if ($SQSPELL_CRYPTO){ . _("If you decide to encrypt your personal dictionary, you must remember that it gets "hashed" with your mailbox password. If you forget your mailbox password and the administrator changes it to a new value, your personal dictionary will become useless and will have to be created anew. However, if you or your system administrator change your mailbox password but you still have the old password at hand, you will be able to enter the old key to re-encrypt the dictionary with the new value.") . '

' . '
' - . '' + . '' . '

' + . 'value="encrypt" /> ' . _("Please encrypt my personal dictionary and store it in an encrypted format.") . '

' . '

' + . _("Change crypto settings") . ' " />

' . '
'; } sqspell_makePage(_("Personal Dictionary Crypto Settings"), @@ -98,4 +98,4 @@ sqspell_makePage(_("Personal Dictionary Crypto Settings"), * vim: syntax=php */ -?> +?> \ No newline at end of file diff --git a/plugins/squirrelspell/modules/forget_me_not.mod b/plugins/squirrelspell/modules/forget_me_not.mod index cbfd5611..bf7029e5 100644 --- a/plugins/squirrelspell/modules/forget_me_not.mod +++ b/plugins/squirrelspell/modules/forget_me_not.mod @@ -71,7 +71,7 @@ sqspell_writeWords($words_dic); $onload = "setTimeout('self.close()', 2000)"; $msg = '
' . '
'; + . _("Close") . ' " onclick="self.close()" />'; sqspell_makeWindow($onload, _("Personal Dictionary Updated"), null, $msg); /** @@ -82,4 +82,4 @@ sqspell_makeWindow($onload, _("Personal Dictionary Updated"), null, $msg); * vim: syntax=php */ -?> +?> \ No newline at end of file diff --git a/plugins/squirrelspell/modules/init.mod b/plugins/squirrelspell/modules/init.mod index 4b8d3d8d..f303b2ca 100644 --- a/plugins/squirrelspell/modules/init.mod +++ b/plugins/squirrelspell/modules/init.mod @@ -21,8 +21,8 @@ */ $langs=sqspell_getSettings(null); $msg = '
' - . '' - . '' + . '' + . '' . '

'; if (sizeof($langs)==1){ /** @@ -32,7 +32,7 @@ if (sizeof($langs)==1){ $onload="sqspell_init(true)"; $msg .= _("Please wait, communicating with the server...") . '

' - . ""; + . ""; } else { /** * More than one dictionary. Let the user choose the dictionary first @@ -50,7 +50,7 @@ if (sizeof($langs)==1){ $msg .= " value=\"$langs[$i]\"> " . _($langs[$i]) . "\n"; } $msg .= ' ' - . '' + . '' . '

'; } $msg .="
\n"; @@ -63,5 +63,5 @@ sqspell_makeWindow($onload, _("SquirrelSpell Initiating"), "init.js", $msg); * End: * vim: syntax=php */ - -?> + +?> \ No newline at end of file diff --git a/plugins/squirrelspell/modules/lang_setup.mod b/plugins/squirrelspell/modules/lang_setup.mod index 36c445d6..d19afba6 100644 --- a/plugins/squirrelspell/modules/lang_setup.mod +++ b/plugins/squirrelspell/modules/lang_setup.mod @@ -22,7 +22,7 @@ $msg = '

' . _("Please check any available international dictionaries which you would like to use when spellchecking:") . '

' . '
' - . '' + . '' . '

'; /** * Present a nice listing. @@ -37,7 +37,7 @@ while (list($avail_lang, $junk) = each($SQSPELL_APP)){ if (in_array($avail_lang, $langs)) { $msg .= ' checked'; } - $msg .= '> ' . _($avail_lang) . "
\n"; + $msg .= ' /> ' . _($avail_lang) . "
\n"; $add .= "\n"; $msg .= "

"; + . _("Make these changes") . " \" />

"; sqspell_makePage(_("Add International Dictionaries"), null, $msg); /** @@ -57,4 +57,4 @@ sqspell_makePage(_("Add International Dictionaries"), null, $msg); * vim: syntax=php */ -?> +?> \ No newline at end of file diff --git a/plugins/squirrelspell/setup.php b/plugins/squirrelspell/setup.php index 06ecd71b..0b1b1a3f 100644 --- a/plugins/squirrelspell/setup.php +++ b/plugins/squirrelspell/setup.php @@ -21,13 +21,13 @@ * @return void */ function squirrelmail_plugin_init_squirrelspell() { - global $squirrelmail_plugin_hooks; - $squirrelmail_plugin_hooks['compose_button_row']['squirrelspell'] = - 'squirrelspell_setup'; - $squirrelmail_plugin_hooks['optpage_register_block']['squirrelspell'] = - 'squirrelspell_optpage_register_block'; - $squirrelmail_plugin_hooks['options_link_and_description']['squirrelspell'] = - 'squirrelspell_options'; + global $squirrelmail_plugin_hooks; + $squirrelmail_plugin_hooks['compose_button_row']['squirrelspell'] = + 'squirrelspell_setup'; + $squirrelmail_plugin_hooks['optpage_register_block']['squirrelspell'] = + 'squirrelspell_optpage_register_block'; + $squirrelmail_plugin_hooks['options_link_and_description']['squirrelspell'] = + 'squirrelspell_options'; } /** @@ -37,22 +37,22 @@ function squirrelmail_plugin_init_squirrelspell() { * @return void */ function squirrelspell_optpage_register_block() { - global $optpage_blocks; - /** - * Check if this browser is capable of using the plugin - */ - if (checkForJavascript()) { + global $optpage_blocks; /** - * The browser checks out. - * Register Squirrelspell with the $optionpages array. + * Check if this browser is capable of using the plugin */ - $optpage_blocks[] = - array( - 'name' => _("SpellChecker Options"), - 'url' => '../plugins/squirrelspell/sqspell_options.php', - 'desc' => _("Here you may set up how your personal dictionary is stored, edit it, or choose which languages should be available to you when spell-checking."), - 'js' => TRUE); - } + if (checkForJavascript()) { + /** + * The browser checks out. + * Register Squirrelspell with the $optionpages array. + */ + $optpage_blocks[] = + array( + 'name' => _("SpellChecker Options"), + 'url' => '../plugins/squirrelspell/sqspell_options.php', + 'desc' => _("Here you may set up how your personal dictionary is stored, edit it, or choose which languages should be available to you when spell-checking."), + 'js' => TRUE); + } } /** @@ -62,26 +62,26 @@ function squirrelspell_optpage_register_block() { * @return void */ function squirrelspell_setup() { - /** - * Check if this browser is capable of displaying SquirrelSpell - * correctly. - */ - if (checkForJavascript()) { /** - * Some people may choose to disable javascript even though their - * browser is capable of using it. So these freaks don't complain, - * use document.write() so the "Check Spelling" button is not - * displayed if js is off in the browser. + * Check if this browser is capable of displaying SquirrelSpell + * correctly. */ - echo "\n"; - } + if (checkForJavascript()) { + /** + * Some people may choose to disable javascript even though their + * browser is capable of using it. So these freaks don't complain, + * use document.write() so the "Check Spelling" button is not + * displayed if js is off in the browser. + */ + echo "\n"; + } } -?> +?> \ No newline at end of file diff --git a/plugins/squirrelspell/sqspell_functions.php b/plugins/squirrelspell/sqspell_functions.php index 4acf28d3..094ac8d1 100644 --- a/plugins/squirrelspell/sqspell_functions.php +++ b/plugins/squirrelspell/sqspell_functions.php @@ -47,7 +47,7 @@ function sqspell_makePage($title, $scriptsrc, $body){ html_tag( 'td', '' . $title .'', 'center', $color[9] ) ) . "\n" . html_tag( 'tr', "\n" . - html_tag( 'td', '
', 'left' ) + html_tag( 'td', '
', 'left' ) ) . "\n" . html_tag( 'tr', "\n" . html_tag( 'td', $body, 'left' ) @@ -58,7 +58,7 @@ function sqspell_makePage($title, $scriptsrc, $body){ */ if ($MOD != "options_main"){ echo html_tag( 'tr', "\n" . - html_tag( 'td', '
', 'left' ) + html_tag( 'td', '
', 'left' ) ) . "\n" . html_tag( 'tr', "\n" . html_tag( 'td', '' @@ -71,7 +71,7 @@ function sqspell_makePage($title, $scriptsrc, $body){ * Close the table and display the version. */ echo html_tag( 'tr', "\n" . - html_tag( 'td', '
', 'left' ) + html_tag( 'td', '
', 'left' ) ) . "\n" . html_tag( 'tr', html_tag( 'td', 'SquirrelSpell ' . $SQSPELL_VERSION, 'center', $color[9] ) @@ -103,7 +103,7 @@ function sqspell_makeWindow($onload, $title, $scriptsrc, $body){ * Check if we have a defined css theme to use. */ if ($theme_css != "") { - echo "\n"; + echo "\n"; } /** * Link in the .js file if needed @@ -129,13 +129,13 @@ function sqspell_makeWindow($onload, $title, $scriptsrc, $body){ html_tag( 'td', '' . $title . '', 'center', $color[9] ) ) . "\n" . html_tag( 'tr', "\n" . - html_tag( 'td', '
', 'left' ) + html_tag( 'td', '
', 'left' ) ) . "\n" . html_tag( 'tr', "\n" . html_tag( 'td', $body, 'left' ) ) . "\n" . html_tag( 'tr', "\n" . - html_tag( 'td', '
', 'left' ) + html_tag( 'td', '
', 'left' ) ) . "\n" . html_tag( 'tr', "\n" . html_tag( 'td', 'SquirrelSpell ' . $SQSPELL_VERSION, 'center', $color[9] ) @@ -375,17 +375,17 @@ function sqspell_getWords(){ 'left' ) . "\n" . '
' . "\n" . '' . "\n" - . '' . "\n" + . '' . "\n" . html_tag( 'p', "\n" . - '' + '' . _("Delete my dictionary and start a new one") . '
' . _("Decrypt my dictionary with my old password:") - . '' , + . '' , 'left' ) . "\n" . '
' . "\n" . html_tag( 'p', "\n" . '' , + . _("Proceed") . ' >>" />' , 'center' ) . "\n" . '' . "\n"; /** @@ -537,4 +537,4 @@ function sqspell_ckMOD($rMOD){ * stuff. :) */ $SQSPELL_VERSION="v0.3.8"; -?> +?> \ No newline at end of file diff --git a/src/addrbook_popup.php b/src/addrbook_popup.php index ac2cf5f3..1800c3cf 100644 --- a/src/addrbook_popup.php +++ b/src/addrbook_popup.php @@ -25,19 +25,19 @@ require_once(SM_PATH . 'functions/addressbook.php'); ?> - - - <?php echo "$org_title: " . _("Address Book"); ?> - - - - - - + + + <?php echo "$org_title: " . _("Address Book"); ?> + + + + + + diff --git a/themes/darkness.php b/themes/darkness.php index 61fbb488..c8c8d202 100755 --- a/themes/darkness.php +++ b/themes/darkness.php @@ -41,7 +41,7 @@ function Darkness_HeaderPlugin() { if (substr($PHP_SELF, -18) == '/src/left_main.php') { echo '' . "\n"; + 'blendTrans(Duration=2.0)" />' . "\n"; } ?>