From f1cb28774230cb69b9ce8ee5b32e4e2531aa586a Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 24 Mar 2012 21:50:04 -0700
Subject: bug #329 - compress the plugin list on the friendica info page

---
 mod/friendica.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'mod/friendica.php')

diff --git a/mod/friendica.php b/mod/friendica.php
index ab92e31ed..d5dad9448 100755
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -51,15 +51,20 @@ function friendica_content(&$a) {
 	$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>';
+		$o .= '<p>' . t('Installed plugins/addons/apps:') . '</p>';
+		$sorted = $a->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); 	
 
-- 
cgit v1.2.3


From 75f778a504c6032c6e029c741be8354419130741 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 29 Mar 2012 18:22:20 -0700
Subject: provide a way to specify an admin account for siteinfo if more than
 one have admin email address

---
 mod/friendica.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'mod/friendica.php')

diff --git a/mod/friendica.php b/mod/friendica.php
index d5dad9448..52a064224 100755
--- 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'],
-- 
cgit v1.2.3