4 files changed, 19 insertions, 6 deletions

@@ -43,7 +43,7 @@ class acp_instadisc
                         $idun   = isset($config['id_username']) ? $config['id_username'] : '';
                         $idps   = isset($config['id_password']) ? $config['id_password'] : '';
                         $idak   = isset($config['id_activation_key']) ? $config['id_activation_key'] : '';
-                        $idsf   = $config['server_protocol'] . $config['server_name'] . $config['script_path'] . '/instadisc.php';
+                        $idsf   = generate_board_url() . '/instadisc.php';
 
                         $template->assign_vars(array(
                                 'S_SUBSCRIPTION_TITLE'  => $idst,
@@ -21,19 +21,30 @@ include($phpbb_root_path . 'includes/xmlrpc/xmlrpc.inc');
 /**
 * Send an InstaDisc Item
 */
-function sendItem($title, $author, $url, $semantics)
+function sendItem($title, $author, $url, $fourm)
 {
+        global $config, $db, $phpbb_root_path;
         $verID = rand(1,65536);
 
+        $url = str_replace($phpbb_root_path, generate_board_url() . '/', $url);
+
+        $da = array('forum_id' => $fourm);
+        $getfourm = "SELECT * FROM " . FORUMS_TABLE . " WHERE " . $db->sql_build_array('SELECT', $da);
+        $getfourm2 = $db->sql_query($getfourm);
+        $getfourm3 = $db->sql_fetchrow($getfourm2);
+        $db->sql_freeresult($getfourm2);
+        $semantics = array('forum' => $getfourm3['forum_name']);
+
         $client = new xmlrpc_client($config['id_central_server']);
         $msg = new xmlrpcmsg("InstaDisc.sendFromUpdate", array( new xmlrpcval($config['id_username'], 'string'),
                                                                 new xmlrpcval(md5($config['id_username'] . ':' . md5($config['id_password']) . ':' . $verID), 'string'),
                                                                 new xmlrpcval($verID, 'int'),
-                                                                new xmlrpcval($config['server_protocol'] . $config['server_name'] . $config['script_path'] . '/', 'string'),
+                                                                new xmlrpcval(generate_board_url() . '/', 'string'),
                                                                 new xmlrpcval($title, 'string'),
                                                                 new xmlrpcval($author, 'string'),
                                                                 new xmlrpcval($url, 'string'),
-                                                                new xmlrpcval($semantics, 'array')));
+                                                                new xmlrpcval(serialize($semantics), 'string')));
+        $client->setDebug(4);
         $client->send($msg);
 }
 
@@ -28,8 +28,9 @@ $template->set_filenames(array(
 );
 
 $template->assign_vars(array(
-        'S_SUBSCRIPTION'        => ($config['server_protocol'] . $config['server_name'] . $config['script_path'] . '/'),
+        'S_SUBSCRIPTION'        => (generate_board_url() . '/'),
         'S_TITLE'               => $config['id_subscription_title'],
+        'S_KEY'                 => $config['id_activation_key'],
 ));
 
 page_footer();
@@ -1,3 +1,4 @@
 Subscription: {S_SUBSCRIPTION}{L_LN}
 Title: {S_TITLE}{L_LN}
-Category: forum-post
+Category: forum-post{L_LN}
+Key: {S_KEY}