| Index: trunk/phase3/includes/installer/Installer.php |
| — | — | @@ -388,16 +388,13 @@ |
| 389 | 389 | return false; |
| 390 | 390 | } |
| 391 | 391 | |
| 392 | | - $this->showMessage( 'config-have-db', $wgLang->listToText( $goodNames ), count( $goodNames ) ); |
| 393 | | - |
| 394 | 392 | // Check for FTS3 full-text search module |
| 395 | 393 | $sqlite = $this->getDBInstaller( 'sqlite' ); |
| 396 | 394 | if ( $sqlite->isCompiled() ) { |
| 397 | 395 | $db = new DatabaseSqliteStandalone( ':memory:' ); |
| 398 | | - $this->showMessage( $db->getFulltextSearchModule() == 'FTS3' |
| 399 | | - ? 'config-have-fts3' |
| 400 | | - : 'config-no-fts3' |
| 401 | | - ); |
| | 396 | + if( $db->getFulltextSearchModule() == 'FTS3' ) { |
| | 397 | + $this->showMessage( 'config-no-fts3' ); |
| | 398 | + } |
| 402 | 399 | } |
| 403 | 400 | } |
| 404 | 401 | |
| — | — | @@ -492,7 +489,6 @@ |
| 493 | 490 | $this->showMessage( 'config-xml-bad' ); |
| 494 | 491 | return false; |
| 495 | 492 | } |
| 496 | | - $this->showMessage( 'config-xml-good' ); |
| 497 | 493 | } |
| 498 | 494 | |
| 499 | 495 | /** |
| — | — | @@ -519,7 +515,6 @@ |
| 520 | 516 | $limit = ini_get( 'memory_limit' ); |
| 521 | 517 | |
| 522 | 518 | if ( !$limit || $limit == -1 ) { |
| 523 | | - $this->showMessage( 'config-memory-none' ); |
| 524 | 519 | return true; |
| 525 | 520 | } |
| 526 | 521 | |
| — | — | @@ -539,7 +534,7 @@ |
| 540 | 535 | $this->setVar( '_RaiseMemory', true ); |
| 541 | 536 | } |
| 542 | 537 | } else { |
| 543 | | - $this->showMessage( 'config-memory-ok', $limit ); |
| | 538 | + return true; |
| 544 | 539 | } |
| 545 | 540 | } |
| 546 | 541 | |
| — | — | @@ -547,12 +542,10 @@ |
| 548 | 543 | * Environment check for compiled object cache types. |
| 549 | 544 | */ |
| 550 | 545 | protected function envCheckCache() { |
| 551 | | - $caches = array(); |
| 552 | | - |
| | 546 | + $caches = false; |
| 553 | 547 | foreach ( $this->objectCaches as $name => $function ) { |
| 554 | 548 | if ( function_exists( $function ) ) { |
| 555 | 549 | $caches[$name] = true; |
| 556 | | - $this->showMessage( 'config-' . $name ); |
| 557 | 550 | } |
| 558 | 551 | } |
| 559 | 552 | |
| — | — | @@ -573,7 +566,6 @@ |
| 574 | 567 | $diff3 = $this->locateExecutableInDefaultPaths( $names, $versionInfo ); |
| 575 | 568 | |
| 576 | 569 | if ( $diff3 ) { |
| 577 | | - $this->showMessage( 'config-diff3-good', $diff3 ); |
| 578 | 570 | $this->setVar( 'wgDiff3', $diff3 ); |
| 579 | 571 | } else { |
| 580 | 572 | $this->setVar( 'wgDiff3', false ); |
| — | — | @@ -608,7 +600,6 @@ |
| 609 | 601 | $IP = dirname( dirname( dirname( __FILE__ ) ) ); |
| 610 | 602 | |
| 611 | 603 | $this->setVar( 'IP', $IP ); |
| 612 | | - $this->showMessage( 'config-dir', $IP ); |
| 613 | 604 | |
| 614 | 605 | // PHP_SELF isn't available sometimes, such as when PHP is CGI but |
| 615 | 606 | // cgi.fix_pathinfo is disabled. In that case, fall back to SCRIPT_NAME |
| — | — | @@ -627,7 +618,6 @@ |
| 628 | 619 | |
| 629 | 620 | $uri = preg_replace( '{^(.*)/config.*$}', '$1', $path ); |
| 630 | 621 | $this->setVar( 'wgScriptPath', $uri ); |
| 631 | | - $this->showMessage( 'config-uri', $uri ); |
| 632 | 622 | } |
| 633 | 623 | |
| 634 | 624 | /** |
| — | — | @@ -640,9 +630,7 @@ |
| 641 | 631 | } else { |
| 642 | 632 | $ext = 'php'; |
| 643 | 633 | } |
| 644 | | - |
| 645 | 634 | $this->setVar( 'wgScriptExtension', ".$ext" ); |
| 646 | | - $this->showMessage( 'config-file-extension', $ext ); |
| 647 | 635 | } |
| 648 | 636 | |
| 649 | 637 | /** |
| — | — | @@ -686,7 +674,6 @@ |
| 687 | 675 | # Try the current value of LANG. |
| 688 | 676 | if ( isset( $candidatesByLocale[ getenv( 'LANG' ) ] ) ) { |
| 689 | 677 | $this->setVar( 'wgShellLocale', getenv( 'LANG' ) ); |
| 690 | | - $this->showMessage( 'config-shell-locale', getenv( 'LANG' ) ); |
| 691 | 678 | return true; |
| 692 | 679 | } |
| 693 | 680 | |
| — | — | @@ -695,7 +682,6 @@ |
| 696 | 683 | foreach ( $commonLocales as $commonLocale ) { |
| 697 | 684 | if ( isset( $candidatesByLocale[$commonLocale] ) ) { |
| 698 | 685 | $this->setVar( 'wgShellLocale', $commonLocale ); |
| 699 | | - $this->showMessage( 'config-shell-locale', $commonLocale ); |
| 700 | 686 | return true; |
| 701 | 687 | } |
| 702 | 688 | } |
| — | — | @@ -706,7 +692,6 @@ |
| 707 | 693 | if ( isset( $candidatesByLang[$wikiLang] ) ) { |
| 708 | 694 | $m = reset( $candidatesByLang[$wikiLang] ); |
| 709 | 695 | $this->setVar( 'wgShellLocale', $m[0] ); |
| 710 | | - $this->showMessage( 'config-shell-locale', $m[0] ); |
| 711 | 696 | return true; |
| 712 | 697 | } |
| 713 | 698 | |
| — | — | @@ -714,7 +699,6 @@ |
| 715 | 700 | if ( count( $candidatesByLocale ) ) { |
| 716 | 701 | $m = reset( $candidatesByLocale ); |
| 717 | 702 | $this->setVar( 'wgShellLocale', $m[0] ); |
| 718 | | - $this->showMessage( 'config-shell-locale', $m[0] ); |
| 719 | 703 | return true; |
| 720 | 704 | } |
| 721 | 705 | |
| — | — | @@ -733,7 +717,7 @@ |
| 734 | 718 | $safe = !$this->dirIsExecutable( $dir, $url ); |
| 735 | 719 | |
| 736 | 720 | if ( $safe ) { |
| 737 | | - $this->showMessage( 'config-uploads-safe' ); |
| | 721 | + return true; |
| 738 | 722 | } else { |
| 739 | 723 | $this->showMessage( 'config-uploads-not-safe', $dir ); |
| 740 | 724 | } |
| Index: trunk/phase3/includes/installer/Installer.i18n.php |
| — | — | @@ -89,8 +89,6 @@ |
| 90 | 90 | If you are on shared hosting, ask your hosting provider to install a suitable database driver. |
| 91 | 91 | If you compiled PHP yourself, reconfigure it with a database client enabled, for example using <code>./configure --with-mysql</code>. |
| 92 | 92 | If you installed PHP from a Debian or Ubuntu package, then you also need install the php5-mysql module.', |
| 93 | | - 'config-have-db' => 'Found database {{PLURAL:$2|driver|drivers}}: $1.', |
| 94 | | - 'config-have-fts3' => 'SQLite is compiled with the [http://sqlite.org/fts3.html FTS3 module], search features will be available on this backend.', |
| 95 | 93 | 'config-no-fts3' => "'''Warning''': SQLite is compiled without the [http://sqlite.org/fts3.html FTS3 module], search features will be unavailable on this backend.", |
| 96 | 94 | 'config-register-globals' => "'''Warning: PHP's <code>[http://php.net/register_globals register_globals]</code> option is enabled.''' |
| 97 | 95 | '''Disable it if you can.''' |
| — | — | @@ -109,7 +107,6 @@ |
| 110 | 108 | You cannot install or use MediaWiki unless this option is disabled.", |
| 111 | 109 | 'config-safe-mode' => "'''Warning:''' PHP's [http://www.php.net/features.safe-mode safe mode] is active. |
| 112 | 110 | It may cause problems, particularly if using file uploads and <code>math</code> support.", |
| 113 | | - 'config-xml-good' => 'Have XML / Latin1-UTF-8 conversion support.', |
| 114 | 111 | 'config-xml-bad' => "PHP's XML module is missing. |
| 115 | 112 | MediaWiki requires functions in this module and will not work in this configuration. |
| 116 | 113 | If you're running Mandrake, install the php-xml package.", |
| — | — | @@ -117,9 +114,6 @@ |
| 118 | 115 | MediaWiki requires the Perl-compatible regular expression functions to work.', |
| 119 | 116 | 'config-pcre-no-utf8' => "'''Fatal''': PHP's PCRE module seems to be compiled without PCRE_UTF8 support. |
| 120 | 117 | MediaWiki requires UTF-8 support to function correctly.", |
| 121 | | - 'config-memory-none' => 'PHP is configured with no <code>memory_limit</code>', |
| 122 | | - 'config-memory-ok' => "PHP's <code>memory_limit</code> is $1. |
| 123 | | -OK.", |
| 124 | 118 | 'config-memory-raised' => "PHP's <code>memory_limit</code> is $1, raised to $2.", |
| 125 | 119 | 'config-memory-bad' => "'''Warning:''' PHP's <code>memory_limit</code> is $1. |
| 126 | 120 | This is probably too low. |
| — | — | @@ -130,7 +124,6 @@ |
| 131 | 125 | 'config-wincache' => '[http://www.iis.net/download/WinCacheForPhp WinCache] is installed', |
| 132 | 126 | 'config-no-cache' => "'''Warning:''' Could not find [http://eaccelerator.sourceforge.net eAccelerator], [http://www.php.net/apc APC], [http://trac.lighttpd.net/xcache/ XCache] or [http://www.iis.net/download/WinCacheForPhp WinCache]. |
| 133 | 127 | Object caching is not enabled.", |
| 134 | | - 'config-diff3-good' => 'Found GNU diff3: <code>$1</code>.', |
| 135 | 128 | 'config-diff3-bad' => 'GNU diff3 not found.', |
| 136 | 129 | 'config-imagemagick' => 'Found ImageMagick: <code>$1</code>. |
| 137 | 130 | Image thumbnailing will be enabled if you enable uploads.', |
| — | — | @@ -138,13 +131,8 @@ |
| 139 | 132 | Image thumbnailing will be enabled if you enable uploads.', |
| 140 | 133 | 'config-no-scaling' => 'Could not find GD library or ImageMagick. |
| 141 | 134 | Image thumbnailing will be disabled.', |
| 142 | | - 'config-dir' => 'Installation directory: <code>$1</code>.', |
| 143 | | - 'config-uri' => 'Script URI path: <code>$1</code>.', |
| 144 | 135 | 'config-no-uri' => "'''Error:''' Could not determine the current URI. |
| 145 | 136 | Installation aborted.", |
| 146 | | - 'config-file-extension' => 'Installing MediaWiki with <code>$1</code> file extensions.', |
| 147 | | - 'config-shell-locale' => 'Detected shell locale "$1"', |
| 148 | | - 'config-uploads-safe' => 'The default directory for uploads is safe from arbitrary scripts execution.', |
| 149 | 137 | 'config-uploads-not-safe' => "'''Warning:''' Your default directory for uploads <code>$1</code> is vulnerable to arbitrary scripts execution. |
| 150 | 138 | Although MediaWiki checks all uploaded files for security threats, it is highly recommended to [http://www.mediawiki.org/wiki/Manual:Security#Upload_security close this security vulnerability] before enabling uploads.", |
| 151 | 139 | 'config-brokenlibxml' => 'Your system has a combination of PHP and libxml2 versions which is buggy and can cause hidden data corruption in MediaWiki and other web applications. |