X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdate_functions.inc;h=8fc1447a4c74cba52bed6e8ba8f81071569b43e4;hb=3613e32ad573d5faccb974a421702bdd87583878;hp=484d5a8e1fc4072f59aab117c23b6f1cb50f1ac0;hpb=37f4a02e0f4bea58e5b2097d583bf9395ffc515f;p=fa-stable.git
diff --git a/includes/date_functions.inc b/includes/date_functions.inc
index 484d5a8e..8fc1447a 100644
--- a/includes/date_functions.inc
+++ b/includes/date_functions.inc
@@ -1,14 +1,25 @@
.
+***********************************************************************/
/*
date validation and parsing functions
These functions refer to the global variable defining the date format
-The date format is defined in config.php called DefaultDateFormat
+The date format is defined in config.php called dateformats
this can be a string either "d/m/Y" for UK/Australia/New Zealand dates or
-"m/d/Y" for US/Canada format dates
+"m/d/Y" for US/Canada format dates depending on setting in preferences.
*/
+if(function_exists("date_default_timezone_set") && function_exists("date_default_timezone_get"))
+ @date_default_timezone_set(@date_default_timezone_get());
function __date($year, $month, $day)
{
@@ -83,7 +94,7 @@ function is_date($date_)
$year = substr($date_,0,4);
}
}
- if ((int)$year > 9999)
+ if (!isset($year)|| (int)$year > 9999)
{
return 0;
}
@@ -132,11 +143,24 @@ function Now()
else
return date("H:i");
}
+//
+// Retrieve and optionaly set default date for new document.
+//
+function new_doc_date($date=null)
+{
+ if (isset($date) && $date != '')
+ $_SESSION['_default_date'] = $date;
+
+ if (!isset($_SESSION['_default_date']) || !sticky_doc_date())
+ $_SESSION['_default_date'] = Today();
+
+ return $_SESSION['_default_date'];
+}
function is_date_in_fiscalyear($date, $convert=false)
{
global $path_to_root;
- include_once($path_to_root . "/admin/db/company_db.inc");
+ include_once($path_to_root . "/admin/db/fiscalyears_db.inc");
$myrow = get_current_fiscalyear();
if ($myrow['closed'] == 1)
@@ -157,7 +181,7 @@ function is_date_in_fiscalyear($date, $convert=false)
function begin_fiscalyear()
{
global $path_to_root;
- include_once($path_to_root . "/admin/db/company_db.inc");
+ include_once($path_to_root . "/admin/db/fiscalyears_db.inc");
$myrow = get_current_fiscalyear();
return sql2date($myrow['begin']);
@@ -166,7 +190,7 @@ function begin_fiscalyear()
function end_fiscalyear()
{
global $path_to_root;
- include_once($path_to_root . "/admin/db/company_db.inc");
+ include_once($path_to_root . "/admin/db/fiscalyears_db.inc");
$myrow = get_current_fiscalyear();
return sql2date($myrow['end']);
@@ -294,53 +318,18 @@ and converts to a yyyy/mm/dd format */
return "";
$date_ = trim($date_);
- $date_ = str_replace($sep, "", $date_);
+ $year = $month = $day = 0;
- if (strlen($date_) == 6)
- {
- if ($how == 0)
- {
- $day = substr($date_,2,2);
- $month = substr($date_,0,2);
- $year = substr($date_,4,2);
- }
- elseif ($how == 1)
- {
- $day = substr($date_,0,2);
- $month = substr($date_,2,2);
- $year = substr($date_,4,2);
- }
- else
- {
- $day = substr($date_,4,2);
- $month = substr($date_,2,2);
- $year = substr($date_,0,2);
- }
- }
- elseif (strlen($date_) == 8)
- {
- if ($how == 0)
- {
- $day = substr($date_,2,2);
- $month = substr($date_,0,2);
- $year = substr($date_,4,4);
- }
- elseif ($how == 1)
- {
- $day = substr($date_,0,2);
- $month = substr($date_,2,2);
- $year = substr($date_,4,4);
- }
- else
- {
- $day = substr($date_,6,2);
- $month = substr($date_,4,2);
- $year = substr($date_,0,4);
- }
- }
+ // Split up the date by the separator based on "how" to split it
+ if ($how == 0) // MMDDYYYY
+ list($month, $day, $year) = explode($sep, $date_);
+ elseif ($how == 1) // DDMMYYYY
+ list($day, $month, $year) = explode($sep, $date_);
+ else // $how == 2, YYYYMMDD
+ list($year, $month, $day) = explode($sep, $date_);
//to modify assumption in 2030
- if ($date_system == 0)
+ if ($date_system == 0 || $date_system == 3)
{
if ((int)$year < 60)
{
@@ -359,7 +348,14 @@ and converts to a yyyy/mm/dd format */
list($year, $month, $day) = jalali_to_gregorian($year, $month, $day);
else if ($date_system == 2)
list($year, $month, $day) = islamic_to_gregorian($year, $month, $day);
- return $year."/".$month."/".$day;
+
+ // Pad with 0s if needed
+ if (strlen($month) == 1)
+ $month = "0$month";
+ if (strlen($day) == 1)
+ $day = "0$day";
+
+ return $year."-".$month."-".$day;
}// end of function
function date1_greater_date2 ($date1, $date2)
@@ -369,8 +365,9 @@ function date1_greater_date2 ($date1, $date2)
$date1 = date2sql($date1);
$date2 = date2sql($date2);
- list($year1, $month1, $day1) = explode("/", $date1);
- list($year2, $month2, $day2) = explode("/", $date2);
+
+ @list($year1, $month1, $day1) = explode("-", $date1);
+ @list($year2, $month2, $day2) = explode("-", $date2);
if ($year1 > $year2)
{
@@ -394,7 +391,7 @@ function date1_greater_date2 ($date1, $date2)
}
-function date_diff ($date1, $date2, $period)
+function date_diff2 ($date1, $date2, $period)
{
/* expects dates in the format specified in $DefaultDateFormat - period can be one of 'd','w','y','m'
@@ -403,8 +400,8 @@ provided that both dates are after 1970. Also only works for dates up to the yea
$date1 = date2sql($date1);
$date2 = date2sql($date2);
- list($year1, $month1, $day1) = explode("/", $date1);
- list($year2, $month2, $day2) = explode("/", $date2);
+ list($year1, $month1, $day1) = explode("-", $date1);
+ list($year2, $month2, $day2) = explode("-", $date2);
$stamp1 = mktime(0,0,0, (int)$month1, (int)$day1, (int)$year1);
$stamp2 = mktime(0,0,0, (int)$month2, (int)$day2, (int)$year2);
@@ -434,11 +431,9 @@ function explode_date_to_dmy($date_)
$date = date2sql($date_);
if ($date == "")
{
- $disp = user_date_display();
- echo "
Dates must be entered in the format $disp. Sent was $date_
";
- exit;
+ return array(0,0,0);
}
- list($year, $month, $day) = explode("/", $date);
+ list($year, $month, $day) = explode("-", $date);
return array($day, $month, $year);
}