From 019f35aa87d2cf7a685cd1beb087e679950cc458 Mon Sep 17 00:00:00 2001
From: losinshi <losinshi@dd492736-c11a-0410-ad51-8c26713eaf7f>
Date: Tue, 22 Aug 2006 16:40:01 +0000
Subject: [PATCH] Config-Module added to frontend

git-svn-id: file:///home/jan/tmp/wetterstation/trunk@36 dd492736-c11a-0410-ad51-8c26713eaf7f
---
 webstuff/frontend/php_inc/config.inc.php     | 24 ++++++++++++++++++++
 webstuff/frontend/php_inc/connection.inc.php |  4 +++-
 webstuff/frontend/php_inc/module_set.inc.php |  3 +++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/webstuff/frontend/php_inc/config.inc.php b/webstuff/frontend/php_inc/config.inc.php
index 8b13789..e713123 100644
--- a/webstuff/frontend/php_inc/config.inc.php
+++ b/webstuff/frontend/php_inc/config.inc.php
@@ -1 +1,25 @@
+<?
+/* Datenbankverbindung */
+  $pg_host 	= "141.30.228.39"; 
+  $pg_database 	= "wetter";
+  $pg_user 	= "losinshi";
+  $pg_pass 	= "";
 
+/* Default-Werte */
+  $default_set	= "test";
+
+/* Config-Klasse, Bitte nicht ändern! */
+class Config{
+
+  function getPgConnString(){
+    global $pg_host,$pg_database,$pg_user,$pg_pass;
+    return "host=".$pg_host." dbname=".$pg_database." user=".$pg_user." password=".$pg_pass;
+  }
+
+  function getDefaultSet(){
+    global $default_set;
+    return $default_set;
+  }
+
+}
+?>
diff --git a/webstuff/frontend/php_inc/connection.inc.php b/webstuff/frontend/php_inc/connection.inc.php
index ea2374f..b2bd3e1 100644
--- a/webstuff/frontend/php_inc/connection.inc.php
+++ b/webstuff/frontend/php_inc/connection.inc.php
@@ -1,4 +1,6 @@
 <?
+include_once("php_inc/config.inc.php");
+
 /* Connection-Klasse..ist für die Datenbankverbindung zuständig */
 class Connection{
 
@@ -12,7 +14,7 @@ class Connection{
   /* Verbindung herstellen (wenn noch net besteht)*/
   function _createConn(){
     if($this->conn == NULL){
-      $this->conn = pg_connect("host=141.30.228.39 dbname=wetter user=losinshi")
+      $this->conn = pg_connect(Config::getPgConnString())
         or die('Verbindungsaufbau fehlgeschlagen: ' . pg_last_error());
     }
   }
diff --git a/webstuff/frontend/php_inc/module_set.inc.php b/webstuff/frontend/php_inc/module_set.inc.php
index b56aa95..6ad109b 100644
--- a/webstuff/frontend/php_inc/module_set.inc.php
+++ b/webstuff/frontend/php_inc/module_set.inc.php
@@ -2,6 +2,7 @@
 include_once("php_inc/module.inc.php");
 include_once("php_inc/parser.inc.php");
 include_once("php_inc/connection.inc.php");
+include_once("php_inc/config.inc.php");
 
 
 /* Klasse, die die ModuleSets Verwaltet */
@@ -23,6 +24,8 @@ class ModuleSet{
 
   /* Dateinamen eines Setz aus dessen Namen zusammenbauen */
   function _getSetFilename($setName){
+    if($setName == "")
+      $setName = Config::getDefaultSet();
     return "content/module_sets/set_".$setName.".html";
   }