From dbdf94e953b0b1fe7c19e98888d512d6d16ee4cf Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Sun, 28 Sep 2008 18:31:07 +0000
Subject: Update: Modifed Wordpress ACP

Also modified subscription file to look pretty and to show verification when the subscription is encrypted. Refs #68
---
 .../plugin/wordpress/trunk/instadisc/instadisc.php | 14 ++++++
 .../wordpress/trunk/instadisc/subscription.php     | 52 +++++++++++++---------
 2 files changed, 44 insertions(+), 22 deletions(-)

(limited to 'update')

diff --git a/update/plugin/wordpress/trunk/instadisc/instadisc.php b/update/plugin/wordpress/trunk/instadisc/instadisc.php
index 3cb711c..d084aa2 100644
--- a/update/plugin/wordpress/trunk/instadisc/instadisc.php
+++ b/update/plugin/wordpress/trunk/instadisc/instadisc.php
@@ -63,6 +63,13 @@ function id_settings_page()
 </TABLE>
 <H3>Blog Posts Subscription</H3>
 <TABLE CLASS="form-table">
+<TR VALIGN="top">
+ <TH SCOPE="row"><LABEL>Subscription File URL</LABEL>
+ <TD>
+  <?php echo(get_option('siteurl') . '/wp-content/plugins/instadisc/subscription.php'); ?>
+  <BR>This is the URL that you advertise, the URL people use to subscribe to your subscription.
+ </TD>
+</TR>
 <?php
 	if (extension_loaded('mcrypt'))
 	{
@@ -80,6 +87,13 @@ function id_settings_page()
 </TABLE>
 <H3>Comments Subscription</H3>
 <TABLE CLASS="form-table">
+<TR VALIGN="top">
+ <TH SCOPE="row"><LABEL>Subscription File URL</LABEL>
+ <TD>
+  <?php echo(get_option('siteurl') . '/wp-content/plugins/instadisc/subscription.php?comment='); ?>
+  <BR>This is the URL that you advertise, the URL people use to subscribe to your subscription.
+ </TD>
+</TR>
 <?php
 	if (extension_loaded('mcrypt'))
 	{
diff --git a/update/plugin/wordpress/trunk/instadisc/subscription.php b/update/plugin/wordpress/trunk/instadisc/subscription.php
index ef5edf9..9889655 100644
--- a/update/plugin/wordpress/trunk/instadisc/subscription.php
+++ b/update/plugin/wordpress/trunk/instadisc/subscription.php
@@ -2,6 +2,8 @@
 
 include('../../../wp-blog-header.php');
 
+echo('<DIV STYLE="display: none">: ' . "\n");
+
 if (isset($_GET['comment']))
 {
 	echo('Subscription: ');
@@ -16,11 +18,23 @@ if (isset($_GET['comment']))
 	echo('Category: blog-comment');
 	echo("\n");
 
-	if (get_option('instaDisc_comment_centralServer_activationKey') != '')
+	if (get_option('instaDisc_comment_password') != '')
 	{
-		echo('Key: ');
-		echo(get_option('instaDisc_comment_centralServer_activationKey'));
+		$verID = rand(1,2147483647);
+
+		echo('Verification: ' . md5(get_option('instaDisc_subscription_title') . ':' . md5(get_option('instaDisc_comment_password')) . ':' . $verID) . "\n");
+		echo('Verification-ID: ' . $verID . "\n");
 	}
+
+?>
+End: </DIV><DIV STYLE="margin: 0 auto; margin-top: 5em; width: 500px; background-color: #FBEC5D; text-align: center; padding: 4px;"><B>This is an InstaDisc Subscription file.</B><P>If you would like to subscribe to the InstaDisc subscription:<BR><I><?php echo(get_option('instaDisc_subscription_title')); ?></I> (<U>blog-comment</U>)<BR>Copy the address of this file to the "Add Subscription" form on your InstaDisc client.</DIV>
+<?php
+
+	if (get_option('instaDisc_comment_password') != '')
+	{
+?><!--Notice-->: <CENTER><B>Please note that this is an <I>encrypted</I> subscription.</B><BR>To subscribe to it, you must know its password.</CENTER><?php
+	}	
+
 } else {
 	echo('Subscription: ');
 	echo('http://' . $_SERVER['SERVER_NAME'] . '/blog-post/' . generateSlug(get_option('instaDisc_subscription_title')) . '/');
@@ -33,28 +47,22 @@ if (isset($_GET['comment']))
 	echo('Category: blog-post');
 	echo("\n");
 
-	if (get_option('instaDisc_blogPost_centralServer_activationKey') != '')
+	if (get_option('instaDisc_blogPost_password') != '')
 	{
-		echo('Key: ');
-		echo(get_option('instaDisc_blogPost_centralServer_activationKey'));
+		$verID = rand(1,2147483647);
+
+		echo('Verification: ' . md5(get_option('instaDisc_subscription_title') . ':' . md5(get_option('instaDisc_blogPost_password')) . ':' . $verID) . "\n");
+		echo('Verification-ID: ' . $verID . "\n");
 	}
-}
 
-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);
+?>
+End: </DIV><DIV STYLE="margin: 0 auto; margin-top: 5em; width: 500px; background-color: #FBEC5D; text-align: center; padding: 4px;"><B>This is an InstaDisc Subscription file.</B><P>If you would like to subscribe to the InstaDisc subscription:<BR><I><?php echo(get_option('instaDisc_subscription_title')); ?></I> (<U>blog-post</U>)<BR>Copy the address of this file to the "Add Subscription" form on your InstaDisc client.</DIV>
+<?php
+
+	if (get_option('instaDisc_blogPost_password') != '')
+	{
+?><!--Notice-->: <CENTER><B>Please note that this is an <I>encrypted</I> subscription.</B><BR>To subscribe to it, you must know its password.</CENTER><?php
+	}	
 }
 
 ?>
-- 
cgit 1.4.1