Subsequent fixes after major changes for PDO

install/install.txt

@@ -1,6 +1,8 @@
 IP Reg Installation
 
 1. Install requirements
+Minimum PHP version is 7.4, we are using arrow functions introduced 
+in that version.
 IP Reg version 0.6 and up depends on smarty template engine.
 In Debian install it with: "apt-get install smarty3".
 The PHP-GD module is also required: "apt-get install php-gd".

install/mysql.sql

@@ -4,6 +4,9 @@ CREATE TABLE asset (
   asset_hostname varchar(100) DEFAULT NULL,
   assetclass_id int(10) NOT NULL,
   asset_info text DEFAULT NULL,
+  asset_intf smallint(5) UNSIGNED NOT NULL DEFAULT 1,
+  asset_location int(10) DEFAULT NULL,
+  asset_type enum ('active','passive') NOT NULL DEFAULT 'active',
   PRIMARY KEY (asset_id),
   INDEX ix_asset_name (asset_name)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -20,16 +23,44 @@ CREATE TABLE assetclassgroup (
   assetclassgroup_id int(10) NOT NULL AUTO_INCREMENT,
   assetclassgroup_name varchar(100) NOT NULL,
   assetclassgroup_color varchar(6) NOT NULL DEFAULT '000000',
+  assetclassgroup_description varchar(100) DEFAULT NULL,
   PRIMARY KEY (assetclassgroup_id),
   INDEX ix_assetclassgroup_name (assetclassgroup_name)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+-- WIP
+CREATE TABLE cable (
+  cable_id int(10) NOT NULL AUTO_INCREMENT,
+  cable_description varchar(100) NOT NULL,
+  cable_from_id int(10) DEFAULT NULL,
+  cable_to_id int(10) DEFAULT NULL,
+  cable_length smallint(5) UNSIGNED DEFAULT NULL,
+  cable_links smallint(5) UNSIGNED DEFAULT 1,
+  cable_type enum('copper','fibre','laser','radio') DEFAULT NULL,
+  cable_info text DEFAULT NULL,
+  PRIMARY KEY (cable_id),
+  UNIQUE INDEX ix_cable_description (cable_description)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- WIP
+-- Reference to external systems
+CREATE TABLE extlink (
+  extlink_id int(10) NOT NULL AUTO_INCREMENT,
+  asset_id int(10) NOT NULL,
+  extlink_type enum('cdb','zabbix', 'topdesk') NOT NULL DEFAULT 'cdb',
+  extlink_refid int(10) DEFAULT NULL,
+  extlink_uid varchar(65) DEFAULT NULL,
+  PRIMARY KEY (extlink_id),
+  INDEX ix_extlink_asset_id (asset_id)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
 CREATE TABLE location (
   location_id int(10) NOT NULL AUTO_INCREMENT,
   location_name varchar(100) NOT NULL,
   location_parent int(10) NOT NULL DEFAULT 0,
   location_info text DEFAULT NULL,
-  location_sort int(11) NOT NULL DEFAULT 0,
+  location_type enum('location', 'building','room','rack') NOT NULL DEFAULT 'location',
+  location_sort smallint(6) NOT NULL DEFAULT 0,
   PRIMARY KEY (location_id),
   INDEX ix_location_sort (location_sort),
   INDEX ix_location_name (location_name)
@@ -40,6 +71,9 @@ CREATE TABLE nat (
   nat_type int(1) NOT NULL,
   nat_ext int(10) NOT NULL,
   nat_int int(10) NOT NULL,
+  nat_ext_port smallint(5) UNSIGNED DEFAULT NULL,
+  nat_int_port smallint(5) UNSIGNED DEFAULT NULL,
+  nat_description varchar(100) DEFAULT NULL,
   PRIMARY KEY (nat_id)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
@@ -85,8 +119,9 @@ CREATE TABLE subnetvlan (
 
 CREATE TABLE user (
   user_id int(10) NOT NULL AUTO_INCREMENT,
+  user_realm enum ('local','ldap') NOT NULL DEFAULT 'local',
   user_name varchar(100) NOT NULL,
-  user_pass varchar(32) NOT NULL,
+  user_pass binary(60) NOT NULL,
   user_displayname varchar(100) NOT NULL,
   user_language char(2) NOT NULL DEFAULT 'en',
   user_imagesize int(3) NOT NULL DEFAULT 6,
@@ -110,7 +145,7 @@ CREATE TABLE user (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 INSERT INTO user (user_name, user_pass, user_displayname) VALUES
-('admin', '21232f297a57a5a743894a0e4a801fc3', 'administrator');
+('admin', '$2y$10$HTs0lSaFrfr.q4Gmy5zWfeDg3jhYZkqEGZEnDkMiHZ641nso38mt6', 'Administrator');
 
 CREATE TABLE vlan (
   vlan_id int(10) NOT NULL AUTO_INCREMENT,

install/mysql_sample.sql

@@ -49,6 +49,10 @@ INSERT INTO subnetlocation (subnet_id, location_id) VALUES
 INSERT INTO subnetvlan (subnet_id, vlan_id) VALUES
 (1, 1);
 
+INSERT INTO user (user_name, user_pass, user_displayname) VALUES
+('alice', '$2y$10$CTq04qodeKZBgeuShC3E..cEzfh.SDlaoOEUWcCXXHPDvXJ51nGdq', 'Alice'),
+('bob', '$2y$10$hl4NN4lOyuz7KN0ZjLHbOuCqGi08GVaTvl/RiMcL1mbFqGmtzDN76', 'Bob');
+
 INSERT INTO vlan (vlan_number, vlan_name) VALUES
 (1, 'DEFAULT_VLAN');
 

install/upgrade.txt

@@ -0,0 +1,24 @@
+IP Reg Upgrading
+
+This version has still not reached version 1.0 (feature complete).
+As such, there may be changes at any time.
+
+There is no database upgrade logic so the database structure has
+to be compared manually.
+
+1. Check and upgrade database schema 
+Compare current database schema with the contents of the database
+creation script "mysql.sql".
+Create missing objects in your current database.
+
+2. Install new version 
+Install the new application in a new location.
+Copy the configuration file "config.php" to new installation.
+Compare the configuration to the sample config.
+There may be additional settings that you want to customize.
+
+3. Switch to new version
+Rename the old an new directory.
+
+4. Done
+If everything works fine you could remove the old directory.