projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More improvements in Italian translation.
[timetracker.git]
/
WEB-INF
/
lib
/
form
/
DateField.class.php
diff --git
a/WEB-INF/lib/form/DateField.class.php
b/WEB-INF/lib/form/DateField.class.php
index
aa8a149
..
f8eef8c
100644
(file)
--- a/
WEB-INF/lib/form/DateField.class.php
+++ b/
WEB-INF/lib/form/DateField.class.php
@@
-33,25
+33,21
@@
class DateField extends TextField {
var $mWeekStartDay = 0;
var $mDateFormat = "d/m/Y";
var $lToday = "Today";
var $mWeekStartDay = 0;
var $mDateFormat = "d/m/Y";
var $lToday = "Today";
-
var $mDateObj;
var $mDateObj;
- var $cClassName = "DateField";
var $lCalendarButtons = array('today'=>'Today', 'close'=>'Close');
var $lCalendarButtons = array('today'=>'Today', 'close'=>'Close');
- function DateField($name) {
- $this->mName = $name;
- $this->mDateObj = new DateAndTime();
-
- if (isset($GLOBALS["I18N"])) {
- $this->setLocalization($GLOBALS["I18N"]);
- }
+ function __construct($name) {
+ $this->class = 'DateField';
+ $this->name = $name;
+ $this->mDateObj = new DateAndTime();
+ $this->localize();
}
}
- function setLocalization($i18n) {
- global $user;
+ function localize() {
+ global $user;
+ global $i18n;
- FormElement::setLocalization($i18n);
$this->mDateObj->setFormat($user->date_format);
$this->mMonthNames = $i18n->monthNames;
$this->mDateObj->setFormat($user->date_format);
$this->mMonthNames = $i18n->monthNames;
@@
-68,28
+64,28
@@
class DateField extends TextField {
function setValueSafe($value) {
if (isset($value) && (strlen($value) > 0)) {
$this->mDateObj->parseVal($value, DB_DATEFORMAT);
function setValueSafe($value) {
if (isset($value) && (strlen($value) > 0)) {
$this->mDateObj->parseVal($value, DB_DATEFORMAT);
- $this->
mV
alue = $this->mDateObj->toString($this->mDateFormat); //?
+ $this->
v
alue = $this->mDateObj->toString($this->mDateFormat); //?
}
}
// get value for storing in session or database
function getValueSafe() {
}
}
// get value for storing in session or database
function getValueSafe() {
- if (strlen($this->
mV
alue)>0) {
- $this->mDateObj->parseVal($this->
mV
alue, $this->mDateFormat); //?
+ if (strlen($this->
v
alue)>0) {
+ $this->mDateObj->parseVal($this->
v
alue, $this->mDateFormat); //?
return $this->mDateObj->toString(DB_DATEFORMAT);
} else {
return null;
}
}
return $this->mDateObj->toString(DB_DATEFORMAT);
} else {
return null;
}
}
- function
toStringControl()
{
-
if (!$this->isRenderable()) return ""
;
+ function
getHtml()
{
+
global $user
;
- if (!$this->isEnable()) {
+ if (!$this->isEnable
d
()) {
$html = htmlspecialchars($this->getValue()).
$html = htmlspecialchars($this->getValue()).
- "<input type=\"hidden\" name=\"$this->
mN
ame\" value=\"".htmlspecialchars($this->getValue())."\">\n";
+ "<input type=\"hidden\" name=\"$this->
n
ame\" value=\"".htmlspecialchars($this->getValue())."\">\n";
} else {
} else {
- if ($this->
mId=="") $this->mId = $this->mN
ame;
+ if ($this->
id=="") $this->id = $this->n
ame;
$html = "";
$html = "";
@@
-299,9
+295,7
@@
class DateField extends TextField {
function getDateString(dateVal) {\n";
function getDateString(dateVal) {\n";
- if (isset($GLOBALS['i18n'])) {
- $html .= "dateVal.locale = \"".$GLOBALS['i18n']->lang."\";\n";
- }
+ $html .= "dateVal.locale = \"".$user->lang."\";\n";
$html .= "return dateVal.strftime(dateFormat);
}
$html .= "return dateVal.strftime(dateFormat);
}
@@
-393,27
+387,21
@@
class DateField extends TextField {
$html .= "</script>\n";
$html .= "\n\t<input type=\"text\"";
$html .= "</script>\n";
$html .= "\n\t<input type=\"text\"";
- $html .= " name=\"$this->
mName\" id=\"$this->mI
d\"";
+ $html .= " name=\"$this->
name\" id=\"$this->i
d\"";
- if ($this->
mS
ize!="")
- $html .= " size=\"$this->
mS
ize\"";
+ if ($this->
s
ize!="")
+ $html .= " size=\"$this->
s
ize\"";
- if ($this->
mS
tyle!="")
- $html .= " style=\"$this->
mS
tyle\"";
+ if ($this->
s
tyle!="")
+ $html .= " style=\"$this->
s
tyle\"";
$html .= " maxlength=\"50\"";
$html .= " maxlength=\"50\"";
- if ($this->mOnChange!="")
- $html .= " onchange=\"$this->mOnChange\"";
-
- if ($this->mOnBlur!="")
- $html .= " onblur=\"$this->mOnBlur\"";
-
- if ($this->mOnClick!="")
- $html .= " onclick=\"$this->mOnClick\"";
+ if ($this->on_change!="")
+ $html .= " onchange=\"$this->on_change\"";
- if ($this->
mOnFocus
!="")
- $html .= " on
focus=\"$this->mOnFocus
\"";
+ if ($this->
on_click
!="")
+ $html .= " on
click=\"$this->on_click
\"";
$html .= " value=\"".htmlspecialchars($this->getValue())."\"";
$html .= ">";
$html .= " value=\"".htmlspecialchars($this->getValue())."\"";
$html .= ">";
@@
-421,10
+409,9
@@
class DateField extends TextField {
if (APP_NAME)
$app_root = '/'.APP_NAME;
if (APP_NAME)
$app_root = '/'.APP_NAME;
- $html .= " <img src=\"".$app_root."/images/calendar.gif\" width=\"16\" height=\"16\" onclick=\"displayDatePicker('".$this->
mN
ame."');\">\n";
+ $html .= " <img src=\"".$app_root."/images/calendar.gif\" width=\"16\" height=\"16\" onclick=\"displayDatePicker('".$this->
n
ame."');\">\n";
}
return $html;
}
}
}
return $html;
}
}
-?>
\ No newline at end of file