X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=blobdiff_plain;f=includes%2Fdate_functions.inc;h=e90e2e781e6b37fdc5c819d666d7f7127a948e5f;hp=c0bcbe94476acb565053bbd7268ac01479270b92;hb=2bcdab793e406bb5a44d2c4e079ec7cc2a1aa857;hpb=85cdc977a80b32727c13aae517f58437e908a033 diff --git a/includes/date_functions.inc b/includes/date_functions.inc index c0bcbe94..e90e2e78 100644 --- a/includes/date_functions.inc +++ b/includes/date_functions.inc @@ -395,32 +395,34 @@ and converts to a yyyy/mm/dd format */ list($day, $month, $year) = explode($sep, $date_); else // $how == 2 || $how == 5, YYYYMMDD or YYYYMmmDD list($year, $month, $day) = explode($sep, $date_); - if ($how > 2) - { - global $tmonths; - $month = array_search($month, $tmonths); - } -//to modify assumption in 2030 - if ($SysPrefs->date_system == 0 || $SysPrefs->date_system == 3) - { - if ((int)$year < 60) + + if ($year+$day+$month) { + if ($how > 2) { - $year = "20".$year; - } - elseif ((int)$year > 59 && (int)$year < 100) + global $tmonths; + $month = array_search($month, $tmonths); + } + //to modify assumption in 2030 + if ($SysPrefs->date_system == 0 || $SysPrefs->date_system == 3) { - $year = "19".$year; + if ((int)$year < 60) + { + $year = "20".$year; + } + elseif ((int)$year > 59 && (int)$year < 100) + { + $year = "19".$year; + } } - } - if ((int)$year > 9999) - { - return 0; + if ((int)$year > 9999) + { + return 0; + } + if ($SysPrefs->date_system == 1) + list($year, $month, $day) = jalali_to_gregorian($year, $month, $day); + elseif ($SysPrefs->date_system == 2) + list($year, $month, $day) = islamic_to_gregorian($year, $month, $day); } - if ($SysPrefs->date_system == 1) - list($year, $month, $day) = jalali_to_gregorian($year, $month, $day); - elseif ($SysPrefs->date_system == 2) - list($year, $month, $day) = islamic_to_gregorian($year, $month, $day); - return sprintf("%04d-%02d-%02d", $year, $month, $day); }// end of function