Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

installer: Restore success messages

Browse source 
Bug: T384524
Change-Id: I688e310ab08d4fb83d5dc47bd1fa79617cead9d3
(cherry picked from commit 379d3842bd4fcc2bd0587ea85a81bb68ed5a285a)
This commit is contained in:
Timo Tijhof 2025-02-17 04:28:25 +00:00 committed by Krinkle
parent 398fdb85b8
commit 6ea3f2f4f5
5 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
includes/installer/CliInstaller.php
View file

@ -262,6 +262,12 @@ class CliInstaller extends Installer {
flush(); flush();
} }
public function showSuccess( $msg, ...$params ) {
// @phan-suppress-next-line SecurityCheck-XSS
echo $this->getMessageText( $msg, $params ) . "\n";
flush();
}
public function showWarning( $msg, ...$params ) { public function showWarning( $msg, ...$params ) {
// @phan-suppress-next-line SecurityCheck-XSS // @phan-suppress-next-line SecurityCheck-XSS
echo $this->getMessageText( $msg, $params ) . "\n"; echo $this->getMessageText( $msg, $params ) . "\n";

11
includes/installer/Installer.php
View file

@ -366,6 +366,15 @@ abstract class Installer {
*/ */
abstract public function showMessage( $msg, ...$params ); abstract public function showMessage( $msg, ...$params );
/**
* Display a success message
*
* @param string|MessageSpecifier $msg String of wikitext that will be converted
* to HTML, or interface message that will be parsed.
* @param string|int|float ...$params Message parameters, same as wfMessage().
*/
abstract public function showSuccess( $msg, ...$params );
/** /**
* Display a warning message * Display a warning message
* *
@ -1770,7 +1779,7 @@ abstract class Installer {
// @phan-suppress-next-next-line PhanPossiblyUndeclaredVariable // @phan-suppress-next-next-line PhanPossiblyUndeclaredVariable
// $steps has at least one element and that defines $status // $steps has at least one element and that defines $status
if ( $status->isOK() ) { if ( $status->isOK() ) {
$this->showMessage( $this->showSuccess(
'config-install-db-success' 'config-install-db-success'
); );
$this->setVar( '_InstallDone', true ); $this->setVar( '_InstallDone', true );

8
includes/installer/WebInstaller.php
View file

@ -677,6 +677,14 @@ class WebInstaller extends Installer {
"</div></div>\n"; "</div></div>\n";
} }
public function showSuccess( $msg, ...$params ) {
$html = '<div class="cdx-message cdx-message--block cdx-message--success">' .
'<span class="cdx-message__icon"></span><div class="cdx-message__content">' .
$this->parse( wfMessage( $msg, $params )->useDatabase( false )->plain() ) .
"</div></div>\n";
$this->output->addHTML( $html );
}
public function showMessage( $msg, ...$params ) { public function showMessage( $msg, ...$params ) {
$html = '<div class="cdx-message cdx-message--block cdx-message--notice">' . $html = '<div class="cdx-message cdx-message--block cdx-message--notice">' .
'<span class="cdx-message__icon"></span><div class="cdx-message__content">' . '<span class="cdx-message__icon"></span><div class="cdx-message__content">' .

10
includes/installer/WebInstallerUpgrade.php
View file

@ -87,13 +87,9 @@ class WebInstallerUpgrade extends WebInstallerPage {
$msg = 'config-upgrade-done-no-regenerate'; $msg = 'config-upgrade-done-no-regenerate';
} }
$this->parent->disableLinkPopups(); $this->parent->disableLinkPopups();
$this->addHTML( $this->parent->showSuccess(
$this->parent->getInfoBox( $msg,
wfMessage( $msg, $this->getVar( 'wgServer' ) . $this->getVar( 'wgScriptPath' ) . '/index.php'
$this->getVar( 'wgServer' ) .
$this->getVar( 'wgScriptPath' ) . '/index.php'
)->plain()
)
); );
$this->parent->restoreLinkPopups(); $this->parent->restoreLinkPopups();
$this->endForm( $regenerate ? 'regenerate' : false, false ); $this->endForm( $regenerate ? 'regenerate' : false, false );

5
includes/installer/WebInstallerWelcome.php
View file

@ -36,10 +36,7 @@ class WebInstallerWelcome extends WebInstallerPage {
$this->parent->output->addWikiTextAsInterface( wfMessage( 'config-welcome' )->plain() ); $this->parent->output->addWikiTextAsInterface( wfMessage( 'config-welcome' )->plain() );
$status = $this->parent->doEnvironmentChecks(); $status = $this->parent->doEnvironmentChecks();
if ( $status->isGood() ) { if ( $status->isGood() ) {
$this->parent->output->addHTML( $this->parent->showSuccess( 'config-env-good' );
'<div class="cdx-message cdx-message--block cdx-message--success">' .
'<span class="cdx-message__icon"></span> <div class="cdx-message__content">' .
wfMessage( 'config-env-good' )->escaped() . '</div></div>' );
$this->parent->output->addWikiTextAsInterface( $this->parent->output->addWikiTextAsInterface(
wfMessage( 'config-welcome-section-copyright', wfMessage( 'config-welcome-section-copyright',
SpecialVersion::getCopyrightAndAuthorList(), SpecialVersion::getCopyrightAndAuthorList(),