Fix config reader

LordRalex · LordRalex · commit 667ecaf92c93 · 2019-10-07T21:30:48.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 /vendor/
 composer.phar
 config/config.json
+.idea/
diff --git a/functions/panel/authentication.php b/functions/panel/authentication.php
@@ -81,8 +81,8 @@ public static function createSession($uuid) {
 
     private static function validateDatabase() {
         if (self::$database == null) {
-            $_DATABASE = Config::getGlobal('database')['auth'];
-            self::$database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['authdb'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));
+            $_DATABASE = Config::getGlobal('database');
+            self::$database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['db'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));
             self::$database->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         }
     }
diff --git a/functions/panel/bans.php b/functions/panel/bans.php
@@ -148,8 +148,8 @@ public static function expire($banId) {
 
     private static function validateDatabase() {
         if (self::$database == null) {
-            $_DATABASE = Config::getGlobal('database')['ban'];
-            self::$database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['authdb'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));
+            $_DATABASE = Config::getGlobal('database');
+            self::$database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['db'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));
             self::$database->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);            
         }
     }
diff --git a/functions/panel/bot.php b/functions/panel/bot.php
@@ -20,8 +20,8 @@ public static function set($key, $value) {
     }
 
     private static function openConnection() {
-        $_DATABASE = Config::getGlobal('database')['factoid'];
-        $database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['factoiddb'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));
+        $_DATABASE = Config::getGlobal('database');
+        $database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['db'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));
         $database->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         return $database;
     }
diff --git a/functions/panel/factoids.php b/functions/panel/factoids.php
@@ -221,8 +221,8 @@ public static function renameFactoid($id, $newName) {
      * @return PDO database
      */
     private static function openConnection() {
-        $_DATABASE = Config::getGlobal('database')['factoid'];
-        $database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['factoiddb'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));
+        $_DATABASE = Config::getGlobal('database');
+        $database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['db'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));
         $database->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         return $database;
     }
diff --git a/functions/panel/hjt.php b/functions/panel/hjt.php
@@ -80,8 +80,8 @@ public static function updateHJT($id, $name, $value) {
 
     private static function validateDatabase() {
         if (self::$database == null) {
-            $_DATABASE = Config::getGlobal('database')['hjt'];
-            self::$database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['authdb'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));
+            $_DATABASE = Config::getGlobal('database');
+            self::$database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['db'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));
             self::$database->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         }
     }
diff --git a/functions/panel/pmcemail.php b/functions/panel/pmcemail.php
@@ -28,8 +28,8 @@ public static function addCode($email, $ticketId, $user) {
     }
 
     private static function openConnection() {
-        $_DATABASE = Config::getGlobal('database')['factoid'];
-        $database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['factoiddb'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));
+        $_DATABASE = Config::getGlobal('database');
+        $database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['db'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));
         $database->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         return $database;
     }
diff --git a/functions/panel/user.php b/functions/panel/user.php
@@ -170,8 +170,8 @@ public static function changeNickserv($uuid, $nickserv) {
 
     private static function validateDatabase() {
         if (self::$database == null) {
-            $_DATABASE = Config::getGlobal('database')['auth'];
-            self::$database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['authdb'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));
+            $_DATABASE = Config::getGlobal('database');
+            self::$database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['db'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));
             self::$database->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,8 @@ public static function createSession($uuid) {`
`81`	`81`
`82`	`82`	`private static function validateDatabase() {`
`83`	`83`	`if (self::$database == null) {`
`84`		`- $_DATABASE = Config::getGlobal('database')['auth'];`
`85`		`- self::$database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['authdb'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));`
	`84`	`+ $_DATABASE = Config::getGlobal('database');`
	`85`	`+ self::$database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['db'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));`
`86`	`86`	`self::$database->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);`
`87`	`87`	`}`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,8 +148,8 @@ public static function expire($banId) {`
`148`	`148`
`149`	`149`	`private static function validateDatabase() {`
`150`	`150`	`if (self::$database == null) {`
`151`		`- $_DATABASE = Config::getGlobal('database')['ban'];`
`152`		`- self::$database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['authdb'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));`
	`151`	`+ $_DATABASE = Config::getGlobal('database');`
	`152`	`+ self::$database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['db'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));`
`153`	`153`	`self::$database->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);`
`154`	`154`	`}`
`155`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ public static function set($key, $value) {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`private static function openConnection() {`
`23`		`- $_DATABASE = Config::getGlobal('database')['factoid'];`
`24`		`- $database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['factoiddb'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));`
	`23`	`+ $_DATABASE = Config::getGlobal('database');`
	`24`	`+ $database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['db'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));`
`25`	`25`	`$database->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);`
`26`	`26`	`return $database;`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,8 @@ public static function updateHJT($id, $name, $value) {`
`80`	`80`
`81`	`81`	`private static function validateDatabase() {`
`82`	`82`	`if (self::$database == null) {`
`83`		`- $_DATABASE = Config::getGlobal('database')['hjt'];`
`84`		`- self::$database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['authdb'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));`
	`83`	`+ $_DATABASE = Config::getGlobal('database');`
	`84`	`+ self::$database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['db'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));`
`85`	`85`	`self::$database->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);`
`86`	`86`	`}`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ public static function addCode($email, $ticketId, $user) {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`private static function openConnection() {`
`31`		`- $_DATABASE = Config::getGlobal('database')['factoid'];`
`32`		`- $database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['factoiddb'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));`
	`31`	`+ $_DATABASE = Config::getGlobal('database');`
	`32`	`+ $database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['db'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));`
`33`	`33`	`$database->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);`
`34`	`34`	`return $database;`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -170,8 +170,8 @@ public static function changeNickserv($uuid, $nickserv) {`
`170`	`170`
`171`	`171`	`private static function validateDatabase() {`
`172`	`172`	`if (self::$database == null) {`
`173`		`- $_DATABASE = Config::getGlobal('database')['auth'];`
`174`		`- self::$database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['authdb'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));`
	`173`	`+ $_DATABASE = Config::getGlobal('database');`
	`174`	`+ self::$database = new PDO("mysql:host=" . $_DATABASE['host'] . ";dbname=" . $_DATABASE['db'], $_DATABASE['user'], $_DATABASE['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES 'utf8'"));`
`175`	`175`	`self::$database->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);`
`176`	`176`	`}`
`177`	`177`	`}`