From b505e76393c28110fa1b6c208d248f0ee59f90cf Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Tue, 15 Feb 2011 12:24:21 +0100 Subject: [PATCH 1/7] First attemp of api --- include/api.php | 389 ++++++++++++++++++++++++++++++++++++++++++++++++ mod/api.php | 11 ++ 2 files changed, 400 insertions(+) create mode 100644 include/api.php create mode 100644 mod/api.php diff --git a/include/api.php b/include/api.php new file mode 100644 index 0000000000..dadd33d455 --- /dev/null +++ b/include/api.php @@ -0,0 +1,389 @@ +name; + foreach($array->attrs as $n=>$v){ + $attrs .= " $n='$v'"; + } + } + + + $xml = ''; + + $xml .= '<' . $node_block . $attrs. '>'; + $xml .= self::generateXmlFromArray($array, $node_name); + $xml .= ''; + + return $xml; + } + + private static function generateXmlFromArray($array, $node_name) { + $xml = ''; + + if (is_array($array) || is_object($array)) { + foreach ($array as $key=>$value) { + $attrs=""; + if ($value instanceof Container){ + $node_name=$value->name; + foreach($value->attrs as $n=>$v){ + $attrs .= " $n='$v'"; + } + } + if (is_numeric($key)) { + $key = $node_name; + } + + + $xml .= '<' . $key . $attrs.'>' . self::generateXmlFromArray($value, $node_name) . ''; + } + } else { + if (is_bool($array)) $array = ($array===true?"true":"false"); + $xml = htmlspecialchars($array, ENT_QUOTES); + } + + return $xml; + } + + } + + // this is used when json and xml are not translatable to arrays + // like [{text:'text'},{text:'text2'}] + // and texttext2 + class Container extends ArrayObject{ + public $name; + public $attrs=Array(); + function __construct($name){ + $this->name = $name; + $args = func_get_args(); + unset($args[0]); + call_user_func_array(array(parent,'__construct'), $args); + } + } + + function api_date($str){ + //Wed May 23 06:01:13 +0000 2007 + return datetime_convert('UTC', 'UTC', $str, "D M d h:i:s +0000 Y" ); + } + + + function api_register_func($path, $func, $auth=false){ + global $API; + $API[$path] = array('func'=>$func, + 'auth'=>auth); + } + + /** + * Simple HTTP Login + */ + function api_login(&$a){ + if (!isset($_SERVER['PHP_AUTH_USER'])) { + header('WWW-Authenticate: Basic realm="Friendika"'); + header('HTTP/1.0 401 Unauthorized'); + die('This api require login'); + } + + $user = $_SERVER['PHP_AUTH_USER']; + $encrypted = hash('whirlpool',trim($_SERVER['PHP_AUTH_PW'])); + + + // da auth.php + + // process normal login request + + $r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) + AND `password` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1", + dbesc(trim($user)), + dbesc(trim($user)), + dbesc($encrypted) + ); + if(count($r)) + $record = $r[0]; + $_SESSION['uid'] = $record['uid']; + $_SESSION['theme'] = $record['theme']; + $_SESSION['authenticated'] = 1; + $_SESSION['page_flags'] = $record['page-flags']; + $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $record['nickname']; + $_SESSION['addr'] = $_SERVER['REMOTE_ADDR']; + + notice( t("Welcome back ") . $record['username'] . EOL); + $a->user = $record; + + if(strlen($a->user['timezone'])) { + date_default_timezone_set($a->user['timezone']); + $a->timezone = $a->user['timezone']; + } + + $r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1", + intval($_SESSION['uid'])); + if(count($r)) { + $a->contact = $r[0]; + $a->cid = $r[0]['id']; + $_SESSION['cid'] = $a->cid; + } + q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d LIMIT 1", + dbesc(datetime_convert()), + intval($_SESSION['uid']) + ); + + call_hooks('logged_in', $a->user); + + header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"'); + } + + function api_call(&$a){ + GLOBAL $API; + foreach ($API as $p=>$info){ + if (strpos($a->query_string, $p)===0){ + if ($info['auth']===true) api_login($a); + + $r = call_user_func($info['func'], $a); + if ($r===false) return; + + if ($r instanceof Container){ + $name=NULL; $values=$r; + } else { + foreach($r as $name=>$values){} + } + + // return xml + if (strpos($a->query_string, ".xml")>0){ + return XMLSerializer::generateValidXmlFromArray($values, $name); + } + // return json + if (strpos($a->query_string, ".json")>0){ + if ($values instanceof Container) $values= iterator_to_array($values); + return json_encode($values); + } + //echo "
"; var_dump($r); die();
+			}
+		}
+		return false;
+	}
+	
+		
+	/**
+	 * Returns extended information of a given user, specified by ID or screen name as per the required id parameter.
+	 * The author's most recent status will be returned inline.
+	 * http://developer.twitter.com/doc/get/users/show
+	 */
+	function api_users_show(&$a){
+		
+		$user = null;
+		$extra_query = "";
+		if(x($_GET, 'user_id')) {
+			$user = intval($_GET['user_id']);	
+			$extra_query = "AND `user`.`uid` = %d ";
+		}
+		if(x($_GET, 'screen_name')) {
+			$user = dbesc($_GET['screen_name']);	
+			$extra_query = "AND `user`.`nickname` = '%s' ";
+		}
+		
+		if ($user===null){
+			list($user, $null) = explode(".",$a->argv[3]);
+			if(is_numeric($user)){
+				$user = intval($user);
+				$extra_query = "AND `user`.`uid` = %d ";
+			} else {
+				$user = dbesc($user);
+				$extra_query = "AND `user`.`nickname` = '%s' ";
+			}
+		}
+		
+		if ($user==='') {
+			return False;
+		}
+		
+
+		// user info		
+		$uinfo = q("SELECT * FROM `user`, `contact`
+				WHERE `user`.`uid`=`contact`.`uid` AND `contact`.`self`=1
+				$extra_query",
+				$user
+		);
+		if (count($uinfo)==0) {
+			return False;
+		}
+		
+		// count public wall messages
+		$r = q("SELECT COUNT(`id`) as `count` FROM `item`
+				WHERE  `uid` = %d
+				AND `type`='wall' 
+				AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''",
+				intval($uinfo[0]['uid'])
+		);
+		$countitms = $r[0]['count'];
+		
+		// count friends
+		$r = q("SELECT COUNT(`id`) as `count` FROM `contact`
+				WHERE  `uid` = %d
+				AND `self`=0 AND `blocked`=0", 
+				intval($uinfo[0]['uid'])
+		);
+		$countfriends = $r[0]['count'];
+		
+		// get last public wall message
+		$lastwall = q("SELECT * FROM `item`
+				WHERE  `uid` = %d
+				AND `type`='wall' 
+				AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''
+				ORDER BY `created` DESC LIMIT 1",
+				intval($uinfo[0]['uid'])
+		);
+	
+		//echo "
"; var_dump($lastwall); die();
+		
+		$ret = Array(
+			'user' => Array(
+				'id' => $uinfo[0]['uid'],
+				'name' => $uinfo[0]['username'],
+				'screen_name' => $uinfo[0]['nickname'],
+				'location' => $uinfo[0]['default-location'],
+				'profile_image_url' => $uinfo[0]['photo'],
+				'url' => $uinfo[0]['url'],
+				'protected' => false,	#
+				'friends_count' => $countfriends,
+				'created_at' => api_date($uinfo[0]['created']),
+				'utc_offset' => 0, #XXX: fix me
+				'time_zone' => $uinfo[0]['timezone'],
+				'geo_enabled' => false,
+				'statuses_count' => $countitms, #XXX: fix me 
+  				'lang' => 'en', #XXX: fix me
+  				'status' => array(
+  					'created_at' => api_date($lastwall[0]['created']),
+  					'id' => $lastwall[0]['id'],
+  					'text' => bbcode($lastwall[0]['body']),
+  					'source' => 'web',
+  					'truncated' => false,
+  					'in_reply_to_status_id' => '',
+  					'in_reply_to_user_id' => '',
+  					'favorited' => false,
+  					'in_reply_to_screen_name' => '',
+  					'geo' => '',
+    				'coordinates' => $lastwall[0]['coord'],
+    				'place' => $lastwall[0]['location'],
+    				'contributors' => ''					
+  				)
+				
+			)
+		);
+		
+		return $ret;
+		
+	}
+	api_register_func('api/users/show','api_users_show');
+	
+	/**
+	 * 
+	 * http://developer.twitter.com/doc/get/statuses/home_timeline
+	 */
+	function api_statuses_home_timeline(&$a){
+		if (local_user()===false) return false;
+		
+		// count public wall messages
+		$r = q("SELECT COUNT(`id`) as `count` FROM `item`
+				WHERE  `uid` = %d
+				AND `type`='wall' 
+				AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''",
+				intval($uinfo[0]['uid'])
+		);
+		$countitms = $r[0]['count'];
+		
+		// get last newtork messages
+		$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` ) ";
+		
+		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+			`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
+			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
+			FROM `item`, `contact`, `user`
+			WHERE `item`.`uid` = %d AND `user`.`uid` = `item`.`uid` 
+			AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+			AND `contact`.`id` = `item`.`contact-id`
+			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+			$sql_extra
+			ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
+			intval($_SESSION['uid']),
+			intval($a->pager['start']),
+			intval($a->pager['itemspage'])
+		);
+		$ret = new Container("statuses");
+		$ret->attrs['type']='array';
+
+		#foreach($r as $item) {
+		{
+			$item = $r[0];
+			$status = new Container('status', array(
+				'created_at'=> api_date($item['created']),
+				'id'		=> $item['id'],
+				'text'		=> bbcode($item['body']),
+				'source'	=> 'web', 	#XXX: Fix me!
+				'truncated' => False,
+				'in_reply_to_status_id' => '',
+				'in_reply_to_user_id' => '',
+				'favorited' => false,
+				'in_reply_to_screen_name' => '',
+				'geo' => '',
+				'coordinates' => $item['coord'],
+				'place' => $item['location'],
+				'contributors' => '',
+				'annotations'  => '',
+				'entities'  => '',
+				'user' => Array(
+					'id' => $item['uid'],
+					'name' => $item['username'],
+					'screen_name' => $item['nickname'],
+					'location' => $item['default-location'],
+					'description' => '',
+					'profile_image_url' => $item['photo'],
+					'url' => $item['url'],
+					'protected' => false,	#
+					'followers_count' => $countfriends, #XXX: fix me
+					'friends_count' => $countfriends,
+					'created_at' => api_date($item['created']),
+					'utc_offset' => 0, #XXX: fix me
+					'time_zone' => $item['timezone'],
+					'geo_enabled' => false,
+					'statuses_count' => $countitms, #XXX: fix me 
+	  				'lang' => 'en', #XXX: fix me
+	  				'favourites_count' => 0,
+	  				'contributors_enabled' => false,
+	  				'follow_request_sent' => false,
+	  				'profile_background_color' => 'cfe8f6',
+      				'profile_text_color' => '000000',
+      				'profile_link_color' => 'FF8500',
+ 					'profile_sidebar_fill_color' =>'AD0066',
+					'profile_sidebar_border_color' => 'AD0066',
+	  				'profile_background_image_url' => '',
+	  				'profile_background_tile' => false,
+	  				'profile_use_background_image' => false,
+	  				'notifications' => false,	  				
+				)					
+			
+			));
+			$ret[]=$status;
+		};
+		
+		return $ret;
+	}
+	api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true);
diff --git a/mod/api.php b/mod/api.php
new file mode 100644
index 0000000000..fa5e43de98
--- /dev/null
+++ b/mod/api.php
@@ -0,0 +1,11 @@
+
Date: Wed, 16 Feb 2011 08:55:38 +0100
Subject: [PATCH 2/7] allow /name.ext to load mod/name_ext.php

---
 boot.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot.php b/boot.php
index 2713f3dcea..ab738e2130 100644
--- a/boot.php
+++ b/boot.php
@@ -277,7 +277,7 @@ class App {
 		$this->argv = explode('/',$this->cmd);
 		$this->argc = count($this->argv);
 		if((array_key_exists('0',$this->argv)) && strlen($this->argv[0])) {
-			$this->module = $this->argv[0];
+			$this->module = str_replace(".", "_", $this->argv[0]);
 		}
 		else {
 			$this->module = 'home';

From 793fc60a65c27ffe405b8c4de85e144702165f33 Mon Sep 17 00:00:00 2001
From: Fabio Comuni 
Date: Wed, 16 Feb 2011 08:56:29 +0100
Subject: [PATCH 3/7] add rsd.xml (needs a template)

---
 mod/rsd_xml.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 mod/rsd_xml.php

diff --git a/mod/rsd_xml.php b/mod/rsd_xml.php
new file mode 100644
index 0000000000..5bf4663fd5
--- /dev/null
+++ b/mod/rsd_xml.php
@@ -0,0 +1,24 @@
+
+ 
+   
+     Friendika
+     http://friendika.com/
+     
+       
+         
+           http://status.net/wiki/TwitterCompatibleAPI
+           false
+         
+       
+     
+   
+ 
+	';
+die();
+}
\ No newline at end of file

From 1fb097951d3769b37a870ea498998b662f261e3f Mon Sep 17 00:00:00 2001
From: Fabio Comuni 
Date: Wed, 16 Feb 2011 08:56:47 +0100
Subject: [PATCH 4/7] work on api.

---
 include/api.php | 248 ++++++++++++++++++++++++++++++------------------
 1 file changed, 158 insertions(+), 90 deletions(-)

diff --git a/include/api.php b/include/api.php
index dadd33d455..e8a49a028f 100644
--- a/include/api.php
+++ b/include/api.php
@@ -89,7 +89,7 @@
 	function api_register_func($path, $func, $auth=false){
 		global $API;
 		$API[$path] = array('func'=>$func,
-							'auth'=>auth);
+							'auth'=>$auth);
 	}
 	
 	/**
@@ -167,10 +167,12 @@
 				
 				// return xml
 				if (strpos($a->query_string, ".xml")>0){
+					header ("Content-Type: text/xml");  
 					return XMLSerializer::generateValidXmlFromArray($values, $name);
 				}
 				// return json
 				if (strpos($a->query_string, ".json")>0){
+					header ("Content-Type: application/json");  
 					if ($values instanceof Container) $values= iterator_to_array($values);
 					return json_encode($values);
 				}
@@ -179,15 +181,10 @@
 		}
 		return false;
 	}
-	
-		
 	/**
-	 * Returns extended information of a given user, specified by ID or screen name as per the required id parameter.
-	 * The author's most recent status will be returned inline.
-	 * http://developer.twitter.com/doc/get/users/show
+	 * Returns user info array
 	 */
-	function api_users_show(&$a){
-		
+	function api_get_user(&$a){
 		$user = null;
 		$extra_query = "";
 		if(x($_GET, 'user_id')) {
@@ -211,7 +208,13 @@
 		}
 		
 		if ($user==='') {
-			return False;
+			if (local_user()===false) {
+				api_login($a); return False;
+			} else {
+				$user = $_SESSION['uid'];
+				$extra_query = "AND `user`.`uid` = %d ";
+			}
+			
 		}
 		
 
@@ -241,6 +244,70 @@
 				intval($uinfo[0]['uid'])
 		);
 		$countfriends = $r[0]['count'];
+				
+
+		$ret = Array(
+			'id' => $uinfo[0]['uid'],
+			'name' => $uinfo[0]['username'],
+			'screen_name' => $uinfo[0]['nickname'],
+			'location' => $uinfo[0]['default-location'],
+			'profile_image_url' => $uinfo[0]['photo'],
+			'url' => $uinfo[0]['url'],
+			'protected' => false,	#
+			'friends_count' => $countfriends,
+			'created_at' => api_date($uinfo[0]['created']),
+			'utc_offset' => 0, #XXX: fix me
+			'time_zone' => $uinfo[0]['timezone'],
+			'geo_enabled' => false,
+			'statuses_count' => $countitms, #XXX: fix me 
+			'lang' => 'en', #XXX: fix me
+			'description' => '',
+			'followers_count' => $countfriends, #XXX: fix me
+			'lang' => 'en', #XXX: fix me
+			'favourites_count' => 0,
+			'contributors_enabled' => false,
+			'follow_request_sent' => false,
+			'profile_background_color' => 'cfe8f6',
+			'profile_text_color' => '000000',
+			'profile_link_color' => 'FF8500',
+			'profile_sidebar_fill_color' =>'AD0066',
+			'profile_sidebar_border_color' => 'AD0066',
+			'profile_background_image_url' => '',
+			'profile_background_tile' => false,
+			'profile_use_background_image' => false,
+			'notifications' => false,	 
+		);
+		
+		return $ret;
+		
+	}
+	
+	/**
+	 ** TWITTER API
+	 */
+	
+	/**
+	 * Returns an HTTP 200 OK response code and a representation of the requesting user if authentication was successful; 
+	 * returns a 401 status code and an error message if not. 
+	 * http://developer.twitter.com/doc/get/account/verify_credentials
+	 */
+	function api_account_verify_credentials(&$a){
+		if (local_user()===false) return false;
+		$user_info = api_get_user($a);
+		$ret = new Container("user", $user_info);
+		return $ret;
+	}
+	api_register_func('api/account/verify_credentials','api_account_verify_credentials', true);
+	 	
+	
+		
+	/**
+	 * Returns extended information of a given user, specified by ID or screen name as per the required id parameter.
+	 * The author's most recent status will be returned inline.
+	 * http://developer.twitter.com/doc/get/users/show
+	 */
+	function api_users_show(&$a){
+		$user_info = api_get_user($a);
 		
 		// get last public wall message
 		$lastwall = q("SELECT * FROM `item`
@@ -248,45 +315,28 @@
 				AND `type`='wall' 
 				AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''
 				ORDER BY `created` DESC LIMIT 1",
-				intval($uinfo[0]['uid'])
+				intval($user_info['uid'])
 		);
 	
 		//echo "
"; var_dump($lastwall); die();
 		
-		$ret = Array(
-			'user' => Array(
-				'id' => $uinfo[0]['uid'],
-				'name' => $uinfo[0]['username'],
-				'screen_name' => $uinfo[0]['nickname'],
-				'location' => $uinfo[0]['default-location'],
-				'profile_image_url' => $uinfo[0]['photo'],
-				'url' => $uinfo[0]['url'],
-				'protected' => false,	#
-				'friends_count' => $countfriends,
-				'created_at' => api_date($uinfo[0]['created']),
-				'utc_offset' => 0, #XXX: fix me
-				'time_zone' => $uinfo[0]['timezone'],
-				'geo_enabled' => false,
-				'statuses_count' => $countitms, #XXX: fix me 
-  				'lang' => 'en', #XXX: fix me
-  				'status' => array(
-  					'created_at' => api_date($lastwall[0]['created']),
-  					'id' => $lastwall[0]['id'],
-  					'text' => bbcode($lastwall[0]['body']),
-  					'source' => 'web',
-  					'truncated' => false,
-  					'in_reply_to_status_id' => '',
-  					'in_reply_to_user_id' => '',
-  					'favorited' => false,
-  					'in_reply_to_screen_name' => '',
-  					'geo' => '',
-    				'coordinates' => $lastwall[0]['coord'],
-    				'place' => $lastwall[0]['location'],
-    				'contributors' => ''					
-  				)
-				
-			)
+		$user_info['status'] = array(
+			'created_at' => api_date($lastwall[0]['created']),
+			'id' => $lastwall[0]['id'],
+			'text' => bbcode($lastwall[0]['body']),
+			'source' => 'web',
+			'truncated' => false,
+			'in_reply_to_status_id' => '',
+			'in_reply_to_user_id' => '',
+			'favorited' => false,
+			'in_reply_to_screen_name' => '',
+			'geo' => '',
+			'coordinates' => $lastwall[0]['coord'],
+			'place' => $lastwall[0]['location'],
+			'contributors' => ''					
 		);
+
+		$ret = Array('user' => $user_info);
 		
 		return $ret;
 		
@@ -300,14 +350,7 @@
 	function api_statuses_home_timeline(&$a){
 		if (local_user()===false) return false;
 		
-		// count public wall messages
-		$r = q("SELECT COUNT(`id`) as `count` FROM `item`
-				WHERE  `uid` = %d
-				AND `type`='wall' 
-				AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''",
-				intval($uinfo[0]['uid'])
-		);
-		$countitms = $r[0]['count'];
+		$user_info = api_get_user($a);
 		
 		// get last newtork messages
 		$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` ) ";
@@ -323,20 +366,74 @@
 			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 			$sql_extra
 			ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
-			intval($_SESSION['uid']),
-			intval($a->pager['start']),
-			intval($a->pager['itemspage'])
+			intval($user_info['id']),
+			0,20
 		);
 		$ret = new Container("statuses");
 		$ret->attrs['type']='array';
 
-		#foreach($r as $item) {
-		{
-			$item = $r[0];
+		foreach($r as $item) {
 			$status = new Container('status', array(
 				'created_at'=> api_date($item['created']),
 				'id'		=> $item['id'],
-				'text'		=> bbcode($item['body']),
+				'text'		=> strip_tags(bbcode($item['body'])),
+				'source'	=> 'web', 	#XXX: Fix me!
+				'truncated' => False,
+				'in_reply_to_status_id' => ($item['parent']!=$item['id']?$item['id']:''),
+				'in_reply_to_user_id' => '',
+				'favorited' => false,
+				'in_reply_to_screen_name' => '',
+				'geo' => '',
+				'coordinates' => $item['coord'],
+				'place' => $item['location'],
+				'contributors' => '',
+				'annotations'  => '',
+				'entities'  => '',
+				'user' => $user_info				
+			
+			));
+			$ret[]=$status;
+		};
+		
+		return $ret;
+	}
+	api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true);
+	
+	/*
+	 * http://developer.twitter.com/doc/get/statuses/user_timeline
+	 */
+	function api_statuses_user_timeline(&$a){
+			
+		$user_info = api_get_user($a);
+		
+		// get last public wall message
+		$lastwall = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+			`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
+			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
+			FROM `item`, `contact`, `user`
+			WHERE `item`.`uid` = %d AND `user`.`uid` = `item`.`uid` 
+			AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+			AND `contact`.`id` = `item`.`contact-id`
+			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+			
+			AND `item`.`type`='wall' 
+			AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`=''
+			
+			ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
+			intval($user_info['id']),
+			0, 20
+		);
+		
+		
+		$ret = new Container("statuses");
+		$ret->attrs['type']='array';
+		
+		foreach($lastwall as $item) {
+			$status = new Container('status', array(
+				'created_at'=> api_date($item['created']),
+				'id'		=> $item['id'],
+				'text'		=> strip_tags(bbcode($item['body'])),
 				'source'	=> 'web', 	#XXX: Fix me!
 				'truncated' => False,
 				'in_reply_to_status_id' => '',
@@ -349,41 +446,12 @@
 				'contributors' => '',
 				'annotations'  => '',
 				'entities'  => '',
-				'user' => Array(
-					'id' => $item['uid'],
-					'name' => $item['username'],
-					'screen_name' => $item['nickname'],
-					'location' => $item['default-location'],
-					'description' => '',
-					'profile_image_url' => $item['photo'],
-					'url' => $item['url'],
-					'protected' => false,	#
-					'followers_count' => $countfriends, #XXX: fix me
-					'friends_count' => $countfriends,
-					'created_at' => api_date($item['created']),
-					'utc_offset' => 0, #XXX: fix me
-					'time_zone' => $item['timezone'],
-					'geo_enabled' => false,
-					'statuses_count' => $countitms, #XXX: fix me 
-	  				'lang' => 'en', #XXX: fix me
-	  				'favourites_count' => 0,
-	  				'contributors_enabled' => false,
-	  				'follow_request_sent' => false,
-	  				'profile_background_color' => 'cfe8f6',
-      				'profile_text_color' => '000000',
-      				'profile_link_color' => 'FF8500',
- 					'profile_sidebar_fill_color' =>'AD0066',
-					'profile_sidebar_border_color' => 'AD0066',
-	  				'profile_background_image_url' => '',
-	  				'profile_background_tile' => false,
-	  				'profile_use_background_image' => false,
-	  				'notifications' => false,	  				
-				)					
-			
+				'user' => $user_info
 			));
 			$ret[]=$status;
 		};
 		
 		return $ret;
 	}
-	api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true);
+	api_register_func('api/statuses/user_timeline','api_statuses_user_timeline', true);
+	
\ No newline at end of file

From e472d79b1e64c91dd3e19227151bdf82eb209192 Mon Sep 17 00:00:00 2001
From: Fabio Comuni 
Date: Thu, 21 Apr 2011 17:03:19 +0200
Subject: [PATCH 5/7] Reworked template processor. support for "if" "for" and
 "inc" blocks, also nested

---
 include/template_processor.php | 113 +++++++++++++++++++++++++++++----
 1 file changed, 100 insertions(+), 13 deletions(-)

diff --git a/include/template_processor.php b/include/template_processor.php
index f6d0264df9..d1ff3998f0 100644
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -1,11 +1,12 @@
 "; var_dump($m);
-			$keys = explode(".",$m[1]);
+		private function _push_stack(){
+			$this->stack[] = array($this->r, $this->search, $this->replace, $this->nodes);
+		}
+		private function _pop_stack(){
+			list($this->r, $this->search, $this->replace, $this->nodes) = array_pop($this->stack);
+		}
+		
+		private function _get_var($name){
+			$keys = array_map('trim',explode(".",$name));			
 			$val = $this->r;
 			foreach($keys as $k) {
 				$val = $val[$k];
 			}
+			return $val;
+		}
+		
+		/**
+		 * IF node
+		 * 
+		 * {{ if <$var> }}...{{ endif }}
+		 */
+		private function _replcb_if($args){
+			$val = $this->_get_var($args[2]);
+			return ($val?$args[3]:"");
+		}
+		
+		/**
+		 * FOR node
+		 * 
+		 * {{ for <$var> as $name }}...{{ endfor }}
+		 * {{ for <$var> as $key=>$name }}...{{ endfor }}
+		 */
+		private function _replcb_for($args){
+			$m = array_map('trim', explode(" as ", $args[2]));
+			list($keyname, $varname) = explode("=>",$m[1]);
+			if (is_null($varname)) { $varname=$keyname; $keyname=""; }
+			if ($m[0]=="" || $varname=="" || is_null($varname)) die("template error: 'for ".$m[0]." as ".$varname."'") ;
+			$vals = $this->r[$m[0]];
+			$ret="";
+			if (!is_array($vals)) return $ret; 
+			foreach ($vals as $k=>$v){
+				$this->_push_stack();
+				$r = $this->r;
+				$r[$varname] = $v;
+				if ($keyname!='') $r[$keyname] = $k;
+				$ret .=  $this->replace($args[3], $r);
+				$this->_pop_stack();
+			}
+			return $ret;
+		}
+
+		/**
+		 * INC node
+		 * 
+		 * {{ inc  [with $var1=$var2] }}{{ endinc }}
+		 */
+		private function _replcb_inc($args){
+			list($tplfile, $newctx) = array_map('trim', explode("with",$args[2]));
+			$this->_push_stack();
+			$r = $this->r;
+			if (!is_null($newctx)) {
+				list($a,$b) = array_map('trim', explode("=",$newctx));
+				$r[$a] = $this->_get_var($b); 
+			}
+			$this->nodes = Array();
+			$tpl = load_view_file($tplfile);
+			$ret = $this->replace($tpl, $r);
+			$this->_pop_stack();
+			return $ret;
 			
-			//echo $val;
-			return ($val?$m[2]:"");
+		}
+
+		private function _replcb_node($m) {
+			$node = $this->nodes[$m[1]];
+			if (method_exists($this, "_replcb_".$node[1])){
+				return call_user_func(array($this, "_replcb_".$node[1]),  $node);
+			} else {
+				return "";
+			}
+		}
+						
+		private function _replcb($m){
+			$this->done = false;	
+			$this->nodes[] = (array) $m;
+			return "||". (count($this->nodes)-1) ."||";
+		}
+		
+		private function _build_nodes($s){
+			$this->done = false;
+			while (!$this->done){
+				$this->done=true;
+				$s = preg_replace_callback('|{{ *([a-z]*) *([^}]*)}}([^{]*){{ *end\1 *}}|', array($this, "_replcb"), $s);
+			}
+			krsort($this->nodes);
+			return $s;
 		}
 		
 		public function replace($s, $r) {
-			$this->s = $s;
 			$this->r = $r;
 			$this->search = array();
 			$this->replace = array();
 	
 			$this->_build_replace($r, "");
-	
 			
-			$s = preg_replace_callback("|{{ *if *([^ }]*) *}}([^{]*){{ *endif *}}|", array($this, "_replcb_if"), $s);
+			#$s = str_replace(array("\n","\r"),array("§n§","§r§"),$s);
+			$s = $this->_build_nodes($s);
+			$s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
+			$s = str_replace($this->search,$this->replace,$s);
 			
-			return str_replace($this->search,$this->replace,$s);
+			return $s;
 		}
-		
-	}	
+	}
+	
 	$t = new Template;

From 41f6ccc039633890b42f3a1a4495dfd8c7262da0 Mon Sep 17 00:00:00 2001
From: Fabio Comuni 
Date: Thu, 21 Apr 2011 17:03:31 +0200
Subject: [PATCH 6/7] More works on api

---
 include/api.php            | 358 ++++++++++++++++---------------------
 view/api_timeline_atom.tpl |  21 +++
 view/api_timeline_rss.tpl  |  23 +++
 view/api_timeline_xml.tpl  |  21 +++
 view/api_user_xml.tpl      |  46 +++++
 5 files changed, 269 insertions(+), 200 deletions(-)
 create mode 100644 view/api_timeline_atom.tpl
 create mode 100644 view/api_timeline_rss.tpl
 create mode 100644 view/api_timeline_xml.tpl
 create mode 100644 view/api_user_xml.tpl

diff --git a/include/api.php b/include/api.php
index e8a49a028f..c2a9b3bbe0 100644
--- a/include/api.php
+++ b/include/api.php
@@ -9,76 +9,7 @@
 
 	$API = Array();
 	 
-	class XMLSerializer {
-	
-	    // functions adopted from http://www.sean-barton.co.uk/2009/03/turning-an-array-or-object-into-xml-using-php/
-	
-	    public static function generateValidXmlFromObj(stdClass $obj, $node_block='nodes', $node_name='node') {
-	        $arr = get_object_vars($obj);
-	        return self::generateValidXmlFromArray($arr, $node_block, $node_name);
-	    }
-	
-	    public static function generateValidXmlFromArray($array, $node_block='nodes', $node_name='node') {
-			$attrs="";
-			if ($array instanceof Container){
-				$node_block=$array->name;
-				foreach($array->attrs as $n=>$v){
-					$attrs .= " $n='$v'";
-				}
-			}
-	
-	
-	        $xml = '';
-	
-	        $xml .= '<' . $node_block . $attrs. '>';
-	        $xml .= self::generateXmlFromArray($array, $node_name);
-	        $xml .= '';
-	
-	        return $xml;
-	    }
-	
-	    private static function generateXmlFromArray($array, $node_name) {
-	        $xml = '';
-				
-	        if (is_array($array) || is_object($array)) {
-	            foreach ($array as $key=>$value) {
-	            	$attrs="";
-					if ($value instanceof Container){
-						$node_name=$value->name;
-						foreach($value->attrs as $n=>$v){
-							$attrs .= " $n='$v'";
-						}
-					}		            	
-	                if (is_numeric($key)) {
-	                    $key = $node_name;
-	                }
-	
-	
-	                $xml .= '<' . $key . $attrs.'>' . self::generateXmlFromArray($value, $node_name) . '';
-	            }
-	        } else {
-	        	if (is_bool($array)) $array = ($array===true?"true":"false");
-	            $xml = htmlspecialchars($array, ENT_QUOTES);
-	        }
-	
-	        return $xml;
-	    }
-	
-	}
-	
-	// this is used when json and xml are not translatable to arrays
-	// like [{text:'text'},{text:'text2'}]
-	//	and	texttext2
-	class Container extends ArrayObject{
-		public $name;
-		public $attrs=Array();
-		function __construct($name){
-			$this->name = $name;
-			$args = func_get_args();
-			unset($args[0]);
-			call_user_func_array(array(parent,'__construct'), $args);
-		}
-	}
+
 	
 	function api_date($str){
 		//Wed May 23 06:01:13 +0000 2007
@@ -106,8 +37,10 @@
 		$encrypted = hash('whirlpool',trim($_SERVER['PHP_AUTH_PW']));
     		
 		
-			// da auth.php
-		
+			/**
+			 *  next code from mod/auth.php. needs better solution
+			 */
+			
 		// process normal login request
 
 		$r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) 
@@ -125,7 +58,7 @@
 		$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $record['nickname'];
 		$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
 
-		notice( t("Welcome back ") . $record['username'] . EOL);
+		//notice( t("Welcome back ") . $record['username'] . EOL);
 		$a->user = $record;
 
 		if(strlen($a->user['timezone'])) {
@@ -150,60 +83,90 @@
 		header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
 	}
 	
+	/**************************
+	 *  MAIN API ENTRY POINT  *
+	 **************************/
 	function api_call(&$a){
 		GLOBAL $API;
 		foreach ($API as $p=>$info){
 			if (strpos($a->query_string, $p)===0){
-				if ($info['auth']===true) api_login($a);
+				if ($info['auth']===true && local_user()===false) {
+						api_login($a);
+				}
+		
+				$type="json";		
+				if (strpos($a->query_string, ".xml")>0) $type="xml";
+				if (strpos($a->query_string, ".json")>0) $type="json";
+				if (strpos($a->query_string, ".rss")>0) $type="rss";
+				if (strpos($a->query_string, ".atom")>0) $type="atom";				
 				
-				$r = call_user_func($info['func'], $a);
+				$r = call_user_func($info['func'], $a, $type);
 				if ($r===false) return;
-				
-				if ($r instanceof Container){
-					$name=NULL; $values=$r;
-				} else {						
-					foreach($r as $name=>$values){}
-				}
-				
-				// return xml
-				if (strpos($a->query_string, ".xml")>0){
-					header ("Content-Type: text/xml");  
-					return XMLSerializer::generateValidXmlFromArray($values, $name);
-				}
-				// return json
-				if (strpos($a->query_string, ".json")>0){
-					header ("Content-Type: application/json");  
-					if ($values instanceof Container) $values= iterator_to_array($values);
-					return json_encode($values);
+
+				switch($type){
+					case "xml":
+						$r = mb_convert_encoding($r, "UTF-8",mb_detect_encoding($r));
+						header ("Content-Type: text/xml");
+						return ''."\n".$r;
+						break;
+					case "json": 
+						header ("Content-Type: application/json");  
+						return json_encode($r);
+						break;
+					case "rss":
+						header ("Content-Type: application/rss+xml");
+						return ''."\n".$r;
+						break;
+					case "atom":
+						#header ("Content-Type: application/atom+xml");
+						return ''."\n".$r;
+						break;
+						
 				}
 				//echo "
"; var_dump($r); die();
 			}
 		}
 		return false;
 	}
+
 	/**
-	 * Returns user info array
+	 * RSS extra info
+	 */
+	function api_rss_extra(&$a, $arr, $user_info){
+		if (is_null($user_info)) $user_info = api_get_user($a);
+		$arr['$rss'] = array(
+			'alternate' => $user_info['url'],
+			'self' => $a->get_baseurl(). "/". $a->query_string,
+			'updated' => api_date(null),
+			'language' => $user_info['language'],
+		);
+		
+		return $arr;
+	}
+	 
+	/**
+	 * Returns user info array.
 	 */
 	function api_get_user(&$a){
 		$user = null;
 		$extra_query = "";
 		if(x($_GET, 'user_id')) {
 			$user = intval($_GET['user_id']);	
-			$extra_query = "AND `user`.`uid` = %d ";
+			$extra_query = "AND `contact`.`id` = %d ";
 		}
 		if(x($_GET, 'screen_name')) {
 			$user = dbesc($_GET['screen_name']);	
-			$extra_query = "AND `user`.`nickname` = '%s' ";
+			$extra_query = "AND `contact`.`nick` = '%s' ";
 		}
 		
 		if ($user===null){
 			list($user, $null) = explode(".",$a->argv[3]);
 			if(is_numeric($user)){
 				$user = intval($user);
-				$extra_query = "AND `user`.`uid` = %d ";
+				$extra_query = "AND `contact`.`id` = %d ";
 			} else {
 				$user = dbesc($user);
-				$extra_query = "AND `user`.`nickname` = '%s' ";
+				$extra_query = "AND `contact`.`nick` = '%s' ";
 			}
 		}
 		
@@ -219,7 +182,7 @@
 		
 
 		// user info		
-		$uinfo = q("SELECT * FROM `user`, `contact`
+		$uinfo = q("SELECT *, `contact`.`id` as `cid` FROM `user`, `contact`
 				WHERE `user`.`uid`=`contact`.`uid` AND `contact`.`self`=1
 				$extra_query",
 				$user
@@ -247,7 +210,7 @@
 				
 
 		$ret = Array(
-			'id' => $uinfo[0]['uid'],
+			'id' => $uinfo[0]['cid'],
 			'name' => $uinfo[0]['username'],
 			'screen_name' => $uinfo[0]['nickname'],
 			'location' => $uinfo[0]['default-location'],
@@ -275,12 +238,43 @@
 			'profile_background_image_url' => '',
 			'profile_background_tile' => false,
 			'profile_use_background_image' => false,
-			'notifications' => false,	 
+			'notifications' => false,
+			'verified' => true, #XXX: fix me
+			'followers' => '', #XXX: fix me
+			#'status' => null
 		);
-		
+	
 		return $ret;
 		
 	}
+
+	/**
+	 * apply xmlify() to all values of array $val, recursively
+	 */
+	function api_xmlify($val){
+		if (is_bool($val)) return $val?"true":"false";
+		if (is_array($val)) return array_map('api_xmlify', $val);
+		return xmlify($val);
+	}
+
+	/**
+	 *  load api $templatename for $type and replace $data array
+	 */
+	function api_apply_template($templatename, $type, $data){
+		switch($type){
+			case "rss":
+			case "atom":
+			case "xml":
+				$data = api_xmlify($data);
+				$tpl = load_view_file("view/api_".$templatename."_".$type.".tpl");
+				$ret = replace_macros($tpl, $data);
+				break;
+			case "json":
+				$ret = $data;
+				break;
+		}
+		return $ret;
+	}
 	
 	/**
 	 ** TWITTER API
@@ -291,11 +285,12 @@
 	 * returns a 401 status code and an error message if not. 
 	 * http://developer.twitter.com/doc/get/account/verify_credentials
 	 */
-	function api_account_verify_credentials(&$a){
+	function api_account_verify_credentials(&$a, $type){
 		if (local_user()===false) return false;
 		$user_info = api_get_user($a);
-		$ret = new Container("user", $user_info);
-		return $ret;
+		
+		return api_apply_template("user", $type, array('$user' => $user_info));
+
 	}
 	api_register_func('api/account/verify_credentials','api_account_verify_credentials', true);
 	 	
@@ -306,39 +301,50 @@
 	 * The author's most recent status will be returned inline.
 	 * http://developer.twitter.com/doc/get/users/show
 	 */
-	function api_users_show(&$a){
+	function api_users_show(&$a, $type){
 		$user_info = api_get_user($a);
-		
 		// get last public wall message
-		$lastwall = q("SELECT * FROM `item`
-				WHERE  `uid` = %d
-				AND `type`='wall' 
-				AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''
-				ORDER BY `created` DESC LIMIT 1",
-				intval($user_info['uid'])
-		);
-	
-		//echo "
"; var_dump($lastwall); die();
-		
-		$user_info['status'] = array(
-			'created_at' => api_date($lastwall[0]['created']),
-			'id' => $lastwall[0]['id'],
-			'text' => bbcode($lastwall[0]['body']),
-			'source' => 'web',
-			'truncated' => false,
-			'in_reply_to_status_id' => '',
-			'in_reply_to_user_id' => '',
-			'favorited' => false,
-			'in_reply_to_screen_name' => '',
-			'geo' => '',
-			'coordinates' => $lastwall[0]['coord'],
-			'place' => $lastwall[0]['location'],
-			'contributors' => ''					
+		$lastwall = q("SELECT `item`.*, `i`.`contact-id` as `reply_uid`, `i`.`nick` as `reply_author`
+				FROM `item`, `contact`,
+					(SELECT `item`.`id`, `item`.`contact-id`, `contact`.`nick` FROM `item`,`contact` WHERE `contact`.`id`=`item`.`contact-id`) as `i` 
+				WHERE `item`.`contact-id` = %d
+					AND `i`.`id` = `item`.`parent`
+					AND `contact`.`id`=`item`.`contact-id` AND `contact`.`self`=1
+					AND `type`!='activity'
+					AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`=''
+				ORDER BY `created` DESC 
+				LIMIT 1",
+				intval($user_info['id'])
 		);
 
-		$ret = Array('user' => $user_info);
-		
-		return $ret;
+		if (count($lastwall)>0){
+			$lastwall = $lastwall[0];
+			
+			$in_reply_to_status_id = '';
+			$in_reply_to_user_id = '';
+			$in_reply_to_screen_name = '';
+			if ($lastwall['parent']!=$lastwall['id']) {
+				$in_reply_to_status_id=$lastwall['parent'];
+				$in_reply_to_user_id = $lastwall['reply_uid'];
+				$in_reply_to_screen_name = $lastwall['reply_author'];
+			}  
+			$user_info['status'] = array(
+				'created_at' => api_date($lastwall['created']),
+				'id' => $lastwall['contact-id'],
+				'text' => strip_tags(bbcode($lastwall['body'])),
+				'source' => 'web',
+				'truncated' => false,
+				'in_reply_to_status_id' => $in_reply_to_status_id,
+				'in_reply_to_user_id' => $in_reply_to_user_id,
+				'favorited' => false,
+				'in_reply_to_screen_name' => $in_reply_to_screen_name,
+				'geo' => '',
+				'coordinates' => $lastwall['coord'],
+				'place' => $lastwall['location'],
+				'contributors' => ''					
+			);
+		}
+		return  api_apply_template("user", $type, array('$user' => $user_info));
 		
 	}
 	api_register_func('api/users/show','api_users_show');
@@ -346,21 +352,24 @@
 	/**
 	 * 
 	 * http://developer.twitter.com/doc/get/statuses/home_timeline
+	 * 
+	 * TODO: Optional parameters
+	 * TODO: Add reply info
 	 */
-	function api_statuses_home_timeline(&$a){
+	function api_statuses_home_timeline(&$a, $type){
 		if (local_user()===false) return false;
 		
 		$user_info = api_get_user($a);
 		
 		// get last newtork messages
 		$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` ) ";
-		
+
 		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
 			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
 			`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
 			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
 			FROM `item`, `contact`, `user`
-			WHERE `item`.`uid` = %d AND `user`.`uid` = `item`.`uid` 
+			WHERE `item`.`contact-id` = %d AND `user`.`uid` = `item`.`uid` 
 			AND `item`.`visible` = 1 AND `item`.`deleted` = 0
 			AND `contact`.`id` = `item`.`contact-id`
 			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
@@ -369,15 +378,15 @@
 			intval($user_info['id']),
 			0,20
 		);
-		$ret = new Container("statuses");
-		$ret->attrs['type']='array';
+		$ret = Array();
 
 		foreach($r as $item) {
-			$status = new Container('status', array(
+			$status = array(
 				'created_at'=> api_date($item['created']),
 				'id'		=> $item['id'],
 				'text'		=> strip_tags(bbcode($item['body'])),
-				'source'	=> 'web', 	#XXX: Fix me!
+				'source'	=> 'web',
+				'url'		=> ($item['plink']!=''?$item['plink']:$item['author-link']),
 				'truncated' => False,
 				'in_reply_to_status_id' => ($item['parent']!=$item['id']?$item['id']:''),
 				'in_reply_to_user_id' => '',
@@ -389,69 +398,18 @@
 				'contributors' => '',
 				'annotations'  => '',
 				'entities'  => '',
-				'user' => $user_info				
-			
-			));
+				'user' =>  $user_info				
+			);
 			$ret[]=$status;
 		};
 		
-		return $ret;
+		$data = array('$statuses' => $ret);
+		if ($type=="rss" || $type=="atom") $data = api_rss_extra($a, $data, $user_info);
+		
+		return  api_apply_template("timeline", $type, $data);
 	}
 	api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true);
-	
-	/*
-	 * http://developer.twitter.com/doc/get/statuses/user_timeline
-	 */
-	function api_statuses_user_timeline(&$a){
-			
-		$user_info = api_get_user($a);
-		
-		// get last public wall message
-		$lastwall = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
-			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
-			`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
-			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
-			FROM `item`, `contact`, `user`
-			WHERE `item`.`uid` = %d AND `user`.`uid` = `item`.`uid` 
-			AND `item`.`visible` = 1 AND `item`.`deleted` = 0
-			AND `contact`.`id` = `item`.`contact-id`
-			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-			
-			AND `item`.`type`='wall' 
-			AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`=''
-			
-			ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
-			intval($user_info['id']),
-			0, 20
-		);
-		
-		
-		$ret = new Container("statuses");
-		$ret->attrs['type']='array';
-		
-		foreach($lastwall as $item) {
-			$status = new Container('status', array(
-				'created_at'=> api_date($item['created']),
-				'id'		=> $item['id'],
-				'text'		=> strip_tags(bbcode($item['body'])),
-				'source'	=> 'web', 	#XXX: Fix me!
-				'truncated' => False,
-				'in_reply_to_status_id' => '',
-				'in_reply_to_user_id' => '',
-				'favorited' => false,
-				'in_reply_to_screen_name' => '',
-				'geo' => '',
-				'coordinates' => $item['coord'],
-				'place' => $item['location'],
-				'contributors' => '',
-				'annotations'  => '',
-				'entities'  => '',
-				'user' => $user_info
-			));
-			$ret[]=$status;
-		};
-		
-		return $ret;
-	}
-	api_register_func('api/statuses/user_timeline','api_statuses_user_timeline', true);
+	api_register_func('api/statuses/friends_timeline','api_statuses_home_timeline', true);
+	api_register_func('api/statuses/user_timeline','api_statuses_home_timeline', true);
+	# TODO: user_timeline should be profile view
 	
\ No newline at end of file
diff --git a/view/api_timeline_atom.tpl b/view/api_timeline_atom.tpl
new file mode 100644
index 0000000000..63782ce36f
--- /dev/null
+++ b/view/api_timeline_atom.tpl
@@ -0,0 +1,21 @@
+
+  
+    Friendika
+    $rss.alternate
+    
+    Friendika timeline
+    $rss.language
+    40
+
+{{ for $statuses as $status }}
+  
+    $status.text
+    $status.text
+    $status.created_at
+    $status.url
+    $status.url
+    $status.source
+  
+{{ endfor }}
+  
+
\ No newline at end of file
diff --git a/view/api_timeline_rss.tpl b/view/api_timeline_rss.tpl
new file mode 100644
index 0000000000..d07ac42ad5
--- /dev/null
+++ b/view/api_timeline_rss.tpl
@@ -0,0 +1,23 @@
+
+  Friendika
+  tag:friendika:Status
+  
+  
+  $rss.updated
+  Friendika timeline
+  	{{ for $statuses as $status }}
+    
+      $status.text
+      $status.text
+      $status.id
+      $status.created_at
+      $status.created_at
+      
+      
+        $status.user.name
+        $status.user.url
+      
+      $status.source
+    
+    {{ endfor }}
+
\ No newline at end of file
diff --git a/view/api_timeline_xml.tpl b/view/api_timeline_xml.tpl
new file mode 100644
index 0000000000..85f73064ec
--- /dev/null
+++ b/view/api_timeline_xml.tpl
@@ -0,0 +1,21 @@
+
+  {{ for $statuses as $status }}
+  
+    $status.created_at
+    $status.id
+    $status.text
+    $status.source
+    $status.truncated
+    $status.url
+    $status.in_reply_to_status_id
+    $status.in_reply_to_user_id
+    $status.favorited
+    $status.in_reply_to_screen_name
+    $status.geo
+    $status.coordinates
+    $status.place
+    $status.contributors
+  	{{ inc view/api_user_xml.tpl with $user=$status.user }}{{ endinc }}
+  
+  {{ endfor }}
+
\ No newline at end of file
diff --git a/view/api_user_xml.tpl b/view/api_user_xml.tpl
new file mode 100644
index 0000000000..15517fc42e
--- /dev/null
+++ b/view/api_user_xml.tpl
@@ -0,0 +1,46 @@
+
+  $user.id
+  $user.name
+  $user.screen_name
+  $user.location
+  $user.description
+  $user.profile_image_url
+  $user.url
+  $user.protected
+  $user.followers
+  $user.profile_background_color
+  $user.profile_text_color
+  $user.profile_link_color
+  $user.profile_sidebar_fill_color
+  $user.profile_sidebar_border_color
+  $user.friends_count
+  $user.created_at
+  $user.favourites_count
+  $user.utc_offset
+  $user.time_zone
+  $user.profile_background_image_url
+  $user.profile_background_tile
+  $user.profile_use_background_image
+  
+  $user.geo_enabled
+  $user.verified
+  
+  $user.statuses_count
+  $user.lang
+  $user.contributors_enabled
+  {{ if $user.status }}
+    $user.status.created_at
+    $user.status.id
+    $user.status.text
+    $user.status.source
+    $user.status.truncated
+    $user.status.in_reply_to_status_id
+    $user.status.in_reply_to_user_id
+    $user.status.favorited
+    $user.status.in_reply_to_screen_name
+    $user.status.geo
+    $user.status.coordinates
+    $user.status.place
+    $user.status.contributors
+  {{ endif }}
+
\ No newline at end of file

From 976d1eaf4312f8c45af0e16205f573afc5be5136 Mon Sep 17 00:00:00 2001
From: fabrixxm 
Date: Wed, 27 Apr 2011 17:46:23 +0200
Subject: [PATCH 7/7] API work

---
 include/api.php            | 28 ++++++++++++++----
 view/api_timeline_atom.tpl | 58 +++++++++++++++++++++++++-------------
 view/api_timeline_rss.tpl  | 44 ++++++++++++++---------------
 3 files changed, 81 insertions(+), 49 deletions(-)

diff --git a/include/api.php b/include/api.php
index c2a9b3bbe0..82790a6383 100644
--- a/include/api.php
+++ b/include/api.php
@@ -49,8 +49,13 @@
 			dbesc(trim($user)),
 			dbesc($encrypted)
 		);
-		if(count($r))
+		if(count($r)){
 			$record = $r[0];
+		} else {
+		    header('WWW-Authenticate: Basic realm="Friendika"');
+		    header('HTTP/1.0 401 Unauthorized');
+		    die('This api require login');
+		}
 		$_SESSION['uid'] = $record['uid'];
 		$_SESSION['theme'] = $record['theme'];
 		$_SESSION['authenticated'] = 1;
@@ -90,6 +95,7 @@
 		GLOBAL $API;
 		foreach ($API as $p=>$info){
 			if (strpos($a->query_string, $p)===0){
+				#unset($_SERVER['PHP_AUTH_USER']);
 				if ($info['auth']===true && local_user()===false) {
 						api_login($a);
 				}
@@ -139,6 +145,7 @@
 			'self' => $a->get_baseurl(). "/". $a->query_string,
 			'updated' => api_date(null),
 			'language' => $user_info['language'],
+			'logo'	=> $a->get_baseurl()."/images/friendika-32.png",
 		);
 		
 		return $arr;
@@ -214,7 +221,7 @@
 			'name' => $uinfo[0]['username'],
 			'screen_name' => $uinfo[0]['nickname'],
 			'location' => $uinfo[0]['default-location'],
-			'profile_image_url' => $uinfo[0]['photo'],
+			'profile_image_url' => $uinfo[0]['micro'],
 			'url' => $uinfo[0]['url'],
 			'protected' => false,	#
 			'friends_count' => $countfriends,
@@ -385,6 +392,7 @@
 				'created_at'=> api_date($item['created']),
 				'id'		=> $item['id'],
 				'text'		=> strip_tags(bbcode($item['body'])),
+				'html'		=> bbcode($item['body']),
 				'source'	=> 'web',
 				'url'		=> ($item['plink']!=''?$item['plink']:$item['author-link']),
 				'truncated' => False,
@@ -398,18 +406,26 @@
 				'contributors' => '',
 				'annotations'  => '',
 				'entities'  => '',
-				'user' =>  $user_info				
+				'user' =>  $user_info,
+				'objecttype' => $item['object-type'],
+				'verb' => $item['verb'],
+				'self' => $a->get_baseurl()."/api/statuses/show/".$ite['id'].".".$type,
+				'edit' => $a->get_baseurl()."/api/statuses/show/".$ite['id'].".".$type,				
 			);
 			$ret[]=$status;
 		};
 		
 		$data = array('$statuses' => $ret);
-		if ($type=="rss" || $type=="atom") $data = api_rss_extra($a, $data, $user_info);
-		
+		switch($type){
+			case "atom":
+			case "rss":
+				$data = api_rss_extra($a, $data, $user_info);
+		}
+				
 		return  api_apply_template("timeline", $type, $data);
 	}
 	api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true);
 	api_register_func('api/statuses/friends_timeline','api_statuses_home_timeline', true);
 	api_register_func('api/statuses/user_timeline','api_statuses_home_timeline', true);
 	# TODO: user_timeline should be profile view
-	
\ No newline at end of file
+	
diff --git a/view/api_timeline_atom.tpl b/view/api_timeline_atom.tpl
index 63782ce36f..069ff7651e 100644
--- a/view/api_timeline_atom.tpl
+++ b/view/api_timeline_atom.tpl
@@ -1,21 +1,39 @@
-
-  
-    Friendika
-    $rss.alternate
-    
-    Friendika timeline
-    $rss.language
-    40
+
+ StatusNet
+ tag:friendika:PublicTimeline
+ Network on Friendika
+ Your network updates on Friendika
+ $rss.logo
+ $rss.updated
+ 
+ 
+  	{{ for $statuses as $status }}
+	
+	 $status.objecttype
+	 $status.id
+	 $status.text
+	 $status.html
+	 
+	 $status.verb
+	 $status.created_at
+	 $status.created_at
 
-{{ for $statuses as $status }}
-  
-    $status.text
-    $status.text
-    $status.created_at
-    $status.url
-    $status.url
-    $status.source
-  
-{{ endfor }}
-  
-
\ No newline at end of file
+	 
+	 
+	 
+	 
+	 
+	 
+	    
+    {{ endfor }}
+
diff --git a/view/api_timeline_rss.tpl b/view/api_timeline_rss.tpl
index d07ac42ad5..fbba93ee90 100644
--- a/view/api_timeline_rss.tpl
+++ b/view/api_timeline_rss.tpl
@@ -1,23 +1,21 @@
-
-  Friendika
-  tag:friendika:Status
-  
-  
-  $rss.updated
-  Friendika timeline
-  	{{ for $statuses as $status }}
-    
-      $status.text
-      $status.text
-      $status.id
-      $status.created_at
-      $status.created_at
-      
-      
-        $status.user.name
-        $status.user.url
-      
-      $status.source
-    
-    {{ endfor }}
-
\ No newline at end of file
+
+  
+    Friendika
+    $rss.alternate
+    
+    Friendika timeline
+    $rss.language
+    40
+
+{{ for $statuses as $status }}
+  
+    $status.text
+    $status.text
+    $status.created_at
+    $status.url
+    $status.url
+    $status.source
+  
+{{ endfor }}
+  
+