[prev in list] [next in list] [prev in thread] [next in thread]
List: squirrelmail-cvs
Subject: [SM-CVS] CVS: squirrelmail/functions display_messages.php,1.91,1.92
From: Steve Brown <stevetruckstuff () users ! sourceforge ! net>
Date: 2006-03-28 22:39:54
Message-ID: E1FOMqw-0007of-Vk () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]
Update of /cvsroot/squirrelmail/squirrelmail/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30020/functions
Modified Files:
display_messages.php
Log Message:
Adding template for error box.
Index: display_messages.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/display_messages.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -w -r1.91 -r1.92
--- display_messages.php 18 Feb 2006 16:11:46 -0000 1.91
+++ display_messages.php 28 Mar 2006 22:39:52 -0000 1.92
@@ -142,21 +142,9 @@
* @since 1.3.2
*/
function error_box($string, $color) {
- global $pageheader_sent;
-
- if ( !isset( $color ) ) {
- $color = array();
- $color[0] = '#dcdcdc'; /* light gray TitleBar */
- $color[1] = '#800000'; /* red */
- $color[2] = '#cc0000'; /* light red Warning/Error Messages */
- $color[4] = '#ffffff'; /* white Normal Background */
- $color[7] = '#0000cc'; /* blue Links */
- $color[8] = '#000000'; /* black Normal text */
- $color[9] = '#ababab'; /* mid-gray Darker version of #0 */
- }
+ global $pageheader_sent, $oTemplate;
$err = _("ERROR");
-
$ret = concat_hook_function('error_box', $string);
if($ret != '') {
$string = $ret;
@@ -168,18 +156,13 @@
include_once( SM_PATH . 'functions/page_header.php' );
displayHtmlHeader('SquirrelMail: '.$err);
$pageheader_sent = TRUE;
- echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" \
vlink=\"$color[7]\" alink=\"$color[7]\">\n\n"; + echo "<body>\n\n";
}
- echo '<table width="100%" cellpadding="1" cellspacing="0" align="center" \
border="0" bgcolor="'.$color[9].'">'.
- '<tr><td>'.
- '<table width="100%" cellpadding="0" cellspacing="0" align="center" \
border="0" bgcolor="'.$color[4].'">'.
- '<tr><td align="center" bgcolor="'.$color[0].'">'.
- '<font color="'.$color[2].'"><b>' . $err . ':</b></font>'.
- '</td></tr><tr><td>'.
- '<table cellpadding="1" cellspacing="5" align="center" border="0">'.
- '<tr>' . html_tag( 'td', $string."\n", 'left') . '</tr></table>'.
- '</td></tr></table></td></tr></table>';
+ /** ERROR is pre-translated to avoid multiple translation calls. **/
+ $oTemplate->assign('error', $err);
+ $oTemplate->assign('errorMessage', $string);
+ $oTemplate->display('error_box.tpl');
}
/**
@@ -195,5 +178,4 @@
$optpage_save_error=array_merge($optpage_save_error,array($message));
}
-// vim: et ts=4
?>
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
--
squirrelmail-cvs mailing list
List Address: squirrelmail-cvs@lists.sourceforge.net
List Info: https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
http://squirrelmail.org/cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic