X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdate_functions.inc;h=96ecb31bcdcf2967a2e90c6cb4173410f1da88bb;hb=03dbf580a48b9831dfb6fcbf8c34e1315c26a99e;hp=4a897552f9c5d668bffe7aadd7c5724c8f3e9f1c;hpb=924070ffd1b254bb94c435cd6147a9822db3c102;p=fa-stable.git

diff --git a/includes/date_functions.inc b/includes/date_functions.inc
index 4a897552..96ecb31b 100644
--- a/includes/date_functions.inc
+++ b/includes/date_functions.inc
@@ -59,7 +59,33 @@ function is_date($date_)
 
 	$date_ = trim($date_);
 	$date = str_replace($sep, "", $date_);
-	if (strlen($date_) == 6)
+	
+	if ($how > 2)
+	{
+		global $tmonths;
+		$dd = explode($sep, $date_);
+		if ($how == 3)
+		{
+			$day = $dd[1];
+			$month = array_search($dd[0], $tmonths);
+			$year = $dd[2];
+		} 
+		elseif ($how == 4)
+		{
+			$day = $dd[0];
+			$month = array_search($dd[1], $tmonths);
+			$year = $dd[2];
+		} 
+		else
+		{
+			$day = $dd[2];
+			$month = array_search($dd[1], $tmonths);
+			$year = $dd[0];
+		}
+		if ($year < 1000)
+			return 0;
+	}
+	elseif (strlen($date) == 6)
 	{
 		if ($how == 0)
 		{
@@ -80,7 +106,7 @@ function is_date($date_)
 			$year = substr($date,0,2);
 		}
 	}
-	elseif (strlen($date_) == 8)
+	elseif (strlen($date) == 8)
 	{
 		if ($how == 0)
 		{
@@ -101,31 +127,6 @@ function is_date($date_)
 			$year = substr($date,0,4);
 		}
 	}
-	elseif ($how > 2)
-	{
-		global $tmonths;
-		$dd = explode($sep, $date_);
-		if ($how == 3)
-		{
-			$day = $dd[1];
-			$month = array_search($dd[0], $tmonths);
-			$year = $dd[2];
-		} 
-		elseif ($how == 4)
-		{
-			$day = $dd[0];
-			$month = array_search($dd[1], $tmonths);
-			$year = $dd[2];
-		} 
-		else
-		{
-			$day = $dd[2];
-			$month = array_search($dd[1], $tmonths);
-			$year = $dd[0];
-		}
-		if ($year < 1000)
-			return 0;
-	}
 	if (!isset($year)|| (int)$year > 9999) 
 	{
 		return 0;
@@ -292,7 +293,8 @@ function add_days($date, $days) // accepts negative values as well
     		list($year, $month, $day) = gregorian_to_islamic(date("Y", $timet), date("n", $timet), date("j", $timet));
     	return __date($year, $month, $day);
     }
-    return date(user_date_display(), $timet);
+    list($year, $month, $day) = explode("-", date("Y-m-d", $timet));
+   	return __date($year, $month, $day);
 }
 
 function add_months($date, $months) // accepts negative values as well
@@ -314,7 +316,8 @@ function add_months($date, $months) // accepts negative values as well
     		list($year, $month, $day) = gregorian_to_islamic(date("Y", $timet), date("n", $timet), date("j", $timet));
     	return __date($year, $month, $day);
     }
-    return date(user_date_display(), $timet);
+    list($year, $month, $day) = explode("-", date("Y-m-d", $timet));
+   	return __date($year, $month, $day);
 }
 
 function add_years($date, $years) // accepts negative values as well
@@ -330,7 +333,8 @@ function add_years($date, $years) // accepts negative values as well
     		list($year, $month, $day) = gregorian_to_islamic(date("Y", $timet), date("n", $timet), date("j", $timet));
     	return __date($year, $month, $day);
     }
-    return date(user_date_display(), $timet);
+    list($year, $month, $day) = explode("-", date("Y-m-d", $timet));
+   	return __date($year, $month, $day);
 }
 
 //_______________________________________________________________
@@ -340,8 +344,6 @@ function sql2date($date_)
 	global $date_system;
 
 	//for MySQL dates are in the format YYYY-mm-dd
-	if ($date_ == null || strlen($date_) == 0)
-		return "";
 
 	if (strpos($date_, "/")) 
 	{ // In MySQL it could be either / or -
@@ -351,6 +353,8 @@ function sql2date($date_)
 	{
 		list($year, $month, $day) = explode("-", $date_);
 	}
+	if (!isset($day)) // data format error
+		return "";
 
 	if (strlen($day) > 4) 
 	{  /*chop off the time stuff */