fixed field case

docs/databases/mysql/en/create_db.sql

@@ -140,7 +140,7 @@ CREATE TABLE `device_ports` (
   `device_id` int(11) DEFAULT NULL,
   `snmp_index` int(11) DEFAULT NULL,
   `port` int(11) DEFAULT NULL,
-  `ifName` varchar(40) DEFAULT NULL,
+  `ifname` varchar(40) DEFAULT NULL,
   `port_name` varchar(40) DEFAULT NULL,
   `description` varchar(50) DEFAULT NULL,
   `target_port_id` int(11) NOT NULL DEFAULT 0,
@@ -252,8 +252,8 @@ CREATE TABLE `mac_history` (
 CREATE TABLE `mac_vendors` (
   `id` int(11) NOT NULL,
   `oui` varchar(20) DEFAULT NULL,
-  `companyName` varchar(255) DEFAULT NULL,
-  `companyAddress` varchar(255) DEFAULT NULL
+  `companyname` varchar(255) DEFAULT NULL,
+  `companyaddress` varchar(255) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 CREATE TABLE `ou` (

docs/databases/mysql/ru/create_db.sql

@@ -140,7 +140,7 @@ CREATE TABLE `device_ports` (
   `device_id` int(11) DEFAULT NULL,
   `snmp_index` int(11) DEFAULT NULL,
   `port` int(11) DEFAULT NULL,
-  `ifName` varchar(40) DEFAULT NULL,
+  `ifname` varchar(40) DEFAULT NULL,
   `port_name` varchar(40) DEFAULT NULL,
   `description` varchar(50) DEFAULT NULL,
   `target_port_id` int(11) NOT NULL DEFAULT 0,
@@ -252,8 +252,8 @@ CREATE TABLE `mac_history` (
 CREATE TABLE `mac_vendors` (
   `id` int(11) NOT NULL,
   `oui` varchar(20) DEFAULT NULL,
-  `companyName` varchar(255) DEFAULT NULL,
-  `companyAddress` varchar(255) DEFAULT NULL
+  `companyname` varchar(255) DEFAULT NULL,
+  `companyaddress` varchar(255) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 CREATE TABLE `ou` (

docs/databases/postgres/en/create_db.sql

@@ -185,7 +185,7 @@ id BIGSERIAL PRIMARY KEY,
 device_id INTEGER,
 snmp_index INTEGER,
 port INTEGER,
-ifName VARCHAR(40),
+ifname VARCHAR(40),
 port_name VARCHAR(40),
 description VARCHAR(50),
 target_port_id INTEGER NOT NULL DEFAULT 0,
@@ -337,8 +337,8 @@ COMMENT ON COLUMN mac_history.ip IS 'Last used IP address';
 CREATE TABLE mac_vendors (
 id SERIAL PRIMARY KEY,
 oui VARCHAR(20),
-companyName VARCHAR(255),
-companyAddress VARCHAR(255)
+companyname VARCHAR(255),
+companyaddress VARCHAR(255)
 );
 COMMENT ON TABLE mac_vendors IS 'MAC address vendor database';
 COMMENT ON COLUMN mac_vendors.oui IS 'Organizationally Unique Identifier (first 6 MAC characters)';

docs/databases/postgres/ru/create_db.sql

@@ -185,7 +185,7 @@ id BIGSERIAL PRIMARY KEY,
 device_id INTEGER,
 snmp_index INTEGER,
 port INTEGER,
-ifName VARCHAR(40),
+ifname VARCHAR(40),
 port_name VARCHAR(40),
 description VARCHAR(50),
 target_port_id INTEGER NOT NULL DEFAULT 0,
@@ -337,8 +337,8 @@ COMMENT ON COLUMN mac_history.ip IS 'Последний использованн
 CREATE TABLE mac_vendors (
 id SERIAL PRIMARY KEY,
 oui VARCHAR(20),
-companyName VARCHAR(255),
-companyAddress VARCHAR(255)
+companyname VARCHAR(255),
+companyaddress VARCHAR(255)
 );
 COMMENT ON TABLE mac_vendors IS 'База данных производителей по MAC-адресам';
 COMMENT ON COLUMN mac_vendors.oui IS 'Organizationally Unique Identifier (первые 6 символов MAC)';

html/admin/devices/editport.php

@@ -46,7 +46,7 @@ print_editdevice_submenu($page_url, $device_id, $device['device_type'], $user_in
                 print "<input type=\"text\" name='f_snmp' style='text-align:center;' value='" . $port['snmp_index'] . "'>"; ?>
             </div>
             <div class="field">
-                <?php print "<label for='f_ifIndex'>ifIndex</label>"; ?><input type="text" id="f_ifIndex" disabled="disabled" style="text-align:center;" value="<?php print $port['ifName']; ?>" />
+                <?php print "<label for='f_ifIndex'>ifIndex</label>"; ?><input type="text" id="f_ifIndex" disabled="disabled" style="text-align:center;" value="<?php print $port['ifname']; ?>" />
             </div>
             <div class="field">
                 <?php print "<label for='f_uplink'>" . WEB_device_port_uplink . "</label>";

html/admin/devices/switchstatus.php

@@ -222,7 +222,7 @@ print_editdevice_submenu($page_url, $id, $device['device_type'], $user_info['log
             print_td_yes($row['skip'],FALSE,$cl);
             $poe_info = "";
 
-            $ifname = $row['ifName'];
+            $ifname = $row['ifname'];
 
             if ($snmp_ok) {
                 //sfp information
@@ -315,8 +315,8 @@ print_editdevice_submenu($page_url, $id, $device['device_type'], $user_info['log
                 if (!empty($ifmib_list[$row['snmp_index']])) {
                     $ifname = $ifmib_list[$row['snmp_index']];
                 }
-                if (!isset($row['ifName']) or $row['ifName'] !== $ifname) {
-                    $new_info['ifName'] = $ifname;
+                if (!isset($row['ifname']) or $row['ifname'] !== $ifname) {
+                    $new_info['ifname'] = $ifname;
                 }
             }
 

html/inc/common.php

@@ -2150,7 +2150,7 @@ function print_device_port_select($db, $field_name, $device_id, $target_id)
     $target_id = (int)$target_id;
     
     $t_device = get_records_sql($db,
-        "SELECT D.device_name, DP.port, DP.device_id, DP.id, DP.ifName 
+        "SELECT D.device_name, DP.port, DP.device_id, DP.id, DP.ifname 
          FROM devices AS D, device_ports AS DP 
          WHERE D.deleted = 0 
            AND D.id = DP.device_id 
@@ -2163,7 +2163,7 @@ function print_device_port_select($db, $field_name, $device_id, $target_id)
     print_select_item('Empty', 0, $target_id);
     
     foreach ($t_device as $row) {
-        $ifName = !empty($row['ifName']) ? $row['ifName'] : $row['port'];
+        $ifName = !empty($row['ifname']) ? $row['ifname'] : $row['port'];
         $display = htmlspecialchars($row['device_name']) . "[" . htmlspecialchars($row['port']) . "] - " . htmlspecialchars(compact_port_name($ifName));
         print_select_item($display, $row['id'], $target_id);
     }
@@ -3775,8 +3775,8 @@ function get_mac_vendor($db, $mac)
     }
     if (empty($vendor)) { return ''; }
 
-    $address = $vendor['companyAddress'] ?? $vendor['companyaddress'] ?? null;
-    $name = $vendor['companyName'] ?? $vendor['companyname'] ?? null;
+    $address = $vendor['companyaddress'] ?? null;
+    $name = $vendor['companyname'] ?? null;
     
     if (!empty($address)) {
         return $address;

scripts/dhcp-log.pl

@@ -295,8 +295,8 @@ sub run {
                         # Try to match by interface name (ifName)
                         $switch_port = undef;
                         foreach my $port_data (@device_ports) {
-                            if ($t_circuit_id =~ /\s*$port_data->{ifName}$/i ||
-                                $t_circuit_id =~ /^$port_data->{ifName}\s+/i) {
+                            if ($t_circuit_id =~ /\s*$port_data->{ifname}$/i ||
+                                $t_circuit_id =~ /^$port_data->{ifname}\s+/i) {
                                 $switch_port = $port_data;
                                 last;
                             }
@@ -314,7 +314,7 @@ sub run {
 
                         # Log and update connection
                         if ($switch_port) {
-                            db_log_verbose($hdb, "DHCP $type: IP=$ip, MAC=$mac " . $switch->{device_name} . " / " . $switch_port->{ifName});
+                            db_log_verbose($hdb, "DHCP $type: IP=$ip, MAC=$mac " . $switch->{device_name} . " / " . $switch_port->{ifname});
 
                             # Check if connection already exists
                             my $connection = get_records_sql($hdb, "SELECT * FROM connections WHERE auth_id = ?", $auth_id);
@@ -334,7 +334,7 @@ sub run {
                     }
 
                     log_debug("Switch identified: " . ($switch ? $switch->{device_name} : "NONE"));
-                    log_debug("Port identified: " . ($switch_port ? $switch_port->{ifName} : "NONE"));
+                    log_debug("Port identified: " . ($switch_port ? $switch_port->{ifname} : "NONE"));
                 }
             } # end while log reading
 

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

@@ -132,3 +132,12 @@ ALTER TABLE `devices` CHANGE COLUMN `SN` `sn` VARCHAR(80) DEFAULT NULL;
 
 -- 2. Переименовать `WikiName` → `wikiname` в таблице `user_auth`
 ALTER TABLE `user_auth` CHANGE COLUMN `WikiName` `wikiname` VARCHAR(250) DEFAULT NULL;
+
+-- mac_vendors: companyName → companyname
+ALTER TABLE `mac_vendors`  CHANGE COLUMN `companyName` `companyname` VARCHAR(255) DEFAULT NULL;
+
+-- mac_vendors: companyAddress → companyaddress
+ALTER TABLE `mac_vendors`  CHANGE COLUMN `companyAddress` `companyaddress` VARCHAR(255) DEFAULT NULL;
+
+-- device_ports: ifName → ifname
+ALTER TABLE `device_ports`  CHANGE COLUMN `ifName` `ifname` VARCHAR(40) DEFAULT NULL;

scripts/utils/mac-oids/update-mac-vendors.pl

@@ -134,7 +134,7 @@ sub insert_batch_simple {
     return 0 unless @data;
     
     my $sth = $dbh->prepare("
-        INSERT INTO mac_vendors (oui, companyName, companyAddress) 
+        INSERT INTO mac_vendors (oui, companyname, companyaddress) 
         VALUES (?, ?, ?)
     ");