[mxbb-commits] core/install db_convert.php,1.1,1.2

[FlorinCB <ory...@us...>]

Update of /cvsroot/mxbb/core/install
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13611

Modified Files:
	db_convert.php 
Log Message:
upg

Index: db_convert.php
===================================================================
RCS file: /cvsroot/mxbb/core/install/db_convert.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** db_convert.php	5 Oct 2008 08:47:58 -0000	1.1
--- db_convert.php	5 Oct 2008 09:23:59 -0000	1.2
***************
*** 20,25 ****
  $tplEx = @file_exists($mx_root_path.'install/templates/mx_install_header.html') ? 'html' : 'tpl';
  
  
! define('INSTALLER_VERSION', '0.0.1');
  define('INSTALLER_NAME', 'MX-Publisher-DB-Converter');
  
--- 20,32 ----
  $tplEx = @file_exists($mx_root_path.'install/templates/mx_install_header.html') ? 'html' : 'tpl';
  
+ //
+ // Set MX-Publisher version here !
+ //
+ $mx_portal_name 	= 'MX-Publisher Modular System';
+ $mx_portal_version 	= '3.0.0-b3';
+ $mx_php_version		= '5.1.2';
+ $mx_portal_copy 	= '<b>MX-Publisher Modular System!</b> <br /><br/> MX-Publisher is a fully modular system, portal and CMS, featuring dynamic pages, blocks, and themes, by means of a powerful yet flexible AdminCP. It is the classical phpBB portal add-on, improved and enhanced for every phpBB version released since 2001 (originally named MX-Publisher). <br /><br />Authors: The MX-Publisher Development Team. <br />Please visit <a href="http://www.mx-publisher.com/">www.mx-publisher.com</a> for further information.';
  
! define('INSTALLER_VERSION', '0.9.0');
  define('INSTALLER_NAME', 'MX-Publisher-DB-Converter');
  
***************
*** 42,47 ****
--- 49,69 ----
  
  include_once($mx_root_path . "includes/db/" . $dbms . ".$phpEx"); // Load dbal and initiate class
+ include_once($mx_root_path . 'includes/mx_functions_core.' . $phpEx); // CORE class
  include_once($mx_root_path . "install/includes/functions_install.$phpEx");
  
+ //
+ // instatiate the mx_request_vars class
+ // make sure to do before it's ever used
+ $mx_request_vars = new mx_request_vars();
+ 
+ //
+ // phpInfo --------------------------------------------------
+ //
+ if ($mx_request_vars->is_get('phpinfo'))
+ {
+ 	show_phpinfo();
+ 	exit;
+ }
+ 
  $db = new $sql_db();
  if(!$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, false))
***************
*** 51,54 ****
--- 73,81 ----
  unset($dbpasswd);
  
+ include_once($mx_root_path . "install/includes/template.$phpEx");
+ 
+ $template = new Template($mx_root_path . 'install/templates');
+ 
+ page_header_install($lang['Installation_error'], INSTALLER_NAME);
  
  switch ($db->sql_layer)
***************
*** 153,156 ****
--- 180,185 ----
  }
  
+ page_footer_install();
+ 
  //
  // Close our DB connection.