From: Magnus Manske Date: Fri, 13 Jan 2006 12:10:59 +0000 (+0000) Subject: Further cleanup of index.php X-Git-Tag: 1.6.0~575 X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=3ccace42c0b0900ae720ad5a73d0512e2131c3ff;p=lhc%2Fweb%2Fwiklou.git Further cleanup of index.php --- diff --git a/includes/Wiki.php b/includes/Wiki.php index 996a5cf832..3551d487e3 100644 --- a/includes/Wiki.php +++ b/includes/Wiki.php @@ -36,6 +36,30 @@ class MediaWiki { return $default; } + /** + * Checks if the wiki is set up at all, or configured but not activated + */ + function checkSetup() { + if ( file_exists( './LocalSettings.php' ) ) { + /* LocalSettings exists, commerce normally */ + return; + } + + /* LocalSettings is not in the right place, do something */ + $IP = "."; + require_once( 'includes/DefaultSettings.php' ); # used for printing the version + $out = file_get_contents( "./setup_message.html" ); + $out = str_replace( "$1", $wgVersion, $out ); + if ( file_exists( 'config/LocalSettings.php' ) ) { + $msg = "To complete the installation, move config/LocalSettings.php to the parent directory."; + } else { + $msg = "Please setup the wiki first."; + } + $out = str_replace( "$2", $msg, $out ); + echo $out ; + die(); + } + /** * Initialization of ... everything @return Article either the object to become $wgArticle, or NULL @@ -63,6 +87,7 @@ class MediaWiki { * Note that $title here is *not* a Title object, but a string! */ function checkInitialQueries( $title,$action,&$output,$request, $lang) { + wfProfileIn( 'MediaWiki::checkInitialQueries' ); if ($request->getVal( 'printable' ) == 'yes') { $output->setPrintable(); } @@ -84,6 +109,7 @@ class MediaWiki { $lang->findVariantLink( $title, $ret ); } + wfProfileOut( 'MediaWiki::checkInitialQueries' ); return $ret ; } diff --git a/index.php b/index.php index 2a36bcaaea..97b2bf80bf 100644 --- a/index.php +++ b/index.php @@ -25,58 +25,17 @@ if ( isset( $_REQUEST['GLOBALS'] ) ) { # it becomes an entry point, thereby defeating its purpose. define( 'MEDIAWIKI', true ); require_once( './includes/Defines.php' ); - -if( !file_exists( 'LocalSettings.php' ) ) { - $IP = "."; - require_once( 'includes/DefaultSettings.php' ); # used for printing the version -?> - - - - MediaWiki <?php echo $wgVersion ?> - - - - - The MediaWiki logo

- -

MediaWiki

- config/LocalSettings.php to the parent directory." ); - } else { - echo( "Please setup the wiki first." ); - } - ?> - -

- - -checkSetup(); +require_once( 'includes/Setup.php' ); # This can't be done in mdiaWiki.php for some weird reason + OutputPage::setEncodings(); # Not really used yet # Query string fields @@ -84,12 +43,12 @@ $action = $wgRequest->getVal( 'action', 'view' ); $title = $wgRequest->getVal( 'title' ); $wgTitle = $mediaWiki->checkInitialQueries( $title,$action,$wgOut, $wgRequest, $wgContLang ); + +# Is this necessary? Who knows... if ($wgTitle == NULL) { unset( $wgTitle ); } -wfProfileOut( 'main-misc-setup' ); - # Setting global variables in mediaWiki $mediaWiki->setVal( "Server", $wgServer ); $mediaWiki->setVal( "DisableInternalSearch", $wgDisableInternalSearch ); diff --git a/setup_message.html b/setup_message.html new file mode 100644 index 0000000000..a672e58d48 --- /dev/null +++ b/setup_message.html @@ -0,0 +1,27 @@ + + + + MediaWiki $1 + + + + + The MediaWiki logo

+ +

MediaWiki $1

+ $2 +

+ +