Skip to content

Commit

Permalink
Dev Removed dead variable assignments
Browse files Browse the repository at this point in the history
  • Loading branch information
@c-schmitz
c-schmitz committed Nov 27, 2017
1 parent c199ed4 commit e1acf7a
Showing 1 changed file with 18 additions and 40 deletions.
58 changes: 18 additions & 40 deletions application/controllers/InstallerController.php
View file
Expand Up @@ -279,9 +279,9 @@ private function stepDatabaseConfiguration()
// Check if the surveys table exists or not
if ($bDBExists == true) {
try {
if ($dataReader = $this->connection->createCommand()->select()->from('{{users}}')->query()->rowCount == 0) {
// DBLIB does not throw an exception on a missing table
$bTablesDoNotExist = true;
// We do the following check because DBLIB does not throw an exception on a missing table
if ($this->connection->createCommand()->select()->from('{{users}}')->query()->rowCount == 0) {
$bTablesDoNotExist = true;
}
} catch (Exception $e) {
$bTablesDoNotExist = true;
Expand All @@ -299,7 +299,7 @@ private function stepDatabaseConfiguration()
Yii::app()->session['optconfig_message'] = sprintf('<b>%s</b>', gT('The database you specified does already exist.'));
Yii::app()->session['step3'] = true;

//wrte config file! as we no longer redirect to optional view
//Write config file as we no longer redirect to optional view
$this->_writeConfigFile();

header("refresh:5;url=".$this->createUrl("/admin"));
Expand All @@ -310,25 +310,26 @@ private function stepDatabaseConfiguration()
}

if (in_array($oModel->dbtype, array('mysql', 'mysqli'))) {
//for development - use mysql in the strictest mode //Checked)
//for development - use mysql in the strictest mode
if (Yii::app()->getConfig('debug') > 1) {
$this->connection->createCommand("SET SESSION SQL_MODE='STRICT_ALL_TABLES,ANSI'")->execute();
}
$sMySQLVersion = $this->connection->getServerVersion();
if (version_compare($sMySQLVersion, '4.1', '<')) {
die("<br />Error: You need at least MySQL version 4.1 to run LimeSurvey. Your version: ".$sMySQLVersion);
}
@$this->connection->createCommand("SET CHARACTER SET 'utf8mb4'")->execute(); //Checked
@$this->connection->createCommand("SET NAMES 'utf8mb4'")->execute(); //Checked
@$this->connection->createCommand("SET CHARACTER SET 'utf8mb4'")->execute();
@$this->connection->createCommand("SET NAMES 'utf8mb4'")->execute();
}

// Setting dateformat for mssql driver. It seems if you don't do that the in- and output format could be different
// Setting date format for mssql driver. It seems if you don't do that the in- and output format could be different
if (in_array($oModel->dbtype, array('mssql', 'sqlsrv', 'dblib'))) {
@$this->connection->createCommand('SET DATEFORMAT ymd;')->execute(); //Checked
@$this->connection->createCommand('SET QUOTED_IDENTIFIER ON;')->execute(); //Checked
@$this->connection->createCommand('SET DATEFORMAT ymd;')->execute();
@$this->connection->createCommand('SET QUOTED_IDENTIFIER ON;')->execute();
}

//$aData array won't work here. changing the name
$aValues=[];
$aValues['title'] = gT('Database settings');
$aValues['descp'] = gT('Database settings');
$aValues['classesForStep'] = array('off', 'off', 'off', 'off', 'on', 'off');
Expand Down Expand Up @@ -399,7 +400,7 @@ function stepCreateDb()
$this->redirect(array('installer/welcome'));
}

$aData['model'] = $model = new InstallerConfigForm;
$aData['model'] = new InstallerConfigForm;
$aData['title'] = gT("Database configuration");
$aData['descp'] = gT("Please enter the database settings you want to use for LimeSurvey:");
$aData['classesForStep'] = array('off', 'off', 'off', 'on', 'off', 'off');
Expand Down Expand Up @@ -436,7 +437,7 @@ function stepCreateDb()
try {
$this->connection->createCommand("CREATE DATABASE \"$sDatabaseName\" ENCODING 'UTF8'")->execute();
} catch (Exception $e) {
$createdb = false;
$bCreateDB = false;
}
break;
default:
Expand Down Expand Up @@ -515,23 +516,8 @@ function stepPopulateDb()
extract($aDbConfig);
self::_dbConnect($aDbConfig, $aData);

/* @todo Use Yii as it supports various db types and would better handle this process */

switch ($sDatabaseType) {
case 'mysqli':
case 'mysql':
$sql_file = 'mysql';
break;
case 'dblib':
case 'sqlsrv':
case 'mssql':
$sql_file = 'mssql';
break;
case 'pgsql':
$sql_file = 'pgsql';
break;
default:
throw new Exception(sprintf('Unknown database type "%s".', $sDatabaseType));
if (!in_array($sDatabaseType,'mysqli','mysql','dblib','sqlsrv','mssql','pgsql')){
throw new Exception(sprintf('Unknown database type "%s".', $sDatabaseType));
}

//checking DB Connection
Expand Down Expand Up @@ -576,12 +562,7 @@ private function stepOptionalConfiguration()
$this->loadHelper('surveytranslator');
$aData['model'] = $model = new InstallerConfigForm('optional');
// Backup the default, needed only for $sDefaultAdminPassword
$sDefaultAdminUserName = $model->adminLoginName;
$sDefaultAdminPassword = $model->adminLoginPwd;
$sDefaultAdminRealName = $model->adminName;
$sDefaultSiteName = $model->siteName;
$sDefaultSiteLanguage = $model->surveylang;
$sDefaultAdminEmail = $model->adminEmail;
if (!is_null(Yii::app()->request->getPost('InstallerConfigForm'))) {
$model->attributes = Yii::app()->request->getPost('InstallerConfigForm');

Expand Down Expand Up @@ -944,7 +925,6 @@ function _executeSQLFile($sFileName, $sDatabasePrefix)

if ($iLineLength && $sLine[0] != '#' && substr($sLine, 0, 2) != '--') {
if (substr($sLine, $iLineLength - 1, 1) == ';') {
$line = substr($sLine, 0, $iLineLength - 1);
$sCommand .= $sLine;
$sCommand = str_replace('prefix_', $sDatabasePrefix, $sCommand); // Table prefixes

Expand Down Expand Up @@ -1241,9 +1221,8 @@ function _dbConnect($aDbConfig = array(), $aData = array())

$sDsn = self::_getDsn($sDatabaseType, $sDatabaseLocation, $sDatabasePort, $sDatabaseName, $sDatabaseUser, $sDatabasePwd);
if (!self::dbTest($aDbConfig, $aData)) {
// Remove sDatabaseName from the connexion is not exist
// Remove sDatabaseName from the connexion is not exist
$sDsn = self::_getDsn($sDatabaseType, $sDatabaseLocation, $sDatabasePort, "", $sDatabaseUser, $sDatabasePwd);
$bDbExist = false;
}
try {
$this->connection = new DbConnection($sDsn, $sDatabaseUser, $sDatabasePwd);
Expand Down Expand Up @@ -1271,7 +1250,7 @@ private function dbTest($aDbConfig = array(), $aData = array())
$sDatabasePort = empty($sDatabasePort) ? '' : $sDatabasePort;
$sDsn = self::_getDsn($sDatabaseType, $sDatabaseLocation, $sDatabasePort, $sDatabaseName, $sDatabaseUser, $sDatabasePwd);
try {
$testPdo = new PDO($sDsn, $sDatabaseUser, $sDatabasePwd, array(PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION));
new PDO($sDsn, $sDatabaseUser, $sDatabasePwd, array(PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION));
} catch (Exception $e) {
if ($sDatabaseType == 'mysql' && $e->getCode() == 1049) {
return false;
Expand All @@ -1283,7 +1262,7 @@ private function dbTest($aDbConfig = array(), $aData = array())
/* using same behaviuor than before : test without dbname : db creation can break */
$sDsn = self::_getDsn($sDatabaseType, $sDatabaseLocation, $sDatabasePort, "", $sDatabaseUser, $sDatabasePwd);
try {
$testPdo = new PDO($sDsn, $sDatabaseUser, $sDatabasePwd, array(PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION));
new PDO($sDsn, $sDatabaseUser, $sDatabasePwd, array(PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION));
} catch (Exception $e) {
/* With pgsql : sending "" to tablename => tablename==username , we are unsure if this must be OK */
/* But Yii sedn exception in same condition : the show this error */
Expand All @@ -1297,7 +1276,6 @@ private function dbTest($aDbConfig = array(), $aData = array())
throw new DbConnection('CDbConnection failed to open the DB connection.', (int) $e->getCode(), $e->errorInfo);
}
}
$testPdo = null;
return false;
}
$sMinimumMySQLVersion = '5.5.3';
Expand Down

0 comments on commit e1acf7a

Please sign in to comment.