From 564f9c924ad07f94c24f8e9ebadc827d043da8d1 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Thu, 12 May 2011 10:26:34 +0200
Subject: [PATCH 1/2] Serve friendika node info as json from url
 /friendika/json/

---
 mod/friendika.php | 40 +++++++++++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/mod/friendika.php b/mod/friendika.php
index 4a8240a11..f07164f2c 100644
--- a/mod/friendika.php
+++ b/mod/friendika.php
@@ -1,6 +1,34 @@
 <?php
 
 function friendika_content(&$a) {
+	if ($a->argv[1]=="json"){
+		$register_policy = Array('REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN');
+
+		if (isset($a->config['admin_email']) && $a->config['admin_email']!=''){
+			$r = q("SELECT username, nickname FROM user WHERE email='%s'", $a->config['admin_email']);
+			$admin = array(
+				'name' => $r[0]['username'],
+				'profile'=> $a->get_baseurl().'profile/'.$r[0]['nickname'],
+			);
+		} else {
+			$admin = false;
+		}
+
+
+
+		$data = Array(
+			'version' => FRIENDIKA_VERSION,
+			'url' => $a->get_baseurl(),
+			'plugins' => $a->plugins,
+			'register_policy' =>  $register_policy[$a->config['register_policy']],
+			'admin' => $admin,
+			'site_name' => $a->config['sitename'],
+			
+		);
+
+		echo json_encode($data);
+		killme();
+	}
 
 	$o = '';
 	$o .= '<h3>Friendika</h3>';
@@ -34,14 +62,4 @@ function friendika_content(&$a) {
  	
 	return $o;
 
-
-
-
-
-
-
-
-
-
-
-}
\ No newline at end of file
+}

From 31aee6b803ebccb0bf6ae36971e10aeb0effd60b Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Thu, 12 May 2011 10:33:59 +0200
Subject: [PATCH 2/2] missing / in admin profile url

---
 mod/friendika.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/friendika.php b/mod/friendika.php
index f07164f2c..0347a07a8 100644
--- a/mod/friendika.php
+++ b/mod/friendika.php
@@ -8,7 +8,7 @@ function friendika_content(&$a) {
 			$r = q("SELECT username, nickname FROM user WHERE email='%s'", $a->config['admin_email']);
 			$admin = array(
 				'name' => $r[0]['username'],
-				'profile'=> $a->get_baseurl().'profile/'.$r[0]['nickname'],
+				'profile'=> $a->get_baseurl().'/profile/'.$r[0]['nickname'],
 			);
 		} else {
 			$admin = false;