Finished refactoring of the FormElement class.

Author: anuko

WEB-INF/lib/form/Calendar.class.php

@@ -222,7 +222,7 @@ function toString($date="") {
       return $str;
     }
 
-    function toStringControl() {
+    function getHtml() {
         return $this->toString();
     }
 

WEB-INF/lib/form/Checkbox.class.php

@@ -45,7 +45,7 @@ function isChecked() { return $this->mChecked; }
 	function setData($value)	{ $this->mOptions = $value; }
 	function getData() { return $this->mOptions; }
 
-	function toStringControl() {
+	function getHtml() {
 
 	    if ($this->id=="") $this->id = $this->name;
 

WEB-INF/lib/form/CheckboxGroup.class.php

@@ -65,7 +65,7 @@ function localize($i18n) {
 		$this->lSelNone = $i18n->getKey('label.select_none');
 	}
 
-	function toStringControl() {
+	function getHtml() {
 
 	    if ($this->id=="") $this->id = $this->name;
 

WEB-INF/lib/form/Combobox.class.php

@@ -65,7 +65,7 @@ function setDataKeys($keys)	{ $this->mDataKeys = $keys; $this->mDataDeep = 2; }
 	function getDataKeys() { return $this->mDataKeys; }
 
 
-	function toStringControl() {
+	function getHtml() {
 
 	    if ($this->id=="") $this->id = $this->name;
 

WEB-INF/lib/form/DateField.class.php

@@ -80,7 +80,7 @@ function getValueSafe() {
     }
   }
 
-  function toStringControl() {
+  function getHtml() {
 
     if (!$this->isEnabled()) {
       $html = htmlspecialchars($this->getValue()).

WEB-INF/lib/form/Form.class.php

@@ -188,7 +188,7 @@ function toStringCloseTag() {
     	$html = "\n";
     	foreach ($this->elements as $elname=>$el) {
             if (strtolower(get_class($this->elements[$elname]))=="hidden") {
-            	$html .= $this->elements[$elname]->toStringControl()."\n";
+                $html .= $this->elements[$elname]->getHtml()."\n";
             }
         }
         $html .= "</form>";

WEB-INF/lib/form/FormElement.class.php

@@ -84,30 +84,15 @@ function setOnClick($str) { $this->on_click = $str; }
   function localize($i18n) {} // Localization occurs in derived classes and is dependent on control type.
                               // For example, in calendar control we need to localize day and month names.
 
-  // TODO: refactoring ongoing down from here.
+  // getHtml returns HTML for the element.
+  function getHtml() { return ''; }
 
+  // getLabelHtml returns HTML code for element label.
+  function getLabelHtml() { return '<label for="'.$this->id.'">'.$this->label.'</label>'; }
 
-
-
-
-	
-
-
-
-	
-	function toStringControl()	{
-		return "";
-	}
-
-	function toStringLabel() {
-	    return "<label for=\"" . $this->id . "\">" . $this->label . "</label>";
-	}
-	
-	function toArray() {
-	    return array(
-	             "label"=>$this->toStringLabel(),
-	             "control"=>$this->toStringControl()
-	           );
-	}
-
+  function toArray() {
+    return array(
+      'label'=>$this->getLabelHtml(),
+      'control'=>$this->getHtml());
+  }
 }

WEB-INF/lib/form/Hidden.class.php

@@ -37,7 +37,7 @@ function __construct($name,$value="")
 		$this->value = $value;
 	}
 
-	function toStringControl()	{
+	function getHtml()	{
 
 	    if ($this->id=="") $this->id = $this->name;
 

WEB-INF/lib/form/Submit.class.php

@@ -37,7 +37,7 @@ function __construct($name,$value="")
 		$this->value = $value;
 	}
 
-	function toStringControl() {
+	function getHtml() {
 
 	    if ($this->id=="") $this->id = $this->name;
 

WEB-INF/lib/form/Table.class.php

@@ -114,7 +114,7 @@ function _process() {
     }
   }
 
-  function toStringControl() {
+  function getHtml() {
     if (!$this->mProccessed) $this->_process();
 
     $html = "";