valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "db: use builtin classloader, lowercase class files" 

This reverts commit 57b8469e67.
This commit is contained in:
Andrew Dolgov 2013-03-15 19:54:08 +04:00
parent e600dbd44a
commit a48d8533bf
7 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
classes/db/abstract.php → classes/Db/Abstract.php
View File

0
classes/db/interface.php → classes/Db/Interface.php
View File

0
classes/db/mysql.php → classes/Db/Mysql.php
View File

0
classes/db/pgsql.php → classes/Db/Pgsql.php
View File

15
include/classloader.php
View File

@ -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;
}
}
?>

10
include/db.php
View File

@ -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);
}
?>
?>

16
include/functions.php
View File

@ -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));
}
?>
?>