FSFE/fsfe-website
25
31
Fork 91
Code Issues 65 Pull Requests 12 Wiki Activity

further modify sanity checks
All checks were successful
the build was successful
Details

Browse Source
This commit is contained in:
Max Mehl
2018-02-19 16:23:32 +01:00
parent a376f8c9cc
commit 1b3885afee
8 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cgi-bin/promotion.php
View File

@@ -20,7 +20,7 @@ function gen_alnum($digits){
function relay_donation($orderID) {
$name = $_POST['name'];
$email = $_POST['email'];
$email = $_POST['mail'];
$amount100 = $_POST['donate'] * 100;
$language = $_POST['language'];
$lang = substr($language, 0, 2);
@@ -110,12 +110,13 @@ $lang = $_POST['language'];
# Sanity checks (*very* sloppy input validation)
if (empty($_POST['lastname']) ||
empty($_POST['email']) ||
empty($_POST['mail']) ||
empty($_POST['street']) ||
empty($_POST['zip']) ||
empty($_POST['city']) ||
empty($_POST['country']) ||
empty($_POST['specifics']) ||
$_POST['quiz'] != 21 ||
!empty($_POST['address']) ) {
header("Location: http://fsfe.org/contribute/spreadtheword-ordererror.$lang.html");
@@ -126,7 +127,7 @@ $subject = "[promo order] {$_POST['firstname']} {$_POST['lastname']}";
$msg = "Hey, someone ordered promotional material:\n".
"First Name: {$_POST['firstname']}\n".
"Last Name: {$_POST['lastname']}\n".
"EMail: {$_POST['email']}\n".
"EMail: {$_POST['mail']}\n".
"\n".
"Address:\n".
"{$_POST['firstname']} " . "{$_POST['lastname']}\n";
@@ -156,7 +157,7 @@ if (isset($_POST['donate']) && ($_POST['donate'] > 0)) {
"confirmation from Concardis for the order: {$_POST['donationID']}";
}
$test = send_mail ( "contact@fsfe.org", $_POST['firstname'] . " " . $_POST['lastname'] . " <" . $_POST['email'] . ">", $subject, $msg );
$test = send_mail ( "contact@fsfe.org", $_POST['firstname'] . " " . $_POST['lastname'] . " <" . $_POST['mail'] . ">", $subject, $msg );
if (isset($_POST['donate']) && ($_POST['donate'] > 0)) {
relay_donation($_POST['donationID']);

4
contribute/spreadtheword.de.xhtml
View File

@@ -121,7 +121,7 @@
<input type="text" name="firstname" placeholder="Vorname" size="20" />
<input type="text" name="lastname" placeholder="Nachname" size="20" required="required" /><br/>
<span class="formlabel">Email:</span>
<input type="email" name="email" placeholder="Email" size="40" required="required" /><br/>
<input type="email" name="mail" placeholder="Email" size="40" required="required" /><br/>
<span class="formlabel">Firma/Organisation (falls zutreffend):</span>
<input type="text" name="org" placeholder="Organisation" size="40" /><br/>
@@ -147,6 +147,8 @@ Kein spezieller Wunsch, schickt mir einfach das Standardpaket. Das bedeutet, das
<span class="formlabel">Kommentar:</span>
<textarea name="comment" rows="4" cols="40"></textarea><br/>
<input type="text" name="address" placeholder="Which address shall be used?" size="20" class="special" />
<span class="formlabel">What is 17 + 4?</span>
<input type="text" name="quiz" size="10" required="required" />
<span class="formlabel">Unterstütze unsere Arbeit mit einer Spende von 10€ oder mehr: </span>
<input type="number" name="donate" value="0" min="0" step="5"/>€
<!-- Translators: please translate the label of this button (the value field) -->

4
contribute/spreadtheword.en.xhtml
View File

@@ -103,7 +103,7 @@
<input type="text" name="firstname" placeholder="First Name" size="20" />
<input type="text" name="lastname" placeholder="Last Name" size="20" required="required" /><br/>
<span class="formlabel">Email:</span>
<input type="email" name="email" placeholder="Email" size="40" required="required" /><br/>
<input type="email" name="mail" placeholder="Email" size="40" required="required" /><br/>
<span class="formlabel">Company/Organisation (if any):</span>
<input type="text" name="org" placeholder="Organisation" size="40" /><br/>
@@ -129,6 +129,8 @@ No focus; just send me the default package. That means we will try to ensure tha
<span class="formlabel">Any comment:</span>
<textarea name="comment" rows="4" cols="40"></textarea><br/>
<input type="text" name="address" placeholder="Which address shall be used?" size="20" class="special" />
<span class="formlabel">What is 17 + 4?</span>
<input type="text" name="quiz" size="10" required="required" />
<span class="formlabel">Support our work with a donation of 10€ or more: </span>
<input type="number" name="donate" value="0" min="0" step="5"/>€
<!-- Translators: please translate the label of this button (the value field) -->

4
contribute/spreadtheword.fr.xhtml
View File

@@ -104,7 +104,7 @@
<input type="text" name="firstname" placeholder="Prénom" size="20" />
<input type="text" name="lastname" placeholder="Nom" size="20" required="required" /><br/>
<span class="formlabel">E-mail&#160;:</span>
<input type="email" name="email" placeholder="Courriel" size="40" required="required" /><br/>
<input type="email" name="mail" placeholder="Courriel" size="40" required="required" /><br/>
<span class="formlabel">Entreprise/Organisation (si pertinent):</span>
@@ -131,6 +131,8 @@
<span class="formlabel">Commentaire(s)&#160;:</span>
<textarea name="comment" rows="4" cols="40"></textarea><br/>
<input type="text" name="address" placeholder="Which address shall be used?" size="20" class="special" />
<span class="formlabel">What is 17 + 4?</span>
<input type="text" name="quiz" size="10" required="required" />
<span class="formlabel">Soutenez nos efforts avec un don de 10€ ou plus&#160;: </span>
<input type="number" name="donate" value="0" min="0" step="5"/>€
<!-- Translators: please translate the label of this button (the value field) -->

4
contribute/spreadtheword.it.xhtml
View File

@@ -102,7 +102,7 @@
<input type="text" name="firstname" placeholder="Nome" size="20" />
<input type="text" name="lastname" placeholder="Cognome" size="20" required="required" /><br/>
<span class="formlabel">Email:</span>
<input type="email" name="email" placeholder="Email" size="40" required="required" /><br/>
<input type="email" name="mail" placeholder="Email" size="40" required="required" /><br/>
<span class="formlabel">Azienda/Organizzazione (opzionale):</span>
<input type="text" name="org" placeholder="Organizzazione" size="40" /><br/>
@@ -128,6 +128,8 @@ Nessuna personalizzazione, mandatemi il pacco standard. Questo significa che ti
<span class="formlabel">Commenti:</span>
<textarea name="comment" rows="4" cols="40"></textarea><br/>
<input type="text" name="address" placeholder="Which address shall be used?" size="20" class="special" />
<span class="formlabel">What is 17 + 4?</span>
<input type="text" name="quiz" size="10" required="required" />
<span class="formlabel">Sostieni il nostro lavoro con una donazione di 10€ o più: </span>
<input type="number" name="donate" value="0" min="0" step="5"/>€
<!-- Translators: please translate the label of this button (the value field) -->

4
contribute/spreadtheword.nl.xhtml
View File

@@ -100,7 +100,7 @@
<input type="text" name="firstname" placeholder="Voornaam" size="20" />
<input type="text" name="lastname" placeholder="Achternaam" size="20" required="required" /><br/>
<span class="formlabel">E-mail:</span>
<input type="email" name="email" placeholder="E-mail" size="40" required="required" /><br/>
<input type="email" name="mail" placeholder="E-mail" size="40" required="required" /><br/>
<span class="formlabel">Bedrijf/organisatie (mits Van toepassing):</span>
<input type="text" name="org" placeholder="Organisatie" size="40" /><br/>
@@ -125,6 +125,8 @@
<span class="formlabel">Uw commentaar:</span>
<textarea name="comment" rows="4" cols="40"></textarea><br/>
<input type="text" name="address" placeholder="Which address shall be used?" size="20" class="special" />
<span class="formlabel">What is 17 + 4?</span>
<input type="text" name="quiz" size="10" required="required" />
<span class="formlabel">Steun ons werk met een donatie van €10,- of meer: </span>
<input type="number" name="donate" value="0" min="0" step="5"/>€
<!-- Translators: please translate the label of this button (the value field) -->

4
contribute/spreadtheword.pt.xhtml
View File

@@ -68,7 +68,7 @@
<input type="text" name="firstname" placeholder="Primeiro Nome" size="20" />
<input type="text" name="lastname" placeholder="Último Nome" size="20" required="required" /><br/>
<span class="formlabel">Email:</span>
<input type="email" name="email" placeholder="Email" size="40" required="required" /><br/>
<input type="email" name="mail" placeholder="Email" size="40" required="required" /><br/>
<span class="formlabel">Empresa/Organização (se for o caso):</span>
<input type="text" name="org" placeholder="Organização" size="40" /><br/>
@@ -92,6 +92,8 @@ Pretendo o pacote padrão. Nesta opção enviar-lhe-emos um pouco de tudo o que
<span class="formlabel">Comentário:</span>
<textarea name="comment" rows="4" cols="40"></textarea><br/>
<input type="text" name="address" placeholder="Which address shall be used?" size="20" class="special" />
<span class="formlabel">What is 17 + 4?</span>
<input type="text" name="quiz" size="10" required="required" />
<span class="formlabel">Apoie o nosso trabalho com um donativo de 10€ (ou mais): </span>
<input type="number" name="donate" value="0" min="0" step="5"/>€
<!-- Translators: please translate the label of this button (the value field) -->

4
contribute/spreadtheword.sq.xhtml
View File

@@ -68,7 +68,7 @@ Do të merrni pjesë në një takim mbi Software-in e Lirë apo madje po organiz
<input type="text" name="firstname" placeholder="First Name" size="20" />
<input type="text" name="lastname" placeholder="Last Name" size="20" required="required" /><br/>
<span class="formlabel">Email:</span>
<input type="email" name="email" placeholder="Email" size="40" required="required" /><br/>
<input type="email" name="mail" placeholder="Email" size="40" required="required" /><br/>
<span class="formlabel">Kompani/Organizëm (në pastë):</span>
<input type="text" name="org" placeholder="Organisation" size="40" /><br/>
@@ -92,6 +92,8 @@ Pa temë specifike, thjesht dërgomëni paketën parazgjedhje. Kjo do të thotë
<span class="formlabel">Çfarëdo komenti:</span>
<textarea name="comment" rows="4" cols="40"></textarea><br/>
<input type="text" name="address" placeholder="Which address shall be used?" size="20" class="special" />
<span class="formlabel">What is 17 + 4?</span>
<input type="text" name="quiz" size="10" required="required" />
<span class="formlabel">Përkrahni punën tonë me një dhurim 10€ ose më tepër: </span>
<input type="number" name="donate" value="0" min="0" step="5"/>€
<!-- Translators: please translate the label of this button (the value field) -->