dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2f49de9)
Further cleanup of index.php
authorMagnus Manske <magnusmanske@users.mediawiki.org>
Fri, 13 Jan 2006 12:10:59 +0000 (12:10 +0000)
committerMagnus Manske <magnusmanske@users.mediawiki.org>
Fri, 13 Jan 2006 12:10:59 +0000 (12:10 +0000)
includes/Wiki.php patch | blob | history
index.php patch | blob | history
setup_message.html [new file with mode: 0644] patch | blob

diff --git a/includes/Wiki.php b/includes/Wiki.php
index 996a5cf..3551d48 100644 (file)
--- 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 <tt>config/LocalSettings.php</tt> to the parent directory.";
+               } else {
+                       $msg = "Please <a href='config/index.php' title='setup'>setup the wiki</a> 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 2a36bca..97b2bf8 100644 (file)
--- 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
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-       <head>
-               <title>MediaWiki <?php echo $wgVersion ?></title>
-               <meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
-               <style type='text/css' media='screen, projection'>
-                       html, body {
-                               color: #000;
-                               background-color: #fff;
-                               font-family: sans-serif;
-                               text-align: center;
-                       }
-
-                       h1 {
-                               font-size: 150%;
-                       }
-               </style>
-       </head>
-       <body>
-               <img src='skins/common/images/mediawiki.png' alt='The MediaWiki logo' />
-
-               <h1>MediaWiki <?php echo $wgVersion ?></h1>
-               <div class='error'>
-               <?php
-               if ( file_exists( 'config/LocalSettings.php' ) ) {
-                       echo( "To complete the installation, move <tt>config/LocalSettings.php</tt> to the parent directory." );
-               } else {
-                       echo( "Please <a href='config/index.php' title='setup'>setup the wiki</a> first." );
-               }
-               ?>
-
-               </div>
-       </body>
-</html>
-<?php
-       die();
-}
-
-require_once( './LocalSettings.php' );
-require_once( 'includes/Setup.php' );
+@include_once( './LocalSettings.php' ); # Will die later if not included anyway
 
 
 # Initialize MediaWiki base class
 require_once( "includes/Wiki.php" );
 $mediaWiki = new MediaWiki();
 
-wfProfileIn( 'main-misc-setup' );
+
+$mediaWiki->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 (file)
index 0000000..a672e58
--- /dev/null
+++ b/setup_message.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
+       <head>
+               <title>MediaWiki $1</title>
+               <meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
+               <style type='text/css' media='screen, projection'>
+                       html, body {
+                               color: #000;
+                               background-color: #fff;
+                               font-family: sans-serif;
+                               text-align: center;
+                       }
+
+                       h1 {
+                               font-size: 150%;
+                       }
+               </style>
+       </head>
+       <body>
+               <img src='skins/common/images/mediawiki.png' alt='The MediaWiki logo' />
+
+               <h1>MediaWiki $1</h1>
+               <div class='error'>
+               $2
+               </div>
+       </body>
+</html>
Wiklou, le Wiki du Wiklou