From 11a297f3d5f84d5d2b9f2ffbc0a8e84da0d4fc01 Mon Sep 17 00:00:00 2001
From: Andreas Blaesius <andi@unlegacy-android.org>
Date: Wed, 6 Jul 2022 21:06:29 +0200
Subject: [PATCH] api(sendPic): handle "Store email addresses in file" option
 earlier

Change-Id: Ief9ae3fb9fdd176099d74a888aac26dd0e4738b9
---
 api/sendPic.php | 57 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 22 deletions(-)

diff --git a/api/sendPic.php b/api/sendPic.php
index 6bd103a53..210bf1046 100644
--- a/api/sendPic.php
+++ b/api/sendPic.php
@@ -11,7 +11,7 @@
 require_once '../lib/db.php';
 require_once '../lib/log.php';
 
-if (empty($_POST['sendTo']) || empty($_POST['image']) || !PHPMailer::validateAddress($_POST['sendTo'])) {
+if (empty($_POST['sendTo']) || !PHPMailer::validateAddress($_POST['sendTo'])) {
     $LogData = [
         'success' => false,
         'error' => 'E-Mail address invalid',
@@ -24,6 +24,40 @@
     die($LogString);
 }
 
+if (isset($_POST['send-link']) && $_POST['send-link'] === 'yes') {
+    if (!file_exists(MAIL_FILE)) {
+        $addresses = [];
+    } else {
+        $addresses = json_decode(file_get_contents(MAIL_FILE));
+    }
+
+    if (!in_array($_POST['sendTo'], $addresses)) {
+        $addresses[] = $_POST['sendTo'];
+    }
+
+    file_put_contents(MAIL_FILE, json_encode($addresses));
+
+    die(
+        json_encode([
+            'success' => true,
+            'saved' => true,
+        ])
+    );
+}
+
+if (empty($_POST['image'])) {
+    $LogData = [
+        'success' => false,
+        'error' => 'Image not defined',
+        'php' => basename($_SERVER['PHP_SELF']),
+    ];
+    $LogString = json_encode($LogData);
+    if ($config['dev']['enabled']) {
+        logError($LogData);
+    }
+    die($LogString);
+}
+
 $postImage = basename($_POST['image']);
 if (!isImageInDB($postImage)) {
     $LogData = [
@@ -96,27 +130,6 @@
     die($LogString);
 }
 
-if (isset($_POST['send-link']) && $_POST['send-link'] === 'yes') {
-    if (!file_exists(MAIL_FILE)) {
-        $addresses = [];
-    } else {
-        $addresses = json_decode(file_get_contents(MAIL_FILE));
-    }
-
-    if (!in_array($_POST['sendTo'], $addresses)) {
-        $addresses[] = $_POST['sendTo'];
-    }
-
-    file_put_contents(MAIL_FILE, json_encode($addresses));
-
-    die(
-        json_encode([
-            'success' => true,
-            'saved' => true,
-        ])
-    );
-}
-
 if ($mail->send()) {
     die(
         json_encode([