summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/UserCVS.php5
-rw-r--r--includes/config_MessegeServer.php7
-rw-r--r--includes/config_modem.php10
-rw-r--r--includes/crypt.php2
-rw-r--r--includes/error_handler.php2
-rw-r--r--includes/header.php4
-rw-r--r--includes/header_start.php4
-rw-r--r--includes/login_eingabefeld.php2
8 files changed, 11 insertions, 25 deletions
diff --git a/includes/UserCVS.php b/includes/UserCVS.php
index 7798ee66..c062106f 100644
--- a/includes/UserCVS.php
+++ b/includes/UserCVS.php
@@ -20,13 +20,14 @@
}
// pagename ermitteln
- $Page["Name"] = basename($_SERVER['PHP_SELF']);
+ //$Page["Name"] = basename($_SERVER['PHP_SELF']);
+ $Page["Name"] = str_replace($ENGEL_ROOT, '', $_SERVER['PHP_SELF']);
//recht fuer diese seite auslesen
if(isset($_SESSION['CVS'][$Page["Name"]]))
$Page["CVS"] = $_SESSION['CVS'][$Page["Name"]];
else {
- echo "SYSTEM ERROR: now right for " . $Page["Name"] . " exists.";
+ echo "SYSTEM ERROR: no right for " . $Page["Name"] . " exists.";
die;
}
diff --git a/includes/config_MessegeServer.php b/includes/config_MessegeServer.php
deleted file mode 100644
index ce7c7c3a..00000000
--- a/includes/config_MessegeServer.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
- // Set the ip and port we will listen on
- define(SERVER_ADDRESS, "127.0.0.1");
- define(SERVER_PORT, 9000);
-
- define(DEBUG, true);
-?>
diff --git a/includes/config_modem.php b/includes/config_modem.php
deleted file mode 100644
index 2de37cb7..00000000
--- a/includes/config_modem.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
- // ist ein modem angeschlossen
- $ModemEnable = false;
-
- // COM port
- $ModemDev = "/dev/ttyS0";
-
- // vorwahl, bei tnovis telefonanlage fuer das programmieren von weckrufen
- $WakeupNumber = "**3";
-?>
diff --git a/includes/crypt.php b/includes/crypt.php
index d511e4f4..8de22030 100644
--- a/includes/crypt.php
+++ b/includes/crypt.php
@@ -1,6 +1,6 @@
<?php
function PassCrypt($passwort) {
- include "config.php";
+ include "../../config/config.php";
switch ($crypt_system) {
case "crypt":
diff --git a/includes/error_handler.php b/includes/error_handler.php
index 5a58076b..42e561fc 100644
--- a/includes/error_handler.php
+++ b/includes/error_handler.php
@@ -100,7 +100,7 @@
function send_message(&$message)
{
chdir(dirname(__FILE__));
- require_once('./config_jabber.php');
+ require_once('../config/config_jabber.php');
if (isset($jabber_recipient) && count($jabber_recipient)) {
$jabber = new Jabber($server, $port, $username, $password, $resource);
diff --git a/includes/header.php b/includes/header.php
index 6b206049..9fb882bf 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -17,7 +17,9 @@ echo "<!DOCTYPE html>\n";
<meta name="revisit-after" content="1 days" />
<script type="text/javascript" src="css/grossbild.js"></script>
<link rel="stylesheet" type="text/css" href="css/base.css" />
-<link rel="stylesheet" type="text/css" href="css/style<?php echo isset($_SESSION['color']) ? $_SESSION['color'] : "6" ?>.css" />
+<link rel="stylesheet" type="text/css" href="css/style<?php echo isset($_SESSION['color']) ? $_SESSION['color'] : $default_theme ?>.css" />
+<link rel="stylesheet" type="text/css" href="../css/base.css" />
+<link rel="stylesheet" type="text/css" href="../css/style<?php echo isset($_SESSION['color']) ? $_SESSION['color'] : $default_theme ?>.css" />
<?php
diff --git a/includes/header_start.php b/includes/header_start.php
index 97b98fc3..70f986cf 100644
--- a/includes/header_start.php
+++ b/includes/header_start.php
@@ -1,9 +1,9 @@
<?php
ini_set("session.gc_maxlifetime", "65535");
- include "config.php";
+ include "config/config.php";
include "error_handler.php";
- include "config_db.php";
+ include "config/config_db.php";
include "funktion_lang.php";
include "funktion_faq.php"; // fuer noAnswer() im menu
include "funktion_menu.php";
diff --git a/includes/login_eingabefeld.php b/includes/login_eingabefeld.php
index e68639cf..9e10271d 100644
--- a/includes/login_eingabefeld.php
+++ b/includes/login_eingabefeld.php
@@ -1,5 +1,5 @@
<?php
- include "config.php";
+ include "config/config.php";
?>
<form action="<?php echo $url . $ENGEL_ROOT; ?>nonpublic/index.php" method="post">