diff options
| -rw-r--r-- | classes/Db/Abstract.php (renamed from classes/db/abstract.php) | 0 | ||||
| -rw-r--r-- | classes/Db/Interface.php (renamed from classes/db/interface.php) | 0 | ||||
| -rw-r--r-- | classes/Db/Mysql.php (renamed from classes/db/mysql.php) | 0 | ||||
| -rw-r--r-- | classes/Db/Pgsql.php (renamed from classes/db/pgsql.php) | 0 | ||||
| -rw-r--r-- | include/classloader.php | 15 | ||||
| -rw-r--r-- | include/db.php | 10 | ||||
| -rw-r--r-- | include/functions.php | 16 |
7 files changed, 21 insertions, 20 deletions
diff --git a/classes/db/abstract.php b/classes/Db/Abstract.php index d84701fd7..d84701fd7 100644 --- a/classes/db/abstract.php +++ b/classes/Db/Abstract.php diff --git a/classes/db/interface.php b/classes/Db/Interface.php index c5bfad56f..c5bfad56f 100644 --- a/classes/db/interface.php +++ b/classes/Db/Interface.php diff --git a/classes/db/mysql.php b/classes/Db/Mysql.php index 170628304..170628304 100644 --- a/classes/db/mysql.php +++ b/classes/Db/Mysql.php diff --git a/classes/db/pgsql.php b/classes/Db/Pgsql.php index 39ed181d7..39ed181d7 100644 --- a/classes/db/pgsql.php +++ b/classes/Db/Pgsql.php diff --git a/include/classloader.php b/include/classloader.php deleted file mode 100644 index 4b8b3738e..000000000 --- a/include/classloader.php +++ /dev/null @@ -1,15 +0,0 @@ -<?php - function __autoload($class) { - $class_file1 = str_replace("_", "/", basename($class)); // PSR-0 - $class_file2 = str_replace("_", "/", strtolower(basename($class))); - - $file1 = dirname(__FILE__)."/../classes/$class_file1.php"; - $file2 = dirname(__FILE__)."/../classes/$class_file2.php"; - - if (file_exists($file1)) { - require $file1; - } elseif (file_exists($file2)) { - require $file2; - } - } -?> diff --git a/include/db.php b/include/db.php index 020fd08a4..28718fb02 100644 --- a/include/db.php +++ b/include/db.php @@ -1,9 +1,13 @@ <?php require_once "config.php"; -require_once "classloader.php"; -$db_class = 'db_'.lcfirst(DB_TYPE); +$db_class = 'Db_'.ucfirst(DB_TYPE); +$db_class_file = 'classes/' . str_replace('_', '/', $db_class) . '.php'; + +require_once "classes/Db/Interface.php"; +require_once "classes/Db/Abstract.php"; +require_once $db_class_file; $db = $db_class::instance(); // call_user_func(array($db_class, 'instance')); @@ -62,4 +66,4 @@ function db_quote($str){ return $db->quote($str); } -?> +?>
\ No newline at end of file diff --git a/include/functions.php b/include/functions.php index caea2576a..4dc286eb6 100644 --- a/include/functions.php +++ b/include/functions.php @@ -5,7 +5,19 @@ $fetch_last_error = false; $pluginhost = false; - require_once "classloader.php"; + function __autoload($class) { + $class_file1 = str_replace("_", "/", basename($class)); // PSR-0 + $class_file2 = str_replace("_", "/", strtolower(basename($class))); + + $file1 = dirname(__FILE__)."/../classes/$class_file1.php"; + $file2 = dirname(__FILE__)."/../classes/$class_file2.php"; + + if (file_exists($file1)) { + require $file1; + } elseif (file_exists($file2)) { + require $file2; + } + } mb_internal_encoding("UTF-8"); date_default_timezone_set('UTC'); @@ -3891,4 +3903,4 @@ return in_array($interface, class_implements($class)); } -?> +?>
\ No newline at end of file |