Update: Centralized Central in phpBB3

Also removed subscription.php due to the new subscription specification (#28)

Refs #52 and #28

6 files changed, 21 insertions, 100 deletions

@@ -17,44 +17,24 @@
                 </DL>
                 <DL>
                         <DT>
-                                <LABEL FOR="subscription_file">{L_SUBSCRIPTION_FILE}</LABEL>
-                                <BR><SPAN>{L_SUBSCRIPTION_FILE_DESC}</SPAN>
+                                <LABEL FOR="series_url">{L_SERIES_URL}</LABEL>
+                                <BR><SPAN>{L_SERIES_URL_DESC}</SPAN>
                         </DT>
-                        <DD>{S_SUBSCRIPTION_FILE}</DD>
-                </DL>
-                <DL>
-                        <DT><label for="central_server">{L_CENTRAL_SERVER}:</label><BR>
-                                <SPAN>{L_CENTRAL_SERVER_DESC}</SPAN>
-                        </DT>
-                        <DD><input name="central_server" type="text" id="central_server" maxlength="255" VALUE="{S_CENTRAL_SERVER}" SIZE="40"/></DD>
-                </DL>
-                <DL>
-                        <DT>
-                                <LABEL FOR="central_server_username">{L_USERNAME}</LABEL>
-                                <BR><SPAN>{L_USERNAME_DESC}</SPAN>
-                        </DT>
-                        <DD><INPUT NAME="central_server_username" TYPE="text" ID="central_server_username" MAXLENGTH="255" VALUE="{S_USERNAME}" SIZE="40"></DD>
-                </DL>
-                <DL>
-                        <DT>
-                                <LABEL FOR="central_server_password">{L_PASSWORD}</LABEL>
-                                <BR><SPAN>{L_PASSWORD_DESC}</SPAN>
-                        </DT>
-                        <DD><INPUT NAME="central_server_password" TYPE="password" ID="central_server_password" MAXLENGTH="255" VALUE="{S_PASSWORD}" SIZE="40"></DD>
+                        <DD><INPUT NAME="series_url" TYPE="text" ID="series_url" MAXLENGTH="255" VALUE="{S_SERIES_URL}" SIZE="40"></DD>
                 </DL>
                 <DL>
                         <DT>
-                                <LABEL FOR="central_server_activation">{L_ACTIVATION}</LABEL>
-                                <BR><SPAN>{L_ACTIVATION_DESC}</SPAN>
+                                <LABEL FOR="subscription_id">{L_SUBSCRIPTION_ID}</LABEL>
+                                <BR><SPAN>{L_SUBSCRIPTION_ID_DESC}</SPAN>
                         </DT>
-                        <DD><INPUT NAME="central_server_activation" TYPE="text" ID="central_server_activation" MAXLENGTH="255" VALUE="{S_ACTIVATION}" SIZE="40"></DD>
+                        <DD><INPUT NAME="subscription_id" TYPE="text" ID="subscription_id" MAXLENGTH="255" VALUE="{S_SUBSCRIPTION_ID}" SIZE="40"></DD>
                 </DL>
                 <DL>
                         <DT>
                                 <LABEL FOR="encryption_key">{L_ENCRYPTION}</LABEL>
                                 <BR><SPAN>{L_ENCRYPTION_DESC}</SPAN>
                         </DT>
-                        <DD><INPUT NAME="encryption_key" TYPE="text" ID="encryption_key" MAXLENGTH="255" VALUE="{S_ENCRYPTION}" SIZE="40"></DD>
+                        <DD><INPUT NAME="encryption_key" TYPE="password" ID="encryption_key" MAXLENGTH="255" VALUE="{S_ENCRYPTION}" SIZE="40"></DD>
                 </DL>
         </fieldset>
         <p class="submit-buttons">
@@ -31,29 +31,21 @@ class acp_instadisc
                 {
                         // Add config to the database
                         set_config('id_subscription_title', $_POST['subscription_title']);
-                        set_config('id_central_server', $_POST['central_server']);
-                        set_config('id_username', $_POST['central_server_username']);
-                        set_config('id_password', $_POST['central_server_password']);
-                        set_config('id_activation_key', $_POST['central_server_activation']);
+                        set_config('id_series_url', $_POST['series_url']);
+                        set_config('id_subscription_id', $_POST['subscription_id']);
                         set_config('id_encryption_key', $_POST['encryption_key']);
 
                         trigger_error($user->lang['ID_CHANGES_SAVED'] . adm_back_link($this->u_action), E_USER_NOTICE);
                 } else {
                         $idst   = isset($config['id_subscription_title']) ? $config['id_subscription_title'] : $config['sitename'];
-                        $idcs   = isset($config['id_central_server']) ? $config['id_central_server'] : '';
-                        $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   = generate_board_url() . '/instadisc.php';
+                        $idsu   = isset($config['id_series_url']) ? $config['id_series_url'] : '';
+                        $idsi   = isset($config['id_subscription_id']) ? $config['id_subscription_id'] : '';
                         $idec   = isset($config['id_encryption_key']) ? $config['id_encryption_key'] : '';
 
                         $template->assign_vars(array(
                                 'S_SUBSCRIPTION_TITLE'  => $idst,
-                                'S_CENTRAL_SERVER'      => $idcs,
-                                'S_USERNAME'            => $idun,
-                                'S_PASSWORD'            => $idps,
-                                'S_ACTIVATION'          => $idak,
-                                'S_SUBSCRIPTION_FILE'   => $idsf,
+                                'S_SERIES_URL'          => $idsu,
+                                'S_SUBSCRIPTION_ID'     => $idsi,
                                 'S_ENCRYPTION_KEY'      => $idec,
                                 'S_SUBMIT'              => $this->u_action
                         ));
@@ -65,11 +65,9 @@ function sendItem($title, $userID, $url, $fourm)
                 mcrypt_module_close($td);
         }
 
-        $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(generate_board_url() . '/', 'string'),
+        $client = new xmlrpc_client('http://central.fourisland.com/xmlrpc.php');
+        $msg = new xmlrpcmsg("InstaDisc.sendFromUpdate", array( new xmlrpcval($config['id_series_url'], 'string'),
+                                                                new xmlrpcval($config['id_subscription_id'], 'string'),
                                                                 new xmlrpcval($title, 'string'),
                                                                 new xmlrpcval($author, 'string'),
                                                                 new xmlrpcval($url, 'string'),
@@ -1,38 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @version $Id: instadisc.php 2008-08-06 07:12:00Z hatkirby $
-* @version (c) 2008 Starla Insigna
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-define('IN_PHPBB', true);
-$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './';
-$phpEx = substr(strrchr(__FILE__, '.'), 1);
-include($phpbb_root_path . 'common.' . $phpEx);
-include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
-
-// Start session
-$user->session_begin();
-$auth->acl($user->data);
-
-$user->setup('mods/instadisc', $forum_data['forum_style']);
-
-$template->set_filenames(array(
-        'body' => 'instadisc.html')
-);
-
-$template->assign_vars(array(
-        'S_SUBSCRIPTION'        => (generate_board_url() . '/'),
-        'S_TITLE'               => $config['id_subscription_title'],
-        'S_KEY'                 => $config['id_activation_key'],
-));
-
-page_footer();
-
-?>
@@ -38,21 +38,14 @@ $lang = array_merge($lang, array(
         'INSTADISC_LINK_TEXT'           => 'the InstaDisc phpBB3 plugin page',
 
         'SUBSCRIPTION'                  => 'Subscription',
-        'SUBSCRIPTION_TITLE'            => 'Subscription Title',
-        'SUBSCRIPTION_FILE'             => 'Subscription File URL',
-
-        'CENTRAL_SERVER'                => 'Central Server',
-        'USERNAME'                      => 'Username',
-        'PASSWORD'                      => 'Password',
-        'ACTIVATION'                    => 'Activation Key',
 
+        'SUBSCRIPTION_TITLE'            => 'Subscription Title',
+        'SERIES_URL'                    => 'Series Control URL',
+        'SUBSCRIPTION_ID'               => 'Subscription ID',
         'ENCRYPTION'                    => 'Encryption Key',
 
-        'SUBSCRIPTION_FILE_DESC'        => 'This is the URL of your subscription file',
-        'CENTRAL_SERVER_DESC'           => 'This is the Central Server\'s XML-RPC URL. They should have provided this for you in an email and also on their site.',
-        'USERNAME_DESC'                 => 'Enter the username you registered for at your Central Server',
-        'PASSWORD_DESC'                 => 'Enter the password to go with the username above',
-        'ACTIVATION_DESC'               => 'After submitting your subscription for sponsership at your Central Server, it should provide you with an Activation Key',
+        'SERIES_URL_DESC'               => 'This is the XML-RPC URL of your Series Control.',
+        'SUBSCRIPTION_ID'               => 'This is this subscription's unique identifier on your Series Control.',
         'ENCRYPTION_DESC'               => 'If you have the PHP module "mcrypt" installed, you can password protect this subscription so that users who wish to subscribe to it must provide the correct password. Leave this field blank if you do not wish to encrypt this subscription.',
 
         'ID_CHANGES_SAVED'              => 'The changes you made to your InstaDisc settings have been saved!',
@@ -1,4 +0,0 @@
-Subscription: {S_SUBSCRIPTION}{L_LN}
-Title: {S_TITLE}{L_LN}
-Category: forum-post{L_LN}
-Key: {S_KEY}