beu/TrackManiaControl
1
0
Fork 0
Code Issues 10 Pull Requests Releases Wiki Activity

Refactoring of Code, Comments and Spelling

Browse Source
This commit is contained in:
Steffen Schröder
2013-12-09 13:45:58 +01:00
parent 5339b6766f
commit c97b4166f2
26 changed files with 1834 additions and 1833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
application/core/Database.php
View File

@ -76,15 +76,15 @@ class Database {
* @return bool
*/
private function initDatabase() {
$dbname = $this->config->xpath('database');
if (!$dbname) {
$dbName = $this->config->xpath('database');
if (!$dbName) {
trigger_error("Invalid database configuration (database).", E_USER_ERROR);
return false;
}
$dbname = (string) $dbname[0];
$dbName = (string) $dbName[0];
// Try to connect
$result = $this->mysqli->select_db($dbname);
$result = $this->mysqli->select_db($dbName);
if ($result) {
return true;
}
@ -96,7 +96,7 @@ class Database {
trigger_error($this->mysqli->error, E_USER_ERROR);
return false;
}
$databaseStatement->bind_param('s', $dbname);
$databaseStatement->bind_param('s', $dbName);
$databaseStatement->execute();
if ($databaseStatement->error) {
trigger_error($databaseStatement->error, E_USER_ERROR);
@ -105,9 +105,9 @@ class Database {
$databaseStatement->close();
// Connect to new database
$this->mysqli->select_db($dbname);
$this->mysqli->select_db($dbName);
if ($this->mysqli->error) {
trigger_error("Couldn't select database '{$dbname}'. " . $this->mysqli->error, E_USER_ERROR);
trigger_error("Couldn't select database '{$dbName}'. " . $this->mysqli->error, E_USER_ERROR);
return false;
}
return true;