harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more cleanup of api

Browse Source
This commit is contained in:
redmatrix 2016-08-11 19:42:44 -07:00
parent 0257d660ad
commit 6bc5dd75bd
2 changed files with 110 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Api.php
View File

@ -90,7 +90,7 @@ class Api extends \Zotlabs\Web\Controller {
return $o; return $o;
} }
echo api_call($a); echo api_call();
killme(); killme();
} }

218
include/api.php
View File

@ -61,11 +61,8 @@ require_once('include/api_auth.php');
} }
function api_register_func($path, $func, $auth=false){ function api_register_func($path, $func, $auth=false) {
\Zotlabs\Lib\Api_router::register($path,$func,$auth); \Zotlabs\Lib\Api_router::register($path,$func,$auth);
// global $API;
// $API[$path] = array('func'=>$func,
// 'auth'=>$auth);
} }
@ -73,9 +70,7 @@ require_once('include/api_auth.php');
* MAIN API ENTRY POINT * * MAIN API ENTRY POINT *
**************************/ **************************/
function api_call($a){ function api_call(){
GLOBAL $called_api;
$type = 'json'; $type = 'json';
$p = App::$cmd; $p = App::$cmd;
@ -83,6 +78,9 @@ require_once('include/api_auth.php');
if(strrpos($p,'.')) { if(strrpos($p,'.')) {
$type = substr($p,strrpos($p,'.')+1); $type = substr($p,strrpos($p,'.')+1);
$p = substr($p,0,strrpos($p,'.')); $p = substr($p,0,strrpos($p,'.'));
// recalculate App argc,argv since we just extracted the type from it
App::$argv = explode('/',$p);
App::$argc = count(App::$argv);
} }
$info = \Zotlabs\Lib\Api_router::find($p); $info = \Zotlabs\Lib\Api_router::find($p);
@ -90,7 +88,6 @@ require_once('include/api_auth.php');
logger('info: ' . $p . ' type: ' . $type . ' ' . print_r($info,true)); logger('info: ' . $p . ' type: ' . $type . ' ' . print_r($info,true));
if($info) { if($info) {
$called_api= explode("/",$p);
if ($info['auth'] === true && api_user() === false) { if ($info['auth'] === true && api_user() === false) {
api_login($a); api_login($a);
@ -103,12 +100,12 @@ require_once('include/api_auth.php');
logger('API call for ' . $channel['channel_name'] . ': ' . App::$query_string); logger('API call for ' . $channel['channel_name'] . ': ' . App::$query_string);
logger('API parameters: ' . print_r($_REQUEST,true)); logger('API parameters: ' . print_r($_REQUEST,true));
$r = call_user_func($info['func'], $a, $type); $r = call_user_func($info['func'],$type);
if($r === false) if($r === false)
return; return;
switch($type){ switch($type) {
case "xml": case "xml":
$r = mb_convert_encoding($r, "UTF-8",mb_detect_encoding($r)); $r = mb_convert_encoding($r, "UTF-8",mb_detect_encoding($r));
header ("Content-Type: text/xml"); header ("Content-Type: text/xml");
@ -172,7 +169,7 @@ require_once('include/api_auth.php');
* RSS extra info * RSS extra info
*/ */
function api_rss_extra($a, $arr, $user_info){ function api_rss_extra( $arr, $user_info){
if (is_null($user_info)) $user_info = api_get_user($a); if (is_null($user_info)) $user_info = api_get_user($a);
$arr['$user'] = $user_info; $arr['$user'] = $user_info;
$arr['$rss'] = array( $arr['$rss'] = array(
@ -192,8 +189,8 @@ require_once('include/api_auth.php');
* Returns user info array. * Returns user info array.
*/ */
function api_get_user($a, $contact_id = null, $contact_xchan = null){ function api_get_user( $contact_id = null, $contact_xchan = null){
global $called_api;
$user = null; $user = null;
$extra_query = ""; $extra_query = "";
@ -218,26 +215,12 @@ require_once('include/api_auth.php');
if (api_user()!==false) if (api_user()!==false)
$extra_query .= " AND abook_channel = ".intval(api_user()); $extra_query .= " AND abook_channel = ".intval(api_user());
} }
if (is_null($user) && argc() > (count($called_api)-1) && (strstr(App::$cmd,'/users'))){
$argid = count($called_api);
list($xx, $null) = explode(".",argv($argid));
if(is_numeric($xx)){
$user = intval($xx);
$extra_query = " AND abook_id = %d ";
} else {
$user = dbesc($xx);
$extra_query = " AND xchan_addr like '%s@%%' ";
if (api_user() !== false)
$extra_query .= " AND abook_channel = ".intval(api_user());
}
}
} }
if (! $user) { if (! $user) {
if (api_user() === false) { if (api_user() === false) {
api_login($a); api_login($a);
return False; return false;
} else { } else {
$user = local_channel(); $user = local_channel();
$extra_query = " AND abook_channel = %d AND abook_self = 1 "; $extra_query = " AND abook_channel = %d AND abook_self = 1 ";
@ -245,7 +228,8 @@ require_once('include/api_auth.php');
} }
logger('api_user: ' . $extra_query . ', user: ' . $user); logger('api_user: ' . $extra_query . ', user: ' . $user, LOGGER_DATA, LOG_INFO);
// user info // user info
$uinfo = q("SELECT * from abook left join xchan on abook_xchan = xchan_hash $uinfo = q("SELECT * from abook left join xchan on abook_xchan = xchan_hash
@ -362,7 +346,7 @@ require_once('include/api_auth.php');
} }
function api_client_register($a,$type) { function api_client_register($type) {
$ret = array(); $ret = array();
$key = random_string(16); $key = random_string(16);
@ -395,12 +379,12 @@ require_once('include/api_auth.php');
function api_item_get_user($a, $item) { function api_item_get_user( $item) {
// The author is our direct contact, in a conversation with us. // The author is our direct contact, in a conversation with us.
if($item['author']['abook_id']) { if($item['author']['abook_id']) {
return api_get_user($a,$item['author']['abook_id']); return api_get_user($item['author']['abook_id']);
} }
// We don't know this person directly. // We don't know this person directly.
@ -479,7 +463,7 @@ require_once('include/api_auth.php');
* returns a 401 status code and an error message if not. * returns a 401 status code and an error message if not.
* http://developer.twitter.com/doc/get/account/verify_credentials * http://developer.twitter.com/doc/get/account/verify_credentials
*/ */
function api_account_verify_credentials($a, $type){ function api_account_verify_credentials( $type){
if (api_user()===false) return false; if (api_user()===false) return false;
$user_info = api_get_user($a); $user_info = api_get_user($a);
@ -489,7 +473,7 @@ require_once('include/api_auth.php');
api_register_func('api/account/verify_credentials','api_account_verify_credentials', true); api_register_func('api/account/verify_credentials','api_account_verify_credentials', true);
function api_account_logout($a, $type){ function api_account_logout( $type){
require_once('include/auth.php'); require_once('include/auth.php');
App::$session->nuke(); App::$session->nuke();
return api_apply_template("user", $type, array('$user' => null)); return api_apply_template("user", $type, array('$user' => null));
@ -513,7 +497,7 @@ require_once('include/api_auth.php');
* Red basic channel export * Red basic channel export
*/ */
function api_export_basic($a, $type) { function api_export_basic( $type) {
if(api_user() === false) { if(api_user() === false) {
logger('api_export_basic: no user'); logger('api_export_basic: no user');
return false; return false;
@ -525,9 +509,10 @@ require_once('include/api_auth.php');
} }
api_register_func('api/export/basic','api_export_basic', true); api_register_func('api/export/basic','api_export_basic', true);
api_register_func('api/red/channel/export/basic','api_export_basic', true); api_register_func('api/red/channel/export/basic','api_export_basic', true);
api_register_func('api/hz/v1/channel/export/basic','api_export_basic', true);
function api_channel_stream($a, $type) { function api_channel_stream( $type) {
if(api_user() === false) { if(api_user() === false) {
logger('api_channel_stream: no user'); logger('api_channel_stream: no user');
return false; return false;
@ -542,18 +527,20 @@ require_once('include/api_auth.php');
} }
} }
api_register_func('api/red/channel/stream','api_channel_stream', true); api_register_func('api/red/channel/stream','api_channel_stream', true);
api_register_func('api/hz/v1/channel/stream','api_channel_stream', true);
function api_attach_list($a,$type) { function api_attach_list($type) {
logger('api_user: ' . api_user()); logger('api_user: ' . api_user());
json_return_and_die(attach_list_files(api_user(),get_observer_hash(),'','','','created asc')); json_return_and_die(attach_list_files(api_user(),get_observer_hash(),'','','','created asc'));
} }
api_register_func('api/red/files','api_attach_list', true); api_register_func('api/red/files','api_attach_list', true);
api_register_func('api/hz/v1/files','api_attach_list', true);
function api_file_meta($a,$type) { function api_file_meta($type) {
if (api_user()===false) return false; if (api_user()===false) return false;
if(! $_REQUEST['file_id']) return false; if(! $_REQUEST['file_id']) return false;
$r = q("select * from attach where uid = %d and hash = '%s' limit 1", $r = q("select * from attach where uid = %d and hash = '%s' limit 1",
@ -569,9 +556,10 @@ require_once('include/api_auth.php');
} }
api_register_func('api/red/filemeta', 'api_file_meta', true); api_register_func('api/red/filemeta', 'api_file_meta', true);
api_register_func('api/hz/v1/filemeta', 'api_file_meta', true);
function api_file_data($a,$type) { function api_file_data($type) {
if (api_user()===false) return false; if (api_user()===false) return false;
if(! $_REQUEST['file_id']) return false; if(! $_REQUEST['file_id']) return false;
$start = (($_REQUEST['start']) ? intval($_REQUEST['start']) : 0); $start = (($_REQUEST['start']) ? intval($_REQUEST['start']) : 0);
@ -612,10 +600,11 @@ require_once('include/api_auth.php');
} }
api_register_func('api/red/filedata', 'api_file_data', true); api_register_func('api/red/filedata', 'api_file_data', true);
api_register_func('api/hz/v1/filedata', 'api_file_data', true);
function api_file_detail($a,$type) { function api_file_detail($type) {
if (api_user()===false) return false; if (api_user()===false) return false;
if(! $_REQUEST['file_id']) return false; if(! $_REQUEST['file_id']) return false;
$r = q("select * from attach where uid = %d and hash = '%s' limit 1", $r = q("select * from attach where uid = %d and hash = '%s' limit 1",
@ -637,20 +626,23 @@ require_once('include/api_auth.php');
} }
api_register_func('api/red/file', 'api_file_detail', true); api_register_func('api/red/file', 'api_file_detail', true);
api_register_func('api/hz/v1/file', 'api_file_detail', true);
function api_albums($a,$type) { function api_albums($type) {
json_return_and_die(photos_albums_list(App::get_channel(),App::get_observer())); json_return_and_die(photos_albums_list(App::get_channel(),App::get_observer()));
} }
api_register_func('api/red/albums','api_albums', true); api_register_func('api/red/albums','api_albums', true);
api_register_func('api/hz/v1/albums','api_albums', true);
function api_photos($a,$type) { function api_photos($type) {
$album = $_REQUEST['album']; $album = $_REQUEST['album'];
json_return_and_die(photos_list_photos(App::get_channel(),App::get_observer(),$album)); json_return_and_die(photos_list_photos(App::get_channel(),App::get_observer(),$album));
} }
api_register_func('api/red/photos','api_photos', true); api_register_func('api/red/photos','api_photos', true);
api_register_func('api/hz/v1/photos','api_photos', true);
function api_photo_detail($a,$type) { function api_photo_detail($type) {
if (api_user()===false) return false; if (api_user()===false) return false;
if(! $_REQUEST['photo_id']) return false; if(! $_REQUEST['photo_id']) return false;
$scale = ((array_key_exists('scale',$_REQUEST)) ? intval($_REQUEST['scale']) : 0); $scale = ((array_key_exists('scale',$_REQUEST)) ? intval($_REQUEST['scale']) : 0);
@ -690,9 +682,10 @@ require_once('include/api_auth.php');
} }
api_register_func('api/red/photo', 'api_photo_detail', true); api_register_func('api/red/photo', 'api_photo_detail', true);
api_register_func('api/hz/v1/photo', 'api_photo_detail', true);
function api_group_members($a,$type) { function api_group_members($type) {
if(api_user() === false) if(api_user() === false)
return false; return false;
@ -712,11 +705,12 @@ require_once('include/api_auth.php');
} }
api_register_func('api/red/group_members','api_group_members', true); api_register_func('api/red/group_members','api_group_members', true);
api_register_func('api/hz/v1/group_members','api_group_members', true);
function api_group($a,$type) { function api_group($type) {
if(api_user() === false) if(api_user() === false)
return false; return false;
@ -726,9 +720,10 @@ require_once('include/api_auth.php');
json_return_and_die($r); json_return_and_die($r);
} }
api_register_func('api/red/group','api_group', true); api_register_func('api/red/group','api_group', true);
api_register_func('api/hz/v1/group','api_group', true);
function api_red_xchan($a,$type) { function api_red_xchan($type) {
logger('api_xchan'); logger('api_xchan');
if(api_user() === false) if(api_user() === false)
@ -744,9 +739,10 @@ require_once('include/api_auth.php');
}; };
api_register_func('api/red/xchan','api_red_xchan',true); api_register_func('api/red/xchan','api_red_xchan',true);
api_register_func('api/hz/v1/xchan','api_red_xchan',true);
function api_statuses_mediap($a, $type) { function api_statuses_mediap( $type) {
if (api_user() === false) { if (api_user() === false) {
logger('api_statuses_update: no user'); logger('api_statuses_update: no user');
return false; return false;
@ -788,11 +784,11 @@ require_once('include/api_auth.php');
$mod->post(); $mod->post();
// this should output the last post (the one we just posted). // this should output the last post (the one we just posted).
return api_status_show($a,$type); return api_status_show($type);
} }
api_register_func('api/statuses/mediap','api_statuses_mediap', true); api_register_func('api/statuses/mediap','api_statuses_mediap', true);
function api_statuses_update($a, $type) { function api_statuses_update( $type) {
if (api_user() === false) { if (api_user() === false) {
logger('api_statuses_update: no user'); logger('api_statuses_update: no user');
return false; return false;
@ -907,13 +903,13 @@ require_once('include/api_auth.php');
$mod->post(); $mod->post();
// this should output the last post (the one we just posted). // this should output the last post (the one we just posted).
return api_status_show($a,$type); return api_status_show($type);
} }
api_register_func('api/statuses/update_with_media','api_statuses_update', true); api_register_func('api/statuses/update_with_media','api_statuses_update', true);
api_register_func('api/statuses/update','api_statuses_update', true); api_register_func('api/statuses/update','api_statuses_update', true);
function red_item_new($a, $type) { function red_item_new( $type) {
if (api_user() === false) { if (api_user() === false) {
logger('api_red_item_new: no user'); logger('api_red_item_new: no user');
@ -945,9 +941,10 @@ require_once('include/api_auth.php');
} }
api_register_func('api/red/item/new','red_item_new', true); api_register_func('api/red/item/new','red_item_new', true);
api_register_func('api/hz/v1/item/new','red_item_new', true);
function red_item($a, $type) { function red_item( $type) {
if (api_user() === false) { if (api_user() === false) {
logger('api_red_item_full: no user'); logger('api_red_item_full: no user');
@ -983,6 +980,7 @@ require_once('include/api_auth.php');
} }
api_register_func('api/red/item/full','red_item', true); api_register_func('api/red/item/full','red_item', true);
api_register_func('api/hz/v1/item/full','red_item', true);
@ -1048,7 +1046,7 @@ require_once('include/api_auth.php');
return $status_info; return $status_info;
} }
function api_status_show($a, $type){ function api_status_show( $type){
$user_info = api_get_user($a); $user_info = api_get_user($a);
// get last public message // get last public message
@ -1126,7 +1124,7 @@ require_once('include/api_auth.php');
// FIXME - this is essentially the same as api_status_show except for the template formatting at the end. Consolidate. // FIXME - this is essentially the same as api_status_show except for the template formatting at the end. Consolidate.
function api_users_show($a, $type){ function api_users_show( $type){
$user_info = api_get_user($a); $user_info = api_get_user($a);
require_once('include/security.php'); require_once('include/security.php');
@ -1198,7 +1196,7 @@ require_once('include/api_auth.php');
* TODO: Add reply info * TODO: Add reply info
*/ */
function api_statuses_home_timeline($a, $type){ function api_statuses_home_timeline( $type){
if (api_user() === false) if (api_user() === false)
return false; return false;
@ -1265,10 +1263,10 @@ require_once('include/api_auth.php');
switch($type){ switch($type){
case "atom": case "atom":
case "rss": case "rss":
$data = api_rss_extra($a, $data, $user_info); $data = api_rss_extra( $data, $user_info);
break; break;
case "as": case "as":
$as = api_format_as($a, $ret, $user_info); $as = api_format_as( $ret, $user_info);
$as['title'] = App::$config['sitename']." Home Timeline"; $as['title'] = App::$config['sitename']." Home Timeline";
$as['link']['url'] = z_root()."/".$user_info["screen_name"]."/all"; $as['link']['url'] = z_root()."/".$user_info["screen_name"]."/all";
return($as); return($as);
@ -1280,7 +1278,7 @@ require_once('include/api_auth.php');
api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true); 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/friends_timeline','api_statuses_home_timeline', true);
function api_statuses_public_timeline($a, $type){ function api_statuses_public_timeline( $type){
if (api_user()===false) return false; if (api_user()===false) return false;
$user_info = api_get_user($a); $user_info = api_get_user($a);
@ -1326,10 +1324,10 @@ require_once('include/api_auth.php');
switch($type){ switch($type){
case "atom": case "atom":
case "rss": case "rss":
$data = api_rss_extra($a, $data, $user_info); $data = api_rss_extra( $data, $user_info);
break; break;
case "as": case "as":
$as = api_format_as($a, $ret, $user_info); $as = api_format_as( $ret, $user_info);
$as['title'] = App::$config['sitename']. " " . t('Public Timeline'); $as['title'] = App::$config['sitename']. " " . t('Public Timeline');
$as['link']['url'] = z_root()."/"; $as['link']['url'] = z_root()."/";
return($as); return($as);
@ -1344,7 +1342,7 @@ require_once('include/api_auth.php');
* *
*/ */
function api_statuses_show($a, $type){ function api_statuses_show( $type){
if (api_user()===false) return false; if (api_user()===false) return false;
$user_info = api_get_user($a); $user_info = api_get_user($a);
@ -1383,7 +1381,7 @@ require_once('include/api_auth.php');
/*switch($type){ /*switch($type){
case "atom": case "atom":
case "rss": case "rss":
$data = api_rss_extra($a, $data, $user_info); $data = api_rss_extra( $data, $user_info);
}*/ }*/
return api_apply_template("status", $type, $data); return api_apply_template("status", $type, $data);
} }
@ -1394,7 +1392,7 @@ require_once('include/api_auth.php');
/** /**
* *
*/ */
function api_statuses_repeat($a, $type){ function api_statuses_repeat( $type){
if (api_user()===false) return false; if (api_user()===false) return false;
$user_info = api_get_user($a); $user_info = api_get_user($a);
@ -1440,7 +1438,7 @@ require_once('include/api_auth.php');
* *
*/ */
function api_statuses_destroy($a, $type){ function api_statuses_destroy( $type){
if (api_user()===false) return false; if (api_user()===false) return false;
$user_info = api_get_user($a); $user_info = api_get_user($a);
@ -1504,7 +1502,7 @@ require_once('include/api_auth.php');
*/ */
function api_statuses_mentions($a, $type){ function api_statuses_mentions( $type){
if (api_user()===false) return false; if (api_user()===false) return false;
$user_info = api_get_user($a); $user_info = api_get_user($a);
@ -1554,10 +1552,10 @@ require_once('include/api_auth.php');
switch($type){ switch($type){
case "atom": case "atom":
case "rss": case "rss":
$data = api_rss_extra($a, $data, $user_info); $data = api_rss_extra( $data, $user_info);
break; break;
case "as": case "as":
$as = api_format_as($a, $ret, $user_info); $as = api_format_as( $ret, $user_info);
$as["title"] = App::$config['sitename']." Mentions"; $as["title"] = App::$config['sitename']." Mentions";
$as['link']['url'] = z_root()."/"; $as['link']['url'] = z_root()."/";
return($as); return($as);
@ -1571,7 +1569,7 @@ require_once('include/api_auth.php');
api_register_func('api/statuses/replies','api_statuses_mentions', true); api_register_func('api/statuses/replies','api_statuses_mentions', true);
function api_statuses_user_timeline($a, $type){ function api_statuses_user_timeline( $type){
if (api_user()===false) return false; if (api_user()===false) return false;
$user_info = api_get_user($a); $user_info = api_get_user($a);
@ -1639,7 +1637,7 @@ require_once('include/api_auth.php');
switch($type){ switch($type){
case "atom": case "atom":
case "rss": case "rss":
$data = api_rss_extra($a, $data, $user_info); $data = api_rss_extra( $data, $user_info);
} }
return api_apply_template("timeline", $type, $data); return api_apply_template("timeline", $type, $data);
@ -1655,7 +1653,7 @@ require_once('include/api_auth.php');
* *
* api v1 : https://web.archive.org/web/20131019055350/https://dev.twitter.com/docs/api/1/post/favorites/create/%3Aid * api v1 : https://web.archive.org/web/20131019055350/https://dev.twitter.com/docs/api/1/post/favorites/create/%3Aid
*/ */
function api_favorites_create_destroy($a, $type){ function api_favorites_create_destroy( $type){
logger('favorites_create_destroy'); logger('favorites_create_destroy');
@ -1712,7 +1710,7 @@ require_once('include/api_auth.php');
switch($type){ switch($type){
case "atom": case "atom":
case "rss": case "rss":
$data = api_rss_extra($a, $data, $user_info); $data = api_rss_extra( $data, $user_info);
} }
return api_apply_template("status", $type, $data); return api_apply_template("status", $type, $data);
@ -1723,7 +1721,7 @@ require_once('include/api_auth.php');
function api_favorites($a, $type){ function api_favorites( $type){
if (api_user()===false) if (api_user()===false)
return false; return false;
@ -1776,10 +1774,10 @@ require_once('include/api_auth.php');
switch($type){ switch($type){
case "atom": case "atom":
case "rss": case "rss":
$data = api_rss_extra($a, $data, $user_info); $data = api_rss_extra( $data, $user_info);
break; break;
case "as": case "as":
$as = api_format_as($a, $ret, $user_info); $as = api_format_as( $ret, $user_info);
$as['title'] = App::$config['sitename']." Home Timeline"; $as['title'] = App::$config['sitename']." Home Timeline";
$as['link']['url'] = z_root()."/".$user_info["screen_name"]."/all"; $as['link']['url'] = z_root()."/".$user_info["screen_name"]."/all";
return($as); return($as);
@ -1795,7 +1793,7 @@ require_once('include/api_auth.php');
function api_format_as($a, $ret, $user_info) { function api_format_as( $ret, $user_info) {
$as = array(); $as = array();
$as['title'] = App::$config['sitename']." Public Timeline"; $as['title'] = App::$config['sitename']." Public Timeline";
@ -1913,7 +1911,7 @@ require_once('include/api_auth.php');
localize_item($item); localize_item($item);
$status_user = (($item['author_xchan']==$user_info['guid'])?$user_info: api_item_get_user($a,$item)); $status_user = (($item['author_xchan']==$user_info['guid'])?$user_info: api_item_get_user($item));
if(array_key_exists('status',$status_user)) if(array_key_exists('status',$status_user))
unset($status_user['status']); unset($status_user['status']);
@ -1992,7 +1990,7 @@ require_once('include/api_auth.php');
} }
function api_account_rate_limit_status($a,$type) { function api_account_rate_limit_status($type) {
$hash = array( $hash = array(
'reset_time_in_seconds' => strtotime('now + 1 hour'), 'reset_time_in_seconds' => strtotime('now + 1 hour'),
@ -2008,7 +2006,7 @@ require_once('include/api_auth.php');
} }
api_register_func('api/account/rate_limit_status','api_account_rate_limit_status',true); api_register_func('api/account/rate_limit_status','api_account_rate_limit_status',true);
function api_help_test($a,$type) { function api_help_test($type) {
if ($type == 'xml') if ($type == 'xml')
$ok = "true"; $ok = "true";
@ -2025,7 +2023,7 @@ require_once('include/api_auth.php');
* This function is deprecated by Twitter * This function is deprecated by Twitter
* returns: json, xml * returns: json, xml
**/ **/
function api_statuses_f($a, $type, $qtype) { function api_statuses_f( $type, $qtype) {
if (api_user()===false) return false; if (api_user()===false) return false;
$user_info = api_get_user($a); $user_info = api_get_user($a);
@ -2060,20 +2058,20 @@ require_once('include/api_auth.php');
$ret = array(); $ret = array();
foreach($r as $cid){ foreach($r as $cid){
$ret[] = api_get_user($a, $cid['abook_id']); $ret[] = api_get_user( $cid['abook_id']);
} }
return array('$users' => $ret); return array('$users' => $ret);
} }
function api_statuses_friends($a, $type){ function api_statuses_friends( $type){
$data = api_statuses_f($a,$type,"friends"); $data = api_statuses_f($type,"friends");
if ($data===false) return false; if ($data===false) return false;
return api_apply_template("friends", $type, $data); return api_apply_template("friends", $type, $data);
} }
function api_statuses_followers($a, $type){ function api_statuses_followers( $type){
$data = api_statuses_f($a,$type,"followers"); $data = api_statuses_f($type,"followers");
if ($data===false) return false; if ($data===false) return false;
return api_apply_template("friends", $type, $data); return api_apply_template("friends", $type, $data);
} }
@ -2085,7 +2083,7 @@ require_once('include/api_auth.php');
function api_statusnet_config($a,$type) { function api_statusnet_config($type) {
load_config('system'); load_config('system');
@ -2121,8 +2119,9 @@ require_once('include/api_auth.php');
api_register_func('api/statusnet/config','api_statusnet_config',false); api_register_func('api/statusnet/config','api_statusnet_config',false);
api_register_func('api/friendica/config','api_statusnet_config',false); api_register_func('api/friendica/config','api_statusnet_config',false);
api_register_func('api/red/config','api_statusnet_config',false); api_register_func('api/red/config','api_statusnet_config',false);
api_register_func('api/hz/v1/config','api_statusnet_config',false);
function api_statusnet_version($a,$type) { function api_statusnet_version($type) {
// liar // liar
@ -2140,7 +2139,7 @@ require_once('include/api_auth.php');
api_register_func('api/statusnet/version','api_statusnet_version',false); api_register_func('api/statusnet/version','api_statusnet_version',false);
function api_friendica_version($a,$type) { function api_friendica_version($type) {
if($type === 'xml') { if($type === 'xml') {
header("Content-type: application/xml"); header("Content-type: application/xml");
@ -2155,9 +2154,10 @@ require_once('include/api_auth.php');
} }
api_register_func('api/friendica/version','api_friendica_version',false); api_register_func('api/friendica/version','api_friendica_version',false);
api_register_func('api/red/version','api_friendica_version',false); api_register_func('api/red/version','api_friendica_version',false);
api_register_func('api/hz/v1/version','api_friendica_version',false);
function api_ff_ids($a,$type,$qtype) { function api_ff_ids($type,$qtype) {
if(! api_user()) if(! api_user())
return false; return false;
@ -2193,17 +2193,17 @@ require_once('include/api_auth.php');
} }
} }
function api_friends_ids($a,$type) { function api_friends_ids($type) {
api_ff_ids($a,$type,'friends'); api_ff_ids($type,'friends');
} }
function api_followers_ids($a,$type) { function api_followers_ids($type) {
api_ff_ids($a,$type,'followers'); api_ff_ids($type,'followers');
} }
api_register_func('api/friends/ids','api_friends_ids',true); api_register_func('api/friends/ids','api_friends_ids',true);
api_register_func('api/followers/ids','api_followers_ids',true); api_register_func('api/followers/ids','api_followers_ids',true);
function api_direct_messages_new($a, $type) { function api_direct_messages_new( $type) {
if (api_user()===false) return false; if (api_user()===false) return false;
if (!x($_POST, "text") || !x($_POST,"screen_name")) return; if (!x($_POST, "text") || !x($_POST,"screen_name")) return;
@ -2219,7 +2219,7 @@ require_once('include/api_auth.php');
dbesc($_POST['screen_name'] . '@%') dbesc($_POST['screen_name'] . '@%')
); );
$recipient = api_get_user($a, $r[0]['abook_id']); $recipient = api_get_user( $r[0]['abook_id']);
$replyto = ''; $replyto = '';
$sub = ''; $sub = '';
if (x($_REQUEST,'replyto')) { if (x($_REQUEST,'replyto')) {
@ -2253,7 +2253,7 @@ require_once('include/api_auth.php');
switch($type){ switch($type){
case "atom": case "atom":
case "rss": case "rss":
$data = api_rss_extra($a, $data, $user_info); $data = api_rss_extra( $data, $user_info);
} }
return api_apply_template("direct_messages", $type, $data); return api_apply_template("direct_messages", $type, $data);
@ -2261,7 +2261,7 @@ require_once('include/api_auth.php');
} }
api_register_func('api/direct_messages/new','api_direct_messages_new',true); api_register_func('api/direct_messages/new','api_direct_messages_new',true);
function api_direct_messages_box($a, $type, $box) { function api_direct_messages_box( $type, $box) {
if (api_user()===false) return false; if (api_user()===false) return false;
$user_info = api_get_user($a); $user_info = api_get_user($a);
@ -2298,10 +2298,10 @@ require_once('include/api_auth.php');
foreach($r as $item) { foreach($r as $item) {
if ($item['from_xchan'] == $channel['channel_hash']) { if ($item['from_xchan'] == $channel['channel_hash']) {
$sender = $user_info; $sender = $user_info;
$recipient = api_get_user($a, null, $item['to_xchan']); $recipient = api_get_user( null, $item['to_xchan']);
} }
else { else {
$sender = api_get_user($a, null, $item['from_xchan']); $sender = api_get_user( null, $item['from_xchan']);
$recipient = $user_info; $recipient = $user_info;
} }
@ -2314,24 +2314,24 @@ require_once('include/api_auth.php');
switch($type){ switch($type){
case "atom": case "atom":
case "rss": case "rss":
$data = api_rss_extra($a, $data, $user_info); $data = api_rss_extra( $data, $user_info);
} }
return api_apply_template("direct_messages", $type, $data); return api_apply_template("direct_messages", $type, $data);
} }
function api_direct_messages_sentbox($a, $type){ function api_direct_messages_sentbox( $type){
return api_direct_messages_box($a, $type, "sentbox"); return api_direct_messages_box( $type, "sentbox");
} }
function api_direct_messages_inbox($a, $type){ function api_direct_messages_inbox( $type){
return api_direct_messages_box($a, $type, "inbox"); return api_direct_messages_box( $type, "inbox");
} }
function api_direct_messages_all($a, $type){ function api_direct_messages_all( $type){
return api_direct_messages_box($a, $type, "all"); return api_direct_messages_box( $type, "all");
} }
function api_direct_messages_conversation($a, $type){ function api_direct_messages_conversation( $type){
return api_direct_messages_box($a, $type, "conversation"); return api_direct_messages_box( $type, "conversation");
} }
api_register_func('api/direct_messages/conversation','api_direct_messages_conversation',true); api_register_func('api/direct_messages/conversation','api_direct_messages_conversation',true);
api_register_func('api/direct_messages/all','api_direct_messages_all',true); api_register_func('api/direct_messages/all','api_direct_messages_all',true);
@ -2339,7 +2339,7 @@ require_once('include/api_auth.php');
api_register_func('api/direct_messages','api_direct_messages_inbox',true); api_register_func('api/direct_messages','api_direct_messages_inbox',true);
function api_oauth_request_token($a, $type){ function api_oauth_request_token( $type){
try{ try{
$oauth = new ZotOAuth1(); $oauth = new ZotOAuth1();
$req = OAuth1Request::from_request(); $req = OAuth1Request::from_request();
@ -2354,7 +2354,7 @@ require_once('include/api_auth.php');
killme(); killme();
} }
function api_oauth_access_token($a, $type){ function api_oauth_access_token( $type){
try{ try{
$oauth = new ZotOAuth1(); $oauth = new ZotOAuth1();
$req = OAuth1Request::from_request(); $req = OAuth1Request::from_request();