Also check on existence.

[core.git] / inc / database.php

diff --git a/inc/database.php b/inc/database.php
index 6f454a69cb2624730d87249525f525a1e539db44..6b028d36e7207477859c98cb9ec18d7f3c8a81bd 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -2,13 +2,13 @@
 /**
  * Initializes the database layer
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.org
  * @deprecated
- * @todo               We should minimize these includes
+ * @todo               Minimize these includes
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,12 +31,12 @@ $databaseInstance = NULL;
 $fqfn = FrameworkConfiguration::getSelfInstance()->getConfigEntry('base_path') . 'inc/database/lib-' . FrameworkConfiguration::getSelfInstance()->getConfigEntry('db_type') . '.php';
 
 // Load the database layer include
-if ((file_exists($fqfn)) && (is_file($fqfn)) && (is_readable($fqfn))) {
+if (BaseFrameworkSystem::isReadableFile($fqfn)) {
        // Load the layer
        require($fqfn);
 } else {
        // Layer is missing!
-       ApplicationEntryPoint::app_die(sprintf("[Main:] Database layer is missing! (%s) -&gt; R.I.P.",
+       ApplicationEntryPoint::app_exit(sprintf('[Main:] Database layer is missing! (%s) -&gt; R.I.P.',
                FrameworkConfiguration::getSelfInstance()->getConfigEntry('db_type')
        ));
 }