iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#24 made t-shirt-size optional for angels

This commit is contained in:
Philip Häusler 2011-07-12 16:17:18 +02:00
parent 11f5998917
commit 02e187a4ec
3 changed files with 87 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
includes/pages/guest_login.php
View File

@ -3,7 +3,7 @@
// Engel registrieren // Engel registrieren
function guest_register() { function guest_register() {
global $SubscribeMailinglist; global $SubscribeMailinglist, $enable_tshirt_size;
$html = ""; $html = "";
$success = "none"; $success = "none";
@ -18,24 +18,17 @@ function guest_register() {
$Ergans = sql_select("SELECT UID FROM `User` WHERE `Nick`='" . sql_escape($_POST["Nick"]) . "'"); $Ergans = sql_select("SELECT UID FROM `User` WHERE `Nick`='" . sql_escape($_POST["Nick"]) . "'");
if (strlen($_POST["Nick"]) < 2) if (strlen($_POST["Nick"]) < 2)
$error = Get_Text("makeuser_error_nick1") $error = Get_Text("makeuser_error_nick1") . $_POST["Nick"] . Get_Text("makeuser_error_nick2");
. $_POST["Nick"] . Get_Text("makeuser_error_nick2");
elseif (count($Ergans) > 0) elseif (count($Ergans) > 0) $error = Get_Text("makeuser_error_nick1") . $_POST["Nick"] . Get_Text("makeuser_error_nick3");
$error = Get_Text("makeuser_error_nick1")
. $_POST["Nick"] . Get_Text("makeuser_error_nick3");
elseif (strlen($_POST["email"]) <= 6 && strstr($_POST["email"], "@") == FALSE && strstr($_POST["email"], ".") == false) elseif (strlen($_POST["email"]) <= 6 && strstr($_POST["email"], "@") == FALSE && strstr($_POST["email"], ".") == false) $error = Get_Text("makeuser_error_mail");
$error = Get_Text("makeuser_error_mail");
elseif (!is_numeric($_POST["Alter"])) elseif (!is_numeric($_POST["Alter"])) $error = Get_Text("makeuser_error_Alter");
$error = Get_Text("makeuser_error_Alter");
elseif ($_POST["Passwort"] != $_POST["Passwort2"]) elseif ($_POST["Passwort"] != $_POST["Passwort2"]) $error = Get_Text("makeuser_error_password1");
$error = Get_Text("makeuser_error_password1");
elseif (strlen($_POST["Passwort"]) < 6) elseif (strlen($_POST["Passwort"]) < 6) $error = Get_Text("makeuser_error_password2");
$error = Get_Text("makeuser_error_password2");
else { else {
$_POST["Passwort"] = PassCrypt($_POST["Passwort"]); $_POST["Passwort"] = PassCrypt($_POST["Passwort"]);
@ -50,26 +43,7 @@ function guest_register() {
"`Size`, " . "`Passwort`, " . "`Size`, " . "`Passwort`, " .
"`Art` , " . "`kommentar`, " . "`Art` , " . "`kommentar`, " .
"`Hometown`," . "`CreateDate`, `Sprache` ) " . "`Hometown`," . "`CreateDate`, `Sprache` ) " .
"VALUES ( '" "VALUES ( '" . sql_escape($_POST["Nick"]) . "', " . "'" . sql_escape($_POST["Name"]) . "', " . "'" . sql_escape($_POST["Vorname"]) . "', " . "'" . sql_escape($_POST["Alter"]) . "', " . "'" . sql_escape($_POST["Telefon"]) . "', " . "'" . sql_escape($_POST["DECT"]) . "', " . "'" . sql_escape($_POST["Handy"]) . "', " . "'" . sql_escape($_POST["email"]) . "', " . "'" . sql_escape($_POST["ICQ"]) . "', " . "'" . sql_escape($_POST["jabber"]) . "', " . "'" . sql_escape($_POST["Size"]) . "', " . "'" . sql_escape($_POST["Passwort"]) . "', " . "'" . sql_escape($_POST["Art"]) . "', " . "'" . sql_escape($_POST["kommentar"]) . "', " . "'" . sql_escape($_POST["Hometown"]) . "'," . "NOW(), '" . sql_escape($_SESSION["Sprache"]) . "')");
. sql_escape($_POST["Nick"]) . "', " . "'"
. sql_escape($_POST["Name"]) . "', " . "'"
. sql_escape($_POST["Vorname"]) . "', " . "'"
. sql_escape($_POST["Alter"]) . "', " . "'"
. sql_escape($_POST["Telefon"]) . "', " . "'"
. sql_escape($_POST["DECT"]) . "', " . "'"
. sql_escape($_POST["Handy"]) . "', " . "'"
. sql_escape($_POST["email"]) . "', " . "'"
. sql_escape($_POST["ICQ"]) . "', " . "'"
. sql_escape($_POST["jabber"]) . "', " . "'"
. sql_escape($_POST["Size"]) . "', " . "'"
. sql_escape($_POST["Passwort"]) . "', " . "'"
. sql_escape($_POST["Art"]) . "', " . "'"
. sql_escape($_POST["kommentar"]) . "', " . "'"
. sql_escape($_POST["Hometown"]) . "',"
. "NOW(), '"
. sql_escape($_SESSION["Sprache"])
. "')"
);
if ($Erg != 1) { if ($Erg != 1) {
$html .= Get_Text("makeuser_error_write1") . "<br />\n"; $html .= Get_Text("makeuser_error_write1") . "<br />\n";
@ -137,58 +111,60 @@ function guest_register() {
$html .= "<tr><td>ICQ</td><td><input type=\"text\" size=\"40\" name=\"ICQ\" value=\"" . $_POST["ICQ"] . "\"></td></tr>\n"; $html .= "<tr><td>ICQ</td><td><input type=\"text\" size=\"40\" name=\"ICQ\" value=\"" . $_POST["ICQ"] . "\"></td></tr>\n";
$html .= "<tr><td>jabber</td><td><input type=\"text\" size=\"40\" name=\"jabber\" value=\"" . $_POST["jabber"] . "\"></td></tr>\n"; $html .= "<tr><td>jabber</td><td><input type=\"text\" size=\"40\" name=\"jabber\" value=\"" . $_POST["jabber"] . "\"></td></tr>\n";
$html .= "<tr><td>" . Get_Text("makeuser_T-Shirt") . " Gr&ouml;sse*</td><td align=\"left\">\n"; if ($enable_tshirt_size) {
$html .= "<select name=\"Size\">\n"; $html .= "<tr><td>" . Get_Text("makeuser_T-Shirt") . " Gr&ouml;sse*</td><td align=\"left\">\n";
$html .= "<option value=\"S\""; $html .= "<select name=\"Size\">\n";
if ($_POST["Size"] == "S") $html .= "<option value=\"S\"";
$html .= " selected"; if ($_POST["Size"] == "S")
$html .= ">S</option>\n"; $html .= " selected";
$html .= "<option value=\"M\""; $html .= ">S</option>\n";
if ($_POST["Size"] == "M") $html .= "<option value=\"M\"";
$html .= " selected"; if ($_POST["Size"] == "M")
$html .= ">M</option>\n"; $html .= " selected";
$html .= "<option value=\"L\""; $html .= ">M</option>\n";
if ($_POST["Size"] == "L") $html .= "<option value=\"L\"";
$html .= " selected"; if ($_POST["Size"] == "L")
$html .= ">L</option>\n"; $html .= " selected";
$html .= "<option value=\"XL\""; $html .= ">L</option>\n";
if ($_POST["Size"] == "XL") $html .= "<option value=\"XL\"";
$html .= " selected"; if ($_POST["Size"] == "XL")
$html .= ">XL</option>\n"; $html .= " selected";
$html .= "<option value=\"2XL\""; $html .= ">XL</option>\n";
if ($_POST["Size"] == "2XL") $html .= "<option value=\"2XL\"";
$html .= " selected"; if ($_POST["Size"] == "2XL")
$html .= ">2XL</option>\n"; $html .= " selected";
$html .= "<option value=\"3XL\""; $html .= ">2XL</option>\n";
if ($_POST["Size"] == "3XL") $html .= "<option value=\"3XL\"";
$html .= " selected"; if ($_POST["Size"] == "3XL")
$html .= ">3XL</option>\n"; $html .= " selected";
$html .= "<option value=\"4XL\""; $html .= ">3XL</option>\n";
if ($_POST["Size"] == "4XL") $html .= "<option value=\"4XL\"";
$html .= " selected"; if ($_POST["Size"] == "4XL")
$html .= ">4XL</option>\n"; $html .= " selected";
$html .= "<option value=\"5XL\""; $html .= ">4XL</option>\n";
if ($_POST["Size"] == "5XL") $html .= "<option value=\"5XL\"";
$html .= " selected"; if ($_POST["Size"] == "5XL")
$html .= ">5XL</option>\n"; $html .= " selected";
$html .= "<option value=\"S-G\""; $html .= ">5XL</option>\n";
if ($_POST["Size"] == "S-G") $html .= "<option value=\"S-G\"";
$html .= " selected"; if ($_POST["Size"] == "S-G")
$html .= ">S Girl</option>\n"; $html .= " selected";
$html .= "<option value=\"M-G\""; $html .= ">S Girl</option>\n";
if ($_POST["Size"] == "M-G") $html .= "<option value=\"M-G\"";
$html .= " selected"; if ($_POST["Size"] == "M-G")
$html .= ">M Girl</option>\n"; $html .= " selected";
$html .= "<option value=\"L-G\""; $html .= ">M Girl</option>\n";
if ($_POST["Size"] == "L-G") $html .= "<option value=\"L-G\"";
$html .= " selected"; if ($_POST["Size"] == "L-G")
$html .= ">L Girl</option>\n"; $html .= " selected";
$html .= "<option value=\"XL-G\""; $html .= ">L Girl</option>\n";
if ($_POST["Size"] == "XL-G") $html .= "<option value=\"XL-G\"";
$html .= " selected"; if ($_POST["Size"] == "XL-G")
$html .= ">XL Girl</option>\n"; $html .= " selected";
$html .= "</select>\n"; $html .= ">XL Girl</option>\n";
$html .= "</td></tr>\n"; $html .= "</select>\n";
$html .= "</td></tr>\n";
}
$html .= "<tr><td>" . Get_Text("makeuser_Engelart") . "</td><td align=\"left\">\n"; $html .= "<tr><td>" . Get_Text("makeuser_Engelart") . "</td><td align=\"left\">\n";
$html .= "<select name=\"Art\">\n"; $html .= "<select name=\"Art\">\n";

38
includes/pages/user_settings.php
View File

@ -1,25 +1,29 @@
<?php <?php
function user_settings() { function user_settings() {
global $enable_tshirt_size;
global $user; global $user;
if (!isset ($_REQUEST['action'])) { if (!isset ($_REQUEST['action'])) {
$tshirt_html = template_render('../templates/user_settings_tshirt.html', array ( if ($enable_tshirt_size)
'label_size' => Get_Text("makeuser_T-Shirt"), $tshirt_html = template_render('../templates/user_settings_tshirt.html', array (
'size_select' => ($user['Tshirt'] == 0) ? html_select_key('size', array ( 'label_size' => Get_Text("makeuser_T-Shirt"),
'S' => "S", 'size_select' => ($user['Tshirt'] == 0) ? html_select_key('size', array (
'M' => "M", 'S' => "S",
'L' => "L", 'M' => "M",
'XL' => "XL", 'L' => "L",
'2XL' => "2XL", 'XL' => "XL",
'3XL' => "3XL", '2XL' => "2XL",
'4XL' => "4XL", '3XL' => "3XL",
'5XL' => "5XL", '4XL' => "4XL",
'S-G' => "S Girl", '5XL' => "5XL",
'M-G' => "M Girl", 'S-G' => "S Girl",
'L-G' => "L Girl", 'M-G' => "M Girl",
'XL-G' => "XL Girl" 'L-G' => "L Girl",
), $user['Size']) : $user['Size'] 'XL-G' => "XL Girl"
)); ), $user['Size']) : $user['Size']
));
else
$tshirt_html = "";
return template_render('../templates/user_settings.html', array ( return template_render('../templates/user_settings.html', array (
'link' => page_link_to("user_settings"), 'link' => page_link_to("user_settings"),

5
install/default-conf/var_www_includes/config.php
View File

@ -23,6 +23,9 @@ $LETZTES_AUSTRAGEN=3;
$crypt_system="md5"; $crypt_system="md5";
//$crypt_system="crypt"; //$crypt_system="crypt";
// Wenn Engel beim Registrieren oder in ihrem Profil eine T-Shirt Größe angeben sollen, auf true setzen:
$enable_tshirt_size = false;
// timezonen offsett // timezonen offsett
$gmdateOffset=3600; $gmdateOffset=3600;
@ -46,8 +49,6 @@ date_default_timezone_set("Europe/Berlin");
$PentabarfXMLhost = "cccv.pentabarf.org"; $PentabarfXMLhost = "cccv.pentabarf.org";
$PentabarfXMLpath = "Xcal/conference/"; $PentabarfXMLpath = "Xcal/conference/";
$PentabarfXMLEventID = "31"; $PentabarfXMLEventID = "31";
$PentabarfGetWith = "fsockopen"; // "fsockopen"/"fopen"/"wget"/"lynx"
//Mailing List: is is not defined, the option is not shown //Mailing List: is is not defined, the option is not shown
//$SubscribeMailinglist = "*-subscribe@lists.*"; //$SubscribeMailinglist = "*-subscribe@lists.*";