Skip to content
This repository was archived by the owner on Aug 27, 2022. It is now read-only.

Commit 8be5804

Browse files
committed
api(sendPic): handle "Store email addresses in file" option earlier
Change-Id: Ief9ae3fb9fdd176099d74a888aac26dd0e4738b9
1 parent 48fcdbc commit 8be5804

File tree

1 file changed

+35
-22
lines changed

1 file changed

+35
-22
lines changed

api/sendPic.php

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
require_once '../lib/db.php';
1212
require_once '../lib/log.php';
1313

14-
if (empty($_POST['sendTo']) || empty($_POST['image']) || !PHPMailer::validateAddress($_POST['sendTo'])) {
14+
if (empty($_POST['sendTo']) || !PHPMailer::validateAddress($_POST['sendTo'])) {
1515
$LogData = [
1616
'success' => false,
1717
'error' => 'E-Mail address invalid',
@@ -24,6 +24,40 @@
2424
die($LogString);
2525
}
2626

27+
if (isset($_POST['send-link']) && $_POST['send-link'] === 'yes') {
28+
if (!file_exists(MAIL_FILE)) {
29+
$addresses = [];
30+
} else {
31+
$addresses = json_decode(file_get_contents(MAIL_FILE));
32+
}
33+
34+
if (!in_array($_POST['sendTo'], $addresses)) {
35+
$addresses[] = $_POST['sendTo'];
36+
}
37+
38+
file_put_contents(MAIL_FILE, json_encode($addresses));
39+
40+
die(
41+
json_encode([
42+
'success' => true,
43+
'saved' => true,
44+
])
45+
);
46+
}
47+
48+
if (empty($_POST['image'])) {
49+
$LogData = [
50+
'success' => false,
51+
'error' => 'Image not defined',
52+
'php' => basename($_SERVER['PHP_SELF']),
53+
];
54+
$LogString = json_encode($LogData);
55+
if ($config['dev']['enabled']) {
56+
logError($LogData);
57+
}
58+
die($LogString);
59+
}
60+
2761
$postImage = basename($_POST['image']);
2862
if (!isImageInDB($postImage)) {
2963
$LogData = [
@@ -96,27 +130,6 @@
96130
die($LogString);
97131
}
98132

99-
if (isset($_POST['send-link']) && $_POST['send-link'] === 'yes') {
100-
if (!file_exists(MAIL_FILE)) {
101-
$addresses = [];
102-
} else {
103-
$addresses = json_decode(file_get_contents(MAIL_FILE));
104-
}
105-
106-
if (!in_array($_POST['sendTo'], $addresses)) {
107-
$addresses[] = $_POST['sendTo'];
108-
}
109-
110-
file_put_contents(MAIL_FILE, json_encode($addresses));
111-
112-
die(
113-
json_encode([
114-
'success' => true,
115-
'saved' => true,
116-
])
117-
);
118-
}
119-
120133
if ($mail->send()) {
121134
die(
122135
json_encode([

0 commit comments

Comments
 (0)