public flack entfernt, wird jetzt ueber UserCVS=-1 geregelt

git-svn-id: svn://svn.cccv.de/engel-system@22 29ba0400-6e00-0410-a75a-ca02368028f8

3 files changed, 25 insertions, 11 deletions

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";