10 files changed, 23 insertions, 4 deletions

@@ -15,9 +15,9 @@ $wgHooks['ArticleSaveComplete'][] = 'instaDisc_sendItem';
 
 function instaDisc_sendItem(&$article, &$user, &$text, &$summary, &$minoredit, &$watchthis, &$sectionanchor, &$flags, &$revision)
 {
-        global $instaDisc_password, $instaDisc_subscriptionURL;
+        global $instaDisc_title, $instaDisc_password;
 
-        if (!isset($instaDisc_password) || !isset($instaDisc_subscriptionURL))
+        if (!isset($instaDisc_title))
         {
                 return false;
         }
@@ -26,8 +26,10 @@ function instaDisc_sendItem(&$article, &$user, &$text, &$summary, &$minoredit, &
         $author = $user->getName();
         $url = $article->getTitle()->getFullURL();
 
+        $subscriptionURL = 'http://' . $_SERVER['SERVER_NAME'] . '/page-change/' . generateSlug($instaDisc_title) . '/';
+
         $encID = 0;
-        if (($instaDisc_password != '') && (extension_loaded('mcrypt')))
+        if ((!isset($instaDisc_password) && ($instaDisc_password != '')) && (extension_loaded('mcrypt')))
         {
                 $encID = encryptData($title, $author, $url, $instaDisc_password);
         }
@@ -35,7 +37,7 @@ function instaDisc_sendItem(&$article, &$user, &$text, &$summary, &$minoredit, &
         $verID = rand(1,2147483647);
 
         $client = new xmlrpc_client('http://central.fourisland.com/xmlrpc.php');
-        $msg = new xmlrpcmsg("InstaDisc.sendFromUpdate", array( new xmlrpcval($instaDisc_subscriptionURL, 'string'),
+        $msg = new xmlrpcmsg("InstaDisc.sendFromUpdate", array( new xmlrpcval($subscriptionURL, 'string'),
                                                                 new xmlrpcval($title, 'string'),
                                                                 new xmlrpcval($author, 'string'),
                                                                 new xmlrpcval($url, 'string'),
@@ -55,6 +57,23 @@ function instaDisc_sendItem(&$article, &$user, &$text, &$summary, &$minoredit, &
         }
 }
 
+function generateSlug($title)
+{
+        $title = preg_replace('/[^A-Za-z0-9]/','-',$title);
+        $title = preg_replace('/-{2,}/','-',$title);
+        if (substr($title,0,1) == '-')
+        {
+                $title = substr($title,1);
+        }
+        if (substr($title,strlen($title)-1,1) == '-')
+        {
+                $title = substr($title,0,strlen($title)-1);
+        }
+        $title = strtolower($title);
+
+        return($title);
+}
+
 function encryptData(&$title, &$author, &$url, $password)
 {
         $encID = rand(1,2147483647);