X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/fiche.php?a=blobdiff_plain;f=config%2Findex.php;h=c07a1016b8a183111f162496690ba2ef213b02e1;hb=efebcf9b720147d60f71d480cc817f34e94d508c;hp=e8a0568ae235bc0c115051c86e7192cbf17f5786;hpb=74f81512ab2fb09d22f14290c7b73d17e05f20d8;p=lhc%2Fweb%2Fwiklou.git diff --git a/config/index.php b/config/index.php index e8a0568ae2..c07a1016b8 100644 --- a/config/index.php +++ b/config/index.php @@ -2,23 +2,25 @@ # MediaWiki web-based config/installation # Copyright (C) 2004 Brion Vibber # http://www.mediawiki.org/ -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # http://www.gnu.org/copyleft/gpl.html +error_reporting( E_ALL ); header( "Content-type: text/html; charset=utf-8" ); +@ini_set( "display_errors", true ); ?> @@ -38,11 +40,11 @@ header( "Content-type: text/html; charset=utf-8" ); padding: 8px; margin-left: 8px; } - + dl.setup dd { margin-left: 0; } - dl.setup dd label { + dl.setup dd label.column { clear: left; font-weight: bold; width: 12em; @@ -60,6 +62,11 @@ header( "Content-type: text/html; charset=utf-8" ); .error { color: red; } + ul.plain { + list-style: none; + clear: both; + margin-left: 12em; + } @@ -68,30 +75,30 @@ header( "Content-type: text/html; charset=utf-8" );
+ src="../stylesheets/images/wiki.png" width="135" height="135" alt="" border="0" />
- + MediaWiki is Copyright (C) 2001-2004 by Magnus Manske, Brion Vibber, Lee Daniel Crocker, - Tim Starling, Erik Möller, and others.

- + Tim Starling, Erik Möller, Gabriel Wicke and others.

+ - +

This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.

- -

This progarm is distributed in the hope that it will be useful, + +

This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.

- +

You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -99,7 +106,14 @@ header( "Content-type: text/html; charset=utf-8" );

MediaWiki installation

@@ -111,15 +125,15 @@ include( "../includes/DefaultSettings.php" ); if( file_exists( "../LocalSettings.php" ) || file_exists( "../AdminSettings.php" ) ) { dieout( "

Wiki is configured.

- +

Already configured... return to the wiki.

- +

(You should probably remove this directory for added security.)

" ); } if( file_exists( "./LocalSettings.php" ) || file_exists( "./AdminSettings.php" ) ) { dieout( "

You're configured!

- +

Please move LocalSettings.php to the parent directory, then try out your wiki. (You should remove this config directory for added security once you're done.)

" ); @@ -127,14 +141,14 @@ if( file_exists( "./LocalSettings.php" ) || file_exists( "./AdminSettings.php" ) if( !is_writable( "." ) ) { dieout( "

Can't write config file, aborting

- +

In order to configure the wiki you have to make the config subdirectory writable by the web server. Once configuration is done you'll move the created LocalSettings.php to the parent directory, and for added safety you can then remove the config subdirectory entirely.

- +

To make the directory writable on a Unix/Linux system:

- + 
 	cd /path/to/wiki
 	chmod a+w config
@@ -142,16 +156,19 @@ if( !is_writable( "." ) ) {
 }
 
 
-include( "../install-utils.inc" );
-include( "../maintenance/updaters.inc" );
+require_once( "../install-utils.inc" );
+require_once( "../maintenance/updaters.inc" );
+require_once( "../maintenance/convertLinks.inc" );
+require_once( "../maintenance/archives/moveCustomMessages.inc" );
+
 class ConfigData {
 	function getEncoded( $data ) {
 		# Hackish
-		global $wgInputEncoding;
-		if( strcasecmp( $wgInputEncoding, "utf-8" ) == 0 ) {
-			return $data;
-		} else {
+		global $wgUseLatin1;
+		if( $wgUseLatin1 ) {
 			return utf8_decode( $data ); /* to latin1 wikis */
+		} else {
+			return $data;
 		}
 	}
 	function getSitename() { return $this->getEncoded( $this->Sitename ); }
@@ -161,39 +178,115 @@ class ConfigData {
 
 ?>
 
+
Please include all of the lines below when reporting installation problems.

 
 
Checking environment...
\n"; } /* Write out the config file now that all is well */ print "

Creating LocalSettings.php...

\n\n"; - $localSettings = "<" . "?php\n$local\n?" . ">"; - $f = fopen( "LocalSettings.php", "xt" ); + $localSettings = "<" . "?php$endl$local$endl?" . ">"; + + if( version_compare( phpversion(), "4.3.2" ) >= 0 ) { + $xt = "xt"; # Refuse to overwrite an existing file + } else { + $xt = "wt"; # 'x' is not available prior to PHP 4.3.2. We did check above, but race conditions blah blah + } + $f = fopen( "LocalSettings.php", $xt ); + if( $f == false ) { - dieout( "Couldn't write out LocalSettings.php. Check that the directory permissions are correct and that there isn't already a file of that name here...

\n" . + dieout( "

Couldn't write out LocalSettings.php. Check that the directory permissions are correct and that there isn't already a file of that name here...

\n" . "

Here's the file that would have been written, try to paste it into place manually:

\n" . "
\n" . htmlspecialchars( $localSettings ) . "
\n" ); } fwrite( $f, $localSettings ); fclose( $f ); - - print "

Success! Move the LocalSettings.php file into the parent directory, then follow + + print "

Success! Move the config/LocalSettings.php file into the parent directory, then follow this link to your wiki.

\n"; - + } while( false ); } ?> @@ -425,7 +574,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) { if( count( $errs ) ) { /* Display options form */ - + if( $conf->posted ) { echo "

Something's not quite right yet; make sure everything below is filled out correctly.

\n"; } @@ -462,7 +611,7 @@ if( count( $errs ) ) {
- +
@@ -562,72 +745,144 @@ function writeAdminSettings( $conf ) { "; } +function escapePhpString( $string ) { + return strtr( $string, + array( + "\n" => "\\n", + "\r" => "\\r", + "\t" => "\\t", + "\\" => "\\\\", + "\$" => "\\\$", + "\"" => "\\\"" + )); +} + function writeLocalSettings( $conf ) { - $conf->DBmysql4 = $conf->DBmysql4 ? 'true' : 'false'; + $conf->DBmysql4 = @$conf->DBmysql4 ? 'true' : 'false'; $conf->UseImageResize = $conf->UseImageResize ? 'true' : 'false'; - $conf->DBsqluser = $conf->DBuser; - $conf->DBsqlpassword = $conf->DBpassword; $conf->PasswordSender = $conf->EmergencyContact; - if( $conf->LanguageCode == "en-utf8" ) { - $conf->LanguageCode = "en"; - $conf->Encoding = "UTF-8"; + if( preg_match( '/^([a-z]+)-latin1$/', $conf->LanguageCode, $m ) ) { + $conf->LanguageCode = $m[1]; + $conf->Latin1 = true; + } else { + $conf->Latin1 = false; } + $zlib = ($conf->zlib ? "" : "# "); + $magic = ($conf->ImageMagick ? "" : "# "); + $convert = ($conf->ImageMagick ? $conf->ImageMagick : "/usr/bin/convert" ); + $pretty = ($conf->prettyURLs ? "" : "# "); + $ugly = ($conf->prettyURLs ? "# " : ""); + $rights = ($conf->RightsUrl) ? "" : "# "; + + $file = @fopen( "/dev/random", "r" ); + if ( $file ) { + $proxyKey = bin2hex( fread( $file, 32 ) ); + fclose( $file ); + } else { + $proxyKey = ""; + for ( $i=0; $i<8; $i++ ) { + $proxyKey .= dechex(mt_rand(0, 0x7fffffff)); + } + print "
  • Warning: \$wgProxyKey is insecure
    • \n"; + } + + # Add slashes to strings for double quoting + $slconf = array_map( "escapePhpString", get_object_vars( $conf ) ); + + $sep = (DIRECTORY_SEPARATOR == "\\") ? ";" : ":"; return " -# This file was automatically generated. Don't touch unless you -# know what you're doing; see LocalSettings.sample for an edit- -# friendly file. +# This file was automatically generated by the MediaWiki installer. +# If you make manual changes, please keep track in case you need to +# recreate them later. -\$IP = \"{$conf->IP}\"; -ini_set( \"include_path\", \"\$IP/includes$sep\$IP/languages$sep\" . ini_get(\"include_path\") ); +\$IP = \"{$slconf['IP']}\"; +ini_set( \"include_path\", \".$sep\$IP$sep\$IP/includes$sep\$IP/languages\" ); include_once( \"DefaultSettings.php\" ); -if( \$wgCommandLineMode ) { - die( \"Can't use command-line utils with in-place install yet, sorry.\" ); +# If PHP's memory limit is very low, some operations may fail. +" . ($conf->raiseMemory ? '' : '# ' ) . "ini_set( 'memory_limit', '20M' );" . " + +if ( \$wgCommandLineMode ) { + if ( isset( \$_SERVER ) && array_key_exists( 'REQUEST_METHOD', \$_SERVER ) ) { + die( \"This script must be run from the command line\\n\" ); + } +} elseif ( empty( \$wgConfiguring ) ) { + ## Compress output if the browser supports it + {$zlib}if( !ini_get( 'zlib.output_compression' ) ) ob_start( 'ob_gzhandler' ); } -\$wgSitename = \"{$conf->Sitename}\"; +\$wgSitename = \"{$slconf['Sitename']}\"; -\$wgScriptPath = \"{$conf->ScriptPath}\"; +\$wgScriptPath = \"{$slconf['ScriptPath']}\"; \$wgScript = \"\$wgScriptPath/index.php\"; \$wgRedirectScript = \"\$wgScriptPath/redirect.php\"; -\$wgArticlePath = \"\$wgScript?title=\$1\"; -# \$wgArticlePath = \"\$wgScript/\$1\"; # Prettier if you're setup for it +## If using PHP as a CGI module, use the ugly URLs +{$pretty}\$wgArticlePath = \"\$wgScript/\$1\"; +{$ugly}\$wgArticlePath = \"\$wgScript?title=\$1\"; -\$wgStyleSheetPath = \"\$wgScriptPath/stylesheets\"; -\$wgStyleSheetDirectory = \"\$IP/stylesheets\"; +\$wgStylePath = \"\$wgScriptPath/stylesheets\"; +\$wgStyleDirectory = \"\$IP/stylesheets\"; +\$wgLogo = \"\$wgStylePath/images/wiki.png\"; \$wgUploadPath = \"\$wgScriptPath/images\"; -\$wgUploadDirectory = \"\$IP/images\"; -\$wgLogo = \"\$wgUploadPath/wiki.png\"; - -\$wgEmergencyContact = \"{$conf->EmergencyContact}\"; -\$wgPasswordSender = \"{$conf->PasswordSender}\"; - -\$wgDBserver = \"{$conf->DBserver}\"; -\$wgDBname = \"{$conf->DBname}\"; -\$wgDBuser = \"{$conf->DBuser}\"; -\$wgDBpassword = \"{$conf->DBpassword}\"; -\$wgDBsqluser = \"{$conf->DBsqluser}\"; -\$wgDBsqlpassword = \"{$conf->DBsqlpassword}\"; +\$wgUploadDirectory = \"\$IP/images\"; + +\$wgEmergencyContact = \"{$slconf['EmergencyContact']}\"; +\$wgPasswordSender = \"{$slconf['PasswordSender']}\"; + +\$wgDBserver = \"{$slconf['DBserver']}\"; +\$wgDBname = \"{$slconf['DBname']}\"; +\$wgDBuser = \"{$slconf['DBuser']}\"; +\$wgDBpassword = \"{$slconf['DBpassword']}\"; + +## To allow SQL queries through the wiki's Special:Askaql page, +## uncomment the next lines. THIS IS VERY INSECURE. If you want +## to allow semipublic read-only SQL access for your sysops, +## you should define a MySQL user with limited privileges. +## See MySQL docs: http://www.mysql.com/doc/en/GRANT.html +# +# \$wgAllowSysopQueries = true; +# \$wgDBsqluser = \"sqluser\"; +# \$wgDBsqlpassword = \"sqlpass\"; \$wgDBmysql4 = \$wgEnablePersistentLC = {$conf->DBmysql4}; +## To enable image uploads, make sure the 'images' directory +## is writable, then uncomment this: +# \$wgDisableUploads = false; \$wgUseImageResize = {$conf->UseImageResize}; +{$magic}\$wgUseImageMagick = true; +{$magic}\$wgImageMagickConvertCommand = \"{$convert}\"; ## If you have the appropriate support software installed ## you can enable inline LaTeX equations: # \$wgUseTeX = true; -# \$wgMathPath = \"{$wgUploadPath}/math\"; -# \$wgMathDirectory = \"{$wgUploadDirectory}/math\"; -# \$wgTmpDirectory = \"{$wgUploadDirectory}/tmp\"; +\$wgMathPath = \"{\$wgUploadPath}/math\"; +\$wgMathDirectory = \"{\$wgUploadDirectory}/math\"; +\$wgTmpDirectory = \"{\$wgUploadDirectory}/tmp\"; \$wgLocalInterwiki = \$wgSitename; -\$wgLanguageCode = \"{$conf->LanguageCode}\"; -" . ($conf->Encoding ? "\$wgInputEncoding = \$wgOutputEncoding = \"{$conf->Encoding}\";" : "" ) . " +\$wgLanguageCode = \"{$slconf['LanguageCode']}\"; +\$wgUseLatin1 = " . ($conf->Latin1 ? 'true' : 'false') . ";\n +\$wgProxyKey = \"$proxyKey\"; + +## Default skin: you can change the default skin. Use the internal symbolic +## names, ie 'standard', 'nostalgia', 'cologneblue', 'monobook': +# \$wgDefaultSkin = 'monobook'; + +## For attaching licensing metadata to pages, and displaying an +## appropriate copyright notice / icon. GNU Free Documentation +## 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 "; } @@ -635,21 +890,57 @@ function dieout( $text ) { die( $text . "\n\n\n" ); } -function importPost( $name, $default = "" ) { - if( isset( $_POST[$name] ) ) { - return $_POST[$name]; +function importVar( &$var, $name, $default = "" ) { + if( isset( $var[$name] ) ) { + $retval = $var[$name]; + if ( get_magic_quotes_gpc() ) { + $retval = stripslashes( $retval ); + } } else { - return $default; + $retval = $default; } + return $retval; } -function aField( &$conf, $field, $text, $type = "" ) { - if( $type != "" ) $type = "type=\"$type\""; - echo "\t\t\n"; - echo "\t\t$field ); +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\""; + } else { + $xtype = ""; + } + + if(!(isset($id)) or ($id == "") ) $id = $field; + $nolabel = ($type == "radio") || ($type == "hidden"); + if( $nolabel ) { + echo "\t\t\n"; + } + global $errs; if(isset($errs[$field])) echo "" . $errs[$field] . "\n"; } @@ -660,23 +951,24 @@ function getLanguageList() { $wgLanguageCode = "xxx"; function wfLocalUrl( $x ) { return $x; } function wfLocalUrlE( $x ) { return $x; } - include( "../languages/Language.php" ); + require_once( "../languages/Names.php" ); } - + $codes = array(); $latin1 = array( "da", "de", "en", "es", "fr", "nl", "sv" ); - + $d = opendir( "../languages" ); while( false !== ($f = readdir( $d ) ) ) { if( preg_match( '/Language([A-Z][a-z]+)\.php$/', $f, $m ) ) { $code = strtolower( $m[1] ); - $codes[$code] = "$code - " . $wgLanguageNames[$code]; if( in_array( $code, $latin1 ) ) { - $codes[$code] .= " - Latin-1"; + $codes[$code] = "$code - " . $wgLanguageNames[$code] . " - Unicode"; + $codes[$code.'-latin1'] = "$code - " . $wgLanguageNames[$code] . " - Latin-1"; + } else { + $codes[$code] = "$code - " . $wgLanguageNames[$code]; } } } - $codes["en-utf8"] = "en - English - Unicode"; closedir( $d ); ksort( $codes ); return $codes; @@ -685,4 +977,4 @@ function getLanguageList() { ?> - \ No newline at end of file +