aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-01-25 10:31:09 +0100
committerMario <mario@mariovavti.com>2019-01-25 10:31:09 +0100
commit45dcd987c5c873a3da39e508ca195f73e78459a0 (patch)
tree89cec599e2219120175ec3550e800be2efe13619 /Zotlabs/Module
parent960246fbb9e7e352908351c4f063b31f93ea1f52 (diff)
parent13e0151cd2569832588cc9a973bcf40d850edd53 (diff)
downloadvolse-hubzilla-45dcd987c5c873a3da39e508ca195f73e78459a0.tar.gz
volse-hubzilla-45dcd987c5c873a3da39e508ca195f73e78459a0.tar.bz2
volse-hubzilla-45dcd987c5c873a3da39e508ca195f73e78459a0.zip
Merge branch 'doku' into 'dev'
Correct and extend Doxygen comments. See merge request hubzilla/core!1485
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Cards.php16
1 files changed, 10 insertions, 6 deletions
diff --git a/Zotlabs/Module/Cards.php b/Zotlabs/Module/Cards.php
index b66de158b..3f0e93de5 100644
--- a/Zotlabs/Module/Cards.php
+++ b/Zotlabs/Module/Cards.php
@@ -10,9 +10,13 @@ require_once('include/channel.php');
require_once('include/conversation.php');
require_once('include/acl_selectors.php');
+/**
+ * @brief Provides the Cards module.
+ *
+ */
class Cards extends Controller {
- function init() {
+ public function init() {
if(argc() > 1)
$which = argv(1);
@@ -20,14 +24,15 @@ class Cards extends Controller {
return;
profile_load($which);
-
}
/**
* {@inheritDoc}
- * @see \Zotlabs\Web\Controller::get()
+ * @see \\Zotlabs\\Web\\Controller::get()
+ *
+ * @return string Parsed HTML from template 'cards.tpl'
*/
- function get($update = 0, $load = false) {
+ public function get($update = 0, $load = false) {
if(observer_prohibited(true)) {
return login();
@@ -99,7 +104,6 @@ class Cards extends Controller {
}
-
if(perm_is_allowed($owner, $ob_hash, 'write_pages')) {
$x = [
@@ -110,7 +114,7 @@ class Cards extends Controller {
'nickname' => $channel['channel_address'],
'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid']
|| $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
- 'acl' => (($is_owner) ? populate_acl($channel_acl, false,
+ 'acl' => (($is_owner) ? populate_acl($channel_acl, false,
PermissionDescription::fromGlobalPermission('view_pages')) : ''),
'permissions' => $channel_acl,
'showacl' => (($is_owner) ? true : false),