From 6a350470200b224261d20817d3a5159095e2f104 Mon Sep 17 00:00:00 2001
From: mikee2 <mikee2@users.noreply.github.com>
Date: Wed, 14 Jun 2017 12:53:29 +0200
Subject: [PATCH] Updated to use dolibarr timme functions

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.
---
 htdocs/includes/odtphp/Segment.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/htdocs/includes/odtphp/Segment.php b/htdocs/includes/odtphp/Segment.php
index 4310c716ee7..d015d6ad263 100644
--- a/htdocs/includes/odtphp/Segment.php
+++ b/htdocs/includes/odtphp/Segment.php
@@ -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);