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

more work on media uploads via api

Browse Source
This commit is contained in:
redmatrix 2015-12-17 16:22:13 -08:00
parent 539d06f02d
commit 62a60e5542
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/api.php
View File

@ -859,15 +859,29 @@ require_once('include/api_auth.php');
$_REQUEST['type'] = 'wall'; $_REQUEST['type'] = 'wall';
if(x($_FILES,'media')) { if(x($_FILES,'media')) {
$num_uploads = count($_FILES['media']['name']); if(is_array($_FILES['media']['name'])) {
for($x = 0; $x < $num_uploads; $x ++) { $num_uploads = count($_FILES['media']['name']);
$_FILES['userfile'] = array(); for($x = 0; $x < $num_uploads; $x ++) {
$_FILES['userfile']['name'] = $_FILES['media']['name'][$x]; $_FILES['userfile'] = array();
$_FILES['userfile']['type'] = $_FILES['media']['type'][$x]; $_FILES['userfile']['name'] = $_FILES['media']['name'][$x];
$_FILES['userfile']['tmp_name'] = $_FILES['media']['tmp_name'][$x]; $_FILES['userfile']['type'] = $_FILES['media']['type'][$x];
$_FILES['userfile']['error'] = $_FILES['media']['error'][$x]; $_FILES['userfile']['tmp_name'] = $_FILES['media']['tmp_name'][$x];
$_FILES['userfile']['size'] = $_FILES['media']['size'][$x]; $_FILES['userfile']['error'] = $_FILES['media']['error'][$x];
$_FILES['userfile']['size'] = $_FILES['media']['size'][$x];
// upload each image if we have any
$_REQUEST['silent']='1'; //tell wall_upload function to return img info instead of echo
require_once('mod/wall_attach.php');
$a->data['api_info'] = $user_info;
$media = wall_attach_post($a);
if(strlen($media)>0)
$_REQUEST['body'] .= "\n\n" . $media;
}
}
else {
// AndStatus doesn't present media as an array
$_FILES['userfile'] = $_FILES['media'];
// upload each image if we have any // upload each image if we have any
$_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_attach.php'); require_once('mod/wall_attach.php');

4
include/attach.php
View File

@ -503,6 +503,10 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
} }
} }
// AndStatus sends jpegs with a non-standard mimetype
if($type === 'image/jpg')
$type = 'image/jpeg';
$existing_size = 0; $existing_size = 0;
if($options === 'replace') { if($options === 'replace') {