BIG CHANGE: migrate p_*_edit permissions to p_*_update permission naming convention, hasEditPermission is now hasUpdatePermission, many explicit perm checks have been cleaned up to hasUpdatePermission

4 files changed, 9 insertions, 9 deletions

diff --git a/templates/board_table.tpl b/templates/board_table.tpl
index 4eb3342..1f1995f 100644
--- a/templates/board_table.tpl
+++ b/templates/board_table.tpl
@@ -46,7 +46,7 @@
 					by 
 					{if $board.last.user_id < 0}{$board.last.l_anon_name|escape}{else}{displayname user_id=$board.last.user_id}{/if}
 				{/if}
-				{if $gBitUser->hasPermission('p_boards_edit') || $gBitUser->hasPermission('p_boards_post_edit')}
+				{if $gBitUser->hasPermission('p_boards_update') || $gBitUser->hasPermission('p_boards_post_update')}
 					{if $board.unreg > 0}<a class="highlight" href="{$board.url}" title="{$board.title|escape}">{$board.unreg}</a>{/if}
 				{/if}
 			</td>
diff --git a/templates/list_topics.tpl b/templates/list_topics.tpl
index d072351..b66d866 100644
--- a/templates/list_topics.tpl
+++ b/templates/list_topics.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_boards/templates/list_topics.tpl,v 1.29 2008/10/02 13:11:59 nickpalmer Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_boards/templates/list_topics.tpl,v 1.30 2008/10/20 21:40:09 spiderr Exp $ *}
 {strip}
 <div class="listing boards">
 	<div class="navbar">
@@ -12,7 +12,7 @@
 			{if $board->getPreference('boards_mailing_list') || $board->hasAdminPermission()}
 				<a class="item" href="{$smarty.const.BOARDS_PKG_URL}mailing_list.php?b={$board->mInfo.board_id}" title="{tr}Message Board Mailing List{/tr}">{biticon ipackage="icons" iname="internet-mail" iexplain="Edit Message Board"}</a>
 			{/if}
-			{if $board->hasEditPermission()}
+			{if $board->hasUpdatePermission()}
 				<a title="{tr}Edit message board{/tr}" href="{$smarty.const.BOARDS_PKG_URL}edit.php?b={$board->mInfo.board_id}">{biticon ipackage="icons" iname="accessories-text-editor" iexplain="Edit Message Board"}</a>
 			{/if}
 			{if $board->hasUserPermission( 'p_boards_remove', TRUE, TRUE )}
@@ -48,10 +48,10 @@
 						<th style="width:40%;">{tr}Title{/tr}</th>
 						<th style="width:5%;">{tr}Replies{/tr}</th>
 						<th style="width:20%;">{tr}Last Reply{/tr}</th>
-						{if $board->hasEditPermission() || $gBitUser->hasPermission('p_boards_post_edit')}
+						{if $board->hasUpdatePermission() || $gBitUser->hasPermission('p_boards_post_update')}
 							<th style="width:1%;"><abbr title="{tr}Number of posts by Anonymous users{/tr}">Anon</abbr></th>
 						{/if}
-						{if $board->hasEditPermission()}
+						{if $board->hasUpdatePermission()}
 							<th style="width:10%;" colspan="2">Actions</th>
 						{/if}
 					</tr>
@@ -83,11 +83,11 @@
 							{if $thread.post_count > 1}{if $thread.llc_user_id < 0}{$thread.l_anon_name|escape}{else}{displayname user_id=$thread.llc_user_id}{/if}{else}{/if}
 						</td>
 
-						{if $board->hasEditPermission() || $gBitUser->hasPermission('p_boards_post_edit')}
+						{if $board->hasUpdatePermission() || $gBitUser->hasPermission('p_boards_post_update')}
 							<td style="text-align:center;">{if $thread.unreg > 0}<a class="highlight" href="{$thread.url}" title="{$thread.title|escape}">{$thread.unreg}</a>{/if}</td>
 						{/if}
 
-						{if $board->hasEditPermission() || $gBitUser->hasPermission('p_boards_post_edit')}
+						{if $board->hasUpdatePermission() || $gBitUser->hasPermission('p_boards_post_update')}
 							<td class="actionicon">
 								{if $thread.flc_user_id<0 && $thread.first_approved==0}
 									<a title="{tr}Approve First Post{/tr}" href="{$smarty.const.BOARDS_PKG_URL}view_board_inc.php?b={$board->mInfo.board_id}&amp;action=1&amp;comment_id={$thread.th_thread_id}">
diff --git a/templates/menu_boards.tpl b/templates/menu_boards.tpl
index c93a0ad..52c7fcc 100644
--- a/templates/menu_boards.tpl
+++ b/templates/menu_boards.tpl
@@ -3,7 +3,7 @@
 		{if $gBitUser->hasPermission( 'p_boards_read')}
 			<li><a class="item" href="{$smarty.const.BOARDS_PKG_URL}index.php">{biticon ipackage="icons" iname="go-home" iexplain="Boards Home" ilocation=menu}</a></li>
 		{/if}
-		{if $gBitUser->hasPermission( 'p_boards_edit')}
+		{if $gBitUser->hasPermission( 'p_boards_create')}
 			<li><a class="item" href="{$smarty.const.BOARDS_PKG_URL}edit.php">{biticon ipackage="icons" iname="folder-new" iexplain="Create new Board" ilocation=menu}</a></li>
 			<li><a class="item" href="{$smarty.const.BOARDS_PKG_URL}assign.php">{biticon ipackage="icons" iname="emblem-symbolic-link" iexplain="Assign to Boards" ilocation=menu}</a></li>
 		{/if}
diff --git a/templates/post_display.tpl b/templates/post_display.tpl
index cb996c4..f59196e 100644
--- a/templates/post_display.tpl
+++ b/templates/post_display.tpl
@@ -39,7 +39,7 @@
 					{if $board->hasUserPermission( 'p_liberty_admin_comments' )}
 						<a href="{$comments_return_url}&amp;delete_comment_id={$comment.comment_id}" rel="nofollow">{biticon ipackage="icons" iname="edit-delete" iexplain="Remove" iforce="icon"}</a>
 					{/if}
-					{if $board->hasEditPermission() && (($comment.user_id<0 && $comment.is_approved==0)||$comment.user_id>=0) && !$comment.is_warned}
+					{if $board->hasUpdatePermission() && (($comment.user_id<0 && $comment.is_approved==0)||$comment.user_id>=0) && !$comment.is_warned}
 						{if $comment.user_id<0 && $comment.is_approved==0}
 							<a title="{tr}Approve this post{/tr}" href="{$smarty.const.BOARDS_PKG_URL}view_topic_inc.php?t={$thread->mRootId}&amp;action=1&amp;comment_id={$comment.comment_id}">
 								{biticon ipackage="icons" iname="list-add" iexplain="Approve Post" iforce="icon"}