From 429c74537c02a1f7d4032d6478f184f4ca362d3b Mon Sep 17 00:00:00 2001
From: www-data <www-data@dabox.fr>
Date: Thu, 18 Feb 2010 23:44:44 +0100
Subject: Personal config is now stored in config.php If config.php is not
 created, config_default.php will be used

---
 HISTORY              |  1 +
 README               |  2 +-
 config.php           | 35 -----------------------------------
 config_default.php   | 35 +++++++++++++++++++++++++++++++++++
 includes/include.php |  5 ++++-
 5 files changed, 41 insertions(+), 37 deletions(-)
 delete mode 100755 config.php
 create mode 100755 config_default.php

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.php
deleted file mode 100755
index d479ba4..0000000
--- a/config.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-	global $user, $pass, $vdrchannels, $vdrstreamdev, $quality, $httppath;
-	global $svdrpip, $svdrpport, $ffmpegpath, $videotypes, $audiotypes, $mediainfopath;
-
-	// Http configuration
-	$user = 'istreamdev';		// Login
-	$pass = 'iguest';		// Password
-	$httppath = '/istreamdev/';	// Path to the index.php file
-
-	// VDR configuration
-	$vdrchannels='/etc/vdr/channels.conf';	// VDR channel list
-	$svdrpport=2001;					// SVDRP port
-	$svdrpip='127.0.0.1';					// SVDRP ip
-	$vdrstreamdev='http://127.0.0.1:3000/TS/';		// VDR streamdev URL
-	$vdrrecpath='/video/';
-
-	// Media configuration
-	$mediainfopath='/usr/bin/mediainfo';
-	$mediapath='/mnt/Storage/';
-	$videotypes='avi mkv ts mov mp4 wmv flv mpg mpeg mpeg2 mpv';
-	$audiotypes='mp3 wav aac flac';
-
-	// Encoding
-	//			Name		Video	Audio	Audio channels	Resolution
-	$quality = array(	'Edge'	=>	'128k	64k	1		240x160',
-				'3g'	=>	'350k	64k	1		408x272',
-				'Wifi'	=>	'512k	128k	2		480x320'
-			);
-
-	// Misc
-	$ffmpegpath = '/usr/bin/ffmpeg';
-
-	// Version
-	$isdversion = "0.3.6-alpha";
-?>
diff --git a/config_default.php b/config_default.php
new file mode 100755
index 0000000..d479ba4
--- /dev/null
+++ b/config_default.php
@@ -0,0 +1,35 @@
+<?php
+	global $user, $pass, $vdrchannels, $vdrstreamdev, $quality, $httppath;
+	global $svdrpip, $svdrpport, $ffmpegpath, $videotypes, $audiotypes, $mediainfopath;
+
+	// Http configuration
+	$user = 'istreamdev';		// Login
+	$pass = 'iguest';		// Password
+	$httppath = '/istreamdev/';	// Path to the index.php file
+
+	// VDR configuration
+	$vdrchannels='/etc/vdr/channels.conf';	// VDR channel list
+	$svdrpport=2001;					// SVDRP port
+	$svdrpip='127.0.0.1';					// SVDRP ip
+	$vdrstreamdev='http://127.0.0.1:3000/TS/';		// VDR streamdev URL
+	$vdrrecpath='/video/';
+
+	// Media configuration
+	$mediainfopath='/usr/bin/mediainfo';
+	$mediapath='/mnt/Storage/';
+	$videotypes='avi mkv ts mov mp4 wmv flv mpg mpeg mpeg2 mpv';
+	$audiotypes='mp3 wav aac flac';
+
+	// Encoding
+	//			Name		Video	Audio	Audio channels	Resolution
+	$quality = array(	'Edge'	=>	'128k	64k	1		240x160',
+				'3g'	=>	'350k	64k	1		408x272',
+				'Wifi'	=>	'512k	128k	2		480x320'
+			);
+
+	// Misc
+	$ffmpegpath = '/usr/bin/ffmpeg';
+
+	// Version
+	$isdversion = "0.3.6-alpha";
+?>
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');
-- 
cgit v1.2.3