fix invalid HTML entities

[lhc/web/wiklou.git] / config / index.php

diff --git a/config/index.php b/config/index.php
index e6fb49c..85890fa 100644 (file)
--- a/config/index.php
+++ b/config/index.php
@@ -189,7 +189,26 @@ $wgConfiguring = true;
 $conf = new ConfigData;
 
 install_version_checks();
-print "<li>PHP " . phpversion() . " ok</li>\n";
+
+print "<li>PHP " . phpversion() . ": ";
+if( version_compare( phpversion(), "5.0", "lt" ) ) {
+       print "ok";
+} else {
+       print " <b>the MonoBook skin will be disabled due to an incompatibility
+               between the PHPTAL template library and PHP 5</b>. The wiki should
+               function normally, but with the older look and feel.";
+}
+print "</li>\n";
+
+if( ini_get( "register_globals" ) ) {
+       ?>
+       <li><b class='error'>Warning:</b> <b>PHP's
+       <tt><a href="http://php.net/register_globals">register_globals</a></tt>
+       option is enabled.</b> MediaWiki will work correctly, but this setting
+       increases your exposure to potential security vulnerabilities in PHP-based
+       software running on your server. <b>You should disable it if you are able.</b></li>
+       <?php
+}
 
 if( ini_get( "safe_mode" ) ) {
        ?>
@@ -225,7 +244,9 @@ $conf->xml = function_exists( "utf8_encode" );
 if( $conf->xml ) {
        print "<li>Have XML / Latin1-UTF-8 conversion support.</li>\n";
 } else {
-       print "<li><b>XML / Latin1-UTF-8 conversion is missing! Wiki will probably not work.</b></li>\n";
+       dieout( "PHP's XML module is missing; the wiki requires functions in
+               this module and won't work in this configuration.
+               If you're running Mandrake, install the php-xml package." );
 }
 
 $memlimit = ini_get( "memory_limit" );
@@ -310,6 +331,9 @@ $errs = array();
 if( $conf->Sitename == "" || $conf->Sitename == "MediaWiki" || $conf->Sitename == "Mediawiki" ) {
        $errs["Sitename"] = "Must not be blank or \"MediaWiki\".";
 }
+if( $conf->DBuser == "" ) {
+       $errs["DBuser"] = "Must not be blank";
+}
 if( $conf->DBpassword == "" ) {
        $errs["DBpassword"] = "Must not be blank";
 }
@@ -324,7 +348,7 @@ if( $conf->SysopPass != $conf->SysopPass2 ) {
        $errs["SysopPass2"] = "Passwords don't match!";
 }
 
-$conf->License = importPost( "License", "none" );
+$conf->License = importRequest( "License", "none" );
 if( $conf->License == "gfdl" ) {
        $conf->RightsUrl = "http://www.gnu.org/copyleft/fdl.html";
        $conf->RightsText = "GNU Free Documentation License 1.2";
@@ -333,10 +357,10 @@ if( $conf->License == "gfdl" ) {
 } elseif( $conf->License == "none" ) {
        $conf->RightsUrl = $conf->RightsText = $conf->RightsCode = $conf->RightsIcon = "";
 } else {
-       $conf->RightsUrl = importPost( "RightsUrl", "" );
-       $conf->RightsText = importPost( "RightsText", "" );
-       $conf->RightsCode = importPost( "RightsCode", "" );
-       $conf->RightsIcon = importPost( "RightsIcon", "" );
+       $conf->RightsUrl = importRequest( "RightsUrl", "" );
+       $conf->RightsText = importRequest( "RightsText", "" );
+       $conf->RightsCode = importRequest( "RightsCode", "" );
+       $conf->RightsIcon = importRequest( "RightsIcon", "" );
 }
 
 if( $conf->posted && ( 0 == count( $errs ) ) ) {
@@ -635,11 +659,16 @@ if( count( $errs ) ) {
                        $icon = urlencode( "$wgServer$wgUploadPath/wiki.png" );
                        $ccApp = htmlspecialchars( "http://creativecommons.org/license/?partner=$partner&exit_url=$exit&partner_icon_url=$icon" );
                        print "<a href=\"$ccApp\">choose</a>";
-                       ?></li>
-               <li><?php aField( $conf, "RightsUrl", $conf->RightsUrl, "hidden" ); ?></li>
-               <li><?php aField( $conf, "RightsText", $conf->RightsText, "hidden" ); ?></li>
-               <li><?php aField( $conf, "RightsCode", $conf->RightsCode, "hidden" ); ?></li>
-               <li><?php aField( $conf, "RightsIcon", $conf->RightsIcon, "hidden" ); ?></li>
+                       ?> (link will wipe out any other data in this form!)
+               <?php if( $conf->License == "cc" ) { ?>
+                       <ul>
+                               <li><?php aField( $conf, "RightsIcon", "<img src=\"" . htmlspecialchars( $conf->RightsIcon ) . "\" alt='icon' />", "hidden" ); ?></li>
+                               <li><?php aField( $conf, "RightsText", htmlspecialchars( $conf->RightsText ), "hidden" ); ?></li>
+                               <li><?php aField( $conf, "RightsCode", "code: " . htmlspecialchars( $conf->RightsCode ), "hidden" ); ?></li>
+                               <li><?php aField( $conf, "RightsUrl", "<a href=\"" . htmlspecialchars( $conf->RightsUrl ) . "\">" . htmlspecialchars( $conf->RightsUrl ) . "</a>", "hidden" ); ?></li>
+                       </ul>
+               <?php } ?>
+                       </li>
                </ul>
        </dd>
        <dt>
@@ -774,7 +803,10 @@ function writeLocalSettings( $conf ) {
 
        # Add slashes to strings for double quoting
        $slconf = array_map( "escapePhpString", get_object_vars( $conf ) );
-
+       if( $conf->License == 'gfdl' ) {
+               # Needs literal string interpolation for the current style path
+               $slconf['RightsIcon'] = $conf->RightsIcon;
+       }
 
        $sep = (DIRECTORY_SEPARATOR == "\\") ? ";" : ":";
        return "
@@ -865,10 +897,10 @@ if ( \$wgCommandLineMode ) {
 ## License and Creative Commons licenses are supported so far.
 {$rights}\$wgEnableCreativeCommonsRdf = true;
 \$wgRightsPage = \"\"; # Set to the title of a wiki page that describes your license/copyright
-\$wgRightsUrl = \"{$conf->RightsUrl}\";
-\$wgRightsText = \"{$conf->RightsText}\";
-\$wgRightsIcon = \"{$conf->RightsIcon}\";
-# \$wgRightsCode = \"{$conf->RightsCode}\"; # Not yet used
+\$wgRightsUrl = \"{$slconf['RightsUrl']}\";
+\$wgRightsText = \"{$slconf['RightsText']}\";
+\$wgRightsIcon = \"{$slconf['RightsIcon']}\";
+# \$wgRightsCode = \"{$slconf['RightsCode']}\"; # Not yet used
 ";
 }
 
@@ -876,9 +908,9 @@ function dieout( $text ) {
        die( $text . "\n\n</body>\n</html>" );
 }
 
-function importPost( $name, $default = "" ) {
-       if( isset( $_POST[$name] ) ) {
-               $retval = $_POST[$name];
+function importVar( &$var, $name, $default = "" ) {
+       if( isset( $var[$name] ) ) {
+               $retval = $var[$name];
                if ( get_magic_quotes_gpc() ) {
                        $retval = stripslashes( $retval );
                }
@@ -888,6 +920,14 @@ function importPost( $name, $default = "" ) {
        return $retval;
 }
 
+function importPost( $name, $default = "" ) {
+       return importVar( $_POST, $name, $default );
+}
+
+function importRequest( $name, $default = "" ) {
+       return importVar( $_REQUEST, $name, $default );
+}
+
 function aField( &$conf, $field, $text, $type = "", $value = "" ) {
        if( $type != "" ) {
                $xtype = "type=\"$type\"";