]> git.mxchange.org Git - friendica.git/blobdiff - mod/wall_upload.php
projects / friendica.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fixes:
[friendica.git] / mod / wall_upload.php
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index a608743d07ff6292799f3c50fe8484b27591093d..8bf2966152957943c93655cde47df9eb42d9eac4 100644 (file)
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file mod/wall_upload.php
  * @brief Module for uploading a picture to the profile wall
@@ -10,21 +9,22 @@
  */
 
 use Friendica\App;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Database\DBM;
 use Friendica\Model\Photo;
 use Friendica\Object\Image;
 
-function wall_upload_post(App $a, $desktopmode = true) {
-
+function wall_upload_post(App $a, $desktopmode = true)
+{
        logger("wall upload: starting new upload", LOGGER_DEBUG);
 
        $r_json = (x($_GET, 'response') && $_GET['response'] == 'json');
        $album = (x($_GET, 'album') ? notags(trim($_GET['album'])) : '');
 
        if ($a->argc > 1) {
-               if (! x($_FILES, 'media')) {
+               if (!x($_FILES, 'media')) {
                        $nick = $a->argv[1];
                        $r = q("SELECT `user`.*, `contact`.`id` FROM `user`
                                INNER JOIN `contact` on `user`.`uid` = `contact`.`uid`
@@ -33,9 +33,9 @@ function wall_upload_post(App $a, $desktopmode = true) {
                                dbesc($nick)
                        );
 
-                       if (! DBM::is_result($r)) {
+                       if (!DBM::is_result($r)) {
                                if ($r_json) {
-                                       echo json_encode(array('error'=>t('Invalid request.')));
+                                       echo json_encode(['error' => L10n::t('Invalid request.')]);
                                        killme();
                                }
                                return;
@@ -51,7 +51,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
                }
        } else {
                if ($r_json) {
-                       echo json_encode(array('error'=>t('Invalid request.')));
+                       echo json_encode(['error' => L10n::t('Invalid request.')]);
                        killme();
                }
                return;
@@ -98,23 +98,26 @@ function wall_upload_post(App $a, $desktopmode = true) {
        }
 
 
-       if (! $can_post) {
+       if (!$can_post) {
                if ($r_json) {
-                       echo json_encode(array('error'=>t('Permission denied.')));
+                       echo json_encode(['error' => L10n::t('Permission denied.')]);
                        killme();
                }
-               notice(t('Permission denied.') . EOL);
+               notice(L10n::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.')));
+                       echo json_encode(['error' => L10n::t('Invalid request.')]);
                }
                killme();
        }
 
-       $src = "";
+       $src = '';
+       $filename = '';
+       $filesize = 0;
+       $filetype = '';
        if (x($_FILES, 'userfile')) {
                $src      = $_FILES['userfile']['tmp_name'];
                $filename = basename($_FILES['userfile']['name']);
@@ -122,37 +125,45 @@ function wall_upload_post(App $a, $desktopmode = true) {
                $filetype = $_FILES['userfile']['type'];
 
        } elseif (x($_FILES, 'media')) {
-               if (is_array($_FILES['media']['tmp_name'])) {
-                       $src = $_FILES['media']['tmp_name'][0];
-               } else {
-                       $src = $_FILES['media']['tmp_name'];
+               if (!empty($_FILES['media']['tmp_name'])) {
+                       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 (!empty($_FILES['media']['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 (!empty($_FILES['media']['size'])) {
+                       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 (!empty($_FILES['media']['type'])) {
+                       if (is_array($_FILES['media']['type'])) {
+                               $filetype = $_FILES['media']['type'][0];
+                       } else {
+                               $filetype = $_FILES['media']['type'];
+                       }
                }
        }
 
-       if ($src=="") {
+       if ($src == "") {
                if ($r_json) {
-                       echo json_encode(array('error'=>t('Invalid request.')));
+                       echo json_encode(['error' => L10n::t('Invalid request.')]);
                        killme();
                }
-               notice(t('Invalid request.').EOL);
+               notice(L10n::t('Invalid request.').EOL);
                killme();
        }
 
@@ -180,9 +191,9 @@ function wall_upload_post(App $a, $desktopmode = true) {
        $maximagesize = Config::get('system', 'maximagesize');
 
        if (($maximagesize) && ($filesize > $maximagesize)) {
-               $msg = sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize));
+               $msg = L10n::t('Image exceeds size limit of %s', formatBytes($maximagesize));
                if ($r_json) {
-                       echo json_encode(array('error'=>$msg));
+                       echo json_encode(['error' => $msg]);
                } else {
                        echo  $msg. EOL;
                }
@@ -193,10 +204,10 @@ function wall_upload_post(App $a, $desktopmode = true) {
        $imagedata = @file_get_contents($src);
        $Image = new Image($imagedata, $filetype);
 
-       if (! $Image->isValid()) {
-               $msg = t('Unable to process image.');
+       if (!$Image->isValid()) {
+               $msg = L10n::t('Unable to process image.');
                if ($r_json) {
-                       echo json_encode(array('error'=>$msg));
+                       echo json_encode(['error' => $msg]);
                } else {
                        echo  $msg. EOL;
                }
@@ -208,7 +219,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
        @unlink($src);
 
        $max_length = Config::get('system', 'max_image_length');
-       if (! $max_length) {
+       if (!$max_length) {
                $max_length = MAX_IMAGE_LENGTH;
        }
        if ($max_length > 0) {
@@ -219,23 +230,23 @@ function wall_upload_post(App $a, $desktopmode = true) {
        $width = $Image->getWidth();
        $height = $Image->getHeight();
 
-       $hash = photo_new_resource();
+       $hash = Photo::newResource();
 
        $smallest = 0;
 
        // If we don't have an album name use the Wall Photos album
-       if (! strlen($album)) {
-               $album = t('Wall Photos');
+       if (!strlen($album)) {
+               $album = L10n::t('Wall Photos');
        }
 
        $defperm = '<' . $default_cid . '>';
 
        $r = Photo::store($Image, $page_owner_uid, $visitor, $hash, $filename, $album, 0, 0, $defperm);
 
-       if (! $r) {
-               $msg = t('Image upload failed.');
+       if (!$r) {
+               $msg = L10n::t('Image upload failed.');
                if ($r_json) {
-                       echo json_encode(array('error'=>$msg));
+                       echo json_encode(['error' => $msg]);
                } else {
                        echo  $msg. EOL;
                }
@@ -268,12 +279,12 @@ function wall_upload_post(App $a, $desktopmode = true) {
                );
                if (!$r) {
                        if ($r_json) {
-                               echo json_encode(array('error'=>''));
+                               echo json_encode(['error' => '']);
                                killme();
                        }
                        return false;
                }
-               $picture = array();
+               $picture = [];
 
                $picture["id"]        = $r[0]["id"];
                $picture["size"]      = $r[0]["datasize"];
@@ -285,28 +296,21 @@ function wall_upload_post(App $a, $desktopmode = true) {
                $picture["preview"]   = System::baseUrl() . "/photo/{$hash}-{$smallest}." . $Image->getExt();
 
                if ($r_json) {
-                       echo json_encode(array('picture'=>$picture));
+                       echo json_encode(['picture' => $picture]);
                        killme();
                }
+               logger("upload done", LOGGER_DEBUG);
                return $picture;
        }
 
+       logger("upload done", LOGGER_DEBUG);
 
        if ($r_json) {
-               echo json_encode(array('ok'=>true));
+               echo json_encode(['ok' => true]);
                killme();
        }
 
-/* mod Waitman Gobble NO WARRANTY */
-       // if we get the signal then return the image url info in BBCODE
-       if ($_REQUEST['hush']!='yeah') {
-               echo  "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . System::baseUrl() . "/photo/{$hash}-{$smallest}.".$Image->getExt()."[/img][/url]\n\n";
-       } else {
-               $m = '[url='.System::baseUrl().'/photos/'.$page_owner_nick.'/image/'.$hash.'][img]'.System::baseUrl()."/photo/{$hash}-{$smallest}.".$Image->getExt()."[/img][/url]";
-               return($m);
-       }
-/* mod Waitman Gobble NO WARRANTY */
-
+       echo  "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . System::baseUrl() . "/photo/{$hash}-{$smallest}.".$Image->getExt()."[/img][/url]\n\n";
        killme();
        // NOTREACHED
 }
Unnamed repository; edit this file 'description' to name the repository.