[Phpbb-checkins] CVS: phpBB2/admin admin_styles.php,1.9,1.10

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

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

Modified Files:
	admin_styles.php 
Log Message:
Added body text setting

Index: admin_styles.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_styles.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** admin_styles.php	2001/11/29 08:32:02	1.9
--- admin_styles.php	2001/12/16 02:38:45	1.10
***************
*** 39,58 ****
  // Check if the user has cancled a confirmation message.
  //
! $confirm = ( $HTTP_POST_VARS['confirm'] ) ? TRUE : FALSE;
! $cancel = ( $HTTP_POST_VARS['cancel'] ) ? TRUE : FALSE;
  
! if($cancel)
  {
! 	header("Location: admin_styles.$phpEx");
  }
  
! if(!$HTTP_POST_VARS['send_file'])
  {
  	require('pagestart.inc');
  }
  
! if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
  {
! 	$mode = ($HTTP_GET_VARS['mode']) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode'];
  }
  else 
--- 39,58 ----
  // 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;
  
! if( $cancel )
  {
! 	header("Location: " . append_sid("admin_styles.$phpEx"));
  }
  
! if( !$HTTP_POST_VARS['send_file'] )
  {
  	require('pagestart.inc');
  }
  
! if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
  {
! 	$mode = ( isset($HTTP_GET_VARS['mode']) ) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode'];
  }
  else 
***************
*** 61,71 ****
  }
  
! switch($mode)
  {
  	case "addnew":
! 		$install_to = ($HTTP_GET_VARS['install_to']) ? urldecode($HTTP_GET_VARS['install_to']) : $HTTP_POST_VARS['install_to'];
! 		$style_name = ($HTTP_GET_VARS['style']) ? urldecode($HTTP_GET_VARS['style']) : $HTTP_POST_VARS['style'];
  	
! 		if(isset($install_to))
  		{
  			include($phpbb_root_dir . "templates/" . $install_to . "/theme_info.cfg");
--- 61,71 ----
  }
  
! switch( $mode )
  {
  	case "addnew":
! 		$install_to = ( isset($HTTP_GET_VARS['install_to']) ) ? urldecode($HTTP_GET_VARS['install_to']) : $HTTP_POST_VARS['install_to'];
! 		$style_name = ( isset($HTTP_GET_VARS['style']) ) ? urldecode($HTTP_GET_VARS['style']) : $HTTP_POST_VARS['style'];
  	
! 		if( isset($install_to) )
  		{
  			include($phpbb_root_dir . "templates/" . $install_to . "/theme_info.cfg");
***************
*** 76,80 ****
  			for($i = 0; $i < count($template_name) && !$found; $i++)
  			{
! 				if($template_name[$i]['style_name'] == $style_name)
  				{
  					while(list($key, $val) = each($template_name[$i]))
--- 76,80 ----
  			for($i = 0; $i < count($template_name) && !$found; $i++)
  			{
! 				if( $template_name[$i]['style_name'] == $style_name )
  				{
  					while(list($key, $val) = each($template_name[$i]))
***************
*** 110,114 ****
  			$sql .= ")";
  			
! 			if(!$result = $db->sql_query($sql))
  			{
  				message_die(GENERAL_ERROR, "Could not insert theme data!", "Error", __LINE__, __FILE__, $sql);
--- 110,114 ----
  			$sql .= ")";
  			
! 			if( !$result = $db->sql_query($sql) )
  			{
  				message_die(GENERAL_ERROR, "Could not insert theme data!", "Error", __LINE__, __FILE__, $sql);
***************
*** 193,199 ****
  	case "create":
  	case "edit":
! 		$submit = (isset($HTTP_POST_VARS['submit'])) ? 1 : 0;
  		
! 		if($submit)
  		{
  			//	
--- 193,199 ----
  	case "create":
  	case "edit":
! 		$submit = ( isset($HTTP_POST_VARS['submit']) ) ? TRUE : 0;
  		
! 		if( $submit )
  		{
  			//	
***************
*** 205,208 ****
--- 205,209 ----
  			$updated['body_background'] = $HTTP_POST_VARS['body_background'];
  			$updated['body_bgcolor'] = $HTTP_POST_VARS['body_bgcolor'];
+ 			$updated['body_text'] = $HTTP_POST_VARS['body_text'];
  			$updated['body_link'] = $HTTP_POST_VARS['body_link'];
  			$updated['body_vlink'] = $HTTP_POST_VARS['body_vlink'];
***************
*** 559,566 ****
  				"L_BACKGROUND_IMAGE" => $lang['Background_image'],
  				"L_BACKGROUND_COLOR" => $lang['Background_color'],
! 				"L_BODY_LINK" => $lang['Link_color'],
! 				"L_BODY_VLINK" => $lang['VLink_color'],
! 				"L_BODY_ALINK" => $lang['ALink_color'],
! 				"L_BODY_HLINK" => $lang['HLink_color'],
  				"L_TR_COLOR1" => $lang['Tr_color1'],
  				"L_TR_COLOR2" => $lang['Tr_color2'],
--- 560,568 ----
  				"L_BACKGROUND_IMAGE" => $lang['Background_image'],
  				"L_BACKGROUND_COLOR" => $lang['Background_color'],
! 				"L_BODY_TEXT_COLOR" => $lang['Text_color'],
! 				"L_BODY_LINK_COLOR" => $lang['Link_color'],
! 				"L_BODY_VLINK_COLOR" => $lang['VLink_color'],
! 				"L_BODY_ALINK_COLOR" => $lang['ALink_color'],
! 				"L_BODY_HLINK_COLOR" => $lang['HLink_color'],
  				"L_TR_COLOR1" => $lang['Tr_color1'],
  				"L_TR_COLOR2" => $lang['Tr_color2'],
***************
*** 598,605 ****
  				"BODY_BACKGROUND" => $selected['body_background'],
  				"BODY_BGCOLOR" => $selected['body_bgcolor'],
! 				"BODY_LINK" => $selected['body_link'],
! 				"BODY_VLINK" => $selected['body_vlink'],
! 				"BODY_ALINK" => $selected['body_alink'],
! 				"BODY_HLINK" => $selected['body_hlink'],
  				"TR_COLOR1" => $selected['tr_color1'],
  				"TR_COLOR2" => $selected['tr_color2'],
--- 600,608 ----
  				"BODY_BACKGROUND" => $selected['body_background'],
  				"BODY_BGCOLOR" => $selected['body_bgcolor'],
! 				"BODY_TEXT_COLOR" => $selected['body_text'],
! 				"BODY_LINK_COLOR" => $selected['body_link'],
! 				"BODY_VLINK_COLOR" => $selected['body_vlink'],
! 				"BODY_ALINK_COLOR" => $selected['body_alink'],
! 				"BODY_HLINK_COLOR" => $selected['body_hlink'],
  				"TR_COLOR1" => $selected['tr_color1'],
  				"TR_COLOR2" => $selected['tr_color2'],
***************
*** 792,798 ****
  
  	case "delete":
! 		$style_id = ($HTTP_GET_VARS['style_id']) ? intval($HTTP_GET_VARS['style_id']) : intval($HTTP_POST_VARS['style_id']);
  		
! 		if(!$confirm)
  		{
  			if($style_id == $board_config['default_style'])
--- 795,801 ----
  
  	case "delete":
! 		$style_id = ( isset($HTTP_GET_VARS['style_id']) ) ? intval($HTTP_GET_VARS['style_id']) : intval($HTTP_POST_VARS['style_id']);
  		
! 		if( !$confirm )
  		{
  			if($style_id == $board_config['default_style'])