Update message copy and move functions to allow for custom handling / ignoring of...

[squirrelmail.git] / functions / display_messages.php

diff --git a/functions/display_messages.php b/functions/display_messages.php
index b22a4e0e008123f2a8c32a48a8999353c0ea2cc6..b6ccd15c2e5ca8418eb8d0aefe83997139cff492 100644 (file)
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -3,7 +3,7 @@
 /**
  * display_messages.php
  *
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * This contains all messages, including information, error, and just
@@ -19,12 +19,12 @@
 require_once(SM_PATH . 'functions/plugin.php');
 
 /**
- * Find out where squirrelmail lives and try to be smart about it.
- * The only problem would be when squirrelmail lives in directories
+ * Find out where SquirrelMail lives and try to be smart about it.
+ * The only problem would be when SquirrelMail lives in directories
  * called "src", "functions", or "plugins", but people who do that need
  * to be beaten with a steel pipe anyway.
  *
- * @return string the base uri of squirrelmail installation.
+ * @return string the base uri of SquirrelMail installation.
  */
 function sqm_baseuri(){
     global $base_uri, $PHP_SELF;
@@ -57,7 +57,7 @@ function plain_error_message($message, $color) {
 
 function logout_error( $errString, $errTitle = '' ) {
     global $frame_top, $org_logo, $org_name, $org_logo_width, $org_logo_height,
-           $hide_sm_attributions, $version, $squirrelmail_language;
+           $hide_sm_attributions, $version, $squirrelmail_language, $color;
 
     $base_uri = sqm_baseuri();
 
@@ -79,7 +79,6 @@ function logout_error( $errString, $errTitle = '' ) {
         $frame_top = '_top';
     }
 
-    // Since $color never is set, this is always true
     if ( !isset( $color ) ) {
         $color = array();
         $color[0]  = '#dcdcdc';  /* light gray    TitleBar               */
@@ -107,8 +106,8 @@ function logout_error( $errString, $errTitle = '' ) {
              "\"$width_and_height /><br />\n";
     }
     echo ( $hide_sm_attributions ? '' :
-            '<small>' . sprintf (_("SquirrelMail version %s"), $version) . '<br />'.
-            _("By the SquirrelMail Development Team") . "<br /></small>\n" ).
+            '<small>' .  _("SquirrelMail Webmail Application") . '<br />'.
+            _("By the SquirrelMail Project Team") . "<br /></small>\n" ).
          '<table cellspacing="1" cellpadding="0" bgcolor="'.$color[1].'" width="70%">'.
          '<tr><td>'.
          '<table width="100%" border="0" bgcolor="'.$color[4].'" align="center">'.
@@ -167,7 +166,7 @@ function error_box($string, $color) {
 /**
  * Adds message that informs about non fatal error that can happen while saving preferences
  * @param string $message error message
- * @since 1.5.1
+ * @since 1.5.1 and 1.4.5
  */
 function error_option_save($message) {
     global $optpage_save_error;
@@ -178,4 +177,4 @@ function error_option_save($message) {
     $optpage_save_error=array_merge($optpage_save_error,array($message));
 }
 // vim: et ts=4
-?>
\ No newline at end of file
+?>