Activated strict SQL mode, minor SQL injection fix, fixed _vl() debug helper.

[fa-stable.git] / includes / date_functions.inc

diff --git a/includes/date_functions.inc b/includes/date_functions.inc
index af05456353a76e126a61e83c3f89ec49bf97ebcf..e90e2e781e6b37fdc5c819d666d7f7127a948e5f 100644 (file)
--- a/includes/date_functions.inc
+++ b/includes/date_functions.inc
@@ -199,11 +199,12 @@ function is_date_in_fiscalyear($date, $convert=false)
        else
                $date2 = $date;
 
+       if (is_date_closed($date2))
+               return 0;
+
        if (user_check_access('SA_MULTIFISCALYEARS')) // allow all open years for this one
                return is_date_in_fiscalyears($date2, false);
 
-       if (is_date_closed($date2))
-               return 0;
        $myrow = get_current_fiscalyear();
        $begin = sql2date($myrow['begin']);
        $end = sql2date($myrow['end']);
@@ -382,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
@@ -394,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