jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/355618 )
Change subject: Remove two unused special pages.
..
Remove two unused special pages.
NovaSecurityGroups has long-since been replaced by better Horizon functions.
NovaRole was pretty much never used -- I don't have permission to access it
even.
Bug: T161553
Change-Id: I21aab0ec033b624910dc85f1b408cc241b059aec
---
M OpenStackManager.php
D special/SpecialNovaRole.php
D special/SpecialNovaSecurityGroup.php
3 files changed, 0 insertions(+), 849 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/OpenStackManager.php b/OpenStackManager.php
index 9cc2c70..f72049c 100644
--- a/OpenStackManager.php
+++ b/OpenStackManager.php
@@ -189,8 +189,6 @@
$wgAutoloadClasses['SpecialNovaProject'] = $dir .
'special/SpecialNovaProject.php';
$wgAutoloadClasses['SpecialNovaDomain'] = $dir .
'special/SpecialNovaDomain.php';
$wgAutoloadClasses['SpecialNovaAddress'] = $dir .
'special/SpecialNovaAddress.php';
-$wgAutoloadClasses['SpecialNovaSecurityGroup'] = $dir .
'special/SpecialNovaSecurityGroup.php';
-$wgAutoloadClasses['SpecialNovaRole'] = $dir . 'special/SpecialNovaRole.php';
$wgAutoloadClasses['SpecialNovaServiceGroup'] = $dir .
'special/SpecialNovaServiceGroup.php';
$wgAutoloadClasses['SpecialNovaVolume'] = $dir .
'special/SpecialNovaVolume.php';
$wgAutoloadClasses['SpecialNovaSudoer'] = $dir .
'special/SpecialNovaSudoer.php';
@@ -209,9 +207,7 @@
$wgAutoloadClasses['OpenStackManagerEvent'] = $dir .
'OpenStackManagerEvent.php';
$wgSpecialPages['NovaKey'] = 'SpecialNovaKey';
$wgSpecialPages['NovaProject'] = 'SpecialNovaProject';
-$wgSpecialPages['NovaSecurityGroup'] = 'SpecialNovaSecurityGroup';
$wgSpecialPages['NovaServiceGroup'] = 'SpecialNovaServiceGroup';
-$wgSpecialPages['NovaRole'] = 'SpecialNovaRole';
$wgSpecialPages['NovaVolume'] = 'SpecialNovaVolume';
$wgSpecialPages['NovaSudoer'] = 'SpecialNovaSudoer';
$wgSpecialPages['NovaResources'] = 'SpecialNovaResources';
diff --git a/special/SpecialNovaRole.php b/special/SpecialNovaRole.php
deleted file mode 100644
index 1a1615f..000
--- a/special/SpecialNovaRole.php
+++ /dev/null
@@ -1,279 +0,0 @@
-userLDAP = new OpenStackNovaUser();
- }
-
- function execute( $par ) {
- if ( !$this->getUser()->isLoggedIn() ) {
- $this->notLoggedIn();
- return;
- }
- $this->checkTwoFactor();
- $this->userLDAP = new OpenStackNovaUser();
- $action = $this->getRequest()->getVal( 'action' );
- if ( $action === "addmember" ) {
- $this->addMember();
- } elseif ( $action === "deletemember" ) {
- $this->deleteMember();
- } else {
- $this->displayRestrictionError();
- }
- }
-
- /**
-* @return bool
-*/
- function addMember() {
- $this->setHeaders();
- $this->getOutput()->setPageTitle( $this->msg(
'openstackmanager-addmember' ) );
-
- $roleInfo = array();
- $roleid = $this->getRequest()->getText( 'roleid' );
- $projectid = $this->getRequest()->getText( 'projectid' );
-
- if ( $projectid ) {
- $project = new OpenStackNovaProject( $projectid );
- $role = new OpenStackNovaRole( $roleid, $project );
- $projectname = $project->getProjectName();
- $rolename = $role->getRoleName();
-
- if ( !$this->userCanExecute( $this->getUser() ) &&
!$this->userLDAP->inRole( $rolename, $projectname ) ) {
- $this->displayRestrictionError();
- return false;
- }
- $projectmembers = $project->getMembers();
- natcasesort( $projectmembers );
- $role = new OpenStackNovaRole( $roleid, $project );
- $rolemembers = $role->getMembers();
- $member_keys = array();
- foreach ( $projectmembers as $projectmember ) {
- if ( ! in_array( $projectmember, $rolemembers )
) {
- $member_keys[$projectmember] =
$projectmember;
- }
- }
- if ( ! $member_keys ) {
- $this->getOutput()->addWikiMsg(
'openstackmanager-nomemberstoadd' );
- return true;
- }
- $roleInfo['members'] = array(
- 'type' => 'multiselect',
-