Refactoring - removed unused stuff.

diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php
index e9d5097622e374ae1036b1d93e63c9215ea5edf6..4257d26a58d2eadd94a000e16061c9a2668103cf 100644 (file)
--- a/WEB-INF/lib/form/Calendar.class.php
+++ b/WEB-INF/lib/form/Calendar.class.php
@@ -93,8 +93,6 @@ class Calendar extends FormElement {
       $indate = $this->value;
       if (!$indate) $indate = strftime(DB_DATEFORMAT);
 
-      if (!$this->isRenderable()) return "";
-
       //current year and month
       if ( strlen ( $indate ) > 0 ) {
         $indateObj = new DateAndTime(DB_DATEFORMAT, $indate);

diff --git a/WEB-INF/lib/form/Checkbox.class.php b/WEB-INF/lib/form/Checkbox.class.php
index 7a49a6fb5b984e0c56dd7dd182ef4d60c2f29eda..37189625c2ddc91320a6ba088976cf4072e2fc35 100644 (file)
--- a/WEB-INF/lib/form/Checkbox.class.php
+++ b/WEB-INF/lib/form/Checkbox.class.php
@@ -45,9 +45,8 @@ class Checkbox extends FormElement {
        function setData($value)        { $this->mOptions = $value; }
        function getData() { return $this->mOptions; }
        
-       function toStringControl()      {
-               if (!$this->isRenderable()) return "";
-           
+       function toStringControl() {
+
            if ($this->id=="") $this->id = $this->name;
            
                $html = "\n\t<input type=\"checkbox\"";

diff --git a/WEB-INF/lib/form/CheckboxGroup.class.php b/WEB-INF/lib/form/CheckboxGroup.class.php
index 21a9e35c436b2f2f41ea9dbf265e4123a2b72c7f..9d19d2785c47be1fd51345bf0c3b2f64717d6415 100644 (file)
--- a/WEB-INF/lib/form/CheckboxGroup.class.php
+++ b/WEB-INF/lib/form/CheckboxGroup.class.php
@@ -66,9 +66,8 @@ class CheckboxGroup extends FormElement {
                $this->lSelNone = $i18n->getKey('label.select_none');
        }
                
-       function toStringControl()      {
-               if (!$this->isRenderable()) return "";
-           
+       function toStringControl() {
+
            if ($this->id=="") $this->id = $this->name;
            
            $renderArray = array();

diff --git a/WEB-INF/lib/form/Combobox.class.php b/WEB-INF/lib/form/Combobox.class.php
index 190819489c9661672cf33c171e20588b94416037..e253e8ec2e62f1ac9b97f80536e06a88a5501152 100644 (file)
--- a/WEB-INF/lib/form/Combobox.class.php
+++ b/WEB-INF/lib/form/Combobox.class.php
@@ -65,9 +65,8 @@ class Combobox extends FormElement {
        function getDataKeys() { return $this->mDataKeys; }
        
        
-       function toStringControl()      {
-               if (!$this->isRenderable()) return "";
-           
+       function toStringControl() {
+
            if ($this->id=="") $this->id = $this->name;
            
                $html = "\n\t<select";

diff --git a/WEB-INF/lib/form/DateField.class.php b/WEB-INF/lib/form/DateField.class.php
index b85632d585c74fe60bf32a24608fb350b9ce91b8..d2331387dc5168f238c0e0cfde30a907b91e721e 100644 (file)
--- a/WEB-INF/lib/form/DateField.class.php
+++ b/WEB-INF/lib/form/DateField.class.php
@@ -81,8 +81,7 @@ class DateField extends TextField {
     }
   }
 
-  function toStringControl()  {
-    if (!$this->isRenderable()) return "";
+  function toStringControl() {
 
     if (!$this->isEnable()) {
       $html = htmlspecialchars($this->getValue()).

diff --git a/WEB-INF/lib/form/FormElement.class.php b/WEB-INF/lib/form/FormElement.class.php
index 384dbebd17c23f6f506f56847afa43fbca44d6d9..fde8b40094ab30464cb0e803b2e2b3b0e9791764 100644 (file)
--- a/WEB-INF/lib/form/FormElement.class.php
+++ b/WEB-INF/lib/form/FormElement.class.php
@@ -40,7 +40,6 @@ class FormElement {
   var $style = '';      // Control style.
 
   // TODO: refactoring ongoing down from here.
-       var $mRenderable    = true;
        var $mEnabled           = true;
        var $cClassName         = "FormElement";
        var $mI18n                      = null;
@@ -76,10 +75,7 @@ class FormElement {
 
        function setStyle($value) { $this->style = $value; }
        function getStyle() { return $this->style; }
-       
-       function setRenderable($flag)   { $this->mRenderable = $flag;   }
-       function isRenderable() { return $this->mRenderable; }
-       
+
        function setEnable($flag)       { $this->mEnabled = $flag;      }
        function isEnable()     { return $this->mEnabled; }
        

diff --git a/WEB-INF/lib/form/Submit.class.php b/WEB-INF/lib/form/Submit.class.php
index ba3d698c89b341d8e65f5da07dc3df80bf9cf299..236fdb4bd9f2dc7a0c4eb8489ca8543768b28d6c 100644 (file)
--- a/WEB-INF/lib/form/Submit.class.php
+++ b/WEB-INF/lib/form/Submit.class.php
@@ -37,8 +37,7 @@ class Submit extends FormElement {
                $this->value = $value;
        }
 
-       function toStringControl()      {
-               if (!$this->isRenderable()) return "";
+       function toStringControl() {
            
            if ($this->id=="") $this->id = $this->name;
            

diff --git a/WEB-INF/lib/form/Table.class.php b/WEB-INF/lib/form/Table.class.php
index 44685d46c9b029ba056fe1966e28944ad3bab790..e0930095bc6e2637a5453aca16fedc5c46a42bab 100644 (file)
--- a/WEB-INF/lib/form/Table.class.php
+++ b/WEB-INF/lib/form/Table.class.php
@@ -95,9 +95,9 @@ class Table extends FormElement {
   }
 
   function _process() {
-       $this->mProccessed = true;
+    $this->mProccessed = true;
        
-       if ($this->mInteractive) {
+    if ($this->mInteractive) {
       // Add a column of clickable checkboxes.
       $column = new TableColumn("","<input type=\"checkbox\" name=\"".$this->getName()."_all\" onclick=\"setAll(this.checked)\">");
       import('form.CheckboxCellRenderer');
@@ -115,7 +115,6 @@ class Table extends FormElement {
   }
   
   function toStringControl() {
-    if (!$this->isRenderable()) return "";
     if (!$this->mProccessed) $this->_process();
     
     $html = "";

diff --git a/WEB-INF/lib/form/TextArea.class.php b/WEB-INF/lib/form/TextArea.class.php
index 784803b224e9098c81d592fe1ecba937fd824eb4..4f176fb37a99024ce264d8c2824d45b6f4e0dcc0 100644 (file)
--- a/WEB-INF/lib/form/TextArea.class.php
+++ b/WEB-INF/lib/form/TextArea.class.php
@@ -47,9 +47,8 @@ class TextArea extends FormElement {
        function setRows($value)        { $this->mRows = $value;        }
        function getRows()      { return $this->mRows; }
        
-       function toStringControl()      {
-               if (!$this->isRenderable()) return "";
-           
+       function toStringControl() {
+    
            if ($this->id=="") $this->id = $this->mName;
            
            $js_maxlen = "";

diff --git a/WEB-INF/lib/form/TextField.class.php b/WEB-INF/lib/form/TextField.class.php
index e4d58659c89420bb9b5c9408c6ee921e9fec31e6..9107c963d73177a063c76a7afc8dbaa7cb27c572 100644 (file)
--- a/WEB-INF/lib/form/TextField.class.php
+++ b/WEB-INF/lib/form/TextField.class.php
@@ -41,9 +41,7 @@ class TextField extends FormElement {
        function setAsPassword($name)   { $this->mPassword = $name;     }
        function getAsPassword()        { return $this->mPassword; }
 
-       function toStringControl()      {
-               if (!$this->isRenderable()) return "";
-           
+       function toStringControl() {
                if (!$this->isEnable()) {
                        $html = "<input name=\"$this->name\" value=\"".htmlspecialchars($this->getValue())."\" readonly>\n";
                } else {

diff --git a/WEB-INF/lib/form/UploadFile.class.php b/WEB-INF/lib/form/UploadFile.class.php
index 97a2a8ca12b41c3b88b1252cdbaa6f446819125a..c3a32763a623d16687a5cfb82a3810c80240319f 100644 (file)
--- a/WEB-INF/lib/form/UploadFile.class.php
+++ b/WEB-INF/lib/form/UploadFile.class.php
@@ -41,10 +41,9 @@ class UploadFile extends FormElement {
        function setMaxSize($value)     { $this->mMaxSize = $value;     }
        function getMaxSize()   { return $this->mMaxSize; }
        
-       function toStringControl()      {
-               if (!$this->isRenderable()) return "";
-           
-           if ($this->id=="") $this->id = $this->name;
+       function toStringControl() {
+
+            if ($this->id=="") $this->id = $this->name;
            
                $html = "\n\t<input type=\"hidden\" name=\"MAX_FILE_SIZE\" value=\"".$this->mMaxSize."\"/>";
                $html .= "\n\t<input";

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 22ef89010bb0754ae154bbc967e6fcafa9a34a29..dda285d878a962851e57f5cc8ccc465f77384bba 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.3604 | 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.3605 | 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>