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

Use date.lib.php functions

Browse Source
This commit is contained in:
atm-lena 2020-08-27 10:29:23 +02:00
parent 9d1fc28eba
commit 4ef2644300
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/comm/action/card.php
View File

@ -393,20 +393,20 @@ if (empty($reshook) && $action == 'add')
$actionCommReminder = new ActionCommReminder($db);
if($offsetunit == 'minute'){
$dateremind = strtotime("-".$offsetvalue." minutes", $datep);
$dateremind = dol_time_plus_duree($datep, -$offsetvalue, 'i');
} elseif($offsetunit == 'hour'){
$dateremind = strtotime("-".$offsetvalue." hours", $datep);
$dateremind = dol_time_plus_duree($datep, -$offsetvalue, 'h');
} elseif ($offsetunit == 'day') {
$dateremind = strtotime("-".$offsetvalue." day", $datep);
$dateremind = dol_time_plus_duree($datep, -$offsetvalue, 'd');
} elseif ($offsetunit == 'week') {
$dateremind = strtotime("-".$offsetvalue." week", $datep);
$dateremind = dol_time_plus_duree($datep, -$offsetvalue, 'w');
} elseif ($offsetunit == 'month') {
$dateremind = strtotime("-".$offsetvalue." month", $datep);
$dateremind = dol_time_plus_duree($datep, -$offsetvalue, 'm');
} elseif ($offsetunit == 'year') {
$dateremind = strtotime("-".$offsetvalue." year", $datep);
$dateremind = dol_time_plus_duree($datep, -$offsetvalue, 'y');
}
$actionCommReminder->dateremind = date('Y-m-d H:i:s', $dateremind);
$actionCommReminder->dateremind = $db->idate($dateremind);
$actionCommReminder->typeremind = $remindertype;
$actionCommReminder->fk_user = $user;
$actionCommReminder->offsetunit = $offsetunit;

3
htdocs/core/lib/date.lib.php
View File

@ -108,7 +108,7 @@ function getServerTimeZoneInt($refgmtdate = 'now')
*
* @param int $time Date timestamp (or string with format YYYY-MM-DD)
* @param int $duration_value Value of delay to add
* @param int $duration_unit Unit of added delay (d, m, y, w, h)
* @param int $duration_unit Unit of added delay (d, m, y, w, h, i)
* @return int New timestamp
*/
function dol_time_plus_duree($time, $duration_value, $duration_unit)
@ -116,6 +116,7 @@ function dol_time_plus_duree($time, $duration_value, $duration_unit)
global $conf;
if ($duration_value == 0) return $time;
if ($duration_unit == 'i') return $time + (60 * $duration_value);
if ($duration_unit == 'h') return $time + (3600 * $duration_value);
if ($duration_unit == 'w') return $time + (3600 * 24 * 7 * $duration_value);