X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fapi.php;h=bc981646d36da12e7dd35bd1b365dc1d6154dd74;hb=c9d17c78a6d10f73baac19e2735e025642f6334a;hp=d1f0f9330c1587db2c7234ccfaffe8189cfbcf73;hpb=b56e00c7c5ed1ee7043852b4ce025a3d02f139e8;p=friendica.git

diff --git a/include/api.php b/include/api.php
index d1f0f9330c..bc981646d3 100644
--- a/include/api.php
+++ b/include/api.php
@@ -129,14 +129,15 @@
 						break;
 					case "json": 
 						header ("Content-Type: application/json");  
-						return json_encode($r);
+						foreach($r as $rr)
+						    return json_encode($rr);
 						break;
 					case "rss":
 						header ("Content-Type: application/rss+xml");
 						return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
 						break;
 					case "atom":
-						#header ("Content-Type: application/atom+xml");
+						header ("Content-Type: application/atom+xml");
 						return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
 						break;
 						
@@ -152,6 +153,7 @@
 	 */
 	function api_rss_extra(&$a, $arr, $user_info){
 		if (is_null($user_info)) $user_info = api_get_user($a);
+		$arr['$user'] = $user_info;
 		$arr['$rss'] = array(
 			'alternate' => $user_info['url'],
 			'self' => $a->get_baseurl(). "/". $a->query_string,
@@ -166,19 +168,24 @@
 	/**
 	 * Returns user info array.
 	 */
-	function api_get_user(&$a){
+	function api_get_user(&$a, $contact_id=Null){
 		$user = null;
 		$extra_query = "";
-		if(x($_GET, 'user_id')) {
+		if(!is_null($contact_id)){
+			$user=$contact_id;
+			$extra_query = "AND `contact`.`id` = %d ";
+		}
+		
+		if(is_null($user) && x($_GET, 'user_id')) {
 			$user = intval($_GET['user_id']);	
 			$extra_query = "AND `contact`.`id` = %d ";
 		}
-		if(x($_GET, 'screen_name')) {
+		if(is_null($user) && x($_GET, 'screen_name')) {
 			$user = dbesc($_GET['screen_name']);	
 			$extra_query = "AND `contact`.`nick` = '%s' ";
 		}
 		
-		if ($user===null){
+		if (is_null($user)){
 			list($user, $null) = explode(".",$a->argv[3]);
 			if(is_numeric($user)){
 				$user = intval($user);
@@ -194,15 +201,15 @@
 				api_login($a); return False;
 			} else {
 				$user = $_SESSION['uid'];
-				$extra_query = "AND `user`.`uid` = %d ";
+				$extra_query = "AND `contact`.`uid` = %d ";
 			}
 			
 		}
 		
 
 		// user info		
-		$uinfo = q("SELECT *, `contact`.`id` as `cid` FROM `user`, `contact`
-				WHERE `user`.`uid`=`contact`.`uid` AND `contact`.`self`=1
+		$uinfo = q("SELECT *, `contact`.`id` as `cid` FROM `contact`
+				WHERE 1
 				$extra_query",
 				$user
 		);
@@ -229,17 +236,19 @@
 				
 
 		$ret = Array(
+			'uid' => $uinfo[0]['uid'],
 			'id' => $uinfo[0]['cid'],
-			'name' => $uinfo[0]['username'],
-			'screen_name' => $uinfo[0]['nickname'],
-			'location' => $uinfo[0]['default-location'],
+			'name' => $uinfo[0]['name'],
+			'screen_name' => $uinfo[0]['nick'],
+			'location' => '', //$uinfo[0]['default-location'],
 			'profile_image_url' => $uinfo[0]['micro'],
 			'url' => $uinfo[0]['url'],
+			'contact_url' => $a->get_baseurl()."/contacts/".$uinfo[0]['cid'],
 			'protected' => false,	#
 			'friends_count' => $countfriends,
-			'created_at' => api_date($uinfo[0]['created']),
+			'created_at' => api_date($uinfo[0]['name-date']),
 			'utc_offset' => 0, #XXX: fix me
-			'time_zone' => $uinfo[0]['timezone'],
+			'time_zone' => '', //$uinfo[0]['timezone'],
 			'geo_enabled' => false,
 			'statuses_count' => $countitms, #XXX: fix me 
 			'lang' => 'en', #XXX: fix me
@@ -279,6 +288,7 @@
 	 *  load api $templatename for $type and replace $data array
 	 */
 	function api_apply_template($templatename, $type, $data){
+
 		switch($type){
 			case "rss":
 			case "atom":
@@ -313,20 +323,31 @@
 	api_register_func('api/account/verify_credentials','api_account_verify_credentials', true);
 	 	
 
-	// TODO - media uploads and alternate 'source'
-	
+	/**
+	 * get data from $_POST or $_GET
+	 */
+	function requestdata($k){
+		if (isset($_POST[$k])){
+			return $_POST[$k];
+		}
+		if (isset($_GET[$k])){
+			return $_GET[$k];
+		}
+		return null;
+	}
+	// TODO - media uploads
 	function api_statuses_update(&$a, $type) {
 		if (local_user()===false) return false;
 		$user_info = api_get_user($a);
 
 		// convert $_POST array items to the form we use for web posts.
 
-		$_POST['body'] = urldecode($_POST['status']);
-		$_POST['parent'] = $_POST['in_reply_to_status_id'];
-		if($_POST['lat'] && $_POST['long'])
-			$_POST['coord'] = sprintf("%s %s",$_POST['lat'],$_POST['long']);
+		$_POST['body'] = urldecode(requestdata('status'));
+		$_POST['parent'] = requestdata('in_reply_to_status_id');
+		if(requestdata('lat') && requestdata('long'))
+			$_POST['coord'] = sprintf("%s %s",requestdata('lat'),requestdata('long'));
 		$_POST['profile_uid'] = local_user();
-		if($_POST['parent'])
+		if(requestdata('parent'))
 			$_POST['type'] = 'net-comment';
 		else
 			$_POST['type'] = 'wall';
@@ -341,10 +362,62 @@
 		item_post($a);	
 
 		// this should output the last post (the one we just posted).
-		return api_users_show($a,$type);
+		return api_status_show($a,$type);
 	}
 	api_register_func('api/statuses/update','api_statuses_update', true);
 
+
+	function api_status_show(&$a, $type){
+		$user_info = api_get_user($a);
+		// get last public wall message
+		$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'])
+		);
+
+		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'];
+			}  
+			$status_info = array(
+				'created_at' => api_date($lastwall['created']),
+				'id' => $lastwall['contact-id'],
+				'text' => strip_tags(bbcode($lastwall['body'])),
+				'source' => (($lastwall['app']) ? $lastwall['app'] : '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' => ''					
+			);
+			$status_info['user'] = $user_info;
+		}
+		return  api_apply_template("status", $type, array('$status' => $status_info));
+		
+	}
+
+
+
+
 		
 	/**
 	 * Returns extended information of a given user, specified by ID or screen name as per the required id parameter.
@@ -382,7 +455,7 @@
 				'created_at' => api_date($lastwall['created']),
 				'id' => $lastwall['contact-id'],
 				'text' => strip_tags(bbcode($lastwall['body'])),
-				'source' => 'web',
+				'source' => (($lastwall['app']) ? $lastwall['app'] : 'web'),
 				'truncated' => false,
 				'in_reply_to_status_id' => $in_reply_to_status_id,
 				'in_reply_to_user_id' => $in_reply_to_user_id,
@@ -410,7 +483,6 @@
 		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` ) ";
 
@@ -418,25 +490,28 @@
 			`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`.`contact-id` = %d AND `user`.`uid` = `item`.`uid` 
+			FROM `item`, `contact`
+			WHERE `item`.`uid` = %d
 			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($user_info['id']),
+			intval($user_info['uid']),
 			0,20
 		);
 		$ret = Array();
 
 		foreach($r as $item) {
+			$status_user = (($item['cid']==$user_info['id'])?$user_info: api_get_user($a,$item['cid']));
 			$status = array(
 				'created_at'=> api_date($item['created']),
+				'published' => datetime_convert('UTC','UTC',$item['created'],ATOM_TIME),
+				'updated'   => datetime_convert('UTC','UTC',$item['edited'],ATOM_TIME),
 				'id'		=> $item['id'],
 				'text'		=> strip_tags(bbcode($item['body'])),
 				'html'		=> bbcode($item['body']),
-				'source'	=> 'web',
+				'source'    => (($item['app']) ? $item['app'] : 'web'),
 				'url'		=> ($item['plink']!=''?$item['plink']:$item['author-link']),
 				'truncated' => False,
 				'in_reply_to_status_id' => ($item['parent']!=$item['id']?$item['parent']:''),
@@ -449,7 +524,7 @@
 				'contributors' => '',
 				'annotations'  => '',
 				'entities'  => '',
-				'user' =>  $user_info,
+				'user' =>  $status_user ,
 				'objecttype' => $item['object-type'],
 				'verb' => $item['verb'],
 				'self' => $a->get_baseurl()."/api/statuses/show/".$ite['id'].".".$type,
@@ -472,3 +547,44 @@
 	api_register_func('api/statuses/user_timeline','api_statuses_home_timeline', true);
 	# TODO: user_timeline should be profile view
 	
+
+	function api_account_rate_limit_status(&$a,$type) {
+
+		$hash = array(
+			  'remaining_hits' => (string) 150,
+			  'hourly_limit' => (string) 150,
+			  'reset_time' => datetime_convert('UTC','UTC','now + 1 hour',ATOM_TIME),
+			  'reset_time_in_seconds' => strtotime('now + 1 hour')
+		);
+
+		return api_apply_template('ratelimit', $type, array('$hash' => $hash));
+
+	}
+	api_register_func('api/account/rate_limit_status','api_account_rate_limit_status',true);
+
+
+	function api_statusnet_config(&$a,$type) {
+		$name = $a->config['sitename'];
+		$server = $a->get_hostname();
+		$logo = $a->get_baseurl() . '/images/friendika-64.png';
+		$email = $a->config['admin_email'];
+		$closed = (($a->config['register_policy'] == REGISTER_CLOSED) ? 'true' : 'false');
+		$private = (($a->config['system']['block_public']) ? 'true' : 'false');
+		$textlimit = (($a->config['max_import_size']) ? $a->config['max_import_size'] : '200000');
+		$ssl = (($a->config['system']['have_ssl']) ? 'true' : 'false');
+		$sslserver = (($ssl === 'true') ? str_replace('http:','https:',$a->get_baseurl()) : '');
+
+		$config = array(
+			'site' => array('name' => $name,'server' => $server, 'theme' => 'default', 'path' => '',
+				'logo' => $logo, 'fancy' => 'true', 'language' => 'en', 'email' => $email, 'broughtby' => '',
+				'broughtbyurl' => '', 'timezone' => 'UTC', 'closed' => $closed, 'inviteonly' => 'false',
+				'private' => $private, 'textlimit' => $textlimit, 'sslserver' => $sslserver, 'ssl' => $ssl,
+				'shorturllength' => '30'
+			),
+		);  
+
+		return api_apply_template('config', $type, array('$config' => $config));
+
+	}
+	api_register_func('api/statusnet/config','api_statusnet_config',true);
+