Merge branch 'master' of https://github.com/friendica/friendica

[friendica.git] / mod / wall_upload.php

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index d74eae3023aeec02e7cc22ffeb60cd88c8d1b52c..64f174a78e4763a58e445d153a21a4de73643ed1 100644 (file)
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -4,22 +4,67 @@ require_once('Photo.php');
 
 function wall_upload_post(&$a) {
 
-        if(! local_user()) {
-                notice ( "Permission denied." . EOL );
-                return;
-        }
+       if($a->argc > 1) {
+               $nick = $a->argv[1];
+               $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
+                       dbesc($nick)
+               );
+               if(! count($r))
+                       return;
+
+       }
+       else
+               return;
+
+       $can_post  = false;
+       $visitor   = 0;
+
+       $page_owner_uid   = $r[0]['uid'];
+       $page_owner_nick  = $r[0]['nickname'];
+       $community_page   = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
+
+       if((local_user()) && (local_user() == $page_owner_uid))
+               $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();
+                       }
+               }
+       }
+
+       if(! $can_post) {
+               notice( t('Permission denied.') . EOL );
+               killme();
+       }
+
+       if(! x($_FILES,'userfile'))
+               killme();
 
        $src      = $_FILES['userfile']['tmp_name'];
        $filename = basename($_FILES['userfile']['name']);
        $filesize = intval($_FILES['userfile']['size']);
 
+       $maximagesize = get_config('system','maximagesize');
+
+       if(($maximagesize) && ($filesize > $maximagesize)) {
+               echo  sprintf( t('Image exceeds size limit of %d'), $maximagesize) . EOL;
+               @unlink($src);
+               killme();
+       }
+
        $imagedata = @file_get_contents($src);
        $ph = new Photo($imagedata);
 
-       if(! ($image = $ph->getImage())) {
-               notice("Unable to process image." . EOL);
+       if(! $ph->is_valid()) {
+               echo ( t('Unable to process image.') . EOL);
                @unlink($src);
-               return;
+               killme();
        }
 
        @unlink($src);
@@ -27,72 +72,54 @@ function wall_upload_post(&$a) {
        $width = $ph->getWidth();
        $height = $ph->getHeight();
 
-       $hash = hash('md5',uniqid(mt_rand(),true));
+       $hash = photo_new_resource();
        
-       $str_image = $ph->imageString();
        $smallest = 0;
 
-       $r = q("INSERT INTO `photo` ( `uid`, `resource-id`, `created`, `edited`, `filename`, 
-               `height`, `width`, `data`, `scale` )
-               VALUES ( %d, '%s', '%s', '%s', '%s', %d, %d, '%s', 0 )",
-               intval($_SESSION['uid']),
-               dbesc($hash),
-               datetime_convert(),
-               datetime_convert(),
-               dbesc(basename($filename)),
-               intval($height),
-               intval($width),
-               dbesc($str_image));
-       if($r)
-               notice("Image uploaded successfully." . EOL);
-       else
-               notice("Image upload failed." . EOL);
+       $defperm = '<' . $page_owner_uid . '>';
+
+       $r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 0, 0, $defperm);
+
+       if(! $r) {
+               echo ( t('Image upload failed.') . EOL);
+               killme();
+       }
 
        if($width > 640 || $height > 640) {
                $ph->scaleImage(640);
-
-               $r = q("INSERT INTO `photo` ( `uid`, `resource-id`, `created`, `edited`, `filename`, 
-                       `height`, `width`, `data`, `scale` )
-                       VALUES ( %d, '%s', '%s', '%s', '%s', %d, %d, '%s', 1 )",
-                       intval($_SESSION['uid']),
-                       dbesc($hash),
-                       datetime_convert(),
-                       datetime_convert(),
-                       dbesc(basename($filename)),
-                       intval($ph->getHeight()),
-                       intval($ph->getWidth()),
-                       dbesc($ph->imageString())
-               );
-               if($r === false)
-                       notice("Image size reduction (640) failed." . EOL );
-               else
+               $r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 1, 0, $defperm);
+               if($r) 
                        $smallest = 1;
        }
 
        if($width > 320 || $height > 320) {
                $ph->scaleImage(320);
-
-               $r = q("INSERT INTO `photo` ( `uid`, `resource-id`, `created`, `edited`, `filename`, 
-                       `height`, `width`, `data`, `scale` )
-                       VALUES ( %d, '%s', '%s', '%s', '%s', %d, %d, '%s', 2 )",
-                       intval($_SESSION['uid']),
-                       dbesc($hash),
-                       datetime_convert(),
-                       datetime_convert(),
-                       dbesc(basename($filename)),
-                       intval($ph->getHeight()),
-                       intval($ph->getWidth()),
-                       dbesc($ph->imageString())
-               );
-               if($r === false)
-                       notice("Image size reduction (320) failed." . EOL );
-               else
+               $r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 2, 0, $defperm);
+               if($r)
                        $smallest = 2;
        }
 
        $basename = basename($filename);
 
-       echo "<img src=\"".$a->get_baseurl(). "/photo/{$hash}-{$smallest}.jpg\" alt=\"$basename\" />";
-       killme();
 
-}
\ No newline at end of file
+/* 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')))
+                       echo  "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.jpg[/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}.jpg\" 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}.jpg[/img][/url]";
+               return($m);
+        }
+/* mod Waitman Gobble NO WARRANTY */
+
+       killme();
+       // NOTREACHED
+}