Changeset 564

Timestamp:

Mar 5, 2016 4:07:19 AM (8 years ago)

Author:

anonymous

Message:

Fixed db_server=>localhost regression. Removed Auth->initDB from Auth->clear. Enabled logging by default for cb cli scripts.

Location:

trunk

Files:

• bin/_config.inc.php (modified) (1 diff)
• lib/Auth_SQL.inc.php (modified) (2 diffs)
• lib/DB.inc.php (modified) (1 diff)

trunk/bin/_config.inc.php

@@ -80 +80 @@
     'display_errors' => true,
     'error_reporting' => E_ALL,
-    'log_file_priority' => false,
+    'log_file_priority' => LOG_DEBUG,
     'log_screen_priority' => LOG_INFO,
-    'log_directory' => '/tmp',
+    'log_directory' => (is_dir('./log') ? './log' : '/tmp'), // If ./log exists, use it, otherwise /tmp.
     'log_filename' => 'site_log',
 ));
 
 if (strtolower(getFilenameExtension($db_auth_file)) != 'json') {
-    // DB auth file is not json, and will not be automaticlaly be loaded by $app's 'db_auth_file' parser.
+    // DB auth file is not JSON, and will not be automatically be loaded by $app's 'db_auth_file' parser.
     require_once $db_auth_file;
 }

trunk/lib/Auth_SQL.inc.php

@@ -163 +163 @@
         $app =& App::getInstance();
         $db =& DB::getInstance();
-
 
         static $_db_tested = false;
@@ -323 +322 @@
         $db =& DB::getInstance();
 
-        $this->initDB();
-
         if ($this->get('user_id', false)) {
+
+            $this->initDB();
+
             // FIX ME: Should we check if the session is active?
             $db->query("

trunk/lib/DB.inc.php

@@ -149 +149 @@
         if (!$this->getParam('db_server')) {
             // If db_server not specified, assume localhost.
-            $this->setParam('db_server', 'localhost');
+            $this->setParam(array('db_server' => 'localhost'));
         }