summaryrefslogtreecommitdiffstats
path: root/lib/class/access.class.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2010-02-19 04:05:27 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2010-02-19 04:05:27 +0000
commit5ec3c0b90e49884c87508325430b67f83d04c6e9 (patch)
tree513f44237480bc89a2020bd644b83fc36ad9cb79 /lib/class/access.class.php
parent8102f1411116ce33c42560558d8e97b3ce73659e (diff)
downloadampache-5ec3c0b90e49884c87508325430b67f83d04c6e9.tar.gz
ampache-5ec3c0b90e49884c87508325430b67f83d04c6e9.tar.bz2
ampache-5ec3c0b90e49884c87508325430b67f83d04c6e9.zip
Change catalog update display to 1/second
Diffstat (limited to 'lib/class/access.class.php')
-rw-r--r--lib/class/access.class.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/class/access.class.php b/lib/class/access.class.php
index 6fd0d952..d3ebb5c0 100644
--- a/lib/class/access.class.php
+++ b/lib/class/access.class.php
@@ -33,7 +33,6 @@ class Access {
public $level;
public $user;
public $type;
- public $key;
public $enabled;
/**
@@ -245,7 +244,7 @@ class Access {
* and then returns true or false if they have access to this
* the IP is passed as a dotted quad
*/
- public static function check_network($type,$user,$level,$ip='',$key='') {
+ public static function check_network($type,$user,$level,$ip='') {
if (!Config::get('access_control')) {
switch ($type) {
@@ -261,7 +260,6 @@ class Access {
// Clean incomming variables
$ip = $ip ? Dba::escape(inet_pton($ip)) : Dba::escape(inet_pton($_SERVER['REMOTE_ADDR']));
$user = Dba::escape($user);
- $key = Dba::escape($key);
$level = Dba::escape($level);
switch ($type) {
@@ -277,7 +275,7 @@ class Access {
case 'xml-rpc':
$sql = "SELECT `id` FROM `access_list`" .
" WHERE `start` <= '$ip' AND `end` >= '$ip'" .
- " AND `key` = '$key' AND `level` >= '$level' AND `type`='rpc'";
+ " AND `level` >= '$level' AND `type`='rpc'";
break;
case 'init-api':
$type = 'rpc';