update database

5 files changed, 41 insertions, 48 deletions

diff --git a/DB/Sprache.sql b/DB/Sprache.sql
index ccbcdf85..5bc5e190 100755
--- a/DB/Sprache.sql
+++ b/DB/Sprache.sql
@@ -382,8 +382,8 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('makeuser_Handy', 'D
 INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('makeuser_Handy', 'EN', 'mobile');

 INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('makeuser_E-Mail', 'DE', 'E-Mail');

 INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('makeuser_E-Mail', 'EN', 'e-mail');

-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('makeuser_subscribe-mailinglist', 'DE', 'Der Mailinglisten Beitreten')

-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('makeuser_subscribe-mailinglist', 'EN', 'subscribe the mailing list')

+INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('makeuser_subscribe-mailinglist', 'DE', 'Der Mailinglisten Beitreten');

+INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('makeuser_subscribe-mailinglist', 'EN', 'subscribe the mailing list');

 INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('makeuser_T-Shirt', 'DE', 'T-Shirt Größe');

 INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('makeuser_T-Shirt', 'EN', 'shirt size');

 INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('makeuser_Engelart', 'DE', 'Engelart');

diff --git a/DB/User.sql b/DB/User.sql
index 5cb9de85..1539665d 100644
--- a/DB/User.sql
+++ b/DB/User.sql
@@ -24,7 +24,7 @@ CREATE TABLE `User` (
   `Gekommen` tinyint(4) NOT NULL default '0',
   `Aktiv` tinyint(4) NOT NULL default '0',
   `Tshirt` tinyint(4) default '0',
-  `color` tinyint(4) default '1',
+  `color` tinyint(4) default '6',
   `Sprache` char(2) default 'EN',
   `Avatar` int(11) default '0',
   `Menu` char(1) NOT NULL default 'L',
diff --git a/DB/UserCVS.sql b/DB/UserCVS.sql
index 11377aff..53b202f8 100644
--- a/DB/UserCVS.sql
+++ b/DB/UserCVS.sql
@@ -1,19 +1,7 @@
--- phpMyAdmin SQL Dump
--- version 2.9.1.1-Debian-4
--- http://www.phpmyadmin.net
--- 
--- Host: localhost
--- Erstellungszeit: 09. Oktober 2007 um 21:53
--- Server Version: 5.0.32
--- PHP-Version: 5.2.0-8+etch7
--- 
--- Datenbank: `Himmel`
--- 
-
 -- --------------------------------------------------------
 
 -- 
--- Tabellenstruktur f?r Tabelle `UserCVS`
+-- Tabellenstruktur für Tabelle `UserCVS`
 -- 
 DROP TABLE IF EXISTS `UserCVS`;
 CREATE TABLE `UserCVS` (
@@ -30,6 +18,7 @@ CREATE TABLE `UserCVS` (
   `nonpublic/news_comments.php` char(1) NOT NULL default 'G',
   `nonpublic/myschichtplan.php` char(1) NOT NULL default 'G',
   `nonpublic/myschichtplan_ical.php` char(1) NOT NULL default 'G',
+  `nonpublic/schichtplan_beamer.php` char(1) NOT NULL default 'G',
   `nonpublic/engelbesprechung.php` char(1) NOT NULL default 'G',
   `nonpublic/schichtplan.php` char(1) NOT NULL default 'G',
   `nonpublic/schichtplan_add.php` char(1) NOT NULL default 'G',
@@ -50,8 +39,6 @@ CREATE TABLE `UserCVS` (
   `admin/userSaveNormal.php` char(1) NOT NULL default 'G',
   `admin/userChangeSecure.php` char(1) NOT NULL default 'G',
   `admin/userSaveSecure.php` char(1) NOT NULL default 'G',
-  `admin/userSaveNormal.php` char(1) NOT NULL default 'G',
-  `admin/userSaveSecure.php` char(1) NOT NULL default 'G',
   `admin/group.php` char(1) NOT NULL default 'G',
   `admin/userDefaultSetting.php` char(1) NOT NULL default 'G',
   `admin/UserPicture.php` char(1) NOT NULL default 'G',
@@ -70,10 +57,45 @@ CREATE TABLE `UserCVS` (
   `Herald` char(1) NOT NULL default 'G',
   `Info` char(1) NOT NULL default 'G',
   `Conference` char(1) NOT NULL default 'G',
+  `Kasse` char(1) NOT NULL default 'G',
   PRIMARY KEY  (`UID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 -- 
--- Daten f?r Tabelle `UserCVS`
+-- Daten für Tabelle `UserCVS`
 -- 
 
+INSERT INTO `UserCVS` (`UID`, `GroupID`, `index.php`, `logout.php`, `faq.php`, `lageplan.php`, `makeuser.php`, `nonpublic/index.php`, `nonpublic/news.php`, `nonpublic/newsAddMeting`, `nonpublic/news_comments.php`, `nonpublic/myschichtplan.php`, `nonpublic/myschichtplan_ical.php`, `nonpublic/schichtplan_beamer.php`, `nonpublic/engelbesprechung.php`, `nonpublic/schichtplan.php`, `nonpublic/schichtplan_add.php`, `nonpublic/wecken.php`, `nonpublic/waeckliste.php`, `nonpublic/messages.php`, `nonpublic/faq.php`, `nonpublic/einstellungen.php`, `Change T_Shirt Size`, `admin/index.php`, `admin/room.php`, `admin/EngelType.php`, `admin/schichtplan.php`, `admin/shiftadd.php`, `admin/schichtplan_druck.php`, `admin/user.php`, `admin/userChangeNormal.php`, `admin/userSaveNormal.php`, `admin/userChangeSecure.php`, `admin/userSaveSecure.php`, `admin/group.php`, `admin/userDefaultSetting.php`, `admin/UserPicture.php`, `admin/userArrived.php`, `admin/aktiv.php`, `admin/tshirt.php`, `admin/news.php`, `admin/faq.php`, `admin/free.php`, `admin/sprache.php`, `admin/dect.php`, `admin/dect_call.php`, `admin/dbUpdateFromXLS.php`, `admin/Recentchanges.php`, `admin/debug.php`, `Herald`, `Info`, `Conference`, `Kasse`) VALUES 
+(1, -4, 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G'),
+(-1, NULL, 'Y', 'N', 'Y', 'N', 'Y', 'Y', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N'),
+(-2, NULL, 'N', 'Y', 'Y', 'N', 'N', 'Y', 'Y', 'N', 'Y', 'Y', 'Y', 'N', 'Y', 'Y', 'Y', 'N', 'N', 'Y', 'Y', 'Y', 'Y', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N'),
+(-3, NULL, 'N', 'Y', 'Y', 'N', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'N', 'N', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'N', 'N', 'N', 'N', 'Y', 'Y', 'N', 'N', 'Y', 'Y', 'Y', 'N', 'N', 'N', 'N', 'Y', 'N', 'Y', 'Y', 'Y', 'Y'),
+(-4, NULL, 'N', 'Y', 'Y', 'N', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'N', 'Y', 'Y', 'Y', 'N', 'N', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'N', 'N', 'N', 'Y', 'Y', 'N', 'Y', 'Y', 'Y', 'Y'),
+(-5, NULL, 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y');
+
+-- --------------------------------------------------------
+-- --------------------------------------------------------
+-- --------------------------------------------------------
+
+-- 
+-- Tabellenstruktur für Tabelle `UserGroups`
+-- 
+
+DROP TABLE IF EXISTS `UserGroups`;
+CREATE TABLE IF NOT EXISTS `UserGroups` (
+  `Name` varchar(35) NOT NULL,
+  `UID` int(11) NOT NULL,
+  PRIMARY KEY  (`UID`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+-- 
+-- Daten für Tabelle `UserGroups`
+-- 
+
+INSERT INTO `UserGroups` (`Name`, `UID`) VALUES 
+('1-logout User', -1),
+('2-Engel', -2),
+('3-Shift Coordinator', -3),
+('4-Erzengel', -4),
+('5-Developer', -5);
+
diff --git a/DB/update_20100112_2115.sql b/DB/update_20100112_2115.sql
deleted file mode 100644
index 198a24ce..00000000
--- a/DB/update_20100112_2115.sql
+++ /dev/null
@@ -1,24 +0,0 @@
-ALTER TABLE `UserCVS` ADD `admin/userArrived.php` CHAR( 1 ) NOT NULL DEFAULT 'N' AFTER `admin/UserPicture.php` ;
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/userArrived.php', 'DE', 'User gekommen');
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/userArrived.php', 'EN', 'User Arrived');
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pri_userArrived_WriteError', 'DE', 'Fehler beim speichern bei Engel');
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pri_userArrived_WriteError', 'EN', 'Error by writing Engel');
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pri_userArrived_Text1', 'DE', 'Über die Suchen-Funktion des Browsers kann diese Liste schnell nach einem Nick abgesucht werden.');
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pri_userArrived_Text1', 'EN', 'Use the search function of the browser, this list can be quickly searched for a nick.');
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pri_userArrived_Text2', 'DE', 'Hinter diesem erscheint ein Link, über den man eintragen kann, dass der Engel gekommen ist.');
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pri_userArrived_Text2', 'EN', 'Behind that will see a link that you can enter, that the angel has come.');
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pri_userArrived_TableToppic', 'DE', 'Liste aller Engel:');
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pri_userArrived_TableToppic', 'EN', 'List of Engels:');
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pri_userArrived_TableTD_Nick', 'DE', 'Nick');
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pri_userArrived_TableTD_Nick', 'EN', 'Nick');
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pri_userArrived_TableTD_ArrivedShow', 'DE', 'Gekommen?');
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pri_userArrived_TableTD_ArrivedShow', 'EN', 'Arrived?');
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pri_userArrived_TableTD_ArrivedSet', 'DE', 'Gekommen Setzen:');
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pri_userArrived_TableTD_ArrivedSet', 'EN', 'Set arrived:');
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pri_userArrived_TableEntry_Arrived', 'DE', 'anwesend');
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pri_userArrived_TableEntry_Arrived', 'EN', 'arrived');
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pri_userArrived_TableEntry_Set', 'DE', 'XXXXXXXX');
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pri_userArrived_TableEntry_Set', 'EN', 'XXXXXXXX');
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pri_userArrived_WriteOK', 'DE', 'Als gekommen makiert');
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pri_userArrived_WriteOK', 'EN', 'Set as arrived');
-
diff --git a/DB/update_20100112_2300.sql b/DB/update_20100112_2300.sql
deleted file mode 100644
index a7c2f5f5..00000000
--- a/DB/update_20100112_2300.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE `UserCVS` ADD `GroupID` INT NULL AFTER `UID` ;
-ALTER TABLE `UserCVS` ADD `admin\group.php` CHAR( 1 ) NOT NULL DEFAULT 'N' AFTER `admin/userDefaultSetting.php` ;
-
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/group.php', 'DE', 'Benutzer Gruppen');
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/group.php', 'EN', 'User Group');