Changeset 449 for branches

Timestamp:

Dec 16, 2013 5:32:39 AM (10 years ago)

Author:

anonymous

Message:

Test existence of db_* values before loading env variables; disabled use of trigger_error in App::getParam(), although this may allow value missing issues.

Location:

branches/eli_branch/lib

Files:

• App.inc.php (modified) (2 diffs)
• Auth_SQL.inc.php (modified) (1 diff)

branches/eli_branch/lib/App.inc.php

@@ -225 +225 @@
             return $this->_params[$param];
         } else {
-            trigger_error(sprintf('Parameter is not set: %s', $param), E_USER_NOTICE);
+            /// trigger_error(sprintf('Parameter is not set: %s', $param), E_USER_NOTICE);
             return null;
         }
@@ -275 +275 @@
 
             // DB connection parameters taken from environment variables in the httpd.conf file, readable only by root.
-            if (!empty($_SERVER['DB_SERVER'])) {
+            if (!empty($_SERVER['DB_SERVER']) && !$this->getParam('db_server')) {
                 $this->setParam(array('db_server' => $_SERVER['DB_SERVER']));
             }
-            if (!empty($_SERVER['DB_NAME'])) {
+            if (!empty($_SERVER['DB_NAME']) && !$this->getParam('db_name')) {
                 $this->setParam(array('db_name' => $_SERVER['DB_NAME']));
             }
-            if (!empty($_SERVER['DB_USER'])) {
+            if (!empty($_SERVER['DB_USER']) && !$this->getParam('db_user')) {
                 $this->setParam(array('db_user' => $_SERVER['DB_USER']));
             }
-            if (!empty($_SERVER['DB_PASS'])) {
+            if (!empty($_SERVER['DB_PASS']) && !$this->getParam('db_pass')) {
                 $this->setParam(array('db_pass' => $_SERVER['DB_PASS']));
             }

branches/eli_branch/lib/Auth_SQL.inc.php

@@ -810 +810 @@
      * patterns, at minimum the US State Department standard: cvcddcvc.
      *
-     * - x    a random upper or lower alpha character or digit
-     * - C    a random upper or lower consonant
-     * - V    a random upper or lower vowel
-     * - c    a random lowercase consonant
-     * - v    a random lowercase vowel
-     * - d    a random digit
+     * - x    A random upper or lower character, digit, or punctuation.
+     * - C    A random upper or lower consonant.
+     * - V    A random upper or lower vowel.
+     * - c    A random lowercase consonant.
+     * - v    A random lowercase vowel.
+     * - d    A random digit.
      *
      * @param  string $pattern  a sequence of character types, above.