merge all of wolffies changes to HEAD. Now need to work on a few things like user_id in mail_subs table, etc.

13 files changed, 177 insertions, 166 deletions

diff --git a/templates/admin_newsletter_subscriptions.tpl b/templates/admin_newsletter_subscriptions.tpl
index 67c5b80..4baf9e5 100644
--- a/templates/admin_newsletter_subscriptions.tpl
+++ b/templates/admin_newsletter_subscriptions.tpl
@@ -10,96 +10,80 @@
 			<input type="hidden" name="nl_id" value="{$nl_id|escape}" />
 
 			<div class="row">
-				{formlabel label="" for=""}
+				{if $gContent->getField('validate_addr') eq 'y'}
+					{formfeedback warning="Validate Email is enabled, a confirmation email will be sent to every subsciber inviting them to the newsletter. <strong>Any duplicate or previously unsubscribed emails will *NOT* be re-subscribed using this method.</strong>"}
+				{else}
+					{formfeedback warning="Validate Email is disabled, emails will be subscribed but not validated by the users. <strong>Any duplicate or previously unsubscribed emails will *NOT* be re-subscribed using this method.</strong>"}
+				{/if}
+			</div>
+
+			<div class="row">
+				{formlabel label="New Subscribers" for=""}
 				{forminput}
-					{formhelp note=""}
+					<textarea cols="50" rows="5" name="new_subscribers" id="new_subscribers"></textarea>
+					{formhelp note="Enter multiple email addresses on separate lines to import into the subscriber list"}
 				{/forminput}
 			</div>
 
 			<div class="row submit">
+				{forminput}
+					<input type="submit" name="save" value="{tr}Subscribe{/tr}" />
+				{/forminput}
 			</div>
 		{/form}
 
 		{minifind}
-	</div><!-- end .body -->
-</div><!-- end .newsletters -->
-
 
-<table class="panel">
-	<caption>Newsletters</caption>
-	<tr>
-		<td>{tr}Name{/tr}:</td>
-		<td>{$nl_info.name}</td>
-	</tr>
-	<tr>
-		<td>{tr}Description{/tr}:</td>
-		<td>{$nl_info.description}</td>
-	</tr>
-</table>
-
-{* original code
-<h2>{tr}Add a subscription newsletters{/tr}</h2>
-<form action="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php" method="post">
-<input type="hidden" name="nl_id" value="{$nl_id|escape}" />
-<table class="panel">
-<tr><td>{tr}Email{/tr}:</td><td><input type="text" name="email" /></td></tr>
-<tr class="panelsubmitrow"><td colspan="2"><input type="submit" name="save" value="{tr}Save{/tr}" /></td></tr>
-</table>
-</form>
-
-<h2>{tr}Add all your site users to this newsletter (broadcast){/tr}</h2>
-<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php?nl_id={$nl_id}&amp;offset={$offset}&amp;sort_mode={$sort_mode}&amp;find={$find}&amp;add_all=1">{tr}Add users{/tr}</a>
+		{form id="list"}
+			<input type="hidden" name="nl_id" value="{$nl_id|escape}" />
 
-<h2>{tr}Subscriptions{/tr}</h2>
-<table class="find">
-<tr><td>{tr}Find{/tr}</td>
-   <td>
-   <form method="get" action="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php">
-     <input type="text" name="find" value="{$find|escape}" />
-     <input type="submit" value="{tr}find{/tr}" name="search" />
-     <input type="hidden" name="sort_mode" value="{$sort_mode|escape}" />
-   </form>
-   </td>
-</tr>
-</table>
+			<table class="data">
+				<caption>{tr}Subscriptions{/tr}</caption>
+				<tr>
+					<th>{smartlink ititle="Email" isort=email offset=$offset idefault=1}</th>
+					<th>{smartlink ititle="Valid" isort=is_valid offset=$offset idefault=1}</th>
+					<th>{smartlink ititle="Subscribed" isort=subscribed_date offset=$offset idefault=1}</th>
+					<th>{smartlink ititle="Unsubscribed" isort=unsubscribe_date offset=$offset idefault=1}</th>
+					<th>{tr}Actions{/tr}</th>
+				</tr>
+				{section name=sb loop=$subscribers}
+					<tr class="{cycle values='odd,even'}">
+						<td>{$subscribers[sb].email}</td>
+						<td>{$subscribers[sb].is_valid}</td>
+						<td>{$subscribers[sb].subscribed_date|bit_short_datetime}</td>
+						<td>{if $subscribers[sb].unsubscribe_date ne NULL}{$subscribers[sb].unsubscribe_date|bit_short_datetime}{/if}</td>
+						<td><input type="checkbox" name="checked[]" value="{$subscribers[sb].email}" /></td>
+					</tr>
+				{sectionelse}
+					<tr class="norecords">
+						<td colspan="2">{tr}No Records Found{/tr}</td>
+					</tr>
+				{/section}
+			</table>
+			<div style="text-align:right;">
+				<script type="text/javascript">//<![CDATA[
+					// check / uncheck all.
+					document.write("<label for=\"switcher\">{tr}Select All{/tr}</label> ");
+					document.write("<input name=\"switcher\" id=\"switcher\" type=\"checkbox\" onclick=\"switchCheckboxes(this.form.id,'checked[]','switcher')\" />");
+				//]]></script>
 
-<table>
-<tr>
-<th><a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php?nl_id={$nl_id}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'email_desc'}email_asc{else}email_desc{/if}">{tr}email{/tr}</a></th>
-<th><a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php?nl_id={$nl_id}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'valid_desc'}valid_asc{else}valid_desc{/if}">{tr}valid{/tr}</a></th>
-<th><a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php?nl_id={$nl_id}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'subscribed_desc'}subscribed_asc{else}subscribed_desc{/if}">{tr}subscribed{/tr}</a></th>
-<th>{tr}action{/tr}</th>
-</tr>
-{cycle values="even,odd" print=false}
-{section name=user loop=$channels}
-<tr class="{cycle}">
-<td>{$channels[user].email}</td>
-<td>{$channels[user].valid}</td>
-<td>{$channels[user].subscribed|bit_short_datetime}</td>
-<td>
-   <a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php?nl_id={$nl_id}&amp;offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove={$channels[user].nl_id}&amp;email={$channels[user].email}">{tr}remove{/tr}</a>
-</td>
-</tr>
-{/section}
-</table>
+				<br />
 
-<div class="pagination">
-{if $prev_offset >= 0}
-[<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php?nl_id={$nl_id}&amp;find={$find}&amp;offset={$prev_offset}&amp;sort_mode={$sort_mode}">{tr}prev{/tr}</a>]&nbsp;
-{/if}
+				<select name="submit_mult" onchange="this.form.submit();">
+					<option value="" selected="selected">{tr}with checked{/tr}:</option>
+						<option value="remove">{tr}remove{/tr}</option>
+						<option value="unsubscribe">{tr}unsubscribe{/tr}</option>
+						<option value="resubscribe">{tr}resubscribe{/tr}</option>
+				</select>
 
-{tr}Page{/tr}: {$actual_page}/{$cant_pages}
+				<script type="text/javascript">//<![CDATA[
+				// Fake js to allow the use of the <noscript> tag (so non-js-users kenn still submit)
+				//]]></script>
 
-{if $next_offset >= 0}
-&nbsp;[<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php?nl_id={$nl_id}&amp;find={$find}&amp;offset={$next_offset}&amp;sort_mode={$sort_mode}">{tr}next{/tr}</a>]
-{/if}
-{if $site_direct_pagination eq 'y'}
-<br />
-{section loop=$cant_pages name=foo}
-{assign var=selector_offset value=$smarty.section.foo.index|times:$maxRecords}
-<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php?nl_id={$nl_id}&amp;find={$find}&amp;offset={$selector_offset}&amp;sort_mode={$sort_mode}">
-{$smarty.section.foo.index_next}</a>&nbsp;
-{/section}
-{/if}
-</div>
-*}
+				<noscript>
+					<div><input type="submit" value="{tr}Submit{/tr}" /></div>
+				</noscript>
+			</div>
+		{/form}
+	</div><!-- end .body -->
+</div><!-- end .newsletters -->
diff --git a/templates/admin_newsletters.tpl b/templates/admin_newsletters.tpl
index 85ed020..da060d6 100644
--- a/templates/admin_newsletters.tpl
+++ b/templates/admin_newsletters.tpl
@@ -2,7 +2,7 @@
 {form legend="Newsletter Features"}
 	<input type="hidden" name="page" value="{$page}" />
 
-	{if !$gBitSystem->getConfig( 'feature_server_name' )}
+	{if !$gBitSystem->getConfig( 'kernel_server_name' )}
 		{formfeedback error="Server name is not defined!"}
 		{tr}You must <a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=server">define the server name</a> for proper background operation of the mail script.{/tr}
 	{/if}
diff --git a/templates/confirm_newsletter_subscription.tpl b/templates/confirm_newsletter_subscription.tpl
index 6ef9f2e..6b1f848 100644
--- a/templates/confirm_newsletter_subscription.tpl
+++ b/templates/confirm_newsletter_subscription.tpl
@@ -1,10 +1,9 @@
-{tr}Somebody or you tried to subscribe this email address at our site:{/tr} {$server_name}
+{tr}A request has been made to subscribe this email address to the newsletter:{/tr} {$gContent->getTitle()}
 
-{tr}To the newsletter:{/tr} {$info.title|escape}
+{$gContent->getField('data')}
 
-{tr}Description:{/tr}
-{$info.description}
+{tr}You can read{/tr} {$gContent->getTitle()} {tr}online by visiting:{/tr}
+{$smarty.const.NEWSLETTERS_PKG_URI}edition.php?nl_id={$gContent->mNewsletterId}
 
-{tr}In order to confirm your subscription you must access the following URL:{/tr}
-
-{$url_subscribe}?confirm_subscription={$code}
+{tr}To confirm your subscription, please visit the following URL:{/tr}
+{$smarty.const.NEWSLETTERS_PKG_URI}?sub={$sub_code}
diff --git a/templates/edit_edition.tpl b/templates/edit_edition.tpl
index 0c77981..3f71499 100644
--- a/templates/edit_edition.tpl
+++ b/templates/edit_edition.tpl
@@ -34,6 +34,21 @@
 							{/forminput}
 						</div>
 
+						{if $gBitUser->hasPermission('p_use_content_templates') && $templates}
+							<div class="row">
+								{formlabel label="Template" for=""}
+								{forminput}
+									<select name="template_id" onchange="javascript:document.getElementById('editpageform').submit();">
+										<option value="0">{tr}none{/tr}</option>
+										{section name=ix loop=$templates}
+											<option value="{$templates[ix].template_id|escape}">{$templates[ix].name}</option>
+										{/section}
+									</select>
+									{formhelp note=""}
+								{/forminput}
+							</div>
+						{/if}
+
 						{include file="bitpackage:liberty/edit_services_inc.tpl serviceFile=content_edit_mini_tpl}
 
 						<div class="row">
@@ -70,7 +85,7 @@
 							{include file="bitpackage:quicktags/quicktags_full.tpl"}
 						{/if}
 						<div class="row">
-							{formlabel label="Body" for="body"}
+							{formlabel label="Body" for=$textarea_id}
 							{forminput}
 								<textarea {spellchecker} id="{$textarea_id}" name="edit" rows="{$rows|default:20}" cols="{$cols|default:50}">{$pageInfo.data|escape:html}</textarea>
 							{/forminput}
diff --git a/templates/edit_newsletter.tpl b/templates/edit_newsletter.tpl
index 2eb4116..affdf5e 100644
--- a/templates/edit_newsletter.tpl
+++ b/templates/edit_newsletter.tpl
@@ -53,7 +53,7 @@
 						{formhelp note="Append instructions on how to subscribe / unsubscribe to ever outgoing newsletter. This is only useful when users can un / subscribe to the list themselves."}
 					{/forminput}
 				</div>
-{*
+
 				<div class="row">
 					{formlabel label="Validate e-mail Addresses" for="validate_addr"}
 					{forminput}
@@ -61,7 +61,7 @@
 						{formhelp note="Validate all email addresses before they are added to the list. This might result in members not being added despite working email addresses."}
 					{/forminput}
 				</div>
-*}
+
 				<div class="row submit">
 					<input type="submit" name="cancel" value="{tr}Cancel{/tr}" />
 					<input type="submit" name="save" value="{tr}Save{/tr}" />
diff --git a/templates/list_editions_inc.tpl b/templates/list_editions_inc.tpl
index ca2c291..721f22a 100644
--- a/templates/list_editions_inc.tpl
+++ b/templates/list_editions_inc.tpl
@@ -9,7 +9,7 @@
 
 			<h2><a href="{$ed.display_url}">{$ed.title|escape}</a></h2>
 			<p>
-				{$ed.data|truncate:200:'...'}
+				{$ed.parsed|truncate:200:'...'}
 				<br />
 				{tr}in{/tr} <a href="{$smarty.const.NEWSLETTERS_PKG_URL}?nl_content_id={$ed.nl_content_id}">{$ed.newsletter_title}</a>
 			</p>
diff --git a/templates/menu_newsletters.tpl b/templates/menu_newsletters.tpl
index 2c03b00..7eaf4dc 100644
--- a/templates/menu_newsletters.tpl
+++ b/templates/menu_newsletters.tpl
@@ -1,9 +1,9 @@
 {strip}
 <ul>
-	<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}index.php">{tr}Newsletter Subscriptions{/tr}</a></li>
-	<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}newsletters.php">{tr}List Newsletters{/tr}</a></li>
+	<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}index.php">{tr}List Newsletters{/tr}</a></li>
 	{if $gBitUser->hasPermission( 'p_newsletters_create' )}
-		<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}newsletters.php?new=1">{tr}Create Newsletter{/tr}</a></li>
+		<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletters.php">{tr}Admin Newsletters{/tr}</a></li>
+		<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletters.php?new=1">{tr}Create Newsletter{/tr}</a></li>
 	{/if}
 	<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}edition.php">{tr}List Editions{/tr}</a></li>
 	{if $gBitUser->hasPermission( 'p_newsletters_create_editions' )}
diff --git a/templates/newsletter_byebye.tpl b/templates/newsletter_byebye.tpl
index 244ac9d..845ccb1 100644
--- a/templates/newsletter_byebye.tpl
+++ b/templates/newsletter_byebye.tpl
@@ -1,6 +1,8 @@
-{tr}Bye bye!{/tr}
-{tr}This email address has been removed to the list of subscriptors of:{/tr}
-{tr}Newsletter:{/tr} {$info.name}
+{tr}This email address has been unsubscribed from:{/tr} {$gContent->getTitle()}
 
-{tr}Description:{/tr}
-{$info.description}
\ No newline at end of file
+{tr}You can reply to this email with any feedback you may have regarding this newsletter.{/tr}
+
+{tr}You can read and re-subscribe to{/tr} {$gContent->getTitle()} {tr}online by visiting:{/tr}
+{$smarty.const.NEWSLETTERS_PKG_URI}?nl_id={$gContent->mNewsletterId}
+
+{tr}Thank you{/tr}
diff --git a/templates/newsletter_welcome.tpl b/templates/newsletter_welcome.tpl
index bb87988..f379e09 100644
--- a/templates/newsletter_welcome.tpl
+++ b/templates/newsletter_welcome.tpl
@@ -1,10 +1,11 @@
-{tr}Welcome to our newsletter!{/tr}
-{tr}This email address has been added to the list of subscriptors of:{/tr}
-{tr}Newsletter:{/tr} {$info.name}
+{tr}Welcome to{/tr} {$gContent->getTitle()} {tr}newsletter!{/tr}
 
-{tr}Description:{/tr}
-{$info.description}
+{$gContent->getField('data')}
 
-{tr}You can always cancel your subscription using:{/tr}
+{tr}This email address has been added to the list of subscribers.{/tr}
+
+{tr}You can read{/tr} {$gContent->getTitle()} {tr}online by visiting:{/tr}
+{$smarty.const.NEWSLETTERS_PKG_URI}edition.php?nl_id={$gContent->mNewsletterId}
 
-{$url_subscribe}?unsubscribe={$code}
\ No newline at end of file
+{tr}You can always cancel your subscription using:{/tr}
+{$smarty.const.NEWSLETTERS_PKG_URI}?unsubscribe={$sub_code}
diff --git a/templates/newsletters.tpl b/templates/newsletters.tpl
index 52a5893..b5f0f94 100644
--- a/templates/newsletters.tpl
+++ b/templates/newsletters.tpl
@@ -5,72 +5,74 @@
 	</div>
 
 	<div class="body">
+		{if $confirm eq 'y'}
+			{formfeedback success="Subscription Confirmed!"}
+		{/if}
 		{formfeedback hash=$feedback}
+		{if $subscribe eq 'y'}
+			<h2>{tr}Subscribe to Newsletter{/tr}</h2>
+			<div class="row">
+				{formlabel label="Name" for=""}
+				{forminput}
+					{$gContent->getTitle()}
+				{/forminput}
+			</div>
 
-		{if $gContent->isValid()}
-			{if $confirm eq 'y'}
-				{formfeedback success="Subscription Confirmed!"}
-			{/if}
+			<div class="row">
+				{formlabel label="Description" for=""}
+				{forminput}
+					{$gContent->parseData()}
+				{/forminput}
+			</div>
+			{if ($gContent->getField('allow_user_sub') eq 'y') or $gBitUser->hasPermission( 'p_newsletters_subscribe' )}
+				{form}
+					<input type="hidden" name="nl_id" value="{$gContent->mNewsletterId}" />
 					<div class="row">
-						{formlabel label="Name" for=""}
+						{formlabel label="Email" for=""}
 						{forminput}
-							{$gContent->getTitle()}
+						{if $gBitUser->hasPermission( 'p_newsletters_subscribe_email' )}
+							<input type="text" name="email" value="{$email|escape}" />
+						{else}
+							<input type="hidden" name="email" value="{$email|escape}" />
+							{$email|escape}
+						{/if}
 						{/forminput}
 					</div>
-
-					<div class="row">
-						{formlabel label="Description" for=""}
+					<div class="row submit">
 						{forminput}
-							{$gContent->parseData()}
+							<input type="submit" name="subscribe" value="{tr}Subscribe{/tr}" />
+							<input type="submit" name="unsubscribe" value="{tr}Unsubscribe{/tr}" />
 						{/forminput}
 					</div>
+				{/form}
+			{/if}
+		{/if}
 
-				{if ($gContent->mInfo.allow_user_sub eq 'y') or $gBitUser->hasPermission( 'p_newsletters_subscribe' )}
-					{form}
-						<input type="hidden" name="nl_id" value="{$gContent->mNewsletterId}" />
-						<div class="row">
-							{formlabel label="Email" for=""}
-							{forminput}
-							{if $gBitUser->hasPermission( 'p_newsletters_subscribe_email' )}
-								<input type="text" name="email" value="{$email|escape}" />
-							{else}
-								<input type="hidden" name="email" value="{$email|escape}" />
-								{$email|escape}
-							{/if}
-							{/forminput}
-						</div>
-						<div class="row submit">
-							{forminput}
-								<input type="submit" name="cancel" value="{tr}Cancel{/tr}" />
-								<input type="submit" name="subscribe" value="{tr}Subscribe{/tr}" />
-							{/forminput}
-						</div>
-					{/form}
-				{/if}
-		{else}
-
-			{minifind}
+		{minifind}
 
-			<table class="data">
-				<caption>{tr}Newsletters{/tr}</caption>
-				<tr>
-					<th>{smartlink ititle="Name" isort=name offset=$offset idefault=1}</th>
-					<th>{smartlink ititle="Description" isort=descritpion offset=$offset}</th>
-				</tr>
-				{foreach from=$newsletters item=nl key=nlId}
-					{if $newsletters.individual ne 'y' or $newsletters.individual_bit_p_subscribe_newsletters eq 'y'}
-						<tr class="{cycle values='odd,even'}">
-							<td><a href="{$smarty.const.NEWSLETTERS_PKG_URL}index.php?nl_id={$nl.nl_id}">{$nl.title|escape}</a></td>
-							<td>{$nl.data}</td>
-						</tr>
-					{/if}
-				{foreachelse}
-					<tr class="norecords">
-						<td colspan="2">{tr}No Records Found{/tr}</td>
+		<table class="data">
+			<caption>{tr}Newsletters{/tr}</caption>
+			<tr>
+				<th>{smartlink ititle="Name" isort=name offset=$offset idefault=1}</th>
+				<th>{smartlink ititle="Description" isort=descritpion offset=$offset idefault=1}</th>
+				<th>{tr}Subscribe{/tr}</th>
+				<th>{tr}Editions{/tr}</th>
+			</tr>
+			{foreach from=$newsletters item=nl}
+				{if $newsletters.individual ne 'y' or $newsletters.individual_bit_p_subscribe_newsletters eq 'y'}
+					<tr class="{cycle values='odd,even'}">
+						<td>{$nl.title|escape}</td>
+						<td>{$nl.data}</td>
+						<td><a href="{$smarty.const.NEWSLETTERS_PKG_URL}index.php?nl_id={$nl.nl_id}&amp;info=1">{tr}Subscribe{/tr}</a></td>
+						<td><a href="{$smarty.const.NEWSLETTERS_PKG_URL}edition.php?nl_id={$nl.nl_id}">{tr}Editions{/tr}</a></td>
 					</tr>
-				{/foreach}
-			</table>
-		{/if}
+				{/if}
+			{foreachelse}
+				<tr class="norecords">
+					<td colspan="2">{tr}No Records Found{/tr}</td>
+				</tr>
+			{/foreach}
+		</table>
 
 		{* haven't dealt with pagination yet *}
 		{pagination}
diff --git a/templates/send_newsletters.tpl b/templates/send_newsletters.tpl
index 4fb40b5..6a320e7 100644
--- a/templates/send_newsletters.tpl
+++ b/templates/send_newsletters.tpl
@@ -20,6 +20,7 @@
 				{if $smarty.request.emited eq 'y'}
 					{tr}The newsletter was sent to {$sent} email addresses{/tr}
 				{elseif $smarty.request.preview}
+					<input type="hidden" name="validated" value="{$validated}" />
 					{jstabs}
 						{jstab title="Preview Newsletter"}
 							{legend legend="Preview Newsletter"}
@@ -38,7 +39,7 @@
 									{forminput}
 										<ol>
 											{foreach from=$recipientList item=recipient key=email}
-												<li>{$recipient.login} &nbsp; <small>&lt;{$email}&gt;</small></li>
+												<li>{$recipient.login} &nbsp; &lt;{$email}&gt;</li>
 											{/foreach}
 										</ol>
 									{/forminput}
@@ -63,6 +64,13 @@
 							{/forminput}
 						</div>
 
+						<div class="row">
+							{formlabel label="Only send to validated emails"}
+							{forminput}
+								<input type="checkbox" name="validated" "checked" />
+							{/forminput}
+						</div>
+
 						<div class="row submit">
 							<input type="submit" name="preview" value="{tr}Preview{/tr}" />
 						</div>
diff --git a/templates/unsubscribe_inc.tpl b/templates/unsubscribe_inc.tpl
index 2900d44..b059537 100644
--- a/templates/unsubscribe_inc.tpl
+++ b/templates/unsubscribe_inc.tpl
@@ -1,2 +1,2 @@
-{tr}You have received this message because you are registered at{/tr} <a href="{$smarty.const.BIT_ROOT_URL}">{$gBitSystem->getConfig('siteTitle', $smarty.server.HTTP_HOST)}</a>. {tr}You can always cancel your subscription using:{/tr}<br/>
-<a href="{$smarty.const.NEWSLETTERS_PKG_URI}?unsubscribe={$code}">{$smarty.const.NEWSLETTERS_PKG_URI}?sub={$url_code}</a>
+<small>{tr}You have received this message because you are registered at{/tr} <a href="{$smarty.const.BIT_BASE_URI}">{$gBitSystem->getConfig('siteTitle', $smarty.const.BIT_BASE_URI)}</a>.<br />{tr}You can always cancel your subscription using:{/tr}<br/>
+<a href="{$smarty.const.NEWSLETTERS_PKG_URI}?unsubscribe={$url_code}">{$smarty.const.NEWSLETTERS_PKG_URI}?unsubscribe={$url_code}</a></small>
diff --git a/templates/view_edition.tpl b/templates/view_edition.tpl
index 748af28..a03a463 100644
--- a/templates/view_edition.tpl
+++ b/templates/view_edition.tpl
@@ -3,13 +3,13 @@
 	<div class="floaticon">
 		{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='icon'}
 
-		{if $gContent->isOwner() || $gBitUser->hasPermission( 'p_newsletters_admin' )}
-			<a href="{$smarty.const.NEWSLETTERS_PKG_URL}edition_edit.php?edition_id={$gContent->mEditionId}">{biticon ipackage=liberty iname="edit" iexplain="edit"}</a>
-			<a href="{$smarty.const.NEWSLETTERS_PKG_URL}edition.php?edition_id={$gContent->mEditionId}&amp;remove=1">{biticon ipackage=liberty iname="delete" iexplain="delete"}</a>
-		{/if}
 		{if $gBitUser->hasPermission('p_newsletters_admin')}
 			<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.php?edition_id={$gContent->mEditionId}">{biticon ipackage=liberty iname="mail_send" iexplain="email this post"}</a>
 		{/if}
+		{if $gContent->isOwner() || $gBitUser->hasPermission( 'bit_p_admin_newsletters' )}
+			<a href="{$smarty.const.NEWSLETTERS_PKG_URL}edition_edit.php?edition_id={$gContent->mEditionId}">{biticon ipackage=liberty iname="edit" iexplain="edit"}</a>
+			<a href="{$smarty.const.NEWSLETTERS_PKG_URL}edition.php?edition_id={$gContent->mEditionId}&amp;remove=1">{biticon ipackage=liberty iname="delete" iexplain="delete"}</a>
+		{/if}
 	</div>
 	{/if}