| Index: trunk/extensions/OpenStackManager/special/SpecialNovaInstance.php |
| — | — | @@ -351,6 +351,7 @@ |
| 352 | 352 | continue; |
| 353 | 353 | } |
| 354 | 354 | $instanceName = (string)$instance->getInstanceName(); |
| | 355 | + $instanceName = htmlentities( $instanceName ); |
| 355 | 356 | $title = Title::newFromText( $instanceName, NS_VM ); |
| 356 | 357 | $instanceNameLink = $sk->link( $title, $instanceName, array(), array(), array() ); |
| 357 | 358 | $instanceOut = Html::rawElement( 'td', array(), $instanceNameLink ); |
| Index: trunk/extensions/OpenStackManager/special/SpecialNovaAddress.php |
| — | — | @@ -355,7 +355,7 @@ |
| 356 | 356 | $hostname = $hostname[0]; |
| 357 | 357 | $link = $sk->link( $this->getTitle(), $msg, array(), |
| 358 | 358 | array( 'action' => 'removehost', 'ip' => $ip, 'project' => $project, 'domain' => $domain->getDomainName(), 'hostname' => $hostname ), array() ); |
| 359 | | - $hostOut = $fqdn . ' ' . $link; |
| | 359 | + $hostOut = htmlentities( $fqdn ) . ' ' . $link; |
| 360 | 360 | $hostsOut .= Html::rawElement( 'li', array(), $hostOut ); |
| 361 | 361 | } |
| 362 | 362 | } |
| Index: trunk/extensions/OpenStackManager/special/SpecialNovaProject.php |
| — | — | @@ -191,7 +191,7 @@ |
| 192 | 192 | $projectMembers = $project->getMembers(); |
| 193 | 193 | $memberOut = ''; |
| 194 | 194 | foreach ( $projectMembers as $projectMember ) { |
| 195 | | - $memberOut .= Html::rawElement( 'li', array(), $projectMember ); |
| | 195 | + $memberOut .= Html::element( 'li', array(), $projectMember ); |
| 196 | 196 | } |
| 197 | 197 | if ( $memberOut ) { |
| 198 | 198 | $memberOut = Html::rawElement( 'ul', array(), $memberOut ); |
| — | — | @@ -205,7 +205,7 @@ |
| 206 | 206 | $roleMembers = ''; |
| 207 | 207 | $specialRoleTitle = Title::newFromText( 'Special:NovaRole' ); |
| 208 | 208 | foreach ( $role->getMembers() as $member ) { |
| 209 | | - $roleMembers .= Html::rawElement( 'li', array(), $member ); |
| | 209 | + $roleMembers .= Html::element( 'li', array(), $member ); |
| 210 | 210 | } |
| 211 | 211 | $roleMembers = Html::rawElement( 'ul', array(), $roleMembers ); |
| 212 | 212 | $roleOut .= Html::rawElement( 'td', array(), $roleMembers ); |
| Index: trunk/extensions/OpenStackManager/special/SpecialNovaDomain.php |
| — | — | @@ -15,9 +15,6 @@ |
| 16 | 16 | function execute( $par ) { |
| 17 | 17 | global $wgRequest, $wgUser; |
| 18 | 18 | |
| 19 | | - # if ( ! $wgUser->isAllowed( 'manageproject' ) ) { |
| 20 | | - # return false; |
| 21 | | - # } |
| 22 | 19 | if ( ! $wgUser->isLoggedIn() ) { |
| 23 | 20 | $this->notLoggedIn(); |
| 24 | 21 | return false; |
| Index: trunk/extensions/OpenStackManager/special/SpecialNovaRole.php |
| — | — | @@ -187,10 +187,10 @@ |
| 188 | 188 | $roleMembers = $role->getMembers(); |
| 189 | 189 | $memberOut = ''; |
| 190 | 190 | foreach ( $roleMembers as $roleMember ) { |
| 191 | | - $memberOut .= Html::rawElement( 'li', array(), $roleMember ); |
| | 191 | + $memberOut .= Html::element( 'li', array(), $roleMember ); |
| 192 | 192 | } |
| 193 | 193 | if ( $memberOut ) { |
| 194 | | - $memberOut = Html::rawElement( 'ul', array(), $memberOut ); |
| | 194 | + $memberOut = Html::element( 'ul', array(), $memberOut ); |
| 195 | 195 | } |
| 196 | 196 | $roleOut .= Html::rawElement( 'td', array(), $memberOut ); |
| 197 | 197 | $link = $sk->link( $this->getTitle(), wfMsg( 'openstackmanager-addrolemember' ), array(), array( 'action' => 'addmember', 'rolename' => $roleName, 'returnto' => 'Special:NovaRole' ), array() ); |
| Index: trunk/extensions/OpenStackManager/OpenStackManager.i18n.php |
| — | — | @@ -29,6 +29,7 @@ |
| 30 | 30 | 'novakey' => 'Manage your public SSH keys', |
| 31 | 31 | 'novaproject' => 'Manage OpenStack projects', |
| 32 | 32 | 'novasecuritygroup' => 'Manage Firewall Security Groups', |
| | 33 | + 'novarole' => 'Manage Global Roles', |
| 33 | 34 | |
| 34 | 35 | 'openstackmanager-novadomain' => 'Nova Domain', |
| 35 | 36 | 'openstackmanager-novainstance' => 'Nova Instance', |
| Index: trunk/extensions/OpenStackManager/OpenStackManager.php |
| — | — | @@ -21,7 +21,7 @@ |
| 22 | 22 | 'path' => __FILE__, |
| 23 | 23 | 'name' => 'OpenStackManager', |
| 24 | 24 | 'author' => 'Ryan Lane', |
| 25 | | - 'version' => '0.9', |
| | 25 | + 'version' => '1.0', |
| 26 | 26 | 'url' => 'http://mediawiki.org/wiki/Extension:OpenStackManager', |
| 27 | 27 | 'descriptionmsg' => 'openstackmanager-desc', |
| 28 | 28 | ); |