harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

foreach: invalid argument

Browse Source
This commit is contained in:
redmatrix 2016-06-09 22:07:27 -07:00
parent 8f181bb188
commit bb3d56a0b2
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Zotlabs/Module/Acl.php
View File

@ -65,18 +65,20 @@ class Acl extends \Zotlabs\Web\Controller {
intval($count), intval($count),
intval($start) intval($start)
); );
foreach($r as $g){ if($r) {
// logger('acl: group: ' . $g['gname'] . ' members: ' . group_get_members_xchan($g['id'])); foreach($r as $g){
$groups[] = array( // logger('acl: group: ' . $g['gname'] . ' members: ' . group_get_members_xchan($g['id']));
"type" => "g", $groups[] = array(
"photo" => "images/twopeople.png", "type" => "g",
"name" => $g['gname'], "photo" => "images/twopeople.png",
"id" => $g['id'], "name" => $g['gname'],
"xid" => $g['hash'], "id" => $g['id'],
"uids" => group_get_members_xchan($g['id']), "xid" => $g['hash'],
"link" => '' "uids" => group_get_members_xchan($g['id']),
); "link" => ''
);
}
} }
} }
@ -204,7 +206,7 @@ class Acl extends \Zotlabs\Web\Controller {
else else
$r = array(); $r = array();
if(count($r)) { if($r) {
foreach($r as $g){ foreach($r as $g){
// remove RSS feeds from ACLs - they are inaccessible // remove RSS feeds from ACLs - they are inaccessible

2
Zotlabs/Module/Admin.php
View File

@ -1738,7 +1738,7 @@ class Admin extends \Zotlabs\Web\Controller {
// name, label, value, help string, extra data... // name, label, value, help string, extra data...
'$debugging' => array('debugging', t("Debugging"),get_config('system','debugging'), ""), '$debugging' => array('debugging', t("Debugging"),get_config('system','debugging'), ""),
'$logfile' => array('logfile', t("Log file"), get_config('system','logfile'), t("Must be writable by web server. Relative to your Red top-level directory.")), '$logfile' => array('logfile', t("Log file"), get_config('system','logfile'), t("Must be writable by web server. Relative to your top-level webserver directory.")),
'$loglevel' => array('loglevel', t("Log level"), get_config('system','loglevel'), "", $log_choices), '$loglevel' => array('loglevel', t("Log level"), get_config('system','loglevel'), "", $log_choices),
'$form_security_token' => get_form_security_token('admin_logs'), '$form_security_token' => get_form_security_token('admin_logs'),