modified users table, class and sign in class
This commit is contained in:
@@ -35,8 +35,7 @@
|
||||
define("INITIALIZATION_FILE_NAME", "../xml/settings.xml");
|
||||
define("INIT_SCRIPT_USER", "Init Script");
|
||||
|
||||
// Safety switch.
|
||||
// Change this to true when you intentionally want to rebuild system tables.
|
||||
// Safety switch - Change this to true when you intentionally want to rebuild system tables.
|
||||
$allow_rebuild = true;
|
||||
|
||||
if (!$allow_rebuild) {
|
||||
@@ -44,9 +43,9 @@
|
||||
exit();
|
||||
}
|
||||
|
||||
// --------------------------
|
||||
// Load Application Settings
|
||||
// --------------------------
|
||||
// --------------------------
|
||||
// Load Application Settings
|
||||
// --------------------------
|
||||
|
||||
$applicationSettings = simplexml_load_file(INITIALIZATION_FILE_NAME);
|
||||
|
||||
@@ -55,9 +54,9 @@
|
||||
exit();
|
||||
}
|
||||
|
||||
// ---------------------
|
||||
// Database Connection
|
||||
// ---------------------
|
||||
// ---------------------
|
||||
// Database Connection
|
||||
// ---------------------
|
||||
|
||||
$host = (string) $applicationSettings->DatabaseServer;
|
||||
$database = (string) $applicationSettings->DatabaseName;
|
||||
@@ -66,8 +65,7 @@
|
||||
|
||||
try {
|
||||
$connection = new PDO(
|
||||
"mysql:host={$host};dbname={$database};charset=utf8mb4",
|
||||
$user,
|
||||
"mysql:host={$host};dbname={$database};charset=utf8mb4", $user,
|
||||
$password,
|
||||
[
|
||||
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
|
||||
@@ -82,17 +80,13 @@
|
||||
exit();
|
||||
}
|
||||
|
||||
// ----------------------------
|
||||
// Get Table Definition Files
|
||||
// ----------------------------
|
||||
// ----------------------------
|
||||
// Get Table Definition Files
|
||||
// ----------------------------
|
||||
|
||||
$tableFiles = glob("*.php");
|
||||
|
||||
$excludedFiles = [
|
||||
"_createSystemTable.php",
|
||||
"_createTable.php",
|
||||
basename(__FILE__),
|
||||
];
|
||||
$excludedFiles = ["_createSystemTable.php", "_createTable.php", basename(__FILE__),];
|
||||
|
||||
$tableFiles = array_values(array_filter($tableFiles, function ($file) use ($excludedFiles) {
|
||||
return !in_array($file, $excludedFiles, true);
|
||||
@@ -100,9 +94,9 @@
|
||||
|
||||
sort($tableFiles);
|
||||
|
||||
// ----------------------------
|
||||
// Process Table Files
|
||||
// ----------------------------
|
||||
// -------------------
|
||||
// Process Table Files
|
||||
// -------------------
|
||||
|
||||
foreach ($tableFiles as $tableFile) {
|
||||
|
||||
@@ -160,9 +154,9 @@
|
||||
|
||||
echoLog("System tables created successfully.", "success");
|
||||
|
||||
// -------------------------
|
||||
// Helper Functions
|
||||
// -------------------------
|
||||
// ----------------
|
||||
// Helper Functions
|
||||
// ----------------
|
||||
|
||||
function runSQL($SQL, PDO $connection, $context = "query") {
|
||||
try {
|
||||
@@ -221,23 +215,20 @@
|
||||
],
|
||||
];
|
||||
|
||||
$SQL = "
|
||||
INSERT INTO popovers (
|
||||
popover_name,
|
||||
popover_title,
|
||||
popover_placeholder,
|
||||
popover_text,
|
||||
popover_created,
|
||||
popover_creator
|
||||
) VALUES (
|
||||
:popover_name,
|
||||
:popover_title,
|
||||
:popover_placeholder,
|
||||
:popover_text,
|
||||
CURDATE(),
|
||||
:popover_creator
|
||||
)
|
||||
";
|
||||
$SQL = " INSERT INTO popovers (
|
||||
popover_name,
|
||||
popover_title,
|
||||
popover_placeholder,
|
||||
popover_text,
|
||||
popover_created,
|
||||
popover_creator
|
||||
) VALUES (
|
||||
:popover_name,
|
||||
:popover_title,
|
||||
:popover_placeholder,
|
||||
:popover_text,
|
||||
CURDATE(),
|
||||
:popover_creator )";
|
||||
|
||||
$statement = $connection->prepare($SQL);
|
||||
|
||||
@@ -258,40 +249,33 @@
|
||||
|
||||
$password = password_hash("349Jamot@", PASSWORD_DEFAULT);
|
||||
|
||||
$SQL = "
|
||||
INSERT INTO users (
|
||||
user_id,
|
||||
user_name,
|
||||
user_email,
|
||||
user_password,
|
||||
user_role,
|
||||
user_change_password,
|
||||
user_active,
|
||||
user_creator,
|
||||
user_created
|
||||
) VALUES (
|
||||
:user_id,
|
||||
:user_name,
|
||||
:user_email,
|
||||
:user_password,
|
||||
:user_role,
|
||||
:user_change_password,
|
||||
:user_active,
|
||||
:user_creator,
|
||||
CURDATE()
|
||||
)
|
||||
";
|
||||
$SQL = "INSERT INTO users (
|
||||
user_name,
|
||||
user_first_name,
|
||||
user_last_name,
|
||||
user_email,
|
||||
user_password_hash,
|
||||
user_role,
|
||||
user_creator
|
||||
|
||||
) VALUES (
|
||||
:user_name,
|
||||
:user_first_name,
|
||||
:user_last_name,
|
||||
:user_email,
|
||||
:user_password_hash,
|
||||
:user_role,
|
||||
:user_creator )";
|
||||
|
||||
$statement = $connection->prepare($SQL);
|
||||
|
||||
$statement->execute([
|
||||
":user_id" => "DSYSADMIN",
|
||||
":user_name" => "James Richie",
|
||||
":user_name" => "jric11",
|
||||
":user_first_name" => "James",
|
||||
":user_last_name" => "Richie",
|
||||
":user_email" => "james.richie@onesourceits.com",
|
||||
":user_password" => $password,
|
||||
":user_password_hash" => $password,
|
||||
":user_role" => "Administrator",
|
||||
":user_change_password" => 1,
|
||||
":user_active" => 1,
|
||||
":user_creator" => INIT_SCRIPT_USER,
|
||||
]);
|
||||
|
||||
|
||||
+1
-1
@@ -19,5 +19,5 @@ $SQL = "create table alerts
|
||||
|
||||
)
|
||||
|
||||
default character set = utf8";
|
||||
default character set = utf8mb4";
|
||||
?>
|
||||
|
||||
@@ -25,6 +25,6 @@ $SQL = "create table dropdowns
|
||||
|
||||
)
|
||||
|
||||
default character set = utf8";
|
||||
default character set = utf8mb4";
|
||||
|
||||
?>
|
||||
|
||||
@@ -20,6 +20,6 @@ $SQL = "create table dropdowntypes
|
||||
|
||||
)
|
||||
|
||||
default character set = utf8";
|
||||
default character set = utf8mb4";
|
||||
|
||||
?>
|
||||
|
||||
+1
-1
@@ -15,6 +15,6 @@ $SQL = "create table journal
|
||||
|
||||
)
|
||||
|
||||
default character set = utf8";
|
||||
default character set = utf8mb4";
|
||||
|
||||
?>
|
||||
|
||||
+1
-1
@@ -18,5 +18,5 @@ $SQL = "create table notes
|
||||
|
||||
)
|
||||
|
||||
default character set = utf8";
|
||||
default character set = utf8mb4";
|
||||
?>
|
||||
|
||||
+1
-1
@@ -19,6 +19,6 @@ $SQL = "create table popovers
|
||||
|
||||
)
|
||||
|
||||
default character set = utf8";
|
||||
default character set = utf8mb4";
|
||||
|
||||
?>
|
||||
|
||||
+1
-1
@@ -19,6 +19,6 @@ $SQL = "create table reports
|
||||
|
||||
)
|
||||
|
||||
default character set = utf8";
|
||||
default character set = utf8mb4";
|
||||
|
||||
?>
|
||||
|
||||
+1
-1
@@ -19,6 +19,6 @@ $SQL = "create table statuses
|
||||
|
||||
)
|
||||
|
||||
default character set = utf8";
|
||||
default character set = utf8mb4";
|
||||
|
||||
?>
|
||||
|
||||
+16
-14
@@ -1,29 +1,31 @@
|
||||
<?php
|
||||
|
||||
$SQL = "create table users
|
||||
|
||||
(
|
||||
$SQL = "create table users (
|
||||
|
||||
user_serial serial,
|
||||
user_id varchar(100) default null,
|
||||
|
||||
user_name varchar(128) default null,
|
||||
user_email varchar(100) default null,
|
||||
user_client_name varchar(128) default null,
|
||||
user_password varchar(255) not null,
|
||||
user_first_name varchar(128) default null,
|
||||
user_last_name varchar(128) default null,
|
||||
user_email varchar(100) not null,
|
||||
|
||||
user_password_hash varchar(255) not null,
|
||||
user_role varchar(255) not null,
|
||||
user_change_password boolean default false,
|
||||
user_active boolean default true,
|
||||
user_login datetime default null,
|
||||
|
||||
user_status varchar(255) not null default 'active',
|
||||
user_last_login datetime default null,
|
||||
|
||||
user_creator varchar(100) default null,
|
||||
user_created datetime default null,
|
||||
user_created datetime not null default current_timestamp ,
|
||||
user_changer varchar(100) default null,
|
||||
user_changed datetime default null,
|
||||
user_changed datetime not null default current_timestamp on update current_timestamp,
|
||||
|
||||
primary key (user_serial),
|
||||
unique key (user_name),
|
||||
unique key (user_email),
|
||||
index (user_name)
|
||||
|
||||
)
|
||||
|
||||
default character set = utf8";
|
||||
) default character set = utf8mb4
|
||||
collate = utf8mb4_unicode_ci";
|
||||
?>
|
||||
|
||||
+1
-1
@@ -16,6 +16,6 @@ $SQL = "create table zipcodes
|
||||
|
||||
)
|
||||
|
||||
default character set = utf8";
|
||||
default character set = utf8mb4";
|
||||
|
||||
?>
|
||||
|
||||
Reference in New Issue
Block a user