diff options
| -rw-r--r-- | Zotlabs/Widget/Categories.php | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/Zotlabs/Widget/Categories.php b/Zotlabs/Widget/Categories.php index 0c6996d55..0a1c80061 100644 --- a/Zotlabs/Widget/Categories.php +++ b/Zotlabs/Widget/Categories.php @@ -17,36 +17,22 @@ class Categories { function widget($arr) { - $cards = ((array_key_exists('cards',$arr) && $arr['cards']) ? true : false); - - if(($cards) && (! Apps::system_app_installed(App::$profile['profile_uid'], 'Cards'))) - return ''; - - $articles = ((array_key_exists('articles',$arr) && $arr['articles']) ? true : false); - - if(($articles) && (! Apps::system_app_installed(App::$profile['profile_uid'],'Articles'))) - return ''; - $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')))) { + if(!App::$profile['profile_uid'] || !perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'view_stream')) { return ''; } - $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); + $cat = ((x($_REQUEST, 'cat')) ? htmlspecialchars($_REQUEST['cat'], ENT_COMPAT, 'UTF-8') : ''); + $srchurl = App::$query_string; + $srchurl = rtrim(preg_replace('/cat\=[^\&].*?(\&|$)/is', '', $srchurl), '&'); + $srchurl = str_replace(['?f=','&f=', '/?'], ['', '', ''], $srchurl); - if($cards) - return cardcategories_widget($srchurl, $cat); - elseif($articles) - return articlecategories_widget($srchurl, $cat); - elseif($files) + if($files) { return filecategories_widget($srchurl, $cat); - else - return categories_widget($srchurl, $cat); + } + + return categories_widget($srchurl, $cat); } } |