| 1 |
brianr |
1.1 |
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 |
| 2 |
|
|
--- 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 |
| 3 |
|
|
+++ 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 |
| 4 |
|
|
@@ -200,14 +200,23 @@ |
| 5 |
|
|
FullName => $user->prop('FirstName') . " " .$user->prop('LastName'), |
| 6 |
|
|
status => $self->l($status), |
| 7 |
|
|
EmailVacation => $EmailVacation, |
| 8 |
|
|
- EmailVacationFrom => $EmailVacationFrom, |
| 9 |
|
|
- EmailVacationTo => $EmailVacationTo, |
| 10 |
|
|
+ EmailVacationFrom => showDate($EmailVacationFrom), |
| 11 |
|
|
+ EmailVacationTo => showDate($EmailVacationTo), |
| 12 |
|
|
Modify => $self->l('vac_MODIFY'), |
| 13 |
|
|
} |
| 14 |
|
|
} |
| 15 |
|
|
return @data; |
| 16 |
|
|
} |
| 17 |
|
|
|
| 18 |
|
|
+sub showDate |
| 19 |
|
|
+{ |
| 20 |
|
|
+ my $strDate = shift; |
| 21 |
|
|
+ my ($Year,$Month,$Day) = ($strDate =~ /(\d{4})(\d{2})(\d{2})/); |
| 22 |
|
|
+ #my $Unix = mktime(0,0,0,$Day,$Month,$Year); |
| 23 |
|
|
+ return "$Year-$Month-$Day"; |
| 24 |
|
|
+} |
| 25 |
|
|
+ |
| 26 |
|
|
+ |
| 27 |
|
|
sub modify_link |
| 28 |
|
|
{ |
| 29 |
|
|
my ($data_item, $row, $field) = @_; |
| 30 |
|
|
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 |
| 31 |
|
|
--- 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 |
| 32 |
|
|
+++ 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 |
| 33 |
|
|
@@ -15,8 +15,8 @@ |
| 34 |
|
|
', |
| 35 |
|
|
'vac_LABEL_VACATION' =>'Vacation', |
| 36 |
|
|
'vac_NO_FORWARDS'=>'No users found for forwarding', |
| 37 |
|
|
-'vac_VACATION_FROM' =>'Vacation starts on <br>(YYYYMMDD)', |
| 38 |
|
|
-'vac_VACATION_TO' =>'Vacation finishes on <br>(YYYYMMDD)', |
| 39 |
|
|
+'vac_VACATION_FROM' =>'Vacation starts on <br>(YYYY-MM-DD)', |
| 40 |
|
|
+'vac_VACATION_TO' =>'Vacation finishes on <br>(YYYY-MM-DD)', |
| 41 |
|
|
'vac_VACATION_FROM1' =>'Vacation starts on', |
| 42 |
|
|
'vac_VACATION_TO1' =>'Vacation finishes on', |
| 43 |
|
|
'vac_MESSAGE' =>'Vacation message', |
Parent Directory
| 
Revision Log
| 
Revision Graph
