From b50151d7bf5f05b4cac8afa2674605e195d12e9a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 7 Jul 2015 14:46:47 +0200 Subject: make directory suggest work with directory options --- include/widgets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/widgets.php') diff --git a/include/widgets.php b/include/widgets.php index 4a9032a21..888e56733 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -132,7 +132,7 @@ function widget_suggestions($arr) { 'profile' => $rr['xchan_url'], 'name' => $rr['xchan_name'], 'photo' => $rr['xchan_photo_m'], - 'ignlnk' => z_root() . '/suggest?ignore=' . $rr['xchan_hash'], + 'ignlnk' => z_root() . '/directory?ignore=' . $rr['xchan_hash'], 'conntxt' => t('Connect'), 'connlnk' => $connlnk, 'ignore' => t('Ignore/Hide') -- cgit v1.2.3 From 43354ab385cd5c7adcc86f591159f10201420aae Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 8 Jul 2015 18:05:38 -0700 Subject: inconsistent naming of block item types --- include/widgets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/widgets.php') diff --git a/include/widgets.php b/include/widgets.php index d87a8c440..bafd9c7a2 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -903,7 +903,7 @@ function widget_random_block($arr) { item_type = %d $sql_options order by $randfunc limit 1", intval($channel_id), dbesc('%' . $contains . '%'), - intval(ITEM_TYPE_BUILDBLOCK) + intval(ITEM_TYPE_BLOCK) ); if($r) { -- cgit v1.2.3 From 964e461e092b15a66da891a0a4c155323e8391e1 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 15 Jul 2015 21:01:18 -0700 Subject: allow plugins to provide module handlers for arbitrary modules that haven't been installed on the system. --- include/widgets.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/widgets.php') diff --git a/include/widgets.php b/include/widgets.php index 888e56733..032b1c67e 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -381,6 +381,7 @@ function widget_categories($arr) { $srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl); return categories_widget($srchurl, $cat); + } function widget_tagcloud_wall($arr) { @@ -409,6 +410,7 @@ function widget_catcloud_wall($arr) { $limit = ((array_key_exists('limit',$arr)) ? intval($arr['limit']) : 50); return catblock($a->profile['profile_uid'], $limit, $a->profile['channel_hash'], ITEM_WALL); + } -- cgit v1.2.3 From 070397ef1470972476df48b169f4d6ee844c5c1f Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 15 Jul 2015 21:43:42 -0700 Subject: make tagadelic results (including categories in wall-to-wall posts) visible to wall visitors by checking ownership rather than authorship. It is doubtful the queries will scale on redmatrix so moved forward to hubzilla tree. --- include/widgets.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/widgets.php') diff --git a/include/widgets.php b/include/widgets.php index bafd9c7a2..c79d2a6c0 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -29,7 +29,7 @@ function widget_tagcloud($args) { $type = TERM_CATEGORY; // FIXME there exists no $authors variable - $r = tagadelic($uid, $count, $authors, $flags, ITEM_TYPE_WEBPAGE, $type); + $r = tagadelic($uid, $count, $authors, $owner, $flags, ITEM_TYPE_WEBPAGE, $type); if($r) { $o = '

' . t('Categories') . '

'; @@ -392,7 +392,7 @@ function widget_tagcloud_wall($arr) { $limit = ((array_key_exists('limit', $arr)) ? intval($arr['limit']) : 50); if(feature_enabled($a->profile['profile_uid'], 'tagadelic')) - return wtagblock($a->profile['profile_uid'], $limit, $a->profile['channel_hash'], 'wall'); + return wtagblock($a->profile['profile_uid'], $limit, '', $a->profile['channel_hash'], 'wall'); return ''; } @@ -407,7 +407,7 @@ function widget_catcloud_wall($arr) { $limit = ((array_key_exists('limit',$arr)) ? intval($arr['limit']) : 50); - return catblock($a->profile['profile_uid'], $limit, $a->profile['channel_hash'], 'wall'); + return catblock($a->profile['profile_uid'], $limit, '', $a->profile['channel_hash'], 'wall'); } -- cgit v1.2.3 From ec00c5b18a1efea64517b18fa12bb9df6f0b95f7 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 19 Jul 2015 17:53:52 -0700 Subject: the view_photos and post_photos permissions are redundant and are now mapped to view_storage and write_storage --- include/widgets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/widgets.php') diff --git a/include/widgets.php b/include/widgets.php index c79d2a6c0..6c1df3022 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -604,7 +604,7 @@ function widget_photo_albums($arr) { if(! $a->profile['profile_uid']) return ''; $channelx = channelx_by_n($a->profile['profile_uid']); - if((! $channelx) || (! perm_is_allowed($a->profile['profile_uid'], get_observer_hash(), 'view_photos'))) + if((! $channelx) || (! perm_is_allowed($a->profile['profile_uid'], get_observer_hash(), 'view_storage'))) return ''; require_once('include/photos.php'); -- cgit v1.2.3