wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing various PHPDoc comments

Browse source
This commit is contained in:
Thomas Müller 2013-10-02 15:04:42 +02:00
parent 4d4eda0f06
commit 621ab1c7ee
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/base.php
View file

@ -492,7 +492,7 @@ class OC {
$sessionUser = self::$session->get('user_id');
$serverUser = $_SERVER['PHP_AUTH_USER'];
OC_Log::write('core',
"Session user-id doesn't match PHP_AUTH_USER. SESSION[user_id]: $sessionUser; SERVER[PHP_AUTH_USER]: $serverUser.",
"Session user-id ($sessionUser) doesn't match SERVER[PHP_AUTH_USER] ($serverUser).",
OC_Log::WARN);
OC_User::logout();
}
@ -757,7 +757,7 @@ class OC {
elseif (OC::tryRememberLogin()) {
$error[] = 'invalidcookie';
}
// Someone wants to log in :
// logon via web form
elseif (OC::tryFormLogin()) {
$error[] = 'invalidpassword';
}

14
lib/private/user.php
View file

@ -215,9 +215,12 @@ class OC_User {
/**
* @brief Try to login a user, assuming authentication
* has already happened (e.g. via SSO).
* has already happened (e.g. via Single Sign On).
*
* Log in a user and regenerate a new session.
*
* @param \OCP\ApacheBackend $backend
* @return bool
*/
public static function loginWithApache(\OCP\ApacheBackend $backend) {
@ -238,7 +241,10 @@ class OC_User {
/**
* @brief Verify with Apache whether user is authenticated.
*
* @return boolean|null true: authenticated - false: not authenticated
* @return boolean|null
* true: authenticated
* false: not authenticated
* null: not handled / no backend available
*/
public static function handleApacheAuth() {
foreach (self::$_usedBackends as $backend) {
@ -306,11 +312,11 @@ class OC_User {
}
/**
* Supplies an attribute to the logout hyperlink. The default behaviuour
* Supplies an attribute to the logout hyperlink. The default behaviour
* is to return an href with '?logout=true' appended. However, it can
* supply any attribute(s) which are valid for <a>.
*
* @return String with one or more HTML attributes.
* @return string with one or more HTML attributes.
*/
public static function getLogoutAttribute() {
foreach (self::$_usedBackends as $backend) {