some db-updates, doku added
git-svn-id: svn://svn.cccv.de/engel-system@241 29ba0400-6e00-0410-a75a-ca02368028f8
This commit is contained in:
ichdasich
parent
546f80edd3
commit
bb3710efde
|
|
@ -50,16 +50,16 @@ CREATE TABLE IF NOT EXISTS `FAQ` (
|
|||
--
|
||||
|
||||
INSERT INTO `FAQ` (`FID`, `Frage`, `Antwort`) VALUES (1, 'Komme ich als Engel billiger/kostenlos auf den Congress?<br>\r\nDo I get in cheaper / for free to the congress as an angel ?', 'Nein, jeder Engel muss normal Eintritt bezahlen.<br>\r\nNo, every angel has to pay full price.'),
|
||||
(2, 'Was bekomme ich für meine Mitarbeit?<br>\r\nWhat do I get for helping ? \r\n', 'Jeder Engel der arbeitet bekommt ein kostenloses (Camp-)T-Shirt nach der Veranstalltung <br>\r\nEvery working angel gets a free (Camp-) shirt after the event. '),
|
||||
(3, 'Wie lange muss ich als Engel arbeiten?<br>\r\nHow long do I have to work as an angel ?', 'Diese Frage ist schwer zu beantworten. Es hängt z.B. davon ab, was man macht (z.B. Workshop-Engel) und wieviele Engel wir zusammenbekommen. <br>\r\nThis is difficult to answer. It depends on what you''ll have to do (e.g. workshop angel) and how many angels will be there. '),
|
||||
(6, 'Ich bin erst XX Jahre alt. Kann ich überhaupt helfen?<br>\r\nI''m only XX years old. Can I help anyway?', 'Du bist alt genug, zum Camp zu kommen? Dann bist Du alt genug zu helfen. <br>\r\nYou''re old enough to come to the Camp? So you''re old enough to help, too.'),
|
||||
(8, 'Wer ist eigentlich alles Erzengel?<br>\r\nWho <b>are</b> the Arch-Angels?\r\n', 'Erzengel sind dieses Jahr: Daizy, Flip, Hasi, Enno, Nachtkind und SaniFox. <br>\r\nThe ArchAngels for this year are: Daizy, Flip, Hasi, Enno, Nachtkind und SaniFox. \r\n'),
|
||||
(9, 'Gibt es dieses Jahr wieder einen IRC-Channel für Engel?<br>\r\nWill there be an IRC-channel for angels again?', 'Ja, im IRC-Net existiert #congress-engel. Einfach mal reinschaun!<br>\r\nYes, in the IRC-net there''s #congress-engel. Just have a look!'),
|
||||
(10, 'Wie gehe ich mit den Besuchern um? <br>\r\nHow do I treat visitors?', 'Man soll gegenüber den Besuchern immer höflich und freundlich sein, auch wenn diese gestresst sind. Wenn man das Gefühl hat, dass man mit der Situation nicht mehr klarkommt, sollte man sich jemanden zur Unterstützung holen, bevor man selbst auch gestresst wird :-) <br>\r\nYou should always be polite and friendly, especially if they are stressed. When you feel you can''t handle it on your own, get someone to help you out before you get so stressed yourself that you get impolite.'),
|
||||
(2, 'Was bekomme ich für meine Mitarbeit?<br>\r\nWhat can i expect in return for my help? \r\n', 'Jeder Engel der arbeitet bekommt ein kostenloses T-Shirt nach der Veranstalltung <br>\r\nEvery working angel gets a free shirt after the event. '),
|
||||
(3, 'Wie lange muss ich als Engel arbeiten?<br>\r\nHow long do I have to work as an angel ?', 'Diese Frage ist schwer zu beantworten. Es hängt z.B. davon ab, was man macht (z.B. Workshop-Engel) und wieviele Engel wir zusammen bekommen. <br>\r\nThis is difficult to answer. It depends on what you decide to do (e.g. workshop angel) and how many people will attend. '),
|
||||
(6, 'Ich bin erst XX Jahre alt. Kann ich überhaupt helfen?<br>\r\nI''m only XX years old. Can I help anyway?', 'Wir können jede helfende Hand gebrauchen. Wenn du alt genug bist, um zum Congress zu kommen, bist du auch alt genug zu helfen. <br>\r\nWe need every help we can get. If your old enough to come to the congress, your old enough to help.'),
|
||||
(8, 'Wer sind eigentlich die Erzengel?<br>\r\nWho <b>are</b> the Arch-Angels?\r\n', 'Erzengel sind dieses Jahr: BugBlue, TabascoEye, Jeedi, Daizy, volty<br> \r\nThe ArchAngels for this year are: BugBlue, TabascoEye, Jeedi, Daizy, volty\r\n'),
|
||||
(9, 'Gibt es dieses Jahr wieder einen IRC-Channel für Engel?<br>\r\nWill there be an IRC-channel for angels again?', 'Ja, im IRC-Net existiert #chaos-angel. Einfach mal reinschaun!<br>\r\nYes, in the IRC-net there''s #chaos-angel. Just have a look!'),
|
||||
(10, 'Wie gehe ich mit den Besuchern um? <br>\r\nHow do I treat visitors?', 'Man soll gegenüber den Besuchern immer höflich und freundlich sein, auch wenn diese gestresst sind. Wenn man das Gefühl hat, dass man mit der Situation nicht mehr klarkommt, sollte man sich jemanden zur Unterstützung holen, bevor man selbst auch gestresst wird :-) <br>\r\nYou should always be polite and friendly, especially if they are stressed. When you feel you can''t handle it on your own, get someone to help you out before you get so stressed yourself that you get impolite.'),
|
||||
(11, 'Wann sind die Engelbesprechungen? <br>\r\nWhen are the angels briefings?', 'Das wird vor Ort noch festgelegt und steht im Himmelnewssystem.<br>\r\nThe information on the Angel Briefings will be in the news section of this system.'),
|
||||
(12, 'Was muss ich noch bedenken?<br>\r\nAnything else I should know?', 'Man sollte nicht total übermüdet oder ausgehungert, wenn man einen Einsatz hat. Eine gewisse Fitness ist hilfreich.<br>\r\nYou should not be exhausted or starving when you arrive for a shift. A reasonable amount of fitness for work would be very helpful.'),
|
||||
(12, 'Was muss ich noch bedenken?<br>\r\nAnything else I should know?', 'Man sollte nicht total übermüdet oder ausgehungert, wenn n man einen Einsatz hat. Eine gewisse Fitness ist hilfreich.<br>\r\nYou should not be exhausted or starving when you arrive for a shift. A reasonable amount of fitness for work would be very helpful.'),
|
||||
(13, 'Ich habe eine Frage, auf die ich in der FAQ keine Antwort gefunden habe. Wohin soll ich mich wenden? <br>\r\nI have a guestion not answered here. Who can I ask?', 'Bei weitere Fragen kannst du die Anfragen an die Erzengel Formular benutzen.<br>\r\nIf you have further questions, you can use the Questions for the ArchAngels form.'),
|
||||
(20, 'Wer muss alles Eintritt zahlen?<br>\r\nWho has to pay the full entrance price?', 'Jeder. Zumindest, solange er/sie älter als 12 Jahre ist...<br>\r\n<b>Everyone</b> who is at older than 12 years old.');
|
||||
(20, 'Wer muss alles Eintritt zahlen?<br>\r\nWho has to pay the full entrance price?', 'Jeder. Zumindest, solange er/sie älter als 12 Jahre ist...<br>\r\nEveryone who is at older than 12 years old.');
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('33', 'EN', 'Languag
|
|||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('34', 'DE', 'Avatar wurde gesetzt.');
|
||||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('34', 'EN', 'Avatar is saved.');
|
||||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('35', 'DE', '<b>Neue Anfrage:</b>\r\nIn diesem Formular hast du die Möglichkeit, den Erzengeln eine Frage zu stellen. Wenn diese beantwortet ist, wirst du hier darüber informiert. Sollte die Frage von allgemeinem Interesse sein, wird diese in die Engel-FAQ übernommen.');
|
||||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('35', 'EN', '<b>New Question:</b>\r\nWith this form you may sumbit questions to our Archangels. Topics of common interest may be added to the FAQ. (Section: answered questions).\r\n');
|
||||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('35', 'EN', '<b>New Question</b>\r\nWith this form you may sumbit questions to our Archangels. Topics of common interest may be added to the FAQ. (Section: answered questions).\r\n');
|
||||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('36', 'DE', 'Stelle hier deine Frage');
|
||||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('36', 'EN', 'Tell us your question');
|
||||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('37', 'DE', 'Deine Anfrage war:');
|
||||
|
|
@ -542,6 +542,10 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('nonpublic/faq.php',
|
|||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('nonpublic/faq.php', 'EN', 'Questions for the ArchAngels');
|
||||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/index.php', 'DE', ' ');
|
||||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/index.php', 'EN', ' ');
|
||||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pub_einstellungen_PictureUpload', 'DE', 'Hochzuladendes Bild auswählen:');
|
||||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pub_einstellungen_PictureUpload', 'EN', 'Choose a picture to Upload:');
|
||||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('upload', 'DE', 'Upload');
|
||||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('upload', 'EN', 'Upload');
|
||||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/room.php', 'DE', 'Räume');
|
||||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/room.php', 'EN', 'rooms');
|
||||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/EngelType.php', 'DE', 'Engeltypen');
|
||||
|
|
@ -558,10 +562,14 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/dbUpdateFromX
|
|||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/dbUpdateFromXLS.php', 'EN', 'UpdateDB');
|
||||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/dect.php', 'DE', 'Dect');
|
||||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/dect.php', 'EN', 'Dect');
|
||||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/dect_call.php', 'DE', 'Dect-Call');
|
||||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/dect_call.php', 'EN', 'Dect-Call');
|
||||
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/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');
|
||||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/UserPicture.php', 'EN', 'User Pictures');
|
||||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/aktiv.php', 'DE', 'Aktiv Liste');
|
||||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/aktiv.php', 'EN', 'active list');
|
||||
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/tshirt.php', 'DE', 'T-Shirtausgabe');
|
||||
|
|
|
|||
|
|
@ -15,15 +15,14 @@
|
|||
--
|
||||
-- Tabellenstruktur für Tabelle `UserCVS`
|
||||
--
|
||||
|
||||
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 'N',
|
||||
`faq.php` char(1) NOT NULL default 'Y',
|
||||
`lageplan.php` char(1) NOT NULL default 'N',
|
||||
`makeuser.php` char(1) NOT NULL default 'Y',
|
||||
`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',
|
||||
|
|
@ -31,8 +30,6 @@ CREATE TABLE `UserCVS` (
|
|||
`nonpublic/myschichtplan.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/schichtplan_beamer.php` char(1) NOT NULL default 'N',
|
||||
`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',
|
||||
|
|
@ -55,7 +52,6 @@ CREATE TABLE `UserCVS` (
|
|||
`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',
|
||||
|
|
@ -69,6 +65,9 @@ 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/engelbesprechung.php`, `nonpublic/schichtplan.php`, `nonpublic/schichtplan_add.php`, `nonpublic/schichtplan_beamer.php`, `nonpublic/wecken.php`, `nonpublic/waeckliste.php`, `nonpublic/messages.php`, `nonpublic/faq.php`, `nonpublic/einstellungen.php`, `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', 'N', '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'),
|
||||
(1, 'N', 'Y', 'N', 'N', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'N', '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', 'Y', 'N');
|
||||
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/engelbesprechung.php`, `nonpublic/schichtplan.php`, `nonpublic/wecken.php`, `nonpublic/waeckliste.php`, `nonpublic/messages.php`, `nonpublic/faq.php`, `nonpublic/einstellungen.php`, `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/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'),
|
||||
-- 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', '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');
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
<?PHP
|
||||
$title = "Anmeldung zum Chaos-Engel";
|
||||
$header = "";
|
||||
$success = "none";
|
||||
include ("./inc/config.php");
|
||||
include ("./inc/header.php");
|
||||
include ("./inc/config_db.php");
|
||||
include ("./inc/crypt.php");
|
||||
|
|
@ -91,13 +93,17 @@ if( isset($_POST["send"]))
|
|||
echo "<h1>". Get_Text("makeuser_writeOK3"). "</h1>\n";
|
||||
}
|
||||
echo Get_Text("makeuser_writeOK4"). "</p><p></p>\n<br><br>\n";
|
||||
$success="any";
|
||||
|
||||
}
|
||||
}
|
||||
if( !isset($error) )
|
||||
echo Get_Text("makeuser_text4"). "<br>\n";
|
||||
else
|
||||
if( !isset($error) ){
|
||||
echo Get_Text("makeuser_text4"). "<a href=";
|
||||
echo($url). ">Login</a><br>\n";
|
||||
}else{
|
||||
echo "<p class=\"warning\">\n$error\n</p>\n\n";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
//init vars
|
||||
|
|
@ -116,7 +122,7 @@ else
|
|||
$_POST["kommentar"] = "";
|
||||
$_POST["Hometown"] = "";
|
||||
}
|
||||
|
||||
if( $success=="none" ){
|
||||
echo "<h1>".Get_Text("makeuser_text0")."</h1>". "<h2>". Get_Text("makeuser_text1"). "</h2>";
|
||||
echo "\t<form action=\"\" method=\"post\">\n";
|
||||
echo "\t\t<table>\n";
|
||||
|
|
@ -187,7 +193,7 @@ echo "\t\t\t<tr><td> </td><td><input type=\"submit\" name=\"send\" value=\"
|
|||
echo "\t\t</table>\n";
|
||||
echo "\t</form>\n";
|
||||
Print_Text("makeuser_text3");
|
||||
|
||||
}
|
||||
include ("./inc/footer.php");
|
||||
?>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<h4> Raum übersicht</h4>
|
||||
<h4> Raum übersicht</h4>
|
||||
|
||||
<?php
|
||||
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ else
|
|||
|
||||
}//if (isset($raum))
|
||||
|
||||
echo "<a href=\"". $_SESSION["newurl"]. "&Icon=0\">@</a>";
|
||||
//echo "<a href=\"". $_SESSION["newurl"]. "&Icon=0\">@</a>";
|
||||
|
||||
include ("./inc/footer.php");
|
||||
?>
|
||||
|
|
|
|||
Loading…
Reference in New Issue