X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffriendica.php;h=9fa203f58d0baa47dfada5b283986a265c104da7;hb=efbdb57f926dc840a162ac960f5a1f3b0fdf0353;hp=52a064224a559ef15eb872754b5e2bcc51961b9e;hpb=8a80ea24d1d8039be6dc532c9db23c60e71eb467;p=friendica.git

diff --git a/mod/friendica.php b/mod/friendica.php
index 52a064224a..9fa203f58d 100644
--- 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'],
@@ -18,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);
@@ -49,14 +61,23 @@ 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)) {
+	$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) {