http://www.mediawiki.org/wiki/Special:Code/MediaWiki/84648
Revision: 84648
Author: reedy
Date: 2011-03-24 00:13:19 +0000 (Thu, 24 Mar 2011)
Log Message:
-----------
Remove some more duplicate code, factor down to SpecialNova general purpose
method
Remove some unused paramters, and hence, their callers
Modified Paths:
--------------
trunk/extensions/OpenStackManager/OpenStackNovaHost.php
trunk/extensions/OpenStackManager/special/SpecialNova.php
trunk/extensions/OpenStackManager/special/SpecialNovaAddress.php
trunk/extensions/OpenStackManager/special/SpecialNovaProject.php
trunk/extensions/OpenStackManager/special/SpecialNovaVolume.php
Modified: trunk/extensions/OpenStackManager/OpenStackNovaHost.php
===================================================================
--- trunk/extensions/OpenStackManager/OpenStackNovaHost.php 2011-03-24
00:06:42 UTC (rev 84647)
+++ trunk/extensions/OpenStackManager/OpenStackNovaHost.php 2011-03-24
00:13:19 UTC (rev 84648)
@@ -420,10 +420,9 @@
*
* @static
* @param $ip
- * @param $domain OpenStackNovaDomain
* @return null|OpenStackNovaHost
*/
- static function getHostByIP( $ip, $domain ) {
+ static function getHostByIP( $ip ) {
global $wgAuth;
global $wgOpenStackManagerLDAPInstanceBaseDN;
Modified: trunk/extensions/OpenStackManager/special/SpecialNova.php
===================================================================
--- trunk/extensions/OpenStackManager/special/SpecialNova.php 2011-03-24
00:06:42 UTC (rev 84647)
+++ trunk/extensions/OpenStackManager/special/SpecialNova.php 2011-03-24
00:13:19 UTC (rev 84648)
@@ -57,14 +57,14 @@
/**
* @param $hostname
- * @param $alldata
* @return bool|string
*/
- function validateHostName( $hostname, $alldata ) {
+ function validateText( $hostname, $error ) {
if ( ! preg_match( "/^[a-z][a-z0-9\-]*$/", $hostname ) ) {
- return Xml::element( 'span', array( 'class' => 'error'
), wfMsg( 'openstackmanager-badinstancename' ) );
+ return Xml::element( 'span', array( 'class' => 'error'
), wfMsg( $error ) );
} else {
return true;
}
}
+
}
Modified: trunk/extensions/OpenStackManager/special/SpecialNovaAddress.php
===================================================================
--- trunk/extensions/OpenStackManager/special/SpecialNovaAddress.php
2011-03-24 00:06:42 UTC (rev 84647)
+++ trunk/extensions/OpenStackManager/special/SpecialNovaAddress.php
2011-03-24 00:13:19 UTC (rev 84648)
@@ -578,7 +578,7 @@
$domain = $formData['domain'];
$domain = OpenStackNovaDomain::getDomainByName( $domain );
$hostbyname = OpenStackNovaHost::getHostByName( $hostname,
$domain );
- $hostbyip = OpenStackNovaHost::getHostByIP( $ip, $domain );
+ $hostbyip = OpenStackNovaHost::getHostByIP( $ip );
if ( $hostbyname ) {
# We need to add an arecord, if the arecord doesn't
already exist
Modified: trunk/extensions/OpenStackManager/special/SpecialNovaProject.php
===================================================================
--- trunk/extensions/OpenStackManager/special/SpecialNovaProject.php
2011-03-24 00:06:42 UTC (rev 84647)
+++ trunk/extensions/OpenStackManager/special/SpecialNovaProject.php
2011-03-24 00:13:19 UTC (rev 84648)
@@ -376,19 +376,6 @@
return true;
}
- /**
- * @param $projectname
- * @param $alldata
- * @return bool|string
- */
- function validateProjectName( $projectname, $alldata ) {
- if ( !preg_match( "/^[a-z][a-z0-9\-_]*$/", $projectname ) ) {
- return Xml::element( 'span', array( 'class' =>
'error' ), wfMsg( 'openstackmanager-badprojectname' ) );
- } else {
- return true;
- }
- }
-
}
class SpecialNovaProjectForm extends HTMLForm {
Modified: trunk/extensions/OpenStackManager/special/SpecialNovaVolume.php
===================================================================
--- trunk/extensions/OpenStackManager/special/SpecialNovaVolume.php
2011-03-24 00:06:42 UTC (rev 84647)
+++ trunk/extensions/OpenStackManager/special/SpecialNovaVolume.php
2011-03-24 00:13:19 UTC (rev 84648)
@@ -518,20 +518,6 @@
return $drives;
}
-
- /**
- * @param $volumename
- * @param $alldata
- * @return bool|string
- */
- function validateVolumeName( $volumename, $alldata ) {
- if ( ! preg_match( "/^[a-z][a-z0-9\-]*$/", $volumename ) ) {
- return Xml::element( 'span', array( 'class' => 'error'
), wfMsg( 'openstackmanager-badvolumename' ) );
- } else {
- return true;
- }
- }
-
}
class SpecialNovaVolumeForm extends HTMLForm {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
