X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdate_functions.inc;h=0adac04ddb825e6d10f685d87f1cce674fb24a89;hb=dc98038dfc9d5a6d54ffe6566bc566a433e59ccb;hp=c681353109eb44ae7548d706fd3b3d0f3e92c3e5;hpb=d567a10b7925c8bb97c734e213d6651a979af29d;p=fa-stable.git

diff --git a/includes/date_functions.inc b/includes/date_functions.inc
index c6813531..0adac04d 100644
--- a/includes/date_functions.inc
+++ b/includes/date_functions.inc
@@ -13,11 +13,13 @@
 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)
 {
@@ -141,6 +143,19 @@ 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)
 {
@@ -303,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)
 		{
@@ -368,6 +348,13 @@ 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); 
+
+   	// 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
 
@@ -403,7 +390,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'