summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwww-data <www-data@dabox.fr>2010-02-18 23:44:44 +0100
committerwww-data <www-data@dabox.fr>2010-02-18 23:44:44 +0100
commit429c74537c02a1f7d4032d6478f184f4ca362d3b (patch)
tree06f1029c518f709531d9748f3c3e30e48804bb7f
parent09330fc053cbd6722a3b353c6cee99d6c7cda903 (diff)
downloadistreamdev-429c74537c02a1f7d4032d6478f184f4ca362d3b.tar.gz
istreamdev-429c74537c02a1f7d4032d6478f184f4ca362d3b.tar.bz2
Personal config is now stored in config.php
If config.php is not created, config_default.php will be used
-rwxr-xr-xHISTORY1
-rwxr-xr-xREADME2
-rwxr-xr-xconfig_default.php (renamed from config.php)0
-rwxr-xr-xincludes/include.php5
4 files changed, 6 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index ccf43bd..4521370 100755
--- a/HISTORY
+++ b/HISTORY
@@ -7,6 +7,7 @@ in progress - V.0.3.6-dev
- fix logos channels size in channel list. Now it's ok ( thanks alex )
- now recordings show logo channel ( The Troll )
- fix channels with comma in the name to display epg ( thanks hendrikw01 & Mentox )
+- default config moved to config-default.php
18.02.2010 - V.0.3.5
diff --git a/README b/README
index 95f4f5d..efdb002 100755
--- a/README
+++ b/README
@@ -83,7 +83,7 @@
-------------------
Copy the file in your webfolder. /istreamdev for example.
- Edit config.php.
+ Copy config_default.php to config.php and edit it.
$httpath can point to your istreamdev http path or the full url
( '/istreamdev/' or "http://mydomain.com/istreamdev/' )
diff --git a/config.php b/config_default.php
index d479ba4..d479ba4 100755
--- a/config.php
+++ b/config_default.php
diff --git a/includes/include.php b/includes/include.php
index 157cccf..830b4b1 100755
--- a/includes/include.php
+++ b/includes/include.php
@@ -1,6 +1,9 @@
<?php
-include ('config.php');
+if (file_exists('config.php'))
+ include ('config.php');
+else
+ include ('config_default.php');
include ('includes/inc_auth.php');
include ('includes/inc_vdr.php');
include ('includes/inc_files.php');