diff --git a/.gitignore b/.gitignore index b04edb1..ab7fcc1 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ src/Language/es.lang.ini .tmp/* !.tmp/index.php /nbproject/private/ +/nbproject \ No newline at end of file diff --git a/assets/mysqlSchema.sql b/assets/mysqlSchema.sql index 1428203..4353104 100644 --- a/assets/mysqlSchema.sql +++ b/assets/mysqlSchema.sql @@ -61,9 +61,9 @@ CREATE TABLE `lsio_users` ( `timezone` varchar(20) COLLATE utf8mb4_unicode_520_ci DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci; INSERT INTO `lsio_users` (`id`, `username`, `password`, `email`, `created`, `firstname`, `lastname`, `usertype`, `timezone`) VALUES -(1, 'admin', '$2a$08$FW0JtSQUEBXxf9aNDioIqeH/FA.ydCPTkgKUZEEWPECQpxwlRxZA.', 'admin@domain.com', '2015-02-18 19:50:31', 'System', 'Administrator', 1, ''), +(1, 'admin', '$2a$08$Y6l2CUoQgTQfQErQPEYZEuoZqDxkpAU34CoTTr7bc2oefzclUILJy', 'admin@domain.com', '2015-02-18 19:50:31', 'System', 'Administrator', 1, ''), (2, 'KIOSK', '', '', '2018-10-19 00:00:00', '', '', 3, ''), -(3, 'Default User', '$2a$08$FW0JtSQUEBXxf9aNDioIqeH/FA.ydCPTkgKUZEEWPECQpxwlRxZA.', 'user1@domain.com', '2018-09-23 00:00:00', 'First', 'Last', 2, ''); +(3, 'Default User', '$2a$08$Y6l2CUoQgTQfQErQPEYZEuoZqDxkpAU34CoTTr7bc2oefzclUILJy', 'user1@domain.com', '2018-09-23 00:00:00', 'First', 'Last', 2, ''); -- -------------------------------------------------------- DROP TABLE IF EXISTS `lsio_users_sites`; CREATE TABLE `lsio_users_sites` ( @@ -108,7 +108,9 @@ CREATE TABLE `lsio_visits` ( `notes` varchar(255) COLLATE utf8mb4_unicode_520_ci DEFAULT NULL, `site_id` int(10) UNSIGNED DEFAULT NULL, `reason` int(10) UNSIGNED DEFAULT NULL, - `approved` tinyint(4) DEFAULT '1' COMMENT '0 void, 1 unapproved, 2 approved' + `approved` tinyint(4) DEFAULT '1' COMMENT '0 void, 1 unapproved, 2 approved', + `carnum` varchar(20) COLLATE utf8mb4_unicode_520_ci DEFAULT NULL, + `ssanum` varchar(20) COLLATE utf8mb4_unicode_520_ci DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci; -- -------------------------------------------------------- DROP TABLE IF EXISTS `lsio_visittypes`; diff --git a/inc/header.inc.php b/inc/header.inc.php index 404f730..0e383ff 100644 --- a/inc/header.inc.php +++ b/inc/header.inc.php @@ -58,6 +58,7 @@ +