X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffriendica.php;h=aad5964baf6e5d1ddf737e88f46b636cb255d6d7;hb=0c9cc29a51941eb572bf16fd5489d0947d47d033;hp=d5dad94484729a43bd8fc78e5ea71add81125ba7;hpb=bdd275474044152a5d9a33ea6b8a8071b931d27e;p=friendica.git diff --git a/mod/friendica.php b/mod/friendica.php old mode 100755 new mode 100644 index d5dad94484..aad5964baf --- 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,35 @@ 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']; + } + + 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' => $a->plugins, + '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); @@ -45,14 +72,23 @@ function friendica_content(&$a) { $o .= t('Please visit Friendica.com to learn more about the Friendica project.') . '
'; - $o .= t('Bug reports and issues: please visit') . ' ' . 'Bugs.Friendica.com
'; + $o .= t('Bug reports and issues: please visit') . ' ' . ''.t('the bugtracker at github').'
'; $o .= t('Suggestions, praise, donations, etc. - please email "Info" at Friendica - dot com') . '
'; $o .= ''; - 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 .= '' . t('Installed plugins/addons/apps:') . '
'; - $sorted = $a->plugins; + $sorted = $visible_plugins; $s = ''; sort($sorted); foreach($sorted as $p) {