[mxbb-commits] core/install mx_install.php,1.55,1.56

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

Update of /cvsroot/mxbb/core/install
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12821/install

Modified Files:
	mx_install.php 
Log Message:
schemas and upgrade data are validated

Index: mx_install.php
===================================================================
RCS file: /cvsroot/mxbb/core/install/mx_install.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** mx_install.php	27 Nov 2005 02:14:47 -0000	1.55
--- mx_install.php	9 Dec 2005 00:22:20 -0000	1.56
***************
*** 587,591 ****
  					$portal_config = $db->sql_fetchrow($result);
  					include($mx_root_path . "includes/mx_functions_core.$phpEx");
! 					update_session_cache(MX_ALL_DATA);
  					$process_msgs[] = $lang['Cache_generate'];
  				}
--- 587,591 ----
  					$portal_config = $db->sql_fetchrow($result);
  					include($mx_root_path . "includes/mx_functions_core.$phpEx");
! 					update_session_cache(MX_CACHE_ALL);
  					$process_msgs[] = $lang['Cache_generate'];
  				}
***************
*** 618,625 ****
  		page_header_install($install_title, $message);
  		$template->set_filenames(array('button' => 'mx_install_button.tpl'));
  		$template->assign_vars(array(
! 			'S_FORM_ACTION'			=> $mx_root_path . "index.$phpEx",
  			'S_HIDDEN_FIELDS'		=> '',
! 			'L_SUBMIT'				=> $mx_portal_name,
  		));
  		$template->pparse('button');
--- 618,628 ----
  		page_header_install($install_title, $message);
  		$template->set_filenames(array('button' => 'mx_install_button.tpl'));
+ 		
+ 		$action_label = $install_mode == 'upgrade' ? $lang['Go_to_admincp'] : $mx_portal_name;
+ 		$action_url = $install_mode == 'upgrade' ? $mx_root_path . "admin/index.$phpEx" : $mx_root_path . "index.$phpEx";
  		$template->assign_vars(array(
! 			'S_FORM_ACTION'			=> $action_url,
  			'S_HIDDEN_FIELDS'		=> '',
! 			'L_SUBMIT'				=> $action_label,
  		));
  		$template->pparse('button');
***************
*** 1581,1584 ****
--- 1584,1588 ----
  		if( !($result = parse_cmd_sql($expression)) )
  		{
+ 			//$process_vars[$setvar] = '';
  			return false;
  		}
***************
*** 1680,1684 ****
  			'portal_phpbb_url'	=> "'$phpbb_url'",
  			'portal_url'		=> "'$portal_url'",
! 			'top_phpbb_links'	=> 1,
  		);
  		$sql = "INSERT INTO ".PORTAL_TABLE." (".
--- 1684,1690 ----
  			'portal_phpbb_url'	=> "'$phpbb_url'",
  			'portal_url'		=> "'$portal_url'",
! 			'top_phpbb_links'	=> 0,
! 			'mx_use_cache'		=> 1,
! 			'mod_rewrite'		=> 0,
  		);
  		$sql = "INSERT INTO ".PORTAL_TABLE." (".