aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-01 19:27:41 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-01 19:27:41 -0700
commit1ce8ce896b39e4131fdb67ce4505959638c523a5 (patch)
treeecf53b2f84cc9c412bc68efadc5eb8d82fabf617 /mod
parent85daf26eb1f12a5fd7f2782b0cd4c9cd6f2c0cb5 (diff)
downloadvolse-hubzilla-1ce8ce896b39e4131fdb67ce4505959638c523a5.tar.gz
volse-hubzilla-1ce8ce896b39e4131fdb67ce4505959638c523a5.tar.bz2
volse-hubzilla-1ce8ce896b39e4131fdb67ce4505959638c523a5.zip
provide consistent ui for things
Diffstat (limited to 'mod')
-rw-r--r--mod/thing.php21
1 files changed, 16 insertions, 5 deletions
diff --git a/mod/thing.php b/mod/thing.php
index ed0f97efa..78fbf396c 100644
--- a/mod/thing.php
+++ b/mod/thing.php
@@ -5,8 +5,9 @@
*/
require_once('include/items.php');
+require_once('include/security.php');
require_once('include/contact_selectors.php');
-
+require_once('include/acl_selectors.php');
function thing_init(&$a) {
@@ -61,9 +62,6 @@ function thing_init(&$a) {
* Future work on this module might produce more complex activities with targets, e.g. Phillip likes Karen's moustache
* and to describe other non-thing objects like channels, such as Karl wants Susan - where Susan represents a channel profile.
*/
-
- /** @FIXME add and fix ACL support to the input forms */
-
if((! $name) || (! $translated_verb))
return;
@@ -221,7 +219,9 @@ function thing_content(&$a) {
if(argc() == 2) {
- $r = q("select * from obj where obj_type = %d and obj_obj = '%s' limit 1",
+ $sql_extra = permissions_sql();
+
+ $r = q("select * from obj where obj_type = %d and obj_obj = '%s' $sql_extra limit 1",
intval(TERM_OBJ_THING),
dbesc(argv(1))
);
@@ -247,6 +247,11 @@ function thing_content(&$a) {
return;
}
+ $acl = new AccessList($channel);
+ $channel_acl = $acl->get();
+
+ $lockstate = (($acl->is_private()) ? 'lock' : 'unlock');
+
$thing_hash = '';
if(argc() == 3 && argv(1) === 'edit') {
@@ -277,6 +282,9 @@ function thing_content(&$a) {
'$theurl' => $r[0]['obj_url'],
'$img_lbl' => t('URL for photo of thing (optional)'),
'$imgurl' => $r[0]['obj_imgurl'],
+ '$permissions' => t('Permissions'),
+ '$aclselect' => populate_acl($channel_acl,false),
+ '$lockstate' => $lockstate,
'$submit' => t('Submit')
));
@@ -316,6 +324,9 @@ function thing_content(&$a) {
'$thing_lbl' => t('Name of thing e.g. something'),
'$url_lbl' => t('URL of thing (optional)'),
'$img_lbl' => t('URL for photo of thing (optional)'),
+ '$permissions' => t('Permissions'),
+ '$aclselect' => populate_acl($channel_acl,false),
+ '$lockstate' => $lockstate,
'$submit' => t('Submit')
));