Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / mod / friendica.php

diff --git a/mod/friendica.php b/mod/friendica.php
old mode 100755 (executable)
new mode 100644 (file)
index d5dad94..28807b5
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -4,8 +4,12 @@ function friendica_init(&$a) {
        if ($a->argv[1]=="json"){
                $register_policy = Array('REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN');
 
+               $sql_extra = '';
+               if(x($a->config,'admin_nickname')) {
+                       $sql_extra = sprintf(" AND nickname = '%s' ",dbesc($a->config['admin_nickname']));
+               }
                if (isset($a->config['admin_email']) && $a->config['admin_email']!=''){
-                       $r = q("SELECT username, nickname FROM user WHERE email='%s'", $a->config['admin_email']);
+                       $r = q("SELECT username, nickname FROM user WHERE email='%s' $sql_extra", dbesc($a->config['admin_email']));
                        $admin = array(
                                'name' => $r[0]['username'],
                                'profile'=> $a->get_baseurl().'/profile/'.$r[0]['nickname'],
@@ -14,10 +18,18 @@ function friendica_init(&$a) {
                        $admin = false;
                }
 
+               $visible_plugins = array();
+               if(is_array($a->plugins) && count($a->plugins)) {
+                       $r = q("select * from addon where hidden = 0");
+                       if(count($r))
+                               foreach($r as $rr)
+                                       $visible_plugins[] = $rr['name'];
+               }
+
                $data = Array(
                        'version' => FRIENDICA_VERSION,
                        'url' => z_root(),
-                       'plugins' => $a->plugins,
+                       'plugins' => $visible_plugins,
                        'register_policy' =>  $register_policy[$a->config['register_policy']],
                        'admin' => $admin,
                        'site_name' => $a->config['sitename'],
@@ -50,9 +62,18 @@ function friendica_content(&$a) {
 
        $o .= '<p></p>';
 
-       if(count($a->plugins)) {
+       $visible_plugins = array();
+       if(is_array($a->plugins) && count($a->plugins)) {
+               $r = q("select * from addon where hidden = 0");
+               if(count($r))
+                       foreach($r as $rr)
+                               $visible_plugins[] = $rr['name'];
+       }
+
+
+       if(count($visible_plugins)) {
                $o .= '<p>' . t('Installed plugins/addons/apps:') . '</p>';
-               $sorted = $a->plugins;
+               $sorted = $visible_plugins;
                $s = '';
                sort($sorted);
                foreach($sorted as $p) {