From 67cbb218cd89ac6be9d1d55ca3799080daac1f5a Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Thu, 22 Nov 2007 17:44:10 +0000
Subject: renamed xml-rpc acl to rpc, added default mime type of image/jpg and
 added config options for batch download to the fs, no garbage collection for
 non-completed downloads yet.

---
 lib/class/access.class.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'lib/class/access.class.php')

diff --git a/lib/class/access.class.php b/lib/class/access.class.php
index c9e41512..59289c7c 100644
--- a/lib/class/access.class.php
+++ b/lib/class/access.class.php
@@ -183,10 +183,11 @@ class Access {
 				$sql = "SELECT `id` FROM `access_list`" .
 					" WHERE `start` <= '$ip' AND `end` >= '$ip' AND `type`='xml-rpc' AND `level` >= '$level'";
 			break;
+			case 'rpc': 
 			case 'xml-rpc':
 				$sql = "SELECT `id` FROM `access_list`" . 
 					" WHERE `start` <= '$ip' AND `end` >= '$ip'" . 
-					" AND  `key` = '$key' AND `level` >= '$level' AND `type`='xml-rpc'";
+					" AND  `key` = '$key' AND `level` >= '$level' AND (`type`='xml-rpc' OR `type`='rpc')";
 			break;
 			case 'network':
 			case 'interface':
@@ -221,11 +222,14 @@ class Access {
 	public static function validate_type($type) { 
 
 		switch($type) { 
-			case 'xml-rpc':
+			case 'rpc':
 			case 'interface':
 			case 'network':
 				return $type;
 			break;
+			case 'xml-rpc':
+				return 'rpc';
+			break; 
 			default: 
 				return 'stream';
 			break;
@@ -297,8 +301,9 @@ class Access {
 	public function get_type_name() { 
 
 		switch ($this->type) { 
-			case 'xml-rpc':
-				return 'XML-RPC';
+			case 'xml-rpc': 
+			case 'rpc':
+				return 'RPC';
 			break;
 			case 'network':
 				return 'Local Network Definition';
-- 
cgit