put in r110285 again now that 1.19 branched

[lhc/web/wiklou.git] / includes / Html.php

diff --git a/includes/Html.php b/includes/Html.php
index 35d570d..c61a1ba 100644 (file)
--- a/includes/Html.php
+++ b/includes/Html.php
@@ -101,6 +101,19 @@ class Html {
                'itemscope',
        );
 
+       private static $HTMLFiveOnlyAttribs = array(
+               'autocomplete',
+               'autofocus',
+               'max',
+               'min',
+               'multiple',
+               'pattern',
+               'placeholder',
+               'required',
+               'step',
+               'spellcheck',
+       );
+
        /**
         * Returns an HTML element in a string.  The major advantage here over
         * manually typing out the HTML is that it will escape all attribute
@@ -363,20 +376,22 @@ class Html {
         * and converted to a space-separated string. In addition to a numerical
         * array, the attribute value may also be an associative array. See the
         * example below for how that works.
-        * @example Numerical array
-        * <code>
+        *
+        * @par Numerical array
+        * @code
         *     Html::element( 'em', array(
         *         'class' => array( 'foo', 'bar' )
         *     ) );
         *     // gives '<em class="foo bar"></em>'
-        * </code>
-        * @example Associative array
-        * <code>
+        * @endcode
+        *
+        * @par Associative array
+        * @code
         *     Html::element( 'em', array(
         *         'class' => array( 'foo', 'bar', 'foo' => false, 'quux' => true )
         *     ) );
         *     // gives '<em class="bar quux"></em>'
-        * </code>
+        * @endcode
         *
         * @param $attribs array Associative array of attributes, e.g., array(
         *   'href' => 'http://www.mediawiki.org/' ).  Values will be HTML-escaped.
@@ -408,18 +423,8 @@ class Html {
                        $key = strtolower( $key );
 
                        # Here we're blacklisting some HTML5-only attributes...
-                       if ( !$wgHtml5 && in_array( $key, array(
-                                       'autocomplete',
-                                       'autofocus',
-                                       'max',
-                                       'min',
-                                       'multiple',
-                                       'pattern',
-                                       'placeholder',
-                                       'required',
-                                       'step',
-                                       'spellcheck',
-                       ) ) ) {
+                       if ( !$wgHtml5 && in_array( $key, self::$HTMLFiveOnlyAttribs )
+                        ) {
                                continue;
                        }
 
@@ -535,6 +540,7 @@ class Html {
                                        # @todo FIXME: Is this really true?
                                        $map['<'] = '&lt;';
                                }
+                               
                                $ret .= " $key=$quote" . strtr( $value, $map ) . $quote;
                        }
                }
@@ -684,7 +690,87 @@ class Html {
                        }
                }
 
-               return self::element( 'textarea', $attribs, $value );
+               if (substr($value, 0, 1) == "\n") {
+                       // Workaround for bug 12130: browsers eat the initial newline
+                       // assuming that it's just for show, but they do keep the later
+                       // newlines, which we may want to preserve during editing.
+                       // Prepending a single newline
+                       $spacedValue = "\n" . $value;
+               } else {
+                       $spacedValue = $value;
+               }
+               return self::element( 'textarea', $attribs, $spacedValue );
+       }
+       /**
+        * Build a drop-down box for selecting a namespace
+        *
+        * @param $params array:
+        * - selected: [optional] Id of namespace which should be pre-selected
+        * - all: [optional] Value of item for "all namespaces". If null or unset, no <option> is generated to select all namespaces
+        * - label: text for label to add before the field
+        * @param $selectAttribs array HTML attributes for the generated select element.
+        * - id:   [optional], default: 'namespace'
+        * - name: [optional], default: 'namespace'
+        * @return string HTML code to select a namespace.
+        */
+       public static function namespaceSelector( Array $params = array(), Array $selectAttribs = array() ) {
+               global $wgContLang;
+
+               // Default 'id' & 'name' <select> attributes
+               $selectAttribs = $selectAttribs + array(
+                       'id'   => 'namespace',
+                       'name' => 'namespace',
+               );
+               ksort( $selectAttribs );
+
+               // Is a namespace selected?
+               if ( isset( $params['selected'] ) ) {
+                       // If string only contains digits, convert to clean int. Selected could also
+                       // be "all" or "" etc. which needs to be left untouched.
+                       // PHP is_numeric() has issues with large strings, PHP ctype_digit has other issues
+                       // and returns false for already clean ints. Use regex instead..
+                       if ( preg_match( '/^\d+$/', $params['selected'] ) ) {
+                               $params['selected'] = intval( $params['selected'] );
+                       }
+                       // else: leaves it untouched for later processing
+               } else {
+                       $params['selected'] = '';
+               }
+
+               // Array holding the <option> elements
+               $options = array();
+
+               if ( isset( $params['all'] ) ) {
+                       // add an <option> that would let the user select all namespaces.
+                       // Value is provided by user, the name shown is localized.
+                       $options[$params['all']] = wfMsg( 'namespacesall' );
+               }
+               // Add defaults <option> according to content language
+               $options += $wgContLang->getFormattedNamespaces();
+
+               // Convert $options to HTML
+               $optionsHtml = array();
+               foreach ( $options as $nsId => $nsName ) {
+                       if ( $nsId < NS_MAIN ) {
+                               continue;
+                       }
+                       if ( $nsId === 0 ) {
+                               $nsName = wfMsg( 'blanknamespace' );
+                       }
+                       $optionsHtml[] = Xml::option( $nsName, $nsId, $nsId === $params['selected'] );
+               }
+
+               // Forge a <select> element and returns it
+               $ret = '';
+               if ( isset( $params['label'] ) ) {
+                       $ret .= Xml::label( $params['label'], $selectAttribs['id'] ) . '&#160;';
+               }
+               $ret .= Html::openElement( 'select', $selectAttribs )
+                       . "\n"
+                       . implode( "\n", $optionsHtml )
+                       . "\n"
+                       . Html::closeElement( 'select' );
+               return $ret;
        }
 
        /**