Merge branch 'master' of https://vcs.wybt.net/engelsystem/git

db/install.sql

@@ -20,12 +20,12 @@ SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
 --
 
 CREATE TABLE IF NOT EXISTS `AngelTypes` (
-  `TID` int(11) NOT NULL AUTO_INCREMENT,
-  `Name` varchar(25) NOT NULL DEFAULT '',
-  `Man` text,
-  PRIMARY KEY (`TID`),
-  UNIQUE KEY `Name` (`Name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(25) NOT NULL DEFAULT '',
+  `restricted` int(1) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `Name` (`name`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=8 ;
 
 --
 -- Daten für Tabelle `AngelTypes`

includes/pages/guest_login.php

@@ -20,6 +20,12 @@ function guest_register() {
 	$comment = "";
 	$tshirt_size = 'S';
 	$password_hash = "";
+	$selected_angel_types = array ();
+
+	$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;