Rename vauth to Auth

config/ampache.cfg.php.dist

@@ -78,11 +78,10 @@ session_cookielife = 0
 session_cookiesecure       = 0
 
 ; Auth Methods 
-; This defines which auth methods vauth will attempt
+; This defines which auth methods Auth will attempt to use and in which order.
-; to use and in which order, if auto_create isn't enabled
+; If auto_create isn't enabled the user must exist locally.
-; The user must exist locally. Local method uses PHP's PAM Auth module
 ; DEFAULT: mysql
-; VALUES: mysql,ldap,http,local
+; VALUES: mysql,ldap,http,pam
 auth_methods = "mysql"
 
 ; Automatic local password updating

lib/class/auth.class.php

@@ -21,14 +21,12 @@
  */
 
 /**
- * vauth Class
  *
  * This class handles all of the session related stuff in Ampache
  * it takes over for the vauth libs, and takes some stuff out of other
- * classes where it didn't belong
+ * classes where it didn't belong.
- *
  */
-class vauth {
+class Auth {
 
     /**
      * Constructor
@@ -85,11 +83,12 @@ class vauth {
     } // logout
 
     /**
-      * authenticate
+     * login
+     *
      * This takes a username and password and then returns the results
      * based on what happens when we try to do the auth.
      */
-    public static function authenticate($username, $password) {
+    public static function login($username, $password) {
 
         // Foreach the auth methods
         foreach (Config::get('auth_methods') as $method) {
@@ -97,7 +96,7 @@ class vauth {
             // Build the function name and call it
             $function_name = $method . '_auth';
 
-            if (!method_exists('vauth', $function_name)) { 
+            if (!method_exists('Auth', $function_name)) { 
                 continue;
             }
 
@@ -110,7 +109,7 @@ class vauth {
 
         return $results;
 
-    } // authenticate
+    }
 
     /**
      * mysql_auth
@@ -158,7 +157,7 @@ class vauth {
         $results['error']    = 'MySQL login attempt failed';
         return $results;
 
-    } // mysql_auth
+    }
 
     /**
      * local_auth
@@ -325,6 +324,5 @@ class vauth {
         return $results;
     } // http_auth
 
-} // end of vauth class
+}
-
 ?>

lib/init.php

@@ -82,7 +82,7 @@ if (isset($results['user_ip_cardinality']) && !$results['user_ip_cardinality'])
     $results['user_ip_cardinality'] = 42;
 }
 
-/* Variables needed for vauth class */
+/* Variables needed for Auth class */
 $results['cookie_path']     = $results['raw_web_path'];
 $results['cookie_domain']    = $_SERVER['SERVER_NAME'];
 $results['cookie_life']        = $results['session_cookielife'];
@@ -133,7 +133,7 @@ set_memory_limit($results['memory_limit']);
 if (!defined('NO_SESSION') && Config::get('use_auth')) {
     /* Verify their session */
     if (!Session::exists('interface', $_COOKIE[Config::get('session_name')])) {
-        vauth::logout($_COOKIE[Config::get('session_name')]);
+        Auth::logout($_COOKIE[Config::get('session_name')]);
         exit;
     }
 
@@ -145,7 +145,7 @@ if (!defined('NO_SESSION') && Config::get('use_auth')) {
 
     /* If the user ID doesn't exist deny them */
     if (!$GLOBALS['user']->id && !Config::get('demo_mode')) {
-        vauth::logout(session_id());
+        Auth::logout(session_id());
         exit;
     }
 
@@ -181,7 +181,7 @@ elseif (!Config::get('use_auth')) {
             $GLOBALS['user']->access = $auth['access'];
         }
         if (!$GLOBALS['user']->id AND !Config::get('demo_mode')) {
-            vauth::logout(session_id()); exit;
+            Auth::logout(session_id()); exit;
         }
         $GLOBALS['user']->update_last_seen();
     }

login.php

@@ -77,7 +77,7 @@ if (($_POST['username'] && $_POST['password']) ||
             $password = '';
         }
 
-        $auth = vauth::authenticate($username, $password);
+        $auth = Auth::login($username, $password);
         
         if ($auth['success']) {
             $username = $auth['username'];

logout.php

@@ -27,5 +27,5 @@
 require_once 'lib/init.php';
 
 // To end a legitimate session, just call logout.
-vauth::logout('',false);
+Auth::logout('',false);
 ?>

templates/show_test_config.inc.php

@@ -54,7 +54,7 @@ new config file.</p>
 values from the ampache.cfg.php.dist file will be used.</p>
 
 <strong>auth_methods</strong> (<i>mysql</i>)<br />
-This defines which auth methods vauth will attempt to use and in which order, if auto_create isn't enabled.
+This defines which auth methods Auth will attempt to use and in which order, if auto_create isn't enabled.
 The user must exist locally as well<br />
 <br />
 <strong>tag_order</strong> (<i>id3v2,id3v1,vorbiscomment,quicktime,ape,asf</i>)<br />