feature management for admins: Merge branch 'devolop'

[friendica.git] / mod / friendica.php

diff --git a/mod/friendica.php b/mod/friendica.php
index 28807b5b509f677fe589a5661ab6a35582ea5cf0..aad5964baf6e5d1ddf737e88f46b636cb255d6d7 100644 (file)
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -9,7 +9,10 @@ function friendica_init(&$a) {
                        $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' $sql_extra", dbesc($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'],
@@ -26,15 +29,27 @@ function friendica_init(&$a) {
                                        $visible_plugins[] = $rr['name'];
                }
 
+               load_config('feature_lock');
+               $locked_features = array();
+               if(is_array($a->config['feature_lock']) && count($a->config['feature_lock'])) {
+                       foreach($a->config['feature_lock'] as $k => $v) {
+                               if($k === 'config_loaded')
+                                       continue;
+                               $locked_features[$k] = intval($v);
+                       }
+               }
+
                $data = Array(
                        'version' => FRIENDICA_VERSION,
                        'url' => z_root(),
                        'plugins' => $visible_plugins,
+                       'locked_features' => $locked_features,
                        '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);
@@ -57,7 +72,7 @@ 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>';