Drop stale references to 'xml-rpc'

3 files changed, 1 insertions, 7 deletions

diff --git a/image.php b/image.php
index a08fb8a1..00bf1092 100644
--- a/image.php
+++ b/image.php
@@ -33,7 +33,7 @@ define('NO_SESSION','1');
 require_once 'lib/init.php';
 
 // Check to see if they've got an interface session or a valid API session, if not GTFO
-if (!Session::exists('interface', $_COOKIE[Config::get('session_name')]) AND !Session::exists('api', $_REQUEST['auth']) AND !Session::exists('xml-rpc', $_REQUEST['auth'])) {
+if (!Session::exists('interface', $_COOKIE[Config::get('session_name')]) && !Session::exists('api', $_REQUEST['auth'])) {
     debug_event('image','Access denied, checked cookie session:' . $_COOKIE[Config::get('session_name')] . ' and auth:' . $_REQUEST['auth'], 1);
     exit;
 }
diff --git a/lib/class/access.class.php b/lib/class/access.class.php
index b72b7f3a..685759f4 100644
--- a/lib/class/access.class.php
+++ b/lib/class/access.class.php
@@ -434,9 +434,6 @@ class Access {
             case 'network':
                 return $type;
             break;
-            case 'xml-rpc':
-                return 'rpc';
-            break;
             default:
                 return 'stream';
             break;
@@ -506,7 +503,6 @@ class Access {
     public function get_type_name() {
 
         switch ($this->type) {
-            case 'xml-rpc':
             case 'rpc':
                 return T_('API/RPC');
             break;
diff --git a/lib/class/session.class.php b/lib/class/session.class.php
index 5d555866..1afa47bf 100644
--- a/lib/class/session.class.php
+++ b/lib/class/session.class.php
@@ -172,7 +172,6 @@ class Session {
 
         // Regenerate the session ID to prevent fixation
         switch ($data['type']) {
-            case 'xml-rpc':
             case 'api':
                 $key = md5(uniqid(rand(), true));
             break;
@@ -258,7 +257,6 @@ class Session {
     public static function exists($type, $key, $data=array()) {
         // Switch on the type they pass
         switch ($type) {
-            case 'xml-rpc':
             case 'api':
                 $key = Dba::escape($key);
                 $time = time();