Changeset 532 for trunk/lib/App.inc.php

Timestamp:

Jul 13, 2015 8:11:33 PM (9 years ago)

Author:

anonymous

Message:

Added common config for codebase cli scripts. Changed behavior of db_auth.json loading. validSignature() now fails on empty string.

File:

• trunk/lib/App.inc.php (modified) (1 diff)

trunk/lib/App.inc.php

@@ -349 +349 @@
             }
 
-            // DB credentials for CLI scripts stored in a JSON file with read rights given only to the user who will be executing the scripts: -rw-------
-            // But only if db_pass hasn't been defined yet by other means.
-            if (defined('_CLI') && !$this->getParam('db_server') && !$this->getParam('db_name') && !$this->getParam('db_user') && !$this->getParam('db_pass')) {
+            // DB credentials for CLI scripts stored in a JSON file with read rights given only to the user who will be executing the scripts: -r--------
+            // But not if all DB credentials have been defined already by other means.
+            if (defined('_CLI') && (!$this->getParam('db_server') || !$this->getParam('db_name') || !$this->getParam('db_user') || !$this->getParam('db_pass'))) {
                 if (false !== $db_auth_file = stream_resolve_include_path($this->getParam('db_auth_file'))) {
                     if (is_readable($db_auth_file)) {