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=7ce92200f0639c6406917c2b63fddc086a951a77;hpb=84027db7f2df8bb54b29daaf10ede871cf0f3d19;p=lhc%2Fweb%2Fwiklou.git diff --git a/config/index.php b/config/index.php index 7ce92200f0..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,25 +178,50 @@ class ConfigData {
 
 ?>
 
+
Please include all of the lines below when reporting installation problems.

 
 
Checking environment...