xoops-cvs2

[<on...@us...>]

Update of /cvsroot/xoops/xoops-current/html
In directory usw-pr-cvs1:/tmp/cvs-serv26151

Modified Files:
	install.php 
Log Message:
no message

Index: install.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/install.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** install.php	18 Sep 2002 13:58:25 -0000	1.9
--- install.php	18 Sep 2002 16:28:01 -0000	1.10
***************
*** 335,358 ****
  
  function install_init(){
- 	global $xoopsConfig;
  	install_header();
! 	if($xoopsConfig[dbhost]=="" || $xoopsConfig[dbname] == "" || $xoopsConfig[prefix] =="" || !isset($xoopsConfig[dbhost]) || !isset($xoopsConfig[dbuname]) || !isset($xoopsConfig[dbpass]) || !isset($xoopsConfig[dbname]) || !isset($xoopsConfig[prefix])){
  		echo "<div style='text-align:center'>\n";
  		echo _INSTALL_L15."<br /><br />\n";
  		echo "<table width=\"70%\">\n";
! 		if($xoopsConfig[dbhost]=="" || !isset($xoopsConfig[dbhost])){
! 			echo "<tr><td>".sprintf(_INSTALL_L16, "<b>\$xoopsConfig['dbhost']</b>")."</td></tr>\n";
  		}
! 		if(!isset($xoopsConfig[dbuname])){
! 			echo "<tr><td>".sprintf(_INSTALL_L17, "<b>\$xoopsConfig['dbuname']</b>")."</td></tr>\n";
  		}
! 		if(!isset($xoopsConfig[dbpass])){
! 			echo "<tr><td>".sprintf(_INSTALL_L18, "<b>\$xoopsConfig['dbpass']</b>")."</td></tr>\n";
  		}
! 		if($xoopsConfig[dbname] == "" || !isset($xoopsConfig[dbname])){
! 			echo "<tr><td>".sprintf(_INSTALL_L19, "<b>\$xoopsConfig['dbname']</b>")."</td></tr>\n";
  		}
! 		if ( $xoopsConfig['prefix'] =="" || !isset($xoopsConfig['prefix']) ) {
! 			echo "<tr><td>".sprintf(_INSTALL_L20, "<b>\$xoopsConfig['prefix']</b>")."</td></tr>\n";
  		}
  		echo "</table>\n";
--- 335,357 ----
  
  function install_init(){
  	install_header();
! 	if (XOOPS_DB_PREFIX == '' || XOOPS_DB_HOST = '' || !defined('XOOPS_DB_USER') || !defined('XOOPS_DB_PASS') || XOOPS_DB_NAME == '') {
  		echo "<div style='text-align:center'>\n";
  		echo _INSTALL_L15."<br /><br />\n";
  		echo "<table width=\"70%\">\n";
! 		if (XOOPS_DB_HOST=="") {
! 			echo "<tr><td>".sprintf(_INSTALL_L16, "<b>XOOPS_DB_HOST</b>")."</td></tr>\n";
  		}
! 		if(!defined(XOOPS_DB_USER)){
! 			echo "<tr><td>".sprintf(_INSTALL_L17, "<b>XOOPS_DB_USER</b>")."</td></tr>\n";
  		}
! 		if(!defined(XOOPS_DB_PASS)){
! 			echo "<tr><td>".sprintf(_INSTALL_L18, "<b>XOOPS_DB_PASS</b>")."</td></tr>\n";
  		}
! 		if (XOOPS_DB_NAME == "") {
! 			echo "<tr><td>".sprintf(_INSTALL_L19, "<b>XOOPS_DB_NAME</b>")."</td></tr>\n";
  		}
! 		if (XOOPS_DB_PREFIX == "") {
! 			echo "<tr><td>".sprintf(_INSTALL_L20, "<b>XOOPS_DB_PREFIX</b>")."</td></tr>\n";
  		}
  		echo "</table>\n";
***************
*** 361,369 ****
  		exit();
  	}
! 	$xoopsDB = new Database();
! 	$xoopsDB->setPrefix($xoopsConfig['prefix']);
! 	if ( !$xoopsDB->connect($xoopsConfig['dbhost'], $xoopsConfig['dbuname'], $xoopsConfig['dbpass'], $xoopsConfig['dbname'], $xoopsConfig['db_pconnect']) ) {
  		echo "<div><p>"._INSTALL_L21."<br /><br />";
! 		echo "<b>".$xoopsConfig['dbname']."</b></p>";
  		echo "<p>"._INSTALL_L22."</p>";
  		echo "<form action='install.php' method='post'>";
--- 360,367 ----
  		exit();
  	}
! 	$xoopsDB =& Database::getInstance();
! 	if (get_class($xoopsDB) != 'database') {
  		echo "<div><p>"._INSTALL_L21."<br /><br />";
! 		echo "<b>".XOOPS_DB_NAME."</b></p>";
  		echo "<p>"._INSTALL_L22."</p>";
  		echo "<form action='install.php' method='post'>";
***************
*** 373,387 ****
  		install_footer();
  		exit();
! 	}
! 	$xoopsDB->close();	
  	echo "<table width=\"60%\" align=\"center\">\n";
  	echo "<tr><td>"._INSTALL_L25."<br /><br />\n";
  	echo "<b>"._INSTALL_L26."</b><br /><br />\n";
! 	echo "&nbsp;"._INSTALL_L27."&nbsp;<b>".$xoopsConfig[dbhost]."</b><br />\n";
! 	echo "&nbsp;"._INSTALL_L28."&nbsp;<b>".$xoopsConfig[dbuname]."</b><br />\n";
! 	echo "&nbsp;"._INSTALL_L29."&nbsp;<b>".$xoopsConfig[dbname]."</b><br />\n";
! 	echo "&nbsp;"._INSTALL_L30."&nbsp;<b>".$xoopsConfig[prefix]."</b><br /><br />\n";
! 	//echo "<b>Site Configuration</b><br /><br />\n";
! 	//echo "&nbsp;URL (Virtual Path):&nbsp;<b>".$xoopsConfig[xoops_url]."</b><br /><br />\n";
  	echo "</td></tr><tr><td align=\"center\"><form action=\"install.php\" method=\"post\">\n";
  	echo _INSTALL_L13."<br /><br />\n";
--- 371,382 ----
  		install_footer();
  		exit();
! 	}	
  	echo "<table width=\"60%\" align=\"center\">\n";
  	echo "<tr><td>"._INSTALL_L25."<br /><br />\n";
  	echo "<b>"._INSTALL_L26."</b><br /><br />\n";
! 	echo "&nbsp;"._INSTALL_L27."&nbsp;<b>".XOOPS_DB_HOST."</b><br />\n";
! 	echo "&nbsp;"._INSTALL_L28."&nbsp;<b>".XOOPS_DB_USER."</b><br />\n";
! 	echo "&nbsp;"._INSTALL_L29."&nbsp;<b>".XOOPS_DB_NAME."</b><br />\n";
! 	echo "&nbsp;"._INSTALL_L30."&nbsp;<b>".XOOPS_DB_PREFIX."</b><br /><br />\n";
  	echo "</td></tr><tr><td align=\"center\"><form action=\"install.php\" method=\"post\">\n";
  	echo _INSTALL_L13."<br /><br />\n";
***************
*** 394,400 ****
  
  function install_createDB(){
! 	global $xoopsConfig;
! 	mysql_connect($xoopsConfig['dbhost'], $xoopsConfig['dbuname'], $xoopsConfig['dbpass']);
! 	$result = mysql_query("CREATE DATABASE ".$xoopsConfig['dbname']."");
  	if ( !$result ) {
  		echo "<div><b>"._INSTALL_L31."</b></div>";
--- 389,394 ----
  
  function install_createDB(){
! 	mysql_connect(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS);
! 	$result = mysql_query("CREATE DATABASE ".XOOPS_DB_NAME);
  	if ( !$result ) {
  		echo "<div><b>"._INSTALL_L31."</b></div>";
***************
*** 402,406 ****
  		exit();
  	}
! 	echo "<div><b>".sprintf(_INSTALL_L43, $xoopsConfig['dbname'])."</b>";
  	echo "<form action='install.php' method='post'>";
  	echo "<input type='hidden' name='op' value='initial' />";
--- 396,400 ----
  		exit();
  	}
! 	echo "<div><b>".sprintf(_INSTALL_L43, XOOPS_DB_NAME)."</b>";
  	echo "<form action='install.php' method='post'>";
  	echo "<input type='hidden' name='op' value='initial' />";