aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-06-09 22:07:27 -0700
committerredmatrix <git@macgirvin.com>2016-06-09 22:07:27 -0700
commitbb3d56a0b2e3676e780b4b6dd4e1b31b211c7b5e (patch)
tree1dde738343819137fdb4f206a05a907054ff3e6b
parent8f181bb18888db6bdd15d470717da4d53ea7606a (diff)
downloadvolse-hubzilla-bb3d56a0b2e3676e780b4b6dd4e1b31b211c7b5e.tar.gz
volse-hubzilla-bb3d56a0b2e3676e780b4b6dd4e1b31b211c7b5e.tar.bz2
volse-hubzilla-bb3d56a0b2e3676e780b4b6dd4e1b31b211c7b5e.zip
foreach: invalid argument
-rw-r--r--Zotlabs/Module/Acl.php28
-rw-r--r--Zotlabs/Module/Admin.php2
2 files changed, 16 insertions, 14 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php
index 7bc197a93..2bc4ba62d 100644
--- a/Zotlabs/Module/Acl.php
+++ b/Zotlabs/Module/Acl.php
@@ -65,18 +65,20 @@ class Acl extends \Zotlabs\Web\Controller {
intval($count),
intval($start)
);
-
- foreach($r as $g){
- // logger('acl: group: ' . $g['gname'] . ' members: ' . group_get_members_xchan($g['id']));
- $groups[] = array(
- "type" => "g",
- "photo" => "images/twopeople.png",
- "name" => $g['gname'],
- "id" => $g['id'],
- "xid" => $g['hash'],
- "uids" => group_get_members_xchan($g['id']),
- "link" => ''
- );
+
+ if($r) {
+ foreach($r as $g){
+ // logger('acl: group: ' . $g['gname'] . ' members: ' . group_get_members_xchan($g['id']));
+ $groups[] = array(
+ "type" => "g",
+ "photo" => "images/twopeople.png",
+ "name" => $g['gname'],
+ "id" => $g['id'],
+ "xid" => $g['hash'],
+ "uids" => group_get_members_xchan($g['id']),
+ "link" => ''
+ );
+ }
}
}
@@ -204,7 +206,7 @@ class Acl extends \Zotlabs\Web\Controller {
else
$r = array();
- if(count($r)) {
+ if($r) {
foreach($r as $g){
// remove RSS feeds from ACLs - they are inaccessible
diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php
index 21ab7f6a7..085d13fd7 100644
--- a/Zotlabs/Module/Admin.php
+++ b/Zotlabs/Module/Admin.php
@@ -1738,7 +1738,7 @@ class Admin extends \Zotlabs\Web\Controller {
// name, label, value, help string, extra data...
'$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),
'$form_security_token' => get_form_security_token('admin_logs'),