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

fix media uploads in api (specifically friendica for android)

Browse Source
This commit is contained in:
friendica 2013-07-25 05:04:52 -07:00
parent 98d3d06352
commit e45beccd5b
3 changed files with 12 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/api.php
View File

@ -610,6 +610,15 @@ require_once('include/photos.php');
return false; return false;
} }
logger('api_statuses_update: REQUEST ' . print_r($_REQUEST,true));
logger('api_statuses_update: FILES ' . print_r($_FILES,true));
// set this so that the item_post() function is quiet and doesn't redirect or emit json
$_REQUEST['api_source'] = true;
$user_info = api_get_user($a); $user_info = api_get_user($a);
// convert $_POST array items to the form we use for web posts. // convert $_POST array items to the form we use for web posts.
@ -655,7 +664,9 @@ require_once('include/photos.php');
$_REQUEST['type'] = 'net-comment'; $_REQUEST['type'] = 'net-comment';
else { else {
$_REQUEST['type'] = 'wall'; $_REQUEST['type'] = 'wall';
if(x($_FILES,'media')) { if(x($_FILES,'media')) {
$_FILES['userfile'] = $_FILES['media'];
// upload the image if we have one // upload the image if we have one
$_REQUEST['silent']='1'; //tell wall_upload function to return img info instead of echo $_REQUEST['silent']='1'; //tell wall_upload function to return img info instead of echo
require_once('mod/wall_upload.php'); require_once('mod/wall_upload.php');
@ -665,9 +676,6 @@ require_once('include/photos.php');
} }
} }
// set this so that the item_post() function is quiet and doesn't redirect or emit json
$_REQUEST['api_source'] = true;
// call out normal post function // call out normal post function

34
include/zot.php
View File

@ -47,40 +47,6 @@ function zot_get_hubloc($arr,$primary = false) {
} }
/**
* obsolete
function zot_notify($channel,$url,$type = 'notify',$recipients = null, $remote_key = null) {
$params = array(
'type' => $type,
'sender' => json_encode(array(
'guid' => $channel['channel_guid'],
'guid_sig' => base64url_encode(rsa_sign($channel['channel_guid'],$channel['channel_prvkey'])),
'url' => z_root(),
'url_sig' => base64url_encode(rsa_sign(z_root(),$channel['channel_prvkey']))
)),
'callback' => '/post',
'version' => ZOT_REVISION
);
if($recipients)
$params['recipients'] = json_encode($recipients);
// Hush-hush ultra top-secret mode
if($remote_key) {
$params = aes_encapsulate($params,$remote_key);
}
$x = z_post_url($url,$params);
return($x);
}
*/
/* /*
* *
* zot_build_packet builds a notification packet that you can either * zot_build_packet builds a notification packet that you can either

2
version.inc
View File

@ -1 +1 @@
2013-07-24.384 2013-07-25.385