From aa169c57725ebf148e9b98af5117a2e0a067eb1b Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Fri, 19 Sep 2008 20:25:09 +0000
Subject: Update: Removed Series-related code

Refs #56
---
 .../phpBB3/trunk/root/adm/style/acp_instadisc.html      | 17 ++++-------------
 .../phpBB3/trunk/root/includes/acp/acp_instadisc.php    |  9 +++------
 .../phpBB3/trunk/root/includes/functions_instadisc.php  |  3 +--
 .../phpBB3/trunk/root/language/en/mods/instadisc.php    |  6 ++----
 4 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/update/plugin/phpBB3/trunk/root/adm/style/acp_instadisc.html b/update/plugin/phpBB3/trunk/root/adm/style/acp_instadisc.html
index 501fcd3..a3906ee 100644
--- a/update/plugin/phpBB3/trunk/root/adm/style/acp_instadisc.html
+++ b/update/plugin/phpBB3/trunk/root/adm/style/acp_instadisc.html
@@ -4,9 +4,7 @@
 								
 <H1>{L_INSTADISC}</H1>
 									
-<P>{L_INSTADISC_EXPLAIN}
-<A HREF="http://fourisland.com/projects/instadisc/wiki/Update/phpBB3">{L_INSTADISC_LINK_TEXT}</A>
-</P>
+<P>{L_INSTADISC_EXPLAIN}<A HREF="http://central.fourisland.com/release/update/phpBB3/">{L_INSTADISC_LINK_TEXT}</A></P>
 								
 <form id="acp_instadisc" method="post" action="{U_ACTION}">
 	<fieldset>
@@ -17,17 +15,10 @@
 		</DL>
 		<DL>
 			<DT>
-				<LABEL FOR="series_url">{L_SERIES_URL}</LABEL>
-				<BR><SPAN>{L_SERIES_URL_DESC}</SPAN>
+				<LABEL FOR="series_url">{L_SUBSCRIPTION_URL}</LABEL>
+				<BR><SPAN>{L_SUBSCRIPTION_URL_DESC}</SPAN>
 			</DT>
-			<DD><INPUT NAME="series_url" TYPE="text" ID="series_url" MAXLENGTH="255" VALUE="{S_SERIES_URL}" SIZE="40"></DD>
-		</DL>
-		<DL>
-			<DT>
-				<LABEL FOR="subscription_id">{L_SUBSCRIPTION_ID}</LABEL>
-				<BR><SPAN>{L_SUBSCRIPTION_ID_DESC}</SPAN>
-			</DT>
-			<DD><INPUT NAME="subscription_id" TYPE="text" ID="subscription_id" MAXLENGTH="255" VALUE="{S_SUBSCRIPTION_ID}" SIZE="40"></DD>
+			<DD><INPUT NAME="subscription_url" TYPE="text" ID="subscription_url" MAXLENGTH="255" VALUE="{S_SUBSCRIPTION_URL}" SIZE="40"></DD>
 		</DL>
 		<DL>
 			<DT>
diff --git a/update/plugin/phpBB3/trunk/root/includes/acp/acp_instadisc.php b/update/plugin/phpBB3/trunk/root/includes/acp/acp_instadisc.php
index b7fc583..f93ece6 100644
--- a/update/plugin/phpBB3/trunk/root/includes/acp/acp_instadisc.php
+++ b/update/plugin/phpBB3/trunk/root/includes/acp/acp_instadisc.php
@@ -31,21 +31,18 @@ class acp_instadisc
 		{
 			// Add config to the database
 			set_config('id_subscription_title', $_POST['subscription_title']);
-			set_config('id_series_url', $_POST['series_url']);
-			set_config('id_subscription_id', $_POST['subscription_id']);
+			set_config('id_subscription_url', $_POST['subscription_url']);
 			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'];
-			$idsu	= isset($config['id_series_url']) ? $config['id_series_url'] : '';
-			$idsi	= isset($config['id_subscription_id']) ? $config['id_subscription_id'] : '';
+			$idsu	= isset($config['id_subscription_url']) ? $config['id_subscription_url'] : '';
 			$idec	= isset($config['id_encryption_key']) ? $config['id_encryption_key'] : '';
 
 			$template->assign_vars(array(
 				'S_SUBSCRIPTION_TITLE'	=> $idst,
-				'S_SERIES_URL'		=> $idsu,
-				'S_SUBSCRIPTION_ID'	=> $idsi,
+				'S_SUBSCRIPTION_URL'	=> $idsu,
 				'S_ENCRYPTION_KEY'	=> $idec,
 				'S_SUBMIT'		=> $this->u_action
 			));
diff --git a/update/plugin/phpBB3/trunk/root/includes/functions_instadisc.php b/update/plugin/phpBB3/trunk/root/includes/functions_instadisc.php
index f7af802..738cab9 100644
--- a/update/plugin/phpBB3/trunk/root/includes/functions_instadisc.php
+++ b/update/plugin/phpBB3/trunk/root/includes/functions_instadisc.php
@@ -66,8 +66,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_series_url'], 'string'),
-								new xmlrpcval($config['id_subscription_id'], 'string'),
+	$msg = new xmlrpcmsg("InstaDisc.sendFromUpdate", array(	new xmlrpcval($config['id_subscription_url'], 'string'),
 								new xmlrpcval($title, 'string'),
 								new xmlrpcval($author, 'string'),
 								new xmlrpcval($url, 'string'),
diff --git a/update/plugin/phpBB3/trunk/root/language/en/mods/instadisc.php b/update/plugin/phpBB3/trunk/root/language/en/mods/instadisc.php
index f7570aa..445290e 100644
--- a/update/plugin/phpBB3/trunk/root/language/en/mods/instadisc.php
+++ b/update/plugin/phpBB3/trunk/root/language/en/mods/instadisc.php
@@ -40,12 +40,10 @@ $lang = array_merge($lang, array(
 	'SUBSCRIPTION'			=> 'Subscription',
 
 	'SUBSCRIPTION_TITLE'		=> 'Subscription Title',
-	'SERIES_URL'			=> 'Series Control URL',
-	'SUBSCRIPTION_ID'		=> 'Subscription ID',
+	'SUBSCRIPTION_URL'		=> 'Subscription URL',
 	'ENCRYPTION'			=> 'Encryption 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.',
+	'SUBSCRIPTION_URL_DESC'		=> 'This is a unique URI used to identify your subscription.',
 	'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!',
-- 
cgit 1.4.1