diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/classloader.php | 15 | ||||
-rw-r--r-- | include/db.php | 10 | ||||
-rw-r--r-- | include/functions.php | 16 |
3 files changed, 20 insertions, 21 deletions
diff --git a/include/classloader.php b/include/classloader.php new file mode 100644 index 000000000..4b8b3738e --- /dev/null +++ b/include/classloader.php @@ -0,0 +1,15 @@ +<?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 28718fb02..020fd08a4 100644 --- a/include/db.php +++ b/include/db.php @@ -1,13 +1,9 @@ <?php require_once "config.php"; +require_once "classloader.php"; -$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_class = 'db_'.lcfirst(DB_TYPE); $db = $db_class::instance(); // call_user_func(array($db_class, 'instance')); @@ -66,4 +62,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 4dc286eb6..caea2576a 100644 --- a/include/functions.php +++ b/include/functions.php @@ -5,19 +5,7 @@ $fetch_last_error = false; $pluginhost = false; - 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; - } - } + require_once "classloader.php"; mb_internal_encoding("UTF-8"); date_default_timezone_set('UTC'); @@ -3903,4 +3891,4 @@ return in_array($interface, class_implements($class)); } -?>
\ No newline at end of file +?> |