From ac5189157ef60820dd125400baee9f408a9ba2ea Mon Sep 17 00:00:00 2001 From: anuko Date: Tue, 28 Feb 2017 18:43:27 +0000 Subject: [PATCH] Some renaming. --- WEB-INF/lib/form/ActionForm.class.php | 4 ++-- WEB-INF/lib/form/Calendar.class.php | 2 +- WEB-INF/lib/form/Checkbox.class.php | 2 +- WEB-INF/lib/form/CheckboxGroup.class.php | 2 +- WEB-INF/lib/form/Combobox.class.php | 2 +- WEB-INF/lib/form/DateField.class.php | 2 +- WEB-INF/lib/form/FloatField.class.php | 2 +- WEB-INF/lib/form/FormElement.class.php | 8 ++++---- WEB-INF/lib/form/Hidden.class.php | 2 +- WEB-INF/lib/form/Submit.class.php | 2 +- WEB-INF/lib/form/Table.class.php | 2 +- WEB-INF/lib/form/TextArea.class.php | 2 +- WEB-INF/lib/form/TextField.class.php | 2 +- WEB-INF/lib/form/UploadFile.class.php | 2 +- WEB-INF/templates/footer.tpl | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) diff --git a/WEB-INF/lib/form/ActionForm.class.php b/WEB-INF/lib/form/ActionForm.class.php index dcd3811c..ee30f7d1 100644 --- a/WEB-INF/lib/form/ActionForm.class.php +++ b/WEB-INF/lib/form/ActionForm.class.php @@ -120,7 +120,7 @@ class ActionForm { $this->mValues[$name] = $value; if ($this->mForm) { if (isset($this->mForm->elements[$name])) { - if ($this->mForm->elements[$name]->cClassName=="DateField") { + if ($this->mForm->elements[$name]->class=="DateField") { $dt = new DateAndTime($user->date_format, $value); $value = $dt->toString(DB_DATEFORMAT); } @@ -149,7 +149,7 @@ class ActionForm { foreach ($this->mValues as $name=>$value) { if ($this->mForm) { if (isset($this->mForm->elements[$name])) { - if ($this->mForm->elements[$name]->cClassName=="DateField") { + if ($this->mForm->elements[$name]->class=="DateField") { $dt = new DateAndTime($user->date_format, $value); $value = $dt->toString(DB_DATEFORMAT); } diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php index 4257d26a..01bd354b 100644 --- a/WEB-INF/lib/form/Calendar.class.php +++ b/WEB-INF/lib/form/Calendar.class.php @@ -45,7 +45,7 @@ class Calendar extends FormElement { var $controlName = ""; var $highlight = "time"; // Determines what type of active days to highlight ("time" or "expenses"). // var $mAllDays = true; - var $cClassName = "Calendar"; + var $class = "Calendar"; function __construct($name) { $this->controlName = $name; diff --git a/WEB-INF/lib/form/Checkbox.class.php b/WEB-INF/lib/form/Checkbox.class.php index 6fe7ca18..8c20288a 100644 --- a/WEB-INF/lib/form/Checkbox.class.php +++ b/WEB-INF/lib/form/Checkbox.class.php @@ -31,7 +31,7 @@ import('form.FormElement'); class Checkbox extends FormElement { var $mChecked = false; var $mOptions = null; - var $cClassName = "Checkbox"; + var $class = 'Checkbox'; function __construct($name,$value="") { diff --git a/WEB-INF/lib/form/CheckboxGroup.class.php b/WEB-INF/lib/form/CheckboxGroup.class.php index 9d19d278..bbb7135b 100644 --- a/WEB-INF/lib/form/CheckboxGroup.class.php +++ b/WEB-INF/lib/form/CheckboxGroup.class.php @@ -33,7 +33,7 @@ class CheckboxGroup extends FormElement { var $mOptions = array(); var $mLayout = "V"; var $mGroupIn = 1; - var $cClassName = "CheckboxGroup"; + var $class = 'CheckboxGroup'; var $mDataKeys = array(); var $mDataDeep = 1; var $lSelAll = "All"; diff --git a/WEB-INF/lib/form/Combobox.class.php b/WEB-INF/lib/form/Combobox.class.php index 0a8bf89c..314f4b74 100644 --- a/WEB-INF/lib/form/Combobox.class.php +++ b/WEB-INF/lib/form/Combobox.class.php @@ -44,7 +44,7 @@ class Combobox extends FormElement { var $mCompareOn = "key"; // or "value" var $mDataDeep = 1; var $mDataKeys = array(); - var $cClassName = "Combobox"; + var $class = 'Combobox'; function __construct($name,$value="") { diff --git a/WEB-INF/lib/form/DateField.class.php b/WEB-INF/lib/form/DateField.class.php index 49c23544..46ff7b83 100644 --- a/WEB-INF/lib/form/DateField.class.php +++ b/WEB-INF/lib/form/DateField.class.php @@ -35,7 +35,7 @@ class DateField extends TextField { var $lToday = "Today"; var $mDateObj; - var $cClassName = "DateField"; + var $class = 'DateField'; var $lCalendarButtons = array('today'=>'Today', 'close'=>'Close'); diff --git a/WEB-INF/lib/form/FloatField.class.php b/WEB-INF/lib/form/FloatField.class.php index b5f8d0d4..c4e9d9ef 100644 --- a/WEB-INF/lib/form/FloatField.class.php +++ b/WEB-INF/lib/form/FloatField.class.php @@ -32,7 +32,7 @@ class FloatField extends TextField { var $mDelimiter = '.'; var $mFFormat; - var $cClassName = 'FloatField'; + var $class = 'FloatField'; function __construct($name) { $this->name = $name; diff --git a/WEB-INF/lib/form/FormElement.class.php b/WEB-INF/lib/form/FormElement.class.php index 20fdb07e..bd8cd6d8 100644 --- a/WEB-INF/lib/form/FormElement.class.php +++ b/WEB-INF/lib/form/FormElement.class.php @@ -39,15 +39,15 @@ class FormElement { var $label = ''; // Optional label for control. var $style = ''; // Control style. var $enabled = true; // Whether the control is enabled. - + var $class = 'FormElement'; // Class name for the element. + // TODO: refactoring ongoing down from here. - var $cClassName = "FormElement"; var $mI18n = null; function __construct() { } - function getClass() { return $this->cClassName; } + function getClass() { return $this->class; } function setName($name) { $this->name = $name; } function getName() { return $this->name; } @@ -55,7 +55,7 @@ class FormElement { function setFormName($name) { $this->form_name = $name; } function getFormName() { return $this->form_name; } - function setValue($value) { $this->value = $value;} + function setValue($value) { $this->value = $value; } function getValue() { return $this->value; } function setValueSafe($value) { $this->value = $value;} diff --git a/WEB-INF/lib/form/Hidden.class.php b/WEB-INF/lib/form/Hidden.class.php index cddb223a..57ed9aa2 100644 --- a/WEB-INF/lib/form/Hidden.class.php +++ b/WEB-INF/lib/form/Hidden.class.php @@ -29,7 +29,7 @@ import('form.FormElement'); class Hidden extends FormElement { - var $cClassName = "Hidden"; + var $class = 'Hidden'; function __construct($name,$value="") { diff --git a/WEB-INF/lib/form/Submit.class.php b/WEB-INF/lib/form/Submit.class.php index c6c917ed..947b368d 100644 --- a/WEB-INF/lib/form/Submit.class.php +++ b/WEB-INF/lib/form/Submit.class.php @@ -29,7 +29,7 @@ import('form.FormElement'); class Submit extends FormElement { - var $cClassName = "Submit"; + var $class = 'Submit'; function __construct($name,$value="") { diff --git a/WEB-INF/lib/form/Table.class.php b/WEB-INF/lib/form/Table.class.php index e0930095..98b330f3 100644 --- a/WEB-INF/lib/form/Table.class.php +++ b/WEB-INF/lib/form/Table.class.php @@ -41,7 +41,7 @@ class Table extends FormElement { var $mBgColor = '#ffffff'; var $mBgColorOver = '#eeeeff'; var $mWidth = ''; - var $cClassName = 'Table'; + var $class = 'Table'; var $mTableOptions = array(); var $mRowOptions = array(); var $mHeaderOptions = array(); diff --git a/WEB-INF/lib/form/TextArea.class.php b/WEB-INF/lib/form/TextArea.class.php index 4f176fb3..9c779179 100644 --- a/WEB-INF/lib/form/TextArea.class.php +++ b/WEB-INF/lib/form/TextArea.class.php @@ -32,7 +32,7 @@ class TextArea extends FormElement { var $mPassword = false; var $mColumns = ""; var $mRows = ""; - var $cClassName = "TextArea"; + var $class = 'TextArea'; var $mOnKeyPress = ""; function __construct($name,$value="") diff --git a/WEB-INF/lib/form/TextField.class.php b/WEB-INF/lib/form/TextField.class.php index 20b7fc6e..d7e38aef 100644 --- a/WEB-INF/lib/form/TextField.class.php +++ b/WEB-INF/lib/form/TextField.class.php @@ -30,7 +30,7 @@ import('form.FormElement'); class TextField extends FormElement { var $mPassword = false; - var $cClassName = "TextField"; + var $class = 'TextField'; function __construct($name,$value="") { diff --git a/WEB-INF/lib/form/UploadFile.class.php b/WEB-INF/lib/form/UploadFile.class.php index c3a32763..7e76d64c 100644 --- a/WEB-INF/lib/form/UploadFile.class.php +++ b/WEB-INF/lib/form/UploadFile.class.php @@ -29,7 +29,7 @@ import('form.FormElement'); class UploadFile extends FormElement { - var $cClassName = "UploadFile"; + var $class = 'UploadFile'; var $mMaxSize = 100000; // 100kb function __construct($name,$value="") diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index e5d8001d..36584cb3 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.10.38.3607 | Copyright © Anuko | +  Anuko Time Tracker 1.10.38.3608 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} -- 2.20.1