Further refactoring of the FormElement class to simplify things.

diff --git a/WEB-INF/lib/form/CheckboxCellRenderer.class.php b/WEB-INF/lib/form/CheckboxCellRenderer.class.php
index 8ebfd6d..d117c12 100644 (file)
--- a/WEB-INF/lib/form/CheckboxCellRenderer.class.php
+++ b/WEB-INF/lib/form/CheckboxCellRenderer.class.php
@@ -33,7 +33,7 @@ class CheckboxCellRenderer extends DefaultCellRenderer {
   function render(&$table, $value, $row, $column, $selected = false) {
     $html = '<td';
     $html .= ($this->mWidth!='' ? ' width="'.$this->mWidth.'"' : '');
-    $html .= "><input name=\"".$table->getName()."[]\" id=\"".$table->getName()."_".$row."\" type=\"checkbox\" value=\"".$value."\"";
+    $html .= "><input name=\"".$table->name."[]\" id=\"".$table->name."_".$row."\" type=\"checkbox\" value=\"".$value."\"";
     if($this->getOnChangeAdd()) {
       $html .= " onclick=\"".$this->getOnChangeAdd()."\"";
     }

diff --git a/WEB-INF/lib/form/CheckboxGroup.class.php b/WEB-INF/lib/form/CheckboxGroup.class.php
index bbb7135..9f5cc05 100644 (file)
--- a/WEB-INF/lib/form/CheckboxGroup.class.php
+++ b/WEB-INF/lib/form/CheckboxGroup.class.php
@@ -132,7 +132,7 @@ class CheckboxGroup extends FormElement {
            
            
            $html = "\n\t<table style=\"".$this->style."\"><tr><td align=\"center\" bgcolor=\"eeeeee\">\n";
-           $html .= '<a href="#" onclick="setAll'.$this->getName().'(true);return false;">'.$this->lSelAll.'</a>&nbsp;/&nbsp;<a href="#" onclick="setAll'.$this->getName().'(false);return false;">'.$this->lSelNone.'</a>';
+           $html .= '<a href="#" onclick="setAll'.$this->name.'(true);return false;">'.$this->lSelAll.'</a>&nbsp;/&nbsp;<a href="#" onclick="setAll'.$this->name.'(false);return false;">'.$this->lSelNone.'</a>';
            $html .= "</td></tr>\n";
            $html .= "<tr><td>";
            $html .= "\n\t<table width=\"100%\">\n";
@@ -147,10 +147,10 @@ class CheckboxGroup extends FormElement {
            $html .= "</td></tr></table>\n";
            
            $str = "<script>\n";
-               $str .= "function setAll".$this->getName()."(value) {\n";
+               $str .= "function setAll".$this->name."(value) {\n";
                $str .= "\tvar formInputs = document.getElementsByTagName(\"input\");\n";
                $str .= "\tfor (var i = 0; i < formInputs.length; i++) {\n";
-        $str .= "\t\tif ((formInputs.item(i).type=='checkbox') && (formInputs.item(i).name=='".$this->getName()."[]')) {\n";
+        $str .= "\t\tif ((formInputs.item(i).type=='checkbox') && (formInputs.item(i).name=='".$this->name."[]')) {\n";
         $str .= "\t\tformInputs.item(i).checked=value;\n";
         $str .= "\t}\n}\n";
                $str .= "}\n";

diff --git a/WEB-INF/lib/form/Form.class.php b/WEB-INF/lib/form/Form.class.php
index 2c16f25..ceaed43 100644 (file)
--- a/WEB-INF/lib/form/Form.class.php
+++ b/WEB-INF/lib/form/Form.class.php
@@ -162,7 +162,7 @@ class Form {
                        if (isset($GLOBALS["I18N"])) $el->setLocalization($GLOBALS["I18N"]);
                
                        $el->setFormName($this->name);
-                       $this->elements[$el->getName()] = &$el;
+                       $this->elements[$el->name] = &$el;
                }
        }
        

diff --git a/WEB-INF/lib/form/FormElement.class.php b/WEB-INF/lib/form/FormElement.class.php
index 260fbef..c6182d3 100644 (file)
--- a/WEB-INF/lib/form/FormElement.class.php
+++ b/WEB-INF/lib/form/FormElement.class.php
@@ -44,12 +44,10 @@ class FormElement {
   function __construct() {
   }
 
+  function getName() { return $this->name; }
   function getClass() { return $this->class; }
-
+  
   // TODO: refactoring ongoing down from here.
-       function setName($name) { $this->name = $name; }
-       function getName()      { return $this->name; }
-       
        function setFormName($name) { $this->form_name = $name; }
        function getFormName()  { return $this->form_name; }
        

diff --git a/WEB-INF/lib/form/Table.class.php b/WEB-INF/lib/form/Table.class.php
index 98b330f..ea0d28e 100644 (file)
--- a/WEB-INF/lib/form/Table.class.php
+++ b/WEB-INF/lib/form/Table.class.php
@@ -99,7 +99,7 @@ class Table extends FormElement {
        
     if ($this->mInteractive) {
       // Add a column of clickable checkboxes.
-      $column = new TableColumn("","<input type=\"checkbox\" name=\"".$this->getName()."_all\" onclick=\"setAll(this.checked)\">");
+      $column = new TableColumn("","<input type=\"checkbox\" name=\"".$this->name."_all\" onclick=\"setAll(this.checked)\">");
       import('form.CheckboxCellRenderer');
       $cb = new CheckboxCellRenderer();
       if ($this->getIAScript()) $cb->setOnChangeAdd($this->getIAScript()."(this)");
@@ -190,7 +190,7 @@ class Table extends FormElement {
     // setAll - checks / unchecks all checkboxes in the table.
     $html .= "function setAll(value) {\n";
     $html .= "\tfor (var i = 0; i < ".$this->getFormName().".elements.length; i++) {\n";
-    $html .= "\t\tif ((".$this->getFormName().".elements[i].type=='checkbox') && (".$this->getFormName().".elements[i].name=='".$this->getName()."[]')) {\n";
+    $html .= "\t\tif ((".$this->getFormName().".elements[i].type=='checkbox') && (".$this->getFormName().".elements[i].name=='".$this->name."[]')) {\n";
     $html .= "\t\t\t".$this->getFormName().".elements[i].checked=value;\n";
     if ($this->getIAScript()) {
       $html .= "\t\t\t".$this->getIAScript()."(".$this->getFormName().".elements[i]);\n";

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index ca09cf3..383e2a8 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.10.38.3609 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.10.38.3610 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/user_add.php b/user_add.php
index a00528b..08d66a7 100644 (file)
--- a/user_add.php
+++ b/user_add.php
@@ -98,7 +98,7 @@ $projects = ttTeamHelper::getActiveProjects($user->team_id);
 class NameCellRenderer extends DefaultCellRenderer {
   function render(&$table, $value, $row, $column, $selected = false) {
     $this->setOptions(array('width'=>200,'valign'=>'top'));
-    $this->setValue('<label for = "'.$table->getName().'_'.$row.'">'.htmlspecialchars($value).'</label>');
+    $this->setValue('<label for = "'.$table->name.'_'.$row.'">'.htmlspecialchars($value).'</label>');
     return $this->toString();
   }
 }

diff --git a/user_edit.php b/user_edit.php
index ac1143f..8f71e55 100644 (file)
--- a/user_edit.php
+++ b/user_edit.php
@@ -128,7 +128,7 @@ $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','for
 class NameCellRenderer extends DefaultCellRenderer {
   function render(&$table, $value, $row, $column, $selected = false) {
     $this->setOptions(array('width'=>200,'valign'=>'top'));
-    $this->setValue('<label for = "'.$table->getName().'_'.$row.'">'.htmlspecialchars($value).'</label>');
+    $this->setValue('<label for = "'.$table->name.'_'.$row.'">'.htmlspecialchars($value).'</label>');
     return $this->toString();
   }
 }