X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdate_functions.inc;h=e90e2e781e6b37fdc5c819d666d7f7127a948e5f;hb=2bcdab793e406bb5a44d2c4e079ec7cc2a1aa857;hp=7aa16acc738823019b9a29d01ef6d79ced22d9d1;hpb=8143beb0b9260509cfd1e73acd3d29c965760763;p=fa-stable.git

diff --git a/includes/date_functions.inc b/includes/date_functions.inc
index 7aa16acc..e90e2e78 100644
--- a/includes/date_functions.inc
+++ b/includes/date_functions.inc
@@ -383,10 +383,10 @@ and converts to a yyyy/mm/dd format */
 	$how = user_date_format();
 	$sep = $SysPrefs->dateseps[user_date_sep()];
 
+	$date_ = trim($date_);
 	if ($date_ == null || strlen($date_) == 0)
 		return "";
 
-	$date_ = trim($date_);
     $year = $month = $day = 0;
     // Split up the date by the separator based on "how" to split it
     if ($how == 0 || $how == 3) // MMDDYYYY or MmmDDYYYY
@@ -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