diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-11-22 17:44:10 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-11-22 17:44:10 +0000 |
| commit | 67cbb218cd89ac6be9d1d55ca3799080daac1f5a (patch) | |
| tree | 9aabddaed61a0bda1e477cf44c69400d1590779f /lib/class/access.class.php | |
| parent | d5ae71f551f0aebef1dbae518a116a1c86430ffb (diff) | |
| download | ampache-67cbb218cd89ac6be9d1d55ca3799080daac1f5a.tar.gz ampache-67cbb218cd89ac6be9d1d55ca3799080daac1f5a.tar.bz2 ampache-67cbb218cd89ac6be9d1d55ca3799080daac1f5a.zip | |
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.
Diffstat (limited to 'lib/class/access.class.php')
| -rw-r--r-- | lib/class/access.class.php | 13 |
1 files changed, 9 insertions, 4 deletions
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'; |