Merge pull request #1455 from pztrn/master

[friendica.git] / mod / wall_upload.php

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index ee1bf3c14c68742a8e78aeb0a64bcad7240dbc46..f1fde2e33c3b364b44f14852d4a314b7c3f65f12 100644 (file)
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -1,13 +1,15 @@
 <?php
 
-require_once('Photo.php');
+require_once('include/Photo.php');
 
 function wall_upload_post(&$a) {
 
+       logger("wall upload: starting new upload", LOGGER_DEBUG);
+
        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",
+                       $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)
                        );
 
@@ -16,7 +18,7 @@ function wall_upload_post(&$a) {
                }
                 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",
+                       $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'])
                        );
                 }
@@ -75,13 +77,45 @@ 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'];
+       }
+
+       // 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 ($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)) {
@@ -118,14 +152,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 . '>';
@@ -140,14 +176,14 @@ function wall_upload_post(&$a) {
        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;
        }
 
@@ -158,16 +194,15 @@ function wall_upload_post(&$a) {
 
 //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  '<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 */