Merge pull request #1937 from annando/1510-follow-notifications

[friendica.git] / mod / friendica.php

diff --git a/mod/friendica.php b/mod/friendica.php
old mode 100755 (executable)
new mode 100644 (file)
index ab92e31..9fa203f
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -4,8 +4,15 @@ 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']);
+                       $adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
+
+                       //$r = q("SELECT username, nickname FROM user WHERE email='%s' $sql_extra", dbesc($a->config['admin_email']));
+                       $r = q("SELECT username, nickname FROM user WHERE email='%s' $sql_extra", dbesc($adminlist[0]));
                        $admin = array(
                                'name' => $r[0]['username'],
                                'profile'=> $a->get_baseurl().'/profile/'.$r[0]['nickname'],
@@ -14,15 +21,24 @@ 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'],
                        'platform' => FRIENDICA_PLATFORM,
-                       'info' => ((x($a->config,'info')) ? $a->config['info'] : '')                    
+                       'info' => ((x($a->config,'info')) ? $a->config['info'] : ''),
+                       'no_scrape_url' => $a->get_baseurl().'/noscrape'
                );
 
                echo json_encode($data);
@@ -45,21 +61,35 @@ function friendica_content(&$a) {
 
        $o .= t('Please visit <a href="http://friendica.com">Friendica.com</a> to learn more about the Friendica project.') . '</p><p>';        
 
-       $o .= t('Bug reports and issues: please visit') . ' ' . '<a href="http://bugs.friendica.com">Bugs.Friendica.com</a></p><p>';
+       $o .= t('Bug reports and issues: please visit') . ' ' . '<a href="https://github.com/friendica/friendica/issues?state=open">'.t('the bugtracker at github').'</a></p><p>';
        $o .= t('Suggestions, praise, donations, etc. - please email "Info" at Friendica - dot com') . '</p>';
 
        $o .= '<p></p>';
 
-       if(count($a->plugins)) {
-               $o .= '<p>' . t('Installed plugins/addons/apps') . '</p>';
-               $o .= '<ul>';
-               foreach($a->plugins as $p)
-                       if(strlen($p))
-                               $o .= '<li>' . $p . '</li>';
-               $o .= '</ul>';
+       $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 = $visible_plugins;
+               $s = '';
+               sort($sorted);
+               foreach($sorted as $p) {
+                       if(strlen($p)) {
+                               if(strlen($s)) $s .= ', ';
+                               $s .= $p;
+                       }
+               }
+               $o .= '<div style="margin-left: 25px; margin-right: 25px;">' . $s . '</div>';
        }
        else
-               $o .= '<p>' . t('No installed plugins/addons/apps');
+               $o .= '<p>' . t('No installed plugins/addons/apps') . '</p>';
 
        call_hooks('about_hook', $o);