[Phpbb-checkins] CVS: phpBB2/admin admin_board.php,1.50,1.51 admin_db_utilities.php,1.40,1.41 admin_disallow.php,1.8,1.9 admin_forum_prune.php,1.19,1.20 admin_forumauth.php,1.22,1.23 admin_forums.php,1.39,1.40 admin_groups.php,1.24,1.25 admin_mass_email.php,1.13,1.14 admin_ranks.php,1.12,1.13 admin_smilies.php,1.20,1.21 admin_styles.php,1.25,1.26 admin_ug_auth.php,1.8,1.9 admin_user_ban.php,1.20,1.21 admin_users.php,1.53,1.54 admin_words.php,1.9,1.10 index.php,1.38,1.39 page_header_admin.php,1.11,1.12

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv12198/admin

Modified Files:
	admin_board.php admin_db_utilities.php admin_disallow.php 
	admin_forum_prune.php admin_forumauth.php admin_forums.php 
	admin_groups.php admin_mass_email.php admin_ranks.php 
	admin_smilies.php admin_styles.php admin_ug_auth.php 
	admin_user_ban.php admin_users.php admin_words.php index.php 
	page_header_admin.php 
Log Message:
Fix problem with user_admin not showing correct status for certain settings + switch to same include series as main files

Index: admin_board.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_board.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** admin_board.php	18 Mar 2002 14:54:24 -0000	1.50
--- admin_board.php	22 Mar 2002 17:00:32 -0000	1.51
***************
*** 24,30 ****
  // Let's set the root dir for phpBB
  //
! $phpbb_root_dir = "./../";
! require('pagestart.inc');
! include($phpbb_root_dir . 'includes/functions_selects.'.$phpEx);
  
  //
--- 24,31 ----
  // Let's set the root dir for phpBB
  //
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
! include($phpbb_root_path . 'includes/functions_selects.'.$phpEx);
  
  //

Index: admin_db_utilities.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_db_utilities.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** admin_db_utilities.php	20 Mar 2002 14:41:20 -0000	1.40
--- admin_db_utilities.php	22 Mar 2002 17:00:32 -0000	1.41
***************
*** 54,60 ****
  // Load default header
  //
- $phpbb_root_dir = "./../";
  $no_page_header = TRUE;
! require('pagestart.inc');
  include($phpbb_root_path . 'includes/sql_parse.'.$phpEx);
  
--- 54,61 ----
  // Load default header
  //
  $no_page_header = TRUE;
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
  include($phpbb_root_path . 'includes/sql_parse.'.$phpEx);
  

Index: admin_disallow.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_disallow.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** admin_disallow.php	20 Mar 2002 00:21:27 -0000	1.8
--- admin_disallow.php	22 Mar 2002 17:00:32 -0000	1.9
***************
*** 34,39 ****
  // Include required files, get $phpEx and check permissions
  //
! $phpbb_root_dir = './../';
! require('pagestart.inc');
  
  if( isset($HTTP_POST_VARS['add_name']) )
--- 34,40 ----
  // Include required files, get $phpEx and check permissions
  //
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
  
  if( isset($HTTP_POST_VARS['add_name']) )

Index: admin_forum_prune.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forum_prune.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** admin_forum_prune.php	18 Mar 2002 14:54:25 -0000	1.19
--- admin_forum_prune.php	22 Mar 2002 17:00:32 -0000	1.20
***************
*** 22,26 ****
  define('IN_PHPBB', 1);
  
! if( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
--- 22,26 ----
  define('IN_PHPBB', 1);
  
! if ( !empty($setmodules) )
  {
  	$filename = basename(__FILE__);
***************
*** 33,39 ****
  // Load default header
  //
! $phpbb_root_dir = "./../";
! require('pagestart.inc');
! include($phpbb_root_path . 'includes/prune.'.$phpEx);
  
  //
--- 33,41 ----
  // Load default header
  //
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
! require($phpbb_root_path . 'includes/prune.'.$phpEx);
! require($phpbb_root_path . 'includes/functions_admin.'.$phpEx); 
  
  //

Index: admin_forumauth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forumauth.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** admin_forumauth.php	18 Mar 2002 14:54:25 -0000	1.22
--- admin_forumauth.php	22 Mar 2002 17:00:32 -0000	1.23
***************
*** 34,40 ****
  // Load default header
  //
- $phpbb_root_dir = "./../";
  $no_page_header = TRUE;
! require('pagestart.inc');
  
  //
--- 34,41 ----
  // Load default header
  //
  $no_page_header = TRUE;
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
  
  //

Index: admin_forums.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forums.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** admin_forums.php	18 Mar 2002 14:54:25 -0000	1.39
--- admin_forums.php	22 Mar 2002 17:00:32 -0000	1.40
***************
*** 33,39 ****
  // Load default header
  //
! $phpbb_root_dir = "./../";
! require('pagestart.inc');
! include($phpbb_root_dir . 'includes/functions_admin.'.$phpEx);
  
  $forum_auth_ary = array(
--- 33,40 ----
  // Load default header
  //
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
! include($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
  
  $forum_auth_ary = array(

Index: admin_groups.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_groups.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** admin_groups.php	19 Mar 2002 15:39:06 -0000	1.24
--- admin_groups.php	22 Mar 2002 17:00:32 -0000	1.25
***************
*** 34,40 ****
  // Load default header
  //
! $phpbb_root_dir = "./../";
! 
! require('pagestart.inc');
  
  if( isset($HTTP_POST_VARS[POST_GROUPS_URL]) || isset($HTTP_GET_VARS[POST_GROUPS_URL]) )
--- 34,40 ----
  // Load default header
  //
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
  
  if( isset($HTTP_POST_VARS[POST_GROUPS_URL]) || isset($HTTP_GET_VARS[POST_GROUPS_URL]) )

Index: admin_mass_email.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_mass_email.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** admin_mass_email.php	18 Mar 2002 14:54:25 -0000	1.13
--- admin_mass_email.php	22 Mar 2002 17:00:32 -0000	1.14
***************
*** 33,39 ****
  // Load default header
  //
- $phpbb_root_dir = "./../";
  $no_page_header = TRUE;
! require('pagestart.inc');
  
  //
--- 33,40 ----
  // Load default header
  //
  $no_page_header = TRUE;
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
  
  //

Index: admin_ranks.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_ranks.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** admin_ranks.php	18 Mar 2002 14:54:25 -0000	1.12
--- admin_ranks.php	22 Mar 2002 17:00:32 -0000	1.13
***************
*** 33,40 ****
  // Let's set the root dir for phpBB
  //
! $phpbb_root_dir = "./../";
! 
! require('pagestart.inc');
! 
  
  if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
--- 33,39 ----
  // Let's set the root dir for phpBB
  //
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
  
  if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )

Index: admin_smilies.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_smilies.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** admin_smilies.php	18 Mar 2002 14:54:25 -0000	1.20
--- admin_smilies.php	22 Mar 2002 17:00:32 -0000	1.21
***************
*** 40,45 ****
  // Load default header
  //
- $phpbb_root_dir = "./../";
- 
  if( isset($HTTP_GET_VARS['export_pack']) )
  {
--- 40,43 ----
***************
*** 49,54 ****
  	}
  }
- require('pagestart.inc');
  
  
  //
--- 47,54 ----
  	}
  }
  
+ $phpbb_root_path = "../";
+ require($phpbb_root_path . 'extension.inc');
+ require('pagestart.' . $phpEx);
  
  //

Index: admin_styles.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_styles.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** admin_styles.php	19 Mar 2002 00:25:03 -0000	1.25
--- admin_styles.php	22 Mar 2002 17:00:32 -0000	1.26
***************
*** 36,44 ****
  // Load default header
  //
- $phpbb_root_dir = "./../";
- 
  //
  // Check if the user has cancled a confirmation message.
  //
  $confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : FALSE;
  $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : FALSE;
--- 36,44 ----
  // Load default header
  //
  //
  // Check if the user has cancled a confirmation message.
  //
+ $phpbb_root_path = "../";
+ 
  $confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : FALSE;
  $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : FALSE;
***************
*** 47,51 ****
  {
  	$no_page_header = ( $cancel ) ? TRUE : FALSE;
! 	require('pagestart.inc');
  }
  
--- 47,52 ----
  {
  	$no_page_header = ( $cancel ) ? TRUE : FALSE;
! 	require($phpbb_root_path . 'extension.inc');
! 	require('pagestart.' . $phpEx);
  }
  
***************
*** 73,77 ****
  		{
  
! 			include($phpbb_root_dir . "templates/" . $install_to . "/theme_info.cfg");
  
  			$template_name = $$install_to;
--- 74,78 ----
  		{
  
! 			include($phpbb_root_path. "templates/" . $install_to . "/theme_info.cfg");
  
  			$template_name = $$install_to;
***************
*** 128,132 ****
  			$installable_themes = array();
  			
! 			if( $dir = @opendir($phpbb_root_dir . "templates/") )
  			{
  				while( $sub_dir = @readdir($dir) )
--- 129,133 ----
  			$installable_themes = array();
  			
! 			if( $dir = @opendir($phpbb_root_path. "templates/") )
  			{
  				while( $sub_dir = @readdir($dir) )
***************
*** 134,140 ****
  					if( !is_file($phpbb_root_path . 'templates/' .$sub_dir) && !is_link($phpbb_root_path . 'templates/' .$sub_dir) && $sub_dir != "." && $sub_dir != ".." && $sub_dir != "CVS" )
  					{
! 						if( @file_exists($phpbb_root_dir . "templates/" . $sub_dir . "/theme_info.cfg") )
  						{
! 							include($phpbb_root_dir . "templates/" . $sub_dir . "/theme_info.cfg");
  							
  							for($i = 0; $i < count($$sub_dir); $i++)
--- 135,141 ----
  					if( !is_file($phpbb_root_path . 'templates/' .$sub_dir) && !is_link($phpbb_root_path . 'templates/' .$sub_dir) && $sub_dir != "." && $sub_dir != ".." && $sub_dir != "CVS" )
  					{
! 						if( @file_exists($phpbb_root_path. "templates/" . $sub_dir . "/theme_info.cfg") )
  						{
! 							include($phpbb_root_path. "templates/" . $sub_dir . "/theme_info.cfg");
  							
  							for($i = 0; $i < count($$sub_dir); $i++)

Index: admin_ug_auth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_ug_auth.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** admin_ug_auth.php	21 Mar 2002 01:56:19 -0000	1.8
--- admin_ug_auth.php	22 Mar 2002 17:00:32 -0000	1.9
***************
*** 35,41 ****
  // Load default header
  //
- $phpbb_root_dir = './../';
  $no_page_header = TRUE;
! require('pagestart.inc');
  
  $params = array('mode' => 'mode', 'user_id' => POST_USERS_URL, 'group_id' => POST_GROUPS_URL, 'adv' => 'adv');
--- 35,43 ----
  // Load default header
  //
  $no_page_header = TRUE;
! 
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
  
  $params = array('mode' => 'mode', 'user_id' => POST_USERS_URL, 'group_id' => POST_GROUPS_URL, 'adv' => 'adv');

Index: admin_user_ban.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_user_ban.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** admin_user_ban.php	20 Mar 2002 01:23:24 -0000	1.20
--- admin_user_ban.php	22 Mar 2002 17:00:32 -0000	1.21
***************
*** 34,39 ****
  // Load default header
  //
! $phpbb_root_dir = "./../";
! require('pagestart.inc');
  
  //
--- 34,40 ----
  // Load default header
  //
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
  
  //

Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -r1.53 -r1.54
*** admin_users.php	19 Mar 2002 00:26:49 -0000	1.53
--- admin_users.php	22 Mar 2002 17:00:33 -0000	1.54
***************
*** 7,11 ****
   *   email                : su...@ph...
   *
!  *   $Id$
   *
   *
--- 7,11 ----
   *   email                : su...@ph...
   *
!  *   $user_id: admin_users.php,v 1.53 2002/03/19 00:26:49 psotfx Exp $
   *
[...1027 lines suppressed...]
! 		'L_USER_SELECT' => $lang['Select_a_User'],
! 		'L_LOOK_UP' => $lang['Look_up_user'],
! 		'L_FIND_USERNAME' => $lang['Find_username'],
  
! 		'U_SEARCH_USER' => append_sid("../search.$phpEx?mode=searchuser"), 
  
! 		'S_USER_ACTION' => append_sid("admin_users.$phpEx"),
! 		'S_USER_SELECT' => $select_list)
  	);
  	$template->pparse('body');
***************
*** 1099,1101 ****
  include('page_footer_admin.'.$phpEx);
  
! ?>
--- 1070,1072 ----
  include('page_footer_admin.'.$phpEx);
  
! ?>
\ No newline at end of file

Index: admin_words.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_words.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** admin_words.php	18 Mar 2002 14:54:25 -0000	1.9
--- admin_words.php	22 Mar 2002 17:00:33 -0000	1.10
***************
*** 33,38 ****
  // Load default header
  //
! $phpbb_root_dir = "./../";
! require('pagestart.inc');
  
  if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
--- 33,39 ----
  // Load default header
  //
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
  
  if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )

Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/index.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** index.php	18 Mar 2002 14:54:25 -0000	1.38
--- index.php	22 Mar 2002 17:00:33 -0000	1.39
***************
*** 26,33 ****
  // Load default header
  //
- $phpbb_root_dir = "./../";
- 
  $no_page_header = TRUE;
! require('pagestart.inc');
  
  // ---------------
--- 26,33 ----
  // Load default header
  //
  $no_page_header = TRUE;
! $phpbb_root_path = "../";
! require($phpbb_root_path . 'extension.inc');
! require('pagestart.' . $phpEx);
  
  // ---------------

Index: page_header_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/page_header_admin.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** page_header_admin.php	18 Mar 2002 14:54:25 -0000	1.11
--- page_header_admin.php	22 Mar 2002 17:00:33 -0000	1.12
***************
*** 36,51 ****
  	$phpver = phpversion();
  
! 	if($phpver >= "4.0.4pl1")
  	{
! 		if(extension_loaded("zlib"))
  		{
! 			ob_start("ob_gzhandler");
  		}
  	}
! 	else if($phpver > "4.0")
  	{
  		if(strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip'))
  		{
! 			if(extension_loaded("zlib"))
  			{
  				$do_gzip_compress = TRUE;
--- 36,51 ----
  	$phpver = phpversion();
  
! 	if($phpver >= '4.0.4pl1')
  	{
! 		if(extension_loaded('zlib'))
  		{
! 			ob_start('ob_gzhandler');
  		}
  	}
! 	else if($phpver > '4.0')
  	{
  		if(strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip'))
  		{
! 			if(extension_loaded('zlib'))
  			{
  				$do_gzip_compress = TRUE;
***************
*** 53,57 ****
  				ob_implicit_flush(0);
  
! 				header("Content-Encoding: gzip");
  			}
  		}
--- 53,57 ----
  				ob_implicit_flush(0);
  
! 				header('Content-Encoding: gzip');
  			}
  		}
***************
*** 60,83 ****
  
  $template->set_filenames(array(
! 	"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
--- 60,67 ----
  
  $template->set_filenames(array(
! 	'header' => 'admin/page_header.tpl')
  );
  
  //
  // 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
***************
*** 85,175 ****
  //
  $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'])
  );
  
- 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");
  
! ?>
--- 69,154 ----
  //
  $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' => 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'])
  );
  
  
! $template->pparse('header');
  
! ?>
\ No newline at end of file