summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Philipp Litza <janphilipp@litza.de>2011-12-26 16:37:19 +0100
committerJan-Philipp Litza <janphilipp@litza.de>2011-12-26 16:37:19 +0100
commitd9896abc4d09f4469baa865f2caca457cd227f56 (patch)
tree5b03b2413dc8f42d818b0d0505048516d6832c18
parent36354d307eb7edca75b4dddec91e547b4d3ede46 (diff)
parent278dc8e5b0c3830e661fd8297a65e71a66eed4ce (diff)
Merge branch 'master' of https://vcs.wybt.net/engelsystem/git
-rw-r--r--db/install.sql12
-rw-r--r--includes/pages/guest_login.php6
2 files changed, 12 insertions, 6 deletions
diff --git a/db/install.sql b/db/install.sql
index 9e414f89..77c1c559 100644
--- a/db/install.sql
+++ b/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`
diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php
index a210a7ce..afcc2cf5 100644
--- a/includes/pages/guest_login.php
+++ b/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;