From 83a90af93078aee26067761db11dfbb369f1e188 Mon Sep 17 00:00:00 2001
From: ichdasich <ichdasich@29ba0400-6e00-0410-a75a-ca02368028f8>
Date: Wed, 10 Sep 2008 15:43:25 +0000
Subject: [PATCH] fixed most of the files in http-root and includes

git-svn-id: svn://svn.cccv.de/engel-system@282 29ba0400-6e00-0410-a75a-ca02368028f8
---
 TODO_FIX_INCLUDES                      | 71 ++++++++++++++++++++++++++
 includes/ShowUserPicture.php           |  8 +--
 includes/crypt.php                     |  2 +-
 includes/error_handler.php             |  4 +-
 includes/footer.php                    |  6 +--
 includes/funktion_SendMessenges.php    |  2 +-
 includes/funktion_modem.php            |  2 +-
 includes/funktion_schichtplan_aray.php |  2 +-
 includes/login_eingabefeld.php         |  2 +-
 includes/menu.php                      |  2 +-
 www-ssl/admin/inc                      |  1 -
 www-ssl/faq.php                        |  4 +-
 www-ssl/index.php                      |  6 +--
 www-ssl/lageplan.php                   |  4 +-
 www-ssl/logout.php                     |  2 +-
 www-ssl/makeuser.php                   | 10 ++--
 www-ssl/nonpublic/inc                  |  1 -
 17 files changed, 99 insertions(+), 30 deletions(-)
 create mode 100644 TODO_FIX_INCLUDES
 delete mode 120000 www-ssl/admin/inc
 delete mode 120000 www-ssl/nonpublic/inc

diff --git a/TODO_FIX_INCLUDES b/TODO_FIX_INCLUDES
new file mode 100644
index 00000000..3de2b8cf
--- /dev/null
+++ b/TODO_FIX_INCLUDES
@@ -0,0 +1,71 @@
+ich@DenkBrett www-ssl % find . -type l
+./admin/inc
+./admin/pic
+./inc/inc
+./nonpublic/inc
+./nonpublic/pic
+
+find . -name \*.php -exec grep -l './inc' {} \;
+
+ich@DenkBrett www-ssl % find . -name \*.php -exec grep -l './inc' {} \;
+./admin/EngelType.php
+./admin/schichtplan.php
+./admin/user2.php
+./admin/dbUpdateFromXLS.php
+./admin/index.php
+./admin/faq.php
+./admin/Recentchanges.php
+./admin/dect_call.php
+./admin/UserPicture.php
+./admin/room.php
+./admin/news.php
+./admin/tshirt.php
+./admin/aktiv.php
+./admin/user.php
+./admin/dect.php
+./admin/free.php
+./admin/userDefaultSetting.php
+./admin/sprache.php
+./admin/debug.php
+./admin/shiftadd.php
+./admin/schichtplan_druck.php
+#./inc/funktion_schichtplan_aray.php
+#./inc/footer.php
+#./inc/menu.php
+#./inc/funktion_modem.php
+./inc/funktion_flag.php # Special fix needed. ich geh ins bett
+#./inc/error_handler.php
+./inc/header.php # Special fix needed
+./inc/funktion_user.php # Special fix needed
+#./inc/crypt.php
+#./inc/ShowUserPicture.php
+#./inc/login_eingabefeld.php
+#./inc/funktion_SendMessenges.php
+./nonpublic/waeckliste.php
+./nonpublic/schichtplan.1.php
+./nonpublic/schichtplan.php
+./nonpublic/schichtplan.2.php
+./nonpublic/myschichtplan.php
+./nonpublic/messages.php
+./nonpublic/index.php
+./nonpublic/faq.php
+./nonpublic/schichtplan_add.php
+./nonpublic/schichtplan_beamer.php
+./nonpublic/news.php
+./nonpublic/einstellungen.php
+./nonpublic/wecken.php
+./nonpublic/engelbesprechung.php
+./nonpublic/news_comments.php
+#./logout.php
+#./makeuser.php
+#./lageplan.php
+#./faq.php
+#./index.php
+
+
+todo:
+./inc > ../inc
+change includes in every fucking file
+FUCKING MOOOOOVE the pictures out of inc to /pic, where they belong. -.-'
+same as above for css-files
+change installscript to place inc outside of http-root. exactly ONE dir ahead.
diff --git a/includes/ShowUserPicture.php b/includes/ShowUserPicture.php
index 8e058127..bb1893d8 100644
--- a/includes/ShowUserPicture.php
+++ b/includes/ShowUserPicture.php
@@ -1,10 +1,10 @@
 <?PHP
 
-include ("./inc/config.php");
-include ("./inc/error_handler.php");
-include ("./inc/config_db.php");
+include ("./config.php");
+include ("./error_handler.php");
+include ("./config_db.php");
 if( !isset($_SESSION))	session_start();
-include ("./inc/secure.php");
+include ("./secure.php");
 
 
 // Parameter check
diff --git a/includes/crypt.php b/includes/crypt.php
index 38867064..474cd62c 100755
--- a/includes/crypt.php
+++ b/includes/crypt.php
@@ -2,7 +2,7 @@
 
 
 function PassCrypt($passwort) {
-include "./inc/config.php";
+include "./config.php";
 
 switch ($crypt_system) {
   case "crypt":
diff --git a/includes/error_handler.php b/includes/error_handler.php
index b0a41581..062df488 100755
--- a/includes/error_handler.php
+++ b/includes/error_handler.php
@@ -1,6 +1,6 @@
 <?php
 
-  require_once("./inc/funktion_jabber.php");
+  require_once("./funktion_jabber.php");
 
   // global array for collected error_messages
   $error_messages = array();
@@ -104,7 +104,7 @@
   function send_message(&$message)
   {
     chdir(dirname(__FILE__));
-    require_once('../inc/config_jabber.php');
+    require_once('./config_jabber.php');
 
     if (isset($jabber_recipient) && count($jabber_recipient)) {
       $jabber = new Jabber($server, $port, $username, $password, $resource);
diff --git a/includes/footer.php b/includes/footer.php
index 70613d29..d61545c0 100755
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -30,7 +30,7 @@ if( $Page["ShowTabel"]=="Y" )
 
 <!-- anfang des menue parts //-->
 <?PHP
-if( $_SESSION['Menu'] =="R")            include("./inc/menu.php");
+if( $_SESSION['Menu'] =="R")            include("./menu.php");
 ?>
 		</td> 
 
@@ -45,8 +45,8 @@ if( $_SESSION['Menu'] =="R")            include("./inc/menu.php");
 		<td colspan="2">
 			<h5 align="center"> &#169; copyleft - <a href="mailto:erzengel@lists.ccc.de">Kontakt</a>
 			<?PHP 
-				include( "./inc/funktion_counter.php"); 
-				include( "./inc/funktion_flag.php"); 
+				include( "./funktion_counter.php"); 
+				include( "./funktion_flag.php"); 
 			?></h5>
         	</td>
 	</tr>
diff --git a/includes/funktion_SendMessenges.php b/includes/funktion_SendMessenges.php
index c6676c6c..893c6600 100644
--- a/includes/funktion_SendMessenges.php
+++ b/includes/funktion_SendMessenges.php
@@ -3,7 +3,7 @@
 
 function SendData($Data)
 {
-	include("./inc/config_MessegeServer.php");
+	include("./config_MessegeServer.php");
 	// Create a UDP socket
 	$sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
 	//send packed
diff --git a/includes/funktion_modem.php b/includes/funktion_modem.php
index 6cbbb49b..ffc5b9c2 100755
--- a/includes/funktion_modem.php
+++ b/includes/funktion_modem.php
@@ -1,5 +1,5 @@
 <?PHP
-include "./inc/config_modem.php";
+include "./config_modem.php";
 
 function DialNumber( $Number )
 {
diff --git a/includes/funktion_schichtplan_aray.php b/includes/funktion_schichtplan_aray.php
index 02ea8dfd..3189f73f 100755
--- a/includes/funktion_schichtplan_aray.php
+++ b/includes/funktion_schichtplan_aray.php
@@ -34,5 +34,5 @@
 		$TID2Name[ mysql_result($Erg, $i, "TID") ] = mysql_result($Erg, $i, "Name");
 	}												
 
-include ("./inc/funktion_schichtplan_Tage.php");
+include ("./funktion_schichtplan_Tage.php");
 ?>
diff --git a/includes/login_eingabefeld.php b/includes/login_eingabefeld.php
index afb0c90e..ff26f65f 100755
--- a/includes/login_eingabefeld.php
+++ b/includes/login_eingabefeld.php
@@ -1,7 +1,7 @@
 
 
 <form action="<?PHP
-include ("./inc/config.php");
+include ("./config.php");
 echo substr($url, 0, strlen($url)-1). $ENGEL_ROOT
 ?>nonpublic/index.php" method="post">
 <table>
diff --git a/includes/menu.php b/includes/menu.php
index ea65383a..dcb80b84 100755
--- a/includes/menu.php
+++ b/includes/menu.php
@@ -51,7 +51,7 @@ if( isset($_SESSION['UID']))
 <table align="center" class="border" cellpadding="3" cellspacing="1">
 	<tr>
 		<td width="160" class="menu">
-		<?php include("./inc/funktion_activeUser.php"); ?>
+		<?php include("./funktion_activeUser.php"); ?>
 		</td>
 	</tr>
 </table>
diff --git a/www-ssl/admin/inc b/www-ssl/admin/inc
deleted file mode 120000
index 22dc542a..00000000
--- a/www-ssl/admin/inc
+++ /dev/null
@@ -1 +0,0 @@
-../inc
\ No newline at end of file
diff --git a/www-ssl/faq.php b/www-ssl/faq.php
index 50c42552..5aeaee54 100755
--- a/www-ssl/faq.php
+++ b/www-ssl/faq.php
@@ -1,7 +1,7 @@
 <?php
 $title = "Index";
 $header = "FAQ";
-include ("./inc/header.php");
+include ("../includes/header.php");
 
 
 $SQL = "SELECT * FROM `FAQ`";
@@ -17,6 +17,6 @@ for ($n = 0 ; $n < $Zeilen ; $n++) {
   }
 }
 
-include ("./inc/footer.php");
+include ("../includes/footer.php");
 ?>
 
diff --git a/www-ssl/index.php b/www-ssl/index.php
index f4de90ce..8192e987 100755
--- a/www-ssl/index.php
+++ b/www-ssl/index.php
@@ -1,19 +1,19 @@
 <?php
 $title = "Index";
 $header = "Index";
-include ("./inc/header.php");
+include ("../includes/header.php");
 
 echo Get_Text("index_text1")."<br><br>";
 echo Get_Text("index_text2")."<br>";
 echo Get_Text("index_text3")."<br>";
 
-include ("./inc/login_eingabefeld.php");
+include ("../includes/login_eingabefeld.php");
 
 echo "<h6>".Get_Text("index_text4")."</h6>";
 
 echo Get_Text("index_text5"). "<br>". $show_SSLCERT;
 
-include ("./inc/footer.php");
+include ("../includes/footer.php");
 ?>
 
 
diff --git a/www-ssl/lageplan.php b/www-ssl/lageplan.php
index c8a7e08c..03aacf79 100755
--- a/www-ssl/lageplan.php
+++ b/www-ssl/lageplan.php
@@ -1,11 +1,11 @@
 <?php
 $title = "Index";
 $header = "Lageplan";
-include ("./inc/header.php");
+include ("../includes/header.php");
 
 echo "<p>". Get_Text("lageplan_text1"). "</p>";
 echo "<p><img src=\"./pic/lageplan/lageplan.jpg\"/>.";
 
-include ("./inc/footer.php");
+include ("../includes/footer.php");
 ?>
 
diff --git a/www-ssl/logout.php b/www-ssl/logout.php
index d8fe10a8..38b3b575 100755
--- a/www-ssl/logout.php
+++ b/www-ssl/logout.php
@@ -1,5 +1,5 @@
 <?php
-include ("./inc/config.php");
+include ("../includes/config.php");
 
 // Die Session zerstoeren...
 session_start();
diff --git a/www-ssl/makeuser.php b/www-ssl/makeuser.php
index 70f56e3b..347403de 100755
--- a/www-ssl/makeuser.php
+++ b/www-ssl/makeuser.php
@@ -2,10 +2,10 @@
 $title = "Anmeldung zum Chaos-Engel";
 $header = "";
 $success = "none"; 
-include ("./inc/config.php");
-include ("./inc/header.php");
-include ("./inc/config_db.php");
-include ("./inc/crypt.php");
+include ("../includes/config.php");
+include ("../includes/header.php");
+include ("../includes/config_db.php");
+include ("../includes/crypt.php");
 
 		
 if( isset($_POST["send"]))
@@ -194,6 +194,6 @@ echo "\t\t</table>\n";
 echo "\t</form>\n";
 Print_Text("makeuser_text3");
 }
-include ("./inc/footer.php");
+include ("../includes/footer.php");
 ?>
 
diff --git a/www-ssl/nonpublic/inc b/www-ssl/nonpublic/inc
deleted file mode 120000
index 22dc542a..00000000
--- a/www-ssl/nonpublic/inc
+++ /dev/null
@@ -1 +0,0 @@
-../inc
\ No newline at end of file