kontakt
/
engelsystem
3
0
Fork 0
Code Issues 12 Pull Requests Projects Releases Wiki Activity

fixes #81: shirt size is now mandatory

Browse Source 
fixes #50: login error to the top
main
Philip Häusler 12 years ago
parent ddbc5a9db2
commit 781a996b3b
2 changed files with 203 additions and 200 deletions
Show Stats Download Patch File Download Diff File

402
includes/pages/guest_login.php
Unescape Escape View File

@ -3,211 +3,213 @@
// Engel registrieren // Engel registrieren
function guest_register() { function guest_register() {
global $tshirt_sizes, $enable_tshirt_size; global $tshirt_sizes, $enable_tshirt_size;
$msg = ""; $msg = "";
$nick = ""; $nick = "";
$lastname = ""; $lastname = "";
$prename = ""; $prename = "";
$age = 23; $age = 23;
$tel = ""; $tel = "";
$dect = ""; $dect = "";
$mobile = ""; $mobile = "";
$mail = ""; $mail = "";
$icq = ""; $icq = "";
$jabber = ""; $jabber = "";
$hometown = ""; $hometown = "";
$comment = ""; $comment = "";
$tshirt_size = 'S'; $tshirt_size = '';
$password_hash = ""; $password_hash = "";
$selected_angel_types = array (); $selected_angel_types = array ();
$angel_types_source = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`"); $angel_types_source = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`");
$angel_types = array (); $angel_types = array ();
foreach ($angel_types_source as $angel_type) foreach ($angel_types_source as $angel_type)
$angel_types[$angel_type['id']] = $angel_type['name'] . ($angel_type['restricted'] ? " (restricted)" : ""); $angel_types[$angel_type['id']] = $angel_type['name'] . ($angel_type['restricted'] ? " (restricted)" : "");
if (isset ($_REQUEST['submit'])) { if (isset ($_REQUEST['submit'])) {
$ok = true; $ok = true;
if (isset ($_REQUEST['nick']) && strlen(strip_request_item('nick')) > 1) { if (isset ($_REQUEST['nick']) && strlen(strip_request_item('nick')) > 1) {
$nick = strip_request_item('nick'); $nick = strip_request_item('nick');
if (sql_num_query("SELECT * FROM `User` WHERE `Nick`='" . sql_escape($nick) . "' LIMIT 1") > 0) { if (sql_num_query("SELECT * FROM `User` WHERE `Nick`='" . sql_escape($nick) . "' LIMIT 1") > 0) {
$ok = false; $ok = false;
$msg .= error(sprintf(Get_Text("makeuser_error_nick1") . "%s" . Get_Text("makeuser_error_nick3"), $nick), true); $msg .= error(sprintf(Get_Text("makeuser_error_nick1") . "%s" . Get_Text("makeuser_error_nick3"), $nick), true);
} }
} else { } else {
$ok = false; $ok = false;
$msg .= error(sprintf(Get_Text("makeuser_error_nick1") . "%s" . Get_Text("makeuser_error_nick2"), strip_request_item('nick')), true); $msg .= error(sprintf(Get_Text("makeuser_error_nick1") . "%s" . Get_Text("makeuser_error_nick2"), strip_request_item('nick')), true);
} }
if (isset ($_REQUEST['mail']) && strlen(strip_request_item('mail')) > 0) { if (isset ($_REQUEST['mail']) && strlen(strip_request_item('mail')) > 0) {
$mail = strip_request_item('mail'); $mail = strip_request_item('mail');
if (!check_email($mail)) { if (!check_email($mail)) {
$ok = false; $ok = false;
$msg .= error(Get_Text("makeuser_error_mail"), true); $msg .= error(Get_Text("makeuser_error_mail"), true);
} }
} else { } else {
$ok = false; $ok = false;
$msg .= error("Please enter your e-mail.", true); $msg .= error("Please enter your e-mail.", true);
} }
if (isset ($_REQUEST['icq'])) if (isset ($_REQUEST['icq']))
$icq = strip_request_item('icq'); $icq = strip_request_item('icq');
if (isset ($_REQUEST['jabber']) && strlen(strip_request_item('jabber')) > 0) { if (isset ($_REQUEST['jabber']) && strlen(strip_request_item('jabber')) > 0) {
$jabber = strip_request_item('jabber'); $jabber = strip_request_item('jabber');
if (!check_email($jabber)) { if (!check_email($jabber)) {
$ok = false; $ok = false;
$msg .= error("Please check your jabber.", true); $msg .= error("Please check your jabber.", true);
} }
} }
if ($enable_tshirt_size) { if ($enable_tshirt_size) {
if (isset ($_REQUEST['tshirt_size']) && isset ($tshirt_sizes[$_REQUEST['tshirt_size']])) if (isset ($_REQUEST['tshirt_size']) && isset ($tshirt_sizes[$_REQUEST['tshirt_size']]) && $_REQUEST['tshirt_size'] != '')
$tshirt_size = $_REQUEST['tshirt_size']; $tshirt_size = $_REQUEST['tshirt_size'];
else else {
$ok = false; $ok = false;
} $msg .= error("Please select your shirt size.", true);
}
if (isset ($_REQUEST['password']) && strlen($_REQUEST['password']) >= 6) { }
if ($_REQUEST['password'] == $_REQUEST['password2']) {
$password_hash = PassCrypt($_REQUEST['password']); if (isset ($_REQUEST['password']) && strlen($_REQUEST['password']) >= 6) {
} else { if ($_REQUEST['password'] == $_REQUEST['password2']) {
$ok = false; $password_hash = PassCrypt($_REQUEST['password']);
$msg .= error(Get_Text("makeuser_error_password1"), true); } else {
} $ok = false;
} else { $msg .= error(Get_Text("makeuser_error_password1"), true);
$ok = false; }
$msg .= error(Get_Text("makeuser_error_password2"), true); } else {
} $ok = false;
$msg .= error(Get_Text("makeuser_error_password2"), true);
$selected_angel_types = array (); }
foreach ($angel_types as $angel_type_id => $angel_type_name)
if (isset ($_REQUEST['angel_types_' . $angel_type_id])) $selected_angel_types = array ();
$selected_angel_types[] = $angel_type_id; foreach ($angel_types as $angel_type_id => $angel_type_name)
if (isset ($_REQUEST['angel_types_' . $angel_type_id]))
// Trivia $selected_angel_types[] = $angel_type_id;
if (isset ($_REQUEST['lastname']))
$lastname = strip_request_item('lastname'); // Trivia
if (isset ($_REQUEST['prename'])) if (isset ($_REQUEST['lastname']))
$prename = strip_request_item('prename'); $lastname = strip_request_item('lastname');
if (isset ($_REQUEST['age']) && preg_match("/^[0-9]{0,4}$/", $_REQUEST['age'])) if (isset ($_REQUEST['prename']))
$age = strip_request_item('age'); $prename = strip_request_item('prename');
if (isset ($_REQUEST['tel'])) if (isset ($_REQUEST['age']) && preg_match("/^[0-9]{0,4}$/", $_REQUEST['age']))
$tel = strip_request_item('tel'); $age = strip_request_item('age');
if (isset ($_REQUEST['dect'])) if (isset ($_REQUEST['tel']))
$dect = strip_request_item('dect'); $tel = strip_request_item('tel');
if (isset ($_REQUEST['mobile'])) if (isset ($_REQUEST['dect']))
$mobile = strip_request_item('mobile'); $dect = strip_request_item('dect');
if (isset ($_REQUEST['hometown'])) if (isset ($_REQUEST['mobile']))
$hometown = strip_request_item('hometown'); $mobile = strip_request_item('mobile');
if (isset ($_REQUEST['comment'])) if (isset ($_REQUEST['hometown']))
$comment = strip_request_item_nl('comment'); $hometown = strip_request_item('hometown');
if (isset ($_REQUEST['comment']))
if ($ok) { $comment = strip_request_item_nl('comment');
sql_query("INSERT INTO `User` SET `Nick`='" . sql_escape($nick) . "', `Vorname`='" . sql_escape($prename) . "', `Name`='" . sql_escape($lastname) .
"', `Alter`='" . sql_escape($age) . "', `Telefon`='" . sql_escape($tel) . "', `DECT`='" . sql_escape($dect) . "', `Handy`='" . sql_escape($mobile) . if ($ok) {
"', `email`='" . sql_escape($mail) . "', `ICQ`='" . sql_escape($icq) . "', `jabber`='" . sql_escape($jabber) . "', `Size`='" . sql_escape($tshirt_size) . sql_query("INSERT INTO `User` SET `Nick`='" . sql_escape($nick) . "', `Vorname`='" . sql_escape($prename) . "', `Name`='" . sql_escape($lastname) .
"', `Passwort`='" . sql_escape($password_hash) . "', `kommentar`='" . sql_escape($comment) . "', `Hometown`='" . sql_escape($hometown) . "', `CreateDate`=NOW(), `Sprache`='" . sql_escape($_SESSION["Sprache"]) . "'"); "', `Alter`='" . sql_escape($age) . "', `Telefon`='" . sql_escape($tel) . "', `DECT`='" . sql_escape($dect) . "', `Handy`='" . sql_escape($mobile) .
"', `email`='" . sql_escape($mail) . "', `ICQ`='" . sql_escape($icq) . "', `jabber`='" . sql_escape($jabber) . "', `Size`='" . sql_escape($tshirt_size) .
// Assign user-group "', `Passwort`='" . sql_escape($password_hash) . "', `kommentar`='" . sql_escape($comment) . "', `Hometown`='" . sql_escape($hometown) . "', `CreateDate`=NOW(), `Sprache`='" . sql_escape($_SESSION["Sprache"]) . "'");
$user_id = sql_id();
sql_query("INSERT INTO `UserGroups` SET `uid`=" . sql_escape($user_id) . ", `group_id`=-2"); // Assign user-group
$user_id = sql_id();
// Assign angel-types sql_query("INSERT INTO `UserGroups` SET `uid`=" . sql_escape($user_id) . ", `group_id`=-2");
foreach ($selected_angel_types as $selected_angel_type_id)
sql_query("INSERT INTO `UserAngelTypes` SET `user_id`=" . sql_escape($user_id) . ", `angeltype_id`=" . sql_escape($selected_angel_type_id)); // Assign angel-types
foreach ($selected_angel_types as $selected_angel_type_id)
success(Get_Text("makeuser_writeOK4")); sql_query("INSERT INTO `UserAngelTypes` SET `user_id`=" . sql_escape($user_id) . ", `angeltype_id`=" . sql_escape($selected_angel_type_id));
//if (!isset ($_SESSION['uid']))
redirect(page_link_to('login')); success(Get_Text("makeuser_writeOK4"));
} //if (!isset ($_SESSION['uid']))
} redirect(page_link_to('login'));
}
return page(array ( }
Get_Text("makeuser_text1"),
$msg, return page(array (
msg(), Get_Text("makeuser_text1"),
form(array ( $msg,
form_text('nick', Get_Text("makeuser_Nickname") . "*", $nick), msg(),
form_text('lastname', Get_Text("makeuser_Nachname"), $lastname), form(array (
form_text('prename', Get_Text("makeuser_Vorname"), $prename), form_text('nick', Get_Text("makeuser_Nickname") . "*", $nick),
form_text('age', Get_Text("makeuser_Alter"), $age), form_text('lastname', Get_Text("makeuser_Nachname"), $lastname),
form_text('tel', Get_Text("makeuser_Telefon"), $tel), form_text('prename', Get_Text("makeuser_Vorname"), $prename),
form_text('dect', Get_Text("makeuser_DECT"), $tel), form_text('age', Get_Text("makeuser_Alter"), $age),
form_text('mobile', Get_Text("makeuser_Handy"), $mobile), form_text('tel', Get_Text("makeuser_Telefon"), $tel),
form_text('mail', Get_Text("makeuser_E-Mail") . "*", $mail), form_text('dect', Get_Text("makeuser_DECT"), $tel),
form_text('icq', "ICQ", $icq), form_text('mobile', Get_Text("makeuser_Handy"), $mobile),
form_text('jabber', "Jabber", $jabber), form_text('mail', Get_Text("makeuser_E-Mail") . "*", $mail),
form_text('hometown', Get_Text("makeuser_Hometown"), $hometown), form_text('icq', "ICQ", $icq),
$enable_tshirt_size ? form_select('tshirt_size', Get_Text("makeuser_T-Shirt"), $tshirt_sizes, $tshirt_size) : '', form_text('jabber', "Jabber", $jabber),
form_textarea('comment', Get_Text("makeuser_text2"), $comment), form_text('hometown', Get_Text("makeuser_Hometown"), $hometown),
form_checkboxes('angel_types', "What do you want to do?", $angel_types, $selected_angel_types), $enable_tshirt_size ? form_select('tshirt_size', Get_Text("makeuser_T-Shirt"), $tshirt_sizes, $tshirt_size) : '',
form_info("", "Restricted angel types need will be confirmed later by an archangel. You can change your selection in the options section."), form_textarea('comment', Get_Text("makeuser_text2"), $comment),
form_password('password', Get_Text("makeuser_Passwort") . "*"), form_checkboxes('angel_types', "What do you want to do?", $angel_types, $selected_angel_types),
form_password('password2', Get_Text("makeuser_Passwort2") . "*"), form_info("", "Restricted angel types need will be confirmed later by an archangel. You can change your selection in the options section."),
info(Get_Text("makeuser_text3"), true), form_password('password', Get_Text("makeuser_Passwort") . "*"),
form_submit('submit', Get_Text("makeuser_Anmelden")) form_password('password2', Get_Text("makeuser_Passwort2") . "*"),
)) info(Get_Text("makeuser_text3"), true),
)); form_submit('submit', Get_Text("makeuser_Anmelden"))
))
));
} }
function guest_logout() { function guest_logout() {
session_destroy(); session_destroy();
header("Location: " . page_link_to("start")); header("Location: " . page_link_to("start"));
} }
function guest_login() { function guest_login() {
global $user; global $user;
$msg = ""; $msg = "";
$nick = ""; $nick = "";
unset ($_SESSION['uid']); unset ($_SESSION['uid']);
if (isset ($_REQUEST['submit'])) { if (isset ($_REQUEST['submit'])) {
$ok = true; $ok = true;
if (isset ($_REQUEST['nick']) && strlen(strip_request_item('nick')) > 0) { if (isset ($_REQUEST['nick']) && strlen(strip_request_item('nick')) > 0) {
$nick = strip_request_item('nick'); $nick = strip_request_item('nick');
$login_user = sql_select("SELECT * FROM `User` WHERE `Nick`='" . sql_escape($nick) . "'"); $login_user = sql_select("SELECT * FROM `User` WHERE `Nick`='" . sql_escape($nick) . "'");
if (count($login_user) > 0) { if (count($login_user) > 0) {
$login_user = $login_user[0]; $login_user = $login_user[0];
if (isset ($_REQUEST['password'])) { if (isset ($_REQUEST['password'])) {
if ($login_user['Passwort'] != PassCrypt($_REQUEST['password'])) { if ($login_user['Passwort'] != PassCrypt($_REQUEST['password'])) {
$ok = false; $ok = false;
$msg .= error(Get_Text("pub_index_pass_no_ok"), true); $msg .= error(Get_Text("pub_index_pass_no_ok"), true);
} }
} else { } else {
$ok = false; $ok = false;
$msg .= error("Please enter a password.", true); $msg .= error("Please enter a password.", true);
} }
} else { } else {
$ok = false; $ok = false;
$msg .= error(Get_Text("pub_index_User_unset"), true); $msg .= error(Get_Text("pub_index_User_unset"), true);
} }
} else { } else {
$ok = false; $ok = false;
$msg .= error("Please enter a nickname.", true); $msg .= error("Please enter a nickname.", true);
} }
if ($ok) { if ($ok) {
$_SESSION['uid'] = $login_user['UID']; $_SESSION['uid'] = $login_user['UID'];
$_SESSION['Sprache'] = $login_user['Sprache']; $_SESSION['Sprache'] = $login_user['Sprache'];
redirect(page_link_to('news')); redirect(page_link_to('news'));
} }
} }
return page(array ( return page(array (
Get_Text("index_text1") . " " . Get_Text("index_text2") . " " . Get_Text("index_text3"), $msg,
$msg, msg(),
msg(), Get_Text("index_text1") . " " . Get_Text("index_text2") . " " . Get_Text("index_text3"),
form(array ( form(array (
form_text('nick', Get_Text("index_lang_nick"), $nick), form_text('nick', Get_Text("index_lang_nick"), $nick),
form_password('password', Get_Text("index_lang_pass")), form_password('password', Get_Text("index_lang_pass")),
form_submit('submit', Get_Text("index_lang_send")) form_submit('submit', Get_Text("index_lang_send"))
)), )),
info(Get_Text("index_text4"), true) info(Get_Text("index_text4"), true)
)); ));
} }
?> ?>

1
includes/sys_user.php
Unescape Escape View File

@ -5,6 +5,7 @@
* Available T-Shirt sizes * Available T-Shirt sizes
*/ */
$tshirt_sizes = array ( $tshirt_sizes = array (
'' => "Please select...",
'S' => "S", 'S' => "S",
'M' => "M", 'M' => "M",
'L' => "L", 'L' => "L",

Write Preview
Loading…
Cancel
Save