first round of changes to get things functional in bitweaver

6 files changed, 77 insertions, 71 deletions

diff --git a/templates/admin_newsletter_subscriptions.tpl b/templates/admin_newsletter_subscriptions.tpl
index 9cc8330..6f5158c 100644
--- a/templates/admin_newsletter_subscriptions.tpl
+++ b/templates/admin_newsletter_subscriptions.tpl
@@ -1,9 +1,9 @@
-<a class="pagetitle" href="{$gTikiLoc.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php?nl_id={$nl_id}">{tr}Admin newsletter subscriptions{/tr}</a>
+<a class="pagetitle" href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php?nl_id={$nl_id}">{tr}Admin newsletter subscriptions{/tr}</a>
 <br /><br />
 
-<a href="{$gTikiLoc.NEWSLETTERS_PKG_URL}index.php">{tr}list newsletters{/tr}</a>
-<a href="{$gTikiLoc.NEWSLETTERS_PKG_URL}admin/index.php">{tr}admin newsletters{/tr}</a>
-<a href="{$gTikiLoc.NEWSLETTERS_PKG_URL}send.php?nl_id={$nl_id}">{tr}send newsletters{/tr}</a>
+<a href="{$smarty.const.NEWSLETTERS_PKG_URL}index.php">{tr}list newsletters{/tr}</a>
+<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php">{tr}admin newsletters{/tr}</a>
+<a href="{$smarty.const.NEWSLETTERS_PKG_URL}send.php?nl_id={$nl_id}">{tr}send newsletters{/tr}</a>
 <br /><br />
 
 <table class="panel">
@@ -19,7 +19,7 @@
 </table>
 
 <h2>{tr}Add a subscription newsletters{/tr}</h2>
-<form action="{$gTikiLoc.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php" method="post">
+<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>
@@ -28,13 +28,13 @@
 </form>
 
 <h2>{tr}Add all your site users to this newsletter (broadcast){/tr}</h2>
-<a href="{$gTikiLoc.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>
+<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>
 
 <h2>{tr}Subscriptions{/tr}</h2>
 <table class="find">
 <tr><td>{tr}Find{/tr}</td>
    <td>
-   <form method="get" action="{$gTikiLoc.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php">
+   <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}" />
@@ -45,9 +45,9 @@
 
 <table>
 <tr>
-<th><a href="{$gTikiLoc.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="{$gTikiLoc.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="{$gTikiLoc.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><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}
@@ -57,7 +57,7 @@
 <td>{$channels[user].valid}</td>
 <td>{$channels[user].subscribed|tiki_short_datetime}</td>
 <td>
-   <a href="{$gTikiLoc.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>
+   <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}
@@ -65,19 +65,19 @@
 
 <div class="pagination">
 {if $prev_offset >= 0}
-[<a href="{$gTikiLoc.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;
+[<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}
 
 {tr}Page{/tr}: {$actual_page}/{$cant_pages}
 
 {if $next_offset >= 0}
-&nbsp;[<a href="{$gTikiLoc.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>]
+&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 $direct_pagination eq 'y'}
 <br />
 {section loop=$cant_pages name=foo}
 {assign var=selector_offset value=$smarty.section.foo.index|times:$maxRecords}
-<a href="{$gTikiLoc.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php?nl_id={$nl_id}&amp;find={$find}&amp;offset={$selector_offset}&amp;sort_mode={$sort_mode}">
+<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}
diff --git a/templates/admin_newsletters.tpl b/templates/admin_newsletters.tpl
index 1d68c44..2eb51c3 100644
--- a/templates/admin_newsletters.tpl
+++ b/templates/admin_newsletters.tpl
@@ -1,24 +1,24 @@
-<a class="pagetitle" href="{$gTikiLoc.NEWSLETTERS_PKG_URL}admin/index.php">{tr}Admin newsletters{/tr}</a>
+<a class="pagetitle" href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php">{tr}Admin newsletters{/tr}</a>
   
-{if $gTikiSystemPrefs.feature_help eq 'y'}
-<a href="http://tikipro.org/wiki/index.php?page=Newsletters" target="help" title="{tr}Tikiwiki.org help{/tr}: {tr}Newsletters{/tr}"><img class="icon" src="{$gTikiLoc.IMG_PKG_URL}icons/help.gif" alt="help" /></a>
+{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 $gTikiSystemPrefs.feature_view_tpl eq 'y'}
-<a href="{$gTikiLoc.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="{$gTikiLoc.IMG_PKG_URL}icons/info.gif" alt="edit tpl" /></a>
+{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="{$gTikiLoc.NEWSLETTERS_PKG_URL}index.php">{tr}list newsletters{/tr}</a>
-<a href="{$gTikiLoc.NEWSLETTERS_PKG_URL}send.php">{tr}send newsletters{/tr}</a>
+<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="{$gTikiLoc.KERNEL_PKG_URL}object_permissions.php?objectName=newsletter%20{$info.name}&amp;object_type=newsletter&amp;permType=newsletters&amp;object_id={$info.nl_id}">{tr}There are individual permissions set for this newsletter{/tr}</a><br /><br />
+<a href="{$smarty.const.KERNEL_PKG_URL}object_permissions.php?objectName=newsletter%20{$info.name}&amp;object_type=newsletter&amp;permType=newsletters&amp;object_id={$info.nl_id}">{tr}There are individual permissions set for this newsletter{/tr}</a><br /><br />
 {/if}
 
-<form action="{$gTikiLoc.NEWSLETTERS_PKG_URL}admin/index.php" method="post">
+<form action="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php" method="post">
 <input type="hidden" name="nl_id" value="{$info.nl_id|escape}" />
 <table class="panel">
 <tr><td>{tr}Name{/tr}:</td><td><input type="text" name="name" value="{$info.name|escape}" /></td></tr>
@@ -39,7 +39,7 @@
 <table class="find">
 <tr><td>{tr}Find{/tr}</td>
    <td>
-   <form method="get" action="{$gTikiLoc.NEWSLETTERS_PKG_URL}admin/index.php">
+   <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}" />
@@ -50,12 +50,12 @@
 
 <table class="panel">
 <tr>
-<th><a href="{$gTikiLoc.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="{$gTikiLoc.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="{$gTikiLoc.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="{$gTikiLoc.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="{$gTikiLoc.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="{$gTikiLoc.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><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}
@@ -66,12 +66,12 @@
 <td>{$channels[user].description}</td>
 <td>{$channels[user].users} ({$channels[user].confirmed})</td>
 <td>{$channels[user].editions}</td>
-<td>{$channels[user].last_sent|tiki_short_datetime}</td>
+<td>{$channels[user].last_sent|bit_short_datetime}</td>
 <td>
-   <a href="{$gTikiLoc.NEWSLETTERS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove={$channels[user].nl_id}">{tr}remove{/tr}</a>
-   <a href="{$gTikiLoc.NEWSLETTERS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;nl_id={$channels[user].nl_id}">{tr}edit{/tr}</a>
-   <a href="{$gTikiLoc.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php?nl_id={$channels[user].nl_id}">{tr}subscriptions{/tr}</a>
-   {if $channels[user].individual eq 'y'}({/if}<a href="{$gTikiLoc.KERNEL_PKG_URL}object_permissions.php?objectName=newsletter%20{$channels[user].name}&amp;object_type=newsletter&amp;permType=newsletters&amp;object_id={$channels[user].nl_id}">{tr}perms{/tr}</a>{if $channels[user].individual eq 'y'}){/if}
+   <a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove={$channels[user].nl_id}">{tr}remove{/tr}</a>
+   <a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;nl_id={$channels[user].nl_id}">{tr}edit{/tr}</a>
+   <a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php?nl_id={$channels[user].nl_id}">{tr}subscriptions{/tr}</a>
+   {if $channels[user].individual eq 'y'}({/if}<a href="{$smarty.const.KERNEL_PKG_URL}object_permissions.php?objectName=newsletter%20{$channels[user].name}&amp;object_type=newsletter&amp;permType=newsletters&amp;object_id={$channels[user].nl_id}">{tr}perms{/tr}</a>{if $channels[user].individual eq 'y'}){/if}
 </td>
 </tr>
 {/section}
@@ -79,17 +79,17 @@
 
 <div class="pagination">
 {if $prev_offset >= 0}
-[<a href="{$gTikiLoc.NEWSLETTERS_PKG_URL}admin/index.php?find={$find}&amp;offset={$prev_offset}&amp;sort_mode={$sort_mode}">{tr}prev{/tr}</a>]&nbsp;
+[<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?find={$find}&amp;offset={$prev_offset}&amp;sort_mode={$sort_mode}">{tr}prev{/tr}</a>]&nbsp;
 {/if}
 {tr}Page{/tr}: {$actual_page}/{$cant_pages}
 {if $next_offset >= 0}
-&nbsp;[<a href="{$gTikiLoc.NEWSLETTERS_PKG_URL}admin/index.php?find={$find}&amp;offset={$next_offset}&amp;sort_mode={$sort_mode}">{tr}next{/tr}</a>]
+&nbsp;[<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?find={$find}&amp;offset={$next_offset}&amp;sort_mode={$sort_mode}">{tr}next{/tr}</a>]
 {/if}
 {if $direct_pagination eq 'y'}
 <br />
 {section loop=$cant_pages name=foo}
 {assign var=selector_offset value=$smarty.section.foo.index|times:$maxRecords}
-<a href="{$gTikiLoc.NEWSLETTERS_PKG_URL}admin/index.php?find={$find}&amp;offset={$selector_offset}&amp;sort_mode={$sort_mode}">
+<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?find={$find}&amp;offset={$selector_offset}&amp;sort_mode={$sort_mode}">
 {$smarty.section.foo.index_next}</a>&nbsp;
 {/section}
 {/if}
diff --git a/templates/menu_newsletters.tpl b/templates/menu_newsletters.tpl
index fcfb736..0407177 100644
--- a/templates/menu_newsletters.tpl
+++ b/templates/menu_newsletters.tpl
@@ -1,5 +1,9 @@
-<a class="menuoption" href="{$gTikiLoc.NEWSLETTERS_PKG_URL}index.php">{tr}List newsletters{/tr}</a>
-{if $tiki_p_admin_newsletters eq 'y'}
-	<a class="menuoption" href="{$gTikiLoc.NEWSLETTERS_PKG_URL}send.php">{tr}Send newsletters{/tr}</a>
-	<a class="menuoption" href="{$gTikiLoc.NEWSLETTERS_PKG_URL}admin/index.php">{tr}Admin newsletters{/tr}</a>
+{strip}
+<ul>
+<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}index.php">{tr}List newsletters{/tr}</a></li>
+{if $gBitUser->hasPermission( 'tiki_p_admin_newsletters' )}
+	<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.php">{tr}Send newsletters{/tr}</a></li>
+	<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php">{tr}Admin newsletters{/tr}</a></li>
 {/if}
+</ul>
+{/strip}
diff --git a/templates/menu_newsletters_admin.tpl b/templates/menu_newsletters_admin.tpl
index c6172d9..7a15eb1 100644
--- a/templates/menu_newsletters_admin.tpl
+++ b/templates/menu_newsletters_admin.tpl
@@ -1,4 +1,6 @@
-{if $tiki_p_admin_newsletters eq 'y'}
-	<a class="menuoption" href="{$gTikiLoc.NEWSLETTERS_PKG_URL}admin/index.php">{tr}Newsletters Settings{/tr}</a>
-	<a class="menuoption" href="{$gTikiLoc.NEWSLETTERS_PKG_URL}send.php">{tr}Send Newsletters{/tr}</a>
+{if $gBitUser->hasPermission( 'bit_p_admin_newsletters' )}
+<ul>
+	<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php">{tr}Newsletters Settings{/tr}</a></li>
+	<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.php">{tr}Send Newsletters{/tr}</a></li>
+</ul>
 {/if}
diff --git a/templates/newsletters.tpl b/templates/newsletters.tpl
index 2e4faef..bf4051d 100644
--- a/templates/newsletters.tpl
+++ b/templates/newsletters.tpl
@@ -1,4 +1,4 @@
-<a href="{$gTikiLoc.NEWSLETTERS_PKG_URL}index.php" class="pagetitle">{tr}Newsletters{/tr}</a><br /><br />
+<a href="{$smarty.const.NEWSLETTERS_PKG_URL}index.php" class="pagetitle">{tr}Newsletters{/tr}</a><br /><br />
 {if $subscribed eq 'y'}
 {tr}Thanks for your subscription. You will receive an email soon to confirm your subscription. No newsletters will be sent to you until the subscription is confirmed.{/tr}<br /><br />
 {/if}
@@ -22,7 +22,7 @@
 {/if}
 
 {if $subscribe eq 'y'}
-<form method="post" action="{$gTikiLoc.NEWSLETTERS_PKG_URL}index.php">
+<form method="post" action="{$smarty.const.NEWSLETTERS_PKG_URL}index.php">
 <input type="hidden" name="nl_id" value="{$nl_id|escape}" />
 <table class="panel">
 <caption>{tr}Subscribe to newsletter{/tr}</caption>
@@ -34,8 +34,8 @@
   <td>{tr}Description{/tr}:</td>
   <td>{$nl_info.description}</td>
 </tr>
-{if ($nl_info.allow_user_sub eq 'y') or ($tiki_p_admin_newsletters eq 'y')}
-{if $tiki_p_subscribe_email eq 'y'}
+{if ($nl_info.allow_user_sub eq 'y') or ($bitweaver.orgi_p_admin_newsletters eq 'y')}
+{if $bitweaver.orgi_p_subscribe_email eq 'y'}
 <tr>
   <td>{tr}Email:{/tr}</td>
   <td><input type="text" name="email" value="{$email|escape}" /></td>
@@ -55,7 +55,7 @@
 <table class="find">
 <tr><td>{tr}Find{/tr}</td>
    <td>
-   <form method="get" action="{$gTikiLoc.NEWSLETTERS_PKG_URL}admin/index.php">
+   <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}" />
@@ -66,14 +66,14 @@
 
 <table>
 <tr>
-<th><a href="{$gTikiLoc.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="{$gTikiLoc.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 '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>
 </tr>
 {cycle values="even,odd" print=false}
 {section name=user loop=$channels}
-{if $channels.individual ne 'y' or $channels.individual_tiki_p_subscribe_newsletters eq 'y'}
+{if $channels.individual ne 'y' or $channels.individual_bitweaver.orgi_p_subscribe_newsletters eq 'y'}
 <tr class="{cycle}">
-<td><a href="{$gTikiLoc.NEWSLETTERS_PKG_URL}index.php?nl_id={$channels[user].nl_id}&amp;info=1">{$channels[user].name}</a></td>
+<td><a href="{$smarty.const.NEWSLETTERS_PKG_URL}index.php?nl_id={$channels[user].nl_id}&amp;info=1">{$channels[user].name}</a></td>
 <td>{$channels[user].description}</td>
 </tr>
 {/if}
@@ -82,17 +82,17 @@
 
 <div class="pagination">
 {if $prev_offset >= 0}
-[<a href="{$gTikiLoc.NEWSLETTERS_PKG_URL}admin/index.php?find={$find}&amp;offset={$prev_offset}&amp;sort_mode={$sort_mode}">{tr}prev{/tr}</a>]&nbsp;
+[<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?find={$find}&amp;offset={$prev_offset}&amp;sort_mode={$sort_mode}">{tr}prev{/tr}</a>]&nbsp;
 {/if}
 {tr}Page{/tr}: {$actual_page}/{$cant_pages}
 {if $next_offset >= 0}
-&nbsp;[<a href="{$gTikiLoc.NEWSLETTERS_PKG_URL}admin/index.php?find={$find}&amp;offset={$next_offset}&amp;sort_mode={$sort_mode}">{tr}next{/tr}</a>]
+&nbsp;[<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?find={$find}&amp;offset={$next_offset}&amp;sort_mode={$sort_mode}">{tr}next{/tr}</a>]
 {/if}
 {if $direct_pagination eq 'y'}
 <br />
 {section loop=$cant_pages name=foo}
 {assign var=selector_offset value=$smarty.section.foo.index|times:$maxRecords}
-<a href="{$gTikiLoc.NEWSLETTERS_PKG_URL}admin/index.php?find={$find}&amp;offset={$selector_offset}&amp;sort_mode={$sort_mode}">{$smarty.section.foo.index_next}</a>&nbsp;
+<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?find={$find}&amp;offset={$selector_offset}&amp;sort_mode={$sort_mode}">{$smarty.section.foo.index_next}</a>&nbsp;
 {/section}
 {/if}
 </div>
diff --git a/templates/send_newsletters.tpl b/templates/send_newsletters.tpl
index 89483ee..8d9f273 100644
--- a/templates/send_newsletters.tpl
+++ b/templates/send_newsletters.tpl
@@ -1,4 +1,4 @@
-<a class="pagetitle" href="{$gTikiLoc.NEWSLETTERS_PKG_URL}send.php">{tr}Send newsletters{/tr}</a>
+<a class="pagetitle" href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.php">{tr}Send newsletters{/tr}</a>
 <br /><br />
 
 {if $emited eq 'y'}
@@ -10,7 +10,7 @@
 
 {tr}This newsletter will be sent to {$subscribers} email addresses.{/tr}
 
-<form method="post" action="{$gTikiLoc.NEWSLETTERS_PKG_URL}send.php">
+<form method="post" action="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.php">
 <input type="hidden" name="nl_id" value="{$nl_id|escape}" />
 <input type="hidden" name="subject" value="{$subject|escape}" />
 <input type="hidden" name="data" value="{$data|escape}" />
@@ -25,7 +25,7 @@
 {/if}
 
 <h2>{tr}Prepare a newsletter to be sent{/tr}</h2>
-<form action="{$gTikiLoc.NEWSLETTERS_PKG_URL}send.php" method="post" id='editpageform'>
+<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}Newsletter{/tr}:</td><td>
@@ -57,7 +57,7 @@
 <table class="find">
 <tr><td>{tr}Find{/tr}</td>
    <td>
-   <form method="get" action="{$gTikiLoc.NEWSLETTERS_PKG_URL}send.php">
+   <form method="get" action="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.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}" />
@@ -68,10 +68,10 @@
 
 <table>
 <tr>
-<th><a href="{$gTikiLoc.NEWSLETTERS_PKG_URL}send.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="{$gTikiLoc.NEWSLETTERS_PKG_URL}send.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'subject_desc'}subject_asc{else}subject_desc{/if}">{tr}subject{/tr}</a></th>
-<th><a href="{$gTikiLoc.NEWSLETTERS_PKG_URL}send.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="{$gTikiLoc.NEWSLETTERS_PKG_URL}send.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'sent_desc'}sent_asc{else}sent_desc{/if}">{tr}sent{/tr}</a></th>
+<th><a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.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/send.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'subject_desc'}subject_asc{else}subject_desc{/if}">{tr}subject{/tr}</a></th>
+<th><a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.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/send.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'sent_desc'}sent_asc{else}sent_desc{/if}">{tr}sent{/tr}</a></th>
 <th>{tr}action{/tr}</th>
 </tr>
 {cycle values="even,odd" print=false}
@@ -80,10 +80,10 @@
 <td>{$channels[user].name}</td>
 <td>{$channels[user].subject}</td>
 <td>{$channels[user].users}</td>
-<td>{$channels[user].sent|tiki_short_datetime}</td>
+<td>{$channels[user].sent|bit_short_datetime}</td>
 <td>
-   <a href="{$gTikiLoc.NEWSLETTERS_PKG_URL}send.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove={$channels[user].edition_id}">{tr}remove{/tr}</a>
-   <a href="{$gTikiLoc.NEWSLETTERS_PKG_URL}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={$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>
 </td>
 </tr>
 {/section}
@@ -91,17 +91,17 @@
 
 <div class="pagination">
 {if $prev_offset >= 0}
-[<a href="{$gTikiLoc.NEWSLETTERS_PKG_URL}send.php?find={$find}&amp;offset={$prev_offset}&amp;sort_mode={$sort_mode}">{tr}prev{/tr}</a>]&nbsp;
+[<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.php?find={$find}&amp;offset={$prev_offset}&amp;sort_mode={$sort_mode}">{tr}prev{/tr}</a>]&nbsp;
 {/if}
 {tr}Page{/tr}: {$actual_page}/{$cant_pages}
 {if $next_offset >= 0}
-&nbsp;[<a href="{$gTikiLoc.NEWSLETTERS_PKG_URL}send.php?find={$find}&amp;offset={$next_offset}&amp;sort_mode={$sort_mode}">{tr}next{/tr}</a>]
+&nbsp;[<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.php?find={$find}&amp;offset={$next_offset}&amp;sort_mode={$sort_mode}">{tr}next{/tr}</a>]
 {/if}
 {if $direct_pagination eq 'y'}
 <br />
 {section loop=$cant_pages name=foo}
 {assign var=selector_offset value=$smarty.section.foo.index|times:$maxRecords}
-<a href="{$gTikiLoc.NEWSLETTERS_PKG_URL}send.php?find={$find}&amp;offset={$selector_offset}&amp;sort_mode={$sort_mode}">
+<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.php?find={$find}&amp;offset={$selector_offset}&amp;sort_mode={$sort_mode}">
 {$smarty.section.foo.index_next}</a>&nbsp;
 {/section}
 {/if}