* Fix missing and double escaping

* Don't hardcode colons
* Xml functions, fixed broken labels

diff --git a/includes/SpecialProtectedpages.php b/includes/SpecialProtectedpages.php
index 59a5264..ba60054 100644 (file)
--- a/includes/SpecialProtectedpages.php
+++ b/includes/SpecialProtectedpages.php
@@ -9,6 +9,10 @@
  * @addtogroup SpecialPage
  */
 class ProtectedPagesForm {
+
+       protected $IdLevel = 'level';
+       protected $IdType  = 'type';
+
        function showList( $msg = '' ) {
                global $wgOut, $wgRequest;
 
@@ -22,8 +26,8 @@ class ProtectedPagesForm {
                        Title::purgeExpiredRestrictions();
                }
 
-               $type = $wgRequest->getVal( 'type' );
-               $level = $wgRequest->getVal( 'level' );
+               $type = $wgRequest->getVal( $this->IdType );
+               $level = $wgRequest->getVal( $this->IdLevel );
                $sizetype = $wgRequest->getVal( 'sizetype' );
                $size = $wgRequest->getIntOrNull( 'size' );
                $NS = $wgRequest->getIntOrNull( 'namespace' );
@@ -125,7 +129,7 @@ class ProtectedPagesForm {
                $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 .= ' '.wfMsg('pagesize');
+               $out .= ' '.wfMsgHtml('pagesize');
                return $out;
        }
                
@@ -134,25 +138,28 @@ class ProtectedPagesForm {
         * @private
         */
        function getTypeMenu( $pr_type ) {
-               global $wgRestrictionTypes, $wgUser;
+               global $wgRestrictionTypes;
        
-               $out = "<select name='type'>\n";
                $m = array(); // Temporary array
+               $options = array();
 
                // First pass to load the log names
                foreach( $wgRestrictionTypes as $type ) {
-                       $text = wfMsgHtml("restriction-$type");
+                       $text = wfMsg("restriction-$type");
                        $m[$text] = $type;
                }
 
                // Third pass generates sorted XHTML content
                foreach( $m as $text => $type ) {
                        $selected = ($type == $pr_type );
-                       $out .= Xml::option( $text, $type, $selected ) . "\n";
+                       $options[] = Xml::option( $text, $type, $selected ) . "\n";
                }
 
-               $out .= '</select>';
-               return "<label for='type'>" . wfMsgHtml('restriction-type') . "</label>: " . $out;
+               return
+                       Xml::label( wfMsg('restriction-type') , $this->IdType ) . '&nbsp;' .
+                       Xml::tags( 'select',
+                               array( 'id' => $this->IdType, 'name' => $this->IdType ),
+                               implode( "\n", $options ) );
        }
 
        /**
@@ -160,30 +167,30 @@ class ProtectedPagesForm {
         * @private
         */     
        function getLevelMenu( $pr_level ) {
-               global $wgRestrictionLevels, $wgUser;
-       
-               $out = "<select name='level'>\n";
-               $m = array( wfMsgHtml('restriction-level-all') => 0 ); // Temporary array
+               global $wgRestrictionLevels;
+
+               $m = array( wfMsg('restriction-level-all') => 0 ); // Temporary array
+               $options = array();
 
                // First pass to load the log names
                foreach( $wgRestrictionLevels as $type ) {
                        if ( $type !='' && $type !='*') {
-                               $text = wfMsgHtml("restriction-level-$type");
+                               $text = wfMsg("restriction-level-$type");
                                $m[$text] = $type;
                        }
                }
 
-               // Second pass to sort by name
-               ksort($m);
-
                // Third pass generates sorted XHTML content
                foreach( $m as $text => $type ) {
                        $selected = ($type == $pr_level );
-                       $out .= Xml::option( $text, $type, $selected ) . "\n";
+                       $options[] = Xml::option( $text, $type, $selected );
                }
 
-               $out .= '</select>';
-               return "<label for='level'>" . wfMsgHtml('restriction-level') . "</label>: " . $out;
+               return
+                       Xml::label( wfMsg('restriction-level') , $this->IdLevel ) . '&nbsp;' .
+                       Xml::tags( 'select',
+                               array( 'id' => $this->IdLevel, 'name' => $this->IdLevel ),
+                               implode( "\n", $options ) );
        }
 }
 

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index d002e3d..3f7a8df 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1835,8 +1835,8 @@ Here are the current settings for the page <strong>$1</strong>:',
 'protect-summary-cascade' => 'cascading',
 'protect-expiring' => 'expires $1 (UTC)',
 'protect-cascade' => 'Cascading protection - protect any pages included in this page.',
-'restriction-type' => 'Permission',
-'restriction-level' => 'Restriction level',
+'restriction-type' => 'Permission:',
+'restriction-level' => 'Restriction level:',
 'minimum-size' => 'Min size',
 'maximum-size' => 'Max size',
 'pagesize'     => '(bytes)',

diff --git a/languages/messages/MessagesFi.php b/languages/messages/MessagesFi.php
index 32daed9..a24bd22 100644 (file)
--- a/languages/messages/MessagesFi.php
+++ b/languages/messages/MessagesFi.php
@@ -1316,7 +1316,7 @@ Palaute ja lisäapu osoitteessa:
 'restriction-level'           => 'Suojaus',
 'minimum-size'                => 'Vähimmäiskoko',
 'maximum-size'                => 'Enimmäiskoko',
-'pagesize'                    => '(tavuina)',
+'pagesize'                    => 'tavua',
 
 # Restrictions (nouns)
 'restriction-edit' => 'muokkaus',
@@ -1357,7 +1357,7 @@ Palaute ja lisäapu osoitteessa:
 'undelete-no-results'      => 'Poistoarkistosta ei löytynyt haettuja sivuja.',
 
 # Namespace form on various pages
-'namespace' => 'Nimiavaruus:',
+'namespace' => 'Nimiavaruus',
 'invert'    => 'Käännä nimiavaruusvalinta päinvastaiseksi',
 
 # Contributions