Changeset 467 for branches/eli_branch/lib/Auth_SQL.inc.php

Timestamp:

Feb 19, 2014 2:28:00 AM (10 years ago)

Author:

anonymous

Message:

Merged in changes from trunk to finish Eli's branch.

Location:

branches/eli_branch

Files:

• . (modified) (1 prop)
• lib/Auth_SQL.inc.php (modified) (2 diffs)

branches/eli_branch/lib/Auth_SQL.inc.php

@@ -424 +424 @@
             // No login: failed authentication!
             return false;
+        }
+
+        // Convert 'priv' to 'user_type' nomenclature to support older implementations.
+        if (isset($user_data['priv'])) {
+            $user_data['user_type'] = $user_data['priv'];
         }
 
@@ -649 +654 @@
             }
             $app->logMsg(sprintf('User_id %s (%s) session expired: %s', $this->get('user_id'), $this->get('username'), join(', ', $expire_reasons)), LOG_INFO, __FILE__, __LINE__);
-        } else {
-            $app->logMsg(sprintf('Session not authenticated: %s', getDump($_SESSION['_auth_sql'][$this->_ns])), LOG_DEBUG, __FILE__, __LINE__);
         }