Implement User::isUserActive(). Potentially very useful for bugs 13225 and 13585...

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

diff --git a/includes/Licenses.php b/includes/Licenses.php
index 36b5a7e..e76ac23 100644 (file)
--- a/includes/Licenses.php
+++ b/includes/Licenses.php
@@ -2,8 +2,7 @@
 /**
  * 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
@@ -12,13 +11,13 @@
 
 class Licenses {
        /**#@+
-        * @access private
+        * @private
         */
        /**
         * @var string
         */
        var $msg;
-       
+
        /**
         * @var array
         */
@@ -29,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 = '';
@@ -45,20 +44,20 @@ 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 ) {
+                       if ( strpos( $line, '*' ) !== 0 )
                                continue;
-                       } else {
+                       else {
                                list( $level, $line ) = $this->trimStars( $line );
-                               
+
                                if ( strpos( $line, '|' ) !== false ) {
                                        $obj = new License( $line );
                                        $this->stackItem( $this->licenses, $levels, $obj );
@@ -68,25 +67,25 @@ class Licenses {
                                        }
                                        if ( $level == count( $levels ) ) {
                                                $levels[$level - 1] = $line;
-                                       } elseif ( $level > count( $levels ) ) {
+                                       } else if ( $level > count( $levels ) ) {
                                                $levels[] = $line;
                                        }
                                }
                        }
-               } // end foreach
+               }
        }
-       
+
        function trimStars( $str ) {
                $i = $count = 0;
-               
+
                wfSuppressWarnings();
                while ($str[$i++] == '*')
                        ++$count;
                wfRestoreWarnings();
-       
+
                return array( $count, ltrim( $str, '* ' ) );
        }
-       
+
        function stackItem( &$list, $path, $item ) {
                $position =& $list;
                if ( $path )
@@ -103,6 +102,7 @@ class Licenses {
                                        array(
                                                'value' => '',
                                                'disabled' => 'disabled',
+                                               'style' => 'color: GrayText', // for MSIE
                                        ),
                                        $depth
                                );
@@ -123,14 +123,14 @@ class Licenses {
                $val = str_repeat( /* &nbsp */ "\xc2\xa0", $depth * 2 ) . $val;
                return str_repeat( "\t", $depth ) . wfElement( 'option', $attribs, $val ) . "\n";
        }
-       
+
        function msg( $str ) {
                $out = wfMsg( $str );
                return wfEmptyMsg( $str, $out ) ? $str : $out;
        }
-       
+
        /**#@-*/
-       
+
        /**
         *  Accessor for $this->licenses
         *
@@ -146,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
         */
@@ -160,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 );
        }
 }
-?>