X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffriendica.php;h=28807b5b509f677fe589a5661ab6a35582ea5cf0;hb=06c9330c5e0f5822cbd1695a50b01fb391a2984d;hp=363f1409f19ce1171d6dcc1a3db84f2ff43a2184;hpb=00c342e13d833fd215e5dc03a508e1abe660fe21;p=friendica.git

diff --git a/mod/friendica.php b/mod/friendica.php
index 363f1409f1..28807b5b50 100644
--- 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,14 +18,22 @@ 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' => FRIENDIKA_VERSION,
+			'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' => FRIENDIKA_PLATFORM,
+			'platform' => FRIENDICA_PLATFORM,
 			'info' => ((x($a->config,'info')) ? $a->config['info'] : '')			
 		);
 
@@ -40,26 +52,40 @@ function friendica_content(&$a) {
 
 	$o .= '<p></p><p>';
 
-	$o .= t('This is Friendica, version') . ' ' . FRIENDIKA_VERSION . ' ';
+	$o .= t('This is Friendica, version') . ' ' . FRIENDICA_VERSION . ' ';
 	$o .= t('running at web location') . ' ' . z_root() . '</p><p>';
 
-	$o .= t('Please visit <a href="http://project.friendika.com">Project.Friendika.com</a> to learn more about the Friendica project.') . '</p><p>';	
+	$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.friendika.com">Bugs.Friendika.com</a></p><p>';
+	$o .= t('Bug reports and issues: please visit') . ' ' . '<a href="http://bugs.friendica.com">Bugs.Friendica.com</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);