From 30470a2fe679c83c29259328c5ad60a32ce69d3d Mon Sep 17 00:00:00 2001 From: anuko Date: Mon, 6 Feb 2017 17:26:59 +0000 Subject: [PATCH] A bit of refactoring in Form.class.php. --- WEB-INF/lib/form/Form.class.php | 27 ++++++++++----------------- WEB-INF/templates/footer.tpl | 2 +- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/WEB-INF/lib/form/Form.class.php b/WEB-INF/lib/form/Form.class.php index 6b663a9e..14680db4 100644 --- a/WEB-INF/lib/form/Form.class.php +++ b/WEB-INF/lib/form/Form.class.php @@ -34,8 +34,10 @@ // +----------------------------------------------------------------------+ class Form { - var $formName = ""; - var $mAction = ""; + + var $name = ''; + // TODO: refactoring ongoing down from here. + var $mMethod = "post"; var $mEnctype = ""; var $mId = ""; @@ -46,7 +48,7 @@ class Form { // var $mFormBean; function __construct($formid) { - $this->formName = $formid; + $this->name = $formid; } function setRequest(&$request) { @@ -72,21 +74,15 @@ class Form { // name // onsubmit // onreset - function setName($value) { $this->formName = $value; } - function getName() { return $this->formName; } + function setName($value) { $this->name = $value; } + function getName() { return $this->name; } function setId($value) { $this->mId = $value; } function getId() { return $this->mId; } - function setAction($value) { $this->mAction = $value; } - function getAction() { return $this->mAction; } - function setMethod($value) { $this->mMethod = $value; } function getMethod() { return $this->mMethod; } - function setEnctype($value) { $this->mEnctype = $value; } - function getEnctype() { return $this->mEnctype; } - function isSubmit() { if (!isset($this->mRequest)) return false; $result = false; @@ -225,7 +221,7 @@ class Form { return($this->OutputError("Type not found for input element","AddInput")); } if ($el!=null) { - $el->setFormName($this->formName); + $el->setFormName($this->name); if (isset($arguments["id"])) $el->setId($arguments["id"]); if (isset($GLOBALS["I18N"])) $el->setLocalization($GLOBALS["I18N"]); if (isset($arguments["render"])) $el->setRenderable($arguments["render"]); @@ -251,21 +247,18 @@ class Form { if (isset($GLOBALS["I18N"])) $el->setLocalization($GLOBALS["I18N"]); - $el->setFormName($this->formName); + $el->setFormName($this->name); $this->mElements[$el->getName()] = &$el; } } function toStringOpenTag() { - $html = "
formName\""; + $html = "name\""; if ($this->mId!="") $html .= " id=\"$this->mId\""; - if ($this->mAction!="") - $html .= " action=\"$this->mAction\""; - if ($this->mMethod!="") $html .= " method=\"$this->mMethod\""; diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 81a80927..ec55d530 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.9.36.3566 | Copyright © Anuko | +  Anuko Time Tracker 1.9.36.3567 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} -- 2.20.1