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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/mxbb/core/install
In directory vz-cvs-4.sog:/tmp/cvs-serv18373

Modified Files:
	convert_utf8_mysql.php convert_utf8_nodbal.php 
Log Message:
some files changed, revent them if they are from mistake

Index: convert_utf8_nodbal.php
===================================================================
RCS file: /cvsroot/mxbb/core/install/convert_utf8_nodbal.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** convert_utf8_nodbal.php	27 Jul 2011 19:44:58 -0000	1.1
--- convert_utf8_nodbal.php	7 Dec 2011 17:43:24 -0000	1.2
***************
*** 27,30 ****
--- 27,32 ----
  $phpEx = substr(strrchr(__FILE__, '.'), 1);
  $tplEx = @file_exists($mx_root_path.'install/templates/mx_install_header.html') ? 'html' : 'tpl';
+ define('INCLUDES', $mx_root_path  . 'includes/'); //Main Includes folder
+ define('UTF_STATUS', true);
  //
  // FYI:
***************
*** 42,46 ****
  }

! require MX_ROOT_PATH . 'config.' . PHP_EXT;

  $db = new mysqli($dbhost, $dbuser, $dbpasswd, $dbname);
--- 44,52 ----
  }

! if (!defined('MX_ROOT_PATH')) define('MX_ROOT_PATH', $mx_root_path);
! if (!defined('PHP_EXT')) define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));
! 
! require(MX_ROOT_PATH . 'config.' . PHP_EXT);
! # Nothing needs to be set below this line...

  $db = new mysqli($dbhost, $dbuser, $dbpasswd, $dbname);

Index: convert_utf8_mysql.php
===================================================================
RCS file: /cvsroot/mxbb/core/install/convert_utf8_mysql.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** convert_utf8_mysql.php	27 Jul 2011 19:44:58 -0000	1.1
--- convert_utf8_mysql.php	7 Dec 2011 17:43:24 -0000	1.2
***************
*** 27,30 ****
--- 27,32 ----
  $phpEx = substr(strrchr(__FILE__, '.'), 1);
  $tplEx = @file_exists($mx_root_path.'install/templates/mx_install_header.html') ? 'html' : 'tpl';
+ define('INCLUDES', $mx_root_path  . 'includes/'); //Main Includes folder
+ define('UTF_STATUS', true);
  //
  // FYI:
***************
*** 42,52 ****
  }

! if (!defined('MX_ROOT_PATH')) define('MX_ROOT_PATH', './');
  if (!defined('PHP_EXT')) define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));

  require(MX_ROOT_PATH . 'config.' . PHP_EXT);
! define('SQL_LAYER', 'mysql4');
! require(MX_ROOT_PATH . 'includes/db/mysql.' . PHP_EXT);

  $db = new sql_db($dbhost, $dbuser, $dbpasswd, $dbname, false);
  if(!$db->db_connect_id)
--- 44,68 ----
  }

! if (!defined('MX_ROOT_PATH')) define('MX_ROOT_PATH', $mx_root_path);
  if (!defined('PHP_EXT')) define('PHP_EXT', substr(strrchr(__FILE__, '.'), 1));

  require(MX_ROOT_PATH . 'config.' . PHP_EXT);
! # Nothing needs to be set below this line...
! if (@function_exists('mysqli_connect'))
! {
! 	//define('SQL_LAYER', 'mysqli');
! 	$dbms = 'mysqli'; // Repopulated for multiple db connections	
! }
! else
! {
! 	//define('SQL_LAYER', 'mysql');
! 	$dbms = 'mysql4'; // Repopulated for multiple db connections	
! }
! 
! // Connect to the database
! //
! require(INCLUDES . 'db/' . $dbms . '.' . PHP_EXT); // Load dbal and initiate class	

+ /*
  $db = new sql_db($dbhost, $dbuser, $dbpasswd, $dbname, false);
  if(!$db->db_connect_id)
***************
*** 54,57 ****
--- 70,74 ----
  	trigger_error('Database connection failed', E_USER_ERROR);
  }
+ */

  // HTML HEADER - BEGIN
***************
*** 61,65 ****
  echo("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n");
  echo("<meta name=\"author\" content=\"Icy Phoenix Team\" />\n");
! echo("<title>Icy Phoenix :: UTF-8 Conversion</title>\n");
  echo("</head>\n");
  echo("<body>\n");
--- 78,82 ----
  echo("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n");
  echo("<meta name=\"author\" content=\"Icy Phoenix Team\" />\n");
! echo("<title>MXP :: UTF-8 Conversion</title>\n");
  echo("</head>\n");
  echo("<body>\n");