COnvert the setHelp method(s) to accept conventioanl printf style argument lists. e.g.: setHelp("%d interfaces have been detected", $numIfs);

3 files changed, 21 insertions, 22 deletions

diff --git a/src/usr/local/www/classes/Form/Group.class.php b/src/usr/local/www/classes/Form/Group.class.php
index ae0a155..65dd66f 100644
--- a/src/usr/local/www/classes/Form/Group.class.php
+++ b/src/usr/local/www/classes/Form/Group.class.php
@@ -54,10 +54,16 @@ class Form_Group extends Form_Element
 		$this->_labelTarget = $input;
 	}
 
-	public function setHelp($help, array $params = array())
+	public function setHelp()
 	{
-		$this->_help = $help;
-		$this->_helpParams = $params;
+		$args = func_get_args();
+
+		if (strlen($args[0]) < 4096) {
+			$args[0] = gettext($args[0]);
+		}
+
+		$this->_help = call_user_func_array('sprintf', $args);
+		$this->_helpParams = "";
 
 		return $this;
 	}
@@ -86,10 +92,7 @@ class Form_Group extends Form_Element
 		$group = new Form_Element;
 		$group->addClass('col-sm-'. Form::MAX_INPUT_WIDTH, 'col-sm-offset-'. Form::LABEL_WIDTH);
 
-		$help = gettext($this->_help);
-
-		if (!empty($this->_helpParams))
-			$help = call_user_func_array('sprintf', array_merge([$help], $this->_helpParams));
+		$help = $this->_help;
 
 		return <<<EOT
 	{$group}
diff --git a/src/usr/local/www/classes/Form/Input.class.php b/src/usr/local/www/classes/Form/Input.class.php
index 7a05d76..a120991 100644
--- a/src/usr/local/www/classes/Form/Input.class.php
+++ b/src/usr/local/www/classes/Form/Input.class.php
@@ -110,10 +110,16 @@ class Form_Input extends Form_Element
 		return $this->_tagName;
 	}
 
-	public function setHelp($help, array $params = array())
+	public function setHelp()
 	{
-		$this->_help = $help;
-		$this->_helpParams = $params;
+		$args = func_get_args();
+
+		if (strlen($args[0]) < 4096) {
+			$args[0] = gettext($args[0]);
+		}
+
+		$this->_help = call_user_func_array('sprintf', $args);
+		$this->_helpParams = "";
 
 		return $this;
 	}
@@ -239,17 +245,7 @@ class Form_Input extends Form_Element
 
 		if (!empty($this->_help))
 		{
-			/* Strings longer than this will break gettext. */
-			if (strlen($this->_help) < 4096) {
-				$help = gettext($this->_help);
-			} else {
-				$help = $this->_help;
-			}
-
-			if (!empty($this->_helpParams))
-				$help = call_user_func_array('sprintf', array_merge([$help], $this->_helpParams));
-
-			$help = '<span class="help-block">'. $help .'</span>';
+			$help = '<span class="help-block">'. $this->_help .'</span>';
 		}
 
 		return <<<EOT
diff --git a/src/usr/local/www/classes/Form/MultiCheckbox.class.php b/src/usr/local/www/classes/Form/MultiCheckbox.class.php
index 104f9e7..907b8ff 100644
--- a/src/usr/local/www/classes/Form/MultiCheckbox.class.php
+++ b/src/usr/local/www/classes/Form/MultiCheckbox.class.php
@@ -22,7 +22,7 @@
 
 class Form_MultiCheckbox extends Form_Checkbox
 {
-	public function setHelp($help, array $params = array())
+	public function setHelp()
 	{
 		throw new Exception('MultiCheckboxes do not support help-texts, please use $group->setHelp instead');
 	}