From 7dc6dae639eb778d9825f8444e0a0bb9a12c3213 Mon Sep 17 00:00:00 2001 From: Agent <43097272+AgentIsai@users.noreply.github.com> Date: Thu, 2 Feb 2023 00:14:54 -0600 Subject: [PATCH 1/8] Add a message if ManageWiki is locked --- includes/Specials/SpecialManageWiki.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/includes/Specials/SpecialManageWiki.php b/includes/Specials/SpecialManageWiki.php index f15ba7757..7563e303d 100644 --- a/includes/Specials/SpecialManageWiki.php +++ b/includes/Specials/SpecialManageWiki.php @@ -118,6 +118,12 @@ public function showWikiForm( $wiki, $module, $special, $filtered ) { $out->addModuleStyles( [ 'oojs-ui-widgets.styles' ] ); } + $remoteWiki = new RemoteWiki( $wiki ); + + if ( $remoteWiki->isLocked() == true ) { + $out->addHTML( Html::errorBox( $this->msg( 'managewiki-mwlocked' ) ); + } + if ( !$special ) { $out->addWikiMsg( "managewiki-header-{$module}", $wiki ); } @@ -154,8 +160,6 @@ public function showWikiForm( $wiki, $module, $special, $filtered ) { return false; } - $remoteWiki = new RemoteWiki( $wiki ); - $formFactory = new ManageWikiFormFactory(); $htmlForm = $formFactory->getForm( $wiki, $remoteWiki, $this->getContext(), $this->config, $module, strtolower( $special ), $filtered ); From 92cbbad8a1238265baed38d9242854eebcc7f925 Mon Sep 17 00:00:00 2001 From: Agent <43097272+AgentIsai@users.noreply.github.com> Date: Thu, 2 Feb 2023 00:15:48 -0600 Subject: [PATCH 2/8] Fix --- includes/Specials/SpecialManageWiki.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/Specials/SpecialManageWiki.php b/includes/Specials/SpecialManageWiki.php index 7563e303d..1b1cd9206 100644 --- a/includes/Specials/SpecialManageWiki.php +++ b/includes/Specials/SpecialManageWiki.php @@ -120,7 +120,7 @@ public function showWikiForm( $wiki, $module, $special, $filtered ) { $remoteWiki = new RemoteWiki( $wiki ); - if ( $remoteWiki->isLocked() == true ) { + if ( $remoteWiki->isLocked() ) { $out->addHTML( Html::errorBox( $this->msg( 'managewiki-mwlocked' ) ); } From 0e286b6bb5d8a82e4d26f2a8dce799f81edabf9c Mon Sep 17 00:00:00 2001 From: Agent <43097272+AgentIsai@users.noreply.github.com> Date: Thu, 2 Feb 2023 00:18:46 -0600 Subject: [PATCH 3/8] Fix --- includes/Specials/SpecialManageWiki.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/Specials/SpecialManageWiki.php b/includes/Specials/SpecialManageWiki.php index 1b1cd9206..0a9512a04 100644 --- a/includes/Specials/SpecialManageWiki.php +++ b/includes/Specials/SpecialManageWiki.php @@ -121,7 +121,7 @@ public function showWikiForm( $wiki, $module, $special, $filtered ) { $remoteWiki = new RemoteWiki( $wiki ); if ( $remoteWiki->isLocked() ) { - $out->addHTML( Html::errorBox( $this->msg( 'managewiki-mwlocked' ) ); + $out->addHTML( Html::errorBox( $this->msg( 'managewiki-mwlocked' )->plain() ); } if ( !$special ) { From 8c76c4c95a7371cb6f5f04a622a72193229e0b73 Mon Sep 17 00:00:00 2001 From: Agent <43097272+AgentIsai@users.noreply.github.com> Date: Thu, 2 Feb 2023 00:20:10 -0600 Subject: [PATCH 4/8] Add missing parenthesis --- includes/Specials/SpecialManageWiki.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/Specials/SpecialManageWiki.php b/includes/Specials/SpecialManageWiki.php index 0a9512a04..42e2f867a 100644 --- a/includes/Specials/SpecialManageWiki.php +++ b/includes/Specials/SpecialManageWiki.php @@ -121,7 +121,7 @@ public function showWikiForm( $wiki, $module, $special, $filtered ) { $remoteWiki = new RemoteWiki( $wiki ); if ( $remoteWiki->isLocked() ) { - $out->addHTML( Html::errorBox( $this->msg( 'managewiki-mwlocked' )->plain() ); + $out->addHTML( Html::errorBox( $this->msg( 'managewiki-mwlocked' )->plain() ) ); } if ( !$special ) { From 5b8a28533d5bf5a0d8860536fc2006fe54bf75d6 Mon Sep 17 00:00:00 2001 From: Agent_Isai <43097272+AgentIsai@users.noreply.github.com> Date: Sun, 21 May 2023 00:24:37 -0500 Subject: [PATCH 5/8] use escaped instead of plain --- includes/Specials/SpecialManageWiki.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/Specials/SpecialManageWiki.php b/includes/Specials/SpecialManageWiki.php index 42e2f867a..ea16c64c9 100644 --- a/includes/Specials/SpecialManageWiki.php +++ b/includes/Specials/SpecialManageWiki.php @@ -121,7 +121,7 @@ public function showWikiForm( $wiki, $module, $special, $filtered ) { $remoteWiki = new RemoteWiki( $wiki ); if ( $remoteWiki->isLocked() ) { - $out->addHTML( Html::errorBox( $this->msg( 'managewiki-mwlocked' )->plain() ) ); + $out->addHTML( Html::errorBox( $this->msg( 'managewiki-mwlocked' )->escaped() ) ); } if ( !$special ) { From 22e51998c1d00daa7da9c6137d0fc9ceb7bd77f7 Mon Sep 17 00:00:00 2001 From: CosmicAlpha Date: Tue, 27 Feb 2024 17:40:28 -0700 Subject: [PATCH 6/8] Fix --- includes/Specials/SpecialManageWiki.php | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/includes/Specials/SpecialManageWiki.php b/includes/Specials/SpecialManageWiki.php index fad1a170d..66bf9c669 100644 --- a/includes/Specials/SpecialManageWiki.php +++ b/includes/Specials/SpecialManageWiki.php @@ -118,6 +118,12 @@ public function onSubmitRedirectToWikiForm( array $params ) { public function showWikiForm( $wiki, $module, $special, $filtered ) { $out = $this->getOutput(); + $remoteWiki = new RemoteWiki( $wiki ); + + if ( $remoteWiki->isLocked() ) { + $out->addHTML( Html::errorBox( $this->msg( 'managewiki-mwlocked' )->escaped() ) ); + } + if ( $special !== '' || in_array( $module, [ 'core', 'extensions', 'settings' ] ) ) { $out->addModules( [ 'ext.managewiki.oouiform' ] ); @@ -128,19 +134,7 @@ public function showWikiForm( $wiki, $module, $special, $filtered ) { $out->addModuleStyles( [ 'oojs-ui-widgets.styles' ] ); - } - - $remoteWiki = new RemoteWiki( $wiki ); - - if ( $remoteWiki->isLocked() ) { - $out->addHTML( Html::errorBox( $this->msg( 'managewiki-mwlocked' )->escaped() ) ); - } - - if ( !$special ) { - $out->addWikiMsg( "managewiki-header-{$module}", $wiki ); - $out->addModules( [ 'mediawiki.special.userrights' ] ); - } $options = []; From fc72bbf8c034a6469c897ceb8dbe98d1130230f0 Mon Sep 17 00:00:00 2001 From: CosmicAlpha Date: Tue, 27 Feb 2024 17:40:59 -0700 Subject: [PATCH 7/8] Fix --- includes/Specials/SpecialManageWiki.php | 1 - 1 file changed, 1 deletion(-) diff --git a/includes/Specials/SpecialManageWiki.php b/includes/Specials/SpecialManageWiki.php index 66bf9c669..fdd9a3298 100644 --- a/includes/Specials/SpecialManageWiki.php +++ b/includes/Specials/SpecialManageWiki.php @@ -133,7 +133,6 @@ public function showWikiForm( $wiki, $module, $special, $filtered ) { ] ); $out->addModuleStyles( [ 'oojs-ui-widgets.styles' ] ); - $out->addModules( [ 'mediawiki.special.userrights' ] ); } From 52acae40a509d8b7390ef4021919ddd9155ef1d8 Mon Sep 17 00:00:00 2001 From: CosmicAlpha Date: Tue, 27 Feb 2024 17:42:36 -0700 Subject: [PATCH 8/8] Fix --- includes/Specials/SpecialManageWiki.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/includes/Specials/SpecialManageWiki.php b/includes/Specials/SpecialManageWiki.php index fdd9a3298..71941d573 100644 --- a/includes/Specials/SpecialManageWiki.php +++ b/includes/Specials/SpecialManageWiki.php @@ -118,12 +118,6 @@ public function onSubmitRedirectToWikiForm( array $params ) { public function showWikiForm( $wiki, $module, $special, $filtered ) { $out = $this->getOutput(); - $remoteWiki = new RemoteWiki( $wiki ); - - if ( $remoteWiki->isLocked() ) { - $out->addHTML( Html::errorBox( $this->msg( 'managewiki-mwlocked' )->escaped() ) ); - } - if ( $special !== '' || in_array( $module, [ 'core', 'extensions', 'settings' ] ) ) { $out->addModules( [ 'ext.managewiki.oouiform' ] ); @@ -136,6 +130,12 @@ public function showWikiForm( $wiki, $module, $special, $filtered ) { $out->addModules( [ 'mediawiki.special.userrights' ] ); } + $remoteWiki = new RemoteWiki( $wiki ); + + if ( $remoteWiki->isLocked() ) { + $out->addHTML( Html::errorBox( $this->msg( 'managewiki-mwlocked' )->escaped() ) ); + } + $options = []; if ( $module == 'permissions' && !$special ) {