bugfix: fixed date from session

html/admin/users/edit_rules.php

@@ -52,6 +52,15 @@ if (isset($_POST["s_create"])) {
 
 unset($_POST);
 
+global $default_user_id;
+global $hotspot_user_id;
+
+//cleanup hotspot subnet rules
+delete_record($db_link,"auth_rules","user_id=".$default_user_id);
+delete_record($db_link,"auth_rules","user_id=".$hotspot_user_id);
+$t_hotspot = get_records_sql($db_link,"subnets","hotspot=1");
+foreach ($t_hotspot as $row) { delete_record($db_link,"auth_rules","rule='".$row['subnet']."'"); }
+
 require_once ($_SERVER['DOCUMENT_ROOT']."/inc/header.php");
 
 ?>

html/inc/common.php

@@ -1130,7 +1130,10 @@ if (!is_a($date_str,'DateTime')) {
     if (!$date1) { $date1 = DateTime::createFromFormat('Y-m-d|',$date_str); }
     if (!$date1) { $date1 = DateTime::createFromFormat('Y.m.d|',$date_str); }
     if (!$date1) { $date1 = DateTime::createFromFormat('Y/m/d|',$date_str); }
-    if (!$date1) { $date1 = new DateTime; }
+    if (!$date1) {
+        $date1 = new DateTime; 
+        $date1->setTime(0,0,0,1);
+        }
     } else { return $date_str; }
 return $date1;
 }

html/inc/datefilter.php

@@ -14,7 +14,7 @@ if (!empty($_GET['date_start']) or !empty($_POST['date_start'])) {
     } else {
     if (!empty($_SESSION[$page_url]['date_start'])) {
         $date1 = $_SESSION[$page_url]['date_start'];
-        $datetime_start = DateTime::createFromFormat('Y-m-d',$date1);
+        $datetime_start = GetDateTimeFromString($date1);
         $time_start = $datetime_start->getTimestamp();
         } else {
         $date1 = $datetime_start->format('Y-m-d');
@@ -30,7 +30,7 @@ if (!empty($_POST['date_stop']) or !empty($_GET['date_stop'])) {
     } else {
     if (!empty($_SESSION[$page_url]['date_stop'])) {
         $date2 = $_SESSION[$page_url]['date_stop'];
-        $datetime_stop = DateTime::createFromFormat('Y-m-d',$date2);
+        $datetime_stop = GetDateTimeFromString($date2);
         $time_stop = $datetime_stop->getTimestamp();
         }
     }

html/inc/datetimefilter.php

@@ -14,7 +14,7 @@ if (!empty($_GET['date_start']) or !empty($_POST['date_start'])) {
     } else {
     if (!empty($_SESSION[$page_url]['date_start'])) {
         $date1 = $_SESSION[$page_url]['date_start'];
-        $datetime_start = DateTime::createFromFormat('Y-m-d H:i:s',$date1);
+        $datetime_start = GetDateTimeFromString($date1);
         $time_start = $datetime_start->getTimestamp();
         } else {
         $date1 = $datetime_start->format('Y-m-d H:i:s');
@@ -30,13 +30,12 @@ if (!empty($_POST['date_stop']) or !empty($_GET['date_stop'])) {
     } else {
     if (!empty($_SESSION[$page_url]['date_stop'])) {
         $date2 = $_SESSION[$page_url]['date_stop'];
-        $datetime_stop = DateTime::createFromFormat('Y-m-d H:i:s',$date2);
+        $datetime_stop = GetDateTimeFromString($date2);
         $time_stop = $datetime_stop->getTimestamp();
         }
     }
 
 
-
 if (!isset($datetime_stop) or empty($datetime_stop)) {
     if ($default_date_shift==='h') {
         $datetime_start->modify('+1 hour');

scripts/Rstat/mysql.pm

@@ -925,9 +925,9 @@ $all_networks->add_string($net->{subnet});
 }
 
 #remove all rules for default user id and hotspot subnet
-delete_record($dbh,"auth_rules","user_id=".$config_ref{default_user_id});
-delete_record($dbh,"auth_rules","user_id=".$config_ref{hotspot_user_id});
-foreach my $subnet (@hotspot_network_list) { delete_record($dbh,"auth_rules","rule='".$subnet."'"); }
+#delete_record($dbh,"auth_rules","user_id=".$config_ref{default_user_id});
+#delete_record($dbh,"auth_rules","user_id=".$config_ref{hotspot_user_id});
+#foreach my $subnet (@hotspot_network_list) { delete_record($dbh,"auth_rules","rule='".$subnet."'"); }
 
 }