Several kinky code smoothed, fixes for admin login

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

diff --git a/inc/db/lib.php b/inc/db/lib.php
index 4384bfea813a58fa0e813a765fa08055e6f6d573..76a097bf2ca33c8902e9a7b71fdae498d9249263 100644 (file)
--- a/inc/db/lib.php
+++ b/inc/db/lib.php
@@ -10,9 +10,14 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : SQL-Typ auswaehlen                               *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -33,26 +38,19 @@
 
 // Some security stuff...
 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");
+       die();
+} // END - if
 
 // Create include file name
-$INC = sprintf("%sinc/db/lib-%s.php", PATH, _DB_TYPE);
+$inc = sprintf("inc/db/lib-%s.php", getConfig('_DB_TYPE'));
 
-if ((file_exists($INC)) && (is_readable($INC))) {
+if (isIncludeReadable($inc)) {
        // Include abstraction layer
-       require_once($INC);
+       loadIncludeOnce($inc);
 } else {
        // Bye, bye...
-       die("Cannot load database abstraction layer! R.I.P.");
+       die('Cannot load database abstraction layer <u>' . getConfig('_DB_TYPE') . '</u> -&gt; R.I.P.');
 }
 
-// Remove this globally used variable
-unset($INC);
-
-//
+// [EOF]
 ?>