Bugs in function show_users_online in users_db.inc

Small sideeffect in date_functions after correction of $date_system

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 799facefdee46dd505cfeabf538f7c43ba52773a..a31cb13ae36f9564f4e4ab2cc31f6c080789350a 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -23,7 +23,10 @@ $ -> Affected files
 ! Changed $date_system value of 3 to be traditional, but non-workday is Friday 
   and start of week is Saturday. For DatePicker.
 $ config.default.php
+  /includes/date_functions.inc
   /includes/ui/ui_view.inc
+# Bugs in function show_users_online in users_db.inc
+$ /admin/db/users_db.inc
   
 30-Oct-2009 Janusz Dobrowolski
 # Fixed non-default company selection bug on login.

diff --git a/admin/db/users_db.inc b/admin/db/users_db.inc
index d9e3dae33251e749bcac37a92d7e040c73e755be..c0bd02b152b315a00f9dfac2b43e3879c7377b9a 100644 (file)
--- a/admin/db/users_db.inc
+++ b/admin/db/users_db.inc
@@ -169,9 +169,10 @@ function show_users_online()
 {
        global $show_users_online;
        
-       if (!isset($show_users_online) || $show_users_online == 0)
+       if (!isset($show_users_online) || $show_users_online == 0 || !defined('TB_PREF') || !isset($_SESSION['get_text']))
                return "";
-       if (db_num_rows(db_query("SHOW TABLES LIKE '".TB_PREF."useronline'")) == 1)
+       $result = db_query("SHOW TABLES LIKE '".TB_PREF."useronline'"); 
+       if (db_num_rows($result) == 1)
        {
                $timeoutseconds = 120;
 

diff --git a/includes/date_functions.inc b/includes/date_functions.inc
index e44f083b41d424c55f1589fab3e87c1510446e1b..13294eb055721b8653cba1b9208f24765727554a 100644 (file)
--- a/includes/date_functions.inc
+++ b/includes/date_functions.inc
@@ -13,12 +13,12 @@
 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
-"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") and function_exists("date_default_timezone_get"))
+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)
@@ -366,7 +366,7 @@ and converts to a yyyy/mm/dd format */
                $year = $month = $day = 0;
 
 //to modify assumption in 2030
-       if ($date_system == 0)
+       if ($date_system == 0 || $date_system == 3)
        {
                if ((int)$year < 60)
                {