creation of BitNewsletterEdition and get send.php warmed up. paused on thought of how to deal with sending a arbitrary content_id instead...

2 files changed, 13 insertions, 95 deletions

diff --git a/templates/admin_newsletters.tpl b/templates/admin_newsletters.tpl
index 4cbb2d9..bc0ea9e 100644
--- a/templates/admin_newsletters.tpl
+++ b/templates/admin_newsletters.tpl
@@ -1,7 +1,6 @@
 {strip}
 <div class="floaticon">{bithelp}</div>
 
-<<<<<<< admin_newsletters.tpl
 <div class="edit ___">
 	<div class="header">
 		<h1>{tr}Netsletter Settings{/tr}</h1>
@@ -105,84 +104,3 @@
 	</div><!-- end .body -->
 </div><!-- end .___ -->
 {/strip}
-=======
-{if $gBitSystemPrefs.feature_help eq 'y'}
-<a href="http://bitweaver.org/wiki/PackageNewsletters" target="help" title="{tr}Tikiwiki.org help{/tr}: {tr}Newsletters{/tr}"><img class="icon" src="{$smarty.const.IMG_PKG_URL}icons/help.gif" alt="help" /></a>
-{/if}
-
-{if $gBitSystemPrefs.feature_view_tpl eq 'y'}
-<a href="{$smarty.const.THEMES_PKG_URL}edit_templates.php?template=templates/admin_newsletters.tpl" target="help" title="{tr}View tpl{/tr}: {tr}admin newsletters tpl{/tr}"><img class="icon" src="{$smarty.const.IMG_PKG_URL}icons/info.gif" alt="edit tpl" /></a>
-{/if}
-<br /><br />
-
-<a href="{$smarty.const.NEWSLETTERS_PKG_URL}index.php">{tr}list newsletters{/tr}</a>
-<a href="{$smarty.const.NEWSLETTERS_PKG_URL}send.php">{tr}send newsletters{/tr}</a>
-<br /><br />
-
-<h2>{tr}Create/edit newsletters{/tr}</h2>
-{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 />
-{/if}
-
-<form action="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php" method="post">
-<input type="hidden" name="nl_id" value="{$gContent->mInfo.nl_id|escape}" />
-<table class="panel">
-<tr><td>{tr}Name{/tr}:</td><td><input type="text" name="title" value="{$gContent->mInfo.title|escape}" /></td></tr>
-<tr><td>{tr}Description{/tr}:</td><td><textarea name="edit" rows="4" cols="40">{$gContent->mInfo.data|escape:html}</textarea></td></tr>
-<tr><td>{tr}Users can subscribe/unsubscribe to this list{/tr}</td><td>
-<input type="checkbox" name="allow_user_sub" {if $gContent->mInfo.allow_user_sub eq 'y'}checked="checked"{/if} /></td></tr>
-<tr><td>{tr}Users can subscribe any email address{/tr}</td><td>
-<input type="checkbox" name="allow_any_sub" {if $gContent->mInfo.allow_any_sub eq 'y'}checked="checked"{/if} /></td></tr>
-<tr><td>{tr}Add unsubscribe instructions to each newsletter{/tr}</td><td>
-<input type="checkbox" name="unsub_msg" {if $gContent->mInfo.unsub_msg eq 'y'}checked="checked"{/if} /></td></tr>
-<tr><td>{tr}Validate email addresses{/tr}</td><td>
-<input type="checkbox" name="validate_addr" {if $gContent->mInfo.validate_addr eq 'y'}checked="checked"{/if} /></td></tr>
-<tr class="panelsubmitrow"><td colspan="2"><input type="submit" name="save" value="{tr}Save{/tr}" /></td></tr>
-</table>
-</form>
-
-<h2>{tr}Newsletters{/tr}</h2>
-<table class="find">
-<tr><td>{tr}Find{/tr}</td>
-   <td>
-   <form method="get" action="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.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="panel">
-<tr>
-<th><a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'nl_id_desc'}nl_id_asc{else}nl_id_desc{/if}">{tr}ID{/tr}</a></th>
-<th><a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'name_desc'}name_asc{else}name_desc{/if}">{tr}name{/tr}</a></th>
-<th><a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'description_desc'}description_asc{else}description_desc{/if}">{tr}description{/tr}</a></th>
-<th><a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'users_desc'}users_asc{else}users_desc{/if}">{tr}users{/tr}</a></th>
-<th><a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'editions_desc'}editions_asc{else}editions_desc{/if}">{tr}editions{/tr}</a></th>
-<th><a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'last_sent_desc'}last_sent_asc{else}last_sent_desc{/if}">{tr}last sent{/tr}</a></th>
-<th>{tr}action{/tr}</th>
-</tr>
-{cycle values="even,odd" print=false}
-{foreach key=nlId from=$newsletters item=nl}
-<tr class="{cycle}">
-<td>{$nlIid}</td>
-<td>{$nl.title}</td>
-<td>{$nl.data}</td>
-<td>{$nl.users} ({$channels[user].confirmed})</td>
-<td>{$nl.editions}</td>
-<td>{$nl.last_sent|bit_short_datetime}</td>
-<td>
-   <a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove=1&amp;nl_id={$nlId}">{tr}remove{/tr}</a>
-   <a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;nl_id={$nlId}">{tr}edit{/tr}</a>
-   <a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php?nl_id={$nlId}">{tr}subscriptions{/tr}</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}">{tr}perms{/tr}</a>{if $nl.individual eq 'y'}){/if}
-</td>
-</tr>
-{/foreach}
-</table>
-
-{pagination}
->>>>>>> 1.4
diff --git a/templates/send_newsletters.tpl b/templates/send_newsletters.tpl
index 8d9f273..22c3449 100644
--- a/templates/send_newsletters.tpl
+++ b/templates/send_newsletters.tpl
@@ -27,12 +27,12 @@
 <h2>{tr}Prepare a newsletter to be sent{/tr}</h2>
 <form action="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.php" method="post" id='editpageform'>
 <table class="panel">
-<tr><td>{tr}Subject{/tr}:</td><td><input type="text" maxlength="250" size="40" name="subject" value="{$info.subject|escape}" /></td></tr>
+<tr><td>{tr}Subject{/tr}:</td><td><input type="text" maxlength="250" size="40" name="title" value="{$info.subject|escape}" /></td></tr>
 <tr><td>{tr}Newsletter{/tr}:</td><td>
 <select name="nl_id">
-{section loop=$newsletters name=ix}
-<option value="{$newsletters[ix].nl_id|escape}" {if $newsletters[ix].nl_id eq $nl_id}selected="selected"{/if}>{$newsletters[ix].name}</option>
-{/section}
+{foreach from=$newsletters item=nl key=nlId}
+<option value="{$nlId|escape}" {if $nlId eq $nl_id}selected="selected"{/if}>{$nl.title}</option>
+{/foreach}
 </select>
 </td></tr>
 {if $tiki_p_use_content_templates eq 'y'}
@@ -45,7 +45,7 @@
 </select>
 </td></tr>
 {/if}
-<tr><td>{tr}Data{/tr}:</td><td><textarea name="data" rows="25" cols="60">{$info.data|escape}</textarea></td></tr>
+<tr><td>{tr}Data{/tr}:</td><td><textarea name="edit" rows="25" cols="60">{$info.data|escape}</textarea></td></tr>
 <tr class="panelsubmitrow"><td colspan="2">
 <input type="submit" name="preview" value="{tr}Preview{/tr}" />&nbsp;<input type="submit" name="save" value="{tr}Send Newsletters{/tr}" />
 </td></tr>
@@ -75,18 +75,18 @@
 <th>{tr}action{/tr}</th>
 </tr>
 {cycle values="even,odd" print=false}
-{section name=user loop=$channels}
+{foreach from=$editions key=edId item=ed}
 <tr class="{cycle}">
-<td>{$channels[user].name}</td>
-<td>{$channels[user].subject}</td>
-<td>{$channels[user].users}</td>
-<td>{$channels[user].sent|bit_short_datetime}</td>
+<td>{$ed.title}</td>
+<td>{$ed.subject}</td>
+<td>{$ed.users}</td>
+<td>{$ed.sent|bit_short_datetime}</td>
 <td>
-   <a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove={$channels[user].edition_id}">{tr}remove{/tr}</a>
-   <a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;edition_id={$channels[user].edition_id}">{tr}use{/tr}</a>
+   <a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove={$ed.edition_id}">{tr}remove{/tr}</a>
+   <a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;edition_id={$ed.edition_id}">{tr}use{/tr}</a>
 </td>
 </tr>
-{/section}
+{/foreach}
 </table>
 
 <div class="pagination">