Changeset 449 for branches/eli_branch
- Timestamp:
- Dec 16, 2013 5:32:39 AM (11 years ago)
- Location:
- branches/eli_branch/lib
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/eli_branch/lib/App.inc.php
r447 r449 225 225 return $this->_params[$param]; 226 226 } else { 227 trigger_error(sprintf('Parameter is not set: %s', $param), E_USER_NOTICE);227 /// trigger_error(sprintf('Parameter is not set: %s', $param), E_USER_NOTICE); 228 228 return null; 229 229 } … … 275 275 276 276 // DB connection parameters taken from environment variables in the httpd.conf file, readable only by root. 277 if (!empty($_SERVER['DB_SERVER']) ) {277 if (!empty($_SERVER['DB_SERVER']) && !$this->getParam('db_server')) { 278 278 $this->setParam(array('db_server' => $_SERVER['DB_SERVER'])); 279 279 } 280 if (!empty($_SERVER['DB_NAME']) ) {280 if (!empty($_SERVER['DB_NAME']) && !$this->getParam('db_name')) { 281 281 $this->setParam(array('db_name' => $_SERVER['DB_NAME'])); 282 282 } 283 if (!empty($_SERVER['DB_USER']) ) {283 if (!empty($_SERVER['DB_USER']) && !$this->getParam('db_user')) { 284 284 $this->setParam(array('db_user' => $_SERVER['DB_USER'])); 285 285 } 286 if (!empty($_SERVER['DB_PASS']) ) {286 if (!empty($_SERVER['DB_PASS']) && !$this->getParam('db_pass')) { 287 287 $this->setParam(array('db_pass' => $_SERVER['DB_PASS'])); 288 288 } -
branches/eli_branch/lib/Auth_SQL.inc.php
r447 r449 810 810 * patterns, at minimum the US State Department standard: cvcddcvc. 811 811 * 812 * - x a random upper or lower alpha character or digit813 * - C a random upper or lower consonant814 * - V a random upper or lower vowel815 * - c a random lowercase consonant816 * - v a random lowercase vowel817 * - d a random digit812 * - x A random upper or lower character, digit, or punctuation. 813 * - C A random upper or lower consonant. 814 * - V A random upper or lower vowel. 815 * - c A random lowercase consonant. 816 * - v A random lowercase vowel. 817 * - d A random digit. 818 818 * 819 819 * @param string $pattern a sequence of character types, above.
Note: See TracChangeset
for help on using the changeset viewer.