X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2Finstall.php;h=0b1ab5a9e88ac83f15e771667879c350b8af20a2;hb=ab2d63b53ed29c44e4917125555af3dc2eb9964e;hp=242358beba4ce19b879cab3c24604211679e8243;hpb=15abcf71ca7ec185b475e47ef0fe43884e764239;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/install.php b/maintenance/install.php
index 242358beba..20d6ad5a8b 100644
--- a/maintenance/install.php
+++ b/maintenance/install.php
@@ -22,14 +22,14 @@
  */
 
 if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), '5.3.2' ) < 0 ) ) {
-	require_once( dirname( __FILE__ ) . '/../includes/PHPVersionError.php' );
+	require_once dirname( __FILE__ ) . '/../includes/PHPVersionError.php';
 	wfPHPVersionError( 'cli' );
 }
 
 define( 'MW_CONFIG_CALLBACK', 'Installer::overrideConfig' );
 define( 'MEDIAWIKI_INSTALL', true );
 
-require_once( dirname( __DIR__ ) . "/maintenance/Maintenance.php" );
+require_once dirname( __DIR__ ) . "/maintenance/Maintenance.php";
 
 /**
  * Maintenance script to install and configure MediaWiki
@@ -41,13 +41,23 @@ class CommandLineInstaller extends Maintenance {
 		parent::__construct();
 		global $IP;
 
-		$this->addArg( 'name', 'The name of the wiki', true);
+		$this->addArg( 'name', 'The name of the wiki', true );
 
 		$this->addArg( 'admin', 'The username of the wiki administrator (WikiSysop)', true );
 		$this->addOption( 'pass', 'The password for the wiki administrator.', false, true );
-		$this->addOption( 'passfile', 'An alternative way to provide pass option, as the contents of this file', false, true );
+		$this->addOption(
+			'passfile',
+			'An alternative way to provide pass option, as the contents of this file',
+			false,
+			true
+		);
 		/* $this->addOption( 'email', 'The email for the wiki administrator', false, true ); */
-		$this->addOption( 'scriptpath', 'The relative path of the wiki in the web server (/wiki)', false, true );
+		$this->addOption(
+			'scriptpath',
+			'The relative path of the wiki in the web server (/wiki)',
+			false,
+			true
+		);
 
 		$this->addOption( 'lang', 'The language to use (en)', false, true );
 		/* $this->addOption( 'cont-lang', 'The content language (en)', false, true ); */
@@ -62,23 +72,32 @@ class CommandLineInstaller extends Maintenance {
 		$this->addOption( 'installdbpass', 'The pasword for the DB user to install as.', false, true );
 		$this->addOption( 'dbuser', 'The user to use for normal operations (wikiuser)', false, true );
 		$this->addOption( 'dbpass', 'The pasword for the DB user for normal operations', false, true );
-		$this->addOption( 'dbpassfile', 'An alternative way to provide dbpass option, as the contents of this file', false, true );
+		$this->addOption(
+			'dbpassfile',
+			'An alternative way to provide dbpass option, as the contents of this file',
+			false,
+			true
+		);
 		$this->addOption( 'confpath', "Path to write LocalSettings.php to, default $IP", false, true );
-		/* $this->addOption( 'dbschema', 'The schema for the MediaWiki DB in pg (mediawiki)', false, true ); */
-		/* $this->addOption( 'namespace', 'The project namespace (same as the name)', false, true ); */
+		/*
+		$this->addOption( 'dbschema', 'The schema for the MediaWiki DB in pg (mediawiki)', false, true );
+		$this->addOption( 'namespace', 'The project namespace (same as the name)', false, true );
+		*/
 		$this->addOption( 'env-checks', "Run environment checks only, don't change anything" );
 	}
 
 	function execute() {
-		global $IP, $wgTitle;
-		$siteName = isset( $this->mArgs[0] ) ? $this->mArgs[0] : "Don't care"; // Will not be set if used with --env-checks
+		global $IP;
+
+		// Will not be set if used with --env-checks
+		$siteName = isset( $this->mArgs[0] ) ? $this->mArgs[0] : "Don't care";
 		$adminName = isset( $this->mArgs[1] ) ? $this->mArgs[1] : null;
-		$wgTitle = Title::newFromText( 'Installer script' );
 
 		$dbpassfile = $this->getOption( 'dbpassfile', false );
 		if ( $dbpassfile !== false ) {
 			if ( $this->getOption( 'dbpass', false ) !== false ) {
-				$this->error( 'WARNING: You provide the options "dbpass" and "dbpassfile". The content of "dbpassfile" overwrites "dbpass".' );
+				$this->error( 'WARNING: You provide the options "dbpass" and "dbpassfile". '
+					. 'The content of "dbpassfile" overwrites "dbpass".' );
 			}
 			wfSuppressWarnings();
 			$dbpass = file_get_contents( $dbpassfile );
@@ -92,7 +111,8 @@ class CommandLineInstaller extends Maintenance {
 		$passfile = $this->getOption( 'passfile', false );
 		if ( $passfile !== false ) {
 			if ( $this->getOption( 'pass', false ) !== false ) {
-				$this->error( 'WARNING: You provide the options "pass" and "passfile". The content of "passfile" overwrites "pass".' );
+				$this->error( 'WARNING: You provide the options "pass" and "passfile". '
+					. 'The content of "passfile" overwrites "pass".' );
 			}
 			wfSuppressWarnings();
 			$pass = file_get_contents( $passfile );
@@ -109,13 +129,14 @@ class CommandLineInstaller extends Maintenance {
 			InstallerOverrides::getCliInstaller( $siteName, $adminName, $this->mOptions );
 
 		$status = $installer->doEnvironmentChecks();
-		if( $status->isGood() ) {
+		if ( $status->isGood() ) {
 			$installer->showMessage( 'config-env-good' );
 		} else {
 			$installer->showStatusMessage( $status );
+
 			return;
 		}
-		if( !$this->hasOption( 'env-checks' ) ) {
+		if ( !$this->hasOption( 'env-checks' ) ) {
 			$installer->execute();
 			$installer->writeConfigurationFile( $this->getOption( 'confpath', $IP ) );
 		}
@@ -130,4 +151,4 @@ class CommandLineInstaller extends Maintenance {
 
 $maintClass = "CommandLineInstaller";
 
-require_once( RUN_MAINTENANCE_IF_MAIN );
+require_once RUN_MAINTENANCE_IF_MAIN;