Moved all SQL statements from PHP files into relevant *_db.inc files.

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

diff --git a/includes/date_functions.inc b/includes/date_functions.inc
index 5f9f0bc802e13fe72e6ef0da9cfba26e6e0adf1e..182e09c86be43b1a8563ed5293e94c432cf1b1d0 100644 (file)
--- a/includes/date_functions.inc
+++ b/includes/date_functions.inc
@@ -13,11 +13,13 @@
 date validation and parsing functions
 
 These functions refer to the global variable defining the date format
 date validation and parsing functions
 
 These functions refer to the global variable defining the date format

-The date format is defined in config.php called DefaultDateFormat
+The date format is defined in config.php called dateformats

 this can be a string either "d/m/Y" for UK/Australia/New Zealand dates or
 this can be a string either "d/m/Y" for UK/Australia/New Zealand dates or

-"m/d/Y" for US/Canada format dates
+"m/d/Y" for US/Canada format dates depending on setting in preferences.

 
 */
 
 */

+if(function_exists("date_default_timezone_set") && function_exists("date_default_timezone_get"))
+       @date_default_timezone_set(@date_default_timezone_get());

 
 function __date($year, $month, $day)
 {
 
 function __date($year, $month, $day)
 {


@@ -158,7 +160,7 @@ function new_doc_date($date=null)
 function is_date_in_fiscalyear($date, $convert=false)
 {
        global $path_to_root;
 function is_date_in_fiscalyear($date, $convert=false)
 {
        global $path_to_root;

-       include_once($path_to_root . "/admin/db/company_db.inc");
+       include_once($path_to_root . "/admin/db/fiscalyears_db.inc");

 
        $myrow = get_current_fiscalyear();
        if ($myrow['closed'] == 1)
 
        $myrow = get_current_fiscalyear();
        if ($myrow['closed'] == 1)


@@ -179,7 +181,7 @@ function is_date_in_fiscalyear($date, $convert=false)
 function begin_fiscalyear()
 {
        global $path_to_root;
 function begin_fiscalyear()
 {
        global $path_to_root;

-       include_once($path_to_root . "/admin/db/company_db.inc");
+       include_once($path_to_root . "/admin/db/fiscalyears_db.inc");

 
        $myrow = get_current_fiscalyear();
        return sql2date($myrow['begin']);
 
        $myrow = get_current_fiscalyear();
        return sql2date($myrow['begin']);


@@ -188,7 +190,7 @@ function begin_fiscalyear()
 function end_fiscalyear()
 {
        global $path_to_root;
 function end_fiscalyear()
 {
        global $path_to_root;

-       include_once($path_to_root . "/admin/db/company_db.inc");
+       include_once($path_to_root . "/admin/db/fiscalyears_db.inc");

 
        $myrow = get_current_fiscalyear();
        return sql2date($myrow['end']);
 
        $myrow = get_current_fiscalyear();
        return sql2date($myrow['end']);


@@ -364,7 +366,7 @@ and converts to a yyyy/mm/dd format */
                $year = $month = $day = 0;
 
 //to modify assumption in 2030
                $year = $month = $day = 0;
 
 //to modify assumption in 2030

-       if ($date_system == 0)
+       if ($date_system == 0 || $date_system == 3)

        {
                if ((int)$year < 60)
                {
        {
                if ((int)$year < 60)
                {