split user setting in different files

3 files changed, 63 insertions, 185 deletions

diff --git a/DB/Sprache.sql b/DB/Sprache.sql
index 8b3c3107..ccbcdf85 100755
--- a/DB/Sprache.sql
+++ b/DB/Sprache.sql
@@ -574,8 +574,14 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/shiftadd.php'
 INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/shiftadd.php', 'EN', ' ');

 INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/schichtplan_druck.php', 'DE', ' ');

 INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/schichtplan_druck.php', 'EN', ' ');

-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/user2.php', 'DE', ' ');

-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/user2.php', 'EN', ' ');

+INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/userChangeNormal.php', 'DE', ' ');

+INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/userChangeNormal.php', 'EN', ' ');

+INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/userChangeSecure.php', 'DE', ' ');

+INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/userChangeSecure.php', 'EN', ' ');

+INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/userSaveNormal.php', 'DE', ' ');

+INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/userSaveNormal.php', 'EN', ' ');

+INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/userSaveSecure.php', 'DE', ' ');

+INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/userSaveSecure.php', 'EN', ' ');

 INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/dbUpdateFromXLS.php', 'DE', 'UpdateDB');

 INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/dbUpdateFromXLS.php', 'EN', 'UpdateDB');

 INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/dect.php', 'DE', 'Dect');

@@ -584,6 +590,8 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/dect_call.php
 INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/dect_call.php', 'EN', ' ');

 INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/user.php', 'DE', 'Engelliste');

 INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/user.php', 'EN', 'Engel-list');

+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');

 INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/userDefaultSetting.php', 'DE', 'Engel Voreinstellungen');

 INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/userDefaultSetting.php', 'EN', 'Engel Default Setting');

 INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/UserPicture.php', 'DE', 'Benutzerbilder');

diff --git a/DB/UserCVS.sql b/DB/UserCVS.sql
index d0b7a4c6..487bd965 100644
--- a/DB/UserCVS.sql
+++ b/DB/UserCVS.sql
@@ -18,51 +18,56 @@
 DROP TABLE IF EXISTS `UserCVS`;
 CREATE TABLE `UserCVS` (
   `UID` int(11) NOT NULL default '0',
-  `index.php` char(1) NOT NULL default 'N',
-  `logout.php` char(1) NOT NULL default 'Y',
-  `faq.php` char(1) NOT NULL default 'Y',
-  `lageplan.php` char(1) NOT NULL default 'N',
-  `makeuser.php` char(1) NOT NULL default 'N',
-  `nonpublic/index.php` char(1) NOT NULL default 'Y',
-  `nonpublic/news.php` char(1) NOT NULL default 'Y',
-  `nonpublic/newsAddMeting` char(1) NOT NULL default 'N',
-  `nonpublic/news_comments.php` char(1) NOT NULL default 'Y',
-  `nonpublic/myschichtplan.php` char(1) NOT NULL default 'Y',
-  `nonpublic/myschichtplan_ical.php` char(1) NOT NULL default 'Y',
-  `nonpublic/engelbesprechung.php` char(1) NOT NULL default 'Y',
-  `nonpublic/schichtplan.php` char(1) NOT NULL default 'Y',
-  `nonpublic/schichtplan_add.php` char(1) NOT NULL default 'Y',
-  `nonpublic/wecken.php` char(1) NOT NULL default 'N',
-  `nonpublic/waeckliste.php` char(1) NOT NULL default 'N',
-  `nonpublic/messages.php` char(1) NOT NULL default 'Y',
-  `nonpublic/faq.php` char(1) NOT NULL default 'Y',
-  `nonpublic/einstellungen.php` char(1) NOT NULL default 'Y',
-  `Change T_Shirt Size` char(1) NOT NULL default 'Y',
-  `admin/index.php` char(1) NOT NULL default 'N',
-  `admin/room.php` char(1) NOT NULL default 'N',
-  `admin/EngelType.php` char(1) NOT NULL default 'N',
-  `admin/schichtplan.php` char(1) NOT NULL default 'N',
-  `admin/shiftadd.php` char(1) NOT NULL default 'N',
-  `admin/schichtplan_druck.php` char(1) NOT NULL default 'N',
-  `admin/user.php` char(1) NOT NULL default 'N',
-  `admin/user2.php` char(1) NOT NULL default 'N',
-  `admin/userDefaultSetting.php` char(1) NOT NULL default 'N',
-  `admin/UserPicture.php` char(1) NOT NULL default 'N',
-  `admin/userArrived.php` char(1) NOT NULL default 'N',
-  `admin/aktiv.php` char(1) NOT NULL default 'N',
-  `admin/tshirt.php` char(1) NOT NULL default 'N',
-  `admin/news.php` char(1) NOT NULL default 'N',
-  `admin/faq.php` char(1) NOT NULL default 'N',
-  `admin/free.php` char(1) NOT NULL default 'N',
-  `admin/sprache.php` char(1) NOT NULL default 'N',
-  `admin/dect.php` char(1) NOT NULL default 'N',
-  `admin/dect_call.php` char(1) NOT NULL default 'N',
-  `admin/dbUpdateFromXLS.php` char(1) NOT NULL default 'N',
-  `admin/Recentchanges.php` char(1) NOT NULL default 'N',
-  `admin/debug.php` char(1) NOT NULL default 'N',
-  `Herald` char(1) NOT NULL default 'N',
-  `Info` char(1) NOT NULL default 'N',
-  `Conference` char(1) NOT NULL default 'N',
+  `GroupID` int(11) default NULL,
+  `index.php` char(1) NOT NULL default 'G',
+  `logout.php` char(1) NOT NULL default 'G',
+  `faq.php` char(1) NOT NULL default 'G',
+  `lageplan.php` char(1) NOT NULL default 'G',
+  `makeuser.php` char(1) NOT NULL default 'G',
+  `nonpublic/index.php` char(1) NOT NULL default 'G',
+  `nonpublic/news.php` char(1) NOT NULL default 'G',
+  `nonpublic/newsAddMeting` char(1) NOT NULL default 'G',
+  `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/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',
+  `nonpublic/wecken.php` char(1) NOT NULL default 'G',
+  `nonpublic/waeckliste.php` char(1) NOT NULL default 'G',
+  `nonpublic/messages.php` char(1) NOT NULL default 'G',
+  `nonpublic/faq.php` char(1) NOT NULL default 'G',
+  `nonpublic/einstellungen.php` char(1) NOT NULL default 'G',
+  `Change T_Shirt Size` char(1) NOT NULL default 'G',
+  `admin/index.php` char(1) NOT NULL default 'G',
+  `admin/room.php` char(1) NOT NULL default 'G',
+  `admin/EngelType.php` char(1) NOT NULL default 'G',
+  `admin/schichtplan.php` char(1) NOT NULL default 'G',
+  `admin/shiftadd.php` char(1) NOT NULL default 'G',
+  `admin/schichtplan_druck.php` char(1) NOT NULL default 'G',
+  `admin/user.php` char(1) NOT NULL default 'G',
+  `admin/userChangeNormal.php` char(1) NOT NULL default 'G',
+  `admin/userChangeSecure.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',
+  `admin/userArrived.php` char(1) NOT NULL default 'G',
+  `admin/aktiv.php` char(1) NOT NULL default 'G',
+  `admin/tshirt.php` char(1) NOT NULL default 'G',
+  `admin/news.php` char(1) NOT NULL default 'G',
+  `admin/faq.php` char(1) NOT NULL default 'G',
+  `admin/free.php` char(1) NOT NULL default 'G',
+  `admin/sprache.php` char(1) NOT NULL default 'G',
+  `admin/dect.php` char(1) NOT NULL default 'G',
+  `admin/dect_call.php` char(1) NOT NULL default 'G',
+  `admin/dbUpdateFromXLS.php` char(1) NOT NULL default 'G',
+  `admin/Recentchanges.php` char(1) NOT NULL default 'G',
+  `admin/debug.php` char(1) NOT NULL default 'G',
+  `Herald` char(1) NOT NULL default 'G',
+  `Info` char(1) NOT NULL default 'G',
+  `Conference` char(1) NOT NULL default 'G',
   PRIMARY KEY  (`UID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
@@ -70,141 +75,3 @@ CREATE TABLE `UserCVS` (
 -- Daten f?r Tabelle `UserCVS`
 -- 
 
-INSERT INTO `UserCVS` (`UID`,
- `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/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/user2.php`,
- `admin/userDefaultSetting.php`,
- `admin/UserPicture.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`) VALUES
-
-(-1, 
- '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'),
---    1    2    3    4    5    6    7    8    9   10   11   12   13   14   15   16   17   18   19   20   21   22   23   24   25   26   27   28   29   30   31   32   33   34   35   36   37   38   39   40   41   42   43
-(1, 
- 'N',
- 'Y',
- 'N',
- 'N',
- 'Y',
- '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',
- 'Y',
- 'Y',
- 'Y',
- 'Y',
- 'Y',
- 'Y',
- 'Y',
- 'Y',
- 'Y',
- 'Y',
- 'Y',
- 'Y',
- 'N');
-
diff --git a/DB/update_20100112_2300.sql b/DB/update_20100112_2300.sql
index ab944226..a7c2f5f5 100644
--- a/DB/update_20100112_2300.sql
+++ b/DB/update_20100112_2300.sql
@@ -1,2 +1,5 @@
 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');