| Index: trunk/extensions/OpenStackManager/special/SpecialNovaInstance.php |
| — | — | @@ -412,8 +412,9 @@ |
| 413 | 413 | |
| 414 | 414 | $sk = $wgUser->getSkin(); |
| 415 | 415 | $domain = OpenStackNovaDomain::getDomainByName( $formData['domain'] ); |
| 416 | | - if ( ! $domain ) { |
| | 416 | + if ( !$domain ) { |
| 417 | 417 | $out = Html::element( 'p', array(), wfMsg( 'openstackmanager-invaliddomain' ) ); |
| | 418 | + $wgOut->addHtml( $out ); |
| 418 | 419 | return true; |
| 419 | 420 | } |
| 420 | 421 | $instance = $this->userNova->createInstance( $formData['instancename'], $formData['imageType'], '', $formData['instanceType'], $formData['availabilityZone'], $formData['groups'] ); |
| — | — | @@ -461,6 +462,7 @@ |
| 462 | 463 | $instance = $this->adminNova->getInstance( $formData['instanceid'] ); |
| 463 | 464 | if ( ! $instance ) { |
| 464 | 465 | $out = Html::element( 'p', array(), wfMsg( 'openstackmanager-nonexistanthost' ) ); |
| | 466 | + $wgOut->addHtml( $out ); |
| 465 | 467 | return true; |
| 466 | 468 | } |
| 467 | 469 | $instancename = $instance->getInstanceName(); |
| Index: trunk/extensions/OpenStackManager/special/SpecialNovaSecurityGroup.php |
| — | — | @@ -462,6 +462,7 @@ |
| 463 | 463 | $securitygroup = $this->adminNova->getSecurityGroup( $formData['groupname'] ); |
| 464 | 464 | if ( ! $securitygroup ) { |
| 465 | 465 | $out = Html::element( 'p', array(), wfMsg( 'openstackmanager-nonexistantsecuritygroup' ) ); |
| | 466 | + $wgOut->addHtml( $out ); |
| 466 | 467 | return true; |
| 467 | 468 | } |
| 468 | 469 | $groupname = $securitygroup->getGroupName(); |
| — | — | @@ -525,6 +526,7 @@ |
| 526 | 527 | $securitygroup = $this->adminNova->getSecurityGroup( $formData['groupname'] ); |
| 527 | 528 | if ( ! $securitygroup ) { |
| 528 | 529 | $out = Html::element( 'p', array(), wfMsg( 'openstackmanager-nonexistantsecuritygroup' ) ); |
| | 530 | + $wgOut->addHtml( $out ); |
| 529 | 531 | return false; |
| 530 | 532 | } |
| 531 | 533 | $groupname = $securitygroup->getGroupName(); |
| — | — | @@ -567,6 +569,7 @@ |
| 568 | 570 | $securitygroup = $this->adminNova->getSecurityGroup( $formData['groupname'] ); |
| 569 | 571 | if ( ! $securitygroup ) { |
| 570 | 572 | $out = Html::element( 'p', array(), wfMsg( 'openstackmanager-nonexistantsecuritygroup' ) ); |
| | 573 | + $wgOut->addHtml( $out ); |
| 571 | 574 | return false; |
| 572 | 575 | } |
| 573 | 576 | $groupname = $securitygroup->getGroupName(); |
| Index: trunk/extensions/OpenStackManager/special/SpecialNovaProject.php |
| — | — | @@ -299,8 +299,7 @@ |
| 300 | 300 | function tryDeleteMemberSubmit( $formData, $entryPoint = 'internal' ) { |
| 301 | 301 | global $wgOut, $wgUser; |
| 302 | 302 | |
| 303 | | - $project = new OpenStackNovaProject( $formData['projectname'] ); |
| 304 | | - $project = OpenStackNovaProject::getProjectByName( $formData['projectname'] ); |
| | 303 | + $project = OpenStackNovaProject::getProjectByName( $formData['projectname'] ); |
| 305 | 304 | if ( ! $project ) { |
| 306 | 305 | $out = Html::element( 'p', array(), wfMsg( 'openstackmanager-nonexistentproject' ) ); |
| 307 | 306 | $wgOut->addHTML( $out ); |