... | ... |
@@ -2,14 +2,11 @@ |
2 | 2 |
/* |
3 | 3 |
This file belongs to the Webinterface of schokokeks.org Hosting |
4 | 4 |
|
5 |
-Written 2008-2018 by schokokeks.org Hosting, namely |
|
5 |
+Written by schokokeks.org Hosting, namely |
|
6 | 6 |
Bernd Wurst <bernd@schokokeks.org> |
7 | 7 |
Hanno Böck <hanno@schokokeks.org> |
8 | 8 |
|
9 |
-To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty. |
|
10 |
- |
|
11 |
-You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see |
|
12 |
-http://creativecommons.org/publicdomain/zero/1.0/ |
|
9 |
+This code is published under a 0BSD license. |
|
13 | 10 |
|
14 | 11 |
Nevertheless, in case you use a significant part of this code, we ask (but not require, see the license) that you keep the authors' names in place and return your changes to the public. We would be especially happy if you tell us what you're going to do with this code. |
15 | 12 |
*/ |
... | ... |
@@ -36,7 +36,7 @@ if ((isset($_REQUEST['newsletter']) && $_REQUEST['newsletter'] == 'no') || (isse |
36 | 36 |
} |
37 | 37 |
} else { |
38 | 38 |
check_form_token('newsletter'); |
39 |
- if (! check_emailaddr($_REQUEST['recipient']) || filter_input_general($_REQUEST['recipient']) != $_REQUEST['recipient']) { |
|
39 |
+ if (! check_emailaddr($_REQUEST['recipient'])) { |
|
40 | 40 |
system_failure("Keine gültige E-Mail-Adresse!"); |
41 | 41 |
} |
42 | 42 |
set_newsletter_address($_REQUEST['recipient']); |
... | ... |
@@ -8,7 +8,7 @@ Written 2008-2018 by schokokeks.org Hosting, namely |
8 | 8 |
|
9 | 9 |
To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty. |
10 | 10 |
|
11 |
-You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see |
|
11 |
+You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see |
|
12 | 12 |
http://creativecommons.org/publicdomain/zero/1.0/ |
13 | 13 |
|
14 | 14 |
Nevertheless, in case you use a significant part of this code, we ask (but not require, see the license) that you keep the authors' names in place and return your changes to the public. We would be especially happy if you tell us what you're going to do with this code. |
... | ... |
@@ -20,31 +20,27 @@ require_once("inc/base.php"); |
20 | 20 |
|
21 | 21 |
|
22 | 22 |
if ((isset($_REQUEST['newsletter']) && $_REQUEST['newsletter'] == 'no') || (isset($_REQUEST['recipient']) && $_REQUEST['recipient'] == "")) { |
23 |
- $sure = user_is_sure(); |
|
24 |
- if ($sure === NULL) |
|
25 |
- { |
|
26 |
- check_form_token('newsletter'); |
|
27 |
- are_you_sure("newsletter=no", "Wenn Sie keinen Newsletter abonnieren, erhalten Sie von uns keine Informationen zu laufenden Änderungen bei schokokeks.org. Beachten Sie bitte dennoch regelmäßig die Einträge auf dieser Website, unser Weblog und unsere Status-Seite. Möchten Sie den Newsletter wirklich abbestellen?"); |
|
28 |
- } |
|
29 |
- elseif ($sure === true) |
|
30 |
- { |
|
31 |
- set_newsletter_address(NULL); |
|
32 |
- if (! $debugmode) |
|
33 |
- header('Location: newsletter'); |
|
34 |
- } |
|
35 |
- elseif ($sure === false) |
|
36 |
- { |
|
37 |
- if (! $debugmode) |
|
38 |
- header('Location: newsletter'); |
|
39 |
- } |
|
23 |
+ $sure = user_is_sure(); |
|
24 |
+ if ($sure === null) { |
|
25 |
+ check_form_token('newsletter'); |
|
26 |
+ are_you_sure("newsletter=no", "Wenn Sie keinen Newsletter abonnieren, erhalten Sie von uns keine Informationen zu laufenden Änderungen bei schokokeks.org. Beachten Sie bitte dennoch regelmäßig die Einträge auf dieser Website, unser Weblog und unsere Status-Seite. Möchten Sie den Newsletter wirklich abbestellen?"); |
|
27 |
+ } elseif ($sure === true) { |
|
28 |
+ set_newsletter_address(null); |
|
29 |
+ if (! $debugmode) { |
|
30 |
+ header('Location: newsletter'); |
|
31 |
+ } |
|
32 |
+ } elseif ($sure === false) { |
|
33 |
+ if (! $debugmode) { |
|
34 |
+ header('Location: newsletter'); |
|
35 |
+ } |
|
36 |
+ } |
|
40 | 37 |
} else { |
41 |
- check_form_token('newsletter'); |
|
42 |
- if (! check_emailaddr($_REQUEST['recipient']) || filter_input_general($_REQUEST['recipient']) != $_REQUEST['recipient']) { |
|
43 |
- system_failure("Keine gültige E-Mail-Adresse!"); |
|
44 |
- } |
|
45 |
- set_newsletter_address($_REQUEST['recipient']); |
|
46 |
- if (! $debugmode) |
|
47 |
- header('Location: newsletter'); |
|
38 |
+ check_form_token('newsletter'); |
|
39 |
+ if (! check_emailaddr($_REQUEST['recipient']) || filter_input_general($_REQUEST['recipient']) != $_REQUEST['recipient']) { |
|
40 |
+ system_failure("Keine gültige E-Mail-Adresse!"); |
|
41 |
+ } |
|
42 |
+ set_newsletter_address($_REQUEST['recipient']); |
|
43 |
+ if (! $debugmode) { |
|
44 |
+ header('Location: newsletter'); |
|
45 |
+ } |
|
48 | 46 |
} |
49 |
- |
|
50 |
- |
... | ... |
@@ -19,7 +19,7 @@ require_once("inc/security.php"); |
19 | 19 |
require_once("inc/base.php"); |
20 | 20 |
|
21 | 21 |
|
22 |
-if ($_POST['newsletter'] == 'no' || $_POST['recipient'] == "") { |
|
22 |
+if ((isset($_REQUEST['newsletter']) && $_REQUEST['newsletter'] == 'no') || (isset($_REQUEST['recipient']) && $_REQUEST['recipient'] == "")) { |
|
23 | 23 |
$sure = user_is_sure(); |
24 | 24 |
if ($sure === NULL) |
25 | 25 |
{ |
... | ... |
@@ -39,10 +39,10 @@ if ($_POST['newsletter'] == 'no' || $_POST['recipient'] == "") { |
39 | 39 |
} |
40 | 40 |
} else { |
41 | 41 |
check_form_token('newsletter'); |
42 |
- if (! check_emailaddr($_POST['recipient']) || filter_input_general($_POST['recipient']) != $_POST['recipient']) { |
|
42 |
+ if (! check_emailaddr($_REQUEST['recipient']) || filter_input_general($_REQUEST['recipient']) != $_REQUEST['recipient']) { |
|
43 | 43 |
system_failure("Keine gültige E-Mail-Adresse!"); |
44 | 44 |
} |
45 |
- set_newsletter_address($_POST['recipient']); |
|
45 |
+ set_newsletter_address($_REQUEST['recipient']); |
|
46 | 46 |
if (! $debugmode) |
47 | 47 |
header('Location: newsletter'); |
48 | 48 |
} |
... | ... |
@@ -1,4 +1,19 @@ |
1 | 1 |
<?php |
2 |
+/* |
|
3 |
+This file belongs to the Webinterface of schokokeks.org Hosting |
|
4 |
+ |
|
5 |
+Written 2008-2012 by schokokeks.org Hosting, namely |
|
6 |
+ Bernd Wurst <bernd@schokokeks.org> |
|
7 |
+ Hanno Böck <hanno@schokokeks.org> |
|
8 |
+ |
|
9 |
+To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty. |
|
10 |
+ |
|
11 |
+You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see |
|
12 |
+http://creativecommons.org/publicdomain/zero/1.0/ |
|
13 |
+ |
|
14 |
+Nevertheless, in case you use a significant part of this code, we ask (but not require, see the license) that you keep the authors' names in place and return your changes to the public. We would be especially happy if you tell us what you're going to do with this code. |
|
15 |
+*/ |
|
16 |
+ |
|
2 | 17 |
require_once("includes/newsletter.php"); |
3 | 18 |
require_once("inc/security.php"); |
4 | 19 |
require_once("inc/base.php"); |
git-svn-id: https://svn.schokokeks.org/repos/tools/webinterface/trunk@1964 87cf0b9e-d624-0410-a070-f6ee81989793
1 | 1 |
new file mode 100644 |
... | ... |
@@ -0,0 +1,35 @@ |
1 |
+<?php |
|
2 |
+require_once("includes/newsletter.php"); |
|
3 |
+require_once("inc/security.php"); |
|
4 |
+require_once("inc/base.php"); |
|
5 |
+ |
|
6 |
+ |
|
7 |
+if ($_POST['newsletter'] == 'no' || $_POST['recipient'] == "") { |
|
8 |
+ $sure = user_is_sure(); |
|
9 |
+ if ($sure === NULL) |
|
10 |
+ { |
|
11 |
+ check_form_token('newsletter'); |
|
12 |
+ are_you_sure("newsletter=no", "Wenn Sie keinen Newsletter abonnieren, erhalten Sie von uns keine Informationen zu laufenden Änderungen bei schokokeks.org. Beachten Sie bitte dennoch regelmäßig die Einträge auf dieser Website, unser Weblog und unsere Status-Seite. Möchten Sie den Newsletter wirklich abbestellen?"); |
|
13 |
+ } |
|
14 |
+ elseif ($sure === true) |
|
15 |
+ { |
|
16 |
+ set_newsletter_address(NULL); |
|
17 |
+ if (! $debugmode) |
|
18 |
+ header('Location: newsletter'); |
|
19 |
+ } |
|
20 |
+ elseif ($sure === false) |
|
21 |
+ { |
|
22 |
+ if (! $debugmode) |
|
23 |
+ header('Location: newsletter'); |
|
24 |
+ } |
|
25 |
+} else { |
|
26 |
+ check_form_token('newsletter'); |
|
27 |
+ if (! check_emailaddr($_POST['recipient']) || filter_input_general($_POST['recipient']) != $_POST['recipient']) { |
|
28 |
+ system_failure("Keine gültige E-Mail-Adresse!"); |
|
29 |
+ } |
|
30 |
+ set_newsletter_address($_POST['recipient']); |
|
31 |
+ if (! $debugmode) |
|
32 |
+ header('Location: newsletter'); |
|
33 |
+} |
|
34 |
+ |
|
35 |
+ |