http://www.mediawiki.org/wiki/Special:Code/MediaWiki/84646
Revision: 84646
Author: reedy
Date: 2011-03-24 00:02:23 +0000 (Thu, 24 Mar 2011)
Log Message:
-----------
validateInstanceName and validateHostName are exact duplicates seemingly
Move into parent SpecialNova class
Modified Paths:
--------------
trunk/extensions/OpenStackManager/special/SpecialNova.php
trunk/extensions/OpenStackManager/special/SpecialNovaAddress.php
trunk/extensions/OpenStackManager/special/SpecialNovaInstance.php
Modified: trunk/extensions/OpenStackManager/special/SpecialNova.php
===================================================================
--- trunk/extensions/OpenStackManager/special/SpecialNova.php 2011-03-23
23:52:52 UTC (rev 84645)
+++ trunk/extensions/OpenStackManager/special/SpecialNova.php 2011-03-24
00:02:23 UTC (rev 84646)
@@ -54,4 +54,17 @@
$wgOut->addWikiMsg(
'openstackmanager-needcloudadminrole2' );
}
}
+
+ /**
+ * @param $hostname
+ * @param $alldata
+ * @return bool|string
+ */
+ function validateHostName( $hostname, $alldata ) {
+ if ( ! preg_match( "/^[a-z][a-z0-9\-]*$/", $hostname ) ) {
+ return Xml::element( 'span', array( 'class' => 'error'
), wfMsg( 'openstackmanager-badinstancename' ) );
+ } else {
+ return true;
+ }
+ }
}
Modified: trunk/extensions/OpenStackManager/special/SpecialNovaAddress.php
===================================================================
--- trunk/extensions/OpenStackManager/special/SpecialNovaAddress.php
2011-03-23 23:52:52 UTC (rev 84645)
+++ trunk/extensions/OpenStackManager/special/SpecialNovaAddress.php
2011-03-24 00:02:23 UTC (rev 84646)
@@ -664,19 +664,6 @@
$wgOut->addHTML( $out );
return true;
}
-
- /**
- * @param $hostname
- * @param $alldata
- * @return bool|string
- */
- function validateHostName( $hostname, $alldata ) {
- if ( ! preg_match( "/^[a-z][a-z0-9\-]*$/", $hostname ) ) {
- return Xml::element( 'span', array( 'class' => 'error'
), wfMsg( 'openstackmanager-badinstancename' ) );
- } else {
- return true;
- }
- }
}
class SpecialNovaAddressForm extends HTMLForm {
Modified: trunk/extensions/OpenStackManager/special/SpecialNovaInstance.php
===================================================================
--- trunk/extensions/OpenStackManager/special/SpecialNovaInstance.php
2011-03-23 23:52:52 UTC (rev 84645)
+++ trunk/extensions/OpenStackManager/special/SpecialNovaInstance.php
2011-03-24 00:02:23 UTC (rev 84646)
@@ -700,20 +700,6 @@
$wgOut->addHTML( $out );
return true;
}
-
- /**
- * @param $instancename
- * @param $alldata
- * @return bool|string
- */
- function validateInstanceName( $instancename, $alldata ) {
- if ( ! preg_match( "/^[a-z][a-z0-9\-]*$/", $instancename ) ) {
- return Xml::element( 'span', array( 'class' => 'error'
), wfMsg( 'openstackmanager-badinstancename' ) );
- } else {
- return true;
- }
- }
-
}
class SpecialNovaInstanceForm extends HTMLForm {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
