}
require_once('include/contact_selectors.php');
- $network_name = network_to_name($uinfo[0]['network']);
+ $network_name = network_to_name($uinfo[0]['network'], $uinfo[0]['url']);
$ret = Array(
'id' => intval($r[0]['id']),
$status_info["entities"] = $converted["entities"];
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']).')');
+ $status_info["source"] = network_to_name($lastwall['item_network'], $user_info['url']);
+ elseif (($lastwall['item_network'] != "") AND (network_to_name($lastwall['item_network'], $user_info['url']) != $status_info["source"]))
+ $status_info["source"] = trim($status_info["source"].' ('.network_to_name($lastwall['item_network'], $user_info['url']).')');
// "uid" and "self" are only needed for some internal stuff, so remove it from here
unset($status_info["user"]["uid"]);
$user_info["status"]["entities"] = $converted["entities"];
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']).')');
+ $user_info["status"]["source"] = network_to_name($lastwall['item_network'], $user_info['url']);
+ if (($lastwall['item_network'] != "") AND (network_to_name($lastwall['item_network'], $user_info['url']) != $user_info["status"]["source"]))
+ $user_info["status"]["source"] = trim($user_info["status"]["source"].' ('.network_to_name($lastwall['item_network'], $user_info['url']).')');
}
$status["entities"] = $converted["entities"];
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']).')');
+ $status["source"] = network_to_name($item['item_network'], $user_info['url']);
+ else if (($item['item_network'] != "") AND (network_to_name($item['item_network'], $user_info['url']) != $status["source"]))
+ $status["source"] = trim($status["source"].' ('.network_to_name($item['item_network'], $user_info['url']).')');
// Retweets are only valid for top postings
unset($status["user"]["uid"]);
unset($status["user"]["self"]);
- // 'geo' => array('type' => 'Point',
- // 'coordinates' => array((float) $notice->lat,
- // (float) $notice->lon));
+ if ($item["coord"] != "") {
+ $coords = explode(' ',$item["coord"]);
+ if (count($coords) == 2) {
+ $status["geo"] = array('type' => 'Point',
+ 'coordinates' => array((float) $coords[0],
+ (float) $coords[1]));
+ }
+ }
$ret[] = $status;
};