[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[37390] branches/proposals/6.x

[<jy...@us...>]

Revision: 37390
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=37390&view=rev
Author:   jyhem
Date:     2011-09-18 17:47:40 +0000 (Sun, 18 Sep 2011)
Log Message:
-----------
[FIX bp/37389] Fix comments moderation buttons which were broken on recent FireFox & IE following change of browser behaviour due to stricter implementation of image input buttons

Modified Paths:
--------------
    branches/proposals/6.x/templates/tiki-list_comments.tpl
    branches/proposals/6.x/tiki-list_comments.php

Modified: branches/proposals/6.x/templates/tiki-list_comments.tpl
===================================================================
--- branches/proposals/6.x/templates/tiki-list_comments.tpl	2011-09-18 17:46:09 UTC (rev 37389)
+++ branches/proposals/6.x/templates/tiki-list_comments.tpl	2011-09-18 17:47:40 UTC (rev 37390)
@@ -72,7 +72,7 @@
 		{/capture}
 
 		<tr class="{cycle}{if $prefs.feature_comments_moderation eq 'y'} post-approved-{$comments[ix].approved}{/if}">
-			<td><input type="checkbox" name="checked[]" value="{$id}"/></td>
+			<td><input type="checkbox" name="checked[]" value="{$id}" {if isset($rejected[$id]) }checked="checked"{/if}/></td>
 			<td>
 				<a title="{tr}Actions{/tr}" href="#" {popup trigger="onClick" sticky=1 mouseoff=1 fullhtml="1" center=true text=$smarty.capture.over_actions|escape:"javascript"|escape:"html"} style="padding:0; margin:0; border:0">{icon _id='wrench' alt="{tr}Actions{/tr}"}</a>
 			</td>
@@ -103,7 +103,7 @@
 				<td class="approval">
 					{if $comments[ix].approved eq 'n'}
 						{self_link approve='y' checked=$id _icon='comment_approve'}{tr}Approve{/tr}{/self_link}
-						{self_link approve='r' checked=$id _icon='comment_reject'}{tr}Reject{/tr}{/self_link}
+						{self_link reject='r' checked=$id _icon='comment_reject'}{tr}Reject{/tr}{/self_link}
 					{elseif $comments[ix].approved eq 'y'}
 						&nbsp;{tr}Approved{/tr}&nbsp;
 					{elseif $comments[ix].approved eq 'r'}
@@ -131,7 +131,7 @@
 		{/if}
 		{if $tiki_p_admin_comments eq 'y' and $prefs.feature_comments_moderation eq 'y'}
 			{icon _id='comment_approve' _tag='input_image' name='approve' value='y' alt="{tr}Approve{/tr}"}
-			{icon _id='comment_reject' _tag='input_image' name='approve' value='r' alt="{tr}Reject{/tr}"}
+			{icon _id='comment_reject' _tag='input_image' name='reject' value='r' alt="{tr}Reject{/tr}"}
 		{/if}
 	</div>
 	</form>

Modified: branches/proposals/6.x/tiki-list_comments.php
===================================================================
--- branches/proposals/6.x/tiki-list_comments.php	2011-09-18 17:46:09 UTC (rev 37389)
+++ branches/proposals/6.x/tiki-list_comments.php	2011-09-18 17:47:40 UTC (rev 37390)
@@ -102,12 +102,22 @@
 		exit;
 	}
 
-	// Approve/Reject comment(s)
-	if ($prefs['feature_comments_moderation'] == 'y' && isset($_REQUEST['approve']) && in_array($_REQUEST['approve'], array('y', 'n', 'r'))) {
+	// Approve comment(s)
+	if ($prefs['feature_comments_moderation'] == 'y' && isset($_REQUEST['approve_x']) ) {
 		foreach($checked as $id) {
-			$commentslib->approve_comment($id, $_REQUEST['approve']);
+			$commentslib->approve_comment($id, 'y');
 		}
 	}
+
+	// Reject comment(s)
+	if ($prefs['feature_comments_moderation'] == 'y' && isset($_REQUEST['reject_x'])) {
+		foreach($checked as $id) {
+			$commentslib->approve_comment($id, 'r');
+			$rejected[$id] = true;
+		}
+		$smarty->assign_by_ref('rejected', $rejected);
+	}
+
 }
 if (isset($_REQUEST["sort_mode"])) {
 	$sort_mode = $_REQUEST["sort_mode"];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.