fix depricated & in function call, fix package names

7 files changed, 25 insertions, 25 deletions

diff --git a/templates/admin_bitboards.tpl b/templates/admin_bitboards.tpl
index 0330d1f..2e3eb45 100644
--- a/templates/admin_bitboards.tpl
+++ b/templates/admin_bitboards.tpl
@@ -9,7 +9,7 @@
 					{forminput}
 						<select name="homeBitForum" id="homeBitForum">
 							{section name=ix loop=$bitboards}
-								<option value="{$bitboards[ix].bitforum_id|escape}" {if $bitforums[ix].bitforum_id eq $home_bitforum}selected="selected"{/if}>{$bitforums[ix].title|escape|truncate:20:"...":true}</option>
+								<option value="{$bitboards[ix].bitboards_id|escape}" {if $bitforums[ix].bitboards_id eq $home_bitforum}selected="selected"{/if}>{$bitforums[ix].title|escape|truncate:20:"...":true}</option>
 							{sectionelse}
 								<option>{tr}No records found{/tr}</option>
 							{/section}
diff --git a/templates/board.tpl b/templates/board.tpl
index 9c54e3a..b4fcdc8 100644
--- a/templates/board.tpl
+++ b/templates/board.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_boards/templates/Attic/board.tpl,v 1.1 2006/06/28 15:45:26 spiderr Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_boards/templates/Attic/board.tpl,v 1.2 2006/07/06 19:44:26 hash9 Exp $ *}
 {strip}
 <div class="floaticon">{bithelp}</div>
 
@@ -30,12 +30,12 @@
 							</td>
 						<td><a href="{$board.url}" title="{$board_title}">{$board_title}</a></td>
 						{*
-					{if $gBitUser->hasPermission('p_bitboard_edit') || $gBitUser->hasPermission('p_bitforum_post_edit')}
+					{if $gBitUser->hasPermission('p_bitboards_edit') || $gBitUser->hasPermission('p_bitboards_post_edit')}
 					<td style="text-align:right;">{if $board.unreg > 0}<a style="color: blue;" href="{$smarty.const.MESSAGEBOARDS_PKG_URL}index.php?board_id={$board.board_id|escape:"url"}" title="{$board.title|escape}">{$board.unreg}&nbsp;Unregistered&nbsp;Posts</a>{/if}</td>{/if}
-						{if $gBitUser->hasPermission( 'p_bitboard_remove' )}
+						{if $gBitUser->hasPermission( 'p_bitboards_remove' )}
 							<td class="actionicon">
 								{smartlink ititle="Edit" ifile="edit.php" ibiticon="liberty/edit" board_id=$board.board_id}
-								<input type="checkbox" name="checked[]" title="{$board.title|escape}" value="{$board.bitboard_id}" />
+								<input type="checkbox" name="checked[]" title="{$board.title|escape}" value="{$board.bitboards_id}" />
 							</td>
 							{/if}
 							*}
@@ -49,7 +49,7 @@
 				{/foreach}
 			</table>
 			{*
-			{if $gBitUser->hasPermission( 'p_bitboard_remove' )}
+			{if $gBitUser->hasPermission( 'p_bitboards_remove' )}
 				<div style="text-align:right;">
 					<script type="text/javascript">/* <![CDATA[ check / uncheck all */
 						document.write("<label for=\"switcher\">{tr}Select All{/tr}</label> ");
@@ -58,7 +58,7 @@
 
 					<select name="submit_mult" onchange="this.form.submit();">
 						<option value="" selected="selected">{tr}with checked{/tr}:</option>
-						{if $gBitUser->hasPermission( 'p_bitboard_remove' )}
+						{if $gBitUser->hasPermission( 'p_bitboards_remove' )}
 							<option value="remove_bitboards">{tr}remove{/tr}</option>
 						{/if}
 					</select>
diff --git a/templates/flipswitch.tpl b/templates/flipswitch.tpl
index 453e0c0..de3a282 100644
--- a/templates/flipswitch.tpl
+++ b/templates/flipswitch.tpl
@@ -13,7 +13,7 @@ $flip_downname=>$flip.$flip_name.downname
 {if $gBitUser->hasPermission( 'p_boards_edit' )}
 <span>
 	<a onclick="
-	var url = '{$smarty.const.BITBOARDS_PKG_URL}ajax.php?req={$flip.$flip_name.req}&seq=' 
+	var url = '{$smarty.const.BITBOARDS_PKG_URL}ajax.php?req={$flip.$flip_name.req}&seq='
 		+ new Date().getTime()+
 		'&{$flip.$flip_name.idname}={$flip.$flip_name.id|escape:"url"}
 		&{$flip_name}={$flip.$flip_name.state|escape:"url"}';
@@ -31,13 +31,13 @@ $flip_downname=>$flip.$flip_name.downname
 	    &{$flip_name}={$flip.$flip_name.state|escape:"url"}">
 {/if}
 {if $flip.$flip_name.state==1}
-	{biticon ipackage=bitboard iname=$flip.$flip_name.up iexplain=$flip.$flip_name.upname}
+	{biticon ipackage=bitboards iname=$flip.$flip_name.up iexplain=$flip.$flip_name.upname}
 {else}
-	{if $gBitUser->hasPermission( 'p_bitboard_edit' )}
-		{biticon ipackage=bitboard iname=$flip.$flip_name.down iexplain=$flip.$flip_name.downname}
+	{if $gBitUser->hasPermission( 'p_bitboards_edit' )}
+		{biticon ipackage=bitboards iname=$flip.$flip_name.down iexplain=$flip.$flip_name.downname}
 	{/if}
 {/if}
-{if $gBitUser->hasPermission( 'p_bitboard_edit' )}
+{if $gBitUser->hasPermission( 'p_bitboards_edit' )}
 	</a>
 </span>
 {/if}
diff --git a/templates/menu_bitboards.tpl b/templates/menu_bitboards.tpl
index 3cc272e..39401d7 100644
--- a/templates/menu_bitboards.tpl
+++ b/templates/menu_bitboards.tpl
@@ -1,6 +1,6 @@
 {strip}
 	<ul>
-		{if $gBitUser->hasPermission( 'p_bitboard_read')}
+		{if $gBitUser->hasPermission( 'p_bitboards_read')}
 			<li><a class="item" href="{$smarty.const.BITBOARDS_PKG_URL}index.php">{tr}BitBoard Home{/tr}</a></li>
 		{/if}
 	</ul>
diff --git a/templates/post.tpl b/templates/post.tpl
index 6f4ba9e..11cba4e 100644
--- a/templates/post.tpl
+++ b/templates/post.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_boards/templates/Attic/post.tpl,v 1.2 2006/07/06 14:31:23 hash9 Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_boards/templates/Attic/post.tpl,v 1.3 2006/07/06 19:44:26 hash9 Exp $ *}
 {strip}
 		{if $comments and $gBitSystem->isFeatureActive('comments_display_option_bar')}
 			{form action="`$comments_return_url`#editcomments"}
@@ -73,7 +73,7 @@
 				{/foreach}
 			</table>
 			<p style="text-align: right;"><a title="{tr}Post on this thread{/tr}" href="{$comments_return_url}&amp;post_comment_request=1#editcomments">{tr}Post on this thread{/tr} {biticon ipackage=bitboard iname="mail_new" iexplain="Post on this thread"}</a></p>
-			{if $gBitUser->hasPermission( 'p_bitboard_remove' )}
+			{if $gBitUser->hasPermission( 'p_bitboards_remove' )}
 				<div style="text-align:right;">
 					<script type="text/javascript">/* <![CDATA[ check / uncheck all */
 						document.write("<label for=\"switcher\">{tr}Select All{/tr}</label> ");
@@ -82,7 +82,7 @@
 
 					<select name="submit_mult" onchange="this.form.submit();">
 						<option value="" selected="selected">{tr}with checked{/tr}:</option>
-						{if $gBitUser->hasPermission( 'p_bitboard_remove' )}
+						{if $gBitUser->hasPermission( 'p_bitboards_remove' )}
 							<option value="remove_bitboards">{tr}remove{/tr}</option>
 						{/if}
 					</select>
diff --git a/templates/post_display.tpl b/templates/post_display.tpl
index b6c667c..9174706 100644
--- a/templates/post_display.tpl
+++ b/templates/post_display.tpl
@@ -23,7 +23,7 @@
 <div class="display bitboard">
 	<div class="floaticon">
 		{if $print_page ne 'y' && $comment.deleted==0 }
-			{if $gBitUser->hasPermission( 'p_bitboard_edit' ) && (($comment.user_id<0 && $comment.approved==0)||$comment.user_id>=0)}
+			{if $gBitUser->hasPermission( 'p_bitboards_edit' ) && (($comment.user_id<0 && $comment.approved==0)||$comment.user_id>=0)}
 				<div style="display: inline; border-right: 1px solid blue; padding: 2px; margin-right: 8px;">
 					{if $comment.user_id<0 && $comment.approved==0}
 						<a title="{tr}Approve this post{/tr}" href="{$smarty.const.BITBOARDS_PKG_URL}post.php?t={$thread->mRootId}&action=1&post_id={$comment.post_id}">
diff --git a/templates/topic.tpl b/templates/topic.tpl
index 356c378..9db5c46 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_boards/templates/Attic/topic.tpl,v 1.2 2006/07/06 14:31:24 hash9 Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_boards/templates/Attic/topic.tpl,v 1.3 2006/07/06 19:44:26 hash9 Exp $ *}
 {strip}
 <div class="listing bitboard">
 	<div class="header">
@@ -29,7 +29,7 @@
 					<th>{smartlink ititle="Started" isort=flc_created offset=$control.offset}</th>
 					<th>{smartlink ititle="Last Update By" isort=llc_user_id offset=$control.offset}</th>
 					<th>{smartlink ititle="Last Update" isort=llc_created offset=$control.offset}</th>
-					{if $gBitUser->hasPermission( 'p_bitboard_remove' )}
+					{if $gBitUser->hasPermission( 'p_bitboards_remove' )}
 						<th>{tr}Actions{/tr}</th>
 					{/if}
 				</tr>*}
@@ -66,12 +66,12 @@
 					<td>
 						<a href="{$thread.url}" title="{$thread.flc_title}">{$thread.flc_title|escape}</a>, started by {if $thread.flc_user_id < 0}{$thread.first_unreg_uname|escape}{else}{displayname user_id=$thread.flc_user_id}{/if} {$thread.flc_created|reltime|escape}{if $thread.post_count > 1}, with {$thread.post_count|escape} posts, last update by {if $thread.flc_user_id < 0}{$thread.first_unreg_uname|escape}{else}{displayname user_id=$thread.flc_user_id}{/if} {$thread.llc_last_modified|reltime|escape}{/if}.
 					</td>
-					{if $gBitUser->hasPermission('p_bitboard_edit') || $gBitUser->hasPermission('p_bitforum_post_edit')}
+					{if $gBitUser->hasPermission('p_bitboards_edit') || $gBitUser->hasPermission('p_bitboards_post_edit')}
 					<td style="text-align:right;">{if $thread.unreg > 0}<a style="color: blue;" href="{$smarty.const.BITBOARDS_PKG_URL}index.php?board_id={$thread.th_board_id|escape:"url"}&thread_id={$thread.th_thread_id|escape:"url"}" title="{$thread.flc_title}">{$thread.unreg}&nbsp;Unregistered&nbsp;Posts</a>{/if}</td>
-						{if ($gBitUser->hasPermission( 'p_bitboard_edit' )||$gBitUser->hasPermission( 'p_bitforum_remove' ))}
+						{if ($gBitUser->hasPermission( 'p_bitboards_edit' )||$gBitUser->hasPermission( 'p_bitboards_remove' ))}
 							<td class="actionicon">
 							{if $thread.th_moved==0}
-								{if $gBitUser->hasPermission( 'p_bitboard_edit' )}
+								{if $gBitUser->hasPermission( 'p_bitboards_edit' )}
 									{*smartlink ititle="Edit" ifile="edit.php" ibiticon="liberty/edit" board_id=$thread.board_id*}
 									<a onclick="
 									document.getElementById('move_block_{$thread.th_thread_id|escape:"url"}').style['display']='inline'; 
@@ -98,7 +98,7 @@
 											</select>
 									</div>
 								{/if}
-								{if $gBitUser->hasPermission( 'p_bitboard_remove' )}
+								{if $gBitUser->hasPermission( 'p_bitboards_remove' )}
 									<a title="{tr}Delete Thread{/tr}" href="{$smarty.const.BITBOARDS_PKG_URL}remove_bitboard.php?thread_id={$thread.th_thread_id|escape:"url"}">{biticon ipackage=bitboard iname="mail_delete" iexplain="Delete Thread"}</a>
 									<input type="checkbox" name="checked[]" title="{$thread.flc_title|escape}" value="{$thread.th_thread_id}" />
 								{/if}
@@ -115,7 +115,7 @@
 			</table>
 
 			<p style="text-align: right;"><a title="{tr}Start a new thread{/tr}" href="{$comments_return_url}&amp;post_comment_request=1#editcomments">{tr}Start a new thread{/tr} {biticon ipackage=bitboard iname="mail_new" iexplain="Start a new thread"}</a></p>
-			{if $gBitUser->hasPermission( 'p_bitboard_remove' )}
+			{if $gBitUser->hasPermission( 'p_bitboards_remove' )}
 				<div style="text-align:right;">
 					<script type="text/javascript">/* <![CDATA[ check / uncheck all */
 					document.write("<label for=\"switcher\">{tr}Select All{/tr}</label> ");
@@ -124,7 +124,7 @@
 
 					<select name="submit_mult" onchange="this.form.submit();">
 						<option value="" selected="selected">{tr}with checked{/tr}:</option>
-						{if $gBitUser->hasPermission( 'p_bitboard_remove' )}
+						{if $gBitUser->hasPermission( 'p_bitboards_remove' )}
 							<option value="remove_bitboards">{tr}remove{/tr}</option>
 						{/if}
 					</select>