#44 user angel types -> user_settings

4 files changed, 247 insertions, 3 deletions

diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php
index afcc2cf5..0f1fdf38 100644
--- a/includes/pages/guest_login.php
+++ b/includes/pages/guest_login.php
@@ -80,6 +80,11 @@ function guest_register() {
 			$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[] = $angel_type_id;
+
 		// Trivia
 		if (isset ($_REQUEST['lastname']))
 			$lastname = strip_request_item('lastname');
@@ -105,16 +110,23 @@ function guest_register() {
 			"', `Passwort`='" . sql_escape($password_hash) . "', `kommentar`='" . sql_escape($comment) . "', `Hometown`='" . sql_escape($hometown) . "', `CreateDate`=NOW(), `Sprache`='" . sql_escape($_SESSION["Sprache"]) . "'");
 
 			// Assign user-group
-			sql_query("INSERT INTO `UserGroups` SET `uid`=" . sql_escape(sql_id()) . ", `group_id`=-2");
+			$user_id = sql_id();
+			sql_query("INSERT INTO `UserGroups` SET `uid`=" . sql_escape($user_id) . ", `group_id`=-2");
+
+			// Assign angel-types
+			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));
 
 			success(Get_Text("makeuser_writeOK4"));
-			redirect(page_link_to('login'));
+			if (!isset ($_SESSION['uid']))
+				redirect(page_link_to('login'));
 		}
 	}
 
 	return page(array (
 		Get_Text("makeuser_text1"),
 		$msg,
+		msg(),
 		form(array (
 			form_text('nick', Get_Text("makeuser_Nickname") . "*", $nick),
 			form_text('lastname', Get_Text("makeuser_Nachname"), $lastname),
@@ -129,6 +141,8 @@ function guest_register() {
 			form_text('hometown', Get_Text("makeuser_Hometown"), $hometown),
 			$enable_tshirt_size ? form_select('tshirt_size', Get_Text("makeuser_T-Shirt"), $tshirt_sizes, $tshirt_size) : '',
 			form_textarea('comment', Get_Text("makeuser_text2"), $comment),
+			form_checkboxes('angel_types', "What do you want to do?", $angel_types, $selected_angel_types),
+			form_info("", "Restricted angel types need will be confirmed later by an archangel. You can change your selection in the options section."),
 			form_password('password', Get_Text("makeuser_Passwort")),
 			form_password('password2', Get_Text("makeuser_Passwort2")),
 			info(Get_Text("makeuser_text3"), true),
diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php
index ce632b93..b141bf84 100644
--- a/includes/pages/user_settings.php
+++ b/includes/pages/user_settings.php
@@ -1,8 +1,211 @@
 <?php
 function user_settings() {
-	global $enable_tshirt_size;
+	global $enable_tshirt_size, $tshirt_sizes, $themes, $languages;
 	global $user;
 
+	$msg = "";
+	$nick = $user['Nick'];
+	$lastname = $user['Name'];
+	$prename = $user['Vorname'];
+	$age = $user['Alter'];
+	$tel = $user['Telefon'];
+	$dect = $user['DECT'];
+	$mobile = $user['Handy'];
+	$mail = $user['email'];
+	$icq = $user['ICQ'];
+	$jabber = $user['jabber'];
+	$hometown = $user['Hometown'];
+	$tshirt_size = $user['Size'];
+	$password_hash = "";
+	$selected_theme = $user['color'];
+	$selected_language = $user['Sprache'];
+
+	$selected_angel_types_source = sql_select("SELECT * FROM `UserAngelTypes` WHERE `user_id`=" . sql_escape($user['UID']));
+	$selected_angel_types = array ();
+	foreach ($selected_angel_types_source as $selected_angel_type)
+		$selected_angel_types[] = $selected_angel_type['angeltype_id'];
+
+	$angel_types_source = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`");
+	$angel_types = array ();
+	foreach ($angel_types_source as $angel_type)
+		$angel_types[$angel_type['id']] = $angel_type['name'] . ($angel_type['restricted'] ? " (restricted)" : "");
+
+	if (isset ($_REQUEST['submit'])) {
+		$ok = true;
+
+		if (isset ($_REQUEST['nick']) && strlen(strip_request_item('nick')) > 1) {
+			$nick = strip_request_item('nick');
+			if (sql_num_query("SELECT * FROM `User` WHERE `Nick`='" . sql_escape($nick) . "' AND NOT `UID`=" . sql_escape($user['UID']) . " LIMIT 1") > 0) {
+				$ok = false;
+				$msg .= error(sprintf(Get_Text("makeuser_error_nick1") . "%s" . Get_Text("makeuser_error_nick3"), $nick), true);
+			}
+		} else {
+			$ok = false;
+			$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) {
+			$mail = strip_request_item('mail');
+			if (!check_email($mail)) {
+				$ok = false;
+				$msg .= error(Get_Text("makeuser_error_mail"), true);
+			}
+		} else {
+			$ok = false;
+			$msg .= error("Please enter your e-mail.", true);
+		}
+
+		if (isset ($_REQUEST['icq']))
+			$icq = strip_request_item('icq');
+		if (isset ($_REQUEST['jabber']) && strlen(strip_request_item('jabber')) > 0) {
+			$jabber = strip_request_item('jabber');
+			if (!check_email($jabber)) {
+				$ok = false;
+				$msg .= error("Please check your jabber.", true);
+			}
+		}
+
+		if (isset ($_REQUEST['tshirt_size']) && isset ($tshirt_sizes[$_REQUEST['tshirt_size']]))
+			$tshirt_size = $_REQUEST['tshirt_size'];
+		else {
+			$ok = false;
+		}
+
+		$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[] = $angel_type_id;
+
+		// Trivia
+		if (isset ($_REQUEST['lastname']))
+			$lastname = strip_request_item('lastname');
+		if (isset ($_REQUEST['prename']))
+			$prename = strip_request_item('prename');
+		if (isset ($_REQUEST['age']) && preg_match("/^[0-9]{0,4}$/", $_REQUEST['age']))
+			$age = strip_request_item('age');
+		if (isset ($_REQUEST['tel']))
+			$tel = strip_request_item('tel');
+		if (isset ($_REQUEST['dect']))
+			$dect = strip_request_item('dect');
+		if (isset ($_REQUEST['mobile']))
+			$mobile = strip_request_item('mobile');
+		if (isset ($_REQUEST['hometown']))
+			$hometown = strip_request_item('hometown');
+
+		if ($ok) {
+			sql_query("UPDATE `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) .
+			"', `email`='" . sql_escape($mail) . "', `ICQ`='" . sql_escape($icq) . "', `jabber`='" . sql_escape($jabber) . "', `Size`='" . sql_escape($tshirt_size) .
+			"', `Hometown`='" . sql_escape($hometown) . "' WHERE `UID`=" . sql_escape($user['UID']));
+
+			// Assign angel-types
+			sql_query("DELETE FROM `UserAngelTypes` WHERE `user_id`=" . sql_escape($user['UID']));
+			foreach ($selected_angel_types as $selected_angel_type_id)
+				sql_query("INSERT INTO `UserAngelTypes` SET `user_id`=" . sql_escape($user['UID']) . ", `angeltype_id`=" . sql_escape($selected_angel_type_id));
+
+			success("Settings saved.");
+			redirect(page_link_to('user_settings'));
+		}
+	}
+	elseif (isset ($_REQUEST['submit_password'])) {
+		$ok = true;
+
+		if (!isset ($_REQUEST['password']) || $user['Passwort'] != PassCrypt($_REQUEST['password'])) {
+			$ok = false;
+			$msg .= error(Get_Text(30), true);
+		}
+
+		if (isset ($_REQUEST['new_password']) && strlen($_REQUEST['new_password']) >= 6) {
+			if ($_REQUEST['new_password'] == $_REQUEST['new_password2']) {
+				$password_hash = PassCrypt($_REQUEST['new_password']);
+			} else {
+				$ok = false;
+				$msg .= error(Get_Text("makeuser_error_password1"), true);
+			}
+		} else {
+			$ok = false;
+			$msg .= error(Get_Text("makeuser_error_password2"), true);
+		}
+
+		if ($ok) {
+			sql_query("UPDATE `User` SET `Passwort`='" . sql_escape($password_hash) . "' WHERE `UID`=" . sql_escape($user['UID']));
+
+			success("Password saved.");
+			redirect(page_link_to('user_settings'));
+		}
+	}
+	elseif (isset ($_REQUEST['submit_theme'])) {
+		$ok = true;
+
+		if (isset ($_REQUEST['theme']) && isset ($themes[$_REQUEST['theme']]))
+			$selected_theme = $_REQUEST['theme'];
+		else
+			$ok = false;
+
+		if ($ok) {
+			sql_query("UPDATE `User` SET `color`='" . sql_escape($selected_theme) . "' WHERE `UID`=" . sql_escape($user['UID']));
+
+			success("Theme changed.");
+			redirect(page_link_to('user_settings'));
+		}
+	}
+	elseif (isset ($_REQUEST['submit_language'])) {
+		$ok = true;
+
+		if (isset ($_REQUEST['language']) && isset ($languages[$_REQUEST['language']]))
+			$selected_language = $_REQUEST['language'];
+		else
+			$ok = false;
+
+		if ($ok) {
+			sql_query("UPDATE `User` SET `Sprache`='" . sql_escape($selected_language) . "' WHERE `UID`=" . sql_escape($user['UID']));
+			$_SESSION['Sprache'] = $selected_language;
+
+			success("Language changed.");
+			redirect(page_link_to('user_settings'));
+		}
+	}
+
+	return page(array (
+		sprintf(Get_Text("Hallo") . "%s,<br />" . Get_Text(13), $user['Nick']),
+		$msg,
+		msg(),
+		form(array (
+			form_info("", Get_Text("pub_einstellungen_Text_UserData")),
+			form_text('nick', Get_Text("makeuser_Nickname") . "*", $nick),
+			form_text('lastname', Get_Text("makeuser_Nachname"), $lastname),
+			form_text('prename', Get_Text("makeuser_Vorname"), $prename),
+			form_text('age', Get_Text("makeuser_Alter"), $age),
+			form_text('tel', Get_Text("makeuser_Telefon"), $tel),
+			form_text('dect', Get_Text("makeuser_DECT"), $tel),
+			form_text('mobile', Get_Text("makeuser_Handy"), $mobile),
+			form_text('mail', Get_Text("makeuser_E-Mail") . "*", $mail),
+			form_text('icq', "ICQ", $icq),
+			form_text('jabber', "Jabber", $jabber),
+			form_text('hometown', Get_Text("makeuser_Hometown"), $hometown),
+			$enable_tshirt_size ? form_select('tshirt_size', Get_Text("makeuser_T-Shirt"), $tshirt_sizes, $tshirt_size) : '',
+			form_checkboxes('angel_types', "What do you want to do?", $angel_types, $selected_angel_types),
+			form_submit('submit', Get_Text("save"))
+		)),
+		form(array (
+			form_info("", Get_Text(14)),
+			form_password('password', Get_Text(15)),
+			form_password('new_password', Get_Text(16)),
+			form_password('new_password2', Get_Text(17)),
+			form_submit('submit_password', Get_Text("save"))
+		)),
+		form(array (
+			form_info("", Get_Text(18)),
+			form_select('theme', Get_Text(19), $themes, $selected_theme),
+			form_submit('submit_theme', Get_Text("save"))
+		)),
+		form(array (
+			form_info("", Get_Text(20)),
+			form_select('language', Get_Text(21), $languages, $selected_language),
+			form_submit('submit_language', Get_Text("save"))
+		))
+	));
+
 	if (!isset ($_REQUEST['action'])) {
 		if ($enable_tshirt_size)
 			$tshirt_html = template_render('../templates/user_settings_tshirt.html', array (
diff --git a/includes/sys_lang.php b/includes/sys_lang.php
index 833d00b8..40abf754 100644
--- a/includes/sys_lang.php
+++ b/includes/sys_lang.php
@@ -1,4 +1,14 @@
 <?php
+
+
+/**
+ * Liste verfügbarer Sprachen
+ */
+$languages = array (
+	'DE' => "Deutsch",
+	'EN' => "English"
+);
+
 function Get_Text($TextID, $NoError = false) {
 	global $con, $error_messages, $debug;
 
diff --git a/includes/sys_template.php b/includes/sys_template.php
index 0a42d9ac..9aed6d95 100644
--- a/includes/sys_template.php
+++ b/includes/sys_template.php
@@ -2,6 +2,23 @@
 
 
 /**
+ * Liste der verfügbaren Themes
+ */
+$themes = array (
+	"1" => "Standard-Style",
+	"2" => "ot/Gelber Style",
+	"3" => "Club-Mate Style",
+	"5" => "Debian Style",
+	"6" => "c-base Style",
+	"7" => "Blau/Gelber Style",
+	"8" => "Pastel Style",
+	"4" => "Test Style",
+	"9" => "Test Style 21c3",
+	"10" => "msquare (cccamp2011)",
+	"11" => "msquare (28c3)"
+);
+
+/**
  * Rendert eine Liste von Checkboxen für ein Formular
  * @param name Die Namen der Checkboxen werden aus name_key gebildet
  * @param label Die Beschriftung der Liste