X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSpecialProtectedpages.php;h=e16890289780a6f680457b4e395465444b3e6a53;hb=5516fef269e71b5962afa34bd7e7403b13b57d12;hp=e9fb0797a4ba731bf2b631d04473547c366f69bb;hpb=177f13da316f2b242dbb6cceb41828da61ac027e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SpecialProtectedpages.php b/includes/SpecialProtectedpages.php
index e9fb0797a4..e168902897 100644
--- a/includes/SpecialProtectedpages.php
+++ b/includes/SpecialProtectedpages.php
@@ -1,19 +1,19 @@
 <?php
 /**
- *
- * @addtogroup SpecialPage
+ * @file
+ * @ingroup SpecialPage
  */
 
 /**
  * @todo document
- * @addtogroup SpecialPage
+ * @ingroup SpecialPage
  */
 class ProtectedPagesForm {
 
 	protected $IdLevel = 'level';
 	protected $IdType  = 'type';
 
-	function showList( $msg = '' ) {
+	public function showList( $msg = '' ) {
 		global $wgOut, $wgRequest;
 
 		$wgOut->setPagetitle( wfMsg( "protectedpages" ) );
@@ -31,14 +31,15 @@ class ProtectedPagesForm {
 		$sizetype = $wgRequest->getVal( 'sizetype' );
 		$size = $wgRequest->getIntOrNull( 'size' );
 		$NS = $wgRequest->getIntOrNull( 'namespace' );
+		$indefOnly = $wgRequest->getBool( 'indefonly' ) ? 1 : 0;
 
-		$pager = new ProtectedPagesPager( $this, array(), $type, $level, $NS, $sizetype, $size );	
+		$pager = new ProtectedPagesPager( $this, array(), $type, $level, $NS, $sizetype, $size, $indefOnly );
 
-		$wgOut->addHTML( $this->showOptions( $NS, $type, $level, $sizetype, $size ) );
+		$wgOut->addHTML( $this->showOptions( $NS, $type, $level, $sizetype, $size, $indefOnly ) );
 
 		if ( $pager->getNumRows() ) {
 			$s = $pager->getNavigationBar();
-			$s .= "<ul>" . 
+			$s .= "<ul>" .
 				$pager->getBody() .
 				"</ul>";
 			$s .= $pager->getNavigationBar();
@@ -50,9 +51,11 @@ class ProtectedPagesForm {
 
 	/**
 	 * Callback function to output a restriction
+	 * @param $row object Protected title
+	 * @return string Formatted <li> element
 	 */
-	function formatRow( $row ) {
-		global $wgUser, $wgLang;
+	public function formatRow( $row ) {
+		global $wgUser, $wgLang, $wgContLang;
 
 		wfProfileIn( __METHOD__ );
 
@@ -60,7 +63,7 @@ class ProtectedPagesForm {
 
 		if( is_null( $skin ) )
 			$skin = $wgUser->getSkin();
-		
+
 		$title = Title::makeTitleSafe( $row->page_namespace, $row->page_title );
 		$link = $skin->makeLinkObj( $title );
 
@@ -70,76 +73,113 @@ class ProtectedPagesForm {
 
 		$description_items[] = $protType;
 
-		$expiry_description = ''; $stxt = '';
+		if ( $row->pr_cascade ) {
+			$description_items[] = wfMsg( 'protect-summary-cascade' );
+		}
+
+		$expiry_description = '';
+		$stxt = '';
 
 		if ( $row->pr_expiry != 'infinity' && strlen($row->pr_expiry) ) {
 			$expiry = Block::decodeExpiry( $row->pr_expiry );
-	
+
 			$expiry_description = wfMsgForContent( 'protect-expiring', $wgLang->timeanddate( $expiry ) );
 
 			$description_items[] = $expiry_description;
 		}
-		
+
 		if (!is_null($size = $row->page_len)) {
 			if ($size == 0)
 				$stxt = ' <small>' . wfMsgHtml('historyempty') . '</small>';
 			else
 				$stxt = ' <small>' . wfMsgHtml('historysize', $wgLang->formatNum( $size ) ) . '</small>';
+			$stxt = $wgContLang->getDirMark() . $stxt;
 		}
+
+		# Show a link to the change protection form for allowed users otherwise a link to the protection log
+		if( $wgUser->isAllowed( 'protect' ) ) {
+			$changeProtection = ' (' . $skin->makeKnownLinkObj( $title, wfMsgHtml( 'protect_change' ), 'action=unprotect' ) . ')';
+		} else {
+			$ltitle = SpecialPage::getTitleFor( 'Log' );
+			$changeProtection = ' (' . $skin->makeKnownLinkObj( $ltitle, wfMsgHtml( 'protectlogpage' ), 'type=protect&page=' . $title->getPrefixedUrl() ) . ')';
+		}
+
 		wfProfileOut( __METHOD__ );
 
-		return '<li>' . wfSpecialList( $link . $stxt, implode( $description_items, ', ' ) ) . "</li>\n";
+		return '<li>' . wfSpecialList( $link . $stxt, implode( $description_items, ', ' ) ) . $changeProtection . "</li>\n";
 	}
-	
+
 	/**
 	 * @param $namespace int
 	 * @param $type string
 	 * @param $level string
 	 * @param $minsize int
+	 * @param $indefOnly bool
+	 * @return string Input form
 	 * @private
 	 */
-	function showOptions( $namespace, $type='edit', $level, $sizetype, $size ) {
+	protected function showOptions( $namespace, $type='edit', $level, $sizetype, $size, $indefOnly ) {
 		global $wgScript;
-		$action = htmlspecialchars( $wgScript );
 		$title = SpecialPage::getTitleFor( 'ProtectedPages' );
-		$special = htmlspecialchars( $title->getPrefixedDBkey() );
-		return "<form action=\"$action\" method=\"get\">\n" .
-			'<fieldset>' .
+		return Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) ) .
+			Xml::openElement( 'fieldset' ) .
 			Xml::element( 'legend', array(), wfMsg( 'protectedpages' ) ) .
-			Xml::hidden( 'title', $special ) . "&nbsp\n" .
-			$this->getNamespaceMenu( $namespace ) . "&nbsp\n" .
-			$this->getTypeMenu( $type ) . "&nbsp\n" .
-			$this->getLevelMenu( $level ) . "<br/>\n" .
-			$this->getSizeLimit( $sizetype, $size ) . "\n" .
-			"&nbsp" . Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "\n" .
-			"</fieldset></form>";
+			Xml::hidden( 'title', $title->getPrefixedDBkey() ) . "&nbsp;\n" .
+			$this->getNamespaceMenu( $namespace ) . "&nbsp;\n" .
+			$this->getTypeMenu( $type ) . "&nbsp;\n" .
+			$this->getLevelMenu( $level ) . "&nbsp;\n" .
+			"<br /><span style='white-space: nowrap'>&nbsp;&nbsp;" .
+			$this->getExpiryCheck( $indefOnly ) . "&nbsp;\n" .
+			$this->getSizeLimit( $sizetype, $size ) . "&nbsp;\n" .
+			"</span>" .
+			"&nbsp;" . Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "\n" .
+			Xml::closeElement( 'fieldset' ) .
+			Xml::closeElement( 'form' );
 	}
-	
-	function getNamespaceMenu( $namespace=NULL ) {
-		return "<label for='namespace'>" . wfMsgHtml('namespace') . "</label>" . HTMLnamespaceselector($namespace, '');
+
+	/**
+	 * Prepare the namespace filter drop-down; standard namespace
+	 * selector, sans the MediaWiki namespace
+	 *
+	 * @param mixed $namespace Pre-select namespace
+	 * @return string
+	 */
+	protected function getNamespaceMenu( $namespace = null ) {
+		return "<span style='white-space: nowrap'>" .
+			Xml::label( wfMsg( 'namespace' ), 'namespace' ) . '&nbsp;'
+			. Xml::namespaceSelector( $namespace, '' ) . "</span>";
 	}
 
 	/**
 	 * @return string Formatted HTML
-	 * @private
 	 */
-	function getSizeLimit( $sizetype, $size ) {	
-		$out = Xml::radio( 'sizetype', 'min', ($sizetype=='min'), array('id' => 'wpmin') );
-		$out .= Xml::label( wfMsg("minimum-size"), 'wpmin' );
-		$out .= "&nbsp".Xml::radio( 'sizetype', 'max', ($sizetype=='max'), array('id' => 'wpmax') );
-		$out .= Xml::label( wfMsg("maximum-size"), 'wpmax' );
-		$out .= "&nbsp".Xml::input('size', 9, $size, array( 'id' => 'wpsize' ) );
-		$out .= ' '.wfMsgHtml('pagesize');
-		return $out;
+	protected function getExpiryCheck( $indefOnly ) {
+		return
+			Xml::checkLabel( wfMsg('protectedpages-indef'), 'indefonly', 'indefonly', $indefOnly ) . "\n";
 	}
-		
+
 	/**
 	 * @return string Formatted HTML
-	 * @private
 	 */
-	function getTypeMenu( $pr_type ) {
+	protected function getSizeLimit( $sizetype, $size ) {
+		$max = $sizetype === 'max';
+
+		return
+			Xml::radioLabel( wfMsg('minimum-size'), 'sizetype', 'min', 'wpmin', !$max ) .
+			'&nbsp;' .
+			Xml::radioLabel( wfMsg('maximum-size'), 'sizetype', 'max', 'wpmax', $max ) .
+			'&nbsp;' .
+			Xml::input( 'size', 9, $size, array( 'id' => 'wpsize' ) ) .
+			'&nbsp;' .
+			Xml::label( wfMsg('pagesize'), 'wpsize' );
+	}
+
+	/**
+	 * @return string Formatted HTML
+	 */
+	protected function getTypeMenu( $pr_type ) {
 		global $wgRestrictionTypes;
-	
+
 		$m = array(); // Temporary array
 		$options = array();
 
@@ -155,18 +195,17 @@ class ProtectedPagesForm {
 			$options[] = Xml::option( $text, $type, $selected ) . "\n";
 		}
 
-		return
+		return "<span style='white-space: nowrap'>" .
 			Xml::label( wfMsg('restriction-type') , $this->IdType ) . '&nbsp;' .
 			Xml::tags( 'select',
 				array( 'id' => $this->IdType, 'name' => $this->IdType ),
-				implode( "\n", $options ) );
+				implode( "\n", $options ) ) . "</span>";
 	}
 
 	/**
 	 * @return string Formatted HTML
-	 * @private
-	 */	
-	function getLevelMenu( $pr_level ) {
+	 */
+	protected function getLevelMenu( $pr_level ) {
 		global $wgRestrictionLevels;
 
 		$m = array( wfMsg('restriction-level-all') => 0 ); // Temporary array
@@ -196,12 +235,13 @@ class ProtectedPagesForm {
 
 /**
  * @todo document
- * @addtogroup Pager
+ * @ingroup Pager
  */
 class ProtectedPagesPager extends AlphabeticPager {
 	public $mForm, $mConds;
+	private $type, $level, $namespace, $sizetype, $size, $indefonly;
 
-	function __construct( $form, $conds = array(), $type, $level, $namespace, $sizetype='', $size=0 ) {
+	function __construct( $form, $conds = array(), $type, $level, $namespace, $sizetype='', $size=0, $indefonly=false ) {
 		$this->mForm = $form;
 		$this->mConds = $conds;
 		$this->type = ( $type ) ? $type : 'edit';
@@ -209,27 +249,24 @@ class ProtectedPagesPager extends AlphabeticPager {
 		$this->namespace = $namespace;
 		$this->sizetype = $sizetype;
 		$this->size = intval($size);
+		$this->indefonly = (bool)$indefonly;
 		parent::__construct();
 	}
 
 	function getStartBody() {
 		wfProfileIn( __METHOD__ );
 		# Do a link batch query
-		$this->mResult->seek( 0 );
 		$lb = new LinkBatch;
-
-		while ( $row = $this->mResult->fetchObject() ) {
-			$name = str_replace( ' ', '_', $row->page_title );
-			$lb->add( $row->page_namespace, $name );
+		while( $row = $this->mResult->fetchObject() ) {
+			$lb->add( $row->page_namespace, $row->page_title );
 		}
-
 		$lb->execute();
+
 		wfProfileOut( __METHOD__ );
 		return '';
 	}
-	
+
 	function formatRow( $row ) {
-		$block = new Block;
 		return $this->mForm->formatRow( $row );
 	}
 
@@ -238,19 +275,24 @@ class ProtectedPagesPager extends AlphabeticPager {
 		$conds[] = 'pr_expiry>' . $this->mDb->addQuotes( $this->mDb->timestamp() );
 		$conds[] = 'page_id=pr_page';
 		$conds[] = 'pr_type=' . $this->mDb->addQuotes( $this->type );
-		
-		if( $this->sizetype=='min' )
+
+		if( $this->sizetype=='min' ) {
 			$conds[] = 'page_len>=' . $this->size;
-		else if( $this->sizetype=='max' )
+		} else if( $this->sizetype=='max' ) {
 			$conds[] = 'page_len<=' . $this->size;
-		
+		}
+
+		if( $this->indefonly ) {
+			$conds[] = "pr_expiry = 'infinity' OR pr_expiry IS NULL";
+		}
+
 		if( $this->level )
 			$conds[] = 'pr_level=' . $this->mDb->addQuotes( $this->level );
 		if( !is_null($this->namespace) )
 			$conds[] = 'page_namespace=' . $this->mDb->addQuotes( $this->namespace );
 		return array(
 			'tables' => array( 'page_restrictions', 'page' ),
-			'fields' => 'pr_id,page_namespace,page_title,page_len,pr_type,pr_level,pr_expiry',
+			'fields' => 'pr_id,page_namespace,page_title,page_len,pr_type,pr_level,pr_expiry,pr_cascade',
 			'conds' => $conds
 		);
 	}
@@ -265,11 +307,7 @@ class ProtectedPagesPager extends AlphabeticPager {
  */
 function wfSpecialProtectedpages() {
 
-	list( $limit, $offset ) = wfCheckLimits();
-
 	$ppForm = new ProtectedPagesForm();
 
 	$ppForm->showList();
 }
-
-?>