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

more work on api media uploads

Browse Source
This commit is contained in:
redmatrix
2015-12-13 19:15:42 -08:00
parent 2cceca49e9
commit fdd2da905a
4 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/api.php
View File

@@ -855,13 +855,24 @@ require_once('include/api_auth.php');
$_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_attach.php');
$media = wall_attach_post($a);
if(strlen($media)>0)
$_REQUEST['body'] .= "\n\n".$media;
$num_uploads = count($_FILES['media']['name']);
for($x = 0; $x < $num_uploads; $x ++) {
$_FILES['userfile'] = array();
$_FILES['userfile']['name'] = $_FILES['media']['name'][$x];
$_FILES['userfile']['type'] = $_FILES['media']['type'][$x];
$_FILES['userfile']['tmp_name'] = $_FILES['media']['tmp_name'][$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;
}
}
}

2
include/attach.php
View File

@@ -430,7 +430,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
$observer = $x[0];
}
logger('arr: ' . print_r($arr,true));
logger('arr: ' . print_r($arr,true), LOGGER_DATA);
if(! perm_is_allowed($channel_id,$observer_hash, 'write_storage')) {
$ret['message'] = t('Permission denied.');

2
include/photos.php
View File

@@ -377,7 +377,7 @@ function photo_upload($channel, $observer, $args) {
$arr['item_thread_top'] = 1;
$arr['item_private'] = intval($acl->is_private());
$arr['plink'] = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . $arr['mid'];
$arr['body'] = (($object) ? $args['body'] : $body . "\r\n" . $args['body']);
$arr['body'] = (($args['body']) ? $body . "\r\n" . $args['body'] : $body);
// this one is tricky because the item and the photo have the same permissions, those of the photo.