[Upcase-project-cvs] UpCase install.php,1.6,1.7

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

Update of /cvsroot/upcase-project/UpCase
In directory sc8-pr-cvs1:/tmp/cvs-serv10991

Modified Files:
	install.php 
Log Message:
added a field to set the site URL


Index: install.php
===================================================================
RCS file: /cvsroot/upcase-project/UpCase/install.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** install.php	20 Nov 2002 11:48:43 -0000	1.6
--- install.php	20 Nov 2002 12:11:24 -0000	1.7
***************
*** 9,12 ****
--- 9,15 ----
  // Check if we have all we need to access the database
  // else display a from to get the info.
+ $dbhost = "localhost";
+ $tblprefix = "upcase_";
+ 
  if (empty($dbname) || empty($dbuser) || empty($dbpasswd) || empty($dbhost)
  	|| empty($tblprefix) || empty($admname) || empty($admpasswd)
***************
*** 18,39 ****
  <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>
--- 21,49 ----
  <table>
  <tr>
+ 	<td>Site Url : </td><td>http://<input type="text" name="siteUrl"
+ 									value="<?=$HTTP_HOST?>"></td>
+ </tr>
+ </table>
+ <hr>
+ <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>
***************
*** 42,62 ****
  <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>
--- 52,72 ----
  <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>
***************
*** 100,109 ****
  $siteRoot = $DOCUMENT_ROOT;
  // Web site root URL
! $siteUrl = $HTTP_HOST;
  
  // ucpase document root
  $upcaseRoot = dirname($DOCUMENT_ROOT . $PHP_SELF);
  // upcase root URL
! $upcaseUrl = dirname($HTTP_HOST . $PHP_SELF);
  
  
--- 110,121 ----
  $siteRoot = $DOCUMENT_ROOT;
  // Web site root URL
! if (empty($siteUrl))
! 	$siteUrl = $HTTP_HOST;
  
  // ucpase document root
  $upcaseRoot = dirname($DOCUMENT_ROOT . $PHP_SELF);
  // upcase root URL
! $upcaseUrl = "http://" . dirname($siteUrl . $PHP_SELF);
! $siteUrl = "http://" . $siteUrl;
  
  
***************
*** 118,124 ****
  <paths>
  	<siteroot>$siteRoot</siteroot>
! 	<siteurl>http://$siteUrl</siteurl>
  	<upcaseroot>$upcaseRoot</upcaseroot>
! 	<upcaseurl>http://$upcaseUrl</upcaseurl>
  </paths>
  
--- 130,136 ----
  <paths>
  	<siteroot>$siteRoot</siteroot>
! 	<siteurl>$siteUrl</siteurl>
  	<upcaseroot>$upcaseRoot</upcaseroot>
! 	<upcaseurl>$upcaseUrl</upcaseurl>
  </paths>