removed faq feature

14 files changed, 26 insertions, 273 deletions

diff --git a/db/install.sql b/db/install.sql
index 26f1fe88..92cadfcd 100644
--- a/db/install.sql
+++ b/db/install.sql
@@ -92,42 +92,6 @@ INSERT INTO `Counter` (`URL`, `Anz`) VALUES
 -- --------------------------------------------------------
 
 --
--- Tabellenstruktur für Tabelle `FAQ`
---
-
-DROP TABLE IF EXISTS `FAQ`;
-CREATE TABLE IF NOT EXISTS `FAQ` (
-  `FID` bigint(20) NOT NULL AUTO_INCREMENT,
-  `Frage_de` text NOT NULL,
-  `Antwort_de` text NOT NULL,
-  `Frage_en` text NOT NULL,
-  `Antwort_en` text NOT NULL,
-  `Sprache` set('de','en') NOT NULL,
-  `QID` int(11) NOT NULL,
-  PRIMARY KEY (`FID`),
-  KEY `Sprache` (`Sprache`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=26 ;
-
---
--- Daten für Tabelle `FAQ`
---
-
-INSERT INTO `FAQ` (`FID`, `Frage_de`, `Antwort_de`, `Frage_en`, `Antwort_en`, `Sprache`, `QID`) VALUES
-(1, 'Komme ich als Engel billiger/kostenlos auf den Congress?', 'Nein, jeder Engel muss normal Eintritt bezahlen.', 'Do I get in cheaper / for free to the congress as an angel ?', 'No, every angel has to pay full price.', '', 0),
-(2, 'Was bekomme ich für meine Mitarbeit?', 'Jeder Engel der arbeitet bekommt ein kostenloses T-Shirt nach der Veranstalltung', 'What can i expect in return for my help?', 'Every working angel gets a free shirt after the event.', '', 0),
-(3, 'Wie lange muss ich als Engel arbeiten?', '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.', 'How long do I have to work as an angel ?', 'This is difficult to answer. It depends on what you decide to do (e.g. workshop angel) and how many people will attend.', '', 0),
-(6, 'Ich bin erst XX Jahre alt. Kann ich überhaupt helfen?', 'Wir können jede helfende Hand gebrauchen. Wenn du alt genug bist, um zum Congress zu kommen, bist du auch alt genug zu helfen.', 'I''m only XX years old. Can I help anyway?', 'We need every help we can get. If your old enough to come to the congress, your old enough to help.', '', 0),
-(8, 'Wer sind eigentlich die Erzengel?', 'Erzengel sind dieses Jahr: BugBlue, TabascoEye, Jeedi, Daizy, volty', 'Who <b>are</b> the Arch-Angels?', 'The ArchAngels for this year are: BugBlue, TabascoEye, Jeedi, Daizy, volty', '', 0),
-(9, 'Gibt es dieses Jahr wieder einen IRC-Channel f&uuml;r Engel?', 'Ja, im IRC-Net existiert #chaos-angel. Einfach mal reinschaun!', 'Will there be an IRC-channel for angels again?', 'Yes, in the IRC-net there''s #chaos-angel. Just have a look!', '', 0),
-(10, 'Wie gehe ich mit den Besuchern um?', 'Man soll gegen&uuml;ber den Besuchern immer h&ouml;flich und freundlich sein, auch wenn diese gestresst sind. Wenn man das Gef&uuml;hl hat, dass man mit der Situation nicht mehr klarkommt, sollte man sich jemanden zur Unterst&uuml;tzung holen, bevor man selbst auch gestresst wird :-)', 'How do I treat visitors?', 'You 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.', '', 0),
-(11, 'Wann sind die Engelbesprechungen?', 'Das wird vor Ort noch festgelegt und steht im Himmelnewssystem.', 'When are the angels briefings?', 'The information on the Angel Briefings will be in the news section of this system.', '', 0),
-(12, 'Was muss ich noch bedenken?', 'Man sollte nicht total &uuml;berm&uuml;det oder ausgehungert, wenn n man einen Einsatz hat. Eine gewisse Fitness ist hilfreich.', 'Anything else I should know?', 'You should not be exhausted or starving when you arrive for a shift. A reasonable amount of fitness for work would be very helpful.', '', 0),
-(13, 'Ich habe eine Frage, auf die ich in der FAQ keine Antwort gefunden habe. Wohin soll ich mich wenden?', 'Bei weitere Fragen kannst du die Anfragen an die Erzengel Formular benutzen.', 'I have a guestion not answered here. Who can I ask?', 'If you have further questions, you can use the Questions for the ArchAngels form.', '', 0),
-(20, 'Wer muss alles Eintritt zahlen?', 'Jeder. Zumindest, solange er/sie &auml;lter als 12 Jahre ist...', 'Who has to pay the full entrance price?', 'Everyone who is at older than 12 years old.', '', 0);
-
--- --------------------------------------------------------
-
---
 -- Tabellenstruktur für Tabelle `Groups`
 --
 
@@ -300,7 +264,6 @@ INSERT INTO `GroupPrivileges` (`id`, `group_id`, `privilege_id`) VALUES
 (139, -5, 12),
 (196, -2, 35),
 (138, -5, 14),
-(137, -5, 13),
 (136, -5, 7),
 (195, -2, 15),
 (87, -6, 18),
@@ -355,7 +318,6 @@ INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES
 (10, 'admin_groups', 'Manage usergroups and their rights'),
 (11, 'user_questions', 'Let users ask questions'),
 (12, 'admin_questions', 'Answer user''s questions'),
-(13, 'admin_faq', 'Edit FAQs'),
 (14, 'admin_news', 'Administrate the news section'),
 (15, 'news_comments', 'User can comment news'),
 (16, 'admin_user', 'Administrate the angels'),
@@ -365,7 +327,6 @@ INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES
 (20, 'user_wakeup', 'User wakeup-service organization'),
 (21, 'admin_import', 'Import rooms and shifts from pentabarf'),
 (22, 'credits', 'View credits'),
-(23, 'faq', 'View FAQ'),
 (24, 'user_shifts', 'Signup for shifts'),
 (25, 'user_shifts_admin', 'Signup other angels for shifts.'),
 (26, 'user_myshifts', 'Allow angels to view their own shifts and cancel them.'),
@@ -452,28 +413,6 @@ CREATE TABLE IF NOT EXISTS `ShiftEntry` (
 -- --------------------------------------------------------
 
 --
--- Tabellenstruktur für Tabelle `ShiftFreeloader`
---
-
-DROP TABLE IF EXISTS `ShiftFreeloader`;
-CREATE TABLE IF NOT EXISTS `ShiftFreeloader` (
-  `ID` int(11) NOT NULL AUTO_INCREMENT,
-  `Remove_Time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `UID` int(11) NOT NULL,
-  `Length` int(11) NOT NULL,
-  `Comment` text NOT NULL,
-  PRIMARY KEY (`ID`),
-  KEY `UID` (`UID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-
---
--- Daten für Tabelle `ShiftFreeloader`
---
-
-
--- --------------------------------------------------------
-
---
 -- Tabellenstruktur für Tabelle `Shifts`
 --
 
diff --git a/includes/pages/admin_faq.php b/includes/pages/admin_faq.php
deleted file mode 100644
index 1b2ea92b..00000000
--- a/includes/pages/admin_faq.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-function admin_faq_title() {
-  return _("Edit FAQs");
-}
-
-function admin_faq() {
-  if (! isset($_REQUEST['action'])) {
-    $faqs_html = "";
-    $faqs = sql_select("SELECT * FROM `FAQ`");
-    foreach ($faqs as $faq) {
-      $faqs_html .= sprintf('<tr><td> <dl><dt>%s</dt><dd>%s</dd></dl> </td>' . '<td> <dl><dt>%s</dt><dd>%s</dd></dl> </td>' . '<td><a href="%s&action=edit&id=%s">Edit</a></td></tr>', $faq['Frage_de'], $faq['Antwort_de'], $faq['Frage_en'], $faq['Antwort_en'], page_link_to('admin_faq'), $faq['FID']);
-    }
-    return template_render('../templates/admin_faq.html', array(
-        'link' => page_link_to("admin_faq"),
-        'faqs' => $faqs_html 
-    ));
-  } else {
-    switch ($_REQUEST['action']) {
-      case 'create':
-        $frage = strip_request_item_nl('frage');
-        $antwort = strip_request_item_nl('antwort');
-        $question = strip_request_item_nl('question');
-        $answer = strip_request_item_nl('answer');
-        
-        sql_query("INSERT INTO `FAQ` SET `Frage_de`='" . sql_escape($frage) . "', `Frage_en`='" . sql_escape($question) . "', `Antwort_de`='" . sql_escape($antwort) . "', `Antwort_en`='" . sql_escape($answer) . "'");
-        
-        redirect(page_link_to("admin_faq"));
-        break;
-      
-      case 'save':
-        if (isset($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id']))
-          $id = $_REQUEST['id'];
-        else
-          return error("Incomplete call, missing FAQ ID.", true);
-        
-        $faq = sql_select("SELECT * FROM `FAQ` WHERE `FID`=" . sql_escape($id) . " LIMIT 1");
-        if (count($faq) > 0) {
-          list($faq) = $faq;
-          
-          $frage = strip_request_item_nl('frage');
-          $antwort = strip_request_item_nl('antwort');
-          $question = strip_request_item_nl('question');
-          $answer = strip_request_item_nl('answer');
-          
-          sql_query("UPDATE `FAQ` SET `Frage_de`='" . sql_escape($frage) . "', `Frage_en`='" . sql_escape($question) . "', `Antwort_de`='" . sql_escape($antwort) . "', `Antwort_en`='" . sql_escape($answer) . "' WHERE `FID`=" . sql_escape($id) . " LIMIT 1");
-          
-          redirect(page_link_to("admin_faq"));
-        } else
-          return error("No FAQ found.", true);
-        break;
-      
-      case 'edit':
-        if (isset($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id']))
-          $id = $_REQUEST['id'];
-        else
-          return error("Incomplete call, missing FAQ ID.", true);
-        
-        $faq = sql_select("SELECT * FROM `FAQ` WHERE `FID`=" . sql_escape($id) . " LIMIT 1");
-        if (count($faq) > 0) {
-          list($faq) = $faq;
-          
-          return template_render('../templates/admin_faq_edit_form.html', array(
-              'link' => page_link_to("admin_faq"),
-              'id' => $id,
-              'frage' => $faq['Frage_de'],
-              'antwort' => $faq['Antwort_de'],
-              'question' => $faq['Frage_en'],
-              'answer' => $faq['Antwort_en'] 
-          ));
-        } else
-          return error("No FAQ found.", true);
-        break;
-      
-      case 'delete':
-        if (isset($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id']))
-          $id = $_REQUEST['id'];
-        else
-          return error("Incomplete call, missing FAQ ID.", true);
-        
-        $faq = sql_select("SELECT * FROM `FAQ` WHERE `FID`=" . sql_escape($id) . " LIMIT 1");
-        if (count($faq) > 0) {
-          list($faq) = $faq;
-          
-          sql_query("DELETE FROM `FAQ` WHERE `FID`=" . sql_escape($id) . " LIMIT 1");
-          redirect(page_link_to("admin_faq"));
-        } else
-          return error("No FAQ found.", true);
-        break;
-    }
-  }
-}
-?>
diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php
index ba7f17ff..2da454cf 100644
--- a/includes/pages/admin_user.php
+++ b/includes/pages/admin_user.php
@@ -196,7 +196,6 @@ function admin_user() {
       $html .= "</form>";
 
       $html .= "<hr />";
-      //$html .= funktion_db_element_list_2row("Freeloader Shifts", "SELECT `Remove_Time`, `Length`, `Comment` FROM `ShiftFreeloader` WHERE UID=" . $_REQUEST['id']);
     } else {
       switch ($_REQUEST['action']) {
         case 'save_groups' :
diff --git a/includes/pages/guest_faq.php b/includes/pages/guest_faq.php
deleted file mode 100644
index b6452f87..00000000
--- a/includes/pages/guest_faq.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-function faq_title() {
-  return _("FAQ");
-}
-
-function guest_faq() {
-	$html = "";
-	$faqs = sql_select("SELECT * FROM `FAQ`");
-	foreach ($faqs as $faq) {
-		$html .= "<dl>";
-		if ($_SESSION['locale'] == "de_DE.UTF-8") {
-			$html .= sprintf(
-				'<dt>%s</dt> <dd>%s</dd>',
-				$faq['Frage_de'],
-				$faq['Antwort_de']
-			);
-		} else {
-			$html .= sprintf(
-				'<dt>%s</dt> <dd>%s</dd>',
-				$faq['Frage_en'],
-				$faq['Antwort_en']
-			);
-		}
-		$html .= "</dl>";
-	}
-	return $html;
-}
-?>
diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php
index 037cd213..f072e411 100644
--- a/includes/pages/guest_login.php
+++ b/includes/pages/guest_login.php
@@ -13,7 +13,7 @@ function logout_title() {
 
 // Engel registrieren
 function guest_register() {
-  global $tshirt_sizes, $enable_tshirt_size, $default_theme;
+  global $tshirt_sizes, $enable_tshirt_size, $default_theme, $faq_url;
   
   $msg = "";
   $nick = "";
@@ -153,7 +153,7 @@ function guest_register() {
           form_text('hometown', _("Hometown"), $hometown),
           $enable_tshirt_size ? form_select('tshirt_size', _("Shirt size"), $tshirt_sizes, $tshirt_size) : '',
           // form_textarea('comment', _("Did you help at former CCC events and which tasks have you performed then?"), $comment),
-          form_checkboxes('angel_types', _("What do you want to do?") . sprintf("<br>(<a href=\"https://events.ccc.de/congress/2012/wiki/Volunteers#What_kind_of_volunteers_are_needed.3F\">%s</a>)", _("Description of job types")), $angel_types, $selected_angel_types),
+          form_checkboxes('angel_types', _("What do you want to do?") . sprintf("<br>(<a href=\"%s\">%s</a>)", $faq_url, _("Description of job types")), $angel_types, $selected_angel_types),
           form_info("", _("Restricted angel types need will be confirmed later by an archangel. You can change your selection in the options section.")),
           form_password('password', _("Password") . "*"),
           form_password('password2', _("Confirm password") . "*"),
diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php
index 81977c71..0edacd48 100644
--- a/includes/pages/user_settings.php
+++ b/includes/pages/user_settings.php
@@ -4,7 +4,7 @@ function settings_title() {
 }
 
 function user_settings() {
-  global $enable_tshirt_size, $tshirt_sizes, $themes, $locales;
+  global $enable_tshirt_size, $tshirt_sizes, $themes, $locales, $faq_url;
   global $user;
   
   $msg = "";
@@ -180,7 +180,7 @@ function user_settings() {
           form_text('jabber', _("Jabber"), $jabber),
           form_text('hometown', _("Hometown"), $hometown),
           $enable_tshirt_size ? form_select('tshirt_size', _("Shirt size"), $tshirt_sizes, $tshirt_size) : '',
-          form_checkboxes('angel_types', _("What do you want to do?") . sprintf("<br>(<a href=\"https://events.ccc.de/congress/2012/wiki/Volunteers#What_kind_of_volunteers_are_needed.3F\">%s</a>)", _("Description of job types")), $angel_types, $selected_angel_types),
+          form_checkboxes('angel_types', _("What do you want to do?") . sprintf("<br>(<a href=\"%s\">%s</a>)", $faq_url, _("Description of job types")), $angel_types, $selected_angel_types),
           form_submit('submit', _("Save")) 
       )),
       form(array(
diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index 29ed6626..3dae2007 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -275,7 +275,7 @@ function user_shifts() {
 
 function view_user_shifts() {
   global $user, $privileges;
-  global $ical_shifts;
+  global $ical_shifts, $faq_url;
   
   $ical_shifts = array();
   $days = sql_select_single_col("SELECT DISTINCT DATE(FROM_UNIXTIME(`start`)) AS `id`, DATE(FROM_UNIXTIME(`start`)) AS `name` FROM `Shifts` ORDER BY `start`");
@@ -697,7 +697,7 @@ function view_user_shifts() {
       'end_time' => $_SESSION['user_shifts']['end_time'],
       'type_select' => make_select($types, $_SESSION['user_shifts']['types'], "types", _("Tasks") . '<sup>1</sup>'),
       'filled_select' => make_select($filled, $_SESSION['user_shifts']['filled'], "filled", _("Occupancy")),
-      'task_notice' => '<sup>1</sup>' . _("The tasks shown here are influenced by the preferences you defined in your settings!") . " <a href=\"https://events.ccc.de/congress/2013/wiki/Volunteers#What_kind_of_volunteers_are_needed.3F\">" . _("Description of the jobs.") . "</a>",
+      'task_notice' => '<sup>1</sup>' . _("The tasks shown here are influenced by the preferences you defined in your settings!") . " <a href=\"" . $faq_url . "\">" . _("Description of the jobs.") . "</a>",
       'new_style_checkbox' => '<label><input type="checkbox" name="new_style" value="1" ' . ($_SESSION['user_shifts']['new_style'] ? ' checked' : '') . '> ' . _("Use new style if possible") . '</label>',
       'shifts_table' => $shifts_table,
       'ical_text' => '<h2>' . _("iCal export") . '</h2><p>' . sprintf(_("Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s\">JSON format</a> available (please keep secret, otherwise <a href=\"%s\">reset the api key</a>)."), page_link_to_absolute('ical') . '&key=' . $user['api_key'], page_link_to_absolute('shifts_json_export') . '&key=' . $user['api_key'], page_link_to('user_myshifts') . '&reset') . '</p>',
diff --git a/includes/sys_menu.php b/includes/sys_menu.php
index e65f1d36..d4620753 100644
--- a/includes/sys_menu.php
+++ b/includes/sys_menu.php
@@ -39,10 +39,6 @@ function make_navigation() {
   global $privileges;
   $menu = "";
   
-  $specials = array(
-      "faq"
-  );
-  
   $pages = array(
       "news" => news_title(),
       "user_meetings" => meetings_title(),
@@ -61,13 +57,12 @@ function make_navigation() {
       "admin_shifts" => admin_shifts_title(),
       "admin_rooms" => admin_rooms_title(),
       "admin_groups" => admin_groups_title(),
-      "admin_faq" => admin_faq_title(),
       "admin_import" => admin_import_title(),
       "admin_log" => admin_log_title()
   );
   
   foreach ($pages as $page => $title)
-    if (in_array($page, $privileges) || in_array($page, $specials))
+    if (in_array($page, $privileges))
       $menu .= '<li' . ($page == $p ? ' class="selected"' : '') . '><a href="' . page_link_to($page) . '">' . $title . '</a></li>';
   
   return '<nav><ul>' . $menu . '</ul></nav>';
@@ -75,14 +70,10 @@ function make_navigation() {
 
 function make_navigation_for($name, $pages) {
   global $privileges, $p;
-  
-  $specials = array(
-      "faq" 
-  );
-  
+
   $menu = "";
   foreach ($pages as $page)
-    if (in_array($page, $privileges) || in_array($page, $specials))
+    if (in_array($page, $privileges))
       $menu .= '<li' . ($page == $p ? ' class="selected"' : '') . '><a href="' . page_link_to($page) . '">' . $title . '</a></li>';
   
   if ($menu != "")
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
index 58b0d52b..53527e92 100644
--- a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
+++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
index f90933d0..5abcab38 100644
--- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po
+++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Engelsystem 2.0\n"
-"POT-Creation-Date: 2013-12-03 16:18+0100\n"
-"PO-Revision-Date: 2013-12-03 16:18+0100\n"
+"POT-Creation-Date: 2013-12-03 16:28+0100\n"
+"PO-Revision-Date: 2013-12-03 16:28+0100\n"
 "Last-Translator: msquare <msquare@notrademark.de>\n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -154,10 +154,6 @@ msgstr "angekommen"
 msgid "Arrived?"
 msgstr "Angekommen?"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_faq.php:3
-msgid "Edit FAQs"
-msgstr "FAQs bearbeiten"
-
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:3
 msgid "Free angels"
 msgstr "Freie Engel"
@@ -206,7 +202,7 @@ msgstr "Engelliste"
 msgid "Save"
 msgstr "Speichern"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:332
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:331
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:90
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:62
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:476
@@ -250,10 +246,6 @@ msgstr "Es gibt nicht freigeschaltete Engeltypen!"
 msgid "Credits"
 msgstr "Credits"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_faq.php:3
-msgid "FAQ"
-msgstr "FAQ"
-
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:3
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:217
 msgid "Login"
@@ -1024,11 +1016,11 @@ msgstr "Kommentar (nur für Dich):"
 msgid "Please select..."
 msgstr "Bitte auswählen..."
 
-#: /Users/msquare/workspace/projects/engelsystem/public/index.php:182
+#: /Users/msquare/workspace/projects/engelsystem/public/index.php:174
 msgid "No Access"
 msgstr "Kein Zugriff"
 
-#: /Users/msquare/workspace/projects/engelsystem/public/index.php:183
+#: /Users/msquare/workspace/projects/engelsystem/public/index.php:175
 msgid ""
 "You don't have permission to view this page. You probably have to sign in or "
 "register in order to gain access!"
@@ -1036,7 +1028,7 @@ msgstr ""
 "Du hast keinen Zugriff auf diese Seite. Registriere Dich und logge Dich "
 "bitte ein, um Zugriff zu erhalten!"
 
-#: /Users/msquare/workspace/projects/engelsystem/public/index.php:196
+#: /Users/msquare/workspace/projects/engelsystem/public/index.php:188
 msgid ""
 "You are not marked as arrived. Please go to heaven's desk, get your angel "
 "badge and/or tell them that you arrived already."
@@ -1044,15 +1036,21 @@ msgstr ""
 "Du bist nicht als angekommen markiert. Bitte gehe zur Himmelsverwaltung, "
 "hole Dein Badge ab und/oder erkläre ihnen, dass Du bereits angekommen bist."
 
-#: /Users/msquare/workspace/projects/engelsystem/public/index.php:199
+#: /Users/msquare/workspace/projects/engelsystem/public/index.php:191
 msgid "You need to specify a tshirt size in your settings!"
 msgstr ""
 
-#: /Users/msquare/workspace/projects/engelsystem/public/index.php:202
+#: /Users/msquare/workspace/projects/engelsystem/public/index.php:194
 msgid ""
 "You need to specify a DECT phone number in your settings! If you don't have "
 "a DECT phone, just enter \"-\"."
 msgstr ""
 
+#~ msgid "Edit FAQs"
+#~ msgstr "FAQs bearbeiten"
+
+#~ msgid "FAQ"
+#~ msgstr "FAQ"
+
 #~ msgid "asdf"
 #~ msgstr "fdsa"
diff --git a/public/index.php b/public/index.php
index 08eb433e..60e0068c 100644
--- a/public/index.php
+++ b/public/index.php
@@ -29,7 +29,6 @@ if(file_exists('config/config.php'))
 require_once ('includes/pages/admin_active.php');
 require_once ('includes/pages/admin_angel_types.php');
 require_once ('includes/pages/admin_arrive.php');
-require_once ('includes/pages/admin_faq.php');
 require_once ('includes/pages/admin_free.php');
 require_once ('includes/pages/admin_groups.php');
 require_once ('includes/pages/admin_import.php');
@@ -39,7 +38,6 @@ require_once ('includes/pages/admin_rooms.php');
 require_once ('includes/pages/admin_shifts.php');
 require_once ('includes/pages/admin_user.php');
 require_once ('includes/pages/admin_user_angeltypes.php');
-require_once ('includes/pages/guest_faq.php');
 require_once ('includes/pages/guest_login.php');
 require_once ('includes/pages/user_messages.php');
 require_once ('includes/pages/user_myshifts.php');
@@ -150,9 +148,6 @@ elseif (in_array($p, $privileges)) {
   } elseif ($p == "admin_groups") {
     $title = admin_groups_title();
     $content = admin_groups();
-  } elseif ($p == "admin_faq") {
-    $title = admin_faq_title();
-    $content = admin_faq();
   } elseif ($p == "admin_language") {
     require_once ('includes/pages/admin_language.php');
     $content = admin_language();
@@ -173,9 +168,6 @@ elseif (in_array($p, $privileges)) {
   require_once ('includes/pages/guest_credits.php');
   $title = credits_title();
   $content = guest_credits();
-} elseif ($p == "faq") {
-  $title = faq_title();
-  $content = guest_faq();
 } else {
   // Wenn schon eingeloggt, keine-Berechtigung-Seite anzeigen
   if (isset($user)) {
@@ -215,7 +207,8 @@ echo template_render('../templates/layout.html', array(
     'atom_link' => ($p == 'news' || $p == 'user_meetings') ? '<link href="' . page_link_to('atom') . (($p == 'user_meetings') ? '&amp;meetings=1' : '') . '&amp;key=' . $user['api_key'] . '" type="application/atom+xml" rel="alternate" title="Atom Feed">' : '',
     'menu' => make_menu(),
     'content' => $content,
-    'header_toolbar' => header_toolbar() 
+    'header_toolbar' => header_toolbar(),
+    'faq_url' => $faq_url
 ));
 
 counter();
diff --git a/templates/admin_faq.html b/templates/admin_faq.html
deleted file mode 100644
index 0eee8d20..00000000
--- a/templates/admin_faq.html
+++ /dev/null
@@ -1,6 +0,0 @@
-%faqs%
-<hr/>Create new FAQ:
-<form action="%link%&action=create" method="post">
-%new_form%
-    <input type="submit" name="submit" value="Create" />
-</form>
diff --git a/templates/admin_faq_edit_form.html b/templates/admin_faq_edit_form.html
deleted file mode 100644
index 1ef791aa..00000000
--- a/templates/admin_faq_edit_form.html
+++ /dev/null
@@ -1,41 +0,0 @@
-Edit FAQ:
-<form action="%link%&action=save" method="post">
-    <table>
-        <tr>
-            <td>
-                Frage
-            </td>
-            <td>
-                <textarea name="frage">%frage%</textarea>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                Antwort
-            </td>
-            <td>
-                <textarea name="antwort">%antwort%</textarea>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                Question
-            </td>
-            <td>
-                <textarea name="question">%question%</textarea>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                Answer
-            </td>
-            <td>
-                <textarea name="answer">%answer%</textarea>
-            </td>
-        </tr>
-    </table>
-    <input type="hidden" name="id" value="%id%" /><input type="submit" name="submit" value="Save" />
-</form><hr/>
-<form action="%link%&action=delete" method="post">
-    Delete FAQ: <input type="hidden" name="id" value="%id%" /><input type="submit" name="submit" value="Delete" />
-</form>
\ No newline at end of file
diff --git a/templates/layout.html b/templates/layout.html
index e1ecd9b9..936f5660 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -26,7 +26,7 @@
                 %menu%
                 <nav class="container small">
                     <ul>
-                        <li><a href="?p=faq">FAQ</a></li>
+                        <li><a href="%faq_url%">FAQ</a></li>
                         <li><a href="mailto:erzengel@lists.ccc.de">Contact <img src="pic/icons/email.png" alt="E-Mail"></a></li>
                         <li><a href="mailto:bugs@engelsystem.de">Bugs / Features <img src="pic/icons/email.png" alt="E-Mail"></a></li>
                         <li><a href="https://vcs.wybt.net/engelsystem/trac/">Development Platform</a></li>