upcase-project-cvs

[<jhe...@us...>]

Update of /cvsroot/upcase-project/UpCase
In directory usw-pr-cvs1:/tmp/cvs-serv9971

Modified Files:
	install.php 
Log Message:
added table for installer


Index: install.php
===================================================================
RCS file: /cvsroot/upcase-project/UpCase/install.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** install.php	5 Aug 2002 07:47:26 -0000	1.1
--- install.php	13 Nov 2002 08:58:02 -0000	1.2
***************
*** 4,15 ****
  include_once("./lib/adodb/adodb.inc.php");
  
  
  // Check if we have all we need to access the database
  // else display a from to get the info.
! if (!isset($dbname) || $dbname == ""
! 	|| !isset($dbuser) || $dbuser == ""
! 	|| !isset($dbpasswd) || $dbpasswd == ""
! 	|| !isset($dbhost) || $dbhost == ""
! 	|| !isset($tblprefix) || $tblprefix == "")
  {
  ?>
--- 4,15 ----
  include_once("./lib/adodb/adodb.inc.php");
  
+ // Check if the app is already configured
+ // Should stat config/upcase.xml
  
  // Check if we have all we need to access the database
  // else display a from to get the info.
! if (empty($dbname) || empty($dbuser) || empty($dbpasswd) || empty($dbhost)
! 	|| empty($tblprefix) || empty($admname) || empty($admpasswd)
! 	|| empty($admmail) || empty($admfirst) || empty($admlast))
  {
  ?>
***************
*** 18,39 ****
  <table>
  <tr>
! 	<td>Database Name : </td><td><input type="text" name="dbname"></td>
  </tr>
  <tr>
! 	<td>Database User : </td><td><input type="text" name="dbuser"></td>
  </tr>
  <tr>
! 	<td>Database Password : </td><td><input type="text" name="dbpasswd"></td>
  </tr>
  <tr>
! 	<td>Database Host : </td><td><input type="text" name="dbhost"></td>
  </tr>
  <tr>
! 	<td>Tables prefix : </td><td><input type="text" name="tblprefix"></td>
  </tr>
  <tr>
! 	<td colspan="2"><input type="submit"></td>
  </tr>
  </table>
  </form>
  
--- 18,65 ----
  <table>
  <tr>
! 	<td>Database Name : </td><td><input type="text" name="dbname"
! 									value=<?=$dbname?>></td>
  </tr>
  <tr>
! 	<td>Database User : </td><td><input type="text" name="dbuser"
! 									value=<?=$dbuser?>></td>
  </tr>
  <tr>
! 	<td>Database Password : </td><td><input type="text" name="dbpasswd"
! 									value=<?=$dbpasswd?>></td>
  </tr>
  <tr>
! 	<td>Database Host : </td><td><input type="text" name="dbhost"
! 									value=<?=$dbhost?>></td>
  </tr>
  <tr>
! 	<td>Tables prefix : </td><td><input type="text" name="tblprefix"
! 									value=<?=$tblprefix?>></td>
  </tr>
+ </table>
+ <hr>
+ <table>
  <tr>
! 	<td>Admin user name : </td><td><input type="text" name="admname"
! 									value=<?=$admname?>></td>
! </tr>
! <tr>
! 	<td>First Name : </td><td><input type="text" name="admfirst"
! 									value=<?=$admfirst?>></td>
! </tr>
! <tr>
! 	<td>Last Name : </td><td><input type="text" name="admlast"
! 									value=<?=$admlast?>></td>
! </tr>
! <tr>
! 	<td>Email : </td><td><input type="text" name="admmail"
! 									value=<?=$admmail?>></td>
! </tr>
! <tr>
! 	<td>Admin password : </td><td><input type="text" name="admpasswd"
! 									value=<?=$admpasswd?>></td>
  </tr>
  </table>
+ <input type="submit">
  </form>
  
***************
*** 52,56 ****
  
  // Execute each query one by one
! foreach ($tables_create as $query)
  {
  	$res = $db->Execute($query);
--- 78,82 ----
  
  // Execute each query one by one
! foreach ($queries as $query)
  {
  	$res = $db->Execute($query);
***************
*** 61,78 ****
  }
  
! foreach ($tables_insert as $query)
! {
! 	$res = $db->Execute($query);
! 	if (!$res)
! 	{
! 		die($db->ErrorMsg());
! 	}
! }
  
  $docroot = dirname($DOCUMENT_ROOT . $PHP_SELF);
! $modules = $docroot . "/modules";
  
! $rooturl = $HTTP_HOST . "/UpCase";
! $modsurl = $rooturl . "/modules";
  
  // Create the config file
--- 87,105 ----
  }
  
! // insert administrator
! $query = "INSERT INTO " . $tblprefix . "users (groupid, username, firstname, "
! 		. "lastname, email, password)"
! 		. " values('0', '" . $admname . "', '" . $admfirst . "', '"
! 		. $admlast . "', '" . $admmail . "', '" . $admpasswd . "')";
! 
! $db->Execute($query) or die("Unable to create admin user: " .
! 						$db->ErrorMsg());
! 
  
  $docroot = dirname($DOCUMENT_ROOT . $PHP_SELF);
! $modules = $DOCUMENT_ROOT;
  
! $rooturl = $HTTP_HOST . "/upcase";
! $modsurl = $HTTP_HOST;
  
  // Create the config file
***************
*** 101,104 ****
--- 128,132 ----
  	<table data="sessions">sessions</table>
  	<table data="users">users</table>
+ 	<table data="installer">installer</table>
  </database>
  
***************
*** 143,146 ****
--- 171,176 ----
  $uc_info["adminsOnly"] = $msgdir . "/adminsonly.php";
  $uc_info["sessionSteal"] = $msgdir . "/sessionsteal.php";
+ $packagesList = "http://galaad/UPCASE/packages/packages.xml";
+ $packagesSource = "http://galaad/UPCASE/packages";
  ?>';