@@ -2,14 +2,11 @@

 /*

 This file belongs to the Webinterface of schokokeks.org Hosting

-Written 2008-2018 by schokokeks.org Hosting, namely

+Written by schokokeks.org Hosting, namely

   Bernd Wurst <bernd@schokokeks.org>

   Hanno Böck <hanno@schokokeks.org>

-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.

-

-You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see

-http://creativecommons.org/publicdomain/zero/1.0/

+This code is published under a 0BSD license.

 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.

 */

@@ -32,7 +32,7 @@ if (! $oldaddr) {

     $no = ' checked="checked" ';

 }

-$form = '<p><input type="radio" id="newsletter_yes" name="newsletter" value="yes" '.$yes.' /> <label for="newsletter_yes">Newsletter soll gesendet werden an:</label> <input type="text" name="recipient" id="recipient" value="'.filter_input_general($oldaddr).'" maxlength="255" /></p>

+$form = '<p><input type="radio" id="newsletter_yes" name="newsletter" value="yes" '.$yes.' /> <label for="newsletter_yes">Newsletter soll gesendet werden an:</label> <input type="text" name="recipient" id="recipient" value="'.filter_output_html($oldaddr).'" maxlength="255" /></p>

 <p><input type="radio" id="newsletter_no" name="newsletter" value="no" '.$no.' /> <label for="newsletter_no">Ich möchte gar keinen Newsletter erhalten.</label></p>

 <p><input type="submit" value="Speichern" /></p>';

@@ -47,6 +47,6 @@ output("<h3>Vergangene Newsletter</h3>

 output("<ul>");

 $news = get_latest_news();

 foreach ($news as $item) {

-    output("<li>".internal_link("read", $item['date'].': '.$item['subject'], "id=".$item['id'])."</li>");

+    output("<li>".internal_link("read", $item['date'].': '.filter_output_html($item['subject']), "id=".$item['id'])."</li>");

 }

 output("</ul>");

@@ -8,7 +8,7 @@ Written 2008-2018 by schokokeks.org Hosting, namely

 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.

-You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see 

+You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see

 http://creativecommons.org/publicdomain/zero/1.0/

 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.

@@ -28,8 +28,8 @@ $oldaddr = get_newsletter_address();

 $yes = ' checked="checked" ';

 $no = '';

 if (! $oldaddr) {

-  $yes = '';

-  $no = ' checked="checked" ';

+    $yes = '';

+    $no = ' checked="checked" ';

 }

 $form = '<p><input type="radio" id="newsletter_yes" name="newsletter" value="yes" '.$yes.' /> <label for="newsletter_yes">Newsletter soll gesendet werden an:</label> <input type="text" name="recipient" id="recipient" value="'.filter_input_general($oldaddr).'" maxlength="255" /></p>

@@ -47,9 +47,6 @@ output("<h3>Vergangene Newsletter</h3>

 output("<ul>");

 $news = get_latest_news();

 foreach ($news as $item) {

-  output("<li>".internal_link("read", $item['date'].': '.$item['subject'], "id=".$item['id'])."</li>");

+    output("<li>".internal_link("read", $item['date'].': '.$item['subject'], "id=".$item['id'])."</li>");

 }

 output("</ul>");

-

-

-

@@ -2,7 +2,7 @@

 /*

 This file belongs to the Webinterface of schokokeks.org Hosting

-Written 2008-2014 by schokokeks.org Hosting, namely

+Written 2008-2018 by schokokeks.org Hosting, namely

   Bernd Wurst <bernd@schokokeks.org>

   Hanno Böck <hanno@schokokeks.org>

@@ -42,7 +42,7 @@ $form = '<p><input type="radio" id="newsletter_yes" name="newsletter" value="yes

 output(html_form("newsletter", "save.php", "", $form));

 output("<h3>Vergangene Newsletter</h3>

-<p>Hier sehen Sie die Newsletter des vergangenen Jahres zum Nachlesen.</p>");

+<p>Hier sehen Sie die Newsletter der vergangenen Jahre zum Nachlesen.</p>");

 output("<ul>");

 $news = get_latest_news();

@@ -2,7 +2,7 @@

 /*

 This file belongs to the Webinterface of schokokeks.org Hosting

-Written 2008-2013 by schokokeks.org Hosting, namely

+Written 2008-2014 by schokokeks.org Hosting, namely

   Bernd Wurst <bernd@schokokeks.org>

   Hanno Böck <hanno@schokokeks.org>

@@ -2,7 +2,7 @@

 /*

 This file belongs to the Webinterface of schokokeks.org Hosting

-Written 2008-2012 by schokokeks.org Hosting, namely

+Written 2008-2013 by schokokeks.org Hosting, namely

   Bernd Wurst <bernd@schokokeks.org>

   Hanno Böck <hanno@schokokeks.org>

@@ -1,4 +1,19 @@

 <?php

+/*

+This file belongs to the Webinterface of schokokeks.org Hosting

+

+Written 2008-2012 by schokokeks.org Hosting, namely

+  Bernd Wurst <bernd@schokokeks.org>

+  Hanno Böck <hanno@schokokeks.org>

+

+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.

+

+You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see 

+http://creativecommons.org/publicdomain/zero/1.0/

+

+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.

+*/

+

 require_once("includes/newsletter.php");

 require_once("inc/base.php");

 require_role(ROLE_CUSTOMER);

@@ -1,6 +1,7 @@

 <?php

 require_once("includes/newsletter.php");

 require_once("inc/base.php");

+require_role(ROLE_CUSTOMER);

 title("Newsletter");

@@ -5,7 +5,7 @@ require_once("inc/base.php");

 title("Newsletter");

 output("<p>Mit unserem Newsletter informieren wir Sie unregelmäßig (typischer Weise maximal einmal im Monat) über Änderungen und neue Möglichkeiten bei schokokeks.org. Es handelt sich in der Regel um techniche Änderungen, geplante Wartungsarbeiten oder neue Möglichkeiten, die Ihren Benutzeraccount bei schokokeks.org betreffen.</p>");

-output("<p>Mehrere Adressen trennen Sie bitte durch Kommata voneinander.</p>");

+//output("<p>Mehrere Adressen trennen Sie bitte durch Kommata voneinander.</p>");

 $oldaddr = get_newsletter_address();

new file mode 100644

@@ -0,0 +1,39 @@

+<?php

+require_once("includes/newsletter.php");

+require_once("inc/base.php");

+

+title("Newsletter");

+

+output("<p>Mit unserem Newsletter informieren wir Sie unregelmäßig (typischer Weise maximal einmal im Monat) über Änderungen und neue Möglichkeiten bei schokokeks.org. Es handelt sich in der Regel um techniche Änderungen, geplante Wartungsarbeiten oder neue Möglichkeiten, die Ihren Benutzeraccount bei schokokeks.org betreffen.</p>");

+output("<p>Mehrere Adressen trennen Sie bitte durch Kommata voneinander.</p>");

+

+$oldaddr = get_newsletter_address();

+

+$yes = ' checked="checked" ';

+$no = '';

+if (! $oldaddr) {

+  $yes = '';

+  $no = ' checked="checked" ';

+}

+

+$form = '<p><input type="radio" id="newsletter_yes" name="newsletter" value="yes" '.$yes.' /> <label for="newsletter_yes">Newsletter soll gesendet werden an:</label> <input type="text" name="recipient" id="recipient" value="'.filter_input_general($oldaddr).'" maxlength="255" /></p>

+<p><input type="radio" id="newsletter_no" name="newsletter" value="no" '.$no.' /> <label for="newsletter_no">Ich möchte gar keinen Newsletter erhalten.</label></p>

+

+<p><input type="submit" value="Speichern" /></p>';

+

+

+

+output(html_form("newsletter", "save.php", "", $form));

+

+output("<h3>Vergangene Newsletter</h3>

+<p>Hier sehen Sie die Newsletter des vergangenen Jahres zum Nachlesen.</p>");

+

+output("<ul>");

+$news = get_latest_news();

+foreach ($news as $item) {

+  output("<li>".internal_link("read", $item['date'].': '.$item['subject'], "id=".$item['id'])."</li>");

+}

+output("</ul>");

+

+

+