updating error_box() function calls. second argument was modified.

using squirrelmail template code for closing html tags.
added some comments in footer.tpl in order to detect generated footer

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11135 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/addressbook.php b/functions/addressbook.php
index 0e20957a76cdc23832fad0e396c872e4c57d2ac2..e4872446ea5d1a850b2e8c219e44ddb5d3b021d4 100644 (file)
--- a/functions/addressbook.php
+++ b/functions/addressbook.php
@@ -27,7 +27,7 @@ include_once(SM_PATH . 'templates/util_global.php');
  * @return object address book object.
  */
 function addressbook_init($showerr = true, $onlylocal = false) {
-    global $data_dir, $username, $color, $ldap_server, $address_book_global_filename;
+    global $data_dir, $username, $ldap_server, $address_book_global_filename;
     global $addrbook_dsn, $addrbook_table;
     global $abook_global_file, $abook_global_file_writeable, $abook_global_file_listing;
     global $addrbook_global_dsn, $addrbook_global_table, $addrbook_global_writeable, $addrbook_global_listing;
@@ -158,7 +158,7 @@ function addressbook_init($showerr = true, $onlylocal = false) {
      * display address book init errors.
      */
     if ($abook_init_error!='' && $showerr) {
-        error_box($abook_init_error,$color);
+        error_box($abook_init_error);
     }
 
     /* Return the initialized object */

diff --git a/functions/display_messages.php b/functions/display_messages.php
index f0c79f254c31a4fa4a8561f14910f7ebef8edb2e..f5300b383a3fb2896df39b86057382331c4cfee7 100644 (file)
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -109,11 +109,19 @@ function logout_error( $errString, $errTitle = '' ) {
  * Displays error message
  * 
  * Since 1.4.1 function checks if page header is already displayed.
+ * 
  * Since 1.4.3 and 1.5.1 function contains error_box hook.
  * Use plain_error_message() and make sure that page header is created,
  * if you want compatibility with 1.4.0 and older.
+ *
+ * In 1.5.2 second function argument is changed. Older functions used it
+ * for $color array, new function uses it for optional link data. Function 
+ * will ignore color array and use standard colors instead.
  * @param string $string Error message to be displayed
- * @param mixed $link Optional array containing link details to be displayed
+ * @param array $link Optional array containing link details to be displayed.
+ *  Array uses three keys. 'URL' key is required and should contain link URL.
+ *  'TEXT' key is optional and should contain link name. 'FRAME' key is 
+ *  optional and should contain link target attribute.
  * @since 1.3.2
  */
 function error_box($string, $link=NULL) {
@@ -134,10 +142,14 @@ function error_box($string, $link=NULL) {
 
     // Double check the link for everything we need
     if (!is_null($link)) {
-        if (!isset($link['FRAME']))
-            $link['FRAME'] = '';
-        if (!isset($link['TEXT']))
-            $link['TEXT'] = $link['URL'];
+        // safety check for older code
+        if (isset($link['URL'])) {
+            if (!isset($link['FRAME'])) $link['FRAME'] = '';
+            if (!isset($link['TEXT'])) $link['TEXT'] = $link['URL'];
+        } else {
+            // somebody used older error_box() code
+            $link=null;
+        }
     }
     
     /** ERROR is pre-translated to avoid multiple translation calls. **/

diff --git a/functions/folder_manip.php b/functions/folder_manip.php
index 3211c88872c95491f21681dd55736046aba21240..22ef6e13539c56296803e85ccde3e329aae2436d 100644 (file)
--- a/functions/folder_manip.php
+++ b/functions/folder_manip.php
@@ -25,15 +25,16 @@ function folders_checkname($imapConnection, $folder_name, $delimiter)
     if (substr_count($folder_name, '"') || substr_count($folder_name, "\\") ||
         substr_count($folder_name, $delimiter) || ($folder_name == '')) {
 
-        global $color;
+        global $color, $oTemplate;
         error_box(_("Illegal folder name.") . "<br />\n" .
                 sprintf(_("The name may not contain any of the following: %s"), '<tt>" \\ '.$delimiter.'</tt>')
                 . "<br />\n" .
                 _("Please select a different name.").
                 '<br /><a href="folders.php">'.
-                _("Click here to go back") . '</a>.', $color);
+                _("Click here to go back") . '</a>.');
 
         sqimap_logout($imapConnection);
+        $oTemplate->display('footer.tpl');
         exit;
     }
 }

diff --git a/functions/imap_general.php b/functions/imap_general.php
index 80d40d1270710330e92528f1486b674db42f095e..01d51f347500a116f1b4ce0983ad36e8b843d864 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -66,7 +66,7 @@ function sqimap_run_command_list ($imap_stream, $query, $handle_errors, &$respon
         $string = "<b><font color=\"$color[2]\">\n" .
                 _("ERROR: No available IMAP stream.") .
                 "</b></font>\n";
-        error_box($string,$color);
+        error_box($string);
         return false;
     }
 }
@@ -116,7 +116,7 @@ function sqimap_run_command ($imap_stream, $query, $handle_errors, &$response,
         $string = "<b><font color=\"$color[2]\">\n" .
                 _("ERROR: No available IMAP stream.") .
                 "</b></font>\n";
-        error_box($string,$color);
+        error_box($string);
         return false;
     }
 }
@@ -314,7 +314,7 @@ function sqimap_fread($imap_stream,$iSize,$filter=false,
  */
 function sqimap_read_data_list($imap_stream, $tag, $handle_errors,
           &$response, &$message, $query = '') {
-    global $color, $squirrelmail_language;
+    global $color, $oTemplate, $squirrelmail_language;
     set_up_language($squirrelmail_language);
     $string = "<b><font color=\"$color[2]\">\n" .
         _("ERROR: Bad function call.") .
@@ -326,8 +326,8 @@ function sqimap_read_data_list($imap_stream, $tag, $handle_errors,
           'sqimap_run_command or sqimap_run_command_list instead<br /><br />'.
           'The following query was issued:<br />'.
            htmlspecialchars($query) . '<br />' . "</font><br />\n";
-    error_box($string,$color);
-    echo '</body></html>';
+    error_box($string);
+    $oTemplate->display('footer.tpl');
     exit;
 }
 
@@ -359,7 +359,7 @@ function sqimap_error_box($title, $query = '', $message_title = '', $message = '
     $string .= "</font><br />\n";
     if ($link != '')
         $string .= $link;
-    error_box($string,$color);
+    error_box($string);
 }
 
 /**
@@ -878,7 +878,7 @@ function sqimap_login ($username, $password, $imap_server_address, $imap_port, $
                         $string .= htmlspecialchars($line) . "<br />\n";
                     }
                 }
-                error_box($string,$color);
+                error_box($string);
                 exit;
             } else {
                 /*

diff --git a/plugins/bug_report/bug_report.php b/plugins/bug_report/bug_report.php
index 5f95e2432c58e7ebb7cc90605a96149f1d556ed6..f24cfccc049803b5400fb198d548cab71e95048f 100644 (file)
--- a/plugins/bug_report/bug_report.php
+++ b/plugins/bug_report/bug_report.php
@@ -28,8 +28,8 @@ displayPageHeader($color, 'None');
 
 /** is bug_report plugin disabled or called by wrong user */
 if (! is_plugin_enabled('bug_report') || ! bug_report_check_user()) {
-    error_box(_("Plugin is disabled."),$color);
-    echo "\n</body></html>\n";
+    error_box(_("Plugin is disabled."));
+    $oTemplate->display('footer.tpl');
     exit();
 }
 

diff --git a/plugins/bug_report/show_system_specs.php b/plugins/bug_report/show_system_specs.php
index 6d79a4fdd68f1d44025a071c238047f770ecc8f8..293e13b991e317de605fc087f4e9576bf3164c2d 100644 (file)
--- a/plugins/bug_report/show_system_specs.php
+++ b/plugins/bug_report/show_system_specs.php
@@ -19,8 +19,8 @@ include_once(SM_PATH.'plugins/bug_report/functions.php');
 
 /** is bug_report plugin disabled or called by wrong user */
 if (! is_plugin_enabled('bug_report') || ! bug_report_check_user()) {
-    error_box(_("Plugin is disabled."),$color);
-    echo "\n</body></html>\n";
+    error_box(_("Plugin is disabled."));
+    $oTemplate->display('footer.tpl');
     exit();
 }
 ?>

diff --git a/plugins/calendar/calendar_data.php b/plugins/calendar/calendar_data.php
index 3d6fe0afb8bddf01119a6325f61dc016abdcff9f..bb32daa30bf6f8f523942c597704dd0f887dc2b8 100644 (file)
--- a/plugins/calendar/calendar_data.php
+++ b/plugins/calendar/calendar_data.php
@@ -116,7 +116,7 @@ function writecalendardata() {
 
                 $calstr = "$calfoo[key]|$calbar[key]|$calfoobar[length]|$calfoobar[priority]|$calfoobar[title]|$calfoobar[message]|$calfoobar[reminder]\n";
                 if(sq_fwrite($fp, $calstr, 4096) === FALSE) {
-                    error_box(_("Could not write calendar file %s", "$username.$year.cal.tmp"), $color);
+                    error_box(_("Could not write calendar file %s", "$username.$year.cal.tmp"));
                 }
             }
 

diff --git a/plugins/change_password/backend/ldap.php b/plugins/change_password/backend/ldap.php
index 34697600791c7b7a421103cbf8f8655d5dba8496..42f128ff0ddcc70f555f15cf57d63bd8f2007926 100644 (file)
--- a/plugins/change_password/backend/ldap.php
+++ b/plugins/change_password/backend/ldap.php
@@ -158,27 +158,26 @@ $squirrelmail_plugin_hooks['change_password_init']['ldap'] =
  * Makes sure that required functions and configuration options are set.
  */
 function cpw_ldap_init() {
-    global $color;
-    global $cpw_ldap_basedn;
+    global $oTemplate, $cpw_ldap_basedn;
 
     // set initial value for error tracker
     $cpw_ldap_initerr=false;
 
     // check for ldap support in php
     if (! function_exists('ldap_connect')) {
-        error_box(_("Current configuration requires LDAP support in PHP."),$color);
+        error_box(_("Current configuration requires LDAP support in PHP."));
         $cpw_ldap_initerr=true;
     }
 
     // chech required configuration settings.
     if ($cpw_ldap_basedn=='') {
-        error_box(_("Plugin is not configured correctly."),$color);
+        error_box(_("Plugin is not configured correctly."));
         $cpw_ldap_initerr=true;
     }
 
     // if error var is positive, close html and stop execution
     if ($cpw_ldap_initerr) {
-        echo '</body></html>';
+        $oTemplate->display('footer.tpl');
         exit;
     }
 }

diff --git a/plugins/change_password/backend/merak.php b/plugins/change_password/backend/merak.php
index ea845f9d6fbb1db2ca24d64d30eeafa0f90f7629..2a9458865429480ff0593be1a716edd73b0f5f86 100644 (file)
--- a/plugins/change_password/backend/merak.php
+++ b/plugins/change_password/backend/merak.php
@@ -41,13 +41,13 @@ $squirrelmail_plugin_hooks['change_password_init']['merak'] =
  * Check if php install has all required extensions.
  */
 function cpw_merak_init() {
-    global $color;
+    global $oTemplate;
 
     if (!function_exists('curl_init')) {
         // user_error('Curl module NOT available!', E_USER_ERROR);
-        error_box(_("PHP Curl extension is NOT available! Unable to change password!"),$color);
+        error_box(_("PHP Curl extension is NOT available! Unable to change password!"));
         // close html and stop script execution
-        echo "</body></html>\n";
+        $oTemplate->display('footer.tpl');
         exit();
     }
 }

diff --git a/plugins/change_password/backend/peardb.php b/plugins/change_password/backend/peardb.php
index e3d10413d9061b600d01f46f4e7827843a54a453..acec149328b0fda3c6a94c87837d20cd28d1f5d3 100644 (file)
--- a/plugins/change_password/backend/peardb.php
+++ b/plugins/change_password/backend/peardb.php
@@ -106,19 +106,19 @@ $squirrelmail_plugin_hooks['change_password_init']['peardb'] =
  * Checks if configuration is correct
  */
 function cpw_peardb_init() {
-    global $color, $cpw_peardb_detect, $cpw_peardb_dsn, $cpw_peardb_table;
+    global $oTemplate, $cpw_peardb_detect, $cpw_peardb_dsn, $cpw_peardb_table;
 
     if (! $cpw_peardb_detect) {
-        error_box(_("Plugin is unable to use PHP Pear DB libraries. PHP Pear includes must be available in your PHP include_path setting."),$color);
-        echo "</body></html>\n";
+        error_box(_("Plugin is unable to use PHP Pear DB libraries. PHP Pear includes must be available in your PHP include_path setting."));
+        $oTemplate->display('footer.tpl');
         exit();
     }
 
     // Test required settings
     if ((is_string($cpw_peardb_dsn) && trim($cpw_peardb_dsn)=='')
         || trim($cpw_peardb_table)=='' ) {
-        error_box(_("Required change password backend configuration options are missing."),$color);
-        echo "</body></html>\n";
+        error_box(_("Required change password backend configuration options are missing."));
+        $oTemplate->display('footer.tpl');
         exit();
     }
 }

diff --git a/plugins/change_password/backend/template.php b/plugins/change_password/backend/template.php
index e7b0a8b474fe2c7505beee37f053e098657476fc..16bd3279c77859be521dbc6d11314fa4ef5e1301 100644 (file)
--- a/plugins/change_password/backend/template.php
+++ b/plugins/change_password/backend/template.php
@@ -39,12 +39,12 @@ $squirrelmail_plugin_hooks['change_password_init']['template'] =
  */
 function cpw_template_init()
 {
-    global $color;
+    global $oTemplate;
 
     // plugin is not configured. Handle error gracefully.
-    error_box(_("No valid backend defined."),$color);
+    error_box(_("No valid backend defined."));
     // close html and stop script execution
-    echo "</body></html>\n";
+    $oTemplate->display('footer.tpl');
     exit();
 }
 

diff --git a/plugins/change_password/backend/vmailmgrd.php b/plugins/change_password/backend/vmailmgrd.php
index e8f70a62131cab093f519bd2e54d7f148497afa2..1a5fb9fff69b7cda4ab23e1bb6c36eb511721c95 100644 (file)
--- a/plugins/change_password/backend/vmailmgrd.php
+++ b/plugins/change_password/backend/vmailmgrd.php
@@ -104,13 +104,13 @@ $squirrelmail_plugin_hooks['change_password_init']['vmailmgrd'] =
  * is displayed to the user.
  */
 function cpw_vmailmgrd_init(){
-    global $vmail_inc_path, $color, $username;
+    global $vmail_inc_path, $username, $oTemplate;
 
     if ($vmail_inc_path=='' || ! file_exists($vmail_inc_path)) {
         // $vmail_inc_path is not set or file does not exist
-        error_box(_("Incorrent path to vmail.inc file."),$color);
+        error_box(_("Incorrent path to vmail.inc file."));
         // close html and stop script execution
-        echo "</body></html>\n";
+        $oTemplate->display('footer.tpl');
         exit();
     }
 
@@ -118,17 +118,17 @@ function cpw_vmailmgrd_init(){
 
     if (! function_exists('vchpass')) {
         // included vmail.inc does not have required functions.
-        error_box(_("Invalid or corrupted vmail.inc file."),$color);
+        error_box(_("Invalid or corrupted vmail.inc file."));
         // close html and stop script execution
-        echo "</body></html>\n";
+        $oTemplate->display('footer.tpl');
         exit();
     }
 
     if (! preg_match("/(.*)\@(.*)/", $username)) {
         // username does not match vmailmgr syntax
-        error_box(_("Invalid user."),$color);
+        error_box(_("Invalid user."));
         // close html and stop script execution
-        echo "</body></html>\n";
+        $oTemplate->display('footer.tpl');
         exit();
     }
 }

diff --git a/plugins/info/options.php b/plugins/info/options.php
index 1046b86b70c4e9d9b7a495fab4543f21c1194559..85677c19448a674c4cd6c89bb74203fa54cbce3d 100644 (file)
--- a/plugins/info/options.php
+++ b/plugins/info/options.php
@@ -35,8 +35,9 @@ $mailbox = 'INBOX';
  * prevent use of plugin if it is not enabled
  */
 if (! is_plugin_enabled('info')) {
-    error_box(_("Plugin is disabled."),$color);
-    echo '</body></html>';
+    error_box(_("Plugin is disabled."));
+    // display footer (closes html) and stop script execution
+    $oTemplate->display('footer.tpl');
     exit;
 }
 

diff --git a/plugins/listcommands/mailout.php b/plugins/listcommands/mailout.php
index c319fc10b43279908c2edac82d1d130f2233939b..dd9e5de180ee7a551e8ab7891cf0628cd5a41c17 100644 (file)
--- a/plugins/listcommands/mailout.php
+++ b/plugins/listcommands/mailout.php
@@ -41,7 +41,9 @@ switch ( $action ) {
         $out_string = _("This will send a message to %s requesting that you will be unsubscribed from this list. It will try to unsubscribe the adress below.");
         break;
     default:
-        error_box(sprintf(_("Unknown action: %s"),htmlspecialchars($action)), $color);
+        error_box(sprintf(_("Unknown action: %s"),htmlspecialchars($action)));
+        // display footer (closes html tags) and stop script execution
+        $oTemplate->display('footer.tpl');
         exit;
 }
 

diff --git a/plugins/sent_subfolders/setup.php b/plugins/sent_subfolders/setup.php
index 42070e334ea692b9f69670a0b1863430414a9cf6..4f9f38ea99a9d012a47e7daac310dc3ab0b9bdb8 100644 (file)
--- a/plugins/sent_subfolders/setup.php
+++ b/plugins/sent_subfolders/setup.php
@@ -254,7 +254,7 @@ function sent_subfolders_update_sentfolder() {
                 if (sqimap_mailbox_is_noselect($ic,$sent_subfolder,$boxes) ||
                     ($level==2 && sqimap_mailbox_is_noinferiors($ic,$year_folder,$boxes)) ||
                      sqimap_mailbox_is_noinferiors($ic,$sent_subfolders_base,$boxes)) {
-                    error_box(_("Sent Subfolders plugin is misconfigured."),$color);
+                    error_box(_("Sent Subfolders plugin is misconfigured."));
                 } else {
                     if ($level==2) {
                         /* Auto-create the year folder, if it does not yet exist. */

diff --git a/plugins/spamcop/spamcop.php b/plugins/spamcop/spamcop.php
index a073034458f226d417472f4e5fd2e498d7b81733..96ede3aae4ce4b402e0c8659bb35b1db264f8b67 100644 (file)
--- a/plugins/spamcop/spamcop.php
+++ b/plugins/spamcop/spamcop.php
@@ -57,8 +57,9 @@ if ($js_web) {
 
 /** is spamcop plugin disabled */
 if (! is_plugin_enabled('spamcop')) {
-    error_box(_("Plugin is disabled."),$color);
-    echo "\n</body></html>\n";
+    error_box(_("Plugin is disabled."));
+    // display footer (closes html tags) and stop script execution
+    $oTemplate->display('footer.tpl');
     exit();
 }
 

diff --git a/plugins/squirrelspell/modules/check_me.mod b/plugins/squirrelspell/modules/check_me.mod
index 7f0273bdca7400625eda7f37eb238efb39dd3819..1fb75b5d358865295056d14ee1e49e755ff13215 100644 (file)
--- a/plugins/squirrelspell/modules/check_me.mod
+++ b/plugins/squirrelspell/modules/check_me.mod
@@ -100,21 +100,21 @@ if( check_php_version ( 4, 3 ) ) {
     if ( ! is_resource ( $spell_proc ) ) {
         // TODO: replace error_box() with sqspell_makeWindow()
         error_box ( sprintf(_("Could not run the spellchecker command (%s)."),
-            htmlspecialchars($sqspell_command) ) , $color );
-        // close html tags and abort script.
-        echo "</body></html>";
+            htmlspecialchars($sqspell_command) ) );
+        // display footer (closes html tags) and stop script execution
+        $oTemplate->display('footer.tpl');
         exit();
     }
     if ( ! @fwrite($pipes[0], $sqspell_new_text) ) {
         // TODO: replace error_box() with sqspell_makeWindow()
-        error_box ( _("Error while writing to pipe.") , $color );
+        error_box ( _("Error while writing to pipe.") );
         // close all three $pipes here.
         for($i=0; $i<=2; $i++) {
             // disable all fclose error messages
             @fclose($pipes[$i]);
         }
         // close html tags and abort script.
-        echo "</body></html>";
+        $oTemplate->display('footer.tpl');
         exit();
     }
     fclose($pipes[0]);
@@ -140,19 +140,19 @@ if( check_php_version ( 4, 3 ) ) {
     if ( ! is_resource ($fp) ) {
         // TODO: replace error_box() with sqspell_makeWindow()
         error_box ( sprintf(_("Could not open temporary file '%s'."),
-            htmlspecialchars($floc) ) , $color );
+            htmlspecialchars($floc) ) );
         // failed to open temp file. abort script.
-        echo "</body></html>";
+        $oTemplate->display('footer.tpl');
         exit();
     }
     if ( ! @fwrite($fp, $sqspell_new_text) ) {
         // TODO: replace error_box() with sqspell_makeWindow()
         error_box ( sprintf(_("Error while writing to temporary file '%s'."),
-            htmlspecialchars($floc) ) , $color );
+            htmlspecialchars($floc) ) );
         // close file descriptor
         fclose($fp);
         // failed writing to temp file. abort script.
-        echo "</body></html>";
+        $oTemplate->display('footer.tpl');
         exit();
     }
     fclose($fp);

diff --git a/plugins/squirrelspell/sqspell_interface.php b/plugins/squirrelspell/sqspell_interface.php
index 4d3cf5e2c83a76ca664030ac785aad70fd12fb9f..417e8c60e2e01a2e9ee6f4382505e0d3dcc05e07 100644 (file)
--- a/plugins/squirrelspell/sqspell_interface.php
+++ b/plugins/squirrelspell/sqspell_interface.php
@@ -46,7 +46,8 @@ sqspell_ckMOD($MOD);
 if (file_exists(SM_PATH . $SQSPELL_DIR . "modules/$MOD.mod")) {
     require_once(SM_PATH . $SQSPELL_DIR . "modules/$MOD.mod");
 } else {
-    error_box(_("Invalid SquirrelSpell module."),$color);
-    echo '</body></html>';
+    error_box(_("Invalid SquirrelSpell module."));
+    // display sm footer (closes html tags)
+    $oTemplate->display('footer.tpl');
 }
 ?>
\ No newline at end of file

diff --git a/plugins/squirrelspell/sqspell_options.php b/plugins/squirrelspell/sqspell_options.php
index a477575b86a6105f0ff0cdaa93e02e440d406938..7db23a006f0e9282c7c946060b4253973a88eb34 100644 (file)
--- a/plugins/squirrelspell/sqspell_options.php
+++ b/plugins/squirrelspell/sqspell_options.php
@@ -43,7 +43,8 @@ sqspell_ckMOD($MOD);
 if (file_exists(SM_PATH . $SQSPELL_DIR . "modules/$MOD.mod")) {
     require_once(SM_PATH . $SQSPELL_DIR . "modules/$MOD.mod");
 } else {
-    error_box(_("Invalid SquirrelSpell module."),$color);
-    echo '</body></html>';
+    error_box(_("Invalid SquirrelSpell module."));
+    // display footer (closes html tags)
+    $oTemplate->display('footer.tpl');
 }
 ?>
\ No newline at end of file

diff --git a/plugins/translate/functions.php b/plugins/translate/functions.php
index 8acae0c1540076a9f363ab372a8c88ac6aed1184..4dfcdabf1943e7ef5d358370351ab325420989fb 100644 (file)
--- a/plugins/translate/functions.php
+++ b/plugins/translate/functions.php
@@ -85,7 +85,7 @@ function translate_read_form_function() {
     $translate_server_option='translate_' . $translate_server . '_enabled';
     if ($translate_server=='gpltrans' && $translate_gpltrans_url=='' ||
         ! $$translate_server_option || ! function_exists('translate_form_' . $translate_server)) {
-        error_box(_("Selected translation engine is disabled. Please update your translation preferences."),$color);
+        error_box(_("Selected translation engine is disabled. Please update your translation preferences."));
         return;
     }
     $translate_dir = 'to';

diff --git a/src/delete_message.php b/src/delete_message.php
index 5c6cd38ee6a83748f847816d3db52b345a288b14..a46f96e45b841d41a4b64e929a94ed6a1433ad7b 100644 (file)
--- a/src/delete_message.php
+++ b/src/delete_message.php
@@ -15,6 +15,6 @@
  * Include the SquirrelMail initialization file.
  */
 include('../include/init.php');
-error_box('delete_message.php script is obsolete since 1.5.1.',$color);
+error_box('delete_message.php script is obsolete since 1.5.1.');
 $oTemplate->display('footer.tpl');
 ?>
\ No newline at end of file

diff --git a/src/help.php b/src/help.php
index f9d07b51aa3c28bd06a0197eccc18c5ebc200461..4f75306fc1a4b1399ff72a055decba34164f8014 100644 (file)
--- a/src/help.php
+++ b/src/help.php
@@ -111,12 +111,14 @@ if (!isset($squirrelmail_language)) {
 if (file_exists("../help/$squirrelmail_language")) {
     $user_language = $squirrelmail_language;
 } else if (file_exists('../help/en_US')) {
-    error_box(_("Help is not available in the selected language. It will be displayed in English instead."), $color);
+    error_box(_("Help is not available in the selected language. It will be displayed in English instead."));
     echo '<br />';
     $user_language = 'en_US';
 } else {
-    error_box( _("Help is not available. Please contact your system administrator for assistance."), $color );
-    exit;
+    error_box( _("Help is not available. Please contact your system administrator for assistance."));
+    // display footer (closes html tags) and stop script execution
+    $oTemplate->display('footer.tpl');
+    exit();
 }
 
 
@@ -195,7 +197,7 @@ if ( $chapter == 0 || !isset( $helpdir[$chapter-1] ) ) {
     } elseif (file_exists("../help/en_US/" . $helpdir[$chapter-1])) {
         // If the selected language can't be found, try English.
         $doc = file("../help/en_US/" . $helpdir[$chapter-1]);
-        error_box(_("This chapter in not available in the selected language. It will be displayed in English instead."), $color);
+        error_box(_("This chapter in not available in the selected language. It will be displayed in English instead."));
         echo '<br />';
     } else {
         // If English can't be found, the chapter went MIA.
@@ -245,7 +247,7 @@ if ( $chapter == 0 || !isset( $helpdir[$chapter-1] ) ) {
         echo '<br /><div style="text-align: center;"><a href="#pagetop">' . _("Top") . '</a></div>';
     } else {
         // If the help file went MIA, display an error message.
-        error_box(sprintf(_("For some reason, chapter %s is not available."), $chapter), $color);
+        error_box(sprintf(_("For some reason, chapter %s is not available."), $chapter));
     }
 }
 

diff --git a/src/login.php b/src/login.php
index 69d1e170c8b078b24272a007bda5edde65f24ee6..02e81c694d2044b3fe6b35af29a4cc2fb4f3b6f3 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -67,7 +67,9 @@ if($imap_auth_mech == 'login') {
                 $string .= _("Also, the use of TLS may allow SquirrelMail to login.").'<br />';
             }
             $string .= _("Please contact your system administrator and report this error.");
-            error_box($string,$color);
+            error_box($string);
+            // display footer (closes html tags) and stop script execution
+            $oTemplate->display('footer.tpl');
             exit;
         }
     }
@@ -131,10 +133,10 @@ if (isset($org_logo) && $org_logo) {
     }
     
     $logo_str = '<img src="'.$org_logo.'" ' .
-                       'alt="'. sprintf(_("%s Logo"), $org_name).'" ' .
-                       $width_and_height .
+                'alt="'. sprintf(_("%s Logo"), $org_name).'" ' .
+                $width_and_height .
                 'class="sqm_loginImage" ' .
-                       ' /><br />'."\n";
+                ' /><br />'."\n";
 }
 
 $sm_attribute_str = '';

diff --git a/src/printer_friendly_main.php b/src/printer_friendly_main.php
index fa6de8f44d51cd8c9a303cc5ac6716c2cc630ea2..45050fabdd89b5f2b8200f242afb6fea17763e2a 100644 (file)
--- a/src/printer_friendly_main.php
+++ b/src/printer_friendly_main.php
@@ -20,7 +20,7 @@ if ( ! sqgetGlobalVar('passed_ent_id',$passed_ent_id,SQ_GET))
     $passed_ent_id = 0;
 if ( ! sqgetGlobalVar('mailbox',$mailbox,SQ_GET) ||
      ! sqgetGlobalVar('passed_id',$passed_id,SQ_GET)) {
-    error_box(_("Invalid URL"),$color);
+    error_box(_("Invalid URL"));
 } else {
     $passed_id= (int) $passed_id;
     $view_unsafe_images = (bool) $_GET['view_unsafe_images'];

diff --git a/templates/default/footer.tpl b/templates/default/footer.tpl
index 8de1394ddb87d7c1e90067c663287b546a8421b1..e330ad4e9ae64fda165ae30336cd1a715b7b3a21 100644 (file)
--- a/templates/default/footer.tpl
+++ b/templates/default/footer.tpl
@@ -18,5 +18,6 @@
 extract($t);
 $this->display('error_message.tpl');
 ?>
+<!-- end of generated html -->
 </body>
 </html>
\ No newline at end of file