| Index: trunk/extensions/OpenStackManager/special/SpecialNovaDomain.php |
| — | — | @@ -19,7 +19,7 @@ |
| 20 | 20 | $this->notLoggedIn(); |
| 21 | 21 | return false; |
| 22 | 22 | } |
| 23 | | - $project = $wgRequest->getText( 'project' ); |
| | 23 | + //$project = $wgRequest->getText( 'project' ); |
| 24 | 24 | # Must be in the global role |
| 25 | 25 | if ( ! $this->userLDAP->inRole( 'netadmin' ) ) { |
| 26 | 26 | $this->notInRole( 'netadmin' ); |
| Index: trunk/extensions/OpenStackManager/special/SpecialNovaKey.php |
| — | — | @@ -37,6 +37,7 @@ |
| 38 | 38 | global $wgRequest, $wgOut; |
| 39 | 39 | global $wgOpenStackManagerNovaKeypairStorage; |
| 40 | 40 | |
| | 41 | + $project = ''; |
| 41 | 42 | if ( $wgOpenStackManagerNovaKeypairStorage == 'nova' ) { |
| 42 | 43 | $project = $wgRequest->getVal( 'project' ); |
| 43 | 44 | if ( $project && ! $this->userLDAP->inProject( $project ) ) { |
| — | — | @@ -97,6 +98,8 @@ |
| 98 | 99 | $wgOut->setPagetitle( wfMsg( 'openstackmanager-deletekey' ) ); |
| 99 | 100 | |
| 100 | 101 | $keyInfo = array(); |
| | 102 | + $hash = ''; |
| | 103 | + $keypairs = array(); |
| 101 | 104 | |
| 102 | 105 | if ( $wgOpenStackManagerNovaKeypairStorage == 'nova' ) { |
| 103 | 106 | $keyname = $wgRequest->getVal( 'keyname' ); |
| Index: trunk/extensions/OpenStackManager/OpenStackNovaController.php |
| — | — | @@ -200,8 +200,10 @@ |
| 201 | 201 | if ( $wgOpenStackManagerInstanceUserData['scripts'] ) { |
| 202 | 202 | $i = 0; |
| 203 | 203 | foreach ( $wgOpenStackManagerInstanceUserData['scripts'] as $script ) { |
| 204 | | - $stat = @stat( $script ); |
| 205 | | - if ( ! $stat ) { |
| | 204 | + wfSuppressWarnings(); |
| | 205 | + $stat = stat( $script ); |
| | 206 | + wfRestoreWarnings(); |
| | 207 | + if ( $stat ) { |
| 206 | 208 | continue; |
| 207 | 209 | } |
| 208 | 210 | $scripttext = file_get_contents( $script ); |
| — | — | @@ -213,7 +215,9 @@ |
| 214 | 216 | if ( $wgOpenStackManagerInstanceUserData['upstarts'] ) { |
| 215 | 217 | $i = 0; |
| 216 | 218 | foreach ( $wgOpenStackManagerInstanceUserData['upstarts'] as $upstart ) { |
| 217 | | - $stat = @stat( $upstart ); |
| | 219 | + wfSuppressWarnings(); |
| | 220 | + $stat = stat( $upstart ); |
| | 221 | + wfRestoreWarnings(); |
| 218 | 222 | if ( ! $stat ) { |
| 219 | 223 | continue; |
| 220 | 224 | } |