aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/auth
diff options
context:
space:
mode:
authorJoseph Warner <hardolaf@hardolaf.com>2013-06-18 15:32:18 -0400
committerJoseph Warner <hardolaf@hardolaf.com>2013-06-18 15:32:18 -0400
commitdb27a8c67a9730384a912298a85a7bf38e506d7d (patch)
treed5ce9791c4c28dccc18a9b6cc208f4a96582e168 /phpBB/includes/auth
parente64abea999f68b248cfe41ab22ac60abc9e2951f (diff)
downloadforums-db27a8c67a9730384a912298a85a7bf38e506d7d.tar
forums-db27a8c67a9730384a912298a85a7bf38e506d7d.tar.gz
forums-db27a8c67a9730384a912298a85a7bf38e506d7d.tar.bz2
forums-db27a8c67a9730384a912298a85a7bf38e506d7d.tar.xz
forums-db27a8c67a9730384a912298a85a7bf38e506d7d.zip
[feature/auth-refactor] Fix comment block indentation
Comment block indentation was off by one space on the provider_* files due to being incorrectly copied over from the auth_* files. PHPBB3-9734
Diffstat (limited to 'phpBB/includes/auth')
-rw-r--r--phpBB/includes/auth/provider_apache.php52
-rw-r--r--phpBB/includes/auth/provider_db.php30
-rw-r--r--phpBB/includes/auth/provider_ldap.php34
3 files changed, 58 insertions, 58 deletions
diff --git a/phpBB/includes/auth/provider_apache.php b/phpBB/includes/auth/provider_apache.php
index ca3bf41560..bb25e502a6 100644
--- a/phpBB/includes/auth/provider_apache.php
+++ b/phpBB/includes/auth/provider_apache.php
@@ -23,12 +23,12 @@ if (!defined('IN_PHPBB'))
class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
{
/**
- * Checks whether the user is identified to apache
- * Only allow changing authentication to apache if the user is identified
- * Called in acp_board while setting authentication plugins
- *
- * @return boolean|string false if the user is identified and else an error message
- */
+ * Checks whether the user is identified to apache
+ * Only allow changing authentication to apache if the user is identified
+ * Called in acp_board while setting authentication plugins
+ *
+ * @return boolean|string false if the user is identified and else an error message
+ */
public function init()
{
global $user, $request;
@@ -41,8 +41,8 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
}
/**
- * Login function
- */
+ * Login function
+ */
public function login(&$username, &$password)
{
global $db, $request;
@@ -133,11 +133,11 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
}
/**
- * Autologin function
- *
- * @return array containing the user row or empty if no auto login should
- * take place
- */
+ * Autologin function
+ *
+ * @return array containing the user row or empty if no auto login should
+ * take place
+ */
public function autologin()
{
global $db, $request;
@@ -194,14 +194,14 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
}
/**
- * This function generates an array which can be passed to the user_add
- * function in order to create a user
- *
- * @param str $username The username of the new user.
- * @param str $password The password of the new user.
- * @return array Contains data that can be passed directly to
- * the user_add function.
- */
+ * This function generates an array which can be passed to the user_add
+ * function in order to create a user
+ *
+ * @param str $username The username of the new user.
+ * @param str $password The password of the new user.
+ * @return array Contains data that can be passed directly to
+ * the user_add function.
+ */
private function user_row($username, $password)
{
global $db, $config, $user;
@@ -232,11 +232,11 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
}
/**
- * The session validation function checks whether the user is still logged in
- *
- * @return boolean true if the given user is authenticated or false if
- * the session should be closed
- */
+ * The session validation function checks whether the user is still logged in
+ *
+ * @return boolean true if the given user is authenticated or false if
+ * the session should be closed
+ */
public function validate_session(&$user)
{
global $request;
diff --git a/phpBB/includes/auth/provider_db.php b/phpBB/includes/auth/provider_db.php
index bba74fc2a3..c55837c685 100644
--- a/phpBB/includes/auth/provider_db.php
+++ b/phpBB/includes/auth/provider_db.php
@@ -30,21 +30,21 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
}
/**
- * Login function
- *
- * @param string $username
- * @param string $password
- * @param string $ip IP address the login is taking place from. Used to
- * limit the number of login attempts per IP address.
- * @param string $browser The user agent used to login
- * @param string $forwarded_for X_FORWARDED_FOR header sent with login request
- * @return array A associative array of the format
- * array(
- * 'status' => status constant
- * 'error_msg' => string
- * 'user_row' => array
- * )
- */
+ * Login function
+ *
+ * @param string $username
+ * @param string $password
+ * @param string $ip IP address the login is taking place from. Used to
+ * limit the number of login attempts per IP address.
+ * @param string $browser The user agent used to login
+ * @param string $forwarded_for X_FORWARDED_FOR header sent with login request
+ * @return array A associative array of the format
+ * array(
+ * 'status' => status constant
+ * 'error_msg' => string
+ * 'user_row' => array
+ * )
+ */
public function login($username, $password, $ip = '', $browser = '', $forwarded_for = '')
{
global $db, $config;
diff --git a/phpBB/includes/auth/provider_ldap.php b/phpBB/includes/auth/provider_ldap.php
index fb2be5ae9d..3c54ba212c 100644
--- a/phpBB/includes/auth/provider_ldap.php
+++ b/phpBB/includes/auth/provider_ldap.php
@@ -25,10 +25,10 @@ if (!defined('IN_PHPBB'))
class phpbb_auth_provider_db implements phpbb_auth_provider_interface
{
/**
- * Connect to ldap server
- * Only allow changing authentication to ldap if we can connect to the ldap server
- * Called in acp_board while setting authentication plugins
- */
+ * Connect to ldap server
+ * Only allow changing authentication to ldap if we can connect to the ldap server
+ * Called in acp_board while setting authentication plugins
+ */
public function init()
{
global $config, $user;
@@ -100,8 +100,8 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
}
/**
- * Login function
- */
+ * Login function
+ */
public function login(&$username, &$password)
{
global $db, $config, $user;
@@ -278,9 +278,9 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
public function autologin();
/**
- * This function is used to output any required fields in the authentication
- * admin panel. It also defines any required configuration table fields.
- */
+ * This function is used to output any required fields in the authentication
+ * admin panel. It also defines any required configuration table fields.
+ */
public function acp(&$new)
{
global $user;
@@ -329,12 +329,12 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
}
/**
- * Generates a filter string for ldap_search to find a user
- *
- * @param $username string Username identifying the searched user
- *
- * @return string A filter string for ldap_search
- */
+ * Generates a filter string for ldap_search to find a user
+ *
+ * @param $username string Username identifying the searched user
+ *
+ * @return string A filter string for ldap_search
+ */
public function user_filter($username)
{
global $config;
@@ -349,8 +349,8 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
}
/**
- * Escapes an LDAP AttributeValue
- */
+ * Escapes an LDAP AttributeValue
+ */
public function escape($string)
{
return str_replace(array('*', '\\', '(', ')'), array('\\*', '\\\\', '\\(', '\\)'), $string);
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-25 12:43:12 +0000