API: (bug 19004) Add support for tags. Patch by Matthew Britton

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

diff --git a/includes/Xml.php b/includes/Xml.php
index 68990d8..9466e08 100644 (file)
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -172,6 +172,36 @@ class Xml {
                        . implode( "\n", $options )
                        . self::closeElement( 'select' );
        }
+       
+       /**
+        * @param $year Integer
+        * @param $month Integer
+        * @return string Formatted HTML
+        */
+       public static function dateMenu( $year, $month ) {
+               # Offset overrides year/month selection
+               if( $month && $month !== -1 ) {
+                       $encMonth = intval( $month );
+               } else {
+                       $encMonth = '';
+               }
+               if( $year ) {
+                       $encYear = intval( $year );
+               } else if( $encMonth ) {
+                       $thisMonth = intval( gmdate( 'n' ) );
+                       $thisYear = intval( gmdate( 'Y' ) );
+                       if( intval($encMonth) > $thisMonth ) {
+                               $thisYear--;
+                       }
+                       $encYear = $thisYear;
+               } else {
+                       $encYear = '';
+               }
+               return Xml::label( wfMsg( 'year' ), 'year' ) . ' '.
+                       Xml::input( 'year', 4, $encYear, array('id' => 'year', 'maxlength' => 4) ) . ' '.
+                       Xml::label( wfMsg( 'month' ), 'month' ) . ' '.
+                       Xml::monthSelector( $encMonth, -1 );
+       }
 
        /**
         *
@@ -368,17 +398,10 @@ class Xml {
        }
 
        /**
-        * Convenience function to build an HTML hidden form field.
-        * @param $name String: name attribute for the field
-        * @param $value String: value for the hidden field
-        * @param $attribs Array: optional custom attributes
-        * @return string HTML
+        * @deprecated Synonymous to Html::hidden()
         */
-       public static function hidden( $name, $value, $attribs=array() ) {
-               return self::element( 'input', array(
-                       'name' => $name,
-                       'type' => 'hidden',
-                       'value' => $value ) + $attribs );
+       public static function hidden( $name, $value, $attribs = array() ) {
+               return Html::hidden( $name, $value, $attribs );
        }
 
        /**
@@ -544,7 +567,10 @@ class Xml {
                        $s = 'null';
                } elseif ( is_int( $value ) ) {
                        $s = $value;
-               } elseif ( is_array( $value ) ) {
+               } elseif ( is_array( $value ) && // Make sure it's not associative.
+                                       array_keys($value) === range( 0, count($value) - 1 ) ||
+                                       count($value) == 0
+                               ) {
                        $s = '[';
                        foreach ( $value as $elt ) {
                                if ( $s != '[' ) {
@@ -553,7 +579,8 @@ class Xml {
                                $s .= self::encodeJsVar( $elt );
                        }
                        $s .= ']';
-               } elseif ( is_object( $value ) ) {
+               } elseif ( is_object( $value ) || is_array( $value ) ) {
+                       // Objects and associative arrays
                        $s = '{';
                        foreach ( (array)$value as $name => $elt ) {
                                if ( $s != '{' ) {
@@ -641,7 +668,6 @@ class Xml {
        
                foreach( $fields as $labelmsg => $input ) {
                        $id = "mw-$labelmsg";
-                       
                        $form .= Xml::openElement( 'tr', array( 'id' => $id ) );
                        $form .= Xml::tags( 'td', array('class' => 'mw-label'), wfMsgExt( $labelmsg, array('parseinline') ) );
                        $form .= Xml::openElement( 'td', array( 'class' => 'mw-input' ) ) . $input . Xml::closeElement( 'td' );
@@ -649,7 +675,7 @@ class Xml {
                }
 
                if( $submitLabel ) {
-                       $form .= Xml::openElement( 'tr', array( 'id' => $id ) );
+                       $form .= Xml::openElement( 'tr' );
                        $form .= Xml::tags( 'td', array(), '' );
                        $form .= Xml::openElement( 'td', array( 'class' => 'mw-submit' ) ) . Xml::submitButton( wfMsg( $submitLabel ) ) . Xml::closeElement( 'td' );
                        $form .= Xml::closeElement( 'tr' );
@@ -663,9 +689,9 @@ class Xml {
        
        /**
         * Build a table of data
-        * @param array $rows An array of arrays of strings, each to be a row in a table
-        * @param array $attribs Attributes to apply to the table tag [optional]
-        * @param array $headers An array of strings to use as table headers [optional]
+        * @param $rows An array of arrays of strings, each to be a row in a table
+        * @param $attribs An array of attributes to apply to the table tag [optional]
+        * @param $headers An array of strings to use as table headers [optional]
         * @return string
         */
        public static function buildTable( $rows, $attribs = array(), $headers = null ) {
@@ -688,7 +714,8 @@ class Xml {
        
        /**
         * Build a row for a table
-        * @param array $cells An array of strings to put in <td>
+        * @param $attribs An array of attributes to apply to the tr tag
+        * @param $cells An array of strings to put in <td>
         * @return string
         */
        public static function buildTableRow( $attribs, $cells ) {
@@ -722,11 +749,43 @@ class XmlSelect {
                $this->attributes[$name] = $value;
        }
 
+       public function getAttribute( $name ) {
+               if ( isset($this->attributes[$name]) ) {
+                       return $this->attributes[$name];
+               } else {
+                       return null;
+               }
+       }
+
        public function addOption( $name, $value = false ) {
                // Stab stab stab
                $value = ($value !== false) ? $value : $name;
                $this->options[] = Xml::option( $name, $value, $value === $this->default );
        }
+       
+       // This accepts an array of form
+       // label => value
+       // label => ( label => value, label => value )
+       public function addOptions( $options ) {
+               $this->options[] = trim(self::formatOptions( $options, $this->default ));
+       }
+
+       // This accepts an array of form
+       // label => value
+       // label => ( label => value, label => value )  
+       static function formatOptions( $options, $default = false ) {
+               $data = '';
+               foreach( $options as $label => $value ) {
+                       if ( is_array( $value ) ) {
+                               $contents = self::formatOptions( $value, $default );
+                               $data .= Xml::tags( 'optgroup', array( 'label' => $label ), $contents ) . "\n";
+                       } else {
+                               $data .= Xml::option( $label, $value, $value === $default ) . "\n";
+                       }
+               }
+               
+               return $data;
+       }
 
        public function getHTML() {
                return Xml::tags( 'select', $this->attributes, implode( "\n", $this->options ) );