3 files changed, 21 insertions, 11 deletions

@@ -28,13 +28,11 @@
 
         <action-group>
                 <copy>
-                        <file from="root/instadisc.php" to="instadisc.php" />
                         <file from="root/adm/style/acp_instadisc.html" to="adm/style/acp_instadisc.html" />
                         <file from="root/includes/functions_instadisc.php" to="includes/functions_instadisc.php" />
                         <file from="root/includes/acp/acp_instadisc.php" to="includes/acp/acp_instadisc.php" />
                         <file from="root/includes/acp/info/acp_instadisc.php" to="includes/acp/info/acp_instadisc.php" />
                         <file from="root/language/en/mods/instadisc.php" to="language/en/mods/instadisc.php" />
-                        <file from="root/styles/prosilver/template/instadisc.html" to="styles/prosilver/template/instadisc.html" />
                 </copy>
 
                 <open src="includes/functions_posting.php">
@@ -64,6 +62,6 @@ if (($post_mode == 'post') || ($post_mode == 'reply'))
                         </edit>
                 </open>
 
-                <diy-instructions lang="en">Go to http://fourisland.com/projects/instadisc/wiki/Update/phpBB3 for help on setting up your subscriptions.</diy-instructions>
+                <diy-instructions lang="en">Go to http://central.fourisland.com/release/update/phpBB3/ for help on setting up your subscriptions.</diy-instructions>
         </action-group>
 </mod>
@@ -15,13 +15,6 @@
                 </DL>
                 <DL>
                         <DT>
-                                <LABEL FOR="series_url">{L_SUBSCRIPTION_URL}</LABEL>
-                                <BR><SPAN>{L_SUBSCRIPTION_URL_DESC}</SPAN>
-                        </DT>
-                        <DD><INPUT NAME="subscription_url" TYPE="text" ID="subscription_url" MAXLENGTH="255" VALUE="{S_SUBSCRIPTION_URL}" SIZE="40"></DD>
-                </DL>
-                <DL>
-                        <DT>
                                 <LABEL FOR="encryption_key">{L_ENCRYPTION}</LABEL>
                                 <BR><SPAN>{L_ENCRYPTION_DESC}</SPAN>
                         </DT>
@@ -42,6 +42,8 @@ function sendItem($title, $userID, $url, $fourm)
         $db->sql_freeresult($getfourm2);
         $semantics = array('forum' => $getfourm3['forum_name']);
 
+        $subscriptionURL = 'http://' . $_SERVER['SERVER_NAME'] . '/forum-post/' . generateSlug($config['id_subscription_title']) . '/';
+
         $encID = 0;
         if (($config['id_encryption_key'] != '') && extension_loaded('mcrypt'))
         {
@@ -66,7 +68,7 @@ function sendItem($title, $userID, $url, $fourm)
         }
 
         $client = new xmlrpc_client('http://central.fourisland.com/xmlrpc.php');
-        $msg = new xmlrpcmsg("InstaDisc.sendFromUpdate", array( new xmlrpcval($config['id_subscription_url'], 'string'),
+        $msg = new xmlrpcmsg("InstaDisc.sendFromUpdate", array( new xmlrpcval($subscriptionURL, 'string'),
                                                                 new xmlrpcval($title, 'string'),
                                                                 new xmlrpcval($author, 'string'),
                                                                 new xmlrpcval($url, 'string'),
@@ -81,6 +83,23 @@ function sendItem($title, $userID, $url, $fourm)
         }
 }
 
+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 encryptString($td, $key, $string)
 {
         mcrypt_generic_init($td, $key, strrev($key));