Changeset 674 for trunk/bin/_config.inc.php

Timestamp:

May 2, 2019 10:17:26 PM (5 years ago)

Author:

anonymous

Message:

Add user.cli.php and supporting changes

File:

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

trunk/bin/_config.inc.php

@@ -39 +39 @@
 define('CODEBASE_PATH', realpath(dirname(__FILE__) . '/../'));
 
-
 $db_auth_file = false;
 if (!defined('_NODB')) {
@@ -51 +50 @@
     }
     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));
+        printf("%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);
+        exit(1);
     }
     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));
+        printf("%s error: you must execute this script as the owner of the web files.\n", $cli_executed);
+        exit(1);
     }
 }
 
 // Set include path.
-ini_set('include_path', get_include_path() . PATH_SEPARATOR . COMMON_BASE);
+ini_set('include_path', join(PATH_SEPARATOR, array_unique(array(
+    '.',
+    COMMON_BASE,
+    dirname($db_auth_file)
+))));
 
 /********************************************************************
@@ -66 +71 @@
 
 // Include core libraries.
-require_once CODEBASE_PATH . '/lib/App.inc.php';
-require_once CODEBASE_PATH . '/lib/Utilities.inc.php';
+(include_once 'codebase/lib/App.inc.php') || require_once CODEBASE_PATH . '/lib/App.inc.php';
 
 define('_CLI', true);