X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwall_upload.php;h=8bf471d3d2ee70f17877c49ab6a38e7990650d7f;hb=39b37281a78b58b50503056e69b2aaa9885257b0;hp=17de7cceb79e6403c9c9f78f23e4eeec08adcad3;hpb=4bd70c15db79b484370a0636e1115e597044d208;p=friendica.git

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 17de7cceb7..8bf471d3d2 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -1,31 +1,40 @@
 <?php
 
-require_once('Photo.php');
+require_once('include/Photo.php');
 
-function wall_upload_post(&$a) {
+function wall_upload_post(&$a, $desktopmode = true) {
 
 	logger("wall upload: starting new upload", LOGGER_DEBUG);
 
+	$r_json = (x($_GET,'response') && $_GET['response']=='json');
+
 	if($a->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(array('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(array('error'=>t('Invalid request.')));
+		    killme();
+		}
 		return;
-
+	}
 
 	$can_post  = false;
 	$visitor   = 0;
@@ -62,14 +71,24 @@ function wall_upload_post(&$a) {
 		}
 	}
 
+
 	if(! $can_post) {
+		if ($r_json) {
+		    echo json_encode(array('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(array('error'=>t('Invalid request.')));
+		}
 		killme();
+	}
 
+	$src = "";
 	if(x($_FILES,'userfile')) {
 		$src      = $_FILES['userfile']['tmp_name'];
 		$filename = basename($_FILES['userfile']['name']);
@@ -77,17 +96,64 @@ 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 ($filetype=="") $filetype=guess_image_type($filename);
+
+	if ($src=="") {
+		if ($r_json) {
+		    echo json_encode(array('error'=>t('Invalid request.')));
+		    killme();
+		}
+		notice(t('Invalid request.').EOL);
+		killme();
+	}
+
+	// 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(array('error'=>$msg));
+		} else {
+			echo  $msg. EOL;
+		}
 		@unlink($src);
 		killme();
 	}
@@ -99,7 +165,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(array('error'=>$msg));
+		} else {
+			echo  $msg. EOL;
+		}
 		@unlink($src);
 		killme();
 	}
@@ -109,7 +180,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(array('error'=>$msg));
+		} else {
+			echo  $msg. EOL;
+		}
 		@unlink($src);
 		killme();
 	}
@@ -120,14 +196,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 . '>';
@@ -135,43 +213,77 @@ 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(array('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(array('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(array('picture'=>$picture));
+		    killme();
+		}
+		return $picture;
+	}
+
+	if ($r_json) {
+	    echo json_encode(array('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')) || x($_REQUEST['nomce'])) ) {
+		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 {
 			echo  '<br /><br /><a href="' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '" ><img src="' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."\" alt=\"$basename\" /></a><br /><br />";
 		}
-		/*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 */