X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialProtectedtitles.php;h=a80f0d0a1c69bb36b4d714494b53c0a26566f9a9;hb=27757a7fdd3c6ffb56c470af7097c4c28cd4632d;hp=bfce8d1aea94a3a8cc5c4d96a403fa2829d8a426;hpb=761c063241968d2798aefad661da3c0e302b8c6f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialProtectedtitles.php b/includes/specials/SpecialProtectedtitles.php
index bfce8d1aea..a80f0d0a1c 100644
--- a/includes/specials/SpecialProtectedtitles.php
+++ b/includes/specials/SpecialProtectedtitles.php
@@ -56,15 +56,14 @@ class SpecialProtectedtitles extends SpecialPage {
 		$this->getOutput()->addHTML( $this->showOptions( $NS, $type, $level ) );
 
 		if ( $pager->getNumRows() ) {
-			$s = $pager->getNavigationBar();
-			$s .= "<ul>" .
-				$pager->getBody() .
-				"</ul>";
-			$s .= $pager->getNavigationBar();
+			$this->getOutput()->addHTML(
+				$pager->getNavigationBar() .
+				'<ul>' . $pager->getBody() . '</ul>' .
+				$pager->getNavigationBar()
+			);
 		} else {
-			$s = '<p>' . wfMsgHtml( 'protectedtitlesempty' ) . '</p>';
+			$this->getOutput()->addWikiMsg( 'protectedtitlesempty' );
 		}
-		$this->getOutput()->addHTML( $s );
 	}
 
 	/**
@@ -86,31 +85,32 @@ class SpecialProtectedtitles extends SpecialPage {
 
 		$description_items = array ();
 
-		$protType = wfMsgHtml( 'restriction-level-' . $row->pt_create_perm );
+		$protType = $this->msg( 'restriction-level-' . $row->pt_create_perm )->escaped();
 
 		$description_items[] = $protType;
 
-		$expiry = strlen( $row->pt_expiry ) ? $this->getLang()->formatExpiry( $row->pt_expiry, TS_MW ) : $infinity;
+		$lang = $this->getLanguage();
+		$expiry = strlen( $row->pt_expiry ) ? $lang->formatExpiry( $row->pt_expiry, TS_MW ) : $infinity;
 		if( $expiry != $infinity ) {
-			$expiry_description = wfMsg(
+			$user = $this->getUser();
+			$description_items[] = $this->msg(
 				'protect-expiring-local',
-				$lang->timeanddate( $expiry, true ),
-				$lang->date( $expiry, true ),
-				$lang->time( $expiry, true )
-			);
-
-			$description_items[] = htmlspecialchars($expiry_description);
+				$lang->userTimeAndDate( $expiry, $user ),
+				$lang->userDate( $expiry, $user ),
+				$lang->userTime( $expiry, $user )
+			)->escaped();
 		}
 
 		wfProfileOut( __METHOD__ );
 
-		return '<li>' . wfSpecialList( $link, implode( $description_items, ', ' ) ) . "</li>\n";
+		return '<li>' . $lang->specialList( $link, implode( $description_items, ', ' ) ) . "</li>\n";
 	}
 
 	/**
 	 * @param $namespace Integer:
 	 * @param $type string
 	 * @param $level string
+	 * @return string
 	 * @private
 	 */
 	function showOptions( $namespace, $type='edit', $level ) {
@@ -120,11 +120,11 @@ class SpecialProtectedtitles extends SpecialPage {
 		$special = htmlspecialchars( $title->getPrefixedDBkey() );
 		return "<form action=\"$action\" method=\"get\">\n" .
 			'<fieldset>' .
-			Xml::element( 'legend', array(), wfMsg( 'protectedtitles' ) ) .
+			Xml::element( 'legend', array(), $this->msg( 'protectedtitles' )->text() ) .
 			Html::hidden( 'title', $special ) . "&#160;\n" .
 			$this->getNamespaceMenu( $namespace ) . "&#160;\n" .
 			$this->getLevelMenu( $level ) . "&#160;\n" .
-			"&#160;" . Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "\n" .
+			"&#160;" . Xml::submitButton( $this->msg( 'allpagessubmit' )->text() ) . "\n" .
 			"</fieldset></form>";
 	}
 
@@ -136,9 +136,17 @@ class SpecialProtectedtitles extends SpecialPage {
 	 * @return string
 	 */
 	function getNamespaceMenu( $namespace = null ) {
-		return Xml::label( wfMsg( 'namespace' ), 'namespace' )
-			. '&#160;'
-			. Xml::namespaceSelector( $namespace, '' );
+		return Html::namespaceSelector(
+			array(
+				'selected' => $namespace,
+				'all' => '',
+				'label' => $this->msg( 'namespace' )->text()
+			), array(
+				'name'  => 'namespace',
+				'id'    => 'namespace',
+				'class' => 'namespaceselector',
+			)
+		);
 	}
 
 	/**
@@ -148,13 +156,13 @@ class SpecialProtectedtitles extends SpecialPage {
 	function getLevelMenu( $pr_level ) {
 		global $wgRestrictionLevels;
 
-		$m = array( wfMsg('restriction-level-all') => 0 ); // Temporary array
+		$m = array( $this->msg( 'restriction-level-all' )->text() => 0 ); // Temporary array
 		$options = array();
 
 		// First pass to load the log names
 		foreach( $wgRestrictionLevels as $type ) {
 			if ( $type !='' && $type !='*') {
-				$text = wfMsg("restriction-level-$type");
+				$text = $this->msg( "restriction-level-$type" )->text();
 				$m[$text] = $type;
 			}
 		}
@@ -169,7 +177,7 @@ class SpecialProtectedtitles extends SpecialPage {
 		}
 
 		return
-			Xml::label( wfMsg('restriction-level') , $this->IdLevel ) . '&#160;' .
+			Xml::label( $this->msg( 'restriction-level' )->text(), $this->IdLevel ) . '&#160;' .
 			Xml::tags( 'select',
 				array( 'id' => $this->IdLevel, 'name' => $this->IdLevel ),
 				implode( "\n", $options ) );
@@ -207,14 +215,20 @@ class ProtectedTitlesPager extends AlphabeticPager {
 		return '';
 	}
 
+	/**
+	 * @return Title
+	 */
 	function getTitle() {
-		return SpecialPage::getTitleFor( 'Protectedtitles' );
+		return $this->mForm->getTitle();
 	}
 
 	function formatRow( $row ) {
 		return $this->mForm->formatRow( $row );
 	}
 
+	/**
+	 * @return array
+	 */
 	function getQueryInfo() {
 		$conds = $this->mConds;
 		$conds[] = 'pt_expiry>' . $this->mDb->addQuotes( $this->mDb->timestamp() );