From 020236a408cb22b1b007d4e83cd53e6c7fbcdc3c Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 14 Apr 2004 06:15:46 +0000 Subject: [PATCH] License selector for installation, to activate the metadata & footer info. Can select no metadata, GNU FDL, or Creative Commons, which sends off to the CC remote license engine to pick one. Not fully tested. CC is returning the wrong icon URL except for public domain right now. Going out to CC and back loses all other options from the form. --- config/index.php | 118 +++++++++++++++++++++++++++++++++++++-------- includes/Setup.php | 2 +- 2 files changed, 100 insertions(+), 20 deletions(-) diff --git a/config/index.php b/config/index.php index bd8e62936e..fbc3cba981 100644 --- a/config/index.php +++ b/config/index.php @@ -42,7 +42,7 @@ header( "Content-type: text/html; charset=utf-8" ); dl.setup dd { margin-left: 0; } - dl.setup dd label { + dl.setup dd label.column { clear: left; font-weight: bold; width: 12em; @@ -60,6 +60,11 @@ header( "Content-type: text/html; charset=utf-8" ); .error { color: red; } + ul.plain { + list-style: none; + clear: both; + margin-left: 12em; + } @@ -266,6 +271,21 @@ if( $conf->SysopPass != $conf->SysopPass2 ) { $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}/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 != ""); @@ -451,7 +471,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) { $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" ); } @@ -508,7 +528,7 @@ if( count( $errs ) ) {
- +
@@ -621,7 +670,9 @@ function writeLocalSettings( $conf ) { $convert = ($conf->ImageMagick ? $conf->ImageMagick : "/usr/bin/convert" ); $pretty = ($conf->prettyURLs ? "" : "# "); $ugly = ($conf->prettyURLs ? "# " : ""); - $proxyKey = Parser::getRandomString() . Parser::getRandomString(); + $rights = ($conf->RightsUrl) ? "" : "# "; + +# $proxyKey = Parser::getRandomString() . Parser::getRandomString(); $sep = (DIRECTORY_SEPARATOR == "\\") ? ";" : ":"; return " @@ -693,22 +744,27 @@ if ( \$wgCommandLineMode ) { \$wgMathDirectory = \"{\$wgUploadDirectory}/math\"; \$wgTmpDirectory = \"{\$wgUploadDirectory}/tmp\"; -## Experimental layout template subsystems -\$wgUsePHPTal = false; -\$wgUseSmarty = false; +\$wgUsePHPTal = true; if ( \$wgUsePHPTal ) { ini_set( \"include_path\", \"\$IP/PHPTAL-NP-0.7.0/libs$sep\" . ini_get(\"include_path\") ); } -if ( \$wgUseSmarty ) { - ini_set( \"include_path\", \"\$IP/Smarty-2.6.2/libs$sep\" . ini_get(\"include_path\") ); -} \$wgLocalInterwiki = \$wgSitename; \$wgLanguageCode = \"{$conf->LanguageCode}\"; " . ($conf->Encoding ? "\$wgInputEncoding = \$wgOutputEncoding = \"{$conf->Encoding}\";" : "" ) . " -\$wgProxyKey = $proxyKey; +#\$wgProxyKey = $proxyKey; + +## 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 "; } @@ -717,19 +773,43 @@ function dieout( $text ) { } function importPost( $name, $default = "" ) { - if( isset( $_POST[$name] ) ) { - return $_POST[$name]; + if( isset( $_REQUEST[$name] ) ) { + return $_REQUEST[$name]; } else { return $default; } } -function aField( &$conf, $field, $text, $type = "" ) { - if( $type != "" ) $type = "type=\"$type\""; - echo "\t\t\n"; - echo "\t\t$field ); +function aField( &$conf, $field, $text, $type = "", $value = "" ) { + if( $type != "" ) { + $xtype = "type=\"$type\""; + } else { + $xtype = ""; + } + + if( $id == "" ) $id = $field; + $nolabel = ($type == "radio") || ($type == "hidden"); + if( $nolabel ) { + echo "\t\t\n"; + } global $errs; if(isset($errs[$field])) echo "" . $errs[$field] . "\n"; diff --git a/includes/Setup.php b/includes/Setup.php index f20722de01..df37cd7a40 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -72,7 +72,7 @@ global $wgBlockCache, $wgParserCache, $wgParser; # Useful debug output if ( $wgCommandLineMode ) { - wfDebug( '"' . implode( '" "', $argv ) . '"' ); + # wfDebug( '"' . implode( '" "', $argv ) . '"' ); } elseif ( function_exists( "getallheaders" ) ) { wfDebug( "\nStart request\n" ); wfDebug( $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI'] . "\n" ); -- 2.20.1