[Linpha-cvs] SF.net SVN: linpha: [4533] trunk/linpha2

[<bz...@us...>]

Revision: 4533
Author:   bzrudi
Date:     2006-04-13 06:30:53 -0700 (Thu, 13 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/linpha/?rev=4533&view=rev

Log Message:
-----------
Oracle related improvements

Modified Paths:
--------------
    trunk/linpha2/ChangeLog
    trunk/linpha2/install/step10_postsettings.php
    trunk/linpha2/install/step5_getlogin.php
    trunk/linpha2/install/step6_selectdatabase.php
    trunk/linpha2/install/step7_selectprefix.php
    trunk/linpha2/install/step8_testing.php
Modified: trunk/linpha2/ChangeLog
===================================================================
--- trunk/linpha2/ChangeLog	2006-04-13 13:19:09 UTC (rev 4532)
+++ trunk/linpha2/ChangeLog	2006-04-13 13:30:53 UTC (rev 4533)
@@ -1,4 +1,10 @@
-2006-04-1* flo
+2006-04-13 bzrudi <linpha2_AT_tuxpower_DOT_de>
+ * replace all remaining recordCount() with EOF
+ * some oracle related fixes
+ * Installer:
+   - Oracle related improvements
+   
+2006-04-13 flo
  * finished search feature
    hope it will work with oracle... ;-)
 

Modified: trunk/linpha2/install/step10_postsettings.php
===================================================================
--- trunk/linpha2/install/step10_postsettings.php	2006-04-13 13:19:09 UTC (rev 4532)
+++ trunk/linpha2/install/step10_postsettings.php	2006-04-13 13:30:53 UTC (rev 4533)
@@ -62,7 +62,7 @@
 <div class="boxalign">
 <?php echo tr("Admin Username").":"; ?>
 <input class="boxalignelement" type="text" id="check01" onKeyup="checkForm()" 
-	name="admin_name" value="admin">
+	name="admin_name" value="root">
 </div>
 
 <div class="boxalign">

Modified: trunk/linpha2/install/step5_getlogin.php
===================================================================
--- trunk/linpha2/install/step5_getlogin.php	2006-04-13 13:19:09 UTC (rev 4532)
+++ trunk/linpha2/install/step5_getlogin.php	2006-04-13 13:30:53 UTC (rev 4533)
@@ -217,7 +217,9 @@
 }
 elseif($_SESSION['sql_dbtype'] == 'oci8po')
 {
-	echo tr("WOW, playing with the big ones");
+	echo tr("NOTE: Oracle support is only testet on XE the \"Free\" Edition. " .
+			"If you get things running using a \"real\" Oracle Database please " .
+			"drop us a note!")."<br /><br />";
 	$_SESSION['sql_dbport'] = '1521';
 }
 ?>

Modified: trunk/linpha2/install/step6_selectdatabase.php
===================================================================
--- trunk/linpha2/install/step6_selectdatabase.php	2006-04-13 13:19:09 UTC (rev 4532)
+++ trunk/linpha2/install/step6_selectdatabase.php	2006-04-13 13:30:53 UTC (rev 4533)
@@ -213,8 +213,15 @@
 }
 
 if($_SESSION['allowed_to_create_db'] == false AND !isset($database))
-{
-	echo tr("Name Of Database To Use (Must Exist)").":<br />";
+{	
+	if($_SESSION['sql_dbname'] == 'oci8po')
+	{
+		echo tr("Name Of Database To Use, this is usually \"XE\" For Oracle Express Edition");
+	}
+	else
+	{
+		echo tr("Name Of Database To Use (Must Exist)").":<br />";
+	}	
 	?>
 	<input type="text" name="sql_dbname_installinto" 
 		value="<?php echo isset($_SESSION['sql_dbname']) ? 

Modified: trunk/linpha2/install/step7_selectprefix.php
===================================================================
--- trunk/linpha2/install/step7_selectprefix.php	2006-04-13 13:19:09 UTC (rev 4532)
+++ trunk/linpha2/install/step7_selectprefix.php	2006-04-13 13:30:53 UTC (rev 4533)
@@ -201,9 +201,14 @@
 	}
 break;
 case "oci8po":
+	echo tr("Testing Server Connection")."<br /><br />";
+	echo tr("Connecting ORACLE-Server")."... ";
+	/**
+	 * make already use of ADBDO as native oci_connet() sucks
+	 */
 	include_once('../lib/adodb/adodb.inc.php');
-	$link = NewADOConnection('oci8po');
-	$link ->connect($_SESSION['sql_hostname'].":".$_SESSION['sql_dbport'], $_SESSION['sql_username'], $_SESSION['sql_password'], $_SESSION['sql_dbname']);
+	$link = ADONewConnection('oci8po');
+	$link ->Connect($_SESSION['sql_hostname'].":".$_SESSION['sql_dbport'], $_SESSION['sql_username'], $_SESSION['sql_password'], $_SESSION['sql_dbname']);
 	if (!$link)
 	{
 		echo failed_msg();
@@ -237,7 +242,7 @@
 	<br /><br />
 	<hr>
 	<br />
-	<?php echo tr("Please Enter Database Prefix For Linpha Tables (Leave For Default)").": <br />" ?>
+	<?php echo tr("Please Enter Database Prefix For Linpha Tables (Default: linpha_)").": <br />" ?>
 	<input type="text" id="check01" onKeyup="checkForm()" name="sql_prefix" 
 		value="<?php echo isset($_SESSION['sql_prefix']) ? 
 		$_SESSION['sql_prefix'] : 'linpha_' ; ?>">

Modified: trunk/linpha2/install/step8_testing.php
===================================================================
--- trunk/linpha2/install/step8_testing.php	2006-04-13 13:19:09 UTC (rev 4532)
+++ trunk/linpha2/install/step8_testing.php	2006-04-13 13:30:53 UTC (rev 4533)
@@ -128,7 +128,7 @@
  * try to create a new db user
  */
 $n_runs = 1;
-if($_SESSION['sql_dbtype']=="mysql")
+if($_SESSION['sql_dbtype'] == "mysql")
 {
 	echo tr("Trying To Create New LinPHA Database User")."... ";
 	$random_pass = random_password(8);
@@ -286,7 +286,10 @@
 }
 }
 else
-{
+{	
+	/**
+	 * skip tests for sqlite
+	 */	
 	echo tr("Skipping Database Tests");
 }
 /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.