X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdate_functions.inc;h=af05456353a76e126a61e83c3f89ec49bf97ebcf;hb=9451db1760036985de791ba24c442801e37f37de;hp=623452e229c607c116a381f97721dd237f665992;hpb=b0c4c9777f9574e9c2805fddc2a12576d75d94ce;p=fa-stable.git

diff --git a/includes/date_functions.inc b/includes/date_functions.inc
index 623452e2..af054563 100644
--- a/includes/date_functions.inc
+++ b/includes/date_functions.inc
@@ -21,10 +21,10 @@ this can be a string either "d/m/Y" for UK/Australia/New Zealand dates or
 
 function __date($year, $month, $day)
 {
-	global $dateseps, $tmonths;
+	global $SysPrefs, $tmonths;
 	
 	$how = user_date_format();
-	$sep = $dateseps[user_date_sep()];
+	$sep = $SysPrefs->dateseps[user_date_sep()];
 	$day = (int)$day;
 	$month = (int)$month;
 	if ($how < 3)
@@ -50,12 +50,12 @@ function __date($year, $month, $day)
 
 function is_date($date_) 
 {
-	global $dateseps;
+	global $SysPrefs;
 
 	if ($date_ == null || $date_ == "")
 		return 0;
 	$how = user_date_format();
-	$sep = $dateseps[user_date_sep()];
+	$sep = $SysPrefs->dateseps[user_date_sep()];
 
 	$date_ = trim($date_);
 	$date = str_replace($sep, "", $date_);
@@ -134,10 +134,10 @@ function is_date($date_)
 
 	if (is_long((int)$day) && is_long((int)$month) && is_long((int)$year))
 	{
-		global $date_system;
-		if ($date_system == 1)
+		global $SysPrefs;
+		if ($SysPrefs->date_system == 1)
 			list($year, $month, $day) = jalali_to_gregorian($year, $month, $day);  
-		elseif ($date_system == 2)	
+		elseif ($SysPrefs->date_system == 2)	
 			list($year, $month, $day) = islamic_to_gregorian($year, $month, $day);  
 		if (checkdate((int)$month, (int)$day, (int)$year))
 		{
@@ -156,14 +156,14 @@ function is_date($date_)
 
 function Today() 
 {
-	global $date_system;
+	global $SysPrefs;
 
 	$year = date("Y");
 	$month = date("n");
 	$day = date("j");
-	if ($date_system == 1)
+	if ($SysPrefs->date_system == 1)
 		list($year, $month, $day) = gregorian_to_jalali($year, $month, $day);
-	elseif ($date_system == 2)	
+	elseif ($SysPrefs->date_system == 2)	
 		list($year, $month, $day) = gregorian_to_islamic($year, $month, $day);
 	return __date($year, $month, $day);	
 }
@@ -239,24 +239,24 @@ function end_fiscalyear()
 
 function begin_month($date)
 {
-	global $date_system;
+	global $SysPrefs;
     list($day, $month, $year) = explode_date_to_dmy($date);
-    if ($date_system == 1)
+    if ($SysPrefs->date_system == 1)
     	list($year, $month, $day) = gregorian_to_jalali($year, $month, $day);
-    elseif ($date_system == 2)	
+    elseif ($SysPrefs->date_system == 2)	
     	list($year, $month, $day) = gregorian_to_islamic($year, $month, $day);
    	return __date($year, $month, 1);
 }
 
 function days_in_month($month, $year)
 {
-	global $date_system;
+	global $SysPrefs;
 
-	if ($date_system == 1)
+	if ($SysPrefs->date_system == 1)
 	{
 		$days_in_month = array(31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, ((((((($year - (($year > 0) ? 474 : 473)) % 2820) + 474) + 38) * 682) % 2816) < 682 ? 30 : 29));
 	}
-	elseif ($date_system == 2)
+	elseif ($SysPrefs->date_system == 2)
 	{
 		$days_in_month = array(30, 29, 30, 29, 30, 29, 30, 29, 30, 29, 30, (((((11 * $year) + 14) % 30) < 11) ? 30 : 29));
 	}
@@ -268,14 +268,14 @@ function days_in_month($month, $year)
 
 function end_month($date)
 {
-	global $date_system;
+	global $SysPrefs;
 
     list($day, $month, $year) = explode_date_to_dmy($date);
-	if ($date_system == 1)
+	if ($SysPrefs->date_system == 1)
 	{
 		list($year, $month, $day) = gregorian_to_jalali($year, $month, $day);
 	}
-	elseif ($date_system == 2)
+	elseif ($SysPrefs->date_system == 2)
 	{
 		list($year, $month, $day) = gregorian_to_islamic($year, $month, $day);
 	}
@@ -285,14 +285,14 @@ function end_month($date)
 
 function add_days($date, $days) // accepts negative values as well
 {
-	global $date_system;
+	global $SysPrefs;
     list($day, $month, $year) = explode_date_to_dmy($date);
    	$timet = mktime(0,0,0, $month, $day + $days, $year);
-    if ($date_system == 1 || $date_system == 2)
+    if ($SysPrefs->date_system == 1 || $SysPrefs->date_system == 2)
     {
-    	if ($date_system == 1)
+    	if ($SysPrefs->date_system == 1)
     		list($year, $month, $day) = gregorian_to_jalali(date("Y", $timet), date("n", $timet), date("j", $timet));
-    	elseif ($date_system == 2) 	
+    	elseif ($SysPrefs->date_system == 2) 	
     		list($year, $month, $day) = gregorian_to_islamic(date("Y", $timet), date("n", $timet), date("j", $timet));
     	return __date($year, $month, $day);
     }
@@ -302,7 +302,8 @@ function add_days($date, $days) // accepts negative values as well
 
 function add_months($date, $months) // accepts negative values as well
 {
-	global $date_system;
+	global $SysPrefs;
+
     list($day, $month, $year) = explode_date_to_dmy($date);
 
 	$months += $year*12+$month;
@@ -311,11 +312,11 @@ function add_months($date, $months) // accepts negative values as well
 
    	$timet = mktime(0,0,0, $month, min($day, days_in_month($month, $year)), $year);
 
-    if ($date_system == 1 || $date_system == 2)
+    if ($SysPrefs->date_system == 1 || $SysPrefs->date_system == 2)
     {
-    	if ($date_system == 1)
+    	if ($SysPrefs->date_system == 1)
     		list($year, $month, $day) = gregorian_to_jalali(date("Y", $timet), date("n", $timet), date("j", $timet));
-    	elseif ($date_system == 2) 	
+    	elseif ($SysPrefs->date_system == 2) 	
     		list($year, $month, $day) = gregorian_to_islamic(date("Y", $timet), date("n", $timet), date("j", $timet));
     	return __date($year, $month, $day);
     }
@@ -325,14 +326,15 @@ function add_months($date, $months) // accepts negative values as well
 
 function add_years($date, $years) // accepts negative values as well
 {
-	global $date_system;
+	global $SysPrefs;
+
     list($day, $month, $year) = explode_date_to_dmy($date);
    	$timet = Mktime(0,0,0, $month, $day, $year + $years);
-    if ($date_system == 1 || $date_system == 2)
+    if ($SysPrefs->date_system == 1 || $SysPrefs->date_system == 2)
     {
-    	if ($date_system == 1)
+    	if ($SysPrefs->date_system == 1)
     		list($year, $month, $day) = gregorian_to_jalali(date("Y", $timet), date("n", $timet), date("j", $timet));
-    	elseif ($date_system == 2) 	
+    	elseif ($SysPrefs->date_system == 2) 	
     		list($year, $month, $day) = gregorian_to_islamic(date("Y", $timet), date("n", $timet), date("j", $timet));
     	return __date($year, $month, $day);
     }
@@ -344,7 +346,7 @@ function add_years($date, $years) // accepts negative values as well
 
 function sql2date($date_) 
 {
-	global $date_system;
+	global $SysPrefs;
 
 	//for MySQL dates are in the format YYYY-mm-dd
 
@@ -363,9 +365,9 @@ function sql2date($date_)
 	{  /*chop off the time stuff */
 		$day = substr($day, 0, 2);
 	}
-	if ($date_system == 1)
+	if ($SysPrefs->date_system == 1)
 		list($year, $month, $day) = gregorian_to_jalali($year, $month, $day);
-	elseif ($date_system == 2)
+	elseif ($SysPrefs->date_system == 2)
 		list($year, $month, $day) = gregorian_to_islamic($year, $month, $day);
 	return __date($year, $month, $day);	
 } // end function sql2date
@@ -373,12 +375,12 @@ function sql2date($date_)
 
 function date2sql($date_)
 {
-	global $dateseps, $date_system, $tmonths;
+	global $SysPrefs, $tmonths;
 /* takes a date in a the format specified in $DefaultDateFormat
 and converts to a yyyy/mm/dd format */
 
 	$how = user_date_format();
-	$sep = $dateseps[user_date_sep()];
+	$sep = $SysPrefs->dateseps[user_date_sep()];
 
 	if ($date_ == null || strlen($date_) == 0)
 		return "";
@@ -398,7 +400,7 @@ and converts to a yyyy/mm/dd format */
 		$month = array_search($month, $tmonths);
 	}	
 //to modify assumption in 2030
-	if ($date_system == 0 || $date_system == 3)
+	if ($SysPrefs->date_system == 0 || $SysPrefs->date_system == 3)
 	{
 		if ((int)$year < 60)
 		{
@@ -413,9 +415,9 @@ and converts to a yyyy/mm/dd format */
 	{
 		return 0;
 	}
-	if ($date_system == 1)
+	if ($SysPrefs->date_system == 1)
 		list($year, $month, $day) = jalali_to_gregorian($year, $month, $day); 
-	elseif ($date_system == 2)
+	elseif ($SysPrefs->date_system == 2)
 		list($year, $month, $day) = islamic_to_gregorian($year, $month, $day); 
 
 	return sprintf("%04d-%02d-%02d", $year, $month, $day);