aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-02-20 21:31:40 -0800
committerzotlabs <mike@macgirvin.com>2018-02-20 21:31:40 -0800
commitb6d34bffccc42a9367d1108144824970946532e8 (patch)
tree2ce9bb2545d9e762a69033f858d741c010c3c0a8
parentce8349662d8c9e309f3faf57114acddb67eb11b7 (diff)
downloadvolse-hubzilla-b6d34bffccc42a9367d1108144824970946532e8.tar.gz
volse-hubzilla-b6d34bffccc42a9367d1108144824970946532e8.tar.bz2
volse-hubzilla-b6d34bffccc42a9367d1108144824970946532e8.zip
trim non-existent/deprecated plugins from siteinfo plugin list
-rw-r--r--include/network.php4
-rwxr-xr-xinclude/plugin.php12
2 files changed, 13 insertions, 3 deletions
diff --git a/include/network.php b/include/network.php
index 2ac430e82..0824183f7 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1605,10 +1605,10 @@ function get_site_info() {
'commit' => $commit,
'plugins' => $visible_plugins,
'register_policy' => $register_policy[get_config('system','register_policy')],
- 'invitation_only' => intval(get_config('system','invitation_only')),
+ 'invitation_only' => (bool) intval(get_config('system','invitation_only')),
'directory_mode' => $directory_mode[get_config('system','directory_mode')],
'language' => get_config('system','language'),
- 'rss_connections' => intval(get_config('system','feed_contacts')),
+ 'rss_connections' => (bool) intval(get_config('system','feed_contacts')),
'expiration' => $site_expire,
'default_service_restrictions' => $service_class,
'locked_features' => $locked_features,
diff --git a/include/plugin.php b/include/plugin.php
index f452d8342..62d443ab8 100755
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -245,8 +245,18 @@ function plugins_sync() {
* @return array
*/
function visible_plugin_list() {
+
$r = q("select * from addon where hidden = 0 order by aname asc");
- return(($r) ? ids_to_array($r,'aname') : array());
+ $x = (($r) ? ids_to_array($r,'aname') : array());
+ $y = [];
+ if($x) {
+ foreach($x as $xv) {
+ if(is_dir('addon/' . $xv)) {
+ $y[] = $xv;
+ }
+ }
+ }
+ return $y;
}