[pLog-svn] r599 - plog/trunk
oscar at devel.plogworld.net
oscar at devel.plogworld.net
Wed Dec 29 13:34:13 GMT 2004
Author: oscar
Date: 2004-12-29 13:34:12 +0000 (Wed, 29 Dec 2004)
New Revision: 599
Modified:
plog/trunk/wizard.php
Log:
fixed a few issues with parameters by reference
Modified: plog/trunk/wizard.php
===================================================================
--- plog/trunk/wizard.php 2004-12-29 13:25:58 UTC (rev 598)
+++ plog/trunk/wizard.php 2004-12-29 13:34:12 UTC (rev 599)
@@ -738,7 +738,7 @@
var $_database;
var $_createDatabase;
- function setDbConfigValues( $view )
+ function setDbConfigValues( &$view )
{
$configFile = new ConfigFileStorage();
$configFile->reload();
@@ -762,7 +762,7 @@
$this->_db = connectDb();
if( !$this->_db ) {
$this->_view = new WizardView( "step1" );
- $this->setDbConfigValues( &$this->_view );
+ $this->setDbConfigValues( $this->_view );
$this->_view->setErrorMessage("There was an error connecting to the database. Please check your settings." );
$this->setCommonData( true );
return false;
@@ -782,7 +782,7 @@
if( !$this->_db->Execute( "CREATE DATABASE ".$this->_database )) {
$message .= "Error creating the database: ".$this->_db->ErrorMsg();
$this->_view = new WizardView( "step1" );
- $this->setDbConfigValues( &$this->_view );
+ $this->setDbConfigValues( $this->_view );
$this->_view->setErrorMessage( $message );
$this->setCommonData( true );
return false;
@@ -811,7 +811,7 @@
$message = "There was an error creating the tables in the database. Please make sure that the user chosen to connect to the database has enough permissions to create tables.<br/><br/>$message";
$this->_view = new WizardView( "step1" );
$this->_view->setErrorMessage( $message );
- $this->setDbConfigValues( &$this->_view );
+ $this->setDbConfigValues( $this->_view );
$this->setCommonData();
return false;
}
@@ -878,7 +878,7 @@
if( $errors ) {
$this->_view = new WizardView( "step1" );
- $this->setDbConfigValues( &$this->_view );
+ $this->setDbConfigValues( $this->_view );
$message = "There was an error initializing some of the tables. Please make sure that the user chosen to connect to the database has enough permissions to add records to the database.<br/><br/>$message";
$this->_view->setErrorMessage( $message );
$this->setCommonData();
@@ -1176,7 +1176,7 @@
function perform()
{
$this->_view = new WizardView( "update1" );
- WizardStepTwo::setDbConfigValues( &$this->_view );
+ WizardStepTwo::setDbConfigValues( $this->_view );
$this->setCommonData();
}
}
@@ -1212,7 +1212,7 @@
if( !$this->_db ) {
$this->_view = new WizardView( "update1" );
- WizardStepTwo::setDbConfigValues( &$this->_view );
+ WizardStepTwo::setDbConfigValues( $this->_view );
$this->_view->setErrorMessage( "There was an error connecting to the database. Please check your settings." );
return false;
}
@@ -1282,7 +1282,7 @@
}
else {
$this->_view = new WizardView( "update1" );
- WizardStepTwo::setDbConfigValues( &$this->_view );
+ WizardStepTwo::setDbConfigValues( $this->_view );
$this->_view->setErrorMessage( $message );
}
}
@@ -1605,4 +1605,4 @@
//// main part ////
$controller = new Controller( $_actionMap, "nextStep" );
$controller->process( HttpVars::getRequest());
-?>
\ No newline at end of file
+?>
More information about the pLog-svn
mailing list