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

fix PHP Deprecated warning: Automatic conversion of false to array is deprecated

Browse Source
This commit is contained in:
ralf 2022-07-08 10:10:17 +02:00
parent 2c5275ea7a
commit ccb342b5a2
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/Acl.php
View File

@ -180,7 +180,7 @@ class Acl
* Delete ACL record in the repository of the class * Delete ACL record in the repository of the class
* *
* @param string $appname appname or '' for $GLOBALS['egw_info']['flags']['currentapp'] * @param string $appname appname or '' for $GLOBALS['egw_info']['flags']['currentapp']
* @param string/boolean $location location or false for all locations * @param string|boolean $location location or false for all locations
* @return array all ACL records from $this->data. * @return array all ACL records from $this->data.
*/ */
function delete($appname,$location) function delete($appname,$location)
@ -496,7 +496,7 @@ class Acl
* @param string $location location * @param string $location location
* @param int $required required rights * @param int $required required rights
* @param int $accountid account id defaults to $GLOBALS['egw_info']['user']['account_id']; * @param int $accountid account id defaults to $GLOBALS['egw_info']['user']['account_id'];
* @return array/boolean false if there are no matching row in the db, else array with app-names * @return array with app-names ([] if there are none)
*/ */
function get_app_list_for_id($location, $required, $accountid = '') function get_app_list_for_id($location, $required, $accountid = '')
{ {
@ -512,7 +512,7 @@ class Acl
$cache_accountid[$accountid] = $account_id; $cache_accountid[$accountid] = $account_id;
} }
$rights = 0; $rights = 0;
$apps = false; $apps = [];
foreach($this->db->select(self::TABLE,array('acl_appname','acl_rights'),array( foreach($this->db->select(self::TABLE,array('acl_appname','acl_rights'),array(
'acl_location' => $location, 'acl_location' => $location,
'acl_account' => $account_id, 'acl_account' => $account_id,
@ -537,7 +537,7 @@ class Acl
* @param string $app app * @param string $app app
* @param int $required required rights * @param int $required required rights
* @param int $accountid optional defaults to $GLOBALS['egw_info']['user']['account_id']; * @param int $accountid optional defaults to $GLOBALS['egw_info']['user']['account_id'];
* @return array/boolean false if there are no matching rows in the db or array with location-strings * @return array with location-strings ([] if there are none)
*/ */
function get_location_list_for_id($app, $required, $accountid = '') function get_location_list_for_id($app, $required, $accountid = '')
{ {
@ -551,7 +551,7 @@ class Acl
{ {
$accountid = $cache_accountid[$accountid] = get_account_id($accountid,$this->account_id); $accountid = $cache_accountid[$accountid] = get_account_id($accountid,$this->account_id);
} }
$locations = false; $locations = [];
foreach($this->db->select(self::TABLE,'acl_location,acl_rights',array( foreach($this->db->select(self::TABLE,'acl_location,acl_rights',array(
'acl_appname' => $app, 'acl_appname' => $app,
'acl_account' => $accountid, 'acl_account' => $accountid,
@ -571,13 +571,13 @@ class Acl
* @param string $location location * @param string $location location
* @param int $required required rights * @param int $required required rights
* @param string $app app optional defaults to $GLOBALS['egw_info']['flags']['currentapp']; * @param string $app app optional defaults to $GLOBALS['egw_info']['flags']['currentapp'];
* @return boolean/array false if there are no matching rows in the db or array of account-ids * @return array of account-ids ([] if there are none in the db)
*/ */
function get_ids_for_location($location, $required, $app = '') function get_ids_for_location($location, $required, $app = '')
{ {
if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp']; if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
$accounts = false; $accounts = [];
foreach($this->db->select(self::TABLE,array('acl_account','acl_rights'),array( foreach($this->db->select(self::TABLE,array('acl_account','acl_rights'),array(
'acl_appname' => $app, 'acl_appname' => $app,
'acl_location' => $location, 'acl_location' => $location,
@ -595,13 +595,13 @@ class Acl
* get the locations for an app (excluding the run location !!!) * get the locations for an app (excluding the run location !!!)
* *
* @param string $app app optional defaults to $GLOBALS['egw_info']['flags']['currentapp']; * @param string $app app optional defaults to $GLOBALS['egw_info']['flags']['currentapp'];
* @return boolean/array false if there are no matching location in the db or array of locations * @return array of locations ([] if there are none)
*/ */
function get_locations_for_app($app='') function get_locations_for_app($app='')
{ {
if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp']; if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
$locations = false; $locations = [];
foreach($this->db->select(self::TABLE,'DISTINCT '.'acl_location',array( foreach($this->db->select(self::TABLE,'DISTINCT '.'acl_location',array(
'acl_appname' => $app, 'acl_appname' => $app,
),__LINE__,__FILE__) as $row) ),__LINE__,__FILE__) as $row)
@ -662,7 +662,7 @@ class Acl
* Read the grants other users gave $this->account_id for $app, group ACL is taken into account * Read the grants other users gave $this->account_id for $app, group ACL is taken into account
* *
* @param string $app optional defaults to $GLOBALS['egw_info']['flags']['currentapp'] * @param string $app optional defaults to $GLOBALS['egw_info']['flags']['currentapp']
* @param boolean/array $enum_group_acls = true should group acls be returned for all members of that group, default yes * @param boolean|array $enum_group_acls = true should group acls be returned for all members of that group, default yes
* if an array of group-id's is given, that id's will NOT be enumerated! * if an array of group-id's is given, that id's will NOT be enumerated!
* @param int $user = null user whos grants to return, default current user * @param int $user = null user whos grants to return, default current user
* @return array with account-ids (of owners) and granted rights as values * @return array with account-ids (of owners) and granted rights as values
@ -803,4 +803,4 @@ class Acl
} }
return $locations; return $locations;
} }
} }