aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-07-25 05:04:52 -0700
committerfriendica <info@friendica.com>2013-07-25 05:04:52 -0700
commite45beccd5b7f5f56f3bda9f09e77e4c0f9669fcd (patch)
tree41eeb9ad689e5a4b38384b5e195429f70126a022
parent98d3d06352f1a2f0d1220bb6f1b4a031c4c885d1 (diff)
downloadvolse-hubzilla-e45beccd5b7f5f56f3bda9f09e77e4c0f9669fcd.tar.gz
volse-hubzilla-e45beccd5b7f5f56f3bda9f09e77e4c0f9669fcd.tar.bz2
volse-hubzilla-e45beccd5b7f5f56f3bda9f09e77e4c0f9669fcd.zip
fix media uploads in api (specifically friendica for android)
-rw-r--r--include/api.php14
-rw-r--r--include/zot.php34
-rw-r--r--version.inc2
3 files changed, 12 insertions, 38 deletions
diff --git a/include/api.php b/include/api.php
index ac86178a6..a49258d18 100644
--- a/include/api.php
+++ b/include/api.php
@@ -610,6 +610,15 @@ require_once('include/photos.php');
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);
// 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';
else {
$_REQUEST['type'] = 'wall';
+
if(x($_FILES,'media')) {
+ $_FILES['userfile'] = $_FILES['media'];
// upload the image if we have one
$_REQUEST['silent']='1'; //tell wall_upload function to return img info instead of echo
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
diff --git a/include/zot.php b/include/zot.php
index 256f5587d..609107936 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -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
diff --git a/version.inc b/version.inc
index 164368ab4..4e63cd637 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-07-24.384
+2013-07-25.385