[mxbb-commits] core27x/admin admin_mx_gen_cache.php,1.1,1.2 admin_mx_menu.php,1.1,1.2 pagestart.php,1.1,1.2 admin_mx_block_edit.php,1.1,NONE

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

Update of /cvsroot/mxbb/core27x/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4750/core27x/admin

Modified Files:
	admin_mx_gen_cache.php admin_mx_menu.php pagestart.php 
Removed Files:
	admin_mx_block_edit.php 
Log Message:
massive commit, for 2.7.7
http://www.mx-system.com/forum/viewtopic.php?t=6902

Index: pagestart.php
===================================================================
RCS file: /cvsroot/mxbb/core27x/admin/pagestart.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pagestart.php	6 May 2005 06:47:56 -0000	1.1
--- pagestart.php	26 May 2005 21:54:08 -0000	1.2
***************
*** 53,57 ****
  if ($HTTP_GET_VARS['sid'] != $userdata['session_id'])
  {
! 	mx_redirect(PORTAL_URL . "admin/index.$phpEx?sid=" . $userdata['session_id']);
  }
  
--- 53,58 ----
  if ($HTTP_GET_VARS['sid'] != $userdata['session_id'])
  {
! 	//mx_redirect(PORTAL_URL . "admin/index.$phpEx?sid=" . $userdata['session_id']);
! 	mx_redirect("admin/index.$phpEx?sid=" . $userdata['session_id']);
  }
  

Index: admin_mx_gen_cache.php
===================================================================
RCS file: /cvsroot/mxbb/core27x/admin/admin_mx_gen_cache.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** admin_mx_gen_cache.php	6 May 2005 06:47:56 -0000	1.1
--- admin_mx_gen_cache.php	26 May 2005 21:54:08 -0000	1.2
***************
*** 10,15 ****
   *
   ***************************************************************************/
- $no_page_header = TRUE;
- 
  if( !empty($setmodules) )
  {
--- 10,13 ----
***************
*** 18,30 ****
  }
  
  define('IN_PORTAL', 1);
! $mx_root_path = '../';
! 
! // Security and page header
  
- require('./pagestart.php');
  
  // Getting mode of operation
! 
  $generate = ( $mx_request_vars->request('generate', MX_TYPE_INT, 0) == 1 ? true : false );
  
--- 16,32 ----
  }
  
+ //
+ // Security and Page header
+ //
  define('IN_PORTAL', 1);
! $mx_root_path = './../';
! require($mx_root_path . 'extension.inc');
! $no_page_header = TRUE;
! require('./pagestart.' . $phpEx);
  
  
+ //
  // Getting mode of operation
! //
  $generate = ( $mx_request_vars->request('generate', MX_TYPE_INT, 0) == 1 ? true : false );
  
***************
*** 36,42 ****
  );
  
  // Main procedure
! 
! if ( !$generate )
  {
  	$message = $lang['Cache_explain'] . '<br />&nbsp;<br />&nbsp;<br />';
--- 38,45 ----
  );
  
+ //
  // Main procedure
! //
! if( !$generate )
  {
  	$message = $lang['Cache_explain'] . '<br />&nbsp;<br />&nbsp;<br />';
***************
*** 48,96 ****
  else
  {
! 
! 	$cache_dir = $mx_root_path . 'cache/';
! 	include($cache_dir . "mx_cache.$phpEx");
! 
! 	@mkdir($cache_dir, 0777);
! 	@chmod($cache_dir, 0777);
! 
! 	if ( !is_writable($cache_dir) )
! 	{
! 		$message = $lang['Cache_dir_write_protect'];
! 		mx_message_die(GENERAL_MESSAGE, $message, '');
! 		exit;
! 	}
! 
! 	$sql = "SELECT blk.block_id
! 				, blk.block_title
! 				, blk.block_desc
! 				, blk.function_id
! 				, blk.auth_view
! 				, blk.auth_edit
! 				, blk.auth_delete
! 				, blk.auth_view_group
! 				, blk.auth_edit_group
! 		FROM " . BLOCK_TABLE . " blk
! 		ORDER BY blk.block_id";
! 
! 	db2xml($sql, $cache_dir. "block_config.xml");
! 
! 	$sql = "SELECT sys.parameter_id
! 				, sys.block_id
! 				, par.parameter_name
! 				, sys.parameter_value
! 				, sys.bbcode_uid
! 		FROM " . BLOCK_SYSTEM_PARAMETER_TABLE . " sys,
! 			" . PARAMETER_TABLE . " par
! 		WHERE sys.parameter_id = par.parameter_id
! 		ORDER BY sys.block_id, sys.parameter_id";
! 
! 	db2xml($sql, $cache_dir. "block_config_param.xml");
! 
! 	//
! 	// Unset all session variables, so it will force
! 	// loading all cached data to the admin session.
! 	//
! 	@session_unset();
  
  	$message = $lang['Cache_generate'];
--- 51,56 ----
  else
  {
! 	// Update mxBB cache
! 	$mx_cache->update( ); 	
  
  	$message = $lang['Cache_generate'];

Index: admin_mx_menu.php
===================================================================
RCS file: /cvsroot/mxbb/core27x/admin/admin_mx_menu.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** admin_mx_menu.php	6 May 2005 06:47:56 -0000	1.1
--- admin_mx_menu.php	26 May 2005 21:54:08 -0000	1.2
***************
*** 37,41 ****
  if ( !empty($HTTP_POST_VARS['block_id']) || !empty($HTTP_GET_VARS['block_id']) )
  {
! 	$block_id = ( !empty($HTTP_POST_VARS['block_id']) ) ? $HTTP_POST_VARS['block_id'] : $HTTP_GET_VARS['block_id'];
  }
  else
--- 37,41 ----
  if ( !empty($HTTP_POST_VARS['block_id']) || !empty($HTTP_GET_VARS['block_id']) )
  {
! 	$block_id = isset($HTTP_GET_VARS['block_id']) ? intval($HTTP_GET_VARS['block_id']) : intval($HTTP_POST_VARS['block_id']);
  }
  else

--- admin_mx_block_edit.php DELETED ---