diff options
| author | Hilmar R <u02@u29lx193> | 2021-01-22 01:38:43 +0100 |
|---|---|---|
| committer | Hilmar R <u02@u29lx193> | 2021-01-22 01:38:43 +0100 |
| commit | 523765b968a5d94a98eee12854fc527d5abbc2e7 (patch) | |
| tree | a71caba8943c674917821a4afd333eb39ac92b2e /Zotlabs/Widget/Categories.php | |
| parent | 78f150cfbc1b713bfba3101fdc3f1fd624120637 (diff) | |
| parent | 254e30bea173e350a24756cbd8cf4acdfe32933e (diff) | |
| download | volse-hubzilla-523765b968a5d94a98eee12854fc527d5abbc2e7.tar.gz volse-hubzilla-523765b968a5d94a98eee12854fc527d5abbc2e7.tar.bz2 volse-hubzilla-523765b968a5d94a98eee12854fc527d5abbc2e7.zip | |
Merge branch 'master' into air.5
Diffstat (limited to 'Zotlabs/Widget/Categories.php')
| -rw-r--r-- | Zotlabs/Widget/Categories.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Zotlabs/Widget/Categories.php b/Zotlabs/Widget/Categories.php index 82c37cd0c..94ad469da 100644 --- a/Zotlabs/Widget/Categories.php +++ b/Zotlabs/Widget/Categories.php @@ -21,7 +21,9 @@ class Categories { if(($articles) && (! Apps::system_app_installed(App::$profile['profile_uid'],'Articles'))) return ''; - if((! App::$profile['profile_uid']) + $files = ((array_key_exists('files',$arr) && $arr['files']) ? true : false); + + if((! App::$profile['profile_uid']) || (! perm_is_allowed(App::$profile['profile_uid'],get_observer_hash(),(($cards || $articles) ? 'view_pages' : 'view_stream')))) { return ''; } @@ -29,12 +31,14 @@ class Categories { $cat = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat'],ENT_COMPAT,'UTF-8') : ''); $srchurl = (($cards) ? App::$argv[0] . '/' . App::$argv[1] : App::$query_string); $srchurl = rtrim(preg_replace('/cat\=[^\&].*?(\&|$)/is','',$srchurl),'&'); - $srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl); + $srchurl = str_replace(array('?f=','&f=', '/?'),array('', '', ''),$srchurl); if($cards) return cardcategories_widget($srchurl, $cat); elseif($articles) return articlecategories_widget($srchurl, $cat); + elseif($files) + return filecategories_widget($srchurl, $cat); else return categories_widget($srchurl, $cat); |