| Index: trunk/extensions/OpenStackManager/OpenStackNovaLdapConnection.php |
| — | — | @@ -4,8 +4,6 @@ |
| 5 | 5 | |
| 6 | 6 | /** |
| 7 | 7 | * Connect to LDAP as the open stack manager account using wgAuth |
| 8 | | - * |
| 9 | | - * @return void |
| 10 | 8 | */ |
| 11 | 9 | static function connect() { |
| 12 | 10 | global $wgAuth; |
| Index: trunk/extensions/OpenStackManager/OpenStackNovaSudoer.php |
| — | — | @@ -159,9 +159,7 @@ |
| 160 | 160 | * @return array of OpenStackNovaSudoer |
| 161 | 161 | */ |
| 162 | 162 | static function getAllSudoers() { |
| 163 | | - global $wgAuth; |
| 164 | | - global $wgOpenStackManagerLDAPUser, $wgOpenStackManagerLDAPUserPassword; |
| 165 | | - global $wgOpenStackManagerLDAPSudoerBaseDN, $wgOpenStackManagerLDAPDomain; |
| | 163 | + global $wgAuth, $wgOpenStackManagerLDAPSudoerBaseDN; |
| 166 | 164 | |
| 167 | 165 | OpenStackNovaLdapConnection::connect(); |
| 168 | 166 | |
| — | — | @@ -215,10 +213,7 @@ |
| 216 | 214 | * @return null|OpenStackNovaSudoer |
| 217 | 215 | */ |
| 218 | 216 | static function createSudoer( $sudoername, $users, $hosts, $commands, $options ) { |
| 219 | | - global $wgAuth; |
| 220 | | - global $wgOpenStackManagerLDAPUser, $wgOpenStackManagerLDAPUserPassword; |
| 221 | | - global $wgOpenStackManagerLDAPSudoerBaseDN; |
| 222 | | - global $wgOpenStackManagerLDAPDomain; |
| | 217 | + global $wgAuth, $wgOpenStackManagerLDAPSudoerBaseDN; |
| 223 | 218 | |
| 224 | 219 | OpenStackNovaLdapConnection::connect(); |
| 225 | 220 | |
| — | — | @@ -260,8 +255,6 @@ |
| 261 | 256 | */ |
| 262 | 257 | static function deleteSudoer( $sudoername ) { |
| 263 | 258 | global $wgAuth; |
| 264 | | - global $wgOpenStackManagerLDAPUser, $wgOpenStackManagerLDAPUserPassword; |
| 265 | | - global $wgOpenStackManagerLDAPDomain; |
| 266 | 259 | |
| 267 | 260 | OpenStackNovaLdapConnection::connect(); |
| 268 | 261 | |
| Index: trunk/extensions/OpenStackManager/OpenStackNovaUser.php |
| — | — | @@ -515,7 +515,7 @@ |
| 516 | 516 | |
| 517 | 517 | /** |
| 518 | 518 | * @static |
| 519 | | - * @param $template |
| | 519 | + * @param $template |
| 520 | 520 | * @return bool |
| 521 | 521 | */ |
| 522 | 522 | static function LDAPModifyUITemplate( &$template ) { |
| Index: trunk/extensions/OpenStackManager/OpenStackNovaController.php |
| — | — | @@ -95,7 +95,7 @@ |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | /** |
| 99 | | - * @return array |
| | 99 | + * @return OpenStackNovaInstanceType |
| 100 | 100 | */ |
| 101 | 101 | function getInstanceType( $instanceType ) { |
| 102 | 102 | $this->getInstanceTypes( false ); |
| Index: trunk/extensions/OpenStackManager/OpenStackNovaArticle.php |
| — | — | @@ -3,13 +3,9 @@ |
| 4 | 4 | class OpenStackNovaArticle { |
| 5 | 5 | |
| 6 | 6 | public static function canCreatePages() { |
| 7 | | - global $wgOpenStackManagerCreateResourcePages; |
| | 7 | + global $wgOpenStackManagerCreateResourcePages; |
| 8 | 8 | |
| 9 | | - if ( $wgOpenStackManagerCreateResourcePages ) { |
| 10 | | - return true; |
| 11 | | - } else { |
| 12 | | - return false; |
| 13 | | - } |
| | 9 | + return $wgOpenStackManagerCreateResourcePages; |
| 14 | 10 | } |
| 15 | 11 | |
| 16 | 12 | public static function editArticle( $titletext, $text ) { |
| — | — | @@ -22,9 +18,9 @@ |
| 23 | 19 | if ( ! OpenStackNovaArticle::canCreatePages() ) { |
| 24 | 20 | return; |
| 25 | 21 | } |
| 26 | | - $title = Title::newFromText( $titletext, NS_NOVA_RESOURCE ); |
| 27 | | - $article = new Article( $title, 0 ); |
| 28 | | - $article->doDeleteArticle( '' ); |
| | 22 | + $title = Title::newFromText( $titletext, NS_NOVA_RESOURCE ); |
| | 23 | + $article = new Article( $title, 0 ); |
| | 24 | + $article->doDeleteArticle( '' ); |
| 29 | 25 | } |
| 30 | 26 | |
| 31 | 27 | } |
| Index: trunk/extensions/OpenStackManager/OpenStackNovaSecurityGroup.php |
| — | — | @@ -7,7 +7,7 @@ |
| 8 | 8 | var $rules; |
| 9 | 9 | |
| 10 | 10 | /** |
| 11 | | - * @param $apiInstanceResponse |
| | 11 | + * @param $apiInstanceResponse |
| 12 | 12 | */ |
| 13 | 13 | function __construct( $apiInstanceResponse ) { |
| 14 | 14 | $this->group = $apiInstanceResponse; |
| — | — | @@ -18,21 +18,21 @@ |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | /** |
| 22 | | - * @return |
| | 22 | + * @return string |
| 23 | 23 | */ |
| 24 | 24 | function getGroupName() { |
| 25 | 25 | return (string)$this->group->groupName; |
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | /** |
| 29 | | - * @return |
| | 29 | + * @return string |
| 30 | 30 | */ |
| 31 | 31 | function getGroupDescription() { |
| 32 | 32 | return (string)$this->group->groupDescription; |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | /** |
| 36 | | - * @return |
| | 36 | + * @return string |
| 37 | 37 | */ |
| 38 | 38 | function getOwner() { |
| 39 | 39 | return (string)$this->group->ownerId; |