5 files changed, 30 insertions, 9 deletions

@@ -4,7 +4,7 @@
                                                                 
 <H1>{L_INSTADISC}</H1>
                                                                         
-<P>{L_INSTADISC_EXPLAIN}<A HREF="http://central.fourisland.com/release/update/phpBB3/">{L_INSTADISC_LINK_TEXT}</A></P>
+<P>{L_INSTADISC_EXPLAIN}<A HREF="http://instadisc.org/phpBB3">{L_INSTADISC_LINK_TEXT}</A></P>
                                                                 
 <form id="acp_instadisc" method="post" action="{U_ACTION}">
         <fieldset>
@@ -15,10 +15,17 @@
                 </DL>
                 <DL>
                         <DT>
+                                <LABEL FOR="subscription_file">{L_SUBSCRIPTION_FILE}</LABEL>
+                                <BR><SPAN>{L_SUBSCRIPTION_FILE_DESC}</SPAN>
+                        </DT>
+                        <DD>{S_SUBSCRIPTION_FILE}</DD>
+                </DL>
+                <DL>
+                        <DT>
                                 <LABEL FOR="encryption_key">{L_ENCRYPTION}</LABEL>
                                 <BR><SPAN>{L_ENCRYPTION_DESC}</SPAN>
                         </DT>
-                        <DD><INPUT NAME="encryption_key" TYPE="password" 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_KEY}" SIZE="40"></DD>
                 </DL>
         </fieldset>
         <p class="submit-buttons">
@@ -31,18 +31,17 @@ class acp_instadisc
                 {
                         // Add config to the database
                         set_config('id_subscription_title', $_POST['subscription_title']);
-                        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_subscription_url']) ? $config['id_subscription_url'] : '';
+                        $idsf   = generate_board_url() . '/instadisc.php';
                         $idec   = isset($config['id_encryption_key']) ? $config['id_encryption_key'] : '';
 
                         $template->assign_vars(array(
                                 'S_SUBSCRIPTION_TITLE'  => $idst,
-                                'S_SUBSCRIPTION_URL'    => $idsu,
+                                'S_SUBSCRIPTION_FILE'   => $idsf,
                                 'S_ENCRYPTION_KEY'      => $idec,
                                 'S_SUBMIT'              => $this->u_action
                         ));
@@ -30,9 +30,16 @@ $template->set_filenames(array(
 $template->assign_vars(array(
         'S_SUBSCRIPTION'        => ('http://' . $_SERVER['SERVER_NAME'] . '/forum-post/' . generateSlug($config['id_subscription_title']) . '/'),
         'S_TITLE'               => $config['id_subscription_title'],
-        'S_KEY'                 => $config['id_activation_key'],
 ));
 
+if ($config['id_encryption_key'] != '')
+{
+        $verID = rand(1,2147483647);
+
+        $template->assign_block_vars('encrypted', array(        'S_VERIFICATION' => md5($config['id_subscription_title'] . ':' . md5($config['id_encryption_key']) . ':' . $verID),
+                                                                'S_VERID' => $verID));
+}
+
 page_footer();
 
 function generateSlug($title)
@@ -40,10 +40,10 @@ $lang = array_merge($lang, array(
         'SUBSCRIPTION'                  => 'Subscription',
 
         'SUBSCRIPTION_TITLE'            => 'Subscription Title',
-        'SUBSCRIPTION_URL'              => 'Subscription URL',
+        'SUBSCRIPTION_FILE'             => 'Subscription File URL',
         'ENCRYPTION'                    => 'Encryption Key',
 
-        'SUBSCRIPTION_URL_DESC'         => 'This is a unique URI used to identify your subscription.',
+        'SUBSCRIPTION_FILE_DESC'        => 'This is the URL of your subscription file',
         '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 +1,12 @@
+<DIV STYLE="display: none">: {L_LN}
 Subscription: {S_SUBSCRIPTION}{L_LN}
 Title: {S_TITLE}{L_LN}
 Category: forum-post{L_LN}
-Key: {S_KEY}
+<!-- BEGIN encrypted -->
+Verification: {encrypted.S_VERIFICATION}{L_LN}
+Verification-ID: {encrypted.S_VERID}{L_LN}
+<!-- END encrypted -->
+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>{S_TITLE}</I> (<U>forum-post</U>)<BR>Copy the address of this file to the "Add Subscription" form on your InstaDisc client.</DIV>
+<!-- BEGIN encrypted -->
+<!--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>
+<!-- END encrypted -->