unsubscription now working. several schema changes. tiki_mail_subscriptions not maintains indviidual email subscriptions as well as all unsubs.

3 files changed, 8 insertions, 44 deletions

diff --git a/templates/edit_newsletter.tpl b/templates/edit_newsletter.tpl
index e2f9800..533b85f 100644
--- a/templates/edit_newsletter.tpl
+++ b/templates/edit_newsletter.tpl
@@ -1,3 +1,4 @@
+{if !$newsletters || $gContent->isValid() || $smarty.request.new}
 {strip}
 <div class="floaticon">{bithelp}</div>
 
@@ -7,7 +8,6 @@
 	</div>
 
 	<div class="body">
-		{if !$newsletters || $gContent->isValid() || $smarty.request.new}
 			{form legend="Create / Edit Newsletters"}
 				{if $individual eq 'y'}
 					<a href="{$smarty.const.KERNEL_PKG_URL}object_permissions.php?objectName=newsletter%20{$gContent->mInfo.name}&amp;object_type=newsletter&amp;permType=newsletters&amp;object_id={$gContent->mInfo.nl_id}">{tr}There are individual permissions set for this newsletter{/tr}</a><br /><br />
@@ -68,46 +68,9 @@
 				</div>
 			{/form}
 
-		{else}
-
-			{minifind}
-
-			<table class="data">
-				<caption>{tr}Newsletters{/tr}</caption>
-				<tr>
-					<th>{smartlink ititle="Name" isort=name offset=$offset}</th>
-					<th>{smartlink ititle="Description" isort=description offset=$offset}</th>
-					<th>{smartlink ititle="Created" isort=last_sent offset=$offset}</th>
-					<th>{smartlink ititle="Last Sent" isort=created offset=$offset}</th>
-					<th>{smartlink ititle="Users Unsubscribed" isort=users offset=$offset}</th>
-					<th>{tr}Action{/tr}</th>
-				</tr>
-
-				{foreach key=nlId from=$newsletters item=nl}
-					<tr class="{cycle values='odd,even'}">
-						<td><a href="{$smarty.const.NEWSLETTERS_PKG_URL}index.php?nl_id={$nlId}">{$nl.title}</a></td>
-						<td>{$nl.data}</td>
-						<td>{$nl.created|bit_short_date}</td>
-						<td>{$nl.last_sent|bit_short_date}</td>
-						<td style="text-align:right;"><a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php?nl_id={$nlId}">{$nl.users|default:0} [ {$channels[user].confirmed|default:0} ]</a></td>
-						<td style="text-align:right;">
-							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}edition_edit.php?nl_id={$nlId}">{biticon ipackage=liberty iname=new iexplain="New Edition"}</a>
-							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?&amp;nl_id={$nlId}">{biticon ipackage=liberty iname=edit iexplain=Edit}</a>
-							{if $channels[user].individual eq 'y'}({/if}<a href="{$smarty.const.KERNEL_PKG_URL}object_permissions.php?objectName=newsletter%20{$nl.title}&amp;object_type={$smarty.const.BITNEWSLETTER_CONTENT_TYPE_GUID}&amp;permType=newsletters&amp;object_id={$nlId}">{biticon ipackage=liberty iname=permissions iexplain=Permissions}</a>{if $nl.individual eq 'y'}){/if}
-							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?remove=1&amp;nl_id={$nlId}">{biticon ipackage=liberty iname=delete iexplain=Remove}</a>
-						</td>
-					</tr>
-				{foreachelse}
-					<tr class="norecords">
-						<td colspan="7">{tr}No Records Found{/tr}</td>
-					</tr>
-				{/foreach}
-			</table>
-
-			<a href="{$smarty.server.php_self}?new=1">Create new newsletter</a>
-
-			{pagination}
-		{/if}
 	</div><!-- end .body -->
 </div><!-- end .___ -->
 {/strip}
+{else}
+	{include file="bitpackage:newsletters/list_newsletters.tpl"}
+{/if}
diff --git a/templates/list_newsletters.tpl b/templates/list_newsletters.tpl
index 3b43512..3ef2960 100644
--- a/templates/list_newsletters.tpl
+++ b/templates/list_newsletters.tpl
@@ -79,7 +79,7 @@
 					<th>{smartlink ititle="Description" isort=description offset=$offset}</th>
 					<th>{smartlink ititle="Created" isort=last_sent offset=$offset}</th>
 					<th>{smartlink ititle="Last Sent" isort=created offset=$offset}</th>
-					<th>{smartlink ititle="Users Unsubscribed" isort=users offset=$offset}</th>
+					<th>{smartlink ititle="Unsubscribed" isort=users offset=$offset}</th>
 					<th>{tr}Action{/tr}</th>
 				</tr>
 
@@ -89,7 +89,7 @@
 						<td>{$nl.data}</td>
 						<td>{$nl.created|bit_short_date}</td>
 						<td>{$nl.last_sent|bit_short_date}</td>
-						<td style="text-align:right;"><a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php?nl_id={$nlId}">{$nl.users|default:0} [ {$channels[user].confirmed|default:0} ]</a></td>
+						<td><a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php?nl_id={$nlId}"> {$nl.unsub_count|default:0}</a></td>
 						<td style="text-align:right;">
 							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}edition_edit.php?nl_id={$nlId}">{biticon ipackage=liberty iname=new iexplain="New Edition"}</a>
 							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}newsletters.php?remove=1&amp;nl_id={$nlId}">{biticon ipackage=liberty iname=delete iexplain=Remove}</a>
diff --git a/templates/user_subscriptions.tpl b/templates/user_subscriptions.tpl
index 8c24ea3..57139ef 100644
--- a/templates/user_subscriptions.tpl
+++ b/templates/user_subscriptions.tpl
@@ -8,7 +8,8 @@
 	{if $subInfo}
 	{formfeedback success=$success error=$gContent->mErrors}
 	{form enctype="multipart/form-data" id="editpageform"}
-		<input type="hidden" name="unsub_content_id" value="{$subInfo.content_id}" />
+		<input type="hidden" name="response_content_id" value="{$subInfo.content_id}" />
+		<input type="hidden" name="sub" value="{$smarty.request.sub}" />
 		<div class="row">
 <em>
 			{formlabel label="In Response To"}