https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113555
Revision: 113555 Author: wikinaut Date: 2012-03-10 11:36:01 +0000 (Sat, 10 Mar 2012) Log Message: ----------- follow up r113554 . forgot - and fixed now - the server-side check of the ajaxpoll-vote permission. For viewers without voting permission it does not make sense to check one of the radio buttons, buttons are now unchecked on load. Modified Paths: -------------- trunk/extensions/AJAXPoll/AJAXPoll.php trunk/extensions/AJAXPoll/AJAXPoll_body.php Modified: trunk/extensions/AJAXPoll/AJAXPoll.php =================================================================== --- trunk/extensions/AJAXPoll/AJAXPoll.php 2012-03-10 09:26:52 UTC (rev 113554) +++ trunk/extensions/AJAXPoll/AJAXPoll.php 2012-03-10 11:36:01 UTC (rev 113555) @@ -19,7 +19,7 @@ * @author Jack Phoenix <j...@countervandalism.net> * @author Thomas Gries * @maintainer Thomas Gries - * @version 1.62 + * @version 1.63 * @link http://www.mediawiki.org/wiki/Extension:AJAX_Poll Documentation */ @@ -31,7 +31,7 @@ $wgExtensionCredits['parserhook'][] = array( 'path' => __FILE__, 'name' => 'AJAX Poll', - 'version' => '1.62 20120310', + 'version' => '1.63 20120310', 'author' => array( 'Dariusz Siedlecki', 'Jack Phoenix', 'Thomas Gries' ), 'descriptionmsg' => 'ajaxpoll-desc', 'url' => 'https://www.mediawiki.org/wiki/Extension:AJAX_Poll', @@ -48,7 +48,7 @@ $wgAvailableRights[] = 'ajaxpoll-vote'; # default: everyone can vote -$wgGroupPermissions['*']['ajaxpoll-vote'] = true; +$wgGroupPermissions['*']['ajaxpoll-vote'] = false; # if you want only users to vote use # $wgGroupPermissions['user']['ajaxpoll-vote'] = true; Modified: trunk/extensions/AJAXPoll/AJAXPoll_body.php =================================================================== --- trunk/extensions/AJAXPoll/AJAXPoll_body.php 2012-03-10 09:26:52 UTC (rev 113554) +++ trunk/extensions/AJAXPoll/AJAXPoll_body.php 2012-03-10 11:36:01 UTC (rev 113555) @@ -160,7 +160,7 @@ $user = $wgUser->getName(); } - if ( $wgUser->isAllowed( 'bot' ) ) { + if ( !$wgUser->isAllowed( 'ajaxpoll-vote' ) || $wgUser->isAllowed( 'bot' ) ) { return AJAXPoll::buildHTML( $ID, $user ); } @@ -348,7 +348,7 @@ } else { $ret .= " -<div id='ajaxpoll-answer-" . $ans_no . "' class='ajaxpoll-answer'><div class='ajaxpoll-answer-name'><label for='ajaxpoll-post-answer-" . $ans_no . "' onclick='$(\"#ajaxpoll-ajax-" . $ID . "\").html(\"" . wfMsg( 'ajaxpoll-vote-permission' ) . "\");$(\"#ajaxpoll-ajax-" . $ID . "\").css(\"display\",\"block\");'><input disabled='disabled' type='radio' id='ajaxpoll-post-answer-" . $ans_no . "' name='ajaxpoll-post-answer-" . $ans_no . "' value='" . $i . "'" . ( $our ? 'checked=true ' : '' ) . "/>" . strip_tags( $lines[$i] ) . +<div id='ajaxpoll-answer-" . $ans_no . "' class='ajaxpoll-answer'><div class='ajaxpoll-answer-name'><label for='ajaxpoll-post-answer-" . $ans_no . "' onclick='$(\"#ajaxpoll-ajax-" . $ID . "\").html(\"" . wfMsg( 'ajaxpoll-vote-permission' ) . "\");$(\"#ajaxpoll-ajax-" . $ID . "\").css(\"display\",\"block\");'><input disabled='disabled' type='radio' id='ajaxpoll-post-answer-" . $ans_no . "' name='ajaxpoll-post-answer-" . $ans_no . "' value='" . $i . "'/>" . strip_tags( $lines[$i] ) . "</label></div><div class='ajaxpoll-answer-vote" . ( $our ? ' ajaxpoll-our-vote' : '' ) ."' onmouseover='mover(this)' onmouseout='mout(this);'><span title='" . wfMsg( 'ajaxpoll-percent-votes', sprintf( $percent ) ) . "'>" . ( ( isset( $poll_result ) && !empty( $poll_result[$i + 1] ) ) ? $poll_result[$i + 1] : 0 ) . "</span><div style='width: " . $percent . "%;" . ( $percent == 0 ? ' border:0;' : '' ) . "'></div></div> </div> "; _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs