projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rerun of connect_db_mysqli.inc.
[fa-stable.git]
/
includes
/
date_functions.inc
diff --git
a/includes/date_functions.inc
b/includes/date_functions.inc
index 623452e229c607c116a381f97721dd237f665992..2538f79d65f3edc24c031ae23f176a5359e10592 100644
(file)
--- 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)
{
function __date($year, $month, $day)
{
- global $
datesep
s, $tmonths;
+ global $
SysPref
s, $tmonths;
$how = user_date_format();
$how = user_date_format();
- $sep = $dateseps[user_date_sep()];
+ $sep = $
SysPrefs->
dateseps[user_date_sep()];
$day = (int)$day;
$month = (int)$month;
if ($how < 3)
$day = (int)$day;
$month = (int)$month;
if ($how < 3)
@@
-50,12
+50,12
@@
function __date($year, $month, $day)
function is_date($date_)
{
function is_date($date_)
{
- global $
datesep
s;
+ global $
SysPref
s;
if ($date_ == null || $date_ == "")
return 0;
$how = user_date_format();
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_);
$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))
{
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);
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))
{
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()
{
function Today()
{
- global $
date_system
;
+ global $
SysPrefs
;
$year = date("Y");
$month = date("n");
$day = date("j");
$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);
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);
}
list($year, $month, $day) = gregorian_to_islamic($year, $month, $day);
return __date($year, $month, $day);
}
@@
-199,11
+199,12
@@
function is_date_in_fiscalyear($date, $convert=false)
else
$date2 = $date;
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 (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']);
$myrow = get_current_fiscalyear();
$begin = sql2date($myrow['begin']);
$end = sql2date($myrow['end']);
@@
-239,24
+240,24
@@
function end_fiscalyear()
function begin_month($date)
{
function begin_month($date)
{
- global $
date_system
;
+ global $
SysPrefs
;
list($day, $month, $year) = explode_date_to_dmy($date);
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);
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)
{
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));
}
{
$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));
}
{
$days_in_month = array(30, 29, 30, 29, 30, 29, 30, 29, 30, 29, 30, (((((11 * $year) + 14) % 30) < 11) ? 30 : 29));
}
@@
-268,14
+269,14
@@
function days_in_month($month, $year)
function end_month($date)
{
function end_month($date)
{
- global $
date_system
;
+ global $
SysPrefs
;
list($day, $month, $year) = explode_date_to_dmy($date);
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);
}
{
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);
}
{
list($year, $month, $day) = gregorian_to_islamic($year, $month, $day);
}
@@
-285,14
+286,14
@@
function end_month($date)
function add_days($date, $days) // accepts negative values as well
{
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);
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));
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);
}
list($year, $month, $day) = gregorian_to_islamic(date("Y", $timet), date("n", $timet), date("j", $timet));
return __date($year, $month, $day);
}
@@
-302,7
+303,8
@@
function add_days($date, $days) // accepts negative values as well
function add_months($date, $months) // 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;
list($day, $month, $year) = explode_date_to_dmy($date);
$months += $year*12+$month;
@@
-311,11
+313,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);
$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));
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);
}
list($year, $month, $day) = gregorian_to_islamic(date("Y", $timet), date("n", $timet), date("j", $timet));
return __date($year, $month, $day);
}
@@
-325,14
+327,15
@@
function add_months($date, $months) // accepts negative values as well
function add_years($date, $years) // 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);
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));
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);
}
list($year, $month, $day) = gregorian_to_islamic(date("Y", $timet), date("n", $timet), date("j", $timet));
return __date($year, $month, $day);
}
@@
-344,10
+347,11
@@
function add_years($date, $years) // accepts negative values as well
function sql2date($date_)
{
function sql2date($date_)
{
- global $
date_system
;
+ global $
SysPrefs
;
//for MySQL dates are in the format YYYY-mm-dd
//for MySQL dates are in the format YYYY-mm-dd
-
+ if ($date_ == null)
+ return "";
if (strpos($date_, "/"))
{ // In MySQL it could be either / or -
list($year, $month, $day) = explode("/", $date_);
if (strpos($date_, "/"))
{ // In MySQL it could be either / or -
list($year, $month, $day) = explode("/", $date_);
@@
-363,9
+367,9
@@
function sql2date($date_)
{ /*chop off the time stuff */
$day = substr($day, 0, 2);
}
{ /*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);
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
list($year, $month, $day) = gregorian_to_islamic($year, $month, $day);
return __date($year, $month, $day);
} // end function sql2date
@@
-373,17
+377,17
@@
function sql2date($date_)
function date2sql($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();
/* 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()];
+ $date_ = trim($date_);
if ($date_ == null || strlen($date_) == 0)
return "";
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
$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
@@
-392,32
+396,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_);
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);
if ($how > 2)
{
global $tmonths;
$month = array_search($month, $tmonths);
- }
-//to modify assumption in 2030
- if ($date_system == 0 || $date_system == 3)
- {
- if ((int)$year < 60)
+ }
+ if ($year+$day+$month) {
+ //to modify assumption in 2030
+ if ($SysPrefs->date_system == 0 || $SysPrefs->date_system == 3)
{
{
- $year = "20".$year;
- }
- elseif ((int)$year > 59 && (int)$year < 100)
+ if ((int)$year < 60)
+ {
+ $year = "20".$year;
+ }
+ elseif ((int)$year > 59 && (int)$year < 100)
+ {
+ $year = "19".$year;
+ }
+ }
+ if ((int)$year > 9999)
{
{
-
$year = "19".$year
;
+
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 ($date_system == 1)
- list($year, $month, $day) = jalali_to_gregorian($year, $month, $day);
- elseif ($date_system == 2)
- list($year, $month, $day) = islamic_to_gregorian($year, $month, $day);
-
return sprintf("%04d-%02d-%02d", $year, $month, $day);
}// end of function
return sprintf("%04d-%02d-%02d", $year, $month, $day);
}// end of function