cosmetic changes

html/admin/reports/userdaydetail.php

@@ -16,7 +16,7 @@ $_SESSION[$page_url]['dns']=$rdns;
 $dns_checked='';
 if ($rdns) { $dns_checked='checked="checked"'; }
 
-print_trafdetail_submenu($page_url,"id=$id&date_start=$date1&date_stop=$date2","<b>Детализация для <a href=/admin/users/editauth.php?id=$id>$fip</a></b> ::&nbsp");
+print_trafdetail_submenu($page_url,"id=$id&date_start='$date1'&date_stop='$date2'","<b>Детализация для <a href=/admin/users/editauth.php?id=$id>$fip</a></b> ::&nbsp");
 ?>
 
 <div id="cont">
@@ -79,6 +79,8 @@ $fsql = "SELECT A.proto, A.dst_ip, A.dst_port, SUM(A.bytes) as tout FROM Traffic
 $userdata = mysqli_query($db_link, $fsql);
 while (list ($uproto, $uip, $uport, $ubytes) = mysqli_fetch_array($userdata)) {
     print "<tr align=center align=center class=\"tr1\" onmouseover=\"className='tr2'\" onmouseout=\"className='tr1'\">\n";
+    if ($uproto==='6') { $uproto = 'tcp'; }
+    if ($uproto==='17') { $uproto = 'udp'; }
     print "<td class=\"data\">" . $uproto . "</td>\n";
     print "<td class=\"data\" align=left>" . long2ip($uip) . "</td>\n";
     $ip_name = '-';

html/admin/reports/userdaydetaillog.php

@@ -15,7 +15,6 @@ $_SESSION[$page_url]['dns']=$rdns;
 $dns_checked='';
 if ($rdns) { $dns_checked='checked="checked"'; }
 
-
 $dns_cache=NULL;
 
 $usersip = mysqli_query($db_link, "SELECT ip,user_id,comments FROM User_auth WHERE User_auth.id=$id");
@@ -81,6 +80,8 @@ while (list ($uid,$udata, $urouter, $uproto, $sip, $sport,$dip, $dport, $ubytes,
     print "<td class=\"data\">$uid</td>\n";
     print "<td class=\"data\">$udata</td>\n";
     print "<td class=\"data\">$gateway_list[$urouter]</td>\n";
+    if ($uproto==='6') { $uproto = 'tcp'; }
+    if ($uproto==='17') { $uproto = 'udp'; }
     print "<td class=\"data\">" . $uproto . "</td>\n";
     print "<td class=\"data\" align=left>" . long2ip($sip) . "</td>\n";
     $ip_name = '-';

html/admin/users/edituser.php

@@ -268,14 +268,13 @@ if ($id == $default_user_id or $id == $hotspot_user_id) { $default_sort = 'last_
 <td class="data"><?php print $sort_url . "&sort=mac&order=$new_order>" . $cell_mac . "</a>"; ?></td>
 <td class="data"><?php print $cell_comment; ?></td>
 <td class="data"><?php print $sort_url . "&sort=dns_name&order=$new_order>" . $cell_dns_name . "</a>"; ?></td>
+<td class="data"><?php print $cell_enabled; ?></td>
 <td class="data"><?php print $cell_filter; ?></td>
-<td class="data"><?php print $sort_url . "&sort=enabled&order=$new_order>" . $cell_enabled . "</a>"; ?></td>
 <td class="data"><?php print $cell_shaper; ?></td>
-<td class="data"><?php print $cell_blocked; ?></td>
-<td class="data"><?php print $cell_perday; ?></td>
-<td class="data"><?php print $cell_permonth; ?></td>
+<td class="data"><?php print $cell_perday."/<br>".$cell_permonth.", Mb"; ?></td>
 <td class="data"><?php print $cell_connection; ?></td>
-<td class="data">DHCP/ARP Event</td>
+<td class="data"><?php print $sort_url . "&sort=timestamp&order=$new_order>Created</a>"; ?></td>
+<td class="data">Last DHCP/ARP Event</td>
 <td class="data"><?php print $sort_url . "&sort=last_found&order=$new_order>Last found</a>"; ?></td>
 </tr>
 
@@ -287,7 +286,7 @@ if (!empty($flist)) {
         if ($row["dhcp_time"] == '0000-00-00 00:00:00') {
             $dhcp_str = '';
             } else {
-            $dhcp_str = $row["dhcp_time"] . " (" . $row["dhcp_action"] . ")";
+            $dhcp_str = FormatDateStr('Y.m.d H:m',$row["dhcp_time"]) . " (" . $row["dhcp_action"] . ")";
             }
         if ($row["last_found"] == '0000-00-00 00:00:00') { $row["last_found"] = ''; }
         print "<tr align=center>\n";
@@ -300,15 +299,16 @@ if (!empty($flist)) {
             print "<td class=\"data\" >".$row["comments"]."</td>\n";
             }
         print "<td class=\"data\" >".$row["dns_name"]."</td>\n";
+        $ip_status = 1;
+        if ($row["blocked"] or !$row["enabled"]) { $ip_status = 0; }
+        print "<td class=\"data\" >" . get_qa($ip_status). "</td>\n";
         print "<td class=\"data\" >" . get_group($db_link, $row["filter_group_id"]) . "</td>\n";
-        print "<td class=\"data\" >" . get_qa($row["enabled"]) . "</td>\n";
         print "<td class=\"data\" >" . get_queue($db_link, $row["queue_id"]) . "</td>\n";
-        print "<td class=\"data\" width=50>" . get_qa($row["blocked"]) . "</td>\n";
-        print "<td class=\"data\" >".$row["day_quota"]."</td>\n";
-        print "<td class=\"data\" >".$row["month_quota"]."</td>\n";
+        print "<td class=\"data\" >".$row["day_quota"]."/".$row["month_quota"]."</td>\n";
         print "<td class=\"data\" >" . get_connection($db_link, $row["id"]) . "</td>\n";
+        print "<td class=\"data\" >" . FormatDateStr('Y.m.d',$row["timestamp"]) . "</td>\n";
         print "<td class=\"data\" >" . $dhcp_str . "</td>\n";
-        print "<td class=\"data\" >" . $row["last_found"] . "</td>\n";
+        print "<td class=\"data\" >" . FormatDateStr('Y.m.d H:i',$row["last_found"]) . "</td>\n";
         print "</tr>";
         }
     }

html/inc/common.php

@@ -458,15 +458,33 @@ function print_loglevel_select($item_name, $value)
     print "</select>\n";
 }
 
+function reencodeurl($url) {
+$url_arr = explode('?', $url);
+$fpage = $url_arr[0];
+$params = $url_arr[1];
+$params_arr = explode('&', $params);
+$new_params = '';
+foreach ($params_arr as $row) {
+    $param = explode ('=',$row);
+    $key = $param[0]; 
+    $value = urlencode(urldecode($param[1]));
+    $new_params.="&".$key."=".$value;
+    }
+$new_params = preg_replace('/^&/','',$new_params);
+$new_url = $fpage."?".$new_params;
+return $new_url;
+}
+
 function print_submenu_url($display_name,$page,$current_page,$last) {
-$fpage = explode('?', $page);
-$fpage = $fpage[0];
-if ($fpage === $current_page) { print "<b>$display_name</b>"; } else { print "<a href='".$page."'> $display_name </a>"; }
+$url_arr = explode('?', $page);
+$fpage = $url_arr[0];
+$new_url = reencodeurl($page);
+if ($fpage === $current_page) { print "<b>$display_name</b>"; } else { print "<a href='".$new_url."'> $display_name </a>"; }
 if (!isset($last) or $last==0) { print " | "; }
 }
 
 function print_url($display_name,$page) {
-print "<a href='".$page."'> $display_name </a>";
+print "<a href='".reencodeurl($page)."'> $display_name </a>";
 }
 
 function print_log_submenu ($current_page) {
@@ -1084,6 +1102,31 @@ LOG_DEBUG($db,"Clean dns cache before $clean_date at $now");
 run_sql($db,"DELETE FROM dns_cache WHERE `timestamp`<='".$clean_date."'");
 }
 
+function FormatDateStr($format = 'Y-m-d H:i:s', $date_str) {
+$date1 = GetDateTimeFromString($date_str);
+var_dump($date1);
+$result = $date1->format($format);
+return $result;
+}
+
+function GetDateTimeFromString($date_str) {
+if (!is_a($date_str,'DateTime')) {
+    $date_str = urldecode($date_str);
+//    $date_str = preg_replace('/(\'|\")/','',$date_str);
+    $date1 = DateTime::createFromFormat('Y-m-d H:i:s',$date_str);
+    if (!$date1) { $date1 = DateTime::createFromFormat('Y.m.d H:i:s',$date_str); }
+    if (!$date1) { $date1 = DateTime::createFromFormat('Y/m/d H:i:s',$date_str); }
+    if (!$date1) { $date1 = DateTime::createFromFormat('Y-m-d H:i',$date_str); }
+    if (!$date1) { $date1 = DateTime::createFromFormat('Y.m.d H:i',$date_str); }
+    if (!$date1) { $date1 = DateTime::createFromFormat('Y/m/d H:i',$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 = DateTime::createFromFormat('Y/m/d|',$date_str); }
+    if (!$date1) { $date1 = new DateTime; }
+    } else { return $date_str; }
+return $date1;
+}
+
 function GetNowTimeString() {
 $now = strftime('%Y-%m-%d %H:%M:%S',time());
 return $now;
@@ -2923,14 +2966,14 @@ if ($total<=1) { return; }
 #две назад
     print "<br><div align=left>";
     if(($page-2)>0):
-      $pagetwoleft="<a class='first_page_link' href=".$url."?page=".($page-2)."'>".($page-2)."</a>  ";
+      $pagetwoleft="<a class='first_page_link' href=".$url."?page=".($page-2).">".($page-2)."</a>  ";
     else:
       $pagetwoleft=null;
     endif;
 
 #одна назад
     if(($page-1)>0):
-      $pageoneleft="<a class='first_page_link' href=".$url."?page=".($page-1)."'>".($page-1)."</a>  ";
+      $pageoneleft="<a class='first_page_link' href=".$url."?page=".($page-1).">".($page-1)."</a>  ";
       $pagetemp=($page-1);
     else:
       $pageoneleft=null;
@@ -2939,14 +2982,14 @@ if ($total<=1) { return; }
 
 #две вперед
     if(($page+2)<=$total):
-      $pagetworight="  <a class='first_page_link' href=".$url."?page=".($page+2)."'>".($page+2)."</a>";
+      $pagetworight="  <a class='first_page_link' href=".$url."?page=".($page+2).">".($page+2)."</a>";
     else:
       $pagetworight=null;
     endif;
 
 #одна вперед
     if(($page+1)<=$total):
-      $pageoneright="  <a class='first_page_link' href=".$url."?page=".($page+1)."'>".($page+1)."</a>";
+      $pageoneright="  <a class='first_page_link' href=".$url."?page=".($page+1).">".($page+1)."</a>";
       $pagetemp2=($page+1);
     else:
       $pageoneright=null;
@@ -2955,14 +2998,14 @@ if ($total<=1) { return; }
 
 # в начало
     if($page!=1 && $pagetemp!=1 && $pagetemp!=2):
-      $pagerevp="<a href=".$url."?page=1' class='first_page_link' title='В начало'><<</a> ";
+      $pagerevp="<a href=".$url."?page=1 class='first_page_link' title='В начало'><<</a> ";
     else:
       $pagerevp=null;
     endif;
 
 #в конец (последняя)
     if($page!=$total && $pagetemp2!=($total-1) && $pagetemp2!=$total):
-      $nextp=" ...  <a href=".$url."?page=".$total."'".$total."' class='first_page_link'>$total</a>";
+      $nextp=" ...  <a href=".$url."?page=".$total." class='first_page_link'>$total</a>";
     else:
       $nextp=null;
     endif;

html/inc/datefilter.php

@@ -7,16 +7,10 @@ $datetime_start = new DateTime();
 if (empty($default_date_shift)) { $default_date_shift='d'; }
 
 if (!empty($_GET['date_start']) or !empty($_POST['date_start'])) {
-    if (!empty($_GET['date_start'])) { $date_str1 = str_replace('"','',$_GET['date_start']); }
-    if (!empty($_POST['date_start'])) { $date_str1 = str_replace('"','',$_POST['date_start']); }
-    $datetime_start = DateTime::createFromFormat('Y-m-d',$date_str1);
-    if (!$datetime_start) { $datetime_start = DateTime::createFromFormat('Y-m-d H:i:s',$date_str1); }
-    if (!$datetime_start) { $datetime_start = DateTime::createFromFormat('Y.m.d',$date_str1); }
-    if (!$datetime_start) { $datetime_start = DateTime::createFromFormat('Y.m.d H:i:s',$date_str1); }
-    if (!empty($datetime_start)) {
-        $date1 = $datetime_start->format('Y-m-d');
-        $time_start = $datetime_start->getTimestamp();
-        }
+    if (!empty($_GET['date_start'])) { $datetime_start = GetDateTimeFromString(urldecode($_GET['date_start'])); }
+    if (!empty($_POST['date_start'])) { $datetime_start = GetDateTimeFromString($_POST['date_start']); }
+    $date1 = $datetime_start->format('Y-m-d');
+    $time_start = $datetime_start->getTimestamp();
     } else {
     if (!empty($_SESSION[$page_url]['date_start'])) {
         $date1 = $_SESSION[$page_url]['date_start'];
@@ -29,16 +23,10 @@ if (!empty($_GET['date_start']) or !empty($_POST['date_start'])) {
     }
 
 if (!empty($_POST['date_stop']) or !empty($_GET['date_stop'])) {
-    if (!empty($_GET['date_stop'])) { $date_str2 = str_replace('"','',$_GET['date_stop']); }
-    if (!empty($_POST['date_stop'])) { $date_str2 = str_replace('"','',$_POST['date_stop']); }
-    $datetime_stop = DateTime::createFromFormat('Y-m-d',$date_str2);
-    if (!$datetime_stop) { $datetime_stop = DateTime::createFromFormat('Y-m-d H:i:s',$date_str2); }
-    if (!$datetime_stop) { $datetime_stop = DateTime::createFromFormat('Y.m.d H:i:s',$date_str2); }
-    if (!$datetime_stop) { $datetime_stop = DateTime::createFromFormat('Y.m.d H:i:s',$date_str2); }
-    if (!empty($datetime_stop)) {
-        $date2 = $datetime_stop->format('Y-m-d');
-        $time_stop = $datetime_stop->getTimestamp();
-        }
+    if (!empty($_GET['date_stop'])) { $datetime_stop = GetDateTimeFromString(urldecode($_GET['date_stop'])); }
+    if (!empty($_POST['date_stop'])) { $datetime_stop = GetDateTimeFromString($_POST['date_stop']); }
+    $date2 = $datetime_stop->format('Y-m-d');
+    $time_stop = $datetime_stop->getTimestamp();
     } else {
     if (!empty($_SESSION[$page_url]['date_stop'])) {
         $date2 = $_SESSION[$page_url]['date_stop'];
@@ -47,6 +35,9 @@ if (!empty($_POST['date_stop']) or !empty($_GET['date_stop'])) {
         }
     }
 
+if (!empty($datetime_stop) and !empty($datetime_start)) {
+    if (($time_stop - $time_start)/86400 <1) { $datetime_stop = NULL; }
+    }
 
 if (!isset($datetime_stop) or empty($datetime_stop)) {
     if ($default_date_shift==='d') {

html/inc/datetimefilter.php

@@ -7,22 +7,10 @@ $datetime_start = new DateTime(strftime('%Y-%m-%d 00:00:00',time()));
 if (empty($default_date_shift)) { $default_date_shift='h'; }
 
 if (!empty($_GET['date_start']) or !empty($_POST['date_start'])) {
-    if (!empty($_GET['date_start'])) { $date_str1 = str_replace('"','',$_GET['date_start']); }
-    if (!empty($_POST['date_start'])) { $date_str1 = str_replace('"','',$_POST['date_start']); }
-    $datetime_start = DateTime::createFromFormat('Y-m-d H:i:s',$date_str1);
-    if (!$datetime_start) { $datetime_start = DateTime::createFromFormat('Y.m.d H:i:s',$date_str1); }
-    if (!$datetime_start) { 
-        $datetime_start = DateTime::createFromFormat('Y-m-d',$date_str1);
-        $datetime_start->setTime(0,0,0);
-        }
-    if (!$datetime_start) { 
-        $datetime_start = DateTime::createFromFormat('Y.m.d',$date_str1); 
-        $datetime_start->setTime(0,0,0);
-        }
-    if (!empty($datetime_start)) {
-        $date1 = $datetime_start->format('Y-m-d H:i:s');
-        $time_start = $datetime_start->getTimestamp();
-        }
+    if (!empty($_GET['date_start'])) { $datetime_start = GetDateTimeFromString(urldecode($_GET['date_start'])); }
+    if (!empty($_POST['date_start'])) { $datetime_start = GetDateTimeFromString($_POST['date_start']); }
+    $date1 = $datetime_start->format('Y-m-d H:i:s');
+    $time_start = $datetime_start->getTimestamp();
     } else {
     if (!empty($_SESSION[$page_url]['date_start'])) {
         $date1 = $_SESSION[$page_url]['date_start'];
@@ -35,16 +23,10 @@ if (!empty($_GET['date_start']) or !empty($_POST['date_start'])) {
     }
 
 if (!empty($_POST['date_stop']) or !empty($_GET['date_stop'])) {
-    if (!empty($_GET['date_stop'])) { $date_str2 = str_replace('"','',$_GET['date_stop']); }
-    if (!empty($_POST['date_stop'])) { $date_str2 = str_replace('"','',$_POST['date_stop']); }
-    $datetime_stop = DateTime::createFromFormat('Y-m-d H:i:s',$date_str2);
-    if (!$datetime_stop) { $datetime_stop = DateTime::createFromFormat('Y.m.d H:i:s',$date_str2); }
-    if (!$datetime_stop) { $datetime_stop = DateTime::createFromFormat('Y-m-d',$date_str2); }
-    if (!$datetime_stop) { $datetime_stop = DateTime::createFromFormat('Y.m.d',$date_str2); }
-    if (!empty($datetime_stop)) {
-        $date2 = $datetime_stop->format('Y-m-d H:i:s');
-        $time_stop = $datetime_stop->getTimestamp();
-        }
+    if (!empty($_GET['date_stop'])) { $datetime_stop = GetDateTimeFromString(urldecode($_GET['date_stop'])); }
+    if (!empty($_POST['date_stop'])) { $datetime_stop = GetDateTimeFromString($_POST['date_stop']); }
+    $date2 = $datetime_stop->format('Y-m-d H:i:s');
+    $time_stop = $datetime_stop->getTimestamp();
     } else {
     if (!empty($_SESSION[$page_url]['date_stop'])) {
         $date2 = $_SESSION[$page_url]['date_stop'];

html/inc/languages/russian.php

@@ -27,10 +27,10 @@ $title_devices = "Инфраструктура";
 $cell_login = "Логин";
 $cell_fio = "ФИО";
 $cell_ou = "Подразделение";
-$cell_enabled = "Активен";
-$cell_blocked = "Блок по трафику";
-$cell_perday = "В день, Mb";
-$cell_permonth = "В месяц, Mb";
+$cell_enabled = "Включен";
+$cell_blocked = "Блокировка";
+$cell_perday = "В день";
+$cell_permonth = "В месяц";
 $cell_report = "Отчёт";
 $cell_name = "Название";
 $cell_ip = "IP";