From: <ki...@us...> - 2007-03-06 15:40:18
|
Revision: 12317 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12317&view=rev Author: kink Date: 2007-03-06 07:40:12 -0800 (Tue, 06 Mar 2007) Log Message: ----------- use org_title instead of SquirrelMail in error box (from Nasmail, approved by Jon) Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/functions/display_messages.php Modified: branches/SM-1_4-STABLE/squirrelmail/functions/display_messages.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/display_messages.php 2007-03-06 15:34:57 UTC (rev 12316) +++ branches/SM-1_4-STABLE/squirrelmail/functions/display_messages.php 2007-03-06 15:40:12 UTC (rev 12317) @@ -108,7 +108,7 @@ } function error_box($string, $color) { - global $pageheader_sent; + global $pageheader_sent, $org_title; if ( !isset( $color ) ) { $color = array(); @@ -120,6 +120,9 @@ $color[8] = '#000000'; /* black Normal text */ $color[9] = '#ababab'; /* mid-gray Darker version of #0 */ } + if ( !isset( $org_title ) ) { + $org_title = "SquirrelMail"; + } $err = _("ERROR"); @@ -132,7 +135,7 @@ if(!isset($pageheader_sent) && !$pageheader_sent) { /* include this just to be sure */ include_once( SM_PATH . 'functions/page_header.php' ); - displayHtmlHeader('SquirrelMail: '.$err); + displayHtmlHeader($org_title.': '.$err); $pageheader_sent = TRUE; echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\">\n\n"; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2007-08-09 06:49:28
|
Revision: 12576 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12576&view=rev Author: pdontthink Date: 2007-08-08 23:49:27 -0700 (Wed, 08 Aug 2007) Log Message: ----------- Remove default folder prefix from being displayed on error page. Complements RisuMail Team - risumail.jp Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/functions/display_messages.php Modified: branches/SM-1_4-STABLE/squirrelmail/functions/display_messages.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/display_messages.php 2007-08-09 06:49:14 UTC (rev 12575) +++ branches/SM-1_4-STABLE/squirrelmail/functions/display_messages.php 2007-08-09 06:49:27 UTC (rev 12576) @@ -18,11 +18,18 @@ require_once(SM_PATH . 'functions/plugin.php'); function error_message($message, $mailbox, $sort, $startMessage, $color) { + + global $default_folder_prefix; + $urlMailbox = urlencode($mailbox); $string = '<tr><td align="center">' . $message . '</td></tr>'. '<tr><td align="center">'. - '<a href="'.sqm_baseuri()."src/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\">". - sprintf (_("Click here to return to %s"), + '<a href="'.sqm_baseuri()."src/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\">"; + + if (strpos($mailbox, $default_folder_prefix) === 0) + $mailbox = substr($mailbox, strlen($default_folder_prefix)); + + $string .= sprintf (_("Click here to return to %s"), htmlspecialchars(imap_utf7_decode_local($mailbox))). '</a></td></tr>'; error_box($string, $color); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pdo...@us...> - 2007-12-01 02:29:21
|
Revision: 12797 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12797&view=rev Author: pdontthink Date: 2007-11-30 18:29:12 -0800 (Fri, 30 Nov 2007) Log Message: ----------- Remove obsolete hack; reshuffle hook so plugins can correctly override org_logo stuff on logout errors Modified Paths: -------------- branches/SM-1_4-STABLE/squirrelmail/functions/display_messages.php Modified: branches/SM-1_4-STABLE/squirrelmail/functions/display_messages.php =================================================================== --- branches/SM-1_4-STABLE/squirrelmail/functions/display_messages.php 2007-11-30 07:49:50 UTC (rev 12796) +++ branches/SM-1_4-STABLE/squirrelmail/functions/display_messages.php 2007-12-01 02:29:12 UTC (rev 12797) @@ -46,13 +46,15 @@ $hide_sm_attributions, $version, $squirrelmail_language, $color, $theme, $theme_default; + include_once( SM_PATH . 'functions/page_header.php' ); + $base_uri = sqm_baseuri(); - include_once( SM_PATH . 'functions/page_header.php' ); - if ( !isset( $org_logo ) ) { - // Don't know yet why, but in some accesses $org_logo is not set. - include( SM_PATH . 'config/config.php' ); - } + $logout_link = $base_uri . 'src/login.php'; + + list($junk, $errString, $errTitle, $logout_link) + = do_hook('logout_error', $errString, $errTitle, $logout_link); + /* Display width and height like good little people */ $width_and_height = ''; if (isset($org_logo_width) && is_numeric($org_logo_width) && $org_logo_width>0) { @@ -80,11 +82,6 @@ $color[8] = '#000000'; /* black Normal text */ } - $logout_link = $base_uri . 'src/login.php'; - - list($junk, $errString, $errTitle, $logout_link) - = do_hook('logout_error', $errString, $errTitle, $logout_link); - if ( $errTitle == '' ) { $errTitle = $errString; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |