extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 00:13:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix warning about static use of Accounts::is_(active|expried) by making it static and throw a WrongParameterException, if is_expired is called with no parameter

Browse Source
This commit is contained in:
Ralf Becker 2017-02-06 10:38:01 +01:00
parent 250cbb5704
commit 2b45b52477
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
api/src/Accounts.php
View File

@ -688,16 +688,18 @@ class Accounts
} }
/** /**
* test if an account is expired * Test if given an account is expired
* *
* Can be used static if array with user-data is supplied * @param int|string|array $data account_(l)id or array with account-data
*
* @param array $data =null array with account data, not specifying the account is depricated!!!
* @return boolean true=expired (no more login possible), false otherwise * @return boolean true=expired (no more login possible), false otherwise
*/ */
function is_expired($data=null) static function is_expired($data)
{ {
if (is_null($data)) $data = $this->data; // depricated use if (is_null($data))
{
throw new Exception\WrongParameter('Missing parameter to Accounts::is_active()');
}
if (!is_array($data)) $data = self::getInstance()->read($data);
$expires = isset($data['account_expires']) ? $data['account_expires'] : $data['expires']; $expires = isset($data['account_expires']) ? $data['account_expires'] : $data['expires'];
@ -707,14 +709,12 @@ class Accounts
/** /**
* Test if an account is active - NOT deactivated or expired * Test if an account is active - NOT deactivated or expired
* *
* Can be used static if array with user-data is supplied * @param int|string|array $data account_(l)id or array with account-data
*
* @param int|array $data account_id or array with account-data
* @return boolean false if account does not exist, is expired or decativated, true otherwise * @return boolean false if account does not exist, is expired or decativated, true otherwise
*/ */
function is_active($data) static function is_active($data)
{ {
if (!is_array($data)) $data = $this->read($data); if (!is_array($data)) $data = self::getInstance()->read($data);
return $data && !(self::is_expired($data) || $data['account_status'] != 'A'); return $data && !(self::is_expired($data) || $data['account_status'] != 'A');
} }