svn commit: r745549 - /incubator/vcl/trunk/web/.ht-inc/authentication.php

[jf...@apache.org]

Author: jfthomps
Date: Wed Feb 18 16:02:48 2009
New Revision: 745549

URL: http://svn.apache.org/viewvc?rev=745549&view=rev
Log:
VCL-96

modified submitLogin to get $passwd directly from $_POST['password'] instead of calling processInputVar
removed $authtype from args being passed to localLogin

modified localLogin to accept $userid and $passwd as parameters instead of getting them from processInputVar

Modified:
    incubator/vcl/trunk/web/.ht-inc/authentication.php

Modified: incubator/vcl/trunk/web/.ht-inc/authentication.php
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/authentication.php?rev=745549&r1=745548&r2=745549&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/authentication.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/authentication.php Wed Feb 18 16:02:48 2009
@@ -307,7 +307,7 @@
 		exit;
 	}
 	$userid = processInputVar('userid', ARG_STRING, '');
-	$passwd = processInputVar('password', ARG_STRING, '');
+	$passwd = $_POST['password'];
 	if(empty($userid) || empty($passwd)) {
 		selectAuth();
 		return;
@@ -317,7 +317,7 @@
 	if($authMechs[$authtype]['type'] == 'ldap')
 		ldapLogin($authtype, $userid, $passwd);
 	elseif($authMechs[$authtype]['type'] == 'local')
-		localLogin($authtype, $userid, $passwd);
+		localLogin($userid, $passwd);
 	else
 		selectAuth();
 }
@@ -451,16 +451,17 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// \fn localLogin()
+/// \fn localLogin($userid, $passwd)
+///
+/// \param $userid - userid without affiliation
+/// \param $passwd - submitted password
 ///
 /// \brief tries to authenticate user locally; calls printLoginPageWithSkin if
 /// authentication fails
 ///
 ////////////////////////////////////////////////////////////////////////////////
-function localLogin() {
+function localLogin($userid, $passwd) {
 	global $HTMLheader, $phpVer;
-	$userid = processInputVar('userid', ARG_STRING);
-	$passwd = processInputVar('password', ARG_STRING);
 	if(validateLocalAccount($userid, $passwd)) {
 		//set cookie
 		$cookie = getAuthCookieData("$userid@local");