| Index: trunk/extensions/OpenStackManager/special/SpecialNovaKey.php |
| — | — | @@ -179,7 +179,7 @@ |
| 180 | 180 | $this->pushResourceColumn( $keyRow, $key ); |
| 181 | 181 | $actions = Array(); |
| 182 | 182 | array_push( $actions, $this->createActionLink( 'openstackmanager-delete', array( 'action' => 'delete', 'hash' => $hash ) ) ); |
| 183 | | - $this->pushResourceColumn( $keyRow, $this->createResourceList( $actions) ); |
| | 183 | + $this->pushRawResourceColumn( $keyRow, $this->createResourceList( $actions) ); |
| 184 | 184 | array_push( $keyRows, $keyRow ); |
| 185 | 185 | } |
| 186 | 186 | $out .= $this->createResourceTable( $headers, $keyRows ); |
| — | — | @@ -311,14 +311,14 @@ |
| 312 | 312 | # Windows user providing it in PuTTY format. |
| 313 | 313 | $key = self::opensshFormatKey( $key ); |
| 314 | 314 | if ( $key === false ) { |
| 315 | | - $this->getOutput()->addWikiMsg( 'openstackmanager-keypairwrongformat' ); |
| | 315 | + $this->getOutput()->addWikiMsg( 'openstackmanager-keypairformatwrong' ); |
| 316 | 316 | return false; |
| 317 | 317 | } |
| 318 | 318 | $this->getOutput()->addWikiMsg( 'openstackmanager-keypairformatconverted' ); |
| 319 | 319 | } |
| 320 | 320 | |
| 321 | 321 | if ( $wgOpenStackManagerNovaKeypairStorage == 'ldap' ) { |
| 322 | | - $success = $this->userLDAP->importKeypair( $formData['key'] ); |
| | 322 | + $success = $this->userLDAP->importKeypair( $key ); |
| 323 | 323 | if ( ! $success ) { |
| 324 | 324 | $this->getOutput()->addWikiMsg( 'openstackmanager-keypairimportfailed' ); |
| 325 | 325 | return false; |
| — | — | @@ -328,7 +328,7 @@ |
| 329 | 329 | # wgOpenStackManagerNovaKeypairStorage == 'nova' |
| 330 | 330 | # OpenStack's EC2 API doesn't yet support importing keys, use |
| 331 | 331 | # of this option isn't currently recommended |
| 332 | | - $keypair = $this->userNova->importKeypair( $formData['keyname'], $formData['key'] ); |
| | 332 | + $keypair = $this->userNova->importKeypair( $formData['keyname'], $key ); |
| 333 | 333 | |
| 334 | 334 | $this->getOutput()->addWikiMsg( 'openstackmanager-keypairimportedfingerprint', $keypair->getKeyName(), $keypair->getKeyFingerprint() ); |
| 335 | 335 | } else { |
| Index: trunk/extensions/OpenStackManager/OpenStackNovaUser.php |
| — | — | @@ -280,7 +280,7 @@ |
| 281 | 281 | if ( $success ) { |
| 282 | 282 | $wgAuth->printDebug( "Successfully imported the user's sshpublickey", NONSENSITIVE ); |
| 283 | 283 | $key = wfMemcKey( 'ldapauthentication', "userinfo", $this->userDN ); |
| 284 | | - $this->printDebug( "Deleting memcache key: $key.", NONSENSITIVE ); |
| | 284 | + $wgAuth->printDebug( "Deleting memcache key: $key.", NONSENSITIVE ); |
| 285 | 285 | $wgMemc->delete( $key ); |
| 286 | 286 | $this->fetchUserInfo(); |
| 287 | 287 | return true; |
| — | — | @@ -316,7 +316,7 @@ |
| 317 | 317 | if ( $success ) { |
| 318 | 318 | $wgAuth->printDebug( "Successfully deleted the user's sshpublickey", NONSENSITIVE ); |
| 319 | 319 | $key = wfMemcKey( 'ldapauthentication', "userinfo", $this->userDN ); |
| 320 | | - $this->printDebug( "Deleting memcache key: $key.", NONSENSITIVE ); |
| | 320 | + $wgAuth->printDebug( "Deleting memcache key: $key.", NONSENSITIVE ); |
| 321 | 321 | $wgMemc->delete( $key ); |
| 322 | 322 | $this->fetchUserInfo(); |
| 323 | 323 | return true; |