$continent = '';
foreach ($timezone_identifiers as $value) {
$ex = explode("/", $value);
$continent = '';
foreach ($timezone_identifiers as $value) {
$ex = explode("/", $value);
$options = str_replace('<select id="timezone_select" name="timezone">', '', $options);
$options = str_replace('</select>', '', $options);
$options = str_replace('<select id="timezone_select" name="timezone">', '', $options);
$options = str_replace('</select>', '', $options);
- $tpl = get_markup_template('field_select_raw.tpl');
- return replace_macros($tpl, [
+ $tpl = Renderer::getMarkupTemplate('field_select_raw.tpl');
+ return Renderer::replaceMacros($tpl, [
'$field' => [$name, $label, $current, $help, $options],
]);
}
'$field' => [$name, $label, $current, $help, $options],
]);
}
list($year, $month, $day) = sscanf($dob, '%4d-%2d-%2d');
if ($dob < '0000-01-01') {
list($year, $month, $day) = sscanf($dob, '%4d-%2d-%2d');
if ($dob < '0000-01-01') {
- $tpl = get_markup_template("field_input.tpl");
- $o = replace_macros($tpl,
+ $tpl = Renderer::getMarkupTemplate("field_input.tpl");
+ $o = Renderer::replaceMacros($tpl,
*/
public static function getDateField($min, $max, $default, $id = 'datepicker')
{
*/
public static function getDateField($min, $max, $default, $id = 'datepicker')
{
- return datetimesel($min, $max, $default, '', $id, true, false, '', '');
+ return self::getDateTimeField($min, $max, $default, '', $id, true, false, '', '');
- return datetimesel(new DateTime(), new DateTime(), new DateTime("$h:$m"), '', $id, false, true);
+ return self::getDateTimeField(new DateTime(), new DateTime(), new DateTime("$h:$m"), '', $id, false, true);
- * @param string $min Unix timestamp of minimum date
- * @param string $max Unix timestamp of maximum date
- * @param string $default Unix timestamp of default date
- * @param string $id Id and name of datetimepicker (defaults to "datetimepicker")
- * @param bool $pickdate true to show date picker (default)
- * @param bool $picktime true to show time picker (default)
- * @param string $minfrom set minimum date from picker with id $minfrom (none by default)
- * @param string $maxfrom set maximum date from picker with id $maxfrom (none by default)
- * @param bool $required default false
+ * @param DateTime $minDate Minimum date
+ * @param DateTime $maxDate Maximum date
+ * @param DateTime $defaultDate Default date
+ * @param string $id Id and name of datetimepicker (defaults to "datetimepicker")
+ * @param bool $pickdate true to show date picker (default)
+ * @param bool $picktime true to show time picker (default)
+ * @param string $minfrom set minimum date from picker with id $minfrom (none by default)
+ * @param string $maxfrom set maximum date from picker with id $maxfrom (none by default)
+ * @param bool $required default false
*
* @return string Parsed HTML output.
*
* @todo Once browser support is better this could probably be replaced with
* native HTML5 date picker.
*/
*
* @return string Parsed HTML output.
*
* @todo Once browser support is better this could probably be replaced with
* native HTML5 date picker.
*/
- public static function getDateTimeField($min, $max, $default, $label, $id = 'datetimepicker', $pickdate = true,
- $picktime = true, $minfrom = '', $maxfrom = '', $required = false)
+ public static function getDateTimeField(
+ DateTime $minDate,
+ DateTime $maxDate,
+ DateTime $defaultDate,
+ $label,
+ $id = 'datetimepicker',
+ $pickdate = true,
+ $picktime = true,
+ $minfrom = '',
+ $maxfrom = '',
+ $required = false)
{
// First day of the week (0 = Sunday)
$firstDay = PConfig::get(local_user(), 'system', 'first_day_of_week', 0);
{
// First day of the week (0 = Sunday)
$firstDay = PConfig::get(local_user(), 'system', 'first_day_of_week', 0);
// Check if the detected language is supported by the picker
if (!in_array($lang,
["ar", "ro", "id", "bg", "fa", "ru", "uk", "en", "el", "de", "nl", "tr", "fr", "es", "th", "pl", "pt", "ch", "se", "kr",
"it", "da", "no", "ja", "vi", "sl", "cs", "hu"])) {
// Check if the detected language is supported by the picker
if (!in_array($lang,
["ar", "ro", "id", "bg", "fa", "ru", "uk", "en", "el", "de", "nl", "tr", "fr", "es", "th", "pl", "pt", "ch", "se", "kr",
"it", "da", "no", "ja", "vi", "sl", "cs", "hu"])) {
- $minjs = $min ? ",minDate: new Date({$min->getTimestamp()}*1000), yearStart: " . $min->format('Y') : '';
- $maxjs = $max ? ",maxDate: new Date({$max->getTimestamp()}*1000), yearEnd: " . $max->format('Y') : '';
-
- $input_text = $default ? date($dateformat, $default->getTimestamp()) : '';
- $defaultdatejs = $default ? ",defaultDate: new Date({$default->getTimestamp()}*1000)" : '';
+ $input_text = $defaultDate ? date($dateformat, $defaultDate->getTimestamp()) : '';
- $pickers = '';
- if (!$pickdate) {
- $pickers .= ', datepicker: false';
- }
-
- if (!$picktime) {
- $pickers .= ',timepicker: false';
- }
-
- $extra_js = '';
- $pickers .= ",dayOfWeekStart: " . $firstDay . ",lang:'" . $lang . "'";
- if ($minfrom != '') {
- $extra_js .= "\$('#id_$minfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#id_$id').data('xdsoft_datetimepicker').setOptions({minDate: currentDateTime})}})";
- }
-
- if ($maxfrom != '') {
- $extra_js .= "\$('#id_$maxfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#id_$id').data('xdsoft_datetimepicker').setOptions({maxDate: currentDateTime})}})";
- }
+ $readable_format = str_replace(['Y', 'm', 'd', 'H', 'i'], ['yyyy', 'mm', 'dd', 'HH', 'MM'], $dateformat);
- $readable_format = $dateformat;
- $readable_format = str_replace('Y', 'yyyy', $readable_format);
- $readable_format = str_replace('m', 'mm', $readable_format);
- $readable_format = str_replace('d', 'dd', $readable_format);
- $readable_format = str_replace('H', 'HH', $readable_format);
- $readable_format = str_replace('i', 'MM', $readable_format);
-
- $tpl = get_markup_template('field_input.tpl');
- $o .= replace_macros($tpl,
- [
+ $tpl = Renderer::getMarkupTemplate('field_datetime.tpl');
+ $o .= Renderer::replaceMacros($tpl, [
$a = [12 * 30 * 24 * 60 * 60 => [L10n::t('year'), L10n::t('years')],
30 * 24 * 60 * 60 => [L10n::t('month'), L10n::t('months')],
7 * 24 * 60 * 60 => [L10n::t('week'), L10n::t('weeks')],
$a = [12 * 30 * 24 * 60 * 60 => [L10n::t('year'), L10n::t('years')],
30 * 24 * 60 * 60 => [L10n::t('month'), L10n::t('months')],
7 * 24 * 60 * 60 => [L10n::t('week'), L10n::t('weeks')],
public static function getDaysInMonth($y, $m)
{
return date('t', mktime(0, 0, 0, $m, 1, $y));
public static function getDaysInMonth($y, $m)
{
return date('t', mktime(0, 0, 0, $m, 1, $y));
}
$dn = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
}
$dn = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
- $f = get_first_dim($y, $m);
- $l = get_dim($y, $m);
+ $f = self::getFirstDayInMonth($y, $m);
+ $l = self::getDaysInMonth($y, $m);
$o = '<table class="calendar' . $class . '">';
$o .= "<caption>$str_month $y</caption><tr>";
for ($a = 0; $a < 7; $a ++) {
$o = '<table class="calendar' . $class . '">';
$o .= "<caption>$str_month $y</caption><tr>";
for ($a = 0; $a < 7; $a ++) {
- $o .= '<th>' . mb_substr(day_translate($dn[$a]), 0, 3, 'UTF-8') . '</th>';
+ $o .= '<th>' . mb_substr(L10n::getDay($dn[$a]), 0, 3, 'UTF-8') . '</th>';
$o .= "<td $today>";
$day = str_replace(' ', ' ', sprintf('%2.2d', $d));
if ($started) {
$o .= "<td $today>";
$day = str_replace(' ', ' ', sprintf('%2.2d', $d));
if ($started) {