Changeset 572 for trunk/bin

Timestamp:

Feb 27, 2017 2:12:39 PM (7 years ago)

Author:

anonymous

Message:

Added option to skip using a database by testing for defined(_NODB)

File:

• trunk/bin/_config.inc.php (modified) (4 diffs)

trunk/bin/_config.inc.php

@@ -36 +36 @@
 }
 
-// Use codebase files releative to this file.
+// Use codebase files relative to this file.
 define('CODEBASE_PATH', realpath(dirname(__FILE__) . '/../'));
 
+
 $db_auth_file = false;
-$rii = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(COMMON_BASE));
-$rii->setMaxDepth(2);
-foreach ($rii as $filename => $file) {
-    if (in_array(basename($filename), ['db_auth.inc.php', 'db_auth.json'])) {
-        $db_auth_file = $filename;
-        break;
+if (!defined('_NODB')) {
+    $rii = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(COMMON_BASE));
+    $rii->setMaxDepth(2);
+    foreach ($rii as $filename => $file) {
+        if (in_array(basename($filename), ['db_auth.inc.php', 'db_auth.json'])) {
+            $db_auth_file = $filename;
+            break;
+        }
     }
-}
-if (!$db_auth_file) {
-    die(sprintf("%s error: the current directory must be common site directory (i.e. the parent directory of the document root) AND a db_auth file must exist within two directory levels.\n", $cli_executed));
-}
-if (fileowner($db_auth_file) != getmyuid()) {
-    die(sprintf("%s error: you must execute this script as the owner of the web files.\n", $cli_executed));
+    if (!$db_auth_file) {
+        die(sprintf("%s error: the current directory must be common site directory (i.e. the parent directory of the document root) AND a db_auth file must exist within two directory levels.\n", $cli_executed));
+    }
+    if (fileowner($db_auth_file) != getmyuid()) {
+        die(sprintf("%s error: you must execute this script as the owner of the web files.\n", $cli_executed));
+    }
 }
 
@@ -72 +75 @@
     'site_email' => 'codebase@strangecode.com',
     'enable_session' => false,
-    'enable_db' => true,
+    'enable_db' => defined('_NODB') ? false : true,
     'db_create_tables' => true,
     'db_auth_file' => $db_auth_file,
@@ -86 +89 @@
 ));
 
-if (strtolower(getFilenameExtension($db_auth_file)) != 'json') {
-    // DB auth file is not JSON, and will not be automatically be loaded by $app's 'db_auth_file' parser.
+if (false !== $db_auth_file && strtolower(getFilenameExtension($db_auth_file)) != 'json') {
+    // DB auth file is not JSON, and will not be automatically loaded by $app's 'db_auth_file' parser.
     require_once $db_auth_file;
 }
@@ -95 +98 @@
 $app->start();
 
-// Global DB object. Automatically pre-configured by $app->start().
-$db =& DB::getInstance();
+if (!defined('_NODB')) {
+    // Global DB object. Automatically pre-configured by $app->start().
+    $db =& DB::getInstance();
+}