[mxbb-commits] core/includes mx_functions_admincp.php, 1.39, 1.40 mx_functions_style.php, 1.23, 1.24 page_header.php, 1.46, 1.47

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1046/includes

Modified Files:
	mx_functions_admincp.php mx_functions_style.php 
	page_header.php 
Log Message:
This and that, while updating my work site...

Index: page_header.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/page_header.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** page_header.php	9 Sep 2007 16:48:17 -0000	1.46
--- page_header.php	19 Nov 2007 16:39:56 -0000	1.47
***************
*** 423,426 ****
--- 423,427 ----
  
  	'LOGO' => $images['mx_logo'],
+ 	'THEME_GRAPHICS' => $images['theme_graphics'],
  
  	'NAV_IMAGES_HOME' => $images['mx_nav_home'],
***************
*** 563,566 ****
--- 564,575 ----
  
  //
+ // Handy switch for Admin
+ //
+ if ( $userdata['session_logged_in'] && $userdata['user_level'] == ADMIN )
+ {
+ 	$layouttemplate->assign_block_vars('is_admin', array());
+ }
+ 
+ //
  // Do NOT set basedir when in EDIT mode
  //

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** mx_functions_style.php	28 Oct 2007 17:13:26 -0000	1.23
--- mx_functions_style.php	19 Nov 2007 16:39:56 -0000	1.24
***************
*** 722,725 ****
--- 722,726 ----
  		$style = isset($_POST['default_style']) ? intval($_POST['default_style']) : $init_style;
  		$theme = $this->_setup_style($style);
+ 
  		return;
  	}

Index: mx_functions_admincp.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** mx_functions_admincp.php	6 Aug 2007 21:11:42 -0000	1.39
--- mx_functions_admincp.php	19 Nov 2007 16:39:56 -0000	1.40
***************
*** 3505,3510 ****
  
  						$block_id = $block_row['block_id'];
! 						$block_title = !empty($block_row['block_title']) ? addslashes(strip_tags(trim($block_row['block_title']))) : '';
! 						$block_desc = !empty($block_desc_tmp) ? ' (' . addslashes(strip_tags(trim($block_desc_tmp))) . ')' : '';
  
  						$this->_addBlock($module_id, $function_id, $block_id, $block_title, $block_desc);
--- 3505,3510 ----
  
  						$block_id = $block_row['block_id'];
! 						$block_title = !empty($block_row['block_title']) ? substr(addslashes(strip_tags(trim($block_row['block_title']))), 0, 25 ) : '';
! 						$block_desc = !empty($block_desc_tmp) ? ' (' . substr(addslashes(strip_tags(trim($block_desc_tmp))), 0, 25 ) . ')' : '';
  
  						$this->_addBlock($module_id, $function_id, $block_id, $block_title, $block_desc);
***************
*** 3582,3587 ****
  
  				$block_id = $row[$j]['block_id'];
! 				$block_title = !empty($row[$j]['block_title']) ? addslashes(strip_tags(trim($row[$j]['block_title']))) : '';
! 				$block_desc = !empty($block_desc_tmp) ? ' (' . addslashes(strip_tags(trim($block_desc_tmp))) . ')' : '';
  
  				$this->_addBlock($module_id, $function_id, $block_id, $block_title, $block_desc);
--- 3582,3587 ----
  
  				$block_id = $row[$j]['block_id'];
! 				$block_title = !empty($row[$j]['block_title']) ? substr(addslashes(strip_tags(trim($row[$j]['block_title']))), 0, 25 ) : '';
! 				$block_desc = !empty($block_desc_tmp) ? ' (' . substr(addslashes(strip_tags(trim($block_desc_tmp))), 0, 25 ) . ')' : '';
  
  				$this->_addBlock($module_id, $function_id, $block_id, $block_title, $block_desc);