(bug 28868) Include the number of pages in the default getLongDesc for multipaged...

[lhc/web/wiklou.git] / includes / installer / CliInstaller.php

diff --git a/includes/installer/CliInstaller.php b/includes/installer/CliInstaller.php
index 5319b0f..66e779e 100644 (file)
--- a/includes/installer/CliInstaller.php
+++ b/includes/installer/CliInstaller.php
@@ -1,10 +1,19 @@
 <?php
+/**
+ * Core installer command line interface.
+ *
+ * @file
+ * @ingroup Deployment
+ */
 
+/**
+ * Class for the core installer command line interface.
+ *
+ * @ingroup Deployment
+ * @since 1.17
+ */
 class CliInstaller extends Installer {
 
-       /* The maintenance class in effect */
-       private $maint;
-
        private $optionMap = array(
                'dbtype' => 'wgDBtype',
                'dbserver' => 'wgDBserver',
@@ -20,12 +29,20 @@ class CliInstaller extends Installer {
                'dbuser' => 'wgDBuser',
                'dbpass' => 'wgDBpassword',
                'dbschema' => 'wgDBmwschema',
-               'dbts2schema' => 'wgDBts2schema',
                'dbpath' => 'wgSQLiteDataDir',
+               'scriptpath' => 'wgScriptPath',
        );
 
-       /** Constructor */
-       function __construct( $siteName, $admin = null, $option = array() ) {
+       /**
+        * Constructor.
+        *
+        * @param $siteName
+        * @param $admin
+        * @param $option Array
+        */
+       function __construct( $siteName, $admin = null, array $option = array() ) {
+               global $wgContLang;
+
                parent::__construct();
 
                foreach ( $this->optionMap as $opt => $global ) {
@@ -36,7 +53,7 @@ class CliInstaller extends Installer {
                }
 
                if ( isset( $option['lang'] ) ) {
-                       global $wgLang, $wgContLang, $wgLanguageCode;
+                       global $wgLang, $wgLanguageCode;
                        $this->setVar( '_UserLang', $option['lang'] );
                        $wgContLang = Language::factory( $option['lang'] );
                        $wgLang = Language::factory( $option['lang'] );
@@ -44,6 +61,13 @@ class CliInstaller extends Installer {
                }
 
                $this->setVar( 'wgSitename', $siteName );
+
+               $metaNS = $wgContLang->ucfirst( str_replace( ' ', '_', $siteName ) );
+               if ( $metaNS == 'MediaWiki' ) {
+                       $metaNS = 'Project';
+               }
+               $this->setVar( 'wgMetaNamespace', $metaNS );
+
                if ( $admin ) {
                        $this->setVar( '_AdminName', $admin );
                }
@@ -64,39 +88,81 @@ class CliInstaller extends Installer {
         * Main entry point.
         */
        public function execute() {
+               $vars = $this->getExistingLocalSettings();
+               if( $vars ) {
+                       $this->showStatusMessage(
+                               Status::newFatal( "config-localsettings-cli-upgrade" )
+                       );
+               }
+
                $this->performInstallation(
-                       array( $this, 'startStage'),
+                       array( $this, 'startStage' ),
                        array( $this, 'endStage' )
                );
        }
 
+       /**
+        * Write LocalSettings.php to a given path
+        *
+        * @param $path String Full path to write LocalSettings.php to
+        */
+       public function writeConfigurationFile( $path ) {
+               $ls = new LocalSettingsGenerator( $this );
+               $ls->writeFile( "$path/LocalSettings.php" );
+       }
+
        public function startStage( $step ) {
-               $this->showMessage( wfMsg( "config-install-$step") .
-                       wfMsg( 'ellipsis' ) . wfMsg( 'word-separator' ) );
+               $this->showMessage( "config-install-$step" );
        }
 
        public function endStage( $step, $status ) {
-               $warnings = $status->getWarningsArray();
-               if ( !$status->isOk() ) {
-                       $this->showStatusMessage( $status );
-                       echo "\n";
-                       exit;
-               } elseif ( count($warnings) !== 0 ) {
-                       foreach ( $status->getWikiTextArray( $warnings ) as $w ) {
-                               $this->showMessage( $w . wfMsg( 'ellipsis') .
-                                       wfMsg( 'word-separator' ) );
-                       }
-               }
-               $this->showMessage( wfMsg( 'config-install-step-done' ) ."\n");
+               $this->showStatusMessage( $status );
+               $this->showMessage( 'config-install-step-done' );
        }
 
        public function showMessage( $msg /*, ... */ ) {
-               echo html_entity_decode( strip_tags( $msg ), ENT_QUOTES );
+               echo $this->getMessageText( func_get_args() ) . "\n";
+               flush();
+       }
+
+       public function showError( $msg /*, ... */ ) {
+               echo "***{$this->getMessageText( func_get_args() )}***\n";
                flush();
        }
 
-       public function showStatusMessage( $status ) {
-               $this->showMessage( $status->getWikiText() );
+       /**
+        * @param $params array
+        *
+        * @return string
+        */
+       protected function getMessageText( $params ) {
+               $msg = array_shift( $params );
+
+               $text = wfMsgExt( $msg, array( 'parseinline' ), $params );
+
+               $text = preg_replace( '/<a href="(.*?)".*?>(.*?)<\/a>/', '$2 &lt;$1&gt;', $text );
+               return html_entity_decode( strip_tags( $text ), ENT_QUOTES );
+       }
+
+       /**
+        * Dummy
+        */
+       public function showHelpBox( $msg /*, ... */ ) {
        }
 
-}
\ No newline at end of file
+       public function showStatusMessage( Status $status ) {
+               $warnings = array_merge( $status->getWarningsArray(),
+                       $status->getErrorsArray() );
+
+               if ( count( $warnings ) !== 0 ) {
+                       foreach ( $warnings as $w ) {
+                               call_user_func_array( array( $this, 'showMessage' ), $w );
+                       }
+               }
+
+               if ( !$status->isOk() ) {
+                       echo "\n";
+                       exit;
+               }
+       }
+}