fixed rule_type field in scripts

html/admin/users/edituser.php

@@ -66,7 +66,7 @@ if (isset($_POST["addMacRule"])) {
 }
 
 if (isset($_POST["delMacRule"])) {
-    run_sql($db_link, "DELETE FROM auth_rules WHERE user_id=? AND type=2", [ $id ]);
+    run_sql($db_link, "DELETE FROM auth_rules WHERE user_id=? AND rule_type=2", [ $id ]);
     LOG_INFO($db_link, "All autorules removed for id: $id login: " . $user_info["login"] . " by mac");
     header("Location: " . $_SERVER["REQUEST_URI"]);
     exit;
@@ -83,7 +83,7 @@ if (isset($_POST["addIPRule"])) {
 }
 
 if (isset($_POST["delIPRule"])) {
-    run_sql($db_link, "DELETE FROM auth_rules WHERE user_id=? AND type=1", [ $id ]);
+    run_sql($db_link, "DELETE FROM auth_rules WHERE user_id=? AND rule_type=1", [ $id ]);
     LOG_INFO($db_link, "Removed all auto rules for id: $id login: " . $user_info["login"] . " by ip");
     header("Location: " . $_SERVER["REQUEST_URI"]);
     exit;
@@ -309,14 +309,14 @@ require_once($_SERVER["DOCUMENT_ROOT"] . "/inc/header.php");
                 $first_auth = get_record_sql($db_link, "SELECT id FROM user_auth WHERE user_id=? AND deleted=0 ORDER BY id", [ $id ]);
                 if (!empty($first_auth)) {
                     //mac
-                    $mac_rule_count = get_count_records($db_link, "auth_rules", "user_id=? AND type=2", [ $id ]);
+                    $mac_rule_count = get_count_records($db_link, "auth_rules", "user_id=? AND rule_type=2", [ $id ]);
                     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=? AND type=1", [ $id ]);
+                    $ip_rule_count = get_count_records($db_link, "auth_rules", "user_id=? AND rule_type=1", [ $id ]);
                     if (!empty($ip_rule_count)) {
                         print "<td><input type=\"submit\" name=\"delIPRule\" value=" . WEB_btn_ip_del . " ></td>";
                     } else {

html/inc/common.php

@@ -795,14 +795,14 @@ function print_add_dev_interface($db, $device_id, $int_list, $int_name)
         if (!empty($int_exists[$interface['index']])) {
             continue;
         }
-        $value = $interface['name'] . ';' . $interface['index'] . ';' . $interface['type'];
+        $value = $interface['name'] . ';' . $interface['index'] . ';' . $interface['interface_type'];
         if ($interface['type'] == 1) {
             $interface['type'] = WEB_select_item_wan;
         }
         if ($interface['type'] == 0) {
             $interface['type'] = WEB_select_item_lan;
         }
-        $display_str = $interface['name'] . '&nbsp|' . $interface['ip'] . '|' . $interface['type'];
+        $display_str = $interface['name'] . '&nbsp|' . $interface['ip'] . '|' . $interface['interface_type'];
         print_select_item($display_str, $value, 0);
     }
     print "</select>\n";
@@ -2389,7 +2389,7 @@ function new_user($db, $user_info)
     $auto_mac_rule = get_option($db, 64);
     if (!empty($result) and $auto_mac_rule and $user_info['mac']) {
         $auth_rule['user_id'] = $result;
-        $auth_rule['type'] = 2;
+        $auth_rule['rule_type'] = 2;
         $auth_rule['rule'] = mac_dotted($user_info['mac']);
         insert_record($db, "auth_rules", $auth_rule);
     }
@@ -2618,16 +2618,16 @@ function get_auth_mac($db, $current_auth)
 function add_auth_rule($db, $rule, $type, $user_id)
 {
     $new['user_id'] = $user_id;
-    $new['type'] = $type;
+    $new['rule_type'] = $type;
     $new['rule'] = $rule;
     $rule_id = 0;
-    $auth_rules = get_record_sql($db, "SELECT * FROM auth_rules WHERE rule='" . $rule . "' AND type=" . $type);
+    $auth_rules = get_record_sql($db, "SELECT * FROM auth_rules WHERE rule='" . $rule . "' AND rule_type=" . $type);
     if (empty($auth_rules)) {
         $rule_id = insert_record($db, "auth_rules", $new);
-        LOG_INFO($db, "Create auto rule for user_id: " . $user_id . " rule: " . $rule . " type: " . $type);
+        LOG_INFO($db, "Create auto rule for user_id: " . $user_id . " rule: " . $rule . " rule_type: " . $type);
     } else {
         if ($auth_rules['user_id'] !== $user_id) {
-            LOG_WARNING($db, "Create auto rule for user_id: " . $user_id . " rule: " . $rule . " type: " . $type . " failed! Already exists at user_id: " . $auth_rules['user_id']);
+            LOG_WARNING($db, "Create auto rule for user_id: " . $user_id . " rule: " . $rule . " rule_type: " . $type . " failed! Already exists at user_id: " . $auth_rules['user_id']);
             $rule_id = 0;
             } else { $rule_id =  $auth_rules['id']; }
     }
@@ -2636,13 +2636,13 @@ function add_auth_rule($db, $rule, $type, $user_id)
 
 function update_auth_rule($db, $new, $rule_id = 0)
 {
-    $type = $new['type'];
+    $type = $new['rule_type'];
     $rule = $new['rule'];
-    $auth_rules = get_record_sql($db, "SELECT * FROM auth_rules WHERE rule='" . $rule . "' AND type=" . $type . " AND id<>" . $rule_id);
+    $auth_rules = get_record_sql($db, "SELECT * FROM auth_rules WHERE rule='" . $rule . "' AND rule_type=" . $type . " AND id<>" . $rule_id);
     if (empty($auth_rules)) {
         $rule_id = update_record($db, "auth_rules", "id=" . $rule_id, $new);
     } else {
-        LOG_WARNING($db, "Create auto rule id: " . $rule_id . " rule: " . $rule . " type: " . $type . " failed! Already exists at user_id: " . $auth_rules['user_id']);
+        LOG_WARNING($db, "Create auto rule id: " . $rule_id . " rule: " . $rule . " rule_type: " . $type . " failed! Already exists at user_id: " . $auth_rules['user_id']);
         $rule_id = 0;
     }
     return $rule_id;
@@ -3447,7 +3447,7 @@ function get_new_user_id($db, $ip, $mac, $hostname)
     //personal user rules
     //ip
     if (!empty($ip)) {
-        $t_rules = get_records_sql($db, "SELECT * FROM auth_rules WHERE type=1 and LENGTH(rule)>0 AND user_id IS NOT NULL");
+        $t_rules = get_records_sql($db, "SELECT * FROM auth_rules WHERE rule_type=1 and LENGTH(rule)>0 AND user_id IS NOT NULL");
         foreach ($t_rules as $row) {
             if (!empty($row['rule']) and is_subnet_aton($row['rule'], $ip_aton)) {
                 $result['user_id'] = $row['user_id'];
@@ -3457,7 +3457,7 @@ function get_new_user_id($db, $ip, $mac, $hostname)
     }
     //mac
     if (!empty($mac)) {
-        $mac_rules = get_records_sql($db, "SELECT * FROM auth_rules WHERE type=2 AND LENGTH(rule)>0 AND user_id IS NOT NULL");
+        $mac_rules = get_records_sql($db, "SELECT * FROM auth_rules WHERE rule_type=2 AND LENGTH(rule)>0 AND user_id IS NOT NULL");
         foreach ($mac_rules as $row) {
             $pattern = '/' . mac_simplify($row['rule']) . '/';
             if (!empty($row['rule']) and preg_match($pattern, mac_simplify($mac))) {
@@ -3468,7 +3468,7 @@ function get_new_user_id($db, $ip, $mac, $hostname)
     }
     //hostname
     if (!empty($hostname)) {
-        $mac_rules = get_records_sql($db, "SELECT * FROM auth_rules WHERE type=3 AND LENGTH(rule)>0 AND user_id IS NOT NULL");
+        $mac_rules = get_records_sql($db, "SELECT * FROM auth_rules WHERE rule_type=3 AND LENGTH(rule)>0 AND user_id IS NOT NULL");
         foreach ($mac_rules as $row) {
             if (!empty($row['rule']) and preg_match($row['rule'], $hostname)) {
                 $result['user_id'] = $row['user_id'];
@@ -3480,7 +3480,7 @@ function get_new_user_id($db, $ip, $mac, $hostname)
     //ou rules
     //ip
     if (!empty($ip)) {
-        $t_rules = get_records_sql($db, "SELECT * FROM auth_rules WHERE type=1 and LENGTH(rule)>0 AND ou_id IS NOT NULL");
+        $t_rules = get_records_sql($db, "SELECT * FROM auth_rules WHERE rule_type=1 and LENGTH(rule)>0 AND ou_id IS NOT NULL");
         foreach ($t_rules as $row) {
             if (!empty($row['rule']) and is_subnet_aton($row['rule'], $ip_aton)) {
                 $result['ou_id'] = $row['ou_id'];
@@ -3490,7 +3490,7 @@ function get_new_user_id($db, $ip, $mac, $hostname)
     }
     //mac
     if (!empty($mac)) {
-        $mac_rules = get_records_sql($db, "SELECT * FROM auth_rules WHERE type=2 AND LENGTH(rule)>0 AND ou_id IS NOT NULL");
+        $mac_rules = get_records_sql($db, "SELECT * FROM auth_rules WHERE rule_type=2 AND LENGTH(rule)>0 AND ou_id IS NOT NULL");
         foreach ($mac_rules as $row) {
             $pattern = '/' . mac_simplify($row['rule']) . '/';
             if (!empty($row['rule']) and preg_match($pattern, mac_simplify($mac))) {
@@ -3501,7 +3501,7 @@ function get_new_user_id($db, $ip, $mac, $hostname)
     }
     //hostname
     if (!empty($hostname)) {
-        $mac_rules = get_records_sql($db, "SELECT * FROM auth_rules WHERE type=3 AND LENGTH(rule)>0 AND ou_id IS NOT NULL");
+        $mac_rules = get_records_sql($db, "SELECT * FROM auth_rules WHERE rule_type=3 AND LENGTH(rule)>0 AND ou_id IS NOT NULL");
         foreach ($mac_rules as $row) {
             if (!empty($row['rule']) and preg_match($row['rule'], $hostname)) {
                 $result['ou_id'] = $row['ou_id'];

html/sessions/.htaccess

@@ -0,0 +1,18 @@
+<IfModule mod_version.c>
+	<IfVersion < 2.4>
+		Order Deny,Allow
+		Deny from All
+	</IfVersion>
+	<IfVersion >= 2.4>
+		Require all denied
+	</IfVersion>
+</IfModule>
+<IfModule !mod_version.c>
+	<IfModule !mod_authz_core.c>
+		Order Deny,Allow
+		Deny from All
+	</IfModule>
+	<IfModule mod_authz_core.c>
+		Require all denied
+	</IfModule>
+</IfModule>

html/utils/auth_apply.php

@@ -104,13 +104,13 @@ if (getPOST("ApplyForAll", $page_url)) {
             
             if ($first_auth && !empty($first_auth['mac'])) {
                 if ($a_bind_mac) {
-                    $user_rule = get_record_sql($db_link, "SELECT * FROM auth_rules WHERE user_id = ? AND type = 2", [(int)$first_auth['user_id']]);
-                    $mac_rule = get_record_sql($db_link, "SELECT * FROM auth_rules WHERE rule = ? AND type = 2", [$first_auth['mac']]);
+                    $user_rule = get_record_sql($db_link, "SELECT * FROM auth_rules WHERE user_id = ? AND rule_type = 2", [(int)$first_auth['user_id']]);
+                    $mac_rule = get_record_sql($db_link, "SELECT * FROM auth_rules WHERE rule = ? AND rule_type = 2", [$first_auth['mac']]);
                     
                     if (!$user_rule && !$mac_rule) {
                         $new_rule = [
                             'user_id' => (int)$first_auth['user_id'],
-                            'type' => 2,
+                            'rule_type' => 2,
                             'rule' => $first_auth['mac']
                         ];
                         insert_record($db_link, "auth_rules", $new_rule);
@@ -119,7 +119,7 @@ if (getPOST("ApplyForAll", $page_url)) {
                         LOG_INFO($db_link, "Auto rule for user_id: " . $first_auth['user_id'] . " and mac " . $first_auth['mac'] . " already exists");
                     }
                 } else {
-                    run_sql($db_link, "DELETE FROM auth_rules WHERE user_id = ? AND type = 2", [(int)$first_auth['user_id']]);
+                    run_sql($db_link, "DELETE FROM auth_rules WHERE user_id = ? AND rule_type = 2", [(int)$first_auth['user_id']]);
                     LOG_INFO($db_link, "Remove auto rule for user_id: " . $first_auth['user_id'] . " and mac " . $first_auth['mac']);
                 }
             } else {
@@ -133,13 +133,13 @@ if (getPOST("ApplyForAll", $page_url)) {
             
             if ($first_auth && !empty($first_auth['ip'])) {
                 if ($a_bind_ip) {
-                    $user_rule = get_record_sql($db_link, "SELECT * FROM auth_rules WHERE user_id = ? AND type = 1", [(int)$first_auth['user_id']]);
-                    $ip_rule = get_record_sql($db_link, "SELECT * FROM auth_rules WHERE rule = ? AND type = 1", [$first_auth['ip']]);
+                    $user_rule = get_record_sql($db_link, "SELECT * FROM auth_rules WHERE user_id = ? AND rule_type = 1", [(int)$first_auth['user_id']]);
+                    $ip_rule = get_record_sql($db_link, "SELECT * FROM auth_rules WHERE rule = ? AND rule_type = 1", [$first_auth['ip']]);
                     
                     if (!$user_rule && !$ip_rule) {
                         $new_rule = [
                             'user_id' => (int)$first_auth['user_id'],
-                            'type' => 1,
+                            'rule_type' => 1,
                             'rule' => $first_auth['ip']
                         ];
                         insert_record($db_link, "auth_rules", $new_rule);
@@ -148,7 +148,7 @@ if (getPOST("ApplyForAll", $page_url)) {
                         LOG_INFO($db_link, "Auto rule for user_id: " . $first_auth['user_id'] . " and ip " . $first_auth['ip'] . " already exists");
                     }
                 } else {
-                    run_sql($db_link, "DELETE FROM auth_rules WHERE user_id = ? AND type = 1", [(int)$first_auth['user_id']]);
+                    run_sql($db_link, "DELETE FROM auth_rules WHERE user_id = ? AND rule_type = 1", [(int)$first_auth['user_id']]);
                     LOG_INFO($db_link, "Remove auto rule for user_id: " . $first_auth['user_id'] . " and ip " . $first_auth['ip']);
                 }
             } else {

html/utils/user_apply.php

@@ -113,18 +113,18 @@ if (getPOST("ApplyForAll", $page_url)) {
         if (getPOST("e_bind_mac", $page_url) !== null) {
             if ($a_bind_mac && $b_mac) {
                 $user_rule = get_record_sql($db_link,
-                    "SELECT * FROM auth_rules WHERE user_id = ? AND type = 2",
+                    "SELECT * FROM auth_rules WHERE user_id = ? AND rule_type = 2",
                     [$user_id]
                 );
                 $mac_rule = get_record_sql($db_link,
-                    "SELECT * FROM auth_rules WHERE rule = ? AND type = 2",
+                    "SELECT * FROM auth_rules WHERE rule = ? AND rule_type = 2",
                     [$b_mac]
                 );
 
                 if (!$user_rule && !$mac_rule) {
                     insert_record($db_link, "auth_rules", [
                         'user_id' => $user_id,
-                        'type' => 2,
+                        'rule_type' => 2,
                         'rule' => $b_mac
                     ]);
                     LOG_INFO($db_link, "Created auto rule for user_id: $user_id and mac $b_mac");
@@ -132,7 +132,7 @@ if (getPOST("ApplyForAll", $page_url)) {
                     LOG_INFO($db_link, "Auto rule for user_id: $user_id and mac $b_mac already exists");
                 }
             } else {
-                run_sql($db_link, "DELETE FROM auth_rules WHERE user_id = ? AND type = 2", [$user_id]);
+                run_sql($db_link, "DELETE FROM auth_rules WHERE user_id = ? AND rule_type = 2", [$user_id]);
                 LOG_INFO($db_link, "Remove auto rule for user_id: $user_id and mac $b_mac");
             }
         }
@@ -141,18 +141,18 @@ if (getPOST("ApplyForAll", $page_url)) {
         if (getPOST("e_bind_ip", $page_url) !== null) {
             if ($a_bind_ip && $b_ip) {
                 $user_rule = get_record_sql($db_link,
-                    "SELECT * FROM auth_rules WHERE user_id = ? AND type = 1",
+                    "SELECT * FROM auth_rules WHERE user_id = ? AND rule_type = 1",
                     [$user_id]
                 );
                 $ip_rule = get_record_sql($db_link,
-                    "SELECT * FROM auth_rules WHERE rule = ? AND type = 1",
+                    "SELECT * FROM auth_rules WHERE rule = ? AND rule_type = 1",
                     [$b_ip]
                 );
 
                 if (!$user_rule && !$ip_rule) {
                     insert_record($db_link, "auth_rules", [
                         'user_id' => $user_id,
-                        'type' => 1,
+                        'rule_type' => 1,
                         'rule' => $b_ip
                     ]);
                     LOG_INFO($db_link, "Created auto rule for user_id: $user_id and ip $b_ip");
@@ -160,7 +160,7 @@ if (getPOST("ApplyForAll", $page_url)) {
                     LOG_INFO($db_link, "Auto rule for user_id: $user_id and ip $b_ip already exists");
                 }
             } else {
-                run_sql($db_link, "DELETE FROM auth_rules WHERE user_id = ? AND type = 1", [$user_id]);
+                run_sql($db_link, "DELETE FROM auth_rules WHERE user_id = ? AND rule_type = 1", [$user_id]);
                 LOG_INFO($db_link, "Remove auto rule for user_id: $user_id and ip $b_ip");
             }
         }

scripts/updates/3-0-1/migration.msql

@@ -96,6 +96,7 @@ ALTER TABLE config_options  CHANGE COLUMN `type` option_type VARCHAR(100) NOT NU
 ALTER TABLE dns_queue       CHANGE COLUMN `type` operation_type VARCHAR(10) NOT NULL DEFAULT 'add';
 ALTER TABLE filter_list     CHANGE COLUMN `type` filter_type SMALLINT NOT NULL DEFAULT 0;
 ALTER TABLE auth_rules      CHANGE COLUMN `type` rule_type INT(11) NOT NULL;
+ALTER TABLE device_l3_interfaces CHANGE COLUMN `type` interface_type int(11) NOT NULL DEFAULT 0;
 
 UPDATE user_auth SET mac_found = last_found WHERE last_found IS NOT NULL;