config file umbenant

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

15 files changed, 20 insertions, 14 deletions

diff --git a/default-conf/www-ssl/inc/config_db.php b/default-conf/www-ssl/inc/config_db.php
new file mode 100755
index 00000000..36535a99
--- /dev/null
+++ b/default-conf/www-ssl/inc/config_db.php
@@ -0,0 +1,6 @@
+<?php
+include("./inc/funktion_db.php");
+
+$con = mysql_connect("localhost", "user", "pass") or die ("connection failed");
+$sel = mysql_select_db("tabel") or die (mysql_error());
+?>
diff --git a/default-conf/www-ssl/inc/jabber.php b/default-conf/www-ssl/inc/config_jabber.php
index 13cd3538..13cd3538 100755
--- a/default-conf/www-ssl/inc/jabber.php
+++ b/default-conf/www-ssl/inc/config_jabber.php
diff --git a/services/jabberserver.php b/services/jabberserver.php
index 9bdd209a..35ddf6b3 100755
--- a/services/jabberserver.php
+++ b/services/jabberserver.php
@@ -3,7 +3,7 @@
 /****************************************************************************************************/

 //					INCLUDE

 /****************************************************************************************************/

-require_once('./inc/jabber.php');

+require_once('./inc/config_jabber.php');

 require_once("./inc/funktion_jabber.php");

 include("./inc/config_MessegeServer.php");

 

diff --git a/www-ssl/admin/EngelType.php b/www-ssl/admin/EngelType.php
index 4ea68c98..03f89b85 100755
--- a/www-ssl/admin/EngelType.php
+++ b/www-ssl/admin/EngelType.php
@@ -7,7 +7,7 @@ include("./inc/funktion_db.php");
 
 function runSQL( $SQL)
 {
-	include( "./inc/db.php");
+	global $con;
 	// hier muesste das SQL ausgefuehrt werden...
 	$Erg = mysql_query($SQL, $con);
 	if ($Erg) 
@@ -27,7 +27,7 @@ function runSQL( $SQL)
 
 function runSQL_log( $SQL, $commed)
 {
-	include( "./inc/db.php");
+	global $con;
 	// hier muesste das SQL ausgefuehrt werden...
 	$Erg = db_query($SQL, $commed);
 	if ($Erg) 
diff --git a/www-ssl/admin/schichtplan_druck.php b/www-ssl/admin/schichtplan_druck.php
index 3ec0cfe5..55dc2041 100755
--- a/www-ssl/admin/schichtplan_druck.php
+++ b/www-ssl/admin/schichtplan_druck.php
@@ -79,7 +79,7 @@ else 	//#################################################################
    	$Raum = $_POST["Raum"];
 	$ausdatum = $_POST["ausdatum"];
 
-	include ("./inc/db.php");
+	include ("./inc/config_db.php");
 	include ("./inc/config.php");
 	include ("./inc/secure.php");
 	//var wird nur gesetzt immer edit auszublenden, achtung sesion darf nicht gestart sein !!!
diff --git a/www-ssl/inc/error_handler.php b/www-ssl/inc/error_handler.php
index 8c152ba8..e444e18c 100755
--- a/www-ssl/inc/error_handler.php
+++ b/www-ssl/inc/error_handler.php
@@ -63,7 +63,7 @@
   function send_message(&$message)
   {
     chdir(dirname(__FILE__));
-    require_once('../inc/jabber.php');
+    require_once('../inc/config_jabber.php');
 
     if (isset($jabber_recipient) && count($jabber_recipient)) {
       $jabber = new Jabber($server, $port, $username, $password, $resource);
diff --git a/www-ssl/inc/funktion_db_list.php b/www-ssl/inc/funktion_db_list.php
index 894de5e5..fbf1c821 100755
--- a/www-ssl/inc/funktion_db_list.php
+++ b/www-ssl/inc/funktion_db_list.php
@@ -2,7 +2,7 @@
 
 function funktion_db_list($Table_Name) {
 
-include ("./inc/db.php");
+	global $con;
 
 $SQL = "SELECT * FROM `".$Table_Name."`";
 $Erg = mysql_query($SQL, $con);
diff --git a/www-ssl/inc/funktion_faq.php b/www-ssl/inc/funktion_faq.php
index 36e3170b..7b6b526c 100755
--- a/www-ssl/inc/funktion_faq.php
+++ b/www-ssl/inc/funktion_faq.php
@@ -1,7 +1,7 @@
 <?PHP
 
 function noAnswer() {
-  include ("./inc/db.php");
+  global $con;
 
   $SQL = "SELECT UID FROM Questions WHERE (Answer=\"\")";
   $Res=mysql_query($SQL, $con);
diff --git a/www-ssl/inc/funktion_xml_schudle.php b/www-ssl/inc/funktion_xml_schudle.php
index 4fd750fd..93e664b3 100755
--- a/www-ssl/inc/funktion_xml_schudle.php
+++ b/www-ssl/inc/funktion_xml_schudle.php
@@ -9,8 +9,8 @@ echo "\n\n<h1>Schudle:</h1>\n";
 function SaveSchedule()
 {
 	global  $RoomID, $RoomName;
+	global $con;
 
-	include ("./inc/db.php");
 	if( isset($_GET["PSIDXML"]) && 
 	    isset($_GET["DateXML"]) &&
 	    isset($_GET["RIDXML"]) &&
diff --git a/www-ssl/inc/header.php b/www-ssl/inc/header.php
index 47d50690..ab11066c 100755
--- a/www-ssl/inc/header.php
+++ b/www-ssl/inc/header.php
@@ -1,7 +1,7 @@
 <?PHP 
 include ("./inc/error_handler.php");
 include ("./inc/config.php");
-include ("./inc/db.php");
+include ("./inc/config_db.php");
 include ("./inc/funktion_lang.php");
 include ("./inc/funktion_menu.php");
 
diff --git a/www-ssl/makeuser.php b/www-ssl/makeuser.php
index 43f71dd1..dcd12c84 100755
--- a/www-ssl/makeuser.php
+++ b/www-ssl/makeuser.php
@@ -2,7 +2,7 @@
 $title = "Anmeldung zum Chaos-Engel";
 $header = "";
 include ("./inc/header.php");
-include ("./inc/db.php");
+include ("./inc/config_db.php");
 include ("./inc/crypt.php");
 
 		
diff --git a/www-ssl/nonpublic/index.php b/www-ssl/nonpublic/index.php
index 2c8b18a1..b65dd9c4 100755
--- a/www-ssl/nonpublic/index.php
+++ b/www-ssl/nonpublic/index.php
@@ -2,7 +2,7 @@
 $title = "Index";
 $header = "Index";
 
-include ("./inc/db.php");
+include ("./inc/config_db.php");
 include ("./inc/crypt.php");
 
 session_start(); // alte Session - falls vorhanden - wiederherstellen...
diff --git a/www-ssl/nonpublic/news_comments.php b/www-ssl/nonpublic/news_comments.php
index 81825dad..99b42072 100755
--- a/www-ssl/nonpublic/news_comments.php
+++ b/www-ssl/nonpublic/news_comments.php
@@ -2,7 +2,7 @@
 $title = "Kommentare zu den News";
 $header = "Kommentar";
 include ("./inc/header.php");
-include ("./inc/db.php");
+include ("./inc/config_db.php");
 include ("./inc/funktion_user.php");
 
 
diff --git a/www-ssl/nonpublic/news_output.php b/www-ssl/nonpublic/news_output.php
index cba36142..1e4a349d 100755
--- a/www-ssl/nonpublic/news_output.php
+++ b/www-ssl/nonpublic/news_output.php
@@ -1,5 +1,5 @@
 <?php
-include ("./inc/db.php");
+include ("./inc/config_db.php");
 include ("./inc/funktion_user.php");
 
 
diff --git a/www-ssl/nonpublic/schichtplan_beamer.php b/www-ssl/nonpublic/schichtplan_beamer.php
index b31460bc..ac161fbb 100755
--- a/www-ssl/nonpublic/schichtplan_beamer.php
+++ b/www-ssl/nonpublic/schichtplan_beamer.php
@@ -1,6 +1,6 @@
 <?php
 include ("./inc/config.php");
-include ("./inc/db.php");
+include ("./inc/config_db.php");
 include ("./inc/funktion_lang.php");
 
 include ("./inc/funktion_user.php");