summaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
authorFelix Favre <gnomus@gnomus.de>2014-12-07 18:04:03 +0100
committerFelix Favre <gnomus@gnomus.de>2014-12-07 18:04:03 +0100
commit5b3e5750ebd48993a58b38c657bb87e1e810d180 (patch)
tree848fd9c99eeb13027bf205c0850d0404ae0c58a1 /public
parent09ef38ff351b6d3308022531ec3f79b5700f2731 (diff)
parentb75700ee1bf4bc07f1da7899aac864cb561022f4 (diff)
Merge branch 'master' of github.com:engelsystem/engelsystem
Conflicts: includes/model/ShiftEntry_model.php
Diffstat (limited to 'public')
-rw-r--r--public/index.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/public/index.php b/public/index.php
index 0ba203b0..cd77f9f3 100644
--- a/public/index.php
+++ b/public/index.php
@@ -82,7 +82,7 @@ $free_pages = array(
'api',
'credits',
'angeltypes',
- 'users'
+ 'users'
);
// Gewünschte Seite/Funktion
@@ -91,10 +91,10 @@ if (! isset($_REQUEST['p']))
$_REQUEST['p'] = isset($user) ? "news" : "login";
if (isset($_REQUEST['p']) && preg_match("/^[a-z0-9_]*$/i", $_REQUEST['p']) && (in_array($_REQUEST['p'], $free_pages) || in_array($_REQUEST['p'], $privileges))) {
$p = $_REQUEST['p'];
-
+
$title = $p;
$content = "";
-
+
if ($p == "api") {
require_once realpath(__DIR__ . '/../includes/controller/api.php');
error("Api disabled temporily.");
@@ -222,7 +222,7 @@ echo template_render('../templates/layout.html', array(
'content' => msg() . $content,
'header_toolbar' => header_toolbar(),
'faq_url' => $faq_url,
- 'locale' => $_SESSION['locale']
+ 'locale' => $_SESSION['locale']
));
counter();