diff -urN smeserver-vacation-1.1.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Uservacations.pm smeserver-vacation-1.1/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Uservacations.pm
--- smeserver-vacation-1.1.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Uservacations.pm 2020-05-19 15:20:01.103030370 +0100
+++ smeserver-vacation-1.1/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Uservacations.pm 2020-05-19 15:15:00.000000000 +0100
@@ -200,14 +200,23 @@
FullName => $user->prop('FirstName') . " " .$user->prop('LastName'),
status => $self->l($status),
EmailVacation => $EmailVacation,
- EmailVacationFrom => $EmailVacationFrom,
- EmailVacationTo => $EmailVacationTo,
+ EmailVacationFrom => showDate($EmailVacationFrom),
+ EmailVacationTo => showDate($EmailVacationTo),
Modify => $self->l('vac_MODIFY'),
}
}
return @data;
}
+sub showDate
+{
+ my $strDate = shift;
+ my ($Year,$Month,$Day) = ($strDate =~ /(\d{4})(\d{2})(\d{2})/);
+ #my $Unix = mktime(0,0,0,$Day,$Month,$Year);
+ return "$Year-$Month-$Day";
+}
+
+
sub modify_link
{
my ($data_item, $row, $field) = @_;
diff -urN smeserver-vacation-1.1.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/I18N/Modules/Uservacations/en.pm smeserver-vacation-1.1/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/I18N/Modules/Uservacations/en.pm
--- smeserver-vacation-1.1.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/I18N/Modules/Uservacations/en.pm 2020-05-19 15:20:01.103030370 +0100
+++ smeserver-vacation-1.1/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/I18N/Modules/Uservacations/en.pm 2020-05-19 15:18:00.000000000 +0100
@@ -15,8 +15,8 @@
',
'vac_LABEL_VACATION' =>'Vacation',
'vac_NO_FORWARDS'=>'No users found for forwarding',
-'vac_VACATION_FROM' =>'Vacation starts on
(YYYYMMDD)',
-'vac_VACATION_TO' =>'Vacation finishes on
(YYYYMMDD)',
+'vac_VACATION_FROM' =>'Vacation starts on
(YYYY-MM-DD)',
+'vac_VACATION_TO' =>'Vacation finishes on
(YYYY-MM-DD)',
'vac_VACATION_FROM1' =>'Vacation starts on',
'vac_VACATION_TO1' =>'Vacation finishes on',
'vac_MESSAGE' =>'Vacation message',