summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xwww-ssl/admin/dbUpdateFromXLS.php2
-rwxr-xr-xwww-ssl/admin/dect.php1
-rwxr-xr-xwww-ssl/faq.php1
-rwxr-xr-xwww-ssl/inc/UserCVS.php21
-rwxr-xr-xwww-ssl/inc/funktion_menu.php7
-rwxr-xr-xwww-ssl/inc/header.php8
-rwxr-xr-xwww-ssl/index.php1
-rwxr-xr-xwww-ssl/lageplan.php1
-rwxr-xr-xwww-ssl/logout.php1
-rwxr-xr-xwww-ssl/makeuser.php1
-rwxr-xr-xwww-ssl/menu.php23
-rwxr-xr-xwww-ssl/nonpublic/index.php1
12 files changed, 48 insertions, 20 deletions
diff --git a/www-ssl/admin/dbUpdateFromXLS.php b/www-ssl/admin/dbUpdateFromXLS.php
index 88f7a0f5..eb3b5ac3 100755
--- a/www-ssl/admin/dbUpdateFromXLS.php
+++ b/www-ssl/admin/dbUpdateFromXLS.php
@@ -1,8 +1,6 @@
<?PHP
-
$title = "DB Update from XML";
$header = "DB Update from XML";
-$Page["Public"] = "N";
include ("./inc/header.php");
include ("./inc/funktion_user.php");
include ("./inc/funktion_xml.php");
diff --git a/www-ssl/admin/dect.php b/www-ssl/admin/dect.php
index 99a58028..49cb72bc 100755
--- a/www-ssl/admin/dect.php
+++ b/www-ssl/admin/dect.php
@@ -2,7 +2,6 @@
$title = "Engelsystem - DECT";
$header = "DECT send call";
-$Page["Public"] = "N";
include ("./inc/header.php");
include ("./inc/funktion_modem.php");
diff --git a/www-ssl/faq.php b/www-ssl/faq.php
index 90f73fb5..50c42552 100755
--- a/www-ssl/faq.php
+++ b/www-ssl/faq.php
@@ -1,7 +1,6 @@
<?php
$title = "Index";
$header = "FAQ";
-$Page["Public"] = "Y";
include ("./inc/header.php");
diff --git a/www-ssl/inc/UserCVS.php b/www-ssl/inc/UserCVS.php
index 48e4d012..f6bc30ed 100755
--- a/www-ssl/inc/UserCVS.php
+++ b/www-ssl/inc/UserCVS.php
@@ -1,12 +1,25 @@
<?php
-if( !isset($Page["Public"])) $Page["Public"]="N";
+if( !isset($_SESSION['UID']))
+ $_SESSION['UID'] = -1;
+// CVS import Data
+$SQL = "SELECT * FROM `UserCVS` WHERE UID=".$_SESSION['UID'];
+$Erg_CVS = mysql_query($SQL, $con);
+$_SESSION['CVS'] = mysql_fetch_array($Erg_CVS);
+
+//pagename ermitteln
$Page["Name"] = substr( $_SERVER['PHP_SELF'], strlen($ENGEL_ROOT) );
+
+
+//recht für diese seite auslesen
if( isset( $_SESSION['CVS'][ $Page["Name"] ]))
$Page["CVS"] = $_SESSION['CVS'][ $Page["Name"] ];
else
- $Page["CVS"] = "";
+{
+ echo "SYSTEM ERROR: now right for ". $Page["Name"]. "exist";
+ die;
+}
if( $DEBUG )
{
@@ -21,10 +34,6 @@ if( $DEBUG )
else
echo "CVS: ". $Page["Name"]. " => '". $Page["CVS"]. "'<br>";
- if( $Page["Public"] == "Y")
- echo "<h3>Page is Public !!!</h3>";
- else
- echo "<h4>Page is non Public</h4>";
}
?>
diff --git a/www-ssl/inc/funktion_menu.php b/www-ssl/inc/funktion_menu.php
index d66700e8..586fce91 100755
--- a/www-ssl/inc/funktion_menu.php
+++ b/www-ssl/inc/funktion_menu.php
@@ -18,10 +18,11 @@ function ShowMenu( $Menu )
$MenuFile = $Menu["Path"]. $Entry["File"];
if( $_SESSION['CVS'][$MenuFile] == "Y")
+ {
echo "\t\t\t<li><a href=\"". $Entry["File"]. "\">". $Entry["Name"]. "</a></li>\n";
- if( isset($Entry["Line"]))
- echo $Entry["Line"];
-
+ if( isset($Entry["Line"]))
+ echo $Entry["Line"];
+ }
//DEBUG
if( $DEBUG )
diff --git a/www-ssl/inc/header.php b/www-ssl/inc/header.php
index 64e831fd..8dac6324 100755
--- a/www-ssl/inc/header.php
+++ b/www-ssl/inc/header.php
@@ -9,6 +9,9 @@ include ("./inc/secure.php");
exit ();
} // Ende Rechte f. Nonpublic'*/
+if( !isset($_SESSION['IP']))
+ $_SESSION['IP'] = $_SERVER['REMOTE_ADDR'];
+
if (IsSet($_SESSION['UID']) and ($_SESSION['IP'] <> $_SERVER['REMOTE_ADDR']))
{
header("Location: https://".$_SERVER['HTTP_HOST'].$ENGEL_ROOT);
@@ -64,7 +67,8 @@ if( $Page["ShowTabel"]=="Y" )
?>
<div align="center">
- <a name="#top"><img src="./inc/himmel<? if ($_SESSION['color']==6) { echo "_w"; } ?>.png" alt="Unser Himmel"></a>
+ <a name="#top"><img src="./inc/himmel<? if( isset($_SESSION['color']))
+ if ($_SESSION['color']==6) echo "_w"; ?>.png" alt="Unser Himmel"></a>
<p>
<table width="95%" align="center" border="0" cellpadding="7" cellspacing="0">
<tr>
@@ -108,7 +112,7 @@ function SetHeaderGo2Back ()
}
-if ( $Page["Public"]!= "Y" && $Page["CVS"] != "Y" ) {
+if ( $Page["CVS"] != "Y" ) {
echo "Du besitzt kein Rechte für diesen Bereich.<br>\n";
If (IsSet($_SESSION['oldurl']))
echo "<a href=\"".$oldurl."\">".Get_Text(11)."</a> geht's zur&uuml;ck...\n";
diff --git a/www-ssl/index.php b/www-ssl/index.php
index 9225ec71..f4de90ce 100755
--- a/www-ssl/index.php
+++ b/www-ssl/index.php
@@ -1,7 +1,6 @@
<?php
$title = "Index";
$header = "Index";
-$Page["Public"] = "Y";
include ("./inc/header.php");
echo Get_Text("index_text1")."<br><br>";
diff --git a/www-ssl/lageplan.php b/www-ssl/lageplan.php
index 08195023..6828376c 100755
--- a/www-ssl/lageplan.php
+++ b/www-ssl/lageplan.php
@@ -1,7 +1,6 @@
<?php
$title = "Index";
$header = "Lageplan";
-$Page["Public"] = "Y";
include ("./inc/header.php");
?>
diff --git a/www-ssl/logout.php b/www-ssl/logout.php
index 40995b8a..23ec9aed 100755
--- a/www-ssl/logout.php
+++ b/www-ssl/logout.php
@@ -1,7 +1,6 @@
<?php
$title = "Himmel";
$header = "News";
-$Page["Public"] = "Y";
// Die Session zerstoeren...
session_start();
diff --git a/www-ssl/makeuser.php b/www-ssl/makeuser.php
index eae1f855..ae21b44a 100755
--- a/www-ssl/makeuser.php
+++ b/www-ssl/makeuser.php
@@ -2,7 +2,6 @@
$title = "MakeNewUser";
$header = "Make New User";
-$Page["Public"]="N^";
include ("./inc/header.php");
include ("./inc/db.php");
include ("./inc/crypt.php");
diff --git a/www-ssl/menu.php b/www-ssl/menu.php
index 2c3f95c2..f2789d17 100755
--- a/www-ssl/menu.php
+++ b/www-ssl/menu.php
@@ -1,3 +1,5 @@
+<?PHP
+/*
<? echo $MenueTableStart; ?>
<h4><? echo Get_Text("menu_Name")?></h4>
@@ -12,3 +14,24 @@
</div>
<? echo $MenueTableEnd; ?>
+
+*/
+
+$Menu["Path"] = "";
+$Menu["Name"] = Get_Text("menu_Name");
+$Menu["Entry"][0]["File"] = "index.php";
+$Menu["Entry"][0]["Name"] = Get_Text("menu_index");
+$Menu["Entry"][0]["Line"] = "<br>";
+$Menu["Entry"][1]["File"] = "faq.php";
+$Menu["Entry"][1]["Name"] = Get_Text("menu_FAQ");
+$Menu["Entry"][1]["Line"] = "<br>";
+$Menu["Entry"][2]["File"] = "lageplan.php";
+$Menu["Entry"][2]["Name"] = Get_Text("menu_plan");
+$Menu["Entry"][2]["Line"] = "<br>";
+$Menu["Entry"][3]["File"] = "makeuser.php";
+$Menu["Entry"][3]["Name"] = Get_Text("menu_MakeUser");
+$Menu["Entry"][3]["Line"] = "<br>";
+$Menu["Entry"][4]["File"] = "nonpublic/schichtplan_beamer.php";
+$Menu["Entry"][4]["Name"] = Get_Text("pub_menu_SchichtplanBeamer");
+
+?>
diff --git a/www-ssl/nonpublic/index.php b/www-ssl/nonpublic/index.php
index d46b0a10..743534e1 100755
--- a/www-ssl/nonpublic/index.php
+++ b/www-ssl/nonpublic/index.php
@@ -1,7 +1,6 @@
<?
$title = "Index";
$header = "Index";
-$Page["Public"] = "Y";
include ("./inc/db.php");
include ("./inc/crypt.php");