fixed DB schema

docs/databases/mysql/en/create_db.sql

@@ -277,8 +277,8 @@ CREATE TABLE `ou` (
 CREATE TABLE `queue_list` (
   `id` int(11) NOT NULL,
   `queue_name` varchar(20) NOT NULL,
-  `Download` int(11) NOT NULL DEFAULT 0,
-  `Upload` int(11) NOT NULL DEFAULT 0
+  `download` int(11) NOT NULL DEFAULT 0,
+  `upload` int(11) NOT NULL DEFAULT 0
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 CREATE TABLE `remote_syslog` (

docs/databases/mysql/en/data.sql

@@ -212,15 +212,15 @@ INSERT INTO `ou` (`id`, `ou_name`, `description`, `default_users`, `default_hots
 INSERT INTO `ou` (`id`, `ou_name`, `description`, `default_users`, `default_hotspot`, `nagios_dir`, `nagios_host_use`, `nagios_ping`, `nagios_default_service`, `enabled`, `filter_group_id`, `queue_id`, `dynamic`, `life_duration`, `parent_id`) VALUES(12, 'DHCP', NULL, 1, 0, NULL, NULL, 1, NULL, 0, 0, 0, 0, '24.00', NULL);
 INSERT INTO `ou` (`id`, `ou_name`, `description`, `default_users`, `default_hotspot`, `nagios_dir`, `nagios_host_use`, `nagios_ping`, `nagios_default_service`, `enabled`, `filter_group_id`, `queue_id`, `dynamic`, `life_duration`, `parent_id`) VALUES(13, 'Guests', NULL, 0, 0, NULL, NULL, 1, NULL, 1, 1, 4, 1, '24.00', NULL);
 
-INSERT INTO `queue_list` (`id`, `queue_name`, `Download`, `Upload`) VALUES(0, 'unlimited', 0, 0);
-INSERT INTO `queue_list` (`id`, `queue_name`, `Download`, `Upload`) VALUES(1, '2M/2M', 2048, 2048);
-INSERT INTO `queue_list` (`id`, `queue_name`, `Download`, `Upload`) VALUES(2, '10M/10M', 10240, 10240);
-INSERT INTO `queue_list` (`id`, `queue_name`, `Download`, `Upload`) VALUES(3, '100M/100M', 102400, 102400);
-INSERT INTO `queue_list` (`id`, `queue_name`, `Download`, `Upload`) VALUES(4, '50M/50M', 50000, 50000);
-INSERT INTO `queue_list` (`id`, `queue_name`, `Download`, `Upload`) VALUES(5, '20M/20M', 20480, 20480);
-INSERT INTO `queue_list` (`id`, `queue_name`, `Download`, `Upload`) VALUES(6, '200M/200M', 212400, 212400);
-INSERT INTO `queue_list` (`id`, `queue_name`, `Download`, `Upload`) VALUES(7, '1G/1G', 1024000, 1024000);
-INSERT INTO `queue_list` (`id`, `queue_name`, `Download`, `Upload`) VALUES(8, '2G/2G', 2048000, 2048000);
+INSERT INTO `queue_list` (`id`, `queue_name`, `download`, `upload`) VALUES(0, 'unlimited', 0, 0);
+INSERT INTO `queue_list` (`id`, `queue_name`, `download`, `upload`) VALUES(1, '2M/2M', 2048, 2048);
+INSERT INTO `queue_list` (`id`, `queue_name`, `download`, `upload`) VALUES(2, '10M/10M', 10240, 10240);
+INSERT INTO `queue_list` (`id`, `queue_name`, `download`, `upload`) VALUES(3, '100M/100M', 102400, 102400);
+INSERT INTO `queue_list` (`id`, `queue_name`, `download`, `upload`) VALUES(4, '50M/50M', 50000, 50000);
+INSERT INTO `queue_list` (`id`, `queue_name`, `download`, `upload`) VALUES(5, '20M/20M', 20480, 20480);
+INSERT INTO `queue_list` (`id`, `queue_name`, `download`, `upload`) VALUES(6, '200M/200M', 212400, 212400);
+INSERT INTO `queue_list` (`id`, `queue_name`, `download`, `upload`) VALUES(7, '1G/1G', 1024000, 1024000);
+INSERT INTO `queue_list` (`id`, `queue_name`, `download`, `upload`) VALUES(8, '2G/2G', 2048000, 2048000);
 
 INSERT INTO `subnets` (`id`, `subnet`, `vlan_tag`, `ip_int_start`, `ip_int_stop`, `dhcp_start`, `dhcp_stop`, `dhcp_lease_time`, `gateway`, `office`, `hotspot`, `vpn`, `free`, `dhcp`, `static`, `dhcp_update_hostname`, `discovery`, `notify`, `description`) VALUES(1, '192.168.2.0/24', 2, 3232236032, 3232236287, 3232236132, 3232236182, 480, 3232236033, 1, 0, 0, 0, 1, 0, 1, 1, 7, 'LAN');
 

docs/databases/mysql/ru/create_db.sql

@@ -277,8 +277,8 @@ CREATE TABLE `ou` (
 CREATE TABLE `queue_list` (
   `id` int(11) NOT NULL,
   `queue_name` varchar(20) NOT NULL,
-  `Download` int(11) NOT NULL DEFAULT 0,
-  `Upload` int(11) NOT NULL DEFAULT 0
+  `download` int(11) NOT NULL DEFAULT 0,
+  `upload` int(11) NOT NULL DEFAULT 0
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 CREATE TABLE `remote_syslog` (

docs/databases/mysql/ru/data.sql

@@ -212,15 +212,15 @@ INSERT INTO `ou` (`id`, `ou_name`, `description`, `default_users`, `default_hots
 INSERT INTO `ou` (`id`, `ou_name`, `description`, `default_users`, `default_hotspot`, `nagios_dir`, `nagios_host_use`, `nagios_ping`, `nagios_default_service`, `enabled`, `filter_group_id`, `queue_id`, `dynamic`, `life_duration`, `parent_id`) VALUES(12, 'DHCP', NULL, 1, 0, NULL, NULL, 1, NULL, 0, 0, 0, 0, '24.00', NULL);
 INSERT INTO `ou` (`id`, `ou_name`, `description`, `default_users`, `default_hotspot`, `nagios_dir`, `nagios_host_use`, `nagios_ping`, `nagios_default_service`, `enabled`, `filter_group_id`, `queue_id`, `dynamic`, `life_duration`, `parent_id`) VALUES(13, 'Гости', NULL, 0, 0, NULL, NULL, 1, NULL, 1, 1, 4, 1, '24.00', NULL);
 
-INSERT INTO `queue_list` (`id`, `queue_name`, `Download`, `Upload`) VALUES(0, 'unlimited', 0, 0);
-INSERT INTO `queue_list` (`id`, `queue_name`, `Download`, `Upload`) VALUES(1, '2M/2M', 2048, 2048);
-INSERT INTO `queue_list` (`id`, `queue_name`, `Download`, `Upload`) VALUES(2, '10M/10M', 10240, 10240);
-INSERT INTO `queue_list` (`id`, `queue_name`, `Download`, `Upload`) VALUES(3, '100M/100M', 102400, 102400);
-INSERT INTO `queue_list` (`id`, `queue_name`, `Download`, `Upload`) VALUES(4, '50M/50M', 50000, 50000);
-INSERT INTO `queue_list` (`id`, `queue_name`, `Download`, `Upload`) VALUES(5, '20M/20M', 20480, 20480);
-INSERT INTO `queue_list` (`id`, `queue_name`, `Download`, `Upload`) VALUES(6, '200M/200M', 212400, 212400);
-INSERT INTO `queue_list` (`id`, `queue_name`, `Download`, `Upload`) VALUES(7, '1G/1G', 1024000, 1024000);
-INSERT INTO `queue_list` (`id`, `queue_name`, `Download`, `Upload`) VALUES(8, '2G/2G', 2048000, 2048000);
+INSERT INTO `queue_list` (`id`, `queue_name`, `download`, `upload`) VALUES(0, 'unlimited', 0, 0);
+INSERT INTO `queue_list` (`id`, `queue_name`, `download`, `upload`) VALUES(1, '2M/2M', 2048, 2048);
+INSERT INTO `queue_list` (`id`, `queue_name`, `download`, `upload`) VALUES(2, '10M/10M', 10240, 10240);
+INSERT INTO `queue_list` (`id`, `queue_name`, `download`, `upload`) VALUES(3, '100M/100M', 102400, 102400);
+INSERT INTO `queue_list` (`id`, `queue_name`, `download`, `upload`) VALUES(4, '50M/50M', 50000, 50000);
+INSERT INTO `queue_list` (`id`, `queue_name`, `download`, `upload`) VALUES(5, '20M/20M', 20480, 20480);
+INSERT INTO `queue_list` (`id`, `queue_name`, `download`, `upload`) VALUES(6, '200M/200M', 212400, 212400);
+INSERT INTO `queue_list` (`id`, `queue_name`, `download`, `upload`) VALUES(7, '1G/1G', 1024000, 1024000);
+INSERT INTO `queue_list` (`id`, `queue_name`, `download`, `upload`) VALUES(8, '2G/2G', 2048000, 2048000);
 
 INSERT INTO `subnets` (`id`, `subnet`, `vlan_tag`, `ip_int_start`, `ip_int_stop`, `dhcp_start`, `dhcp_stop`, `dhcp_lease_time`, `gateway`, `office`, `hotspot`, `vpn`, `free`, `dhcp`, `static`, `dhcp_update_hostname`, `discovery`, `notify`, `description`) VALUES(1, '192.168.2.0/24', 2, 3232236032, 3232236287, 3232236132, 3232236182, 480, 3232236033, 1, 0, 0, 0, 1, 0, 1, 1, 7, 'LAN');
 

docs/databases/postgres/en/create_db.sql

@@ -369,12 +369,12 @@ COMMENT ON COLUMN ou.life_duration IS 'Default lifetime in hours for dynamic OUs
 CREATE TABLE queue_list (
 id SERIAL PRIMARY KEY,
 queue_name VARCHAR(20) NOT NULL,
-Download INTEGER NOT NULL DEFAULT 0,
-Upload INTEGER NOT NULL DEFAULT 0
+download INTEGER NOT NULL DEFAULT 0,
+upload INTEGER NOT NULL DEFAULT 0
 );
 COMMENT ON TABLE queue_list IS 'Bandwidth profiles for traffic shaping';
-COMMENT ON COLUMN queue_list.Download IS 'Download speed limit in Kbit/s';
-COMMENT ON COLUMN queue_list.Upload IS 'Upload speed limit in Kbit/s';
+COMMENT ON COLUMN queue_list.download IS 'Download speed limit in Kbit/s';
+COMMENT ON COLUMN queue_list.upload IS 'Upload speed limit in Kbit/s';
 
 -- Remote syslog messages
 CREATE TABLE remote_syslog (

docs/databases/postgres/en/data.sql

@@ -322,7 +322,7 @@ ON CONFLICT (id) DO UPDATE SET
     parent_id = EXCLUDED.parent_id;
 
 -- Traffic shaping queues
-INSERT INTO queue_list (id, queue_name, Download, Upload)
+INSERT INTO queue_list (id, queue_name, download, upload)
 VALUES
 (0, 'unlimited', 0, 0),
 (1, '2M/2M', 2048, 2048),
@@ -335,8 +335,8 @@ VALUES
 (8, '2G/2G', 2048000, 2048000)
 ON CONFLICT (id) DO UPDATE SET
     queue_name = EXCLUDED.queue_name,
-    Download = EXCLUDED.Download,
-    Upload = EXCLUDED.Upload;
+    download = EXCLUDED.download,
+    upload = EXCLUDED.upload;
 
 -- Network subnets
 INSERT INTO subnets (id, subnet, vlan_tag, ip_int_start, ip_int_stop, dhcp_start, dhcp_stop, dhcp_lease_time, gateway, office, hotspot, vpn, free, dhcp, static, dhcp_update_hostname, discovery, notify, description)

docs/databases/postgres/ru/create_db.sql

@@ -369,12 +369,12 @@ COMMENT ON COLUMN ou.life_duration IS 'Время жизни по умолчан
 CREATE TABLE queue_list (
 id SERIAL PRIMARY KEY,
 queue_name VARCHAR(20) NOT NULL,
-Download INTEGER NOT NULL DEFAULT 0,
-Upload INTEGER NOT NULL DEFAULT 0
+download INTEGER NOT NULL DEFAULT 0,
+upload INTEGER NOT NULL DEFAULT 0
 );
 COMMENT ON TABLE queue_list IS 'Профили полосы пропускания для шейпинга трафика';
-COMMENT ON COLUMN queue_list.Download IS 'Ограничение скорости скачивания в Кбит/с';
-COMMENT ON COLUMN queue_list.Upload IS 'Ограничение скорости отдачи в Кбит/с';
+COMMENT ON COLUMN queue_list.download IS 'Ограничение скорости скачивания в Кбит/с';
+COMMENT ON COLUMN queue_list.upload IS 'Ограничение скорости отдачи в Кбит/с';
 
 -- Удаленные syslog сообщения
 CREATE TABLE remote_syslog (

docs/databases/postgres/ru/data.sql

@@ -315,7 +315,7 @@ ON CONFLICT (id) DO UPDATE SET
     parent_id = EXCLUDED.parent_id;
 
 -- Traffic shaping queues
-INSERT INTO queue_list (id, queue_name, Download, Upload)
+INSERT INTO queue_list (id, queue_name, download, upload)
 VALUES
 (0, 'unlimited', 0, 0),
 (1, '2M/2M', 2048, 2048),
@@ -328,8 +328,8 @@ VALUES
 (8, '2G/2G', 2048000, 2048000)
 ON CONFLICT (id) DO UPDATE SET
     queue_name = EXCLUDED.queue_name,
-    Download = EXCLUDED.Download,
-    Upload = EXCLUDED.Upload;
+    download = EXCLUDED.download,
+    upload = EXCLUDED.upload;
 
 -- Network subnets
 INSERT INTO subnets (id, subnet, vlan_tag, ip_int_start, ip_int_stop, dhcp_start, dhcp_stop, dhcp_lease_time, gateway, office, hotspot, vpn, free, dhcp, static, dhcp_update_hostname, discovery, notify, description)

html/admin/queues/index.php

@@ -23,8 +23,8 @@ if (getPOST("save") !== null) {
 
             update_record($db_link, "queue_list", "id = ?", [
                 'queue_name' => $name,
-                'Download'   => (int)($downs[$i] ?? 0),
-                'Upload'     => (int)($ups[$i] ?? 0)
+                'download'   => (int)($downs[$i] ?? 0),
+                'upload'     => (int)($ups[$i] ?? 0)
             ], [$id]);
         }
     }

scripts/sync_mikrotik.pl

@@ -496,10 +496,10 @@ my @queuelist_ref = get_records_sql($dbh,"SELECT * FROM queue_list");
 my %queues;
 foreach my $row (@queuelist_ref) {
 $lists{'queue_'.$row->{id}}=1;
-next if ((!$row->{Download}) and !($row->{Upload}));
+next if ((!$row->{download}) and !($row->{upload}));
 $queues{'queue_'.$row->{id}}{id}=$row->{id};
-$queues{'queue_'.$row->{id}}{down}=$row->{Download};
-$queues{'queue_'.$row->{id}}{up}=$row->{Upload};
+$queues{'queue_'.$row->{id}}{down}=$row->{download};
+$queues{'queue_'.$row->{id}}{up}=$row->{upload};
 }
 
 log_debug($gate_ident."Queues status:".Dumper(\%queues));

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

@@ -119,3 +119,7 @@ ALTER TABLE `user_auth` MODIFY COLUMN `ip` varchar(18) NULL DEFAULT NULL;
 
 -- Add ACL for disable user
 INSERT INTO acl (id,name,description_english,description_russian) VALUES(0,'Disabled','User disabled','Пользователь отключен');
+
+-- queue_list
+ALTER TABLE queue_list CHANGE COLUMN `Download` `download` INT(11) NOT NULL DEFAULT 0;
+ALTER TABLE queue_list CHANGE COLUMN `Upload` `upload` INT(11) NOT NULL DEFAULT 0;