Fix for broken SQL queries (all). Resolves #84

[mailer.git] / inc / db / lib.php

diff --git a/inc/db/lib.php b/inc/db/lib.php
index 6bc4e7397186c0398adb11eb27ef14e86c4c8f45..645721deacf8e89ed840af587d29ee61939ca7e1 100644 (file)
--- a/inc/db/lib.php
+++ b/inc/db/lib.php
@@ -32,27 +32,23 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
 
 // Select MySQL 3 as default database type
-if (_DB_TYPE == "_DB_TYPE") define('_DB_TYPE', "mysql3");
+if (!defined('_DB_TYPE')) define('_DB_TYPE', "mysql3");
 
 // Create include file name
-$INC = PATH."inc/db/lib-"._DB_TYPE.".php";
+$INC = sprintf("inc/db/lib-%s.php", constant('_DB_TYPE'));
 
-if (file_exists($INC))
-{
+if (FILE_READABLE($INC)) {
        // Include abstraction layer
-       require_once($INC);
-}
- else
-{
+       LOAD_INC_ONCE($INC);
+} else {
        // Bye, bye...
-       die("Cannot load database abstraction layer! R.I.P.");
+       die("Cannot load database abstraction layer ".constant('_DB_TYPE')." -> R.I.P.");
 }
 
 //