Merge branch 'jquery' of projects.vdr-developer.org:istreamdev into jquery

3 files changed, 3 insertions, 4 deletions

diff --git a/bin/session.php b/bin/session.php
index 3409688..0c0b704 100755
--- a/bin/session.php
+++ b/bin/session.php
@@ -45,7 +45,6 @@ function sessioncreate($type, $url, $mode)
 	}
 	
 	$cmd = str_replace('%', '%%', $cmd);
-	exec ('echo "' .$cmd .'" > /tmp/a');
 	exec ($cmd);
 	
 	// Extract $channame if needed
diff --git a/config_default.php b/config_default.php
index 1cce79f..93d6e7f 100755
--- a/config_default.php
+++ b/config_default.php
@@ -20,11 +20,11 @@
 	$mediasources[]=array ( 1,              'Video',        '/mnt/media/movies');
 	$mediasources[]=array ( 2,              'Audio',        '/mnt/media/music');
 
-	// Encoding
+	// Encoding (The name cannot be changed)
 	//			Name		Video	Audio	Audio channels	Resolution
-	$quality=array (	'Edge'	=>	'128k	64k	1		240x160',
+	$quality=array (	'edge'	=>	'128k	64k	1		240x160',
 				'3g'	=>	'350k	64k	1		408x272',
-				'Wifi'	=>	'512k	128k	2		480x320');
+				'wifi'	=>	'512k	128k	2		480x320');
 	$maxencodingprocesses=10;                               // Max simultaneous encoding processes
 
 	// Misc
diff --git a/ram/temp-logo.png b/ram/temp-logo.png
deleted file mode 100755
index 92d077a..0000000
--- a/ram/temp-logo.png
+++ /dev/null