From cf9558c0d889b23bce467844a579ce7af5cc3bcc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Sep 2011 14:17:46 +0000 Subject: [PATCH] Doxygen --- htdocs/includes/login/functions_empty.php | 2 +- htdocs/includes/login/functions_forceuser.php | 2 +- htdocs/includes/login/functions_http.php | 2 +- htdocs/includes/login/functions_ldap.php | 2 +- htdocs/includes/login/functions_myopenid.php | 2 +- htdocs/lib/ws.lib.php | 9 +++++---- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/htdocs/includes/login/functions_empty.php b/htdocs/includes/login/functions_empty.php index 2417aea9c20..cf535aff82b 100644 --- a/htdocs/includes/login/functions_empty.php +++ b/htdocs/includes/login/functions_empty.php @@ -31,7 +31,7 @@ * @param int $entitytotest Number of instance (always 1 if module multicompany not enabled) * @return string Login if OK, '' if KO */ -function check_user_password_empty($usertotest,$passwordtotest) +function check_user_password_empty($usertotest,$passwordtotest,$entitytotest) { dol_syslog("functions_empty::check_user_password_empty usertotest=".$usertotest); diff --git a/htdocs/includes/login/functions_forceuser.php b/htdocs/includes/login/functions_forceuser.php index 49f7491f52f..8c341b76d56 100644 --- a/htdocs/includes/login/functions_forceuser.php +++ b/htdocs/includes/login/functions_forceuser.php @@ -32,7 +32,7 @@ * @param int $entitytotest Number of instance (always 1 if module multicompany not enabled) * @return string Login if OK, '' if KO */ -function check_user_password_forceuser($usertotest,$passwordtotest) +function check_user_password_forceuser($usertotest,$passwordtotest,$entitytotest) { // Variable dolibarr_auto_user must be defined in conf.php file global $dolibarr_auto_user; diff --git a/htdocs/includes/login/functions_http.php b/htdocs/includes/login/functions_http.php index 2c504a01860..1e05b10db58 100644 --- a/htdocs/includes/login/functions_http.php +++ b/htdocs/includes/login/functions_http.php @@ -31,7 +31,7 @@ * @param int $entitytotest Number of instance (always 1 if module multicompany not enabled) * @return string Login if OK, '' if KO */ -function check_user_password_http($usertotest,$passwordtotest) +function check_user_password_http($usertotest,$passwordtotest,$entitytotest) { dol_syslog("functions_http::check_user_password_http _SERVER[REMOTE_USER]=".$_SERVER["REMOTE_USER"]); diff --git a/htdocs/includes/login/functions_ldap.php b/htdocs/includes/login/functions_ldap.php index 39f7d59fde6..dd3ddb9e340 100644 --- a/htdocs/includes/login/functions_ldap.php +++ b/htdocs/includes/login/functions_ldap.php @@ -32,7 +32,7 @@ * @param int $entitytotest Number of instance (always 1 if module multicompany not enabled) * @return string Login if OK, '' if KO */ -function check_user_password_ldap($usertotest,$passwordtotest) +function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest) { global $_POST,$db,$conf,$langs; global $dolibarr_main_auth_ldap_host,$dolibarr_main_auth_ldap_port; diff --git a/htdocs/includes/login/functions_myopenid.php b/htdocs/includes/login/functions_myopenid.php index 746e5baae86..ecb831465c1 100644 --- a/htdocs/includes/login/functions_myopenid.php +++ b/htdocs/includes/login/functions_myopenid.php @@ -32,7 +32,7 @@ * @param int $entitytotest Number of instance (always 1 if module multicompany not enabled) * @return string Login if OK, '' if KO */ -function check_user_password_myopenid($usertotest,$passwordtotest) +function check_user_password_myopenid($usertotest,$passwordtotest,$entitytotest) { global $_POST,$db,$conf,$langs; diff --git a/htdocs/lib/ws.lib.php b/htdocs/lib/ws.lib.php index ff40e7c0c02..c7d2c019453 100755 --- a/htdocs/lib/ws.lib.php +++ b/htdocs/lib/ws.lib.php @@ -26,10 +26,11 @@ /** * Check authentication array and set error, errorcode, errorlabel * - * @param authentication Array - * @param error - * @param errorcode - * @param errorlabel + * @param array $authentication Array with authentication informations ('login'=>,'password'=>,'entity'=>,'dolibarrkey'=>) + * @param int &$error Number of errors + * @param string &$errorcode Error string code + * @param string &$errorlabel Error string label + * @return User Return user object identified by login/pass/entity into authentication array */ function check_authentication($authentication,&$error,&$errorcode,&$errorlabel) {