summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TODO_FIX_INCLUDES30
-rwxr-xr-xwww-ssl/nonpublic/engelbesprechung.php4
-rwxr-xr-xwww-ssl/nonpublic/faq.php4
-rwxr-xr-xwww-ssl/nonpublic/index.php12
-rwxr-xr-xwww-ssl/nonpublic/messages.php4
-rwxr-xr-xwww-ssl/nonpublic/myschichtplan.php10
-rwxr-xr-xwww-ssl/nonpublic/news.php4
-rwxr-xr-xwww-ssl/nonpublic/news_comments.php4
-rwxr-xr-xwww-ssl/nonpublic/schichtplan.1.php2
-rwxr-xr-xwww-ssl/nonpublic/schichtplan.2.php2
-rwxr-xr-xwww-ssl/nonpublic/schichtplan.php10
-rwxr-xr-xwww-ssl/nonpublic/schichtplan_add.php10
-rwxr-xr-xwww-ssl/nonpublic/waeckliste.php4
-rwxr-xr-xwww-ssl/nonpublic/wecken.php4
14 files changed, 52 insertions, 52 deletions
diff --git a/TODO_FIX_INCLUDES b/TODO_FIX_INCLUDES
index 3de2b8cf..68a4533a 100644
--- a/TODO_FIX_INCLUDES
+++ b/TODO_FIX_INCLUDES
@@ -41,21 +41,21 @@ ich@DenkBrett www-ssl % find . -name \*.php -exec grep -l './inc' {} \;
#./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
+#./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 # Special fix needed, css
+#./nonpublic/news.php
+./nonpublic/einstellungen.php # Special fix needed
+#./nonpublic/wecken.php
+#./nonpublic/engelbesprechung.php
+#./nonpublic/news_comments.php
#./logout.php
#./makeuser.php
#./lageplan.php
diff --git a/www-ssl/nonpublic/engelbesprechung.php b/www-ssl/nonpublic/engelbesprechung.php
index 45194451..add50240 100755
--- a/www-ssl/nonpublic/engelbesprechung.php
+++ b/www-ssl/nonpublic/engelbesprechung.php
@@ -1,7 +1,7 @@
<?php
$title = "Himmel";
$header = "Engelbesprechung";
-include ("./inc/header.php");
+include ("../../includes/header.php");
?>
<br>
@@ -33,5 +33,5 @@ for ($n = 0 ; $n < $Zeilen ; $n++)
}
-include ("./inc/footer.php");
+include ("../../includes/footer.php");
?>
diff --git a/www-ssl/nonpublic/faq.php b/www-ssl/nonpublic/faq.php
index 9d061d5b..5adfb67c 100755
--- a/www-ssl/nonpublic/faq.php
+++ b/www-ssl/nonpublic/faq.php
@@ -1,7 +1,7 @@
<?php
$title = "Himmel";
$header = "FAQ / Fragen an die Erzengel";
-include ("./inc/header.php");
+include ("../../includes/header.php");
// Erstaufruf, oder Frage bereits abgeschickt?
@@ -68,5 +68,5 @@ if ($Zeilen==0){
}
}
-include ("./inc/footer.php");
+include ("../../includes/footer.php");
?>
diff --git a/www-ssl/nonpublic/index.php b/www-ssl/nonpublic/index.php
index f4dee263..de833eb4 100755
--- a/www-ssl/nonpublic/index.php
+++ b/www-ssl/nonpublic/index.php
@@ -2,14 +2,14 @@
$title = "Index";
$header = "Index";
-include ("./inc/config_db.php");
-include ("./inc/crypt.php");
+include ("../../includes/config_db.php");
+include ("../../includes/crypt.php");
session_start(); // alte Session - falls vorhanden - wiederherstellen...
function LoginOK()
{
- include ("./inc/config.php");
+ include ("../../includes/config.php");
header("HTTP/1.1 302 Moved Temporarily");
header("Location: ". substr($url, 0, strlen($url)-1). $ENGEL_ROOT. "nonpublic/news.php");
}
@@ -73,11 +73,11 @@ else
$ErrorText = "pub_index_User_more_as_one";
} // Ende Check, ob User angemeldet wurde
}
-include ("./inc/header.php");
+include ("../../includes/header.php");
if( isset($ErrorText))
echo "<h2>". Get_Text($ErrorText). "</h2><br>\n";
-include ("./inc/login_eingabefeld.php");
-include ("./inc/footer.php");
+include ("../../includes/login_eingabefeld.php");
+include ("../../includes/footer.php");
?>
diff --git a/www-ssl/nonpublic/messages.php b/www-ssl/nonpublic/messages.php
index 2e5a6e14..7d3bb7fb 100755
--- a/www-ssl/nonpublic/messages.php
+++ b/www-ssl/nonpublic/messages.php
@@ -2,7 +2,7 @@
$title = "Himmel";
$header = "";
-include ("./inc/header.php");
+include ("../../includes/header.php");
If( !isset($_GET["action"]) )
$_GET["action"] = "start";
@@ -123,5 +123,5 @@ switch( $_GET["action"])
echo Get_Text("pub_messages_NoCommand");
}
-include ("./inc/footer.php");
+include ("../../includes/footer.php");
?>
diff --git a/www-ssl/nonpublic/myschichtplan.php b/www-ssl/nonpublic/myschichtplan.php
index f7a9b870..89791343 100755
--- a/www-ssl/nonpublic/myschichtplan.php
+++ b/www-ssl/nonpublic/myschichtplan.php
@@ -2,10 +2,10 @@
$title = "Himmel";
$header = "Mein Schichtplan";
-include ("./inc/header.php");
-include ("./inc/funktionen.php");
-include ("./inc/funktion_schichtplan.php");
-include ("./inc/funktion_schichtplan_aray.php");
+include ("../../includes/header.php");
+include ("../../includes/funktionen.php");
+include ("../../includes/funktion_schichtplan.php");
+include ("../../includes/funktion_schichtplan_aray.php");
If( !IsSet($_GET["action"]) )
@@ -176,5 +176,5 @@ else
SetHeaderGo2Back();
}
}
-include ("./inc/footer.php");
+include ("../../includes/footer.php");
?>
diff --git a/www-ssl/nonpublic/news.php b/www-ssl/nonpublic/news.php
index 107f5913..2f04d22c 100755
--- a/www-ssl/nonpublic/news.php
+++ b/www-ssl/nonpublic/news.php
@@ -1,11 +1,11 @@
<?php
$title = "Himmel";
$header = "News";
-include ("./inc/header.php");
+include ("../../includes/header.php");
echo "<a href=\"#Neu\">".Get_Text(3)."</a>";
include ("news_output.php");
-include ("./inc/footer.php");
+include ("../../includes/footer.php");
?>
diff --git a/www-ssl/nonpublic/news_comments.php b/www-ssl/nonpublic/news_comments.php
index 4c7dc24c..710d33dc 100755
--- a/www-ssl/nonpublic/news_comments.php
+++ b/www-ssl/nonpublic/news_comments.php
@@ -1,7 +1,7 @@
<?php
$title = "Kommentare zu den News";
$header = "Kommentar";
-include ("./inc/header.php");
+include ("../../includes/header.php");
if( IsSet( $_GET["nid"]))
@@ -85,5 +85,5 @@ else
echo "Fehlerhafter Aufruf!";
}
-include ("./inc/footer.php");
+include ("../../includes/footer.php");
?>
diff --git a/www-ssl/nonpublic/schichtplan.1.php b/www-ssl/nonpublic/schichtplan.1.php
index d733b111..ab27d698 100755
--- a/www-ssl/nonpublic/schichtplan.1.php
+++ b/www-ssl/nonpublic/schichtplan.1.php
@@ -1,7 +1,7 @@
<h4>&nbsp;Tage </h4>
<?PHP
-include ("./inc/funktion_schichtplan_aray.php");
+include ("../../includes/funktion_schichtplan_aray.php");
function Printlink( $Datum)
{
diff --git a/www-ssl/nonpublic/schichtplan.2.php b/www-ssl/nonpublic/schichtplan.2.php
index d41d698d..72e9a479 100755
--- a/www-ssl/nonpublic/schichtplan.2.php
+++ b/www-ssl/nonpublic/schichtplan.2.php
@@ -1,7 +1,7 @@
<h4>&nbsp;Raum&uuml;bersicht</h4>
<?php
-include ("./inc/funktion_schichtplan_aray.php");
+include ("../../includes/funktion_schichtplan_aray.php");
if( isset ($Room))
foreach( $Room as $RoomEntry )
diff --git a/www-ssl/nonpublic/schichtplan.php b/www-ssl/nonpublic/schichtplan.php
index d4c5a71c..b4f77ab9 100755
--- a/www-ssl/nonpublic/schichtplan.php
+++ b/www-ssl/nonpublic/schichtplan.php
@@ -8,10 +8,10 @@ if( isset($_GET["ausdatum"]))
if( isset($_GET["raum"]))
$raum = $_GET["raum"];
-include ("./inc/header.php");
-include ("./inc/funktionen.php");
-include ("./inc/funktion_schichtplan.php");
-include ("./inc/funktion_schichtplan_aray.php");
+include ("../../includes/header.php");
+include ("../../includes/inc/funktionen.php");
+include ("../../includes/funktion_schichtplan.php");
+include ("../../includes/funktion_schichtplan_aray.php");
?>
<?PHP echo Get_Text("Hello").$_SESSION['Nick'].",<br>".
@@ -153,5 +153,5 @@ else
echo "<a href=\"". $_SESSION["newurl"]. "&Icon=0\">@</a>";
-include ("./inc/footer.php");
+include ("../../includes/footer.php");
?>
diff --git a/www-ssl/nonpublic/schichtplan_add.php b/www-ssl/nonpublic/schichtplan_add.php
index d5ae50f7..05ff52b7 100755
--- a/www-ssl/nonpublic/schichtplan_add.php
+++ b/www-ssl/nonpublic/schichtplan_add.php
@@ -1,10 +1,10 @@
<?php
$title = "Himmel";
$header = "Schichtpl&auml;ne";
-include ("./inc/header.php");
-include ("./inc/funktion_schichtplan.php");
-include ("./inc/funktion_schichtplan_aray.php");
-include ("./inc/funktionen.php");
+include ("../../includes/header.php");
+include ("../../includes/funktion_schichtplan.php");
+include ("../../includes/funktion_schichtplan_aray.php");
+include ("../../includes/funktionen.php");
if (isset($_POST["newtext"]) && isset($_POST["SID"]) && isset($_POST["TID"])) {
SetHeaderGo2Back();
@@ -122,5 +122,5 @@ elseif (isset($_GET["SID"]) && isset($_GET["TID"]))
}
-include ("./inc/footer.php");
+include ("../../includes/footer.php");
?>
diff --git a/www-ssl/nonpublic/waeckliste.php b/www-ssl/nonpublic/waeckliste.php
index 9071e3c0..7ca7460e 100755
--- a/www-ssl/nonpublic/waeckliste.php
+++ b/www-ssl/nonpublic/waeckliste.php
@@ -2,7 +2,7 @@
$title = "Himmel";
$header = "Weckdienst - Liste der zu weckenden Engel";
-include ("./inc/header.php");
+include ("../../includes/header.php");
?>
@@ -36,5 +36,5 @@ include ("./inc/header.php");
?>
</table>
<?PHP
-include ("./inc/footer.php");
+include ("../../includes/footer.php");
?>
diff --git a/www-ssl/nonpublic/wecken.php b/www-ssl/nonpublic/wecken.php
index 3fa497b6..30ef689b 100755
--- a/www-ssl/nonpublic/wecken.php
+++ b/www-ssl/nonpublic/wecken.php
@@ -2,7 +2,7 @@
$title = "Himmel";
$header = "Weckdienst";
-include ("./inc/header.php");
+include ("../../includes/header.php");
if( isset($_POST["eintragen"]))
if( $_POST["eintragen"] == Get_Text("pub_wake_bouton") )
@@ -77,5 +77,5 @@ echo Get_Text("pub_wake_beschreibung2"); ?>
<input type="submit" name="eintragen" value="<?PHP echo Get_Text("pub_wake_bouton"); ?>">
</form>
<?PHP
-include ("./inc/footer.php");
+include ("../../includes/footer.php");
?>