Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/52951
Change subject: Fixup a few undefined variables
......................................................................
Fixup a few undefined variables
Added some documentation bits at the same time
Change-Id: I354915a5004495add35f3c0b949aafcc29448e1e
---
M maintenance/syncProjectGroups.php
M nova/OpenStackNovaController.php
M special/SpecialNovaProject.php
3 files changed, 18 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager
refs/changes/51/52951/1
diff --git a/maintenance/syncProjectGroups.php
b/maintenance/syncProjectGroups.php
index cf385d8..a66f292 100644
--- a/maintenance/syncProjectGroups.php
+++ b/maintenance/syncProjectGroups.php
@@ -18,7 +18,6 @@
global $wgOpenStackManagerLDAPUserPassword;
$user = new OpenStackNovaUser(
$wgOpenStackManagerLDAPUsername );
- $userNova = OpenStackNovaController::newFromUser( $user );
$projects = OpenStackNovaProject::getAllProjects();
$failedSync = false;
@@ -27,6 +26,9 @@
$synced_count = 0;
$failed_count = 0;
+ /**
+ * @var $project OpenStackNovaProject
+ */
foreach ( $projects as $project ) {
// actually load the project info from ldap
// (getAllProjects() doesn't do this)
@@ -41,7 +43,7 @@
// 1: successful sync
if ( $retval != 0 ) {
- $this->output( ( $success ? "Succeeded" :
"Failed") . " syncing members for project $projectName and group " .
$project->projectGroup->getProjectGroupName() );
+ $this->output( ( $retval ? "Succeeded" :
"Failed") . " syncing members for project $projectName and group " .
$project->projectGroup->getProjectGroupName() );
if ( $retval < 0 ) {
$failedSync = true;
$failed_count++;
diff --git a/nova/OpenStackNovaController.php b/nova/OpenStackNovaController.php
index 59874bd..4e48a52 100644
--- a/nova/OpenStackNovaController.php
+++ b/nova/OpenStackNovaController.php
@@ -15,7 +15,7 @@
var $token;
/**
- * @param $username
+ * @param $user string
*/
function __construct( $user ) {
global $wgOpenStackManagerLDAPUseUidAsNamingAttribute;
@@ -31,6 +31,10 @@
$this->user = $user;
}
+ /**
+ * @param $user string
+ * @return OpenStackNovaController
+ */
static function newFromUser( $user ) {
return new OpenStackNovaController( $user );
}
diff --git a/special/SpecialNovaProject.php b/special/SpecialNovaProject.php
index 8a054ef..a8a4e49 100644
--- a/special/SpecialNovaProject.php
+++ b/special/SpecialNovaProject.php
@@ -8,7 +8,14 @@
*/
class SpecialNovaProject extends SpecialNova {
+ /**
+ * @var OpenStackNovaUser
+ */
var $userLDAP;
+
+ /**
+ * @var OpenStackNovaController
+ */
var $userNova;
function __construct() {
@@ -281,7 +288,7 @@
$this->setHeaders();
$projectName = $this->getRequest()->getText( 'projectname' );
$this->getOutput()->setPagetitle( $this->msg(
'openstackmanager-configureproject', $projectName ) );
- if ( !$this->userCanExecute( $this->getUser() ) &&
!$this->userLDAP->inProject( $project ) ) {
+ if ( !$this->userCanExecute( $this->getUser() ) &&
!$this->userLDAP->inProject( $projectName ) ) {
$this->notInProject();
return false;
}
@@ -533,7 +540,7 @@
$this->getOutput()->addWikiMsg(
'openstackmanager-configureproject-failed' );
}
- $out .= Linker::link(
+ $out = Linker::link(
$this->getTitle(),
$this->msg( 'openstackmanager-backprojectlist'
)->escaped()
);
--
To view, visit https://gerrit.wikimedia.org/r/52951
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I354915a5004495add35f3c0b949aafcc29448e1e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
