Просмотр исходного кода

If the ip address comment is allowed, fill it out from the user's record

Roman Dmitriev 1 год назад
Родитель
Сommit
d72d829
1 измененных файлов с 264 добавлено и 227 удалено
  1. 264 227
      html/admin/users/edituser.php

+ 264 - 227
html/admin/users/edituser.php

@@ -1,11 +1,11 @@
 <?php
 <?php
-require_once ($_SERVER["DOCUMENT_ROOT"]."/inc/auth.php");
-require_once ($_SERVER["DOCUMENT_ROOT"]."/inc/languages/" . HTML_LANG . ".php");
-require_once ($_SERVER["DOCUMENT_ROOT"]."/inc/idfilter.php");
+require_once($_SERVER["DOCUMENT_ROOT"] . "/inc/auth.php");
+require_once($_SERVER["DOCUMENT_ROOT"] . "/inc/languages/" . HTML_LANG . ".php");
+require_once($_SERVER["DOCUMENT_ROOT"] . "/inc/idfilter.php");
 
 
 
 
-$default_sort='ip_int';
-require_once ($_SERVER['DOCUMENT_ROOT']."/inc/sortfilter.php");
+$default_sort = 'ip_int';
+require_once($_SERVER['DOCUMENT_ROOT'] . "/inc/sortfilter.php");
 
 
 $msg_error = "";
 $msg_error = "";
 
 
@@ -14,13 +14,13 @@ $user_info = get_record_sql($db_link, $sSQL);
 
 
 if (empty($user_info)) {
 if (empty($user_info)) {
     header("Location: /admin/");
     header("Location: /admin/");
-    }
+}
 
 
 if (isset($_POST["edituser"])) {
 if (isset($_POST["edituser"])) {
     unset($new);
     unset($new);
     $new["ou_id"] = $_POST["f_ou"] * 1;
     $new["ou_id"] = $_POST["f_ou"] * 1;
-    $new["filter_group_id"] = $_POST["f_filter"]*1;
-    $new["queue_id"] = $_POST["f_queue"]*1;
+    $new["filter_group_id"] = $_POST["f_filter"] * 1;
+    $new["queue_id"] = $_POST["f_queue"] * 1;
     $new["login"] = trim($_POST["f_login"]);
     $new["login"] = trim($_POST["f_login"]);
     $new["fio"] = trim($_POST["f_fio"]);
     $new["fio"] = trim($_POST["f_fio"]);
     if (get_const('default_user_ou_id') == $new["ou_id"] or get_const('default_hotspot_ou_id') == $new["ou_id"]) {
     if (get_const('default_user_ou_id') == $new["ou_id"] or get_const('default_hotspot_ou_id') == $new["ou_id"]) {
@@ -34,145 +34,158 @@ if (isset($_POST["edituser"])) {
         $new["day_quota"] = get_int(trim($_POST["f_perday"]));
         $new["day_quota"] = get_int(trim($_POST["f_perday"]));
         $new["month_quota"] = get_int(trim($_POST["f_permonth"]));
         $new["month_quota"] = get_int(trim($_POST["f_permonth"]));
     }
     }
-    $changes = get_diff_rec($db_link,"User_list","id='$id'", $new, 0);
-    if (!empty($changes)) { LOG_INFO($db_link,"Changed user id: $id login: ".$new["login"].". \r\nApply: $changes"); }
+    $changes = get_diff_rec($db_link, "User_list", "id='$id'", $new, 0);
+    if (!empty($changes)) {
+        LOG_INFO($db_link, "Changed user id: $id login: " . $new["login"] . ". \r\nApply: $changes");
+    }
     update_record($db_link, "User_list", "id='$id'", $new);
     update_record($db_link, "User_list", "id='$id'", $new);
     if (!$new["enabled"]) {
     if (!$new["enabled"]) {
-        run_sql($db_link, "UPDATE User_auth SET enabled=0, changed=1 WHERE user_id=".$id);
-        }
-    run_sql($db_link, "UPDATE User_auth SET ou_id=".$new["ou_id"]." WHERE user_id=".$id);
-    run_sql($db_link, "UPDATE devices SET device_name='".$new["login"]."' WHERE user_id=".$id);
+        run_sql($db_link, "UPDATE User_auth SET enabled=0, changed=1 WHERE user_id=" . $id);
+    }
+    if (!empty($new["fio"])) {
+        run_sql($db_link, "UPDATE User_auth SET `comments`='" . mysqli_real_escape_string($db_link, $new["fio"]) . "' WHERE `user_id`=" . $id . " AND `deleted`=0 AND (`comments` IS NULL or `comments`='' or `comments`='" . $user_info["fio"] . "')");
+    }
+    run_sql($db_link, "UPDATE User_auth SET ou_id=" . $new["ou_id"] . " WHERE user_id=" . $id);
+    run_sql($db_link, "UPDATE devices SET device_name='" . $new["login"] . "' WHERE user_id=" . $id);
     header("Location: " . $_SERVER["REQUEST_URI"]);
     header("Location: " . $_SERVER["REQUEST_URI"]);
     exit;
     exit;
 }
 }
 
 
 if (isset($_POST["addMacRule"])) {
 if (isset($_POST["addMacRule"])) {
     unset($new);
     unset($new);
-    $first_auth = get_record_sql($db_link,"SELECT mac FROM User_auth WHERE user_id=".$id." AND deleted=0 AND LENGTH(mac)>0 ORDER BY id");
+    $first_auth = get_record_sql($db_link, "SELECT mac FROM User_auth WHERE user_id=" . $id . " AND deleted=0 AND LENGTH(mac)>0 ORDER BY id");
     if (!empty($first_auth) and !empty($first_auth['mac'])) {
     if (!empty($first_auth) and !empty($first_auth['mac'])) {
-	    add_auth_rule($db_link,$first_auth['mac'],2,$id);
-        }
+        add_auth_rule($db_link, $first_auth['mac'], 2, $id);
+    }
     header("Location: " . $_SERVER["REQUEST_URI"]);
     header("Location: " . $_SERVER["REQUEST_URI"]);
     exit;
     exit;
 }
 }
 
 
 if (isset($_POST["delMacRule"])) {
 if (isset($_POST["delMacRule"])) {
-    run_sql($db_link,"DELETE FROM auth_rules WHERE user_id=".$id." AND type=2");
-    LOG_INFO($db_link,"All autorules removed for id: $id login: ".$user_info["login"]." by mac");
+    run_sql($db_link, "DELETE FROM auth_rules WHERE user_id=" . $id . " AND type=2");
+    LOG_INFO($db_link, "All autorules removed for id: $id login: " . $user_info["login"] . " by mac");
     header("Location: " . $_SERVER["REQUEST_URI"]);
     header("Location: " . $_SERVER["REQUEST_URI"]);
     exit;
     exit;
 }
 }
 
 
 if (isset($_POST["addIPRule"])) {
 if (isset($_POST["addIPRule"])) {
     unset($new);
     unset($new);
-    $first_auth = get_record_sql($db_link,"SELECT ip FROM User_auth WHERE user_id=".$id." AND deleted=0 AND LENGTH(ip)>0 ORDER BY id");
+    $first_auth = get_record_sql($db_link, "SELECT ip FROM User_auth WHERE user_id=" . $id . " AND deleted=0 AND LENGTH(ip)>0 ORDER BY id");
     if (!empty($first_auth) and !empty($first_auth['ip'])) {
     if (!empty($first_auth) and !empty($first_auth['ip'])) {
-	    add_auth_rule($db_link,$first_auth['ip'],1,$id);
-        }
+        add_auth_rule($db_link, $first_auth['ip'], 1, $id);
+    }
     header("Location: " . $_SERVER["REQUEST_URI"]);
     header("Location: " . $_SERVER["REQUEST_URI"]);
     exit;
     exit;
 }
 }
 
 
 if (isset($_POST["delIPRule"])) {
 if (isset($_POST["delIPRule"])) {
-    run_sql($db_link,"DELETE FROM auth_rules WHERE user_id=".$id." AND type=1");
-    LOG_INFO($db_link,"Removed all auto rules for id: $id login: ".$user_info["login"]." by ip");
+    run_sql($db_link, "DELETE FROM auth_rules WHERE user_id=" . $id . " AND type=1");
+    LOG_INFO($db_link, "Removed all auto rules for id: $id login: " . $user_info["login"] . " by ip");
     header("Location: " . $_SERVER["REQUEST_URI"]);
     header("Location: " . $_SERVER["REQUEST_URI"]);
     exit;
     exit;
 }
 }
 
 
 if (isset($_POST["showDevice"])) {
 if (isset($_POST["showDevice"])) {
-    $device = get_record_sql($db_link,"SELECT * FROM devices WHERE user_id=".$id);
-    $auth = get_record_sql($db_link,"SELECT * FROM User_auth WHERE user_id=".$id);
+    $device = get_record_sql($db_link, "SELECT * FROM devices WHERE user_id=" . $id);
+    $auth = get_record_sql($db_link, "SELECT * FROM User_auth WHERE user_id=" . $id);
     if (empty($device) and !empty($auth)) {
     if (empty($device) and !empty($auth)) {
-	    $new['user_id']=$id;
+        $new['user_id'] = $id;
         $new['device_name'] = $user_info['login'];
         $new['device_name'] = $user_info['login'];
         $new['device_type'] = 5;
         $new['device_type'] = 5;
-        $new['ip']=$auth['ip'];
+        $new['ip'] = $auth['ip'];
         $new['community'] = get_const('snmp_default_community');
         $new['community'] = get_const('snmp_default_community');
         $new['snmp_version'] = get_const('snmp_default_version');
         $new['snmp_version'] = get_const('snmp_default_version');
-        $new['login'] = get_option($db_link,28);
-        $new['password'] = get_option($db_link,29);
+        $new['login'] = get_option($db_link, 28);
+        $new['password'] = get_option($db_link, 29);
         //default ssh
         //default ssh
         $new['protocol'] = 0;
         $new['protocol'] = 0;
-        $new['control_port'] = get_option($db_link,30);
-        $new_id=insert_record($db_link, "devices", $new);
+        $new['control_port'] = get_option($db_link, 30);
+        $new_id = insert_record($db_link, "devices", $new);
         unset($_POST);
         unset($_POST);
         if (!empty($new_id)) {
         if (!empty($new_id)) {
             LOG_INFO($db_link, "Created device with id: $new_id for auth_id: $id");
             LOG_INFO($db_link, "Created device with id: $new_id for auth_id: $id");
-	        header("Location: /admin/devices/editdevice.php?id={$new_id}");
-	        exit;
-	        } else {
-	        header("Location: ".$_SERVER["REQUEST_URI"]);
-	        exit;
-	        }
-	    }
-    header("Location: /admin/devices/editdevice.php?id=".$device['id']);
+            header("Location: /admin/devices/editdevice.php?id={$new_id}");
+            exit;
+        } else {
+            header("Location: " . $_SERVER["REQUEST_URI"]);
+            exit;
+        }
+    }
+    header("Location: /admin/devices/editdevice.php?id=" . $device['id']);
     exit;
     exit;
 }
 }
 
 
 if (isset($_POST["addauth"])) {
 if (isset($_POST["addauth"])) {
     $fip = substr(trim($_POST["newip"]), 0, 18);
     $fip = substr(trim($_POST["newip"]), 0, 18);
     $fmac = NULL;
     $fmac = NULL;
-    if (isset($_POST["newmac"])) { $fmac = mac_dotted(substr(trim($_POST["newmac"]), 0, 17)); }
+    if (isset($_POST["newmac"])) {
+        $fmac = mac_dotted(substr(trim($_POST["newmac"]), 0, 17));
+    }
     if ($fip) {
     if ($fip) {
         if (checkValidIp($fip)) {
         if (checkValidIp($fip)) {
             $ip_aton = ip2long($fip);
             $ip_aton = ip2long($fip);
             $f_dhcp = 1;
             $f_dhcp = 1;
             //search mac
             //search mac
             if (!empty($fmac) and !empty($fip)) {
             if (!empty($fmac) and !empty($fip)) {
-                $mac_exists=find_mac_in_subnet($db_link,$fip,$fmac);
-                if (!empty($mac_exists) and $mac_exists['count']>=1 and !in_array($id,$mac_exists['users_id'])) {
-                    $dup_sql = "SELECT * FROM User_list WHERE id=".$mac_exists['users_id']['0'];
+                $mac_exists = find_mac_in_subnet($db_link, $fip, $fmac);
+                if (!empty($mac_exists) and $mac_exists['count'] >= 1 and !in_array($id, $mac_exists['users_id'])) {
+                    $dup_sql = "SELECT * FROM User_list WHERE id=" . $mac_exists['users_id']['0'];
                     $dup_info = get_record_sql($db_link, $dup_sql);
                     $dup_info = get_record_sql($db_link, $dup_sql);
-                    $msg_error="Mac already exists at another user in this subnet! Skip creating $fip [$fmac].<br>Old user id: ".$dup_info['id']." login: ".$dup_info['login'];
+                    $msg_error = "Mac already exists at another user in this subnet! Skip creating $fip [$fmac].<br>Old user id: " . $dup_info['id'] . " login: " . $dup_info['login'];
                     $_SESSION[$page_url]['msg'] = $msg_error;
                     $_SESSION[$page_url]['msg'] = $msg_error;
                     LOG_ERROR($db_link, $msg_error);
                     LOG_ERROR($db_link, $msg_error);
                     header("Location: " . $_SERVER["REQUEST_URI"]);
                     header("Location: " . $_SERVER["REQUEST_URI"]);
                     exit;
                     exit;
-                    }
+                }
                 //disable dhcp for secondary ip
                 //disable dhcp for secondary ip
-                if (empty($mac_exists)) { $f_dhcp = 1; } else {
-                    if (in_array($id,$mac_exists['users_id'])) { $f_dhcp = 0; }
+                if (empty($mac_exists)) {
+                    $f_dhcp = 1;
+                } else {
+                    if (in_array($id, $mac_exists['users_id'])) {
+                        $f_dhcp = 0;
                     }
                     }
                 }
                 }
+            }
             //search ip
             //search ip
-            $dup_ip_record = get_record_sql($db_link, "SELECT * FROM User_auth WHERE `ip_int`=$ip_aton AND user_id<>".$id." AND deleted=0");
+            $dup_ip_record = get_record_sql($db_link, "SELECT * FROM User_auth WHERE `ip_int`=$ip_aton AND user_id<>" . $id . " AND deleted=0");
             if (!empty($dup_ip_record)) {
             if (!empty($dup_ip_record)) {
-                $dup_info = get_record_sql($db_link, "SELECT * FROM User_list WHERE id=".$dup_ip_record['user_id']);
-                $msg_error = "$fip already exists. Skip creating $fip [$fmac].<br>Old user id: ".$dup_info['id']." login: ".$dup_info['login'];
+                $dup_info = get_record_sql($db_link, "SELECT * FROM User_list WHERE id=" . $dup_ip_record['user_id']);
+                $msg_error = "$fip already exists. Skip creating $fip [$fmac].<br>Old user id: " . $dup_info['id'] . " login: " . $dup_info['login'];
                 $_SESSION[$page_url]['msg'] = $msg_error;
                 $_SESSION[$page_url]['msg'] = $msg_error;
                 LOG_ERROR($db_link, $msg_error);
                 LOG_ERROR($db_link, $msg_error);
                 header("Location: " . $_SERVER["REQUEST_URI"]);
                 header("Location: " . $_SERVER["REQUEST_URI"]);
                 exit;
                 exit;
-                }
+            }
             $fid = new_auth($db_link, $fip, $fmac, $id);
             $fid = new_auth($db_link, $fip, $fmac, $id);
             if (!empty($fid)) {
             if (!empty($fid)) {
-                $new['dhcp']=$f_dhcp;
-                $new["dhcp_action"]='manual';
-                update_record($db_link,"User_auth","id=".$fid,$new);
-                LOG_INFO($db_link,"Add ip for login: ".$user_info["login"].": ip => $fip, mac => $fmac",$fid);
-                header("Location: /admin/users/editauth.php?id=".$fid);
+                $new['dhcp'] = $f_dhcp;
+                $new["dhcp_action"] = 'manual';
+                update_record($db_link, "User_auth", "id=" . $fid, $new);
+                LOG_INFO($db_link, "Add ip for login: " . $user_info["login"] . ": ip => $fip, mac => $fmac", $fid);
+                header("Location: /admin/users/editauth.php?id=" . $fid);
                 exit;
                 exit;
-                }
-	        header("Location: " . $_SERVER["REQUEST_URI"]);
-	        exit;
-    	    } else {
-                $msg_error = "$msg_ip_error xxx.xxx.xxx.xxx";
-                $_SESSION[$page_url]['msg'] = $msg_error;
-    	    }
-	}
+            }
+            header("Location: " . $_SERVER["REQUEST_URI"]);
+            exit;
+        } else {
+            $msg_error = "$msg_ip_error xxx.xxx.xxx.xxx";
+            $_SESSION[$page_url]['msg'] = $msg_error;
+        }
+    }
     header("Location: " . $_SERVER["REQUEST_URI"]);
     header("Location: " . $_SERVER["REQUEST_URI"]);
     exit;
     exit;
-    }
+}
 
 
 if (isset($_POST["removeauth"])) {
 if (isset($_POST["removeauth"])) {
     $auth_id = $_POST["f_auth_id"];
     $auth_id = $_POST["f_auth_id"];
     foreach ($auth_id as $key => $val) {
     foreach ($auth_id as $key => $val) {
         if ($val) {
         if ($val) {
-            run_sql($db_link, 'DELETE FROM connections WHERE auth_id='.$val);
-            run_sql($db_link, 'DELETE FROM User_auth_alias WHERE auth_id='.$val);
-            $changes=delete_record($db_link, "User_auth", "id=" . $val);
-            if (!empty($changes)) { LOG_INFO($db_link,"Remove user ".$user_info["login"]." ip: \r\n ".$changes); }
+            run_sql($db_link, 'DELETE FROM connections WHERE auth_id=' . $val);
+            run_sql($db_link, 'DELETE FROM User_auth_alias WHERE auth_id=' . $val);
+            $changes = delete_record($db_link, "User_auth", "id=" . $val);
+            if (!empty($changes)) {
+                LOG_INFO($db_link, "Remove user " . $user_info["login"] . " ip: \r\n " . $changes);
+            }
         }
         }
     }
     }
     header("Location: " . $_SERVER["REQUEST_URI"]);
     header("Location: " . $_SERVER["REQUEST_URI"]);
@@ -184,31 +197,41 @@ if (isset($_POST["new_user"])) {
     $save_traf = get_option($db_link, 23) * 1;
     $save_traf = get_option($db_link, 23) * 1;
     foreach ($auth_id as $key => $val) {
     foreach ($auth_id as $key => $val) {
         if ($val) {
         if ($val) {
-	    $auth_info = get_record_sql($db_link,"SELECT ip, mac, comments, dns_name, dhcp_hostname FROM User_auth WHERE id=$val");
+            $auth_info = get_record_sql($db_link, "SELECT ip, mac, comments, dns_name, dhcp_hostname FROM User_auth WHERE id=$val");
             $ou_id = $user_info["ou_id"];
             $ou_id = $user_info["ou_id"];
             $login = NULL;
             $login = NULL;
-            if (!empty($auth_info["dns_name"])) { $login = $auth_info["dns_name"]; }
-            if (empty($login) and !empty($auth_info["comments"])) { $login = transliterate($auth_info["comments"]); }
-            if (empty($login) and !empty($auth_info["dhcp_hostname"])) { $login = $auth_info["dhcp_hostname"]; }
-            if (empty($login) and !empty($auth_info["mac"])) { $login = $auth_info["mac"]; }
-	        if (empty($login)) { $login = $auth_info["ip"]; }
-	        $new_user = get_record_sql($db_link,"SELECT * FROM User_list WHERE LCase(login)=LCase('$login') and deleted=0");
+            if (!empty($auth_info["dns_name"])) {
+                $login = $auth_info["dns_name"];
+            }
+            if (empty($login) and !empty($auth_info["comments"])) {
+                $login = transliterate($auth_info["comments"]);
+            }
+            if (empty($login) and !empty($auth_info["dhcp_hostname"])) {
+                $login = $auth_info["dhcp_hostname"];
+            }
+            if (empty($login) and !empty($auth_info["mac"])) {
+                $login = $auth_info["mac"];
+            }
+            if (empty($login)) {
+                $login = $auth_info["ip"];
+            }
+            $new_user = get_record_sql($db_link, "SELECT * FROM User_list WHERE LCase(login)=LCase('$login') and deleted=0");
             if (!empty($new_user)) {
             if (!empty($new_user)) {
                 // move auth
                 // move auth
                 $auth["user_id"] = $new_user["id"];
                 $auth["user_id"] = $new_user["id"];
                 $auth["ou_id"] = $new_user["ou_id"];
                 $auth["ou_id"] = $new_user["ou_id"];
                 $auth["save_traf"] = $save_traf;
                 $auth["save_traf"] = $save_traf;
-                $auth=apply_auth_rule($db_link,$auth,$l_id);
+                $auth = apply_auth_rule($db_link, $auth, $l_id);
                 update_record($db_link, "User_auth", "id='" . $val . "'", $auth);
                 update_record($db_link, "User_auth", "id='" . $val . "'", $auth);
-                LOG_WARNING($db_link,"ip from id: $val moved to another user user_id: ".$new_user["id"], $val);
+                LOG_WARNING($db_link, "ip from id: $val moved to another user user_id: " . $new_user["id"], $val);
             } else {
             } else {
                 $new["login"] = $login;
                 $new["login"] = $login;
                 $new["ou_id"] = $ou_id;
                 $new["ou_id"] = $ou_id;
-                $l_id=insert_record($db_link, "User_list", $new);
+                $l_id = insert_record($db_link, "User_list", $new);
                 $auth["user_id"] = $l_id;
                 $auth["user_id"] = $l_id;
                 $auth["save_traf"] = $save_traf;
                 $auth["save_traf"] = $save_traf;
                 update_record($db_link, "User_auth", "id='" . $val . "'", $auth);
                 update_record($db_link, "User_auth", "id='" . $val . "'", $auth);
-                LOG_WARNING($db_link,"Create user from ip: login => $login. ip-record auth_id: $val moved to this user.", $val);
+                LOG_WARNING($db_link, "Create user from ip: login => $login. ip-record auth_id: $val moved to this user.", $val);
             }
             }
         }
         }
     }
     }
@@ -218,158 +241,172 @@ if (isset($_POST["new_user"])) {
 
 
 unset($_POST);
 unset($_POST);
 
 
-require_once ($_SERVER["DOCUMENT_ROOT"]."/inc/header.php");
+require_once($_SERVER["DOCUMENT_ROOT"] . "/inc/header.php");
 ?>
 ?>
 <div id="cont">
 <div id="cont">
-<?php
-if (!empty($_SESSION[$page_url]['msg'])) {
-    print '<div id="msg">'.$_SESSION[$page_url]['msg'].'</div>';
-    unset($_SESSION[$page_url]['msg']);
+    <?php
+    if (!empty($_SESSION[$page_url]['msg'])) {
+        print '<div id="msg">' . $_SESSION[$page_url]['msg'] . '</div>';
+        unset($_SESSION[$page_url]['msg']);
     }
     }
-?>
-<form name="def" action="edituser.php?id=<?php echo $id; ?>" method="post">
-<input type="hidden" name="id" value=<?php echo $id; ?>>
-<table class="data">
-<tr>
-<td colspan=2><?php print WEB_cell_login; ?></td>
-<td colspan=2><?php print WEB_cell_fio; ?></td>
-<td colspan=2><?php print WEB_cell_ou; ?></td>
-</tr>
-<tr>
-<td colspan=2><input type="text" name="f_login" value="<?php print $user_info["login"]; ?>" size=25></td>
-<td colspan=2><input type="text" name="f_fio" value="<?php print $user_info["fio"]; ?>" size=25></td>
-<td colspan=2><?php print_ou_set($db_link, 'f_ou', $user_info["ou_id"]); ?></td>
-</tr>
-<tr>
-<td colspan=2><?php print WEB_cell_perday; ?></td>
-<td colspan=2><?php print WEB_cell_permonth; ?></td>
-<td><?php print WEB_cell_blocked; ?></td>
-<td><?php print WEB_cell_enabled; ?></td>
-</tr>
-<tr>
-<td colspan=2><input type="text" name="f_perday" value="<?php echo $user_info["day_quota"]; ?>" size=5></td>
-<td colspan=2><input type="text" name="f_permonth" value="<?php echo $user_info["month_quota"]; ?>" size=5></td>
-<td ><?php print_qa_select('f_blocked', $user_info["blocked"]); ?></td>
-<td ><?php print_qa_select('f_enabled', $user_info["enabled"]); ?></td>
-</tr>
-<tr><td class=data colspan=6><?php echo WEB_user_rules_for_autoassign; ?>:</td></tr>
-<tr>
-<td colspan=2><?php print WEB_cell_filter; ?></td>
-<td colspan=2><?php print WEB_cell_shaper; ?></td>
-<td colspan=2></td>
-</tr>
-<tr>
-<td colspan=2><?php print_group_select($db_link, 'f_filter', $user_info["filter_group_id"]); ?></td>
-<td colspan=2><?php print_queue_select($db_link, 'f_queue', $user_info["queue_id"]); ?></td>
-<td colspan=2></td>
-</tr>
-<tr>
-<?php
-print "<td>"; print_url(WEB_user_rule_list,"/admin/users/edit_rules.php?id=$id"); print "</td>";
-$rule_count = get_count_records($db_link,"auth_rules","user_id=".$id);
-print "<td > Count: ".$rule_count."</td>";
-$first_auth = get_record_sql($db_link,"SELECT id FROM User_auth WHERE user_id=".$id." AND deleted=0 ORDER BY id");
-if (!empty($first_auth)) {
-    //mac
-    $mac_rule_count = get_count_records($db_link,"auth_rules","user_id=".$id." AND type=2");
-    if (!empty($mac_rule_count)) { 
-	    print "<td><input type=\"submit\" name=\"delMacRule\" value=".WEB_btn_mac_del." ></td>";
-	    } else {
-	    print "<td><input type=\"submit\" name=\"addMacRule\" value=".WEB_btn_mac_add." ></td>";
-	    }
-    //ip
-    $ip_rule_count = get_count_records($db_link,"auth_rules","user_id=".$id." AND type=1");
-    if (!empty($ip_rule_count)) { 
-	    print "<td><input type=\"submit\" name=\"delIPRule\" value=".WEB_btn_ip_del." ></td>";
-	    } else {
-	    print "<td><input type=\"submit\" name=\"addIPRule\" value=".WEB_btn_ip_add." ></td>";
-	    }
-    } else { print "<td colspan=2></td>"; }
-?>
-<td colspan=2 align=right><?php print WEB_cell_created.":";print $user_info["timestamp"]; ?></td>
-</tr>
-<tr>
-<?php print "<td colspan=2>"; print_url(WEB_report_by_day,"/admin/reports/userday.php?id=$id"); ?></td>
-<td></td>
-<td><input type="submit" name="showDevice" value=<?php print WEB_btn_device; ?>></td>
-<td></td>
-<td align=right><input type="submit" name="edituser" value=<?php print WEB_btn_save; ?>></td>
-</tr>
-</table>
-<?php
-if ($msg_error) { print "<div id='msg'><b>$msg_error</b></div><br>\n"; }
+    ?>
+    <form name="def" action="edituser.php?id=<?php echo $id; ?>" method="post">
+        <input type="hidden" name="id" value=<?php echo $id; ?>>
+        <table class="data">
+            <tr>
+                <td colspan=2><?php print WEB_cell_login; ?></td>
+                <td colspan=2><?php print WEB_cell_fio; ?></td>
+                <td colspan=2><?php print WEB_cell_ou; ?></td>
+            </tr>
+            <tr>
+                <td colspan=2><input type="text" name="f_login" value="<?php print $user_info["login"]; ?>" size=25></td>
+                <td colspan=2><input type="text" name="f_fio" value="<?php print $user_info["fio"]; ?>" size=25></td>
+                <td colspan=2><?php print_ou_set($db_link, 'f_ou', $user_info["ou_id"]); ?></td>
+            </tr>
+            <tr>
+                <td colspan=2><?php print WEB_cell_perday; ?></td>
+                <td colspan=2><?php print WEB_cell_permonth; ?></td>
+                <td><?php print WEB_cell_blocked; ?></td>
+                <td><?php print WEB_cell_enabled; ?></td>
+            </tr>
+            <tr>
+                <td colspan=2><input type="text" name="f_perday" value="<?php echo $user_info["day_quota"]; ?>" size=5></td>
+                <td colspan=2><input type="text" name="f_permonth" value="<?php echo $user_info["month_quota"]; ?>" size=5></td>
+                <td><?php print_qa_select('f_blocked', $user_info["blocked"]); ?></td>
+                <td><?php print_qa_select('f_enabled', $user_info["enabled"]); ?></td>
+            </tr>
+            <tr>
+                <td class=data colspan=6><?php echo WEB_user_rules_for_autoassign; ?>:</td>
+            </tr>
+            <tr>
+                <td colspan=2><?php print WEB_cell_filter; ?></td>
+                <td colspan=2><?php print WEB_cell_shaper; ?></td>
+                <td colspan=2></td>
+            </tr>
+            <tr>
+                <td colspan=2><?php print_group_select($db_link, 'f_filter', $user_info["filter_group_id"]); ?></td>
+                <td colspan=2><?php print_queue_select($db_link, 'f_queue', $user_info["queue_id"]); ?></td>
+                <td colspan=2></td>
+            </tr>
+            <tr>
+                <?php
+                print "<td>";
+                print_url(WEB_user_rule_list, "/admin/users/edit_rules.php?id=$id");
+                print "</td>";
+                $rule_count = get_count_records($db_link, "auth_rules", "user_id=" . $id);
+                print "<td > Count: " . $rule_count . "</td>";
+                $first_auth = get_record_sql($db_link, "SELECT id FROM User_auth WHERE user_id=" . $id . " AND deleted=0 ORDER BY id");
+                if (!empty($first_auth)) {
+                    //mac
+                    $mac_rule_count = get_count_records($db_link, "auth_rules", "user_id=" . $id . " AND type=2");
+                    if (!empty($mac_rule_count)) {
+                        print "<td><input type=\"submit\" name=\"delMacRule\" value=" . WEB_btn_mac_del . " ></td>";
+                    } else {
+                        print "<td><input type=\"submit\" name=\"addMacRule\" value=" . WEB_btn_mac_add . " ></td>";
+                    }
+                    //ip
+                    $ip_rule_count = get_count_records($db_link, "auth_rules", "user_id=" . $id . " AND type=1");
+                    if (!empty($ip_rule_count)) {
+                        print "<td><input type=\"submit\" name=\"delIPRule\" value=" . WEB_btn_ip_del . " ></td>";
+                    } else {
+                        print "<td><input type=\"submit\" name=\"addIPRule\" value=" . WEB_btn_ip_add . " ></td>";
+                    }
+                } else {
+                    print "<td colspan=2></td>";
+                }
+                ?>
+                <td colspan=2 align=right><?php print WEB_cell_created . ":";
+                                            print $user_info["timestamp"]; ?></td>
+            </tr>
+            <tr>
+                <?php print "<td colspan=2>";
+                print_url(WEB_report_by_day, "/admin/reports/userday.php?id=$id"); ?></td>
+                <td></td>
+                <td><input type="submit" name="showDevice" value=<?php print WEB_btn_device; ?>></td>
+                <td></td>
+                <td align=right><input type="submit" name="edituser" value=<?php print WEB_btn_save; ?>></td>
+            </tr>
+        </table>
+        <?php
+        if ($msg_error) {
+            print "<div id='msg'><b>$msg_error</b></div><br>\n";
+        }
 
 
-$sort_table = 'User_auth';
-$sort_url = "<a href=edituser.php?id=" . $id;
-?>
+        $sort_table = 'User_auth';
+        $sort_url = "<a href=edituser.php?id=" . $id;
+        ?>
 
 
-<br><b><?php echo WEB_user_ip_list; ?></b><br>
-<table class="data">
-<tr>
-<td class="data"><?php echo WEB_user_add_ip; ?>:&nbsp<input type=text name=newip value=""></td>
-<td class="data"><?php echo WEB_user_add_mac; ?>:&nbsp<input type=text name=newmac value=""></td>
-<td class="data"><input type="submit" name="addauth" value="<?php echo WEB_btn_add; ?>"></td>
-<td class="data" align=right><input type="submit" name="new_user" value="<?php echo WEB_btn_transfom; ?>"></td>
-</tr>
-</table>
+        <br><b><?php echo WEB_user_ip_list; ?></b><br>
+        <table class="data">
+            <tr>
+                <td class="data"><?php echo WEB_user_add_ip; ?>:&nbsp<input type=text name=newip value=""></td>
+                <td class="data"><?php echo WEB_user_add_mac; ?>:&nbsp<input type=text name=newmac value=""></td>
+                <td class="data"><input type="submit" name="addauth" value="<?php echo WEB_btn_add; ?>"></td>
+                <td class="data" align=right><input type="submit" name="new_user" value="<?php echo WEB_btn_transfom; ?>"></td>
+            </tr>
+        </table>
 
 
-<table class="data">
-<tr>
-<td class="data"><input type="checkbox" onClick="checkAll(this.checked);"></td>
-<td class="data"><?php print $sort_url . "&sort=ip_int&order=$new_order>" . WEB_cell_ip . "</a>"; ?></td>
-<td class="data"><?php print $sort_url . "&sort=mac&order=$new_order>" . WEB_cell_mac . "</a>"; ?></td>
-<td class="data"><?php print WEB_cell_comment; ?></td>
-<td class="data"><?php print $sort_url . "&sort=dns_name&order=$new_order>" . WEB_cell_dns_name . "</a>"; ?></td>
-<td class="data"><?php print WEB_cell_enabled; ?></td>
-<td class="data"><?php print WEB_cell_dhcp; ?></td>
-<td class="data"><?php print WEB_cell_filter; ?></td>
-<td class="data"><?php print WEB_cell_shaper; ?></td>
-<td class="data"><?php print WEB_cell_perday."/<br>".WEB_cell_permonth.", Mb"; ?></td>
-<td class="data"><?php print WEB_cell_connection; ?></td>
-<td class="data"><?php print $sort_url . "&sort=timestamp&order=$new_order>".WEB_cell_created."</a>"; ?></td>
-<td class="data">Last DHCP/ARP Event</td>
-<td class="data"><?php print $sort_url . "&sort=last_found&order=$new_order>".WEB_cell_last_found."</a>"; ?></td>
-<td class="data"><?php print "<input type=\"submit\" onclick=\"return confirm('".WEB_msg_apply_selected."?')\" name=\"removeauth\" value=".WEB_btn_remove.">"; ?></td>
-</tr>
+        <table class="data">
+            <tr>
+                <td class="data"><input type="checkbox" onClick="checkAll(this.checked);"></td>
+                <td class="data"><?php print $sort_url . "&sort=ip_int&order=$new_order>" . WEB_cell_ip . "</a>"; ?></td>
+                <td class="data"><?php print $sort_url . "&sort=mac&order=$new_order>" . WEB_cell_mac . "</a>"; ?></td>
+                <td class="data"><?php print WEB_cell_comment; ?></td>
+                <td class="data"><?php print $sort_url . "&sort=dns_name&order=$new_order>" . WEB_cell_dns_name . "</a>"; ?></td>
+                <td class="data"><?php print WEB_cell_enabled; ?></td>
+                <td class="data"><?php print WEB_cell_dhcp; ?></td>
+                <td class="data"><?php print WEB_cell_filter; ?></td>
+                <td class="data"><?php print WEB_cell_shaper; ?></td>
+                <td class="data"><?php print WEB_cell_perday . "/<br>" . WEB_cell_permonth . ", Mb"; ?></td>
+                <td class="data"><?php print WEB_cell_connection; ?></td>
+                <td class="data"><?php print $sort_url . "&sort=timestamp&order=$new_order>" . WEB_cell_created . "</a>"; ?></td>
+                <td class="data">Last DHCP/ARP Event</td>
+                <td class="data"><?php print $sort_url . "&sort=last_found&order=$new_order>" . WEB_cell_last_found . "</a>"; ?></td>
+                <td class="data"><?php print "<input type=\"submit\" onclick=\"return confirm('" . WEB_msg_apply_selected . "?')\" name=\"removeauth\" value=" . WEB_btn_remove . ">"; ?></td>
+            </tr>
 
 
-<?php
+            <?php
 
 
-$flist=get_records($db_link,'User_auth',"user_id=".$id." and deleted=0 ORDER BY $sort_table.$sort_field $order");
-if (!empty($flist)) {
-    foreach ( $flist as $row ) {
-        if ($row["dhcp_time"] == '0000-00-00 00:00:00') {
-            $dhcp_str = '';
-            } else {
-            $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";
-        print "<td class=\"data\" style='padding:0'><input type=checkbox name=f_auth_id[] value=".$row["id"]." ></td>\n";
-        print "<td class=\"data\" align=left><a href=editauth.php?id=".$row["id"].">" . $row["ip"] . "</a></td>\n";
-        print "<td class=\"data\" >" . expand_mac($db_link,$row["mac"]) . "</td>\n";
-        if (isset($row["dhcp_hostname"]) and strlen($row["dhcp_hostname"]) > 0) {
-            print "<td class=\"data\" >".$row["comments"]." [" . $row["dhcp_hostname"] . "]</td>\n";
-            } else {
-            print "<td class=\"data\" >".$row["comments"]."</td>\n";
+            $flist = get_records($db_link, 'User_auth', "user_id=" . $id . " and deleted=0 ORDER BY $sort_table.$sort_field $order");
+            if (!empty($flist)) {
+                foreach ($flist as $row) {
+                    if ($row["dhcp_time"] == '0000-00-00 00:00:00') {
+                        $dhcp_str = '';
+                    } else {
+                        $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";
+                    print "<td class=\"data\" style='padding:0'><input type=checkbox name=f_auth_id[] value=" . $row["id"] . " ></td>\n";
+                    print "<td class=\"data\" align=left><a href=editauth.php?id=" . $row["id"] . ">" . $row["ip"] . "</a></td>\n";
+                    print "<td class=\"data\" >" . expand_mac($db_link, $row["mac"]) . "</td>\n";
+                    if (isset($row["dhcp_hostname"]) and strlen($row["dhcp_hostname"]) > 0) {
+                        print "<td class=\"data\" >" . $row["comments"] . " [" . $row["dhcp_hostname"] . "]</td>\n";
+                    } else {
+                        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_qa($row["dhcp"]) . "</td>\n";
+                    print "<td class=\"data\" >" . get_group($db_link, $row["filter_group_id"]) . "</td>\n";
+                    print "<td class=\"data\" >" . get_queue($db_link, $row["queue_id"]) . "</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\" >" . FormatDateStr('Y.m.d H:i', $row["last_found"]) . "</td>\n";
+                    print "<td class=\"data\" ></td></tr>";
+                }
             }
             }
-        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_qa($row["dhcp"]). "</td>\n";
-        print "<td class=\"data\" >" . get_group($db_link, $row["filter_group_id"]) . "</td>\n";
-        print "<td class=\"data\" >" . get_queue($db_link, $row["queue_id"]) . "</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\" >" . FormatDateStr('Y.m.d H:i',$row["last_found"]) . "</td>\n";
-        print "<td class=\"data\" ></td></tr>";
-        }
-    }
-?>
-</table>
-</form>
-<?php
-require_once ($_SERVER["DOCUMENT_ROOT"]."/inc/footer.php");
-?>
+            ?>
+        </table>
+    </form>
+    <?php
+    require_once($_SERVER["DOCUMENT_ROOT"] . "/inc/footer.php");
+    ?>