bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #866 from annando/master

Browse source 
API: reworked
This commit is contained in:
fabrixxm 2013-12-26 02:12:27 -08:00
commit 230ce659bd
5 changed files with 486 additions and 308 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -14,7 +14,7 @@ require_once('include/features.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.2.1745' ); define ( 'FRIENDICA_VERSION', '3.2.1745' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1166 ); define ( 'DB_UPDATE_VERSION', 1167 );
define ( 'EOL', "<br />\r\n" ); define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );

15
database.sql
View file

@ -1175,3 +1175,18 @@ CREATE TABLE IF NOT EXISTS `push_subscriber` (
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- --------------------------------------------------------
--
-- Table structure for table `unique_contacts`
--
CREATE TABLE IF NOT EXISTS `unique_contacts` (
`id` INT NOT NULL AUTO_INCREMENT,
`url` CHAR(255) NOT NULL,
`nick` CHAR(255) NOT NULL,
`name` CHAR(255) NOT NULL,
`avatar` CHAR(255) NOT NULL,
PRIMARY KEY (`id`),
KEY `url` (`url`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;

592
include/api.php
View file

@ -71,7 +71,9 @@
logger('API_login: ' . print_r($_SERVER,true), LOGGER_DEBUG); logger('API_login: ' . print_r($_SERVER,true), LOGGER_DEBUG);
header('WWW-Authenticate: Basic realm="Friendica"'); header('WWW-Authenticate: Basic realm="Friendica"');
header('HTTP/1.0 401 Unauthorized'); header('HTTP/1.0 401 Unauthorized');
die('This api requires login'); die((api_error(&$a, 'json', "This api requires login")));
//die('This api requires login');
} }
$user = $_SERVER['PHP_AUTH_USER']; $user = $_SERVER['PHP_AUTH_USER'];
@ -144,7 +146,7 @@
return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r; return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
break; break;
case "json": case "json":
//header ("Content-Type: application/json"); header ("Content-Type: application/json");
foreach($r as $rr) foreach($r as $rr)
return json_encode($rr); return json_encode($rr);
break; break;
@ -169,7 +171,12 @@
} }
header("HTTP/1.1 404 Not Found"); header("HTTP/1.1 404 Not Found");
logger('API call not implemented: '.$a->query_string." - ".print_r($_REQUEST,true)); logger('API call not implemented: '.$a->query_string." - ".print_r($_REQUEST,true));
$r = '<status><error>not implemented</error></status>'; return(api_error(&$a, $type, "not implemented"));
}
function api_error(&$a, $type, $error) {
$r = "<status><error>".$error."</error><request>".$a->query_string."</request></status>";
switch($type){ switch($type){
case "xml": case "xml":
header ("Content-Type: text/xml"); header ("Content-Type: text/xml");
@ -177,7 +184,7 @@
break; break;
case "json": case "json":
header ("Content-Type: application/json"); header ("Content-Type: application/json");
return json_encode(array('error' => 'not implemented')); return json_encode(array('error' => $error, 'request' => $a->query_string));
break; break;
case "rss": case "rss":
header ("Content-Type: application/rss+xml"); header ("Content-Type: application/rss+xml");
@ -209,45 +216,87 @@
return $arr; return $arr;
} }
/**
* Unique contact to to contact url.
*/
function api_unique_id_to_url($id){
$r = q("SELECT url FROM unique_contacts WHERE id=%d LIMIT 1",
intval($id));
if ($r)
return ($r[0]["url"]);
else
return false;
}
/** /**
* Returns user info array. * Returns user info array.
*/ */
function api_get_user(&$a, $contact_id = Null){ function api_get_user(&$a, $contact_id = Null, $type = "json"){
global $called_api; global $called_api;
$user = null; $user = null;
$extra_query = ""; $extra_query = "";
$url = "";
$nick = "";
// Searching for contact URL
if(!is_null($contact_id) AND (intval($contact_id) == 0)){
$user = dbesc(normalise_link($contact_id));
$url = $user;
$extra_query = "AND `contact`.`nurl` = '%s' ";
if (api_user()!==false) $extra_query .= "AND `contact`.`uid`=".intval(api_user());
}
if(!is_null($contact_id)){ // Searching for unique contact id
$user=$contact_id; if(!is_null($contact_id) AND (intval($contact_id) != 0)){
$extra_query = "AND `contact`.`id` = %d "; $user = dbesc(api_unique_id_to_url($contact_id));
if ($user == "")
die(api_error($a, $type, t("User not found.")));
$url = $user;
$extra_query = "AND `contact`.`nurl` = '%s' ";
if (api_user()!==false) $extra_query .= "AND `contact`.`uid`=".intval(api_user());
} }
if(is_null($user) && x($_GET, 'user_id')) { if(is_null($user) && x($_GET, 'user_id')) {
$user = intval($_GET['user_id']); $user = dbesc(api_unique_id_to_url($_GET['user_id']));
$extra_query = "AND `contact`.`id` = %d ";
if ($user == "")
die(api_error($a, $type, t("User not found.")));
$url = $user;
$extra_query = "AND `contact`.`nurl` = '%s' ";
if (api_user()!==false) $extra_query .= "AND `contact`.`uid`=".intval(api_user());
} }
if(is_null($user) && x($_GET, 'screen_name')) { if(is_null($user) && x($_GET, 'screen_name')) {
$user = dbesc($_GET['screen_name']); $user = dbesc($_GET['screen_name']);
$nick = $user;
$extra_query = "AND `contact`.`nick` = '%s' "; $extra_query = "AND `contact`.`nick` = '%s' ";
if (api_user()!==false) $extra_query .= "AND `contact`.`uid`=".intval(api_user()); if (api_user()!==false) $extra_query .= "AND `contact`.`uid`=".intval(api_user());
} }
if (is_null($user) && $a->argc > (count($called_api)-1)){ if (is_null($user) && $a->argc > (count($called_api)-1)){
$argid = count($called_api); $argid = count($called_api);
list($user, $null) = explode(".",$a->argv[$argid]); list($user, $null) = explode(".",$a->argv[$argid]);
if(is_numeric($user)){ if(is_numeric($user)){
$user = intval($user); $user = dbesc(api_unique_id_to_url($user));
$extra_query = "AND `contact`.`id` = %d ";
if ($user == "")
return false;
$url = $user;
$extra_query = "AND `contact`.`nurl` = '%s' ";
if (api_user()!==false) $extra_query .= "AND `contact`.`uid`=".intval(api_user());
} else { } else {
$user = dbesc($user); $user = dbesc($user);
$nick = $user;
$extra_query = "AND `contact`.`nick` = '%s' "; $extra_query = "AND `contact`.`nick` = '%s' ";
if (api_user()!==false) $extra_query .= "AND `contact`.`uid`=".intval(api_user()); if (api_user()!==false) $extra_query .= "AND `contact`.`uid`=".intval(api_user());
} }
} }
if (! $user) { if (!$user) {
if (api_user()===false) { if (api_user()===false) {
api_login($a); return False; api_login($a); return False;
} else { } else {
@ -264,8 +313,46 @@
$extra_query", $extra_query",
$user $user
); );
// if the contact wasn't found, fetch it from the unique contacts
if (count($uinfo)==0) { if (count($uinfo)==0) {
return False; $r = array();
if ($url != "")
$r = q("SELECT * FROM unique_contacts WHERE url='%s' LIMIT 1", $url);
elseif ($nick != "")
$r = q("SELECT * FROM unique_contacts WHERE nick='%s' LIMIT 1", $nick);
if ($r) {
$ret = array(
'id' => $r[0]["id"],
'name' => $r[0]["name"],
'screen_name' => (($r[0]['nick']) ? $r[0]['nick'] : $r[0]['name']),
'location' => NULL,
'description' => NULL,
'profile_image_url' => $r[0]["avatar"],
'url' => $r[0]["url"],
'protected' => false,
'followers_count' => 0,
'friends_count' => 0,
'created_at' => '',
'favourites_count' => 0,
'utc_offset' => 0,
'time_zone' => 'UTC',
'statuses_count' => 0,
'following' => 1,
'statusnet_blocking' => false,
'notifications' => false,
'statusnet_profile_url' => $r[0]["url"],
'uid' => 0,
'cid' => 0,
'self' => 0,
);
return $ret;
} else
die(api_error($a, $type, t("User not found.")));
} }
if($uinfo[0]['self']) { if($uinfo[0]['self']) {
@ -325,41 +412,41 @@
$starred = 0; $starred = 0;
} }
// Fetching unique id
$r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1", dbesc(normalise_link($uinfo[0]['url'])));
// If not there, then add it
if (count($r) == 0) {
q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')",
dbesc(normalise_link($uinfo[0]['url'])), dbesc($uinfo[0]['name']),dbesc($uinfo[0]['nick']), dbesc($uinfo[0]['micro']));
$r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1", dbesc(normalise_link($uinfo[0]['url'])));
}
$ret = Array( $ret = Array(
'id' => intval($uinfo[0]['cid']), 'id' => intval($r[0]['id']),
'self' => intval($uinfo[0]['self']),
'uid' => intval($uinfo[0]['uid']),
'name' => (($uinfo[0]['name']) ? $uinfo[0]['name'] : $uinfo[0]['nick']), 'name' => (($uinfo[0]['name']) ? $uinfo[0]['name'] : $uinfo[0]['nick']),
'screen_name' => (($uinfo[0]['nick']) ? $uinfo[0]['nick'] : $uinfo[0]['name']), 'screen_name' => (($uinfo[0]['nick']) ? $uinfo[0]['nick'] : $uinfo[0]['name']),
'location' => ($usr) ? $usr[0]['default-location'] : '', 'location' => ($usr) ? $usr[0]['default-location'] : NULL,
'description' => (($profile) ? $profile[0]['pdesc'] : NULL),
'profile_image_url' => $uinfo[0]['micro'], 'profile_image_url' => $uinfo[0]['micro'],
'url' => $uinfo[0]['url'], 'url' => $uinfo[0]['url'],
'contact_url' => $a->get_baseurl()."/contacts/".$uinfo[0]['cid'],
'protected' => false, 'protected' => false,
'followers_count' => intval($countfollowers),
'friends_count' => intval($countfriends), 'friends_count' => intval($countfriends),
'created_at' => api_date($uinfo[0]['name-date']), 'created_at' => api_date($uinfo[0]['name-date']),
'utc_offset' => "+00:00",
'time_zone' => 'UTC', //$uinfo[0]['timezone'],
'geo_enabled' => false,
'statuses_count' => intval($countitms), #XXX: fix me
'lang' => 'en', #XXX: fix me
'description' => (($profile) ? $profile[0]['pdesc'] : ''),
'followers_count' => intval($countfollowers),
'favourites_count' => intval($starred), 'favourites_count' => intval($starred),
'contributors_enabled' => false, 'utc_offset' => "0", // To-Do
'follow_request_sent' => true, 'time_zone' => 'UTC', // To-Do $uinfo[0]['timezone'],
'profile_background_color' => 'cfe8f6', 'statuses_count' => intval($countitms),
'profile_text_color' => '000000', 'following' => true, //#XXX: fix me
'profile_link_color' => 'FF8500', 'verified' => true, //#XXX: fix me
'profile_sidebar_fill_color' =>'AD0066', 'statusnet_blocking' => false,
'profile_sidebar_border_color' => 'AD0066',
'profile_background_image_url' => '',
'profile_background_tile' => false,
'profile_use_background_image' => false,
'notifications' => false, 'notifications' => false,
'following' => '', #XXX: fix me 'statusnet_profile_url' => $a->get_baseurl()."/contacts/".$uinfo[0]['cid'],
'verified' => true, #XXX: fix me 'uid' => intval($uinfo[0]['uid']),
'status' => array() 'cid' => intval($uinfo[0]['cid']),
'self' => $uinfo[0]['self'],
); );
return $ret; return $ret;
@ -367,73 +454,41 @@
} }
function api_item_get_user(&$a, $item) { function api_item_get_user(&$a, $item) {
global $usercache;
// The author is our direct contact, in a conversation with us. $author = q("SELECT * FROM unique_contacts WHERE url='%s' LIMIT 1",
if(link_compare($item['url'],$item['author-link'])) { dbesc(normalise_link($item['author-link'])));
return api_get_user($a,$item['cid']);
if (count($author) == 0) {
q("INSERT INTO unique_contacts (url, name, avatar) VALUES ('%s', '%s', '%s')",
dbesc(normalise_link($item["author-link"])), dbesc($item["author-name"]), dbesc($item["author-avatar"]));
$author = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
dbesc(normalise_link($item['author-link'])));
} else if ($item["author-link"].$item["author-name"] != $author[0]["url"].$author[0]["name"]) {
q("UPDATE unique_contacts SET name = '%s', avatar = '%s' WHERE url = '%s'",
dbesc($item["author-name"]), dbesc($item["author-avatar"]), dbesc(normalise_link($item["author-link"])));
} }
else {
// The author may be a contact of ours, but is replying to somebody else. $owner = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
// Figure out if we know him/her. dbesc(normalise_link($item['owner-link'])));
$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
if(($normalised != 'mailbox') && (x($a->contacts[$normalised]))) if (count($owner) == 0) {
return api_get_user($a,$a->contacts[$normalised]['id']); q("INSERT INTO unique_contacts (url, name, avatar) VALUES ('%s', '%s', '%s')",
dbesc(normalise_link($item["owner-link"])), dbesc($item["owner-name"]), dbesc($item["owner-avatar"]));
$owner = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
dbesc(normalise_link($item['owner-link'])));
} else if ($item["owner-link"].$item["owner-name"] != $owner[0]["url"].$owner[0]["name"]) {
q("UPDATE unique_contacts SET name = '%s', avatar = '%s' WHERE url = '%s'",
dbesc($item["owner-name"]), dbesc($item["owner-avatar"]), dbesc(normalise_link($item["owner-link"])));
} }
// We don't know this person directly.
list($nick, $name) = array_map("trim",explode("(",$item['author-name'])); // Comments in threads may appear as wall-to-wall postings.
$name=str_replace(")","",$name); // So only take the owner at the top posting.
if ($item["id"] == $item["parent"])
if ($name == '') return api_get_user($a,$item["owner-link"]);
$name = $nick; else
return api_get_user($a,$item["author-link"]);
if ($nick == '')
$nick = $name;
// Generating a random ID
if (is_null($usercache[$nick]) or !array_key_exists($nick, $usercache))
$usercache[$nick] = mt_rand(2000000, 2100000);
$ret = array(
'id' => $usercache[$nick],
'name' => $name,
'screen_name' => $nick,
'location' => '', //$uinfo[0]['default-location'],
'description' => '',
'profile_image_url' => $item['author-avatar'],
'url' => $item['author-link'],
'protected' => false, #
'followers_count' => 0,
'friends_count' => 0,
'created_at' => '',
'favourites_count' => 0,
'utc_offset' => 0, #XXX: fix me
'time_zone' => '', //$uinfo[0]['timezone'],
'statuses_count' => 0,
'following' => 1,
'statusnet_blocking' => false,
'notifications' => false,
'uid' => 0,
'contact_url' => 0,
'geo_enabled' => false,
'lang' => 'en', #XXX: fix me
'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,
'verified' => true, #XXX: fix me
'followers' => '', #XXX: fix me
'status' => array()
);
return $ret;
} }
@ -477,6 +532,18 @@
if (api_user()===false) return false; if (api_user()===false) return false;
$user_info = api_get_user($a); $user_info = api_get_user($a);
// "verified" isn't used here in the standard
unset($user_info["verified"]);
// - Adding last status
$user_info["status"] = api_status_show($a,"raw");
unset($user_info["status"]["user"]);
// "cid", "uid" and "self" are only needed for some internal stuff, so remove it from here
unset($user_info["cid"]);
unset($user_info["uid"]);
unset($user_info["self"]);
return api_apply_template("user", $type, array('$user' => $user_info)); return api_apply_template("user", $type, array('$user' => $user_info));
} }
@ -573,7 +640,6 @@
} }
else else
$_REQUEST['body'] = requestdata('status'); $_REQUEST['body'] = requestdata('status');
//$_REQUEST['body'] = urldecode(requestdata('status'));
$_REQUEST['title'] = requestdata('title'); $_REQUEST['title'] = requestdata('title');
@ -619,45 +685,38 @@
function api_status_show(&$a, $type){ function api_status_show(&$a, $type){
$user_info = api_get_user($a); $user_info = api_get_user($a);
// get last public wall message // get last public wall message
$lastwall = q("SELECT `item`.*, `i`.`contact-id` as `reply_uid`, `c`.`nick` as `reply_author`, `i`.`author-link` AS `item-author`
$lastwall = q("SELECT `item`.*, `i`.`contact-id` as `reply_uid`, `c`.`nick` as `reply_author`
FROM `item`, `contact`, `item` as `i`, `contact` as `c` FROM `item`, `contact`, `item` as `i`, `contact` as `c`
WHERE `item`.`contact-id` = %d WHERE `item`.`contact-id` = %d AND `item`.`owner-link` = '%s'
AND `i`.`id` = `item`.`parent` AND `i`.`id` = `item`.`parent`
AND `contact`.`id`=`item`.`contact-id` AND `c`.`id`=`i`.`contact-id` AND `contact`.`self`=1 AND `contact`.`id`=`item`.`contact-id` AND `c`.`id`=`i`.`contact-id` AND `contact`.`self`=1
AND `item`.`type`!='activity' AND `item`.`type`!='activity'
AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`='' AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`=''
ORDER BY `item`.`created` DESC ORDER BY `item`.`created` DESC
LIMIT 1", LIMIT 1",
intval($user_info['id']) intval($user_info['cid']),
dbesc($user_info['url'])
); );
// $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){ if (count($lastwall)>0){
$lastwall = $lastwall[0]; $lastwall = $lastwall[0];
$in_reply_to_status_id = ''; $in_reply_to_status_id = NULL;
$in_reply_to_user_id = ''; $in_reply_to_user_id = NULL;
$in_reply_to_screen_name = ''; $in_reply_to_screen_name = NULL;
if ($lastwall['parent']!=$lastwall['id']) { if ($lastwall['parent']!=$lastwall['id']) {
$in_reply_to_status_id=$lastwall['parent']; $in_reply_to_status_id=$lastwall['parent'];
$in_reply_to_user_id = $lastwall['reply_uid']; //$in_reply_to_user_id = $lastwall['reply_uid'];
$in_reply_to_screen_name = $lastwall['reply_author']; //$in_reply_to_screen_name = $lastwall['reply_author'];
$r = q("SELECT * FROM unique_contacts WHERE `url` = '%s'", dbesc(normalise_link($lastwall['item-author'])));
if ($r) {
$in_reply_to_screen_name = $r[0]['name'];
$in_reply_to_user_id = $r[0]['id'];
}
} }
$status_info = array( $status_info = array(
'text' => html2plain(bbcode($lastwall['body'], false, false, true), 0), 'text' => trim(html2plain(bbcode($lastwall['body'], false, false, 2), 0)),
'truncated' => false, 'truncated' => false,
'created_at' => api_date($lastwall['created']), 'created_at' => api_date($lastwall['created']),
'in_reply_to_status_id' => $in_reply_to_status_id, 'in_reply_to_status_id' => $in_reply_to_status_id,
@ -665,14 +724,28 @@
'id' => $lastwall['id'], 'id' => $lastwall['id'],
'in_reply_to_user_id' => $in_reply_to_user_id, 'in_reply_to_user_id' => $in_reply_to_user_id,
'in_reply_to_screen_name' => $in_reply_to_screen_name, 'in_reply_to_screen_name' => $in_reply_to_screen_name,
'geo' => '', 'geo' => NULL,
'favorited' => false, 'favorited' => false,
'coordinates' => $lastwall['coord'], // attachments
'place' => $lastwall['location'], 'user' => $user_info,
'contributors' => '' 'statusnet_html' => trim(bbcode($lastwall['body'], false, false)),
'statusnet_conversation_id' => $lastwall['parent'],
); );
$status_info['user'] = $user_info;
if (($lastwall['item_network'] != "") AND ($status["source"] == 'web'))
$status_info["source"] = network_to_name($lastwall['item_network']);
elseif (($lastwall['item_network'] != "") AND (network_to_name($lastwall['item_network']) != $status_info["source"]))
$status_info["source"] = trim($status_info["source"].' ('.network_to_name($lastwall['item_network']).')');
// "cid", "uid" and "self" are only needed for some internal stuff, so remove it from here
unset($status_info["user"]["cid"]);
unset($status_info["user"]["uid"]);
unset($status_info["user"]["self"]);
} }
if ($type == "raw")
return($status_info);
return api_apply_template("status", $type, array('$status' => $status_info)); return api_apply_template("status", $type, array('$status' => $status_info));
} }
@ -688,47 +761,66 @@
*/ */
function api_users_show(&$a, $type){ function api_users_show(&$a, $type){
$user_info = api_get_user($a); $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` $lastwall = q("SELECT `item`.*
FROM `item`, `contact`, 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 `item`.`owner-link` = '%s'
WHERE `item`.`contact-id` = %d AND `contact`.`id`=`item`.`contact-id`
AND `i`.`id` = `item`.`parent`
AND `contact`.`id`=`item`.`contact-id` AND `contact`.`self`=1
AND `type`!='activity' AND `type`!='activity'
AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`='' AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`=''
ORDER BY `created` DESC ORDER BY `created` DESC
LIMIT 1", LIMIT 1",
intval($user_info['id']) intval($user_info['cid']),
dbesc($user_info['url'])
); );
if (count($lastwall)>0){ if (count($lastwall)>0){
$lastwall = $lastwall[0]; $lastwall = $lastwall[0];
$in_reply_to_status_id = ''; $in_reply_to_status_id = NULL;
$in_reply_to_user_id = ''; $in_reply_to_user_id = NULL;
$in_reply_to_screen_name = ''; $in_reply_to_screen_name = NULL;
if ($lastwall['parent']!=$lastwall['id']) { if ($lastwall['parent']!=$lastwall['id']) {
$reply = q("SELECT `item`.`id`, `item`.`contact-id` as `reply_uid`, `contact`.`nick` as `reply_author`, `item`.`author-link` AS `item-author`
FROM `item`,`contact` WHERE `contact`.`id`=`item`.`contact-id` AND `item`.`id` = %d", intval($lastwall['parent']));
if (count($reply)>0) {
$in_reply_to_status_id=$lastwall['parent']; $in_reply_to_status_id=$lastwall['parent'];
$in_reply_to_user_id = $lastwall['reply_uid']; //$in_reply_to_user_id = $reply[0]['reply_uid'];
$in_reply_to_screen_name = $lastwall['reply_author']; //$in_reply_to_screen_name = $reply[0]['reply_author'];
$r = q("SELECT * FROM unique_contacts WHERE `url` = '%s'", dbesc(normalise_link($reply[0]['item-author'])));
if ($r) {
$in_reply_to_screen_name = $r[0]['name'];
$in_reply_to_user_id = $r[0]['id'];
}
}
} }
$user_info['status'] = array( $user_info['status'] = array(
'created_at' => api_date($lastwall['created']), 'text' => trim(html2plain(bbcode($lastwall['body'], false, false, 2), 0)),
'id' => $lastwall['contact-id'],
'text' => html2plain(bbcode($lastwall['body'], false, false, true), 0),
'source' => (($lastwall['app']) ? $lastwall['app'] : 'web'),
'truncated' => false, 'truncated' => false,
'created_at' => api_date($lastwall['created']),
'in_reply_to_status_id' => $in_reply_to_status_id, 'in_reply_to_status_id' => $in_reply_to_status_id,
'source' => (($lastwall['app']) ? $lastwall['app'] : 'web'),
'id' => $lastwall['contact-id'],
'in_reply_to_user_id' => $in_reply_to_user_id, 'in_reply_to_user_id' => $in_reply_to_user_id,
'favorited' => false,
'in_reply_to_screen_name' => $in_reply_to_screen_name, 'in_reply_to_screen_name' => $in_reply_to_screen_name,
'geo' => '', 'geo' => NULL,
'coordinates' => $lastwall['coord'], 'favorited' => false,
'place' => $lastwall['location'], 'statusnet_html' => trim(bbcode($lastwall['body'], false, false)),
'contributors' => '' 'statusnet_conversation_id' => $lastwall['parent'],
); );
if (($lastwall['item_network'] != "") AND ($user_info["status"]["source"] == 'web'))
$user_info["status"]["source"] = network_to_name($lastwall['item_network']);
if (($lastwall['item_network'] != "") AND (network_to_name($lastwall['item_network']) != $user_info["status"]["source"]))
$user_info["status"]["source"] = trim($user_info["status"]["source"].' ('.network_to_name($lastwall['item_network']).')');
} }
// "cid", "uid" and "self" are only needed for some internal stuff, so remove it from here
unset($user_info["cid"]);
unset($user_info["uid"]);
unset($user_info["self"]);
return api_apply_template("user", $type, array('$user' => $user_info)); return api_apply_template("user", $type, array('$user' => $user_info));
} }
@ -770,7 +862,7 @@
if ($conversation_id > 0) if ($conversation_id > 0)
$sql_extra .= ' AND `item`.`parent` = '.intval($conversation_id); $sql_extra .= ' AND `item`.`parent` = '.intval($conversation_id);
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
@ -782,7 +874,8 @@
$sql_extra $sql_extra
AND `item`.`id`>%d AND `item`.`id`>%d
ORDER BY `item`.`received` DESC LIMIT %d ,%d ", ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
intval($user_info['uid']), //intval($user_info['uid']),
intval(api_user()),
intval($since_id), intval($since_id),
intval($start), intval($count) intval($start), intval($count)
); );
@ -795,7 +888,8 @@
$r = q("UPDATE `item` SET `unseen` = 0 $r = q("UPDATE `item` SET `unseen` = 0
WHERE `unseen` = 1 AND `uid` = %d", WHERE `unseen` = 1 AND `uid` = %d",
intval($user_info['uid']) //intval($user_info['uid'])
intval(api_user())
); );
@ -846,24 +940,7 @@
if ($conversation_id > 0) if ($conversation_id > 0)
$sql_extra .= ' AND `item`.`parent` = '.intval($conversation_id); $sql_extra .= ' AND `item`.`parent` = '.intval($conversation_id);
/*$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
`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`
WHERE `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0
AND `contact`.`id` = `item`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra
AND `item`.`id`>%d
ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
intval($since_id),
intval($start), intval($count)
);*/
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`, `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
@ -914,6 +991,9 @@
// params // params
$id = intval($a->argv[3]); $id = intval($a->argv[3]);
if ($id == 0)
$id = intval($_REQUEST["id"]);
logger('API: api_statuses_show: '.$id); logger('API: api_statuses_show: '.$id);
//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false); //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
@ -925,7 +1005,7 @@
else else
$sql_extra .= " AND `item`.`id` = %d"; $sql_extra .= " AND `item`.`id` = %d";
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
@ -937,6 +1017,9 @@
intval($id) intval($id)
); );
if (!$r)
die(api_error($a, $type, t("There is no status with this id.")));
$ret = api_format_items($r,$user_info); $ret = api_format_items($r,$user_info);
if ($conversation) { if ($conversation) {
@ -966,11 +1049,14 @@
// params // params
$id = intval($a->argv[3]); $id = intval($a->argv[3]);
if ($id == 0)
$id = intval($_REQUEST["id"]);
logger('API: api_statuses_repeat: '.$id); logger('API: api_statuses_repeat: '.$id);
//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false); //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`nick` as `reply_author`, $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`nick` as `reply_author`,
`contact`.`name`, `contact`.`photo` as `reply_photo`, `contact`.`url` as `reply_url`, `contact`.`rel`, `contact`.`name`, `contact`.`photo` as `reply_photo`, `contact`.`url` as `reply_url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
@ -1024,6 +1110,9 @@
// params // params
$id = intval($a->argv[3]); $id = intval($a->argv[3]);
if ($id == 0)
$id = intval($_REQUEST["id"]);
logger('API: api_statuses_destroy: '.$id); logger('API: api_statuses_destroy: '.$id);
require_once('include/items.php'); require_once('include/items.php');
@ -1062,6 +1151,7 @@
//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false); //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
// Ugly code - should be changed
$myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname']; $myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname'];
$myurl = substr($myurl,strpos($myurl,'://')+3); $myurl = substr($myurl,strpos($myurl,'://')+3);
//$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl); //$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
@ -1076,7 +1166,7 @@
if ($max_id > 0) if ($max_id > 0)
$sql_extra .= ' AND `item`.`id` <= '.intval($max_id); $sql_extra .= ' AND `item`.`id` <= '.intval($max_id);
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
@ -1088,7 +1178,8 @@
$sql_extra $sql_extra
AND `item`.`id`>%d AND `item`.`id`>%d
ORDER BY `item`.`received` DESC LIMIT %d ,%d ", ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
intval($user_info['uid']), //intval($user_info['uid']),
intval(api_user()),
intval($since_id), intval($since_id),
intval($start), intval($count) intval($start), intval($count)
); );
@ -1120,8 +1211,7 @@
if (api_user()===false) return false; if (api_user()===false) return false;
$user_info = api_get_user($a); $user_info = api_get_user($a);
// get last newtork messages // get last network messages
logger("api_statuses_user_timeline: api_user: ". api_user() . logger("api_statuses_user_timeline: api_user: ". api_user() .
"\nuser_info: ".print_r($user_info, true) . "\nuser_info: ".print_r($user_info, true) .
@ -1147,7 +1237,7 @@
if ($conversation_id > 0) if ($conversation_id > 0)
$sql_extra .= ' AND `item`.`parent` = '.intval($conversation_id); $sql_extra .= ' AND `item`.`parent` = '.intval($conversation_id);
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
@ -1161,13 +1251,12 @@
AND `item`.`id`>%d AND `item`.`id`>%d
ORDER BY `item`.`received` DESC LIMIT %d ,%d ", ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
intval(api_user()), intval(api_user()),
intval($user_info['id']), intval($user_info['cid']),
intval($since_id), intval($since_id),
intval($start), intval($count) intval($start), intval($count)
); );
$ret = api_format_items($r,$user_info); $ret = api_format_items($r,$user_info, true);
$data = array('$statuses' => $ret); $data = array('$statuses' => $ret);
switch($type){ switch($type){
@ -1202,7 +1291,7 @@
$start = $page*$count; $start = $page*$count;
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
@ -1214,7 +1303,8 @@
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra $sql_extra
ORDER BY `item`.`received` DESC LIMIT %d ,%d ", ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
intval($user_info['uid']), //intval($user_info['uid']),
intval(api_user()),
intval($start), intval($count) intval($start), intval($count)
); );
@ -1303,27 +1393,37 @@
// standard meta information // standard meta information
$ret=Array( $ret=Array(
'id' => $item['id'], 'id' => $item['id'],
'created_at' => api_date($item['created']),
'sender_id' => $sender['id'] , 'sender_id' => $sender['id'] ,
'sender_screen_name' => $sender['screen_name'], 'text' => "",
'sender' => $sender,
'recipient_id' => $recipient['id'], 'recipient_id' => $recipient['id'],
'created_at' => api_date($item['created']),
'sender_screen_name' => $sender['screen_name'],
'recipient_screen_name' => $recipient['screen_name'], 'recipient_screen_name' => $recipient['screen_name'],
'sender' => $sender,
'recipient' => $recipient, 'recipient' => $recipient,
); );
// "cid", "uid" and "self" are only needed for some internal stuff, so remove it from here
unset($ret["sender"]["cid"]);
unset($ret["sender"]["uid"]);
unset($ret["sender"]["self"]);
unset($ret["recipient"]["cid"]);
unset($ret["recipient"]["uid"]);
unset($ret["recipient"]["self"]);
//don't send title to regular StatusNET requests to avoid confusing these apps //don't send title to regular StatusNET requests to avoid confusing these apps
if (x($_GET, 'getText')) { if (x($_GET, 'getText')) {
$ret['title'] = $item['title'] ; $ret['title'] = $item['title'] ;
if ($_GET["getText"] == "html") { if ($_GET["getText"] == "html") {
$ret['text'] = bbcode($item['body']); $ret['text'] = bbcode($item['body'], false, false);
} }
elseif ($_GET["getText"] == "plain") { elseif ($_GET["getText"] == "plain") {
$ret['text'] = html2plain(bbcode($item['body'], false, false, true), 0); //$ret['text'] = html2plain(bbcode($item['body'], false, false, true), 0);
$ret['text'] = trim(html2plain(bbcode($item['body'], false, false, 2), 0));
} }
} }
else { else {
$ret['text'] = $item['title']."\n".html2plain(bbcode($item['body'], false, false, true), 0); $ret['text'] = $item['title']."\n".html2plain(bbcode($item['body'], false, false, 2), 0);
} }
if (isset($_GET["getUserObjects"]) && $_GET["getUserObjects"] == "false") { if (isset($_GET["getUserObjects"]) && $_GET["getUserObjects"] == "false") {
unset($ret['sender']); unset($ret['sender']);
@ -1333,41 +1433,51 @@
return $ret; return $ret;
} }
function api_format_items($r,$user_info) { function api_format_items($r,$user_info, $filter_user = false) {
//logger('api_format_items: ' . print_r($r,true));
//logger('api_format_items: ' . print_r($user_info,true));
$a = get_app(); $a = get_app();
$ret = Array(); $ret = Array();
foreach($r as $item) { foreach($r as $item) {
localize_item($item); localize_item($item);
$status_user = (($item['cid']==$user_info['id'])?$user_info: api_item_get_user($a,$item)); $status_user = api_item_get_user($a,$item);
if ($item['parent']!=$item['id']) { // Look if the posts are matching if they should be filtered by user id
$r = q("select id from item where parent=%s and id<%s order by id desc limit 1", if ($filter_user AND ($status_user["id"] != $user_info["id"]))
intval($item['parent']), intval($item['id'])); continue;
if ($item['thr-parent'] != $item['uri']) {
$r = q("SELECT id FROM item WHERE uid=%d AND uri='%s' LIMIT 1",
intval(api_user()),
dbesc($item['thr-parent']));
if ($r) if ($r)
$in_reply_to_status_id = $r[0]['id']; $in_reply_to_status_id = $r[0]['id'];
else else
$in_reply_to_status_id = $item['parent']; $in_reply_to_status_id = $item['parent'];
$r = q("select `item`.`contact-id`, `contact`.nick, `item`.`author-name` from item, contact $in_reply_to_screen_name = NULL;
where `contact`.`id` = `item`.`contact-id` and `item`.id=%d", intval($in_reply_to_status_id)); $in_reply_to_user_id = NULL;
$in_reply_to_screen_name = $r[0]['author-name']; $r = q("SELECT `author-link` FROM item WHERE uid=%d AND id=%d LIMIT 1",
$in_reply_to_user_id = $r[0]['contact-id']; intval(api_user()),
intval($in_reply_to_status_id));
if ($r) {
$r = q("SELECT * FROM unique_contacts WHERE `url` = '%s'", dbesc(normalise_link($r[0]['author-link'])));
if ($r) {
$in_reply_to_screen_name = $r[0]['name'];
$in_reply_to_user_id = $r[0]['id'];
}
}
} else { } else {
$in_reply_to_screen_name = ''; $in_reply_to_screen_name = NULL;
$in_reply_to_user_id = 0; $in_reply_to_user_id = NULL;
$in_reply_to_status_id = 0; $in_reply_to_status_id = NULL;
} }
// Workaround for ostatus messages where the title is identically to the body // Workaround for ostatus messages where the title is identically to the body
$statusbody = trim(html2plain(bbcode($item['body'], false, false, true), 0)); $statusbody = trim(html2plain(bbcode($item['body'], false, false, 2), 0));
$statustitle = trim($item['title']); $statustitle = trim($item['title']);
if (($statustitle != '') and (strpos($statusbody, $statustitle) !== false)) if (($statustitle != '') and (strpos($statusbody, $statustitle) !== false))
@ -1387,15 +1497,40 @@
'id' => intval($item['id']), 'id' => intval($item['id']),
'in_reply_to_user_id' => $in_reply_to_user_id, 'in_reply_to_user_id' => $in_reply_to_user_id,
'in_reply_to_screen_name' => $in_reply_to_screen_name, 'in_reply_to_screen_name' => $in_reply_to_screen_name,
'geo' => '', 'geo' => NULL,
'favorited' => $item['starred'] ? true : false, 'favorited' => $item['starred'] ? true : false,
//'attachments' => array(),
'user' => $status_user , 'user' => $status_user ,
'statusnet_html' => trim(bbcode($item['body'])), 'statusnet_html' => trim(bbcode($item['body'], false, false)),
'statusnet_conversation_id' => $item['parent'], 'statusnet_conversation_id' => $item['parent'],
); );
if (($item['item_network'] != "") AND ($status["source"] == 'web'))
$status["source"] = network_to_name($item['item_network']);
else if (($item['item_network'] != "") AND (network_to_name($item['item_network']) != $status["source"]))
$status["source"] = trim($status["source"].' ('.network_to_name($item['item_network']).')');
// Retweets are only valid for top postings
if (($item['owner-link'] != $item['author-link']) AND ($item["id"] == $item["parent"])) {
$retweeted_status = $status;
$retweeted_status["user"] = api_get_user($a,$item["author-link"]);
$status["retweeted_status"] = $retweeted_status;
}
// "cid", "uid" and "self" are only needed for some internal stuff, so remove it from here
unset($status["user"]["cid"]);
unset($status["user"]["uid"]);
unset($status["user"]["self"]);
// 'geo' => array('type' => 'Point',
// 'coordinates' => array((float) $notice->lat,
// (float) $notice->lon));
// Seesmic doesn't like the following content // Seesmic doesn't like the following content
if ($_SERVER['HTTP_USER_AGENT'] != 'Seesmic') { // completely disabled to make friendica totally compatible to the statusnet API
/*if ($_SERVER['HTTP_USER_AGENT'] != 'Seesmic') {
$status2 = array( $status2 = array(
'updated' => api_date($item['edited']), 'updated' => api_date($item['edited']),
'published' => api_date($item['created']), 'published' => api_date($item['created']),
@ -1413,9 +1548,9 @@
); );
$status = array_merge($status, $status2); $status = array_merge($status, $status2);
} }*/
$ret[]=$status; $ret[] = $status;
}; };
return $ret; return $ret;
} }
@ -1427,7 +1562,7 @@
'reset_time_in_seconds' => strtotime('now + 1 hour'), 'reset_time_in_seconds' => strtotime('now + 1 hour'),
'remaining_hits' => (string) 150, 'remaining_hits' => (string) 150,
'hourly_limit' => (string) 150, 'hourly_limit' => (string) 150,
'reset_time' => datetime_convert('UTC','UTC','now + 1 hour',ATOM_TIME), 'reset_time' => api_date(datetime_convert('UTC','UTC','now + 1 hour',ATOM_TIME)),
); );
if ($type == "xml") if ($type == "xml")
$hash['resettime_in_seconds'] = $hash['reset_time_in_seconds']; $hash['resettime_in_seconds'] = $hash['reset_time_in_seconds'];
@ -1486,7 +1621,14 @@
$ret = array(); $ret = array();
foreach($r as $cid){ foreach($r as $cid){
$ret[] = api_get_user($a, $cid['id']); $user = api_get_user($a, $cid['id']);
// "cid", "uid" and "self" are only needed for some internal stuff, so remove it from here
unset($user["cid"]);
unset($user["uid"]);
unset($user["self"]);
if ($user)
$ret[] = $user;
} }
@ -1526,8 +1668,8 @@
$config = array( $config = array(
'site' => array('name' => $name,'server' => $server, 'theme' => 'default', 'path' => '', 'site' => array('name' => $name,'server' => $server, 'theme' => 'default', 'path' => '',
'logo' => $logo, 'fancy' => 'true', 'language' => 'en', 'email' => $email, 'broughtby' => '', 'logo' => $logo, 'fancy' => true, 'language' => 'en', 'email' => $email, 'broughtby' => '',
'broughtbyurl' => '', 'timezone' => 'UTC', 'closed' => $closed, 'inviteonly' => 'false', 'broughtbyurl' => '', 'timezone' => 'UTC', 'closed' => $closed, 'inviteonly' => false,
'private' => $private, 'textlimit' => $textlimit, 'sslserver' => $sslserver, 'ssl' => $ssl, 'private' => $private, 'textlimit' => $textlimit, 'sslserver' => $sslserver, 'ssl' => $ssl,
'shorturllength' => '30', 'shorturllength' => '30',
'friendica' => array( 'friendica' => array(
@ -1572,11 +1714,12 @@
$sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_FOLLOWER), intval(CONTACT_IS_FRIEND)); $sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_FOLLOWER), intval(CONTACT_IS_FRIEND));
$r = q("SELECT id FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 $sql_extra", $r = q("SELECT unique_contacts.id FROM contact, unique_contacts WHERE contact.nurl = unique_contacts.url AND `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 $sql_extra",
intval(api_user()) intval(api_user())
); );
if(is_array($r)) { if(is_array($r)) {
if($type === 'xml') { if($type === 'xml') {
header("Content-type: application/xml"); header("Content-type: application/xml");
echo '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n" . '<ids>' . "\r\n"; echo '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n" . '<ids>' . "\r\n";
@ -1670,9 +1813,13 @@
$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0); $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
if ($page<0) $page=0; if ($page<0) $page=0;
$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
$start = $page*$count; $start = $page*$count;
$profile_url = $a->get_baseurl() . '/profile/' . $a->user['nickname']; //$profile_url = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
$profile_url = $user_info["url"];
if ($box=="sentbox") { if ($box=="sentbox") {
$sql_extra = "`from-url`='".dbesc( $profile_url )."'"; $sql_extra = "`from-url`='".dbesc( $profile_url )."'";
} }
@ -1686,8 +1833,9 @@
$sql_extra = "`from-url`!='".dbesc( $profile_url )."'"; $sql_extra = "`from-url`!='".dbesc( $profile_url )."'";
} }
$r = q("SELECT * FROM `mail` WHERE uid=%d AND $sql_extra ORDER BY created DESC LIMIT %d,%d", $r = q("SELECT * FROM `mail` WHERE uid=%d AND $sql_extra AND id > %d ORDER BY created DESC LIMIT %d,%d",
intval(api_user()), intval(api_user()),
intval($since_id),
intval($start), intval($count) intval($start), intval($count)
); );

17
update.php
View file

@ -1,6 +1,6 @@
<?php <?php
define( 'UPDATE_VERSION' , 1166 ); define( 'UPDATE_VERSION' , 1167 );
/** /**
* *
@ -1526,3 +1526,18 @@ function update_1165() {
return UPDATE_SUCCESS; return UPDATE_SUCCESS;
} }
function update_1166() {
$r = q("CREATE TABLE IF NOT EXISTS `unique_contacts` (
`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
`url` CHAR(255) NOT NULL,
`nick` CHAR(255) NOT NULL,
`name` CHAR(255) NOT NULL,
`avatar` CHAR(255) NOT NULL,
INDEX (`url`)
) ENGINE = MYISAM DEFAULT CHARSET=utf8 ");
if (!$r)
return UPDATE_FAILED;
return UPDATE_SUCCESS;
}