1 files changed, 87 insertions, 108 deletions
diff --git a/phpBB/admin/page_header_admin.php b/phpBB/admin/page_header_admin.php
index 1d5112559b..7786d464c4 100644
--- a/phpBB/admin/page_header_admin.php
+++ b/phpBB/admin/page_header_admin.php
@@ -35,141 +35,120 @@ if($board_config['gzip_compress'])
 {
 	$phpver = phpversion();
 
-	if($phpver >= "4.0.4pl1")
+	if($phpver >= '4.0.4pl1')
 	{
-		if(extension_loaded("zlib"))
+		if(extension_loaded('zlib'))
 		{
-			ob_start("ob_gzhandler");
+			ob_start('ob_gzhandler');
 		}
 	}
-	else if($phpver > "4.0")
+	else if($phpver > '4.0')
 	{
 		if(strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip'))
 		{
-			if(extension_loaded("zlib"))
+			if(extension_loaded('zlib'))
 			{
 				$do_gzip_compress = TRUE;
 				ob_start();
 				ob_implicit_flush(0);
 
-				header("Content-Encoding: gzip");
+				header('Content-Encoding: gzip');
 			}
 		}
 	}
 }
 
 $template->set_filenames(array(
-	"header" => "admin/page_header.tpl")
+	'header' => 'admin/page_header.tpl')
 );
 
 //
-// Do timezone text output
-//
-if($board_config['board_timezone'] < 0)
-{
-	$s_timezone = $lang['All_times'] . " " .$lang['GMT'] . " - " . (-$board_config['board_timezone']) . " " . $lang['Hours'];
-}
-else if($board_config['board_timezone'] == 0)
-{
-	$s_timezone = $lang['All_times'] . " " . $lang['GMT'];
-}
-else
-{
-	$s_timezone = $lang['All_times'] . " " . $lang['GMT'] ." + " . $board_config['board_timezone'] . " " . $lang['Hours'];
-}
-
-//
 // The following assigns all _common_ variables that may be used at any point
 // in a template. Note that all URL's should be wrapped in append_sid, as
 // should all S_x_ACTIONS for forms.
 //
 $template->assign_vars(array(
-	"SITENAME" => $board_config['sitename'],
-	"PAGE_TITLE" => $page_title,
-
-	"L_ADMIN" => $lang['Admin'], 
-	"L_USERNAME" => $lang['Username'],
-	"L_PASSWORD" => $lang['Password'],
-	"L_INDEX" => $lang['Forum_Index'],
-	"L_REGISTER" => $lang['Register'],
-	"L_PROFILE" => $lang['Profile'],
-	"L_SEARCH" => $lang['Search'],
-	"L_PRIVATEMSGS" => $lang['Private_msgs'],
-	"L_MEMBERLIST" => $lang['Memberlist'],
-	"L_FAQ" => $lang['FAQ'],
-	"L_USERGROUPS" => $lang['Usergroups'],
-	"L_FORUM" => $lang['Forum'],
-	"L_TOPICS" => $lang['Topics'],
-	"L_REPLIES" => $lang['Replies'],
-	"L_VIEWS" => $lang['Views'],
-	"L_POSTS" => $lang['Posts'],
-	"L_LASTPOST" => $lang['Last_Post'],
-	"L_MODERATOR" => $lang['Moderator'],
-	"L_NONEWPOSTS" => $lang['No_new_posts'],
-	"L_NEWPOSTS" => $lang['New_posts'],
-	"L_POSTED" => $lang['Posted'],
-	"L_JOINED" => $lang['Joined'],
-	"L_AUTHOR" => $lang['Author'],
-	"L_MESSAGE" => $lang['Message'],
-	"L_BY" => $lang['by'],
-
-	"U_INDEX" => append_sid("../index.".$phpEx),
-
-	"S_TIMEZONE" => $s_timezone,
-	"S_LOGIN_ACTION" => append_sid("../login.$phpEx"),
-	"S_JUMPBOX_ACTION" => append_sid("../viewforum.$phpEx"),
-	"S_CURRENT_TIME" => create_date($board_config['default_dateformat'], time(), $board_config['board_timezone']), 
-	"S_CONTENT_DIRECTION" => $lang['DIRECTION'], 
-	"S_CONTENT_ENCODING" => $lang['ENCODING'], 
-	"S_CONTENT_DIR_LEFT" => $lang['LEFT'], 
-	"S_CONTENT_DIR_RIGHT" => $lang['RIGHT'], 
-
-	"T_HEAD_STYLESHEET" => $theme['head_stylesheet'],
-	"T_BODY_BACKGROUND" => $theme['body_background'],
-	"T_BODY_BGCOLOR" => "#".$theme['body_bgcolor'],
-	"T_BODY_TEXT" => "#".$theme['body_text'],
-	"T_BODY_LINK" => "#".$theme['body_link'],
-	"T_BODY_VLINK" => "#".$theme['body_vlink'],
-	"T_BODY_ALINK" => "#".$theme['body_alink'],
-	"T_BODY_HLINK" => "#".$theme['body_hlink'],
-	"T_TR_COLOR1" => "#".$theme['tr_color1'],
-	"T_TR_COLOR2" => "#".$theme['tr_color2'],
-	"T_TR_COLOR3" => "#".$theme['tr_color3'],
-	"T_TR_CLASS1" => $theme['tr_class1'],
-	"T_TR_CLASS2" => $theme['tr_class2'],
-	"T_TR_CLASS3" => $theme['tr_class3'],
-	"T_TH_COLOR1" => "#".$theme['th_color1'],
-	"T_TH_COLOR2" => "#".$theme['th_color2'],
-	"T_TH_COLOR3" => "#".$theme['th_color3'],
-	"T_TH_CLASS1" => $theme['th_class1'],
-	"T_TH_CLASS2" => $theme['th_class2'],
-	"T_TH_CLASS3" => $theme['th_class3'],
-	"T_TD_COLOR1" => "#".$theme['td_color1'],
-	"T_TD_COLOR2" => "#".$theme['td_color2'],
-	"T_TD_COLOR3" => "#".$theme['td_color3'],
-	"T_TD_CLASS1" => $theme['td_class1'],
-	"T_TD_CLASS2" => $theme['td_class2'],
-	"T_TD_CLASS3" => $theme['td_class3'],
-	"T_FONTFACE1" => $theme['fontface1'],
-	"T_FONTFACE2" => $theme['fontface2'],
-	"T_FONTFACE3" => $theme['fontface3'],
-	"T_FONTSIZE1" => $theme['fontsize1'],
-	"T_FONTSIZE2" => $theme['fontsize2'],
-	"T_FONTSIZE3" => $theme['fontsize3'],
-	"T_FONTCOLOR1" => "#".$theme['fontcolor1'],
-	"T_FONTCOLOR2" => "#".$theme['fontcolor2'],
-	"T_FONTCOLOR3" => "#".$theme['fontcolor3'],
-	"T_SPAN_CLASS1" => $theme['span_class1'],
-	"T_SPAN_CLASS2" => $theme['span_class2'],
-	"T_SPAN_CLASS3" => $theme['span_class3'])
+	'SITENAME' => $board_config['sitename'],
+	'PAGE_TITLE' => $page_title,
+
+	'L_ADMIN' => $lang['Admin'], 
+	'L_USERNAME' => $lang['Username'],
+	'L_PASSWORD' => $lang['Password'],
+	'L_INDEX' => $lang['Forum_Index'],
+	'L_REGISTER' => $lang['Register'],
+	'L_PROFILE' => $lang['Profile'],
+	'L_SEARCH' => $lang['Search'],
+	'L_PRIVATEMSGS' => $lang['Private_msgs'],
+	'L_MEMBERLIST' => $lang['Memberlist'],
+	'L_FAQ' => $lang['FAQ'],
+	'L_USERGROUPS' => $lang['Usergroups'],
+	'L_FORUM' => $lang['Forum'],
+	'L_TOPICS' => $lang['Topics'],
+	'L_REPLIES' => $lang['Replies'],
+	'L_VIEWS' => $lang['Views'],
+	'L_POSTS' => $lang['Posts'],
+	'L_LASTPOST' => $lang['Last_Post'],
+	'L_MODERATOR' => $lang['Moderator'],
+	'L_NONEWPOSTS' => $lang['No_new_posts'],
+	'L_NEWPOSTS' => $lang['New_posts'],
+	'L_POSTED' => $lang['Posted'],
+	'L_JOINED' => $lang['Joined'],
+	'L_AUTHOR' => $lang['Author'],
+	'L_MESSAGE' => $lang['Message'],
+	'L_BY' => $lang['by'],
+
+	'U_INDEX' => append_sid('../index.'.$phpEx),
+
+	'S_TIMEZONE' => sprintf($lang['All_times'], $lang[$board_config['board_timezone']]),
+	'S_LOGIN_ACTION' => append_sid('../login.'.$phpEx),
+	'S_JUMPBOX_ACTION' => append_sid('../viewforum.'.$phpEx),
+	'S_CURRENT_TIME' => sprintf($lang['Current_time'], create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])), 
+	'S_CONTENT_DIRECTION' => $lang['DIRECTION'], 
+	'S_CONTENT_ENCODING' => $lang['ENCODING'], 
+	'S_CONTENT_DIR_LEFT' => $lang['LEFT'], 
+	'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'], 
+
+	'T_HEAD_STYLESHEET' => $theme['head_stylesheet'],
+	'T_BODY_BACKGROUND' => $theme['body_background'],
+	'T_BODY_BGCOLOR' => '#'.$theme['body_bgcolor'],
+	'T_BODY_TEXT' => '#'.$theme['body_text'],
+	'T_BODY_LINK' => '#'.$theme['body_link'],
+	'T_BODY_VLINK' => '#'.$theme['body_vlink'],
+	'T_BODY_ALINK' => '#'.$theme['body_alink'],
+	'T_BODY_HLINK' => '#'.$theme['body_hlink'],
+	'T_TR_COLOR1' => '#'.$theme['tr_color1'],
+	'T_TR_COLOR2' => '#'.$theme['tr_color2'],
+	'T_TR_COLOR3' => '#'.$theme['tr_color3'],
+	'T_TR_CLASS1' => $theme['tr_class1'],
+	'T_TR_CLASS2' => $theme['tr_class2'],
+	'T_TR_CLASS3' => $theme['tr_class3'],
+	'T_TH_COLOR1' => '#'.$theme['th_color1'],
+	'T_TH_COLOR2' => '#'.$theme['th_color2'],
+	'T_TH_COLOR3' => '#'.$theme['th_color3'],
+	'T_TH_CLASS1' => $theme['th_class1'],
+	'T_TH_CLASS2' => $theme['th_class2'],
+	'T_TH_CLASS3' => $theme['th_class3'],
+	'T_TD_COLOR1' => '#'.$theme['td_color1'],
+	'T_TD_COLOR2' => '#'.$theme['td_color2'],
+	'T_TD_COLOR3' => '#'.$theme['td_color3'],
+	'T_TD_CLASS1' => $theme['td_class1'],
+	'T_TD_CLASS2' => $theme['td_class2'],
+	'T_TD_CLASS3' => $theme['td_class3'],
+	'T_FONTFACE1' => $theme['fontface1'],
+	'T_FONTFACE2' => $theme['fontface2'],
+	'T_FONTFACE3' => $theme['fontface3'],
+	'T_FONTSIZE1' => $theme['fontsize1'],
+	'T_FONTSIZE2' => $theme['fontsize2'],
+	'T_FONTSIZE3' => $theme['fontsize3'],
+	'T_FONTCOLOR1' => '#'.$theme['fontcolor1'],
+	'T_FONTCOLOR2' => '#'.$theme['fontcolor2'],
+	'T_FONTCOLOR3' => '#'.$theme['fontcolor3'],
+	'T_SPAN_CLASS1' => $theme['span_class1'],
+	'T_SPAN_CLASS2' => $theme['span_class2'],
+	'T_SPAN_CLASS3' => $theme['span_class3'])
 );
 
-header ("Cache-Control: no-store, no-cache, must-revalidate");
-header ("Cache-Control: pre-check=0, post-check=0, max-age=0", false);
-header ("Pragma: no-cache");
-header ("Expires: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
-header ("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
 
-$template->pparse("header");
+$template->pparse('header');
 
-?>
+?>
+\ No newline at end of file