* addressed r53282#c3209 moved conditional inclusion of $wgExtensionMessages in mwScr...

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

diff --git a/includes/Licenses.php b/includes/Licenses.php
index 1d78c31..6398c88 100644 (file)
--- a/includes/Licenses.php
+++ b/includes/Licenses.php
@@ -2,22 +2,22 @@
 /**
  * A License class for use on Special:Upload
  *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @ingroup SpecialPage
  *
  * @author Ævar Arnfjörð Bjarmason <avarab@gmail.com>
+ * @copyright Copyright © 2005, Ævar Arnfjörð Bjarmason
  * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
  */
 
 class Licenses {
        /**#@+
-        * @access private
+        * @private
         */
        /**
         * @var string
         */
        var $msg;
-       
+
        /**
         * @var array
         */
@@ -28,14 +28,14 @@ class Licenses {
         */
        var $html;
        /**#@-*/
-       
+
        /**
-        * Constrictor
+        * Constructor
         *
-        * @param string $str The string to build the licenses member from, will use
+        * @param $str String: the string to build the licenses member from, will use
         *                    wfMsgForContent( 'licenses' ) if null (default: null)
         */
-       function Licenses( $str = null ) {
+       function __construct( $str = null ) {
                // PHP sucks, this should be possible in the constructor
                $this->msg = is_null( $str ) ? wfMsgForContent( 'licenses' ) : $str;
                $this->html = '';
@@ -44,66 +44,65 @@ class Licenses {
                $tmp = $this->getLicenses();
                $this->makeHtml( $tmp );
        }
-       
+
        /**#@+
-        * @access private
+        * @private
         */
        function makeLicenses() {
                $levels = array();
                $lines = explode( "\n", $this->msg );
-               
+
                foreach ( $lines as $line ) {
                        if ( strpos( $line, '*' ) !== 0 )
                                continue;
                        else {
                                list( $level, $line ) = $this->trimStars( $line );
-                               
+
                                if ( strpos( $line, '|' ) !== false ) {
                                        $obj = new License( $line );
-                                       // TODO: Do this without using eval()
-                                       eval( '$this->licenses' . $this->makeIndexes( $levels ) . '[] = $obj;' );
+                                       $this->stackItem( $this->licenses, $levels, $obj );
                                } else {
-                                       if ( $level < count( $levels ) )
-                                               $levels = array_slice( $levels, count( $levels ) - $level );
-                                       if ( $level == count( $levels ) )
+                                       if ( $level < count( $levels ) ) {
+                                               $levels = array_slice( $levels, 0, $level );
+                                       }
+                                       if ( $level == count( $levels ) ) {
                                                $levels[$level - 1] = $line;
-                                       else if ( $level > count( $levels ) )
+                                       } else if ( $level > count( $levels ) ) {
                                                $levels[] = $line;
-       
+                                       }
                                }
                        }
                }
        }
-       
+
        function trimStars( $str ) {
                $i = $count = 0;
-               
+
+               wfSuppressWarnings();
                while ($str[$i++] == '*')
                        ++$count;
-       
+               wfRestoreWarnings();
+
                return array( $count, ltrim( $str, '* ' ) );
        }
-       
-       function makeIndexes( $arr ) {
-               $str = '';
-       
-               wfSuppressWarnings();
-               foreach ( $arr as $item )
-                       $str .= '["' . addslashes( $item ) . '"]';
-               
-               wfRestoreWarnings();
-               return $str;
+
+       function stackItem( &$list, $path, $item ) {
+               $position =& $list;
+               if ( $path )
+                       foreach( $path as $key )
+                               $position =& $position[$key];
+               $position[] = $item;
        }
 
        function makeHtml( &$tagset, $depth = 0 ) {
                foreach ( $tagset as $key => $val )
                        if ( is_array( $val ) ) {
-                               
                                $this->html .= $this->outputOption(
                                        $this->msg( $key ),
                                        array(
                                                'value' => '',
                                                'disabled' => 'disabled',
+                                               'style' => 'color: GrayText', // for MSIE
                                        ),
                                        $depth
                                );
@@ -113,7 +112,7 @@ class Licenses {
                                        $this->msg( $val->text ),
                                        array(
                                                'value' => $val->template,
-                                               'title' => $val->template
+                                               'title' => '{{' . $val->template . '}}'
                                        ),
                                        $depth
                                );
@@ -122,16 +121,16 @@ class Licenses {
 
        function outputOption( $val, $attribs = null, $depth ) {
                $val = str_repeat( /* &nbsp */ "\xc2\xa0", $depth * 2 ) . $val;
-               return str_repeat( "\t", $depth ) . wfElement( 'option', $attribs, $val ) . "\n";
+               return str_repeat( "\t", $depth ) . Xml::element( 'option', $attribs, $val ) . "\n";
        }
-       
+
        function msg( $str ) {
                $out = wfMsg( $str );
-               return wfNoMsg( $str, $out ) ? $str : $out;
+               return wfEmptyMsg( $str, $out ) ? $str : $out;
        }
-       
+
        /**#@-*/
-       
+
        /**
         *  Accessor for $this->licenses
         *
@@ -147,12 +146,15 @@ class Licenses {
        function getHtml() { return $this->html; }
 }
 
+/**
+ * A License class for use on Special:Upload (represents a single type of license).
+ */
 class License {
        /**
         * @var string
         */
        var $template;
-       
+
        /**
         * @var string
         */
@@ -161,13 +163,12 @@ class License {
        /**
         * Constructor
         *
-        * @param string $str
+        * @param $str String: license name??
         */
        function License( $str ) {
                list( $text, $template ) = explode( '|', strrev( $str ), 2 );
-               
+
                $this->template = strrev( $template );
                $this->text = strrev( $text );
        }
 }
-?>