summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-12-18 01:35:40 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-12-18 01:35:40 +0000
commit74201cb6158db6448ebf5d8330ace6ad4a139693 (patch)
treec80e8011494c48a17f7edf0609467dc9a84d7f78 /lib
parentb6a7f890d97b88a6dfbcc48d883132e9be44cfda (diff)
downloadampache-74201cb6158db6448ebf5d8330ace6ad4a139693.tar.gz
ampache-74201cb6158db6448ebf5d8330ace6ad4a139693.tar.bz2
ampache-74201cb6158db6448ebf5d8330ace6ad4a139693.zip
cleaned up XML API errors so that they are always xml docs regardless
Diffstat (limited to 'lib')
-rw-r--r--lib/class/access.class.php2
-rw-r--r--lib/init.php2
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/class/access.class.php b/lib/class/access.class.php
index b46b248b..2d1ac3e5 100644
--- a/lib/class/access.class.php
+++ b/lib/class/access.class.php
@@ -179,6 +179,7 @@ class Access {
/* This is here because we want to at least check IP before even creating the xml-rpc server
* however we don't have the key that was passed yet so we've got to do just ip
*/
+ case 'init-rpc':
case 'init-xml-rpc':
$sql = "SELECT `id` FROM `access_list`" .
" WHERE `start` <= '$ip' AND `end` >= '$ip' AND `type`='rpc' AND `level` >= '$level'";
@@ -189,6 +190,7 @@ class Access {
" WHERE `start` <= '$ip' AND `end` >= '$ip'" .
" AND `key` = '$key' AND `level` >= '$level' AND `type`='rpc'";
break;
+ case 'init-api':
case 'network':
case 'interface':
case 'stream':
diff --git a/lib/init.php b/lib/init.php
index 28ac53d1..4796a615 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -81,7 +81,7 @@ if (!count($results)) {
}
/** This is the version.... fluf nothing more... **/
-$results['version'] = '3.4-Alpha4 Build (004)';
+$results['version'] = '3.4-Alpha4 Build (005)';
$results['int_config_version'] = '6';
$results['raw_web_path'] = $results['web_path'];