| Index: trunk/extensions/OpenStackManager/special/SpecialNovaInstance.php |
| — | — | @@ -563,7 +563,6 @@ |
| 564 | 564 | */ |
| 565 | 565 | function tryCreateSubmit( $formData, $entryPoint = 'internal' ) { |
| 566 | 566 | global $wgOut; |
| 567 | | - global $wgOpenStackManagerPuppetOptions; |
| 568 | 567 | |
| 569 | 568 | $domain = OpenStackNovaDomain::getDomainByName( $formData['domain'] ); |
| 570 | 569 | if ( !$domain ) { |
| — | — | @@ -659,7 +658,7 @@ |
| 660 | 659 | * @return bool |
| 661 | 660 | */ |
| 662 | 661 | function tryConfigureSubmit( $formData, $entryPoint = 'internal' ) { |
| 663 | | - global $wgOut, $wgOpenStackManagerPuppetOptions; |
| | 662 | + global $wgOut; |
| 664 | 663 | |
| 665 | 664 | $instance = $this->adminNova->getInstance( $formData['instanceid'] ); |
| 666 | 665 | $host = $instance->getHost(); |
| Index: trunk/extensions/OpenStackManager/special/SpecialNovaSecurityGroup.php |
| — | — | @@ -337,7 +337,7 @@ |
| 338 | 338 | $this->notInRole( 'netadmin' ); |
| 339 | 339 | return false; |
| 340 | 340 | } |
| 341 | | - $group_keys = array(); |
| | 341 | + |
| 342 | 342 | $info = array(); |
| 343 | 343 | $securityGroups = $this->adminNova->getSecurityGroups(); |
| 344 | 344 | foreach ( $securityGroups as $securityGroup ) { |
| — | — | @@ -628,7 +628,7 @@ |
| 629 | 629 | * @return bool |
| 630 | 630 | */ |
| 631 | 631 | function tryRemoveRuleSubmit( $formData, $entryPoint = 'internal' ) { |
| 632 | | - global $wgOut, $wgUser; |
| | 632 | + global $wgOut; |
| 633 | 633 | |
| 634 | 634 | $project = $formData['project']; |
| 635 | 635 | $fromport = $formData['fromport']; |
| Index: trunk/extensions/OpenStackManager/special/SpecialNovaAddress.php |
| — | — | @@ -663,8 +663,7 @@ |
| 664 | 664 | $wgOut->addWikiMsg( 'openstackmanager-nonexistenthost' ); |
| 665 | 665 | } |
| 666 | 666 | $out = '<br />'; |
| 667 | | - $sk = $wgOut->getSkin(); |
| 668 | | - $out .= $sk->link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backaddresslist' ) ); |
| | 667 | + $out .= Linker::link( $this->getTitle(), wfMsgHtml( 'openstackmanager-backaddresslist' ) ); |
| 669 | 668 | $wgOut->addHTML( $out ); |
| 670 | 669 | return true; |
| 671 | 670 | } |
| Index: trunk/extensions/OpenStackManager/special/SpecialNovaPuppetGroup.php |
| — | — | @@ -506,7 +506,6 @@ |
| 507 | 507 | */ |
| 508 | 508 | function tryCreateSubmit( $formData, $entryPoint = 'internal' ) { |
| 509 | 509 | global $wgOut; |
| 510 | | - global $wgOpenStackManagerDefaultSecurityGroupRules; |
| 511 | 510 | |
| 512 | 511 | $success = OpenStackNovaPuppetGroup::addGroup( $formData['puppetgroupname'], $formData['puppetgroupposition'] ); |
| 513 | 512 | if ( $success ) { |
| Index: trunk/extensions/OpenStackManager/special/SpecialNovaSudoer.php |
| — | — | @@ -280,7 +280,7 @@ |
| 281 | 281 | * @return bool |
| 282 | 282 | */ |
| 283 | 283 | function tryCreateSubmit( $formData, $entryPoint = 'internal' ) { |
| 284 | | - global $wgOut, $wgUser; |
| | 284 | + global $wgOut; |
| 285 | 285 | |
| 286 | 286 | if ( $formData['users'] ) { |
| 287 | 287 | $users = explode( ',', $formData['users'] ); |
| Index: trunk/extensions/OpenStackManager/OpenStackNovaSudoer.php |
| — | — | @@ -123,8 +123,6 @@ |
| 124 | 124 | */ |
| 125 | 125 | function modifySudoer( $users, $hosts, $commands, $options ) { |
| 126 | 126 | global $wgAuth; |
| 127 | | - global $wgOpenStackManagerLDAPUser, $wgOpenStackManagerLDAPUserPassword; |
| 128 | | - global $wgOpenStackManagerLDAPDomain; |
| 129 | 127 | |
| 130 | 128 | $sudoer = array(); |
| 131 | 129 | foreach ( $users as $user ) { |
| Index: trunk/extensions/OpenStackManager/OpenStackNovaRole.php |
| — | — | @@ -200,7 +200,6 @@ |
| 201 | 201 | * @return array |
| 202 | 202 | */ |
| 203 | 203 | static function getAllGlobalRoles() { |
| 204 | | - global $wgAuth; |
| 205 | 204 | global $wgOpenStackManagerLDAPGlobalRoles; |
| 206 | 205 | |
| 207 | 206 | OpenStackNovaLdapConnection::connect(); |
| Index: trunk/extensions/OpenStackManager/OpenStackNovaUser.php |
| — | — | @@ -451,8 +451,8 @@ |
| 452 | 452 | |
| 453 | 453 | if ( $wgOpenStackManagerLDAPUseUidAsNamingAttribute ) { |
| 454 | 454 | if ( $writeloc == '' ) { |
| | 455 | + $auth->printDebug( "Trying to set the userdn, but write location isn't set.", NONSENSITIVE ); |
| 455 | 456 | return false; |
| 456 | | - $auth->printDebug( "Trying to set the userdn, but write location isn't set.", NONSENSITIVE ); |
| 457 | 457 | } else { |
| 458 | 458 | $userdn = 'uid=' . $username . ',' . $writeloc; |
| 459 | 459 | $auth->printDebug( "Using uid as the naming attribute, dn is: $userdn", NONSENSITIVE ); |
| Index: trunk/extensions/OpenStackManager/OpenStackNovaController.php |
| — | — | @@ -208,6 +208,7 @@ |
| 209 | 209 | * Get the console output of an instance |
| 210 | 210 | * |
| 211 | 211 | * @param $instanceid string |
| | 212 | + * @return string |
| 212 | 213 | */ |
| 213 | 214 | function getConsoleOutput( $instanceid ) { |
| 214 | 215 | $consoleOutput = $this->novaConnection->get_console_output( $instanceid, array() ); |