Aktualisierung auf MediaWiki 1.10.0

Plugins angepasst und verbessert
kleine Korrekturen am Design

1 files changed, 96 insertions, 46 deletions

diff --git a/includes/SpecialRandompage.php b/includes/SpecialRandompage.php
index 2cd31eb5..e6c4abe8 100644
--- a/includes/SpecialRandompage.php
+++ b/includes/SpecialRandompage.php
@@ -1,58 +1,108 @@
 <?php
+
 /**
- * @package MediaWiki
- * @subpackage SpecialPage
+ * Special page to direct the user to a random page
+ *
+ * @addtogroup SpecialPage
+ * @author Rob Church <robchur@gmail.com>, Ilmari Karonen
+ * @license GNU General Public Licence 2.0 or later
  */
 
 /**
- * Constructor
- *
- * @param $par The namespace to get a random page from (default NS_MAIN),
- *               used as e.g. Special:Randompage/Category
+ * Main execution point
+ * @param $par Namespace to select the page from
  */
-function wfSpecialRandompage( $par = NS_MAIN ) {
-	global $wgOut, $wgExtraRandompageSQL;
-	$fname = 'wfSpecialRandompage';
-
-	# Determine namespace
-	$t = Title::newFromText ( $par . ":Dummy" ) ;
-	$namespace = $t->getNamespace () ;
-
-	# NOTE! We use a literal constant in the SQL instead of the RAND()
-	# function because RAND() will return a different value for every row
-	# in the table. That's both very slow and returns results heavily
-	# biased towards low values, as rows later in the table will likely
-	# never be reached for comparison.
-	#
-	# Using a literal constant means the whole thing gets optimized on
-	# the index, and the comparison is both fast and fair.
-
-	# interpolation and sprintf() can muck up with locale-specific decimal separator
-	$randstr = wfRandom();
-
-	$db =& wfGetDB( DB_SLAVE );
-	$use_index = $db->useIndexClause( 'page_random' );
-	$page = $db->tableName( 'page' );
-
-	$extra = $wgExtraRandompageSQL ? "AND ($wgExtraRandompageSQL)" : '';
-	$sql = "SELECT page_id,page_title
-		FROM $page $use_index
-		WHERE page_namespace=$namespace AND page_is_redirect=0 $extra
-		AND page_random>$randstr
-		ORDER BY page_random";
-	$sql = $db->limitResult($sql, 1, 0);
-	$res = $db->query( $sql, $fname );
-
-	$title = null;
-	if( $s = $db->fetchObject( $res ) ) {
-		$title =& Title::makeTitle( $namespace, $s->page_title );
-	}
+function wfSpecialRandompage( $par = null ) {
+	global $wgOut, $wgContLang;
+
+	$rnd = new RandomPage();
+	$rnd->setNamespace( $wgContLang->getNsIndex( $par ) );
+	$rnd->setRedirect( false );
+
+	$title = $rnd->getRandomTitle();
+
 	if( is_null( $title ) ) {
-		# That's not supposed to happen :)
-		$title = Title::newMainPage();
+		$wgOut->addWikiText( wfMsg( 'randompage-nopages' ) );
+		return;
 	}
-	$wgOut->reportTime(); # for logfile
+
+	$wgOut->reportTime();
 	$wgOut->redirect( $title->getFullUrl() );
 }
 
+
+/**
+ * Special page to direct the user to a random page
+ *
+ * @addtogroup SpecialPage
+ */
+class RandomPage {
+	private $namespace = NS_MAIN;  // namespace to select pages from
+	private $redirect = false;     // select redirects instead of normal pages?
+
+	public function getNamespace ( ) {
+		return $this->namespace;
+	}
+	public function setNamespace ( $ns ) {
+		if( $ns < NS_MAIN ) $ns = NS_MAIN;
+		$this->namespace = $ns;
+	}
+	public function getRedirect ( ) {
+		return $this->redirect;
+	}
+	public function setRedirect ( $redirect ) {
+		$this->redirect = $redirect;
+	}
+
+	/**
+	 * Choose a random title.
+	 * @return Title object (or null if nothing to choose from)
+	 */
+	public function getRandomTitle ( ) {
+		$randstr = wfRandom();
+		$row = $this->selectRandomPageFromDB( $randstr );
+
+		/* If we picked a value that was higher than any in
+		 * the DB, wrap around and select the page with the
+		 * lowest value instead!  One might think this would
+		 * skew the distribution, but in fact it won't cause
+		 * any more bias than what the page_random scheme
+		 * causes anyway.  Trust me, I'm a mathematician. :)
+		 */
+		if( !$row )
+			$row = $this->selectRandomPageFromDB( "0" );
+
+		if( $row )
+			return Title::makeTitleSafe( $this->namespace, $row->page_title );
+		else
+			return null;
+	}
+
+	private function selectRandomPageFromDB ( $randstr ) {
+		global $wgExtraRandompageSQL;
+		$fname = 'RandomPage::selectRandomPageFromDB';
+
+		$dbr = wfGetDB( DB_SLAVE );
+
+		$use_index = $dbr->useIndexClause( 'page_random' );
+		$page = $dbr->tableName( 'page' );
+
+		$ns = (int) $this->namespace;
+		$redirect = $this->redirect ? 1 : 0;
+
+		$extra = $wgExtraRandompageSQL ? "AND ($wgExtraRandompageSQL)" : "";
+		$sql = "SELECT page_title
+			FROM $page $use_index
+			WHERE page_namespace = $ns
+			AND page_is_redirect = $redirect
+			AND page_random >= $randstr
+			$extra
+			ORDER BY page_random";
+
+		$sql = $dbr->limitResult( $sql, 1, 0 );
+		$res = $dbr->query( $sql, $fname );
+		return $dbr->fetchObject( $res );
+	}
+}
+
 ?>