Changeset 532 for trunk/lib

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.

Location:

trunk/lib

Files:

• App.inc.php (modified) (1 diff)
• DB.inc.php (modified) (2 diffs)
• Utilities.inc.php (modified) (1 diff)
• Version.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)) {

trunk/lib/DB.inc.php

@@ -378 +378 @@
     public function columnExists($table, $columns, $strict=true, $use_cached_results=true)
     {
-        if (!$this->_connected) {
+        $app =& App::getInstance();
+
+        if (!$this->_connected) {
+            $app->logMsg(sprintf('No DB connection to run %s', __METHOD__), LOG_NOTICE, __FILE__, __LINE__);
             return false;
         }
@@ -384 +387 @@
         // Ensure the table exists.
         if (!$this->tableExists($table, $use_cached_results)) {
+            $app->logMsg(sprintf('Table does not exist: %s', $table), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }

trunk/lib/Utilities.inc.php

@@ -1091 +1091 @@
     $val = removeSignature($signed_val);
     // If the signed value matches the original signed value we consider the value safe.
-    if ($signed_val == addSignature($val, $salt, $length)) {
+    if ('' != $signed_val && $signed_val == addSignature($val, $salt, $length)) {
         // Signature verified.
         return true;

trunk/lib/Version.inc.php

@@ -53 +53 @@
         // This value is overwritten by the $app->getParam('db_create_tables') setting if it is available.
         'create_table' => true,
+
         // If true, makes an exact comparison of saved vs. live table schemas. If false, just checks that the saved columns are available.
         'db_schema_strict' => true,