Rename the 'local' auth method to 'pam'

It's what it should have been from the start.

3 files changed, 18 insertions, 5 deletions

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 743dbd92..bef0a7f0 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,7 @@
 
 --------------------------------------------------------------------------
   v.3.6-FUTURE
+    - Renamed the local auth method to pam, which is less confusing
     - Removed the Flash player
     - Added an HTML5 player (patch by Holger Brunn)
     - Changed the way themes handle RTL languages
diff --git a/lib/class/auth.class.php b/lib/class/auth.class.php
index 8d231f0a..a59e2ad4 100644
--- a/lib/class/auth.class.php
+++ b/lib/class/auth.class.php
@@ -160,11 +160,11 @@ class Auth {
     }
 
     /**
-     * local_auth
+     * pam_auth
      * Check to make sure the pam_auth function is implemented (module is 
      * installed), then check the credentials.
      */
-    private static function local_auth($username, $password) {
+    private static function pam_auth($username, $password) {
         if (!function_exists('pam_auth')) {
             $results['success']    = false;
             $results['error']    = 'The PAM PHP module is not installed';
@@ -175,7 +175,7 @@ class Auth {
 
         if (pam_auth($username, $password)) {
             $results['success']    = true;
-            $results['type']    = 'local';
+            $results['type']    = 'pam';
             $results['username']    = $username;
         }
         else {
diff --git a/lib/class/update.class.php b/lib/class/update.class.php
index bfaefc65..b4517572 100644
--- a/lib/class/update.class.php
+++ b/lib/class/update.class.php
@@ -370,6 +370,8 @@ class Update {
         $update_string = '- Add table to store stream session playlist.<br />';
         $version[] = array('version' => '360011', 'description' => $update_string);
 
+        $update_string = '- Drop enum for the type field in session.<br />';
+        $version[] = array('version' => '360012', 'description' => $update_string);
         return $version;
 
     } // populate_version
@@ -2083,7 +2085,7 @@ class Update {
     }
 
     /**
-     * update_380011
+     * update_360011
      * We need a place to store actual playlist data for downloadable
      * playlist files.
      */
@@ -2104,5 +2106,15 @@ class Update {
         self::set_version('db_version', '360011');
     }
 
-} // end update class
+    /**
+     * update_360012()
+     *
+     * Drop the enum on session.type
+     */
+    public static function update_360012() {
+        Dba::write('ALTER TABLE `session` CHANGE `type` `type` VARCHAR(16) DEFAULT NULL');
+        self::set_version('db_version', '360012');
+    }
+
+}
 ?>