https://www.mediawiki.org/wiki/Special:Code/MediaWiki/111874
Revision: 111874
Author: wikinaut
Date: 2012-02-19 17:24:15 +0000 (Sun, 19 Feb 2012)
Log Message:
-----------
wrapped into class AJAXPoll
Modified Paths:
--------------
trunk/extensions/AJAXPoll/AJAXPoll.php
Modified: trunk/extensions/AJAXPoll/AJAXPoll.php
===================================================================
--- trunk/extensions/AJAXPoll/AJAXPoll.php 2012-02-19 17:17:42 UTC (rev
111873)
+++ trunk/extensions/AJAXPoll/AJAXPoll.php 2012-02-19 17:24:15 UTC (rev
111874)
@@ -40,267 +40,269 @@
// Internationalization + AJAX function
$dir = dirname( __FILE__ ) . '/';
$wgExtensionMessagesFiles['AJAXPoll'] = $dir . 'AJAXPoll.i18n.php';
-$wgAjaxExportList[] = 'submitVote';
+$wgAjaxExportList[] = 'AJAXPoll::submitVote';
+$wgHooks['ParserFirstCallInit'][] = 'AJAXPoll::AJAXPollParserInit';
-$wgHooks['ParserFirstCallInit'][] = 'wfPoll';
+class AJAXPoll {
-/**
- * Register <poll> tag with the parser
- *
- * @param $parser Object: instance of Parser (not necessarily $wgParser)
- * @return Boolean: true
- */
-function wfPoll( &$parser ) {
- $parser->setHook( 'poll', 'renderPoll' );
- return true;
-}
+ /**
+ * Register <poll> tag with the parser
+ *
+ * @param $parser Object: instance of Parser (not necessarily $wgParser)
+ * @return Boolean: true
+ */
+ static function AJAXPollParserInit( $parser ) {
+ $parser->setHook( 'poll', array( __CLASS__, 'AJAXPollRender' )
);
+ return true;
+ }
-# The callback function for converting the input text to HTML output
-function renderPoll( $input ) {
- global $wgParser, $wgUser, $wgOut, $wgTitle, $wgScriptPath;
+ # The callback function for converting the input text to HTML output
+ static function AJAXPollRender( $input ) {
+ global $wgParser, $wgUser, $wgOut, $wgTitle, $wgScriptPath;
- $wgParser->disableCache();
+ $wgParser->disableCache();
- if ( $wgUser->getName() == '' ) {
- $user = wfGetIP();
- } else {
- $user = $wgUser->getName();
- }
+ if ( $wgUser->getName() == '' ) {
+ $user = wfGetIP();
+ } else {
+ $user = $wgUser->getName();
+ }
- // ID of the poll
- $ID = strtoupper( md5( $input ) );
+ // ID of the poll
+ $ID = strtoupper( md5( $input ) );
- $par = new Parser();
- $input = $par->parse( $input, $wgTitle, $wgOut->parserOptions() );
- $input = trim( strip_tags( $input->getText() ) );
- $lines = explode( "\n", trim( $input ) );
+ $par = new Parser();
+ $input = $par->parse( $input, $wgTitle, $wgOut->parserOptions()
);
+ $input = trim( strip_tags( $input->getText() ) );
+ $lines = explode( "\n", trim( $input ) );
- // Deprecating AJAX
- /*if ( isset( $_POST['ajaxpoll-post-id'] ) && isset(
$_POST['ajaxpoll-post-answer'] ) && $_POST['ajaxpoll-post-id'] == $ID ) {
- submitVote( $_POST['ajaxpoll-post-id'], intval(
$_POST['ajaxpoll-post-answer'] ) );
- }*/
+ // Deprecating AJAX
+ /*if ( isset( $_POST['ajaxpoll-post-id'] ) && isset(
$_POST['ajaxpoll-post-answer'] ) && $_POST['ajaxpoll-post-id'] == $ID ) {
+ AJAXPoll::submitVote( $_POST['ajaxpoll-post-id'],
intval( $_POST['ajaxpoll-post-answer'] ) );
+ }*/
- $dbw = wfGetDB( DB_MASTER );
- $dbw->begin();
- /**
- * Register poll in the database
- */
- $row = $dbw->selectRow(
- array( 'poll_info' ),
- array( 'COUNT(poll_id) AS count' ),
- array( 'poll_id' => $ID ),
- __METHOD__
- );
-
- if( empty( $row->count ) ) {
- $dbw->insert(
- 'poll_info',
- array(
- 'poll_id' => $ID,
- 'poll_txt' => $input,
- 'poll_date' => wfTimestampNow(),
- 'poll_title' => $wgParser->mTitle->getText()
- ),
+ $dbw = wfGetDB( DB_MASTER );
+ $dbw->begin();
+ /**
+ * Register poll in the database
+ */
+ $row = $dbw->selectRow(
+ array( 'poll_info' ),
+ array( 'COUNT(poll_id) AS count' ),
+ array( 'poll_id' => $ID ),
__METHOD__
);
- }
- $dbw->commit();
- // Add CSS
- $wgOut->addExtensionStyle( $wgScriptPath .
'/extensions/AJAXPoll/AJAXPoll.css' );
- switch( $lines[0] ) {
- case 'STATS':
- $retVal = buildStats( $ID, $user );
- break;
- default:
- $retVal = '
-<div id="ajaxpoll-container-' . $ID . '">' . buildHTML( $ID, $user, $lines ) .
'</div>';
- break;
+ if( empty( $row->count ) ) {
+ $dbw->insert(
+ 'poll_info',
+ array(
+ 'poll_id' => $ID,
+ 'poll_txt' => $input,
+ 'poll_date' => wfTimestampNow(),
+ 'poll_title' =>
$wgParser->mTitle->getText()
+ ),
+ __METHOD__
+ );
+ }
+ $dbw->commit();
+
+ // Add CSS
+ $wgOut->addExtensionStyle( $wgScriptPath .
'/extensions/AJAXPoll/AJAXPoll.css' );
+ switch( $lines[0] ) {
+ case 'STATS':
+ $retVal = AJAXPoll::buildStats( $ID, $user );
+ break;
+ default:
+ $retVal = '
+<div id="ajaxpoll-container-' . $ID . '">' . AJAXPoll::buildHTML( $ID, $user,
$lines ) . '</div>';
+ break;
+ }
+ return $retVal;
}
- return $retVal;
-}
-function buildStats( $ID, $user ) {
- $dbw = wfGetDB( DB_MASTER );
+ private static function buildStats( $ID, $user ) {
- $res = $dbw->select(
- 'poll_vote',
- array(
- 'COUNT(*)',
- 'COUNT(DISTINCT poll_id)',
- 'COUNT(DISTINCT poll_user)',
- 'TIMEDIFF(NOW(), MAX(poll_date))'
- ),
- array(),
- __METHOD__
- );
- $tab = $dbw->fetchRow( $res );
+ $dbw = wfGetDB( DB_MASTER );
- $clock = explode( ':', $tab[3] );
+ $res = $dbw->select(
+ 'poll_vote',
+ array(
+ 'COUNT(*)',
+ 'COUNT(DISTINCT poll_id)',
+ 'COUNT(DISTINCT poll_user)',
+ 'TIMEDIFF(NOW(), MAX(poll_date))'
+ ),
+ array(),
+ __METHOD__
+ );
+ $tab = $dbw->fetchRow( $res );
- if ( $clock[0] == '00' && $clock[1] == '00' ) {
- $x = $clock[2];
- $y = 'second';
- } elseif( $clock[0] == '00' ) {
- $x = $clock[1];
- $y = 'minute';
- } else {
- if ( $clock[0] < 24 ) {
- $x = $clock[0];
- $y = 'hour';
+ $clock = explode( ':', $tab[3] );
+
+ if ( $clock[0] == '00' && $clock[1] == '00' ) {
+ $x = $clock[2];
+ $y = 'second';
+ } elseif( $clock[0] == '00' ) {
+ $x = $clock[1];
+ $y = 'minute';
} else {
- $x = floor( $hr / 24 );
- $y = 'day';
+ if ( $clock[0] < 24 ) {
+ $x = $clock[0];
+ $y = 'hour';
+ } else {
+ $x = floor( $hr / 24 );
+ $y = 'day';
+ }
}
- }
- $clockago = $x . ' ' . $y . ( $x > 1 ? 's' : '' );
+ $clockago = $x . ' ' . $y . ( $x > 1 ? 's' : '' );
- $res = $dbw->select(
- 'poll_vote',
- 'COUNT(*)',
- array( 'DATE_SUB(CURDATE(), INTERVAL 2 DAY) <= poll_date' ),
- __METHOD__
- );
- $tab2 = $dbw->fetchRow( $res );
+ $res = $dbw->select(
+ 'poll_vote',
+ 'COUNT(*)',
+ array( 'DATE_SUB(CURDATE(), INTERVAL 2 DAY) <=
poll_date' ),
+ __METHOD__
+ );
+ $tab2 = $dbw->fetchRow( $res );
- return "There are $tab[1] polls and $tab[0] votes given by $tab[2]
different people.<br />
- The last vote has been given $clockago ago.<br/>
- During the last 48 hours, $tab2[0] votes have been given.";
-}
+ return "There are $tab[1] polls and $tab[0] votes given by
$tab[2] different people.<br />
+ The last vote has been given $clockago ago.<br/>
+ During the last 48 hours, $tab2[0] votes have been
given.";
+ }
-function submitVote( $ID, $answer ) {
- global $wgUser,$wgOut;
+ public static function submitVote( $ID, $answer ) {
+ global $wgUser,$wgOut;
- $dbw = wfGetDB( DB_MASTER );
+ $dbw = wfGetDB( DB_MASTER );
- if ( $wgUser->getName() == '' ) {
- $user = wfGetIP();
- } else {
- $user = $wgUser->getName();
- }
+ if ( $wgUser->getName() == '' ) {
+ $user = wfGetIP();
+ } else {
+ $user = $wgUser->getName();
+ }
- if ( $wgUser->isAllowed( 'bot' ) ) {
- return buildHTML( $ID, $user );
- }
+ if ( $wgUser->isAllowed( 'bot' ) ) {
+ return AJAXPoll::buildHTML( $ID, $user );
+ }
- $answer = ++$answer;
+ $answer = ++$answer;
- $q = $dbw->select(
- 'poll_vote',
- 'COUNT(*) AS c',
- array(
- 'poll_id' => $ID,
- 'poll_user' => $user
- ),
- __METHOD__
- );
- $row = $dbw->fetchRow( $q );
-
- if ( $row['c'] > 0 ) {
-
- $updateQuery = $dbw->update(
+ $q = $dbw->select(
'poll_vote',
+ 'COUNT(*) AS c',
array(
- 'poll_answer' => $answer,
- 'poll_date' => wfTimestampNow()
- ),
- array(
'poll_id' => $ID,
'poll_user' => $user
),
__METHOD__
);
- $dbw->commit();
- $pollContainerText = ( $updateQuery ) ? 'ajaxpoll-vote-update'
: 'ajaxpoll-vote-error';
+ $row = $dbw->fetchRow( $q );
- } else {
+ if ( $row['c'] > 0 ) {
- $insertQuery = $dbw->insert(
- 'poll_vote',
- array(
- 'poll_id' => $ID,
- 'poll_user' => $user,
- 'poll_ip' => wfGetIP(),
- 'poll_answer' => $answer,
- 'poll_date' => wfTimestampNow()
- ),
- __METHOD__
- );
- $dbw->commit();
- $pollContainerText = ( $insertQuery ) ? 'ajaxpoll-vote-add' :
'ajaxpoll-vote-error';
+ $updateQuery = $dbw->update(
+ 'poll_vote',
+ array(
+ 'poll_answer' => $answer,
+ 'poll_date' => wfTimestampNow()
+ ),
+ array(
+ 'poll_id' => $ID,
+ 'poll_user' => $user
+ ),
+ __METHOD__
+ );
+ $dbw->commit();
+ $pollContainerText = ( $updateQuery ) ?
'ajaxpoll-vote-update' : 'ajaxpoll-vote-error';
- }
+ } else {
- return buildHTML( $ID, $user, '', $pollContainerText );
+ $insertQuery = $dbw->insert(
+ 'poll_vote',
+ array(
+ 'poll_id' => $ID,
+ 'poll_user' => $user,
+ 'poll_ip' => wfGetIP(),
+ 'poll_answer' => $answer,
+ 'poll_date' => wfTimestampNow()
+ ),
+ __METHOD__
+ );
+ $dbw->commit();
+ $pollContainerText = ( $insertQuery ) ?
'ajaxpoll-vote-add' : 'ajaxpoll-vote-error';
-}
+ }
-function buildHTML( $ID, $user, $lines = '', $extra_from_ajax = '' ) {
- global $wgTitle, $wgLang, $wgUseAjax;
+ return AJAXPoll::buildHTML( $ID, $user, '', $pollContainerText
);
- $dbw = wfGetDB( DB_SLAVE );
+ }
- $q = $dbw->select(
- 'poll_info',
- array( 'poll_txt', 'poll_date' ),
- array( 'poll_id' => $ID ),
- __METHOD__
- );
- $row = $dbw->fetchRow( $q );
+ private static function buildHTML( $ID, $user, $lines = '',
$extra_from_ajax = '' ) {
+ global $wgTitle, $wgLang, $wgUseAjax;
- if ( empty( $lines ) ) {
- $lines = explode( "\n", trim( $row['poll_txt'] ) );
- }
+ $dbw = wfGetDB( DB_SLAVE );
- $start_date = $row['poll_date'];
+ $q = $dbw->select(
+ 'poll_info',
+ array( 'poll_txt', 'poll_date' ),
+ array( 'poll_id' => $ID ),
+ __METHOD__
+ );
+ $row = $dbw->fetchRow( $q );
- $q = $dbw->select(
- 'poll_vote',
- array( 'poll_answer', 'COUNT(*)' ),
- array( 'poll_id' => $ID ),
- __METHOD__,
- array( 'GROUP BY' => 'poll_answer' )
- );
+ if ( empty( $lines ) ) {
+ $lines = explode( "\n", trim( $row['poll_txt'] ) );
+ }
- $poll_result = array();
+ $start_date = $row['poll_date'];
- while ( $row = $q->fetchRow() ) {
- $poll_result[$row[0]] = $row[1];
- }
+ $q = $dbw->select(
+ 'poll_vote',
+ array( 'poll_answer', 'COUNT(*)' ),
+ array( 'poll_id' => $ID ),
+ __METHOD__,
+ array( 'GROUP BY' => 'poll_answer' )
+ );
- $amountOfVotes = array_sum( $poll_result );
+ $poll_result = array();
- // Did we vote?
- $q = $dbw->select(
- 'poll_vote',
- array( 'poll_answer', 'poll_date' ),
- array(
- 'poll_id' => $ID,
- 'poll_user' => $user
- ),
- __METHOD__
- );
+ while ( $row = $q->fetchRow() ) {
+ $poll_result[$row[0]] = $row[1];
+ }
- if ( $row = $dbw->fetchRow( $q ) ) {
- $ourLastVoteDate = wfMsg(
- 'ajaxpoll-your-vote',
- $lines[$row[0] - 1],
- $wgLang->timeanddate( wfTimestamp( TS_MW, $row[1] ),
true /* adjust? */ )
+ $amountOfVotes = array_sum( $poll_result );
+
+ // Did we vote?
+ $q = $dbw->select(
+ 'poll_vote',
+ array( 'poll_answer', 'poll_date' ),
+ array(
+ 'poll_id' => $ID,
+ 'poll_user' => $user
+ ),
+ __METHOD__
);
- }
- if ( is_object( $wgTitle ) ) {
- if( !empty( $extra_from_ajax ) ) {
- $attributes = ' style="display: block;"';
- $ajaxMessage = wfMsg( $extra_from_ajax );
- } else {
- $attributes = '';
- $ajaxMessage = '';
+ if ( $row = $dbw->fetchRow( $q ) ) {
+ $ourLastVoteDate = wfMsg(
+ 'ajaxpoll-your-vote',
+ $lines[$row[0] - 1],
+ $wgLang->timeanddate( wfTimestamp( TS_MW,
$row[1] ), true /* adjust? */ )
+ );
}
- // HTML output has to be on one line thanks to a MediaWiki bug
- // @see https://bugzilla.wikimedia.org/show_bug.cgi?id=1319
- $ret = '<div id="ajaxpoll-id-' . $ID . '" class="ajaxpoll">
+
+ if ( is_object( $wgTitle ) ) {
+ if( !empty( $extra_from_ajax ) ) {
+ $attributes = ' style="display: block;"';
+ $ajaxMessage = wfMsg( $extra_from_ajax );
+ } else {
+ $attributes = '';
+ $ajaxMessage = '';
+ }
+ // HTML output has to be on one line thanks to a
MediaWiki bug
+ // @see
https://bugzilla.wikimedia.org/show_bug.cgi?id=1319
+ $ret = '<div id="ajaxpoll-id-' . $ID . '"
class="ajaxpoll">
<div id="ajaxpoll-ajax-' . $ID . '" class="ajaxpoll-ajax"' . $attributes . '>'
. $ajaxMessage . '</div>
<script>var tmp;
function mover(x){
@@ -317,59 +319,61 @@
</script>
<div class="ajaxpoll-question">' . strip_tags( $lines[0] ) . '</div>';
- // Different message depending on if the user has already voted
or not.
- $message = ( isset( $row[0] ) ) ? $ourLastVoteDate : wfMsg(
'ajaxpoll-no-vote' );
- $ret .= '<div class="ajaxpoll-misc">' . $message . '
+ // Different message depending on if the user has
already voted or not.
+ $message = ( isset( $row[0] ) ) ? $ourLastVoteDate :
wfMsg( 'ajaxpoll-no-vote' );
+ $ret .= '<div class="ajaxpoll-misc">' . $message . '
</div>';
- $ret .= '<form method="post" action="' .
$wgTitle->getLocalURL() .
- '" id="ajaxpoll-answer-id-' . $ID . '"><input
type="hidden" name="ajaxpoll-post-id" value="' . $ID . '" />';
+ $ret .= '<form method="post" action="' .
$wgTitle->getLocalURL() .
+ '" id="ajaxpoll-answer-id-' . $ID . '"><input
type="hidden" name="ajaxpoll-post-id" value="' . $ID . '" />';
- for ( $i = 1; $i < count( $lines ); $i++ ) {
- $ans_no = $i - 1;
+ for ( $i = 1; $i < count( $lines ); $i++ ) {
+ $ans_no = $i - 1;
- if ( $amountOfVotes == 0 ) {
- $percent = 0;
- } else {
- $percent = $wgLang->formatNum( round( ( isset(
$poll_result[$i + 1] ) ? $poll_result[$i + 1] : 0 ) * 100 / $amountOfVotes, 2 )
);
- }
+ if ( $amountOfVotes == 0 ) {
+ $percent = 0;
+ } else {
+ $percent = $wgLang->formatNum( round( (
isset( $poll_result[$i + 1] ) ? $poll_result[$i + 1] : 0 ) * 100 /
$amountOfVotes, 2 ) );
+ }
- $our = ( isset( $row[0] ) && ( $row[0] - 1 == $i ) );
+ $our = ( isset( $row[0] ) && ( $row[0] - 1 ==
$i ) );
- // If AJAX is enabled, as it is by default in modern
MWs, we can
- // just use sajax library function here for that AJAX-y
feel.
- // If not, we'll have to submit the form old-school
way...
- if ( $wgUseAjax ) {
- $submitJS = "sajax_do_call(\"submitVote\",[\""
. $ID . "\",\"" . $i . "\"], $(\"#ajaxpoll-container-" . $ID . "\")[0]);";
- } else {
- $submitJS = "$(\"#ajaxpoll-answer-id-" . $ID .
"\").submit();";
- }
+ // If AJAX is enabled, as it is by default in
modern MWs, we can
+ // just use sajax library function here for
that AJAX-y feel.
+ // If not, we'll have to submit the form
old-school way...
+ if ( $wgUseAjax ) {
+ $submitJS =
"sajax_do_call(\"AJAXPoll::submitVote\",[\"" . $ID . "\",\"" . $i . "\"],
$(\"#ajaxpoll-container-" . $ID . "\")[0]);";
+ } else {
+ $submitJS = "$(\"#ajaxpoll-answer-id-"
. $ID . "\").submit();";
+ }
- // HTML output has to be on one line thanks to a
MediaWiki bug
- // @see
https://bugzilla.wikimedia.org/show_bug.cgi?id=1319
- $ret .= "
+ // HTML output has to be on one line thanks to
a MediaWiki bug
+ // @see
https://bugzilla.wikimedia.org/show_bug.cgi?id=1319
+ $ret .= "
<div id='ajaxpoll-answer-" . $ans_no . "' class='ajaxpoll-answer'><div
class='ajaxpoll-answer-name'><label for='ajaxpoll-answer-radio-" . $ans_no . "'
onclick='$(\"#ajaxpoll-ajax-" . $ID . "\").html(\"" . wfMsg(
'ajaxpoll-submitting' ) . "\");$(\"#ajaxpoll-ajax-" . $ID .
"\").css(\"display\",\"block\");$(this).addClass(\"ajaxpoll-checkevent\").prop(\"checked\",true);
" . $submitJS . "'><input type='radio' id='ajaxpoll-post-answer-" . $ans_no .
"' name='ajaxpoll-post-answer' value='" . $i . "'" . ( $our ? 'checked=true ' :
'' ) . "/>" . 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>
";
}
- $ret .= '</form>';
+ $ret .= '</form>';
- // Display information about the poll (creation date, amount of
votes)
- $pollSummary = wfMsgExt(
- 'ajaxpoll-info',
- 'parsemag', // parse PLURAL
- $amountOfVotes, // amount of votes
- $wgLang->timeanddate( wfTimestamp( TS_MW, $start_date
), true /* adjust? */ )
- );
+ // Display information about the poll (creation date,
amount of votes)
+ $pollSummary = wfMsgExt(
+ 'ajaxpoll-info',
+ 'parsemag', // parse PLURAL
+ $amountOfVotes, // amount of votes
+ $wgLang->timeanddate( wfTimestamp( TS_MW,
$start_date ), true /* adjust? */ )
+ );
- $ret .= '<div id="ajaxpoll-info-' . $ID . '"
class="ajaxpoll-info">' . $pollSummary . '</div>';
+ $ret .= '<div id="ajaxpoll-info-' . $ID . '"
class="ajaxpoll-info">' . $pollSummary . '</div>';
- $ret .= '</div>';
- } else {
- $ret = '';
+ $ret .= '</div>';
+ } else {
+ $ret = '';
+ }
+
+ return $ret;
}
- return $ret;
-}
+} /* class AJAXPoll */
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
