Changed:

- here `Logger::level()` is okay to use
- added more logging in wall_upload.php
- formatted array and put all $array['foo'] = $foo; into a single statement
- <include|require[_once]> are all no functions, but keywords

diff --git a/mod/update_notes.php b/mod/update_notes.php
index 71650fe21a04bbabe87a0e7c40790939ab50f4b3..f195b536272d8735cb5d6ee193900777e06d9b3b 100644 (file)
--- a/mod/update_notes.php
+++ b/mod/update_notes.php
@@ -24,11 +24,11 @@ use Friendica\App;
 use Friendica\Core\System;
 use Friendica\DI;
 
-require_once("mod/notes.php");
+require_once 'mod/notes.php';
 
-function update_notes_content(App $a) {
-
-       $profile_uid = intval($_GET["p"]);
+function update_notes_content(App $a)
+{
+       $profile_uid = intval($_GET['p']);
 
        /**
         *

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 82eb050087a5a325c21f03f313cd97a614035989..690427489cf952b1c3145ba05eb07206eaf5134a 100644 (file)
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -20,6 +20,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -35,14 +36,14 @@ function wall_attach_post(App $a)
                $nick = DI::args()->getArgv()[1];
                $owner = User::getOwnerDataByNick($nick);
                if (!DBA::isResult($owner)) {
-                       DI::logger()->warning('owner is not a valid record:', ['owner' => $owner]);
+                       Logger::warning('owner is not a valid record:', ['owner' => $owner, 'nick' => $nick]);
                        if ($isJson) {
                                System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]);
                        }
                        return;
                }
        } else {
-               DI::logger()->warning('Argument count is zero');
+               Logger::warning('Argument count is zero or one (invalid)');
                if ($isJson) {
                        System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]);
                }
@@ -64,6 +65,7 @@ function wall_attach_post(App $a)
        }
 
        if (!$can_post) {
+               Logger::warning('User does not have required permissions', ['contact_id' => $contact_id, 'page_owner_uid' => $page_owner_uid]);
                if ($isJson) {
                        System::jsonExit(['error' => DI::l10n()->t('Permission denied.')]);
                }
@@ -72,7 +74,7 @@ function wall_attach_post(App $a)
        }
 
        if (empty($_FILES['userfile'])) {
-               DI::logger()->warning('No file uploaded (empty userfile)');
+               Logger::warning('No file uploaded (empty userfile)');
                if ($isJson) {
                        System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]);
                }
@@ -91,6 +93,7 @@ function wall_attach_post(App $a)
         */
        if ($fileSize <= 0) {
                $msg = DI::l10n()->t('Sorry, maybe your upload is bigger than the PHP configuration allows') . '<br />' .(DI::l10n()->t('Or - did you try to upload an empty file?'));
+               Logger::warning($msg, ['fileSize' => $fileSize]);
                @unlink($tempFileName);
                if ($isJson) {
                        System::jsonExit(['error' => $msg]);
@@ -102,6 +105,7 @@ function wall_attach_post(App $a)
 
        if ($maxFileSize && $fileSize > $maxFileSize) {
                $msg = DI::l10n()->t('File exceeds size limit of %s', Strings::formatBytes($maxFileSize));
+               Logger::warning($msg, ['fileSize' => $fileSize]);
                @unlink($tempFileName);
                if ($isJson) {
                        System::jsonExit(['error' => $msg]);
@@ -117,6 +121,7 @@ function wall_attach_post(App $a)
 
        if ($newid === false) {
                $msg =  DI::l10n()->t('File upload failed.');
+               Logger::warning($msg);
                if ($isJson) {
                        System::jsonExit(['error' => $msg]);
                } else {

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index c5575da9764f8b0a77bbf52116250bc09a3bd803..b72f759326232616e27737bc0f5a03b894590dfb 100644 (file)
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -39,17 +39,18 @@ use Friendica\Util\Strings;
 
 function wall_upload_post(App $a, $desktopmode = true)
 {
-       Logger::info("wall upload: starting new upload");
+       Logger::info('wall upload: starting new upload');
 
-       $r_json = (!empty($_GET['response']) && $_GET['response'] == 'json');
+       $isJson = (!empty($_GET['response']) && $_GET['response'] == 'json');
        $album = trim($_GET['album'] ?? '');
 
        if (DI::args()->getArgc() > 1) {
                if (empty($_FILES['media'])) {
-                       $nick = DI::args()->getArgv()[1];                       
+                       $nick = DI::args()->getArgv()[1];
                        $user = DBA::selectFirst('owner-view', ['id', 'uid', 'nickname', 'page-flags'], ['nickname' => $nick, 'blocked' => false]);
                        if (!DBA::isResult($user)) {
-                               if ($r_json) {
+                               Logger::warning('wall upload: user instance is not valid', ['user' => $user, 'nickname' => $nick]);
+                               if ($isJson) {
                                        System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]);
                                }
                                return;
@@ -58,7 +59,8 @@ function wall_upload_post(App $a, $desktopmode = true)
                        $user = DBA::selectFirst('owner-view', ['id', 'uid', 'nickname', 'page-flags'], ['uid' => BaseApi::getCurrentUserID(), 'blocked' => false]);
                }
        } else {
-               if ($r_json) {
+               Logger:warning('Argument count is zero or one (invalid)');
+               if ($isJson) {
                        System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]);
                }
                return;
@@ -73,7 +75,7 @@ function wall_upload_post(App $a, $desktopmode = true)
        $page_owner_uid   = $user['uid'];
        $default_cid      = $user['id'];
        $page_owner_nick  = $user['nickname'];
-       $community_page   = (($user['page-flags'] == User::PAGE_FLAGS_COMMUNITY) ? true : false);
+       $community_page   = ($user['page-flags'] == User::PAGE_FLAGS_COMMUNITY);
 
        if ((DI::userSession()->getLocalUserId()) && (DI::userSession()->getLocalUserId() == $page_owner_uid)) {
                $can_post = true;
@@ -84,15 +86,18 @@ function wall_upload_post(App $a, $desktopmode = true)
        }
 
        if (!$can_post) {
-               if ($r_json) {
-                       System::jsonExit(['error' => DI::l10n()->t('Permission denied.')]);
+               Logger::warning('No permission to upload files', ['contact_id' => $contact_id, 'page_owner_uid' => $page_owner_uid]);
+               $msg = DI::l10n()->t('Permission denied.');
+               if ($isJson) {
+                       System::jsonExit(['error' => $msg]);
                }
-               DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
+               DI::sysmsg()->addNotice($msg);
                System::exit();
        }
 
        if (empty($_FILES['userfile']) && empty($_FILES['media'])) {
-               if ($r_json) {
+               Logger::warning('Empty "userfile" and "media" field');
+               if ($isJson) {
                        System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]);
                }
                System::exit();
@@ -102,12 +107,12 @@ function wall_upload_post(App $a, $desktopmode = true)
        $filename = '';
        $filesize = 0;
        $filetype = '';
+
        if (!empty($_FILES['userfile'])) {
                $src      = $_FILES['userfile']['tmp_name'];
                $filename = basename($_FILES['userfile']['name']);
                $filesize = intval($_FILES['userfile']['size']);
                $filetype = $_FILES['userfile']['type'];
-
        } elseif (!empty($_FILES['media'])) {
                if (!empty($_FILES['media']['tmp_name'])) {
                        if (is_array($_FILES['media']['tmp_name'])) {
@@ -142,29 +147,36 @@ function wall_upload_post(App $a, $desktopmode = true)
                }
        }
 
-       if ($src == "") {
-               if ($r_json) {
-                       System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]);
+       if ($src == '') {
+               Logger::warning('File source (temporary file) cannot be determined');
+               $msg = DI::l10n()->t('Invalid request.');
+               if ($isJson) {
+                       System::jsonExit(['error' => $msg]);
                }
-               DI::sysmsg()->addNotice(DI::l10n()->t('Invalid request.'));
+               DI::sysmsg()->addNotice($msg);
                System::exit();
        }
 
        $filetype = Images::getMimeTypeBySource($src, $filename, $filetype);
 
-       Logger::info("File upload src: " . $src . " - filename: " . $filename .
-               " - size: " . $filesize . " - type: " . $filetype);
+       Logger::info('File upload:', [
+               'src' => $src,
+               'filename' => $filename,
+               'filesize' => $filesize,
+               'filetype' => $filetype,
+       ]);
 
        $imagedata = @file_get_contents($src);
        $image = new Image($imagedata, $filetype);
 
        if (!$image->isValid()) {
                $msg = DI::l10n()->t('Unable to process image.');
+               Logger::warning($msg, ['imagedata[]' => gettype($imagedata), 'filetype' => $filetype]);
                @unlink($src);
-               if ($r_json) {
+               if ($isJson) {
                        System::jsonExit(['error' => $msg]);
                } else {
-                       echo  $msg . '<br />';
+                       echo $msg . '<br />';
                }
                System::exit();
        }
@@ -176,7 +188,7 @@ function wall_upload_post(App $a, $desktopmode = true)
        if ($max_length > 0) {
                $image->scaleDown($max_length);
                $filesize = strlen($image->asString());
-               Logger::info("File upload: Scaling picture to new size " . $max_length);
+               Logger::info('File upload: Scaling picture to new size', ['max_length' => $max_length]);
        }
 
        $width = $image->getWidth();
@@ -199,7 +211,7 @@ function wall_upload_post(App $a, $desktopmode = true)
                        Logger::notice('Image size is too big', ['size' => $filesize, 'max' => $maximagesize]);
                        $msg = DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize));
                        @unlink($src);
-                       if ($r_json) {
+                       if ($isJson) {
                                System::jsonExit(['error' => $msg]);
                        } else {
                                echo  $msg . '<br />';
@@ -223,7 +235,8 @@ function wall_upload_post(App $a, $desktopmode = true)
 
        if (!$r) {
                $msg = DI::l10n()->t('Image upload failed.');
-               if ($r_json) {
+               Logger::warning('Photo::store() failed', ['r' => $r]);
+               if ($isJson) {
                        System::jsonExit(['error' => $msg]);
                } else {
                        echo  $msg . '<br />';
@@ -250,32 +263,34 @@ function wall_upload_post(App $a, $desktopmode = true)
        if (!$desktopmode) {
                $photo = Photo::selectFirst(['id', 'datasize', 'width', 'height', 'type'], ['resource-id' => $resource_id], ['order' => ['width']]);
                if (!$photo) {
-                       if ($r_json) {
-                               System::jsonExit(['error' => '']);
+                       Logger::warning('Cannot find photo in database', ['resource-id' => $resource_id]);
+                       if ($isJson) {
+                               System::jsonExit(['error' => 'Cannot find photo']);
                        }
                        return false;
                }
-               $picture = [];
-
-               $picture["id"]        = $photo["id"];
-               $picture["size"]      = $photo["datasize"];
-               $picture["width"]     = $photo["width"];
-               $picture["height"]    = $photo["height"];
-               $picture["type"]      = $photo["type"];
-               $picture["albumpage"] = DI::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $resource_id;
-               $picture["picture"]   = DI::baseUrl() . "/photo/{$resource_id}-0." . $image->getExt();
-               $picture["preview"]   = DI::baseUrl() . "/photo/{$resource_id}-{$smallest}." . $image->getExt();
-
-               if ($r_json) {
+
+               $picture = [
+                       'id'        => $photo['id'],
+                       'size'      => $photo['datasize'],
+                       'width'     => $photo['width'],
+                       'height'    => $photo['height'],
+                       'type'      => $photo['type'],
+                       'albumpage' => DI::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $resource_id,
+                       'picture'   => DI::baseUrl() . "/photo/{$resource_id}-0." . $image->getExt(),
+                       'preview'   => DI::baseUrl() . "/photo/{$resource_id}-{$smallest}." . $image->getExt(),
+               ];
+
+               if ($isJson) {
                        System::jsonExit(['picture' => $picture]);
                }
-               Logger::info("upload done");
+               Logger::info('upload done');
                return $picture;
        }
 
-       Logger::info("upload done");
+       Logger::info('upload done');
 
-       if ($r_json) {
+       if ($isJson) {
                System::jsonExit(['ok' => true]);
        }