diff --git a/classes/Config.php b/classes/Config.php index fa8dbaf..867e782 100755 --- a/classes/Config.php +++ b/classes/Config.php @@ -10,7 +10,7 @@ class Config { // @todo no hardcoded paths! $file = "/var/www/josh/common/config/{$site}.ini"; if (file_exists($file)) { - self::$data =& parse_ini_file($file, true); + self::$data = parse_ini_file($file, true); } else { Error::addError('Unable to load the configuration file'); diff --git a/classes/DB.php b/classes/DB.php index 5d0fdc2..212d081 100755 --- a/classes/DB.php +++ b/classes/DB.php @@ -11,10 +11,10 @@ class DB { private static $results; public static function open() { - self::$hostname =& Config::get('hostname', 'database'); - self::$username =& Config::get('username', 'database'); - self::$password =& Config::get('password', 'database'); - self::$database =& Config::get('database', 'database'); + self::$hostname = Config::get('hostname', 'database'); + self::$username = Config::get('username', 'database'); + self::$password = Config::get('password', 'database'); + self::$database = Config::get('database', 'database'); if (isset(self::$hostname) && isset(self::$username) && isset(self::$password) && isset(self::$database)) { self::$connection = @mysql_connect(self::$hostname, self::$username, self::$password); @@ -178,6 +178,7 @@ class DB { public static function delete($table, $columnValues, $conditions) { } + } ?> diff --git a/config/farewelltothee.com.ini b/config/farewelltothee.com.ini index b60c37a..155956a 100644 --- a/config/farewelltothee.com.ini +++ b/config/farewelltothee.com.ini @@ -1,6 +1,8 @@ disable = false debug = false +session = false smarty = true +fckeditor = false [database] hostname = "localhost" diff --git a/config/hexurl.com.ini b/config/hexurl.com.ini index 55ff0e1..92c896f 100644 --- a/config/hexurl.com.ini +++ b/config/hexurl.com.ini @@ -1,6 +1,8 @@ disable = false debug = false +session = false smarty = false +fckeditor = false [database] hostname = "localhost" diff --git a/config/insecticidelobotomy.com.ini b/config/insecticidelobotomy.com.ini index 263957f..aeb622d 100644 --- a/config/insecticidelobotomy.com.ini +++ b/config/insecticidelobotomy.com.ini @@ -1,6 +1,8 @@ disable = false debug = false -smarty = true +session = false +smarty = true +fckeditor = false [database] hostname = "localhost" diff --git a/config/meatronic.com.ini b/config/meatronic.com.ini index 9dc4774..ef000f8 100755 --- a/config/meatronic.com.ini +++ b/config/meatronic.com.ini @@ -2,6 +2,7 @@ disable = false debug = false session = true smarty = true +fckeditor = false [database] hostname = "localhost" diff --git a/config/paganstars.com.ini b/config/paganstars.com.ini index 3a02688..1d11226 100644 --- a/config/paganstars.com.ini +++ b/config/paganstars.com.ini @@ -6,7 +6,7 @@ fckeditor = true [database] hostname = "localhost" -username = "josh" -password = "my5QL r0ck5" +username = "paganstars" +password = "p4g4ns74r5" database = "paganstars" diff --git a/config/thatgirljen.com.ini b/config/thatgirljen.com.ini index defc2f0..dea976e 100644 --- a/config/thatgirljen.com.ini +++ b/config/thatgirljen.com.ini @@ -1,6 +1,8 @@ disable = false debug = false +session = false smarty = true +fckeditor = false [database] hostname = "localhost"