rename permissions to new standard using: p_<package>_<verb>_[<noun>]

9 files changed, 16 insertions, 16 deletions

diff --git a/templates/edit_edition.tpl b/templates/edit_edition.tpl
index 4d82062..cf37a08 100644
--- a/templates/edit_edition.tpl
+++ b/templates/edit_edition.tpl
@@ -80,7 +80,7 @@
 
 				{include file="bitpackage:liberty/edit_services_inc.tpl serviceFile=content_edit_tab_tpl}
 
-				{if $gBitUser->hasPermission('bit_p_content_attachments')}
+				{if $gBitUser->hasPermission('p_liberty_attach_attachments')}
 					{jstab title="Attachments"}
 						{legend legend="Attachments"}
 							{include file="bitpackage:liberty/edit_storage.tpl"}
diff --git a/templates/list_editions_inc.tpl b/templates/list_editions_inc.tpl
index 91ed7a6..ca2c291 100644
--- a/templates/list_editions_inc.tpl
+++ b/templates/list_editions_inc.tpl
@@ -2,7 +2,7 @@
 	{foreach from=$editionList key=editionId item=ed}
 		<li class="item {cycle values='odd,even'} {$ed.content_type_guid}">
 			<div class="floaticon">
-				{if $gBitUser->hasPermission('bit_p_admin_newsletters')}
+				{if $gBitUser->hasPermission('p_newsletters_admin')}
 					<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.php?edition_id={$ed.edition_id}">{biticon ipackage=liberty iname="mail_send" iexplain="Send"}</a>
 			   {/if}
 			</div>
diff --git a/templates/list_newsletters.tpl b/templates/list_newsletters.tpl
index 99954ee..fda336c 100644
--- a/templates/list_newsletters.tpl
+++ b/templates/list_newsletters.tpl
@@ -45,7 +45,7 @@
 				{/foreach}
 			</table>
 
-			{if $gBitUser->hasPermission('bit_p_create_newsletters')}
+			{if $gBitUser->hasPermission('p_newsletters_create')}
 				<a href="{$smarty.server.php_self}?new=1">Create new newsletter</a>
 			{/if}
 
diff --git a/templates/menu_newsletters.tpl b/templates/menu_newsletters.tpl
index 34dc16a..2c03b00 100644
--- a/templates/menu_newsletters.tpl
+++ b/templates/menu_newsletters.tpl
@@ -2,14 +2,14 @@
 <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>
-	{if $gBitUser->hasPermission( 'bit_p_create_newsletters' )}
+	{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>
 	{/if}
 	<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}edition.php">{tr}List Editions{/tr}</a></li>
-	{if $gBitUser->hasPermission( 'bit_p_create_editions' )}
+	{if $gBitUser->hasPermission( 'p_newsletters_create_editions' )}
 		<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}edition_edit.php">{tr}Create Edition{/tr}</a></li>
 	{/if}
-	{if $gBitUser->hasPermission( 'bit_p_admin_newsletters' )}
+	{if $gBitUser->hasPermission( 'p_newsletters_admin' )}
 		<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.php">{tr}Send Newsletters{/tr}</a></li>
 	{/if}
 </ul>
diff --git a/templates/menu_newsletters_admin.tpl b/templates/menu_newsletters_admin.tpl
index 427af15..ddcb9a5 100644
--- a/templates/menu_newsletters_admin.tpl
+++ b/templates/menu_newsletters_admin.tpl
@@ -1,4 +1,4 @@
-{if $gBitUser->hasPermission( 'bit_p_admin_newsletters' )}
+{if $gBitUser->hasPermission( 'p_newsletters_admin' )}
 <ul>
 	<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=newsletters">{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>
diff --git a/templates/newsletters.tpl b/templates/newsletters.tpl
index acb3a7b..6ee896a 100644
--- a/templates/newsletters.tpl
+++ b/templates/newsletters.tpl
@@ -25,13 +25,13 @@
 						{/forminput}
 					</div>
 
-				{if ($gContent->mInfo.allow_user_sub eq 'y') or $gBitUser->hasPermission( 'bit_p_subscribe_newsletters' )}
+				{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( 'bit_p_subscribe_email' )}
+							{if $gBitUser->hasPermission( 'p_newsletters_subscribe_email' )}
 								<input type="text" name="email" value="{$email|escape}" />
 							{else}
 								<input type="hidden" name="email" value="{$email|escape}" />
@@ -93,8 +93,8 @@
   <td>{tr}Description{/tr}:</td>
   <td>{$nl_info.description}</td>
 </tr>
-{if ($nl_info.allow_user_sub eq 'y') or ($bit_p_admin_newsletters eq 'y')}
-{if $bit_p_subscribe_email eq 'y'}
+{if ($nl_info.allow_user_sub eq 'y') or ($p_newsletters_admin eq 'y')}
+{if $p_newsletters_subscribe_email eq 'y'}
 <tr>
   <td>{tr}Email:{/tr}</td>
   <td><input type="text" name="email" value="{$email|escape}" /></td>
diff --git a/templates/user_subscriptions.tpl b/templates/user_subscriptions.tpl
index c005c05..fbb745d 100644
--- a/templates/user_subscriptions.tpl
+++ b/templates/user_subscriptions.tpl
@@ -1,4 +1,4 @@
-{if $subInfo || $gBitUser->hasPermission('bit_p_subscribe_newsletters')}
+{if $subInfo || $gBitUser->hasPermission('p_newsletters_subscribe')}
 {strip}
 <div class="display newsletters">
 	<div class="header">
diff --git a/templates/view_edition.tpl b/templates/view_edition.tpl
index 52dbd23..748af28 100644
--- a/templates/view_edition.tpl
+++ b/templates/view_edition.tpl
@@ -3,11 +3,11 @@
 	<div class="floaticon">
 		{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='icon'}
 
-		{if $gContent->isOwner() || $gBitUser->hasPermission( 'bit_p_admin_newsletters' )}
+		{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('bit_p_admin_newsletters')}
+		{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}
 	</div>
diff --git a/templates/view_newsletter.tpl b/templates/view_newsletter.tpl
index 7dde128..584a903 100644
--- a/templates/view_newsletter.tpl
+++ b/templates/view_newsletter.tpl
@@ -2,12 +2,12 @@
 	<div class="floaticon">
 		{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='icon'}
 
-		{if $gContent->isOwner() || $gBitUser->hasPermission( 'bit_p_admin_newsletters' )}
+		{if $gContent->isOwner() || $gBitUser->hasPermission( 'p_newsletters_admin' )}
 			<a href="{$smarty.const.NEWSLETTERS_PKG_URL}newsletters.php?nl_id={$gContent->mNewsletterId}">{biticon ipackage=liberty iname="edit" iexplain="edit"}</a>
 			<a href="{$smarty.const.NEWSLETTERS_PKG_URL}newsletters.php?nl_id={$gContent->mNewsletterId}&amp;remove=1">{biticon ipackage=liberty iname="delete" iexplain="delete"}</a>
 		{/if}
 
-		{if $gBitUser->hasPermission( 'bit_p_print' )}
+		{if $gBitUser->hasPermission( 'p_liberty_print' )}
 			<a href="{$smarty.const.NEWSLETTERS_PKG_URL}print_blog_post.php?post_id={$post_id}">{biticon ipackage=liberty iname="print" iexplain="print"}</a>
 		{/if}
 		<a href="{$smarty.const.NEWSLETTERS_PKG_URL}send_newsletter.php?post_id={$post_id}">{biticon ipackage=liberty iname="mail_send" iexplain="email this post"}</a>