X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwall_upload.php;h=fce28c47d428b7d418a3e426dd1fcfd6ccfb2ea5;hb=72896b0f6b1677a42970f432485df213318141e9;hp=07d97d17a9e21fa15809a7f325d81c554409657d;hpb=9fbe921051adec1517e2ded8122033bc3d11ea85;p=friendica.git
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 07d97d17a9..fce28c47d4 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -1,29 +1,34 @@
argc > 1) {
- if(! x($_FILES,'media')) {
- $nick = $a->argv[1];
- $r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
- dbesc($nick)
- );
-
- if(! count($r))
- return;
- }
- else {
+ if(! x($_FILES,'media')) {
+ $nick = $a->argv[1];
+ $r = q("SELECT `user`.*, `contact`.`id` FROM `user` INNER JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
+ dbesc($nick)
+ );
+
+ if(! count($r)){
+ if ($r_json) { echo json_encode(['error'=>t('Invalid request.')]); killme(); }
+ return;
+ }
+ } else {
$user_info = api_get_user($a);
- $r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
- dbesc($user_info['screen_name'])
- );
- }
- }
- else
+ $r = q("SELECT `user`.*, `contact`.`id` FROM `user` INNER JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
+ dbesc($user_info['screen_name'])
+ );
+ }
+ } else {
+ if ($r_json) { echo json_encode(['error'=>t('Invalid request.')]); killme(); }
return;
-
+ }
$can_post = false;
$visitor = 0;
@@ -37,26 +42,42 @@ function wall_upload_post(&$a) {
$can_post = true;
else {
if($community_page && remote_user()) {
- $r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
- intval(remote_user()),
- intval($page_owner_uid)
- );
- if(count($r)) {
- $can_post = true;
- $visitor = remote_user();
- $default_cid = $visitor;
+ $cid = 0;
+ if(is_array($_SESSION['remote'])) {
+ foreach($_SESSION['remote'] as $v) {
+ if($v['uid'] == $page_owner_uid) {
+ $cid = $v['cid'];
+ break;
+ }
+ }
+ }
+ if($cid) {
+
+ $r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
+ intval($cid),
+ intval($page_owner_uid)
+ );
+ if(count($r)) {
+ $can_post = true;
+ $visitor = $cid;
+ }
}
}
}
+
if(! $can_post) {
+ if ($r_json) { echo json_encode(['error'=>t('Permission denied.')]); killme(); }
notice( t('Permission denied.') . EOL );
killme();
}
- if(! x($_FILES,'userfile') && ! x($_FILES,'media'))
+ if(! x($_FILES,'userfile') && ! x($_FILES,'media')){
+ if ($r_json) { echo json_encode(['error'=>t('Invalid request.')]); killme(); }
killme();
+ }
+ $src = "";
if(x($_FILES,'userfile')) {
$src = $_FILES['userfile']['tmp_name'];
$filename = basename($_FILES['userfile']['name']);
@@ -64,17 +85,61 @@ function wall_upload_post(&$a) {
$filetype = $_FILES['userfile']['type'];
}
elseif(x($_FILES,'media')) {
- $src = $_FILES['media']['tmp_name'];
- $filename = basename($_FILES['media']['name']);
- $filesize = intval($_FILES['media']['size']);
- $filetype = $_FILES['media']['type'];
+ if (is_array($_FILES['media']['tmp_name']))
+ $src = $_FILES['media']['tmp_name'][0];
+ else
+ $src = $_FILES['media']['tmp_name'];
+
+ if (is_array($_FILES['media']['name']))
+ $filename = basename($_FILES['media']['name'][0]);
+ else
+ $filename = basename($_FILES['media']['name']);
+
+ if (is_array($_FILES['media']['size']))
+ $filesize = intval($_FILES['media']['size'][0]);
+ else
+ $filesize = intval($_FILES['media']['size']);
+
+ if (is_array($_FILES['media']['type']))
+ $filetype = $_FILES['media']['type'][0];
+ else
+ $filetype = $_FILES['media']['type'];
+ }
+
+ if ($src=="") {
+ if ($r_json) { echo json_encode(['error'=>t('Invalid request.')]); killme(); }
+ notice(t('Invalid request.').EOL);
+ killme();
}
-
- if ($filetype=="") $filetype=guess_image_type($filename);
+
+ // This is a special treatment for picture upload from Twidere
+ if (($filename == "octet-stream") AND ($filetype != "")) {
+ $filename = $filetype;
+ $filetype = "";
+ }
+
+ if ($filetype=="")
+ $filetype=guess_image_type($filename);
+
+ // If there is a temp name, then do a manual check
+ // This is more reliable than the provided value
+
+ $imagedata = getimagesize($src);
+ if ($imagedata)
+ $filetype = $imagedata['mime'];
+
+ logger("File upload src: ".$src." - filename: ".$filename.
+ " - size: ".$filesize." - type: ".$filetype, LOGGER_DEBUG);
+
$maximagesize = get_config('system','maximagesize');
if(($maximagesize) && ($filesize > $maximagesize)) {
- echo sprintf( t('Image exceeds size limit of %d'), $maximagesize) . EOL;
+ $msg = sprintf( t('Image exceeds size limit of %s'), formatBytes($maximagesize));
+ if ($r_json) {
+ echo json_encode(['error'=>$msg]);
+ } else {
+ echo $msg. EOL;
+ }
@unlink($src);
killme();
}
@@ -86,7 +151,12 @@ function wall_upload_post(&$a) {
$limit = service_class_fetch($page_owner_uid,'photo_upload_limit');
if(($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) {
- echo upgrade_message(true) . EOL ;
+ $msg = upgrade_message(true);
+ if ($r_json) {
+ echo json_encode(['error'=>$msg]);
+ } else {
+ echo $msg. EOL;
+ }
@unlink($src);
killme();
}
@@ -96,7 +166,12 @@ function wall_upload_post(&$a) {
$ph = new Photo($imagedata, $filetype);
if(! $ph->is_valid()) {
- echo ( t('Unable to process image.') . EOL);
+ $msg = t('Unable to process image.');
+ if ($r_json) {
+ echo json_encode(['error'=>$msg]);
+ } else {
+ echo $msg. EOL;
+ }
@unlink($src);
killme();
}
@@ -107,14 +182,16 @@ function wall_upload_post(&$a) {
$max_length = get_config('system','max_image_length');
if(! $max_length)
$max_length = MAX_IMAGE_LENGTH;
- if($max_length > 0)
+ if($max_length > 0) {
$ph->scaleImage($max_length);
+ logger("File upload: Scaling picture to new size ".$max_length, LOGGER_DEBUG);
+ }
$width = $ph->getWidth();
$height = $ph->getHeight();
$hash = photo_new_resource();
-
+
$smallest = 0;
$defperm = '<' . $default_cid . '>';
@@ -122,41 +199,68 @@ function wall_upload_post(&$a) {
$r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 0, 0, $defperm);
if(! $r) {
- echo ( t('Image upload failed.') . EOL);
+ $msg = t('Image upload failed.');
+ if ($r_json) {
+ echo json_encode(['error'=>$msg]);
+ } else {
+ echo $msg. EOL;
+ }
killme();
}
if($width > 640 || $height > 640) {
$ph->scaleImage(640);
$r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 1, 0, $defperm);
- if($r)
+ if($r)
$smallest = 1;
}
if($width > 320 || $height > 320) {
$ph->scaleImage(320);
$r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 2, 0, $defperm);
- if($r)
+ if($r AND ($smallest == 0))
$smallest = 2;
}
$basename = basename($filename);
+ if (!$desktopmode) {
+
+ $r = q("SELECT `id`, `datasize`, `width`, `height`, `type` FROM `photo` WHERE `resource-id` = '%s' ORDER BY `width` DESC LIMIT 1", $hash);
+ if (!$r){
+ if ($r_json) { echo json_encode(['error'=>'']); killme(); }
+ return false;
+ }
+ $picture = array();
+
+ $picture["id"] = $r[0]["id"];
+ $picture["size"] = $r[0]["datasize"];
+ $picture["width"] = $r[0]["width"];
+ $picture["height"] = $r[0]["height"];
+ $picture["type"] = $r[0]["type"];
+ $picture["albumpage"] = $a->get_baseurl().'/photos/'.$page_owner_nick.'/image/'.$hash;
+ $picture["picture"] = $a->get_baseurl()."/photo/{$hash}-0.".$ph->getExt();
+ $picture["preview"] = $a->get_baseurl()."/photo/{$hash}-{$smallest}.".$ph->getExt();
+
+ if ($r_json) { echo json_encode(['picture'=>$picture]); killme(); }
+ return $picture;
+ }
+
+ if ($r_json) { echo json_encode(['ok'=>true]); killme(); }
/* mod Waitman Gobble NO WARRANTY */
//if we get the signal then return the image url info in BBCODE, otherwise this outputs the info and bails (for the ajax image uploader on wall post)
if ($_REQUEST['hush']!='yeah') {
-
- /*existing code*/
- if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
+ if(local_user() && (! feature_enabled(local_user(),'richtext') || x($_REQUEST['nomce'])) ) {
echo "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]\n\n";
- else
+ }
+ else {
echo '
 . )
getExt()."\" alt=\"$basename\" />
";
- /*existing code*/
-
- } else {
- $m = '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]";
+ }
+ }
+ else {
+ $m = '[url='.$a->get_baseurl().'/photos/'.$page_owner_nick.'/image/'.$hash.'][img]'.$a->get_baseurl()."/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]";
return($m);
}
/* mod Waitman Gobble NO WARRANTY */