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

1 files changed, 62 insertions, 78 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 -->