summaryrefslogtreecommitdiff
path: root/default-conf
diff options
context:
space:
mode:
Diffstat (limited to 'default-conf')
-rw-r--r--[-rwxr-xr-x]default-conf/var_www_includes/config.php18
-rw-r--r--default-conf/var_www_includes/config_IAX.php2
-rw-r--r--[-rwxr-xr-x]default-conf/var_www_includes/config_db.php9
-rw-r--r--[-rwxr-xr-x]default-conf/var_www_includes/config_jabber.php0
-rw-r--r--default-conf/var_www_includes/config_modem.php15
5 files changed, 23 insertions, 21 deletions
diff --git a/default-conf/var_www_includes/config.php b/default-conf/var_www_includes/config.php
index 574d9947..574c44ae 100755..100644
--- a/default-conf/var_www_includes/config.php
+++ b/default-conf/var_www_includes/config.php
@@ -1,10 +1,13 @@
-<?PHP
+<?php
// Adresse des Webservers
$url = "https://SEDENGELURL";
// Startverzeichnis des Engelhome
$ENGEL_ROOT = "/";
+// Default-Theme auf der Startseite, 1=style1.css usw.
+$default_theme = 10;
+
// System disable message, ist ist set is: bages schow only this text
//$SystemDisableMessage="<H1>This system ist moved to a server in the BCC, you can in the moment only youse it in the in Engel Room</H1>";
@@ -16,22 +19,19 @@ $LETZTES_AUSTRAGEN=3;
//Setzt den zu verwendenden Crypto algorismis
// mp5 oder crypt
-// achtung crypt schaltet password ändern ab
+// achtung crypt schaltet password �ndern ab
$crypt_system="md5";
//$crypt_system="crypt";
-// the archangels
-$arch_angels="fnord";
-
// timezonen offsett
$gmdateOffset=3600;
-// für Developen 1, sonst = 0
-$DEBUG = 0;
+// f�r Developen 1, sonst = 0
+$debug = 0;
// SSL Cert-KEY
$show_SSLCERT = "MD5:<br>MD5SED<br>\n".
- "SHA1:<br>SHA1SED";
+ "SHA1:<br>SHA1SED";
//globale const. fuer schischtplan
$GlobalZeileProStunde = 4;
@@ -42,7 +42,7 @@ $Tempdir="./tmp";
// local timezone
date_default_timezone_set("Europe/Berlin");
-//Pentabarf ConferenzDI für UpdateDB
+//Pentabarf ConferenzDI f�r UpdateDB
$PentabarfXMLhost = "cccv.pentabarf.org";
$PentabarfXMLpath = "Xcal/conference/";
$PentabarfXMLEventID = "31";
diff --git a/default-conf/var_www_includes/config_IAX.php b/default-conf/var_www_includes/config_IAX.php
index e7eca465..87c3d8ea 100644
--- a/default-conf/var_www_includes/config_IAX.php
+++ b/default-conf/var_www_includes/config_IAX.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
$IAXenable = TRUE;
diff --git a/default-conf/var_www_includes/config_db.php b/default-conf/var_www_includes/config_db.php
index d959be90..d07529c0 100755..100644
--- a/default-conf/var_www_includes/config_db.php
+++ b/default-conf/var_www_includes/config_db.php
@@ -1,6 +1,9 @@
<?php
-include("funktion_db.php");
-$con = mysql_connect("localhost", "root", "changeme") or die ("connection failed");
-$sel = mysql_select_db("tabel") or die (mysql_error());
+
+// MySQL-Connection Settings
+$config['host'] = "localhost";
+$config['user'] = "root";
+$config['pw'] = "";
+$config['db'] = "engelsystem";
?>
diff --git a/default-conf/var_www_includes/config_jabber.php b/default-conf/var_www_includes/config_jabber.php
index 13cd3538..13cd3538 100755..100644
--- a/default-conf/var_www_includes/config_jabber.php
+++ b/default-conf/var_www_includes/config_jabber.php
diff --git a/default-conf/var_www_includes/config_modem.php b/default-conf/var_www_includes/config_modem.php
index 0625936d..e6542fc4 100644
--- a/default-conf/var_www_includes/config_modem.php
+++ b/default-conf/var_www_includes/config_modem.php
@@ -1,11 +1,10 @@
-<?PHP
+<?php
+ // ist ein modem angeschlossen
+ $ModemEnable = false;
-//ist ein modem angeschlossen
-$ModemEnable = false;
+ // COM port
+ $ModemDev ="/dev/ttyS0";
-// COM port
-$ModemDev="/dev/ttyS0";
-
-// vorwahl, bei tnovis telefonanlage für das programmieren von weckrufen
-$WackupNumber="**3";
+ // vorwahl, bei tnovis telefonanlage fuer das programmieren von weckrufen
+ $WakeupNumber="**3";
?>