Skip to content

Commit 2baef5d

Browse files
phpipamphpipam
committed
Removed AFTER statements for DB update and DB fix as they were causing issues
1 parent 7ed7ca9 commit 2baef5d

File tree

2 files changed

+70
-75
lines changed

2 files changed

+70
-75
lines changed

‎db/UPDATE.sql

+69-69
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ INSERT INTO `usersAuthMethod` (`id`, `type`, `params`, `protected`, `description
2020
VALUES
2121
(1, 'local', NULL, 'Yes', 'Local database');
2222
/* Add authMethod field */
23-
ALTER TABLE `users` ADD `authMethod` INT(2) NULL DEFAULT 1 AFTER `username`;
23+
ALTER TABLE `users` ADD `authMethod` INT(2) NULL DEFAULT 1;
2424
/* update all domain users to use domain auth, settings will be migrated after first successfull login */
2525
UPDATE `users` set `authMethod`=3 where `domainUser` = 1;
2626

2727
/* add ping types */
28-
ALTER TABLE `settings` ADD `scanFPingPath` VARCHAR(64) NULL DEFAULT '/bin/fping' AFTER `scanPingPath`;
29-
ALTER TABLE `settings` ADD `scanPingType` SET('ping','pear','fping') NOT NULL DEFAULT 'ping' AFTER `scanFPingPath`;
28+
ALTER TABLE `settings` ADD `scanFPingPath` VARCHAR(64) NULL DEFAULT '/bin/fping';
29+
ALTER TABLE `settings` ADD `scanPingType` SET('ping','pear','fping') NOT NULL DEFAULT 'ping';
3030

3131
/* vlanDomains */
3232
CREATE TABLE `vlanDomains` (
@@ -41,11 +41,11 @@ INSERT INTO `vlanDomains` (`id`, `name`, `description`, `permissions`)
4141
VALUES
4242
(1, 'default', 'default L2 domain', NULL);
4343
/* add domainId to vlans */
44-
ALTER TABLE `vlans` ADD `domainId` INT NOT NULL DEFAULT '1' AFTER `vlanId`;
44+
ALTER TABLE `vlans` ADD `domainId` INT NOT NULL DEFAULT '1';
4545

4646
/* add last login for users */
47-
ALTER TABLE `users` ADD `lastLogin` TIMESTAMP NULL AFTER `editDate`;
48-
ALTER TABLE `users` ADD `lastActivity` TIMESTAMP NULL AFTER `lastLogin`;
47+
ALTER TABLE `users` ADD `lastLogin` TIMESTAMP NULL;
48+
ALTER TABLE `users` ADD `lastActivity` TIMESTAMP NULL;
4949

5050
/* permit null dns_name */
5151
ALTER TABLE `ipaddresses` CHANGE `dns_name` `dns_name` VARCHAR(100) CHARACTER SET utf8 NULL DEFAULT NULL;
@@ -73,7 +73,7 @@ UPDATE `settings` set `version` = '1.12';
7373
UPDATE `settings` set `dbverified` = 0;
7474

7575
/* add gateway field to database */
76-
ALTER TABLE `ipaddresses` ADD `is_gateway` TINYINT(1) NULL DEFAULT '0' AFTER `ip_addr`;
76+
ALTER TABLE `ipaddresses` ADD `is_gateway` TINYINT(1) NULL DEFAULT '0';
7777

7878
/* change tag */
7979
ALTER TABLE `ipaddresses` CHANGE `state` `state` INT(3) NULL DEFAULT '1';
@@ -109,7 +109,7 @@ UPDATE `settings` set `dbverified` = 0;
109109
ALTER TABLE `usersAuthMethod` CHANGE `type` `type` SET('local','AD','LDAP','Radius') CHARACTER SET utf8 NOT NULL DEFAULT 'local';
110110

111111
/* add temp access */
112-
ALTER TABLE `settings` ADD `tempAccess` TEXT NULL AFTER `authmigrated`;
112+
ALTER TABLE `settings` ADD `tempAccess` TEXT NULL;
113113

114114

115115

@@ -121,12 +121,12 @@ UPDATE `settings` set `version` = '1.14';
121121
UPDATE `settings` set `dbverified` = 0;
122122

123123
/* add tempShare */
124-
ALTER TABLE `settings` ADD `tempShare` TINYINT(1) NULL DEFAULT '0' AFTER `authmigrated`;
124+
ALTER TABLE `settings` ADD `tempShare` TINYINT(1) NULL DEFAULT '0';
125125

126126
/* move display Settings to user */
127-
ALTER TABLE `users` ADD `dhcpCompress` BOOL NOT NULL DEFAULT '0' AFTER `lastActivity`;
128-
ALTER TABLE `users` ADD `hideFreeRange` tinyint(1) DEFAULT '0' AFTER `dhcpCompress`;
129-
ALTER TABLE `users` ADD `printLimit` int(4) unsigned DEFAULT '30' AFTER `hideFreeRange`;
127+
ALTER TABLE `users` ADD `dhcpCompress` BOOL NOT NULL DEFAULT '0';
128+
ALTER TABLE `users` ADD `hideFreeRange` tinyint(1) DEFAULT '0';
129+
ALTER TABLE `users` ADD `printLimit` int(4) unsigned DEFAULT '30';
130130

131131
/* drop old display settings */
132132
ALTER TABLE `settings` DROP `dhcpCompress`;
@@ -173,17 +173,17 @@ UPDATE `ipaddresses` SET `state` = 1 WHERE `state` = 0;
173173
ALTER TABLE `ipaddresses` CHANGE `state` `state` INT(3) NULL DEFAULT '2';
174174

175175
/* add autoSuggestNetwork flag and permitRWAvlan */
176-
ALTER TABLE `settings` ADD `autoSuggestNetwork` TINYINT(1) NOT NULL DEFAULT '0' AFTER `visualLimit`;
177-
ALTER TABLE `settings` ADD `permitUserVlanCreate` TINYINT(1) NOT NULL DEFAULT '0' AFTER `autoSuggestNetwork`;
176+
ALTER TABLE `settings` ADD `autoSuggestNetwork` TINYINT(1) NOT NULL DEFAULT '0';
177+
ALTER TABLE `settings` ADD `permitUserVlanCreate` TINYINT(1) NOT NULL DEFAULT '0';
178178

179179
/* add section DNS */
180-
ALTER TABLE `sections` ADD `DNS` VARCHAR(128) NULL DEFAULT NULL AFTER `showVRF`;
180+
ALTER TABLE `sections` ADD `DNS` VARCHAR(128) NULL DEFAULT NULL;
181181

182182
/* mark subnet as full */
183-
ALTER TABLE `subnets` ADD `isFull` TINYINT(1) NULL DEFAULT '0' AFTER `isFolder`;
183+
ALTER TABLE `subnets` ADD `isFull` TINYINT(1) NULL DEFAULT '0';
184184

185185
/* add state */
186-
ALTER TABLE `subnets` ADD `state` INT(3) NULL DEFAULT '2' AFTER `isFull`;
186+
ALTER TABLE `subnets` ADD `state` INT(3) NULL DEFAULT '2';
187187

188188

189189

@@ -195,7 +195,7 @@ UPDATE `settings` set `version` = '1.16';
195195
UPDATE `settings` set `dbverified` = 0;
196196

197197
/* add compress tag for ranges */
198-
ALTER TABLE `ipTags` ADD `compress` SET('No','Yes') NOT NULL DEFAULT 'No' AFTER `locked`;
198+
ALTER TABLE `ipTags` ADD `compress` SET('No','Yes') NOT NULL DEFAULT 'No';
199199
UPDATE `ipTags` SET `compress` = 'Yes' WHERE `id` = '4';
200200

201201
/* dhcp compress */
@@ -234,7 +234,7 @@ VALUES
234234
('IP Calculator', 'Shows IP calculator as widget', 'ipcalc', NULL, 'yes', '6', 'no', 'yes');
235235

236236
/* add security type and permit empty app code */
237-
ALTER TABLE `api` ADD `app_security` SET('crypt','ssl','none') NOT NULL DEFAULT 'ssl' AFTER `app_comment`;
237+
ALTER TABLE `api` ADD `app_security` SET('crypt','ssl','none') NOT NULL DEFAULT 'ssl';
238238
ALTER TABLE `api` CHANGE `app_code` `app_code` VARCHAR(32) NULL DEFAULT '';
239239

240240

@@ -248,17 +248,17 @@ UPDATE `settings` set `dbverified` = 0;
248248

249249

250250
/* add tokens */
251-
ALTER TABLE `users` ADD `token` VARCHAR(24) NULL DEFAULT NULL AFTER `printLimit`;
252-
ALTER TABLE `users` ADD `token_valid_until` DATETIME NULL AFTER `token`;
251+
ALTER TABLE `users` ADD `token` VARCHAR(24) NULL DEFAULT NULL;
252+
ALTER TABLE `users` ADD `token_valid_until` DATETIME NULL;
253253

254254
/* add scan agents */
255-
ALTER TABLE `subnets` ADD `scanAgent` int(11) DEFAULT NULL AFTER `discoverSubnet`;
255+
ALTER TABLE `subnets` ADD `scanAgent` int(11) DEFAULT NULL;
256256

257257
/* powerDNS integration */
258-
ALTER TABLE `settings` ADD `enablePowerDNS` TINYINT(1) NULL DEFAULT '0' AFTER `enableDNSresolving`;
259-
ALTER TABLE `settings` ADD `powerDNS` TEXT NULL AFTER `enablePowerDNS`;
258+
ALTER TABLE `settings` ADD `enablePowerDNS` TINYINT(1) NULL DEFAULT '0';
259+
ALTER TABLE `settings` ADD `powerDNS` TEXT NULL;
260260

261-
ALTER TABLE `subnets` ADD `DNSrecursive` TINYINT(1) NULL DEFAULT '0' AFTER `discoverSubnet`;
261+
ALTER TABLE `subnets` ADD `DNSrecursive` TINYINT(1) NULL DEFAULT '0';
262262

263263

264264

@@ -270,16 +270,16 @@ UPDATE `settings` set `version` = '1.18';
270270
UPDATE `settings` set `dbverified` = 0;
271271

272272
/* powerDNS integration */
273-
ALTER TABLE `ipaddresses` ADD `PTRignore` BINARY(1) NULL DEFAULT '0' AFTER `excludePing`;
274-
ALTER TABLE `ipaddresses` ADD `PTR` INT(11) UNSIGNED NULL DEFAULT '0' AFTER `PTRignore`;
273+
ALTER TABLE `ipaddresses` ADD `PTRignore` BINARY(1) NULL DEFAULT '0';
274+
ALTER TABLE `ipaddresses` ADD `PTR` INT(11) UNSIGNED NULL DEFAULT '0';
275275

276-
ALTER TABLE `subnets` ADD `DNSrecords` TINYINT(1) NULL DEFAULT '0' AFTER `DNSrecursive`;
276+
ALTER TABLE `subnets` ADD `DNSrecords` TINYINT(1) NULL DEFAULT '0';
277277

278278
/* log destination */
279-
ALTER TABLE `settings` ADD `log` SET('Database','syslog') NOT NULL DEFAULT 'Database' AFTER `tempAccess`;
279+
ALTER TABLE `settings` ADD `log` SET('Database','syslog') NOT NULL DEFAULT 'Database';
280280

281281
/* link subnet to device */
282-
ALTER TABLE `subnets` ADD `device` INT UNSIGNED NULL DEFAULT '0' AFTER `showName`;
282+
ALTER TABLE `subnets` ADD `device` INT UNSIGNED NULL DEFAULT '0';
283283

284284
/* add table for recursive nameservers to subnets */
285285
DROP TABLE IF EXISTS `nameservers`;
@@ -300,7 +300,7 @@ VALUES
300300
('Google NS', '8.8.8.8;8.8.4.4', 'Google public nameservers', '1;2');
301301

302302
/* add reference to nameservers in subnets table */
303-
ALTER TABLE `subnets` ADD `nameserverId` int(11) NULL DEFAULT '0' AFTER `DNSrecursive`;
303+
ALTER TABLE `subnets` ADD `nameserverId` int(11) NULL DEFAULT '0';
304304

305305

306306

@@ -328,13 +328,13 @@ ALTER TABLE `users` CHANGE `username` `username` varchar(25) CHARACTER SET utf8
328328
ALTER TABLE `usersAuthMethod` CHANGE `type` `type` set('local','AD','LDAP','NetIQ', 'Radius') NOT NULL DEFAULT 'local';
329329

330330
/* add header infotext for login page */
331-
ALTER TABLE `settings` ADD `siteLoginText` varchar(128) NULL DEFAULT NULL AFTER `siteURL`;
331+
ALTER TABLE `settings` ADD `siteLoginText` varchar(128) NULL DEFAULT NULL;
332332

333333
/* add unique ip+subnet requirement */
334334
ALTER TABLE `ipaddresses` ADD UNIQUE INDEX `sid_ip_unique` (`ip_addr`, `subnetId`);
335335

336336
/* add tag to ip requests */
337-
ALTER TABLE `requests` ADD `state` INT NULL DEFAULT '2' AFTER `dns_name`;
337+
ALTER TABLE `requests` ADD `state` INT NULL DEFAULT '2';
338338

339339

340340
/* scanagents */
@@ -389,8 +389,8 @@ CREATE TABLE `firewallZoneMapping` (
389389

390390
/* Alter the settings table to inject the modul switch and default zone settings */
391391
ALTER TABLE `settings`
392-
ADD COLUMN `enableFirewallZones` TINYINT(1) NOT NULL DEFAULT '0' COMMENT '' AFTER `enableDNSresolving`,
393-
ADD COLUMN `firewallZoneSettings` VARCHAR(1024) NOT NULL DEFAULT '{"zoneLength":3,"ipType":{"0":"v4","1":"v6"},"separator":"_","indicator":{"0":"own","1":"customer"},"zoneGenerator":"2","zoneGeneratorType":{"0":"decimal","1":"hex","2":"text"},"deviceType":"3","padding":"on","strictMode":"on"}' COMMENT '' AFTER `enableFirewallZones`;
392+
ADD COLUMN `enableFirewallZones` TINYINT(1) NOT NULL DEFAULT '0' COMMENT '',
393+
ADD COLUMN `firewallZoneSettings` VARCHAR(1024) NOT NULL DEFAULT '{"zoneLength":3,"ipType":{"0":"v4","1":"v6"},"separator":"_","indicator":{"0":"own","1":"customer"},"zoneGenerator":"2","zoneGeneratorType":{"0":"decimal","1":"hex","2":"text"},"deviceType":"3","padding":"on","strictMode":"on"}' COMMENT '';
394394

395395

396396

@@ -441,13 +441,13 @@ ALTER TABLE `firewallZoneMapping` ADD INDEX `devId_idx` (`deviceId` ASC);
441441
ALTER TABLE `firewallZoneMapping` ADD CONSTRAINT `devId` FOREIGN KEY (`deviceId`) REFERENCES `devices` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION;
442442

443443
/* add firewallAddresObject field to the ipaddresses table to store fw addr. obj. names permanently */
444-
ALTER TABLE `ipaddresses` ADD COLUMN `firewallAddressObject` VARCHAR(100) NULL DEFAULT NULL AFTER `PTR`;
444+
ALTER TABLE `ipaddresses` ADD COLUMN `firewallAddressObject` VARCHAR(100) NULL DEFAULT NULL;
445445

446446
/* activate the firewallAddressObject IP field filter on default */
447447
UPDATE `settings` SET IPfilter = CONCAT(IPfilter,';firewallAddressObject');
448448

449449
/* add a column for subnet firewall address objects */
450-
ALTER TABLE `subnets` ADD COLUMN `firewallAddressObject` VARCHAR(100) NULL DEFAULT NULL AFTER `description`;
450+
ALTER TABLE `subnets` ADD COLUMN `firewallAddressObject` VARCHAR(100) NULL DEFAULT NULL;
451451

452452
/* add http auth method */
453453
ALTER TABLE `usersAuthMethod` CHANGE `type` `type` SET('local','AD','LDAP','NetIQ','Radius','http') CHARACTER SET utf8 NOT NULL DEFAULT 'local';
@@ -456,7 +456,7 @@ INSERT INTO `usersAuthMethod` (`type`, `params`, `protected`, `description`)
456456
VALUES ('http', NULL, 'Yes', 'Apache authentication');
457457

458458
/* allow powerdns record management for user */
459-
ALTER TABLE `users` ADD `pdns` SET('Yes','No') NULL DEFAULT 'No' AFTER `email`;
459+
ALTER TABLE `users` ADD `pdns` SET('Yes','No') NULL DEFAULT 'No';
460460

461461
/* add Ip request widget */
462462
INSERT INTO `widgets` (`wtitle`, `wdescription`, `wfile`, `wparams`, `whref`, `wsize`, `wadminonly`, `wactive`)
@@ -467,7 +467,7 @@ VALUES
467467
ALTER TABLE `subnets` CHANGE `mask` `mask` VARCHAR(3) CHARACTER SET utf8 NULL DEFAULT NULL;
468468

469469
/* add section to vrf */
470-
ALTER TABLE `vrf` ADD `sections` VARCHAR(128) NULL DEFAULT NULL AFTER `description`;
470+
ALTER TABLE `vrf` ADD `sections` VARCHAR(128) NULL DEFAULT NULL;
471471

472472

473473

@@ -476,16 +476,16 @@ ALTER TABLE `vrf` ADD `sections` VARCHAR(128) NULL DEFAULT NULL AFTER `descri
476476
UPDATE `settings` set `version` = '1.21';
477477

478478
/* New modules */
479-
ALTER TABLE `settings` ADD `enableMulticast` TINYINT(1) NULL DEFAULT '0' AFTER `powerDNS`;
480-
ALTER TABLE `settings` ADD `enableNAT` TINYINT(1) NULL DEFAULT '0' AFTER `enableMulticast`;
481-
ALTER TABLE `settings` ADD `enableSNMP` TINYINT(1) NULL DEFAULT '0' AFTER `enableNAT`;
482-
ALTER TABLE `settings` ADD `enableThreshold` TINYINT(1) NULL DEFAULT '0' AFTER `enableSNMP`;
483-
ALTER TABLE `settings` ADD `enableRACK` TINYINT(1) NULL DEFAULT '0' AFTER `enableThreshold`;
484-
ALTER TABLE `settings` ADD `link_field` VARCHAR(32) NULL DEFAULT '0' AFTER `enableRACK`;
479+
ALTER TABLE `settings` ADD `enableMulticast` TINYINT(1) NULL DEFAULT '0';
480+
ALTER TABLE `settings` ADD `enableNAT` TINYINT(1) NULL DEFAULT '0';
481+
ALTER TABLE `settings` ADD `enableSNMP` TINYINT(1) NULL DEFAULT '0';
482+
ALTER TABLE `settings` ADD `enableThreshold` TINYINT(1) NULL DEFAULT '0';
483+
ALTER TABLE `settings` ADD `enableRACK` TINYINT(1) NULL DEFAULT '0';
484+
ALTER TABLE `settings` ADD `link_field` VARCHAR(32) NULL DEFAULT '0';
485485

486486
/* add nat link */
487-
ALTER TABLE `ipaddresses` ADD `NAT` VARCHAR(64) NULL DEFAULT NULL AFTER `PTR`;
488-
ALTER TABLE `subnets` ADD `NAT` VARCHAR(64) NULL DEFAULT NULL AFTER `state`;
487+
ALTER TABLE `ipaddresses` ADD `NAT` VARCHAR(64) NULL DEFAULT NULL;
488+
ALTER TABLE `subnets` ADD `NAT` VARCHAR(64) NULL DEFAULT NULL;
489489

490490
/* NAT table */
491491
CREATE TABLE `nat` (
@@ -500,11 +500,11 @@ CREATE TABLE `nat` (
500500
) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
501501

502502
/* snmp to devices */
503-
ALTER TABLE `devices` ADD `snmp_community` VARCHAR(100) NULL DEFAULT NULL AFTER `sections`;
504-
ALTER TABLE `devices` ADD `snmp_version` SET('0','1','2') NULL DEFAULT '0' AFTER `snmp_community`;
505-
ALTER TABLE `devices` ADD `snmp_port` mediumint(5) unsigned DEFAULT '161' AFTER `snmp_version`;
506-
ALTER TABLE `devices` ADD `snmp_timeout` mediumint(5) unsigned DEFAULT '1000000' AFTER `snmp_port`;
507-
ALTER TABLE `devices` ADD `snmp_queries` VARCHAR(128) NULL DEFAULT NULL AFTER `snmp_timeout`;
503+
ALTER TABLE `devices` ADD `snmp_community` VARCHAR(100) NULL DEFAULT NULL;
504+
ALTER TABLE `devices` ADD `snmp_version` SET('0','1','2') NULL DEFAULT '0';
505+
ALTER TABLE `devices` ADD `snmp_port` mediumint(5) unsigned DEFAULT '161';
506+
ALTER TABLE `devices` ADD `snmp_timeout` mediumint(5) unsigned DEFAULT '1000000';
507+
ALTER TABLE `devices` ADD `snmp_queries` VARCHAR(128) NULL DEFAULT NULL;
508508

509509
/* racks */
510510
CREATE TABLE `racks` (
@@ -516,12 +516,12 @@ CREATE TABLE `racks` (
516516
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
517517

518518
/* rack info to devices */
519-
ALTER TABLE `devices` ADD `rack` int(11) unsigned DEFAULT null AFTER `snmp_timeout`;
520-
ALTER TABLE `devices` ADD `rack_start` int(11) unsigned DEFAULT null AFTER `rack`;
521-
ALTER TABLE `devices` ADD `rack_size` int(11) unsigned DEFAULT null AFTER `rack_start`;
519+
ALTER TABLE `devices` ADD `rack` int(11) unsigned DEFAULT null;
520+
ALTER TABLE `devices` ADD `rack_start` int(11) unsigned DEFAULT null;
521+
ALTER TABLE `devices` ADD `rack_size` int(11) unsigned DEFAULT null;
522522

523523
/* add threshold module to subnets */
524-
ALTER TABLE `subnets` ADD `threshold` int(3) NULL DEFAULT 0 AFTER `NAT`;
524+
ALTER TABLE `subnets` ADD `threshold` int(3) NULL DEFAULT 0;
525525

526526
/* threshold and inactive hosts widget */
527527
INSERT INTO `widgets` ( `wtitle`, `wdescription`, `wfile`, `wparams`, `whref`, `wsize`, `wadminonly`, `wactive`) VALUES ('Threshold', 'Shows threshold usage for top 5 subnets', 'threshold', NULL, 'yes', '6', 'no', 'yes');
@@ -546,11 +546,11 @@ UPDATE `settings` set `dbverified` = 0;
546546
UPDATE `settings` set `donate` = 0;
547547

548548
/* add DHCP to settings */
549-
ALTER TABLE `settings` ADD `enableDHCP` TINYINT(1) NULL DEFAULT '0' AFTER `powerDNS`;
550-
ALTER TABLE `settings` ADD `DHCP` VARCHAR(256) NULL default '{"type":"kea","settings":{"file":"\/etc\/kea\/kea.conf"}}' AFTER `enableDHCP`;
549+
ALTER TABLE `settings` ADD `enableDHCP` TINYINT(1) NULL DEFAULT '0';
550+
ALTER TABLE `settings` ADD `DHCP` VARCHAR(256) NULL default '{"type":"kea","settings":{"file":"\/etc\/kea\/kea.conf"}}';
551551

552552
/* permit normal users to manage VLANs */
553-
ALTER TABLE `users` ADD `editVlan` SET('Yes','No') NULL DEFAULT 'No' AFTER `pdns`;
553+
ALTER TABLE `users` ADD `editVlan` SET('Yes','No') NULL DEFAULT 'No';
554554

555555
/* remove permitUserVlanCreate - not needed */
556556
ALTER TABLE `settings` DROP `permitUserVlanCreate`;
@@ -571,10 +571,10 @@ UPDATE `settings` set `donate` = 0;
571571
ALTER TABLE `ipaddresses` CHANGE `lastSeen` `lastSeen` DATETIME NULL DEFAULT '1970-01-01 00:00:01';
572572

573573
/* add linked subnet field */
574-
ALTER TABLE `subnets` ADD `linked_subnet` INT(11) UNSIGNED NULL DEFAULT NULL AFTER `description`;
574+
ALTER TABLE `subnets` ADD `linked_subnet` INT(11) UNSIGNED NULL DEFAULT NULL;
575575

576576
/* add device to table */
577-
ALTER TABLE `nat` ADD `device` INT(11) UNSIGNED NULL DEFAULT NULL AFTER `port`;
577+
ALTER TABLE `nat` ADD `device` INT(11) UNSIGNED NULL DEFAULT NULL;
578578

579579
/* drop NAT fields */
580580
ALTER TABLE `subnets` DROP `NAT`;
@@ -585,10 +585,10 @@ ALTER TABLE `logs` CHANGE `username` `username` VARCHAR(64) CHARACTER SET utf8
585585
ALTER TABLE `users` CHANGE `username` `username` VARCHAR(64) CHARACTER SET utf8 NOT NULL DEFAULT '';
586586

587587
/* locations */
588-
ALTER TABLE `settings` ADD `enableLocations` TINYINT(1) NULL DEFAULT '1' AFTER `enableRACK`;
589-
ALTER TABLE `devices` ADD `location` INT(11) UNSIGNED NULL DEFAULT NULL AFTER `rack_size`;
590-
ALTER TABLE `racks` ADD `location` INT(11) UNSIGNED NULL DEFAULT NULL AFTER `size`;
591-
ALTER TABLE `subnets` ADD `location` INT(11) UNSIGNED NULL DEFAULT NULL AFTER `threshold`;
588+
ALTER TABLE `settings` ADD `enableLocations` TINYINT(1) NULL DEFAULT '1';
589+
ALTER TABLE `devices` ADD `location` INT(11) UNSIGNED NULL DEFAULT NULL;
590+
ALTER TABLE `racks` ADD `location` INT(11) UNSIGNED NULL DEFAULT NULL;
591+
ALTER TABLE `subnets` ADD `location` INT(11) UNSIGNED NULL DEFAULT NULL;
592592

593593

594594
CREATE TABLE `locations` (
@@ -600,11 +600,11 @@ CREATE TABLE `locations` (
600600
PRIMARY KEY (`id`)
601601
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
602602

603-
ALTER TABLE `locations` ADD `address` VARCHAR(128) NULL DEFAULT NULL AFTER `description`;
603+
ALTER TABLE `locations` ADD `address` VARCHAR(128) NULL DEFAULT NULL;
604604

605605
/* nat changes */
606606
ALTER TABLE `nat` CHANGE `port` `src_port` INT(5) NULL DEFAULT NULL;
607-
ALTER TABLE `nat` ADD `dst_port` INT(5) NULL DEFAULT NULL AFTER `src_port`;
607+
ALTER TABLE `nat` ADD `dst_port` INT(5) NULL DEFAULT NULL;
608608

609609

610610

@@ -616,7 +616,7 @@ UPDATE `settings` set `dbverified` = 0;
616616
UPDATE `settings` set `donate` = 0;
617617

618618
/* PSTN */
619-
ALTER TABLE `settings` ADD `enablePSTN` TINYINT(1) NULL DEFAULT '1' AFTER `enableLocations`;
619+
ALTER TABLE `settings` ADD `enablePSTN` TINYINT(1) NULL DEFAULT '1';
620620

621621
/* pstnPrefixes */
622622
CREATE TABLE `pstnPrefixes` (
@@ -645,6 +645,6 @@ CREATE TABLE `pstnNumbers` (
645645
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
646646

647647
/* use permissions for pstn */
648-
ALTER TABLE `users` ADD `pstn` INT(1) NULL DEFAULT '1' AFTER `editVlan`;
648+
ALTER TABLE `users` ADD `pstn` INT(1) NULL DEFAULT '1';
649649

650650

‎functions/classes/class.Tools.php

+1-6
Original file line numberDiff line numberDiff line change
@@ -1293,13 +1293,8 @@ public function get_field_fix ($table, $field) {
12931293
$file = explode("\n", $file);
12941294
foreach($file as $k=>$l) {
12951295
if(strpos(trim($l), "$field`")==1) {
1296-
//get previous
1297-
$prev = trim($file[$k-1]);
1298-
$prev = explode("`", $prev);
1299-
$prev = "`$prev[1]`";
1300-
13011296
$res = trim($l, ",");
1302-
$res .= " after $prev;";
1297+
$res .= ";";
13031298

13041299
return $res;
13051300
}

0 commit comments

Comments
 (0)