lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated to use dolibarr timme functions

Browse Source 
Redefined macro strings to adapt to dolibarr date functions return values. Keep same macro names when possible to avoid breaking existing code. Some macro holders (not commonly used) have been dropped because non existing values in dolibarr date functions.

Per eldy request changed php date functions with dolibarr's internal date functions to match users time zone. Now dates are those of the user's timezone so check that is is correctly defined in user's profile.
This commit is contained in:
mikee2 2017-06-14 12:53:29 +02:00 committed by GitHub
parent 637e1a8d21
commit 6a35047020
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/includes/odtphp/Segment.php
View File

@ -170,16 +170,17 @@ class Segment implements IteratorAggregate, Countable
{
global $langs;
$nextMonth = strtotime('+1 month');
$patterns=array( '/__CURRENTDAY__/u','/__CURRENTDAYTEXT__/u',
'/__CURRENTMONTH__/u','/__CURRENTMONTHSHORT__/u','/__CURRENTMONTHLONG__/u',
'/__NEXTMONTH__/u','/__NEXTMONTHSHORT__/u','/__NEXTMONTHLONG__/u',
$hoy = dol_getdate(dol_now('tzuser'));
$nextMonth = dol_get_next_month($hoy['mon'], $hoy['year'])['month'];
$patterns=array( '/__CURRENTDAY__/u','/__CURENTWEEKDAY__/u',
'/__CURRENTMONTH__/u','/__CURRENTMONTHLONG__/u',
'/__NEXTMONTH__/u','/__NEXTMONTHLONG__/u',
'/__CURRENTYEAR__/u','/__NEXTYEAR__/u' );
$values=array( date('j'), $langs->trans(date('l')),
$langs->trans(date('n')), $langs->trans(date('M')), $langs->trans(date('F')),
$langs->trans(date('n', $nextMonth)), $langs->trans(date('M', $nextMonth)), $langs->trans(date('F', $nextMonth)),
date('Y'), date('Y', strtotime('+1 year')) );
$values=array( $hoy['mday'], $langs->trans($hoy['weekday']),
$hoy['mon'], $langs->trans($hoy['month']),
$nextMonth, monthArray($langs)[$nextMonth],
$hoy['year'], $hoy['year']+1 );
$text=preg_replace($patterns, $values, $text);