iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
ichdasich 2008-09-10 15:43:25 +00:00
parent b00d5b96c6
commit 83a90af930
17 changed files with 99 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
TODO_FIX_INCLUDES Normal file
View File

@ -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.

8
includes/ShowUserPicture.php
View File

@ -1,10 +1,10 @@
<?PHP <?PHP
include ("./inc/config.php"); include ("./config.php");
include ("./inc/error_handler.php"); include ("./error_handler.php");
include ("./inc/config_db.php"); include ("./config_db.php");
if( !isset($_SESSION)) session_start(); if( !isset($_SESSION)) session_start();
include ("./inc/secure.php"); include ("./secure.php");
// Parameter check // Parameter check

2
includes/crypt.php
View File

@ -2,7 +2,7 @@
function PassCrypt($passwort) { function PassCrypt($passwort) {
include "./inc/config.php"; include "./config.php";
switch ($crypt_system) { switch ($crypt_system) {
case "crypt": case "crypt":

4
includes/error_handler.php
View File

@ -1,6 +1,6 @@
<?php <?php
require_once("./inc/funktion_jabber.php"); require_once("./funktion_jabber.php");
// global array for collected error_messages // global array for collected error_messages
$error_messages = array(); $error_messages = array();
@ -104,7 +104,7 @@
function send_message(&$message) function send_message(&$message)
{ {
chdir(dirname(__FILE__)); chdir(dirname(__FILE__));
require_once('../inc/config_jabber.php'); require_once('./config_jabber.php');
if (isset($jabber_recipient) && count($jabber_recipient)) { if (isset($jabber_recipient) && count($jabber_recipient)) {
$jabber = new Jabber($server, $port, $username, $password, $resource); $jabber = new Jabber($server, $port, $username, $password, $resource);

6
includes/footer.php
View File

@ -30,7 +30,7 @@ if( $Page["ShowTabel"]=="Y" )
<!-- anfang des menue parts //--> <!-- anfang des menue parts //-->
<?PHP <?PHP
if( $_SESSION['Menu'] =="R") include("./inc/menu.php"); if( $_SESSION['Menu'] =="R") include("./menu.php");
?> ?>
</td> </td>
@ -45,8 +45,8 @@ if( $_SESSION['Menu'] =="R") include("./inc/menu.php");
<td colspan="2"> <td colspan="2">
<h5 align="center"> &#169; copyleft - <a href="mailto:erzengel@lists.ccc.de">Kontakt</a> <h5 align="center"> &#169; copyleft - <a href="mailto:erzengel@lists.ccc.de">Kontakt</a>
<?PHP <?PHP
include( "./inc/funktion_counter.php"); include( "./funktion_counter.php");
include( "./inc/funktion_flag.php"); include( "./funktion_flag.php");
?></h5> ?></h5>
</td> </td>
</tr> </tr>

2
includes/funktion_SendMessenges.php
View File

@ -3,7 +3,7 @@
function SendData($Data) function SendData($Data)
{ {
include("./inc/config_MessegeServer.php"); include("./config_MessegeServer.php");
// Create a UDP socket // Create a UDP socket
$sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP); $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
//send packed //send packed

2
includes/funktion_modem.php
View File

@ -1,5 +1,5 @@
<?PHP <?PHP
include "./inc/config_modem.php"; include "./config_modem.php";
function DialNumber( $Number ) function DialNumber( $Number )
{ {

2
includes/funktion_schichtplan_aray.php
View File

@ -34,5 +34,5 @@
$TID2Name[ mysql_result($Erg, $i, "TID") ] = mysql_result($Erg, $i, "Name"); $TID2Name[ mysql_result($Erg, $i, "TID") ] = mysql_result($Erg, $i, "Name");
} }
include ("./inc/funktion_schichtplan_Tage.php"); include ("./funktion_schichtplan_Tage.php");
?> ?>

2
includes/login_eingabefeld.php
View File

@ -1,7 +1,7 @@
<form action="<?PHP <form action="<?PHP
include ("./inc/config.php"); include ("./config.php");
echo substr($url, 0, strlen($url)-1). $ENGEL_ROOT echo substr($url, 0, strlen($url)-1). $ENGEL_ROOT
?>nonpublic/index.php" method="post"> ?>nonpublic/index.php" method="post">
<table> <table>

2
includes/menu.php
View File

@ -51,7 +51,7 @@ if( isset($_SESSION['UID']))
<table align="center" class="border" cellpadding="3" cellspacing="1"> <table align="center" class="border" cellpadding="3" cellspacing="1">
<tr> <tr>
<td width="160" class="menu"> <td width="160" class="menu">
<?php include("./inc/funktion_activeUser.php"); ?> <?php include("./funktion_activeUser.php"); ?>
</td> </td>
</tr> </tr>
</table> </table>

1
www-ssl/admin/inc
View File

@ -1 +0,0 @@
../inc

4
www-ssl/faq.php
View File

@ -1,7 +1,7 @@
<?php <?php
$title = "Index"; $title = "Index";
$header = "FAQ"; $header = "FAQ";
include ("./inc/header.php"); include ("../includes/header.php");
$SQL = "SELECT * FROM `FAQ`"; $SQL = "SELECT * FROM `FAQ`";
@ -17,6 +17,6 @@ for ($n = 0 ; $n < $Zeilen ; $n++) {
} }
} }
include ("./inc/footer.php"); include ("../includes/footer.php");
?> ?>

6
www-ssl/index.php
View File

@ -1,19 +1,19 @@
<?php <?php
$title = "Index"; $title = "Index";
$header = "Index"; $header = "Index";
include ("./inc/header.php"); include ("../includes/header.php");
echo Get_Text("index_text1")."<br><br>"; echo Get_Text("index_text1")."<br><br>";
echo Get_Text("index_text2")."<br>"; echo Get_Text("index_text2")."<br>";
echo Get_Text("index_text3")."<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 "<h6>".Get_Text("index_text4")."</h6>";
echo Get_Text("index_text5"). "<br>". $show_SSLCERT; echo Get_Text("index_text5"). "<br>". $show_SSLCERT;
include ("./inc/footer.php"); include ("../includes/footer.php");
?> ?>

4
www-ssl/lageplan.php
View File

@ -1,11 +1,11 @@
<?php <?php
$title = "Index"; $title = "Index";
$header = "Lageplan"; $header = "Lageplan";
include ("./inc/header.php"); include ("../includes/header.php");
echo "<p>". Get_Text("lageplan_text1"). "</p>"; echo "<p>". Get_Text("lageplan_text1"). "</p>";
echo "<p><img src=\"./pic/lageplan/lageplan.jpg\"/>."; echo "<p><img src=\"./pic/lageplan/lageplan.jpg\"/>.";
include ("./inc/footer.php"); include ("../includes/footer.php");
?> ?>

2
www-ssl/logout.php
View File

@ -1,5 +1,5 @@
<?php <?php
include ("./inc/config.php"); include ("../includes/config.php");
// Die Session zerstoeren... // Die Session zerstoeren...
session_start(); session_start();

10
www-ssl/makeuser.php
View File

@ -2,10 +2,10 @@
$title = "Anmeldung zum Chaos-Engel"; $title = "Anmeldung zum Chaos-Engel";
$header = ""; $header = "";
$success = "none"; $success = "none";
include ("./inc/config.php"); include ("../includes/config.php");
include ("./inc/header.php"); include ("../includes/header.php");
include ("./inc/config_db.php"); include ("../includes/config_db.php");
include ("./inc/crypt.php"); include ("../includes/crypt.php");
if( isset($_POST["send"])) if( isset($_POST["send"]))
@ -194,6 +194,6 @@ echo "\t\t</table>\n";
echo "\t</form>\n"; echo "\t</form>\n";
Print_Text("makeuser_text3"); Print_Text("makeuser_text3");
} }
include ("./inc/footer.php"); include ("../includes/footer.php");
?> ?>

1
www-ssl/nonpublic/inc
View File

@ -1 +0,0 @@
../inc