dl.setup dd {
margin-left: 0;
}
- dl.setup dd label {
+ dl.setup dd label.column {
clear: left;
font-weight: bold;
width: 12em;
.error {
color: red;
}
+ ul.plain {
+ list-style: none;
+ clear: both;
+ margin-left: 12em;
+ }
</style>
</head>
<div id="credit">
<center>
<a href="http://www.mediawiki.org/"><img
- src="../images/wiki.png" width="135" height="135" alt="" border="0" /></a>
+ src="../stylesheets/images/wiki.png" width="135" height="135" alt="" border="0" /></a>
</center>
<b><a href="http://www.mediawiki.org/">MediaWiki</a></b> is
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.</p>
- <p>This progarm is distributed in the hope that it will be useful,
+ <p>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.</p>
</div>
<?php
-include( "../includes/DefaultSettings.php" );
+
+$IP = ".."; # Just to suppress notices, not for anything useful
+define( "MEDIAWIKI", true );
+define( "MEDIAWIKI_INSTALL", true );
+require( "../includes/DefaultSettings.php" );
?>
<h1>MediaWiki <?php print $wgVersion ?> installation</h1>
}
-include( "../install-utils.inc" );
-include( "../maintenance/updaters.inc" );
+require( "../install-utils.inc" );
+require( "../maintenance/updaters.inc" );
+require( "../maintenance/convertLinks.inc" );
+require( "../maintenance/archives/moveCustomMessages.inc" );
+
class ConfigData {
function getEncoded( $data ) {
# Hackish
?>
+<p><i>Please include all of the lines below when reporting installation problems.</i></p>
<h2>Checking environment...</h2>
<ul>
<?php
-
+$endl = "
+";
$conf = new ConfigData;
install_version_checks();
print "<li>PHP " . phpversion() . " ok</li>\n";
-/*
+$sapi = php_sapi_name();
+$conf->prettyURLs = true;
+print "<li>PHP server API is $sapi; ";
+switch( $sapi ) {
+case "apache":
+case "apache2handler":
+ print "ok, using pretty URLs (<tt>index.php/Page_Title</tt>)";
+ break;
+case "cgi":
+case "cgi-fcgi":
+case "apache2filter":
+ print "using ugly URLs (<tt>index.php?title=Page_Title</tt>)";
+ $conf->prettyURLs = false;
+ break;
+default:
+ print "unknown; using pretty URLs (<tt>index.php/Page_Title</tt>), if you have trouble change this in <tt>LocalSettings.php</tt>";
+}
+print "</li>\n";
+
$conf->zlib = function_exists( "gzencode" );
-$z = $conf->zlib ? "Have" : "No";
-print "<li>$z zlib support</li>\n";
-*/
+if( $conf->zlib ) {
+ print "<li>Have zlib support; enabling output compression.</li>\n";
+} else {
+ print "<li>No zlib support.</li>\n";
+}
+
+$conf->ImageMagick = false;
$conf->HaveGD = function_exists( "imagejpeg" );
if( $conf->HaveGD ) {
print "<li>Found GD graphics library built-in, image thumbnailing will be enabled if you enable uploads.</li>\n";
} else {
- print "<li>No built-in GD library, image thumbnailing disabled.</li>\n";
-}
-
-/*
-if( file_exists( "/usr/bin/convert" ) ) {
- $conf->ImageMagick = "/usr/bin/convert";
- print "<li>Found ImageMagick: /usr/bin/convert</li>\n";
-} elseif( file_exists( "/usr/local/bin/convert" ) ) {
- $conf->ImageMagick = "/usr/local/bin/convert";
- print "<li>Found ImageMagick: /usr/local/bin/convert</li>\n";
-} else {
- $conf->ImageMagick = false;
- print "<li>No ImageMagick.</li>\n";
+ $imcheck = array( "/usr/bin", "/usr/local/bin", "/sw/bin" );
+ foreach( $imcheck as $dir ) {
+ $im = "$dir/convert";
+ if( file_exists( $im ) ) {
+ print "<li>Found ImageMagick: <tt>$im</tt>; image thumbnailing will be enabled if you enable uploads.</li>\n";
+ $conf->ImageMagick = $im;
+ break;
+ }
+ }
+ if( !$conf->ImageMagick ) {
+ print "<li>Couldn't find GD library or ImageMagick; image thumbnailing disabled.</li>\n";
+ }
}
-*/
-$conf->UseImageResize = $conf->HaveGD;
+$conf->UseImageResize = $conf->HaveGD || $conf->ImageMagick;
# $conf->IP = "/Users/brion/Sites/inplace";
chdir( ".." );
$conf->IP = getcwd();
+$conf->IP = preg_replace( "/\\\\/","\\\\\\\\",$conf->IP ); // For Windows, \ -> \\
chdir( "config" );
print "<li>Installation directory: <tt>" . htmlspecialchars( $conf->IP ) . "</tt></li>\n";
$errs["SysopPass2"] = "Passwords don't match!";
}
+$conf->License = importPost( "License", "none" );
+if( $conf->License == "gfdl" ) {
+ $conf->RightsUrl = "http://www.gnu.org/copyleft/fdl.html";
+ $conf->RightsText = "GNU Free Documentation License 1.2";
+ $conf->RightsCode = "gfdl";
+ $conf->RightsIcon = "{$conf->ScriptPath}/stylesheets/images/gnu-fdl.png";
+} 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", "" );
+}
+
if( $conf->posted && ( 0 == count( $errs ) ) ) {
do { /* So we can 'continue' to end prematurely */
$conf->Root = ($conf->RootPW != "");
/* Load up the settings and get installin' */
$local = writeLocalSettings( $conf );
$wgCommandLineMode = false;
+ chdir( ".." );
eval($local);
-
$wgDBadminuser = $wgDBuser;
$wgDBadminpassword = $wgDBpassword;
$wgCommandLineMode = true;
$wgUseDatabaseMessages = false; /* FIXME: For database failure */
- include_once( "Setup.php" );
- include_once( "../maintenance/InitialiseMessages.inc" );
+ require_once( "includes/Setup.php" );
+ chdir( "config" );
+
+ require_once( "../maintenance/InitialiseMessages.inc" );
$wgTitle = Title::newFromText( "Installation script" );
-
- if( $conf->Root ) {
- $wgDatabase = Database::newFromParams( $wgDBserver, "root", $conf->RootPW, "", 1 );
- } else {
- $wgDatabase = Database::newFromParams( $wgDBserver, $wgDBuser, $wgDBpassword, "", 1 );
- }
+ $wgDatabase = Database::newFromParams( $wgDBserver, "root", $conf->RootPW, "", 1 );
$wgDatabase->mIgnoreErrors = true;
- if ( !$wgDatabase->isOpen() ) {
- $errs["DBserver"] = "Couldn't connect to database";
- continue;
- }
-
@$myver = mysql_get_server_info( $wgDatabase->mConn );
- if( !$myver ) {
+ if( $myver ) {
+ $conf->Root = true;
+ print "<li>Connected as root (automatic)</li>\n";
+ } else {
print "<li>MySQL error " . ($err = mysql_errno() ) .
": " . htmlspecialchars( mysql_error() );
$ok = false;
if( $conf->Root ) {
$errs["RootPW"] = "Check password";
} else {
- print "<li>Trying root...\n";
- /* Try a blank root password... */
- $wgDatabase = Database::newFromParams( $wgDBserver, "root", "", "", 1 );
+ print "<li>Trying regular user...\n";
+ /* Try the regular user... */
+ $wgDatabase = Database::newFromParams( $wgDBserver, $wgDBuser, $wgDBpassword, "", 1 );
$wgDatabase->isOpen();
$wgDatabase->mIgnoreErrors = true;
@$myver = mysql_get_server_info( $wgDatabase->mConn );
$errs["RootPW"] = "Got root?";
print " need password.</li>\n";
} else {
- $conf->Root = true;
+ $conf->Root = false;
$conf->RootPW = "";
print " ok.</li>\n";
# And keep going...
}
if( !$ok ) continue;
}
+
+ if ( !$wgDatabase->isOpen() ) {
+ $errs["DBserver"] = "Couldn't connect to database";
+ continue;
+ }
+
print "<li>Connected to database... $myver";
if( version_compare( $myver, "4.0.0" ) >= 0 ) {
print "; enabling MySQL 4 enhancements";
do_interwiki_update(); flush();
do_index_update(); flush();
do_linkscc_update(); flush();
+ do_linkscc_1_3_update(); flush();
do_hitcounter_update(); flush();
do_recentchanges_update(); flush();
+ convertLinks(); flush();
+ do_user_real_name_update(); flush();
+ do_querycache_update(); flush();
+ do_objectcache_update(); flush();
+ do_categorylinks_update(); flush();
+
+ if ( isTemplateInitialised() ) {
+ print "Template namespace already initialised\n";
+ } else {
+ moveCustomMessages( 1 ); flush();
+ moveCustomMessages( 2 ); flush();
+ moveCustomMessages( 3 ); flush();
+ }
+
initialiseMessages(); flush();
chdir( "config" );
$u->addToDatabase();
$u->setPassword( $conf->getSysopPass() );
$u->addRight( "sysop" );
- $u->addRight( "developer" ); /* ?? */
+ $u->addRight( "bureaucrat" );
$u->saveSettings();
print "<li>Created sysop account <tt>" .
htmlspecialchars( $conf->SysopName ) . "</tt>.</li>\n";
"uploadlogpage" => "uploadlogpagetext",
"dellogpage" => "dellogpagetext",
"protectlogpage" => "protectlogtext",
- "blocklogpage" => "bloglogtext"
+ "blocklogpage" => "blocklogtext"
);
$metaNamespace = Namespace::getWikipedia();
$now = wfTimestampNow();
$title = $titleobj->getDBkey();
$sql = "INSERT INTO cur (cur_namespace,cur_title,cur_text,cur_timestamp,inverse_timestamp,cur_touched) " .
"VALUES (0,'$title','" .
- wfStrencode( wfMsg( "mainpagetext" ) ) . "','$now','$won','$now')";
+ wfStrencode( wfMsg( "mainpagetext" ) . "\n\n" . wfMsg( "mainpagedocfooter" ) ) . "','$now','$won','$now')";
$wgDatabase->query( $sql, $fname );
- print "<li>";
+ print "<li><pre>";
initialiseMessages();
- print "</li>\n";
+ print "</pre></li>\n";
if( $conf->Root ) {
- # Grant user permissions
+ print "<li>Granting user permissions...</li>\n";
dbsource( "../maintenance/users.sql", $wgDatabase );
}
}
/* Write out the config file now that all is well */
print "<p>Creating LocalSettings.php...</p>\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...</p>\n" .
+ dieout( "<p>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...</p>\n" .
"<p>Here's the file that would have been written, try to paste it into place manually:</p>\n" .
"<pre>\n" . htmlspecialchars( $localSettings ) . "</pre>\n" );
}
</dt>
<dd>
- <label for="LanguageCode">Language</label>
+ <label class='column' for="LanguageCode">Language</label>
<select id="LanguageCode" name="LanguageCode">
<?php
$list = getLanguageList();
be used where not specified otherwise.
</dt>
+ <dd>
+ <label class='column'>Copyright/license metadata</label>
+ <div>Select one:</div>
+
+ <ul class="plain">
+ <li><?php aField( $conf, "License", "no license metadata", "radio", "none" ); ?></li>
+ <li><?php aField( $conf, "License", "GNU Free Documentation License 1.2 (Wikipedia-compatible)", "radio", "gfdl" ); ?></li>
+ <li><?php
+ aField( $conf, "License", "a Creative Commons license...", "radio", "cc" );
+ $partner = "MediaWiki";
+ $exit = urlencode( "$wgServer{$conf->ScriptPath}/config/index.php?License=cc&RightsUrl=[license_url]&RightsText=[license_name]&RightsCode=[license_code]&RightsIcon=[license_button]" );
+ $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>
+ </ul>
+ </dd>
+ <dt>
+ MediaWiki can include a basic license notice, icon, and machine-reable
+ copyright metadata if your wiki's content is to be licensed under
+ the GNU FDL or a Creative Commons license. If you're not sure, leave
+ it at "none".
+ </dt>
+
+
<dd>
<?php aField( $conf, "SysopName", "Sysop account name:", "" ) ?>
</dd>
</dt>
<dd>
- <label> </label>
+ <label class='column'> </label>
<input type="submit" value="Install!" />
</dd>
</dl>
}
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";
}
+ $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( "addslashes", 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}\";
+\$IP = \"{$slconf['IP']}\";
ini_set( \"include_path\", \"\$IP/includes$sep\$IP/languages$sep\" . ini_get(\"include_path\") );
include_once( \"DefaultSettings.php\" );
-if( \$wgCommandLineMode ) {
- die( \"Can't use command-line utils with in-place install yet, sorry.\" );
+if ( \$wgCommandLineMode ) {
+ if ( isset( \$_SERVER ) && array_key_exists( 'REQUEST_METHOD', \$_SERVER ) ) {
+ die( \"This script must be run from the command line\\n\" );
+ }
+} else {
+ ## 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/\$1\";
+## 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};
## 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']}\";
+" . ($conf->Encoding ? "\$wgInputEncoding = \$wgOutputEncoding = \"{$slconf['Encoding']}\";" : "" ) . "
+\$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
";
}
function importPost( $name, $default = "" ) {
if( isset( $_POST[$name] ) ) {
- return $_POST[$name];
+ $retval = $_POST[$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<label for=\"$field\">$text</label>\n";
- echo "\t\t<input $type name=\"$field\" id=\"$field\" value=\"";
- echo htmlspecialchars( $conf->$field );
+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<label>";
+ } else {
+ echo "\t\t<label class='column' for=\"$id\">$text</label>\n";
+ }
+
+ if( $type == "radio" && $value == $conf->$field ) {
+ $checked = "checked='checked'";
+ } else {
+ $checked = "";
+ }
+ echo "\t\t<input $xtype name=\"$field\" id=\"$id\" $checked value=\"";
+ if( $type == "radio" ) {
+ echo htmlspecialchars( $value );
+ } else {
+ echo htmlspecialchars( $conf->$field );
+ }
echo "\" />\n";
+ if( $nolabel ) {
+ echo " $text</label>\n";
+ }
global $errs;
if(isset($errs[$field])) echo "<span class='error'>" . $errs[$field] . "</span>\n";
$wgLanguageCode = "xxx";
function wfLocalUrl( $x ) { return $x; }
function wfLocalUrlE( $x ) { return $x; }
- include( "../languages/Language.php" );
+ require( "../languages/Language.php" );
}
$codes = array();
- $latin1 = array( "da", "de", "en", "es", "fr", "nl", "sv" );
+ $latin1 = array( "da", "de", "en", "es", "nl", "sv" );
$d = opendir( "../languages" );
while( false !== ($f = readdir( $d ) ) ) {
?>
</body>
-</html>
\ No newline at end of file
+</html>
dépôts / lhc / web / wiklou.git / blobdiff