3 files changed, 8 insertions, 40 deletions

@@ -237,19 +237,4 @@ function instaDisc_changePassword($username, $password)
         $setpass2 = mysql_query($setpass);
 }
 
-function instaDisc_resolveSubscription($seriesURL, $id)
-{
-        $client = new xmlrpc_client($seriesURL);
-        $msg = new xmlrpcmsg('InstaDisc.subscriptionInfo', array(       new xmlrpcval($id, 'string')));
-        $resp = $client->send($msg);
-        $val = $resp->value()->scalarVal();
-
-        if ($val == 'false')
-        {
-                return 'false';
-        } else {
-                return unserialize($val);
-        }
-}
-
 ?>
@@ -1,9 +0,0 @@
-<?php
-
-/* InstaDisc Server - A Four Island Project */
-
-include('includes/instadisc.php');
-
-?>Subscription: http://fourisland.com/<?php echo($_SERVER['SERVER_NAME'] . "\n"); ?>
-Title: <?php echo(instaDisc_getConfig('siteName') . "\n"); ?>
-Category: instadisc
@@ -75,26 +75,18 @@ function requestRetained($username, $verification, $verificationID)
         return new xmlrpcresp(new xmlrpcval(1, "int"));
 }
 
-function sendFromUpdate($subscriptionSeriesURL, $subscriptionID, $title, $author, $url, $semantics, $encryptionID)
+function sendFromUpdate($subscriptionURL, $title, $author, $url, $semantics, $encryptionID)
 {
-        $subscriptionURL = instaDisc_resolveSubscription($subscriptionSeriesURL, $subscriptionID);
-        if ($subscriptionURL != 'false')
+        $getsed = "SELECT * FROM subscriptions WHERE url = \"" . mysql_real_escape_string($subscriptionURL) . "\"";
+        $getsed2 = mysql_query($getsed);
+        $i=0;
+        while ($getsed3[$i] = mysql_fetch_array($getsed2))
         {
-                $subscriptionURL = $subscriptionURL['url'];
-
-                $getsed = "SELECT * FROM subscriptions WHERE url = \"" . mysql_real_escape_string($subscriptionURL) . "\"";
-                $getsed2 = mysql_query($getsed);
-                $i=0;
-                while ($getsed3[$i] = mysql_fetch_array($getsed2))
-                {
-                        instaDisc_addItem($getsed3[$i]['username'], $subscriptionURL, $title, $author, $url, $semantics, $encryptionID);
-                        $i++;
-                }
-
-                return new xmlrpcresp(new xmlrpcval(0, "int"));
+                instaDisc_addItem($getsed3[$i]['username'], $subscriptionURL, $title, $author, $url, $semantics, $encryptionID);
+                $i++;
         }
 
-        return new xmlrpcresp(new xmlrpcval(1, "int"));
+        return new xmlrpcresp(new xmlrpcval(0, "int"));
 }
 
 function deleteSubscription($username, $verification, $verificationID, $subscription)