Incorporated changes for release 1.3.2
This commit is contained in:
@@ -8,9 +8,13 @@
|
||||
*/
|
||||
|
||||
include("common.php");
|
||||
|
||||
if (array_key_exists('print',$_REQUEST)) {
|
||||
$print=true;
|
||||
} else {
|
||||
$print=false;
|
||||
}
|
||||
// redirect to index.php on cancel button press
|
||||
if ($_REQUEST['cancel']) {
|
||||
if (array_key_exists('cancel',$_REQUEST)) {
|
||||
header("Cache-Control:no-cache, must-revalidate");
|
||||
header("Pragma:no-cache");
|
||||
header("Location:index.php");
|
||||
@@ -30,7 +34,6 @@ if ($role != ADMIN) {
|
||||
}
|
||||
|
||||
// import incoming arrays
|
||||
$print=$_REQUEST['print'];
|
||||
if ($print) {
|
||||
// if printer friendly was clicked, values will be passed in serialized
|
||||
// form as "all_parameters" so we need to load those into $incoming[]
|
||||
@@ -40,53 +43,85 @@ if ($print) {
|
||||
$incoming=arrayCopy($_REQUEST);
|
||||
}
|
||||
|
||||
// load variables from incoming array
|
||||
$edit_user=$incoming['edit_user'];
|
||||
$add_user=$incoming['add_user'];
|
||||
$update_user=$incoming['update_user'];
|
||||
$delete_user=$incoming['delete_user'];
|
||||
$user_id=$incoming['user_id'];
|
||||
$user_fname=$incoming['user_fname'];
|
||||
$user_lname=$incoming['user_lname'];
|
||||
$user_login=$incoming['user_login'];
|
||||
$user_pass=$incoming['user_pass'];
|
||||
$user_passconf=$incoming['user_passconf'];
|
||||
$user_role=$incoming['user_role'];
|
||||
$user_active=$incoming['user_active'];
|
||||
// extract incoming array keys into variables
|
||||
extract($incoming, EXTR_SKIP);
|
||||
/*
|
||||
* possible keys are:
|
||||
* edit_user
|
||||
* add_user
|
||||
* update_user
|
||||
* delete_user
|
||||
* user_id
|
||||
* user_fname
|
||||
* user_lname
|
||||
* user_login
|
||||
* user_pass
|
||||
* user_passconf
|
||||
* user_role
|
||||
* user_active
|
||||
* edit_device
|
||||
* add_device
|
||||
* update_device
|
||||
* delete_device
|
||||
* device_id
|
||||
* device_name
|
||||
* device_active
|
||||
* edit_subsystem
|
||||
* add_subsystem
|
||||
* update_subsystem
|
||||
* delete_subsystem
|
||||
* subsystem_id
|
||||
* subsystem_name
|
||||
* subsystem_desc
|
||||
* subsystem_active
|
||||
* edit_reason
|
||||
* add_reason
|
||||
* update_reason
|
||||
* delete_reason
|
||||
* reason_id
|
||||
* reason_text
|
||||
* reason_active
|
||||
* edit_discovered
|
||||
* add_discovered
|
||||
* update_discovered
|
||||
* delete_discovered
|
||||
* discovered_id
|
||||
* discovered_name
|
||||
* discovered_desc
|
||||
* discovered_active
|
||||
*/
|
||||
|
||||
$edit_device=$incoming['edit_device'];
|
||||
$add_device=$incoming['add_device'];
|
||||
$update_device=$incoming['update_device'];
|
||||
$delete_device=$incoming['delete_device'];
|
||||
$device_id=$incoming['device_id'];
|
||||
$device_name=$incoming['device_name'];
|
||||
$device_active=$incoming['device_active'];
|
||||
|
||||
$edit_subsystem=$incoming['edit_subsystem'];
|
||||
$add_subsystem=$incoming['add_subsystem'];
|
||||
$update_subsystem=$incoming['update_subsystem'];
|
||||
$delete_subsystem=$incoming['delete_subsystem'];
|
||||
$subsystem_id=$incoming['subsystem_id'];
|
||||
$subsystem_name=$incoming['subsystem_name'];
|
||||
$subsystem_desc=$incoming['subsystem_desc'];
|
||||
$subsystem_active=$incoming['subsystem_active'];
|
||||
|
||||
$edit_reason=$incoming['edit_reason'];
|
||||
$add_reason=$incoming['add_reason'];
|
||||
$update_reason=$incoming['update_reason'];
|
||||
$delete_reason=$incoming['delete_reason'];
|
||||
$reason_id=$incoming['reason_id'];
|
||||
$reason_text=$incoming['reason_text'];
|
||||
$reason_active=$incoming['reason_active'];
|
||||
|
||||
$edit_discovered=$incoming['edit_discovered'];
|
||||
$add_discovered=$incoming['add_discovered'];
|
||||
$update_discovered=$incoming['update_discovered'];
|
||||
$delete_discovered=$incoming['delete_discovered'];
|
||||
$discovered_id=$incoming['discovered_id'];
|
||||
$discovered_name=$incoming['discovered_name'];
|
||||
$discovered_desc=$incoming['discovered_desc'];
|
||||
$discovered_active=$incoming['discovered_active'];
|
||||
if (!isset($edit_user)) $edit_user=false;
|
||||
if (!isset($add_user)) $add_user=false;
|
||||
if (!isset($update_user)) $update_user=false;
|
||||
if (!isset($delete_user)) $delete_user=false;
|
||||
if (!isset($edit_device)) $edit_device=false;
|
||||
if (!isset($add_device)) $add_device=false;
|
||||
if (!isset($update_device)) $update_device=false;
|
||||
if (!isset($delete_device)) $delete_device=false;
|
||||
if (!isset($edit_subsystem)) $edit_subsystem=false;
|
||||
if (!isset($add_subsystem)) $add_subsystem=false;
|
||||
if (!isset($update_subsystem)) $update_subsystem=false;
|
||||
if (!isset($delete_subsystem)) $delete_subsystem=false;
|
||||
if (!isset($edit_reason)) $edit_reason=false;
|
||||
if (!isset($add_reason)) $add_reason=false;
|
||||
if (!isset($update_reason)) $update_reason=false;
|
||||
if (!isset($delete_reason)) $delete_reason=false;
|
||||
if (!isset($edit_discovered)) $edit_discovered=false;
|
||||
if (!isset($add_discovered)) $add_discovered=false;
|
||||
if (!isset($update_discovered)) $update_discovered=false;
|
||||
if (!isset($delete_discovered)) $delete_discovered=false;
|
||||
if (!isset($user_fname)) $user_fname=NULL;
|
||||
if (!isset($user_lname)) $user_lname=NULL;
|
||||
if (!isset($user_login)) $user_login=NULL;
|
||||
if (!isset($user_pass)) $user_pass=NULL;
|
||||
if (!isset($user_passconf)) $user_passconf=NULL;
|
||||
if (!isset($device_name)) $device_name=NULL;
|
||||
if (!isset($subsystem_name)) $subsystem_name=NULL;
|
||||
if (!isset($subsystem_desc)) $subsystem_desc=NULL;
|
||||
if (!isset($reason_text)) $reason_text=NULL;
|
||||
if (!isset($discovered_name)) $discovered_name=NULL;
|
||||
if (!isset($discovered_desc)) $discovered_desc=NULL;
|
||||
|
||||
// define local functions
|
||||
|
||||
@@ -94,7 +129,7 @@ $discovered_active=$incoming['discovered_active'];
|
||||
// assign variables from constants
|
||||
$appname=APP_NAME;
|
||||
|
||||
if ($print=="Printer Friendly") {
|
||||
if ($print) {
|
||||
$mbgcolor=P_MENUBG_COLOR;
|
||||
} else {
|
||||
$mbgcolor=MENUBG_COLOR;
|
||||
@@ -110,6 +145,11 @@ framework("begin","$appname","Database Administration",$print);
|
||||
// ******** begin database manipulation ********
|
||||
|
||||
// users-------------------------------------
|
||||
$usernameunique_err=$fnamesuppld_err=$lnamesuppld_err=false;
|
||||
$loginsuppld_err=$loginunique_err=$passcomplex_err=$passmatch_err=false;
|
||||
$userhaswriteups_err=false;
|
||||
$user_add_fail=false;
|
||||
|
||||
if ($add_user) {
|
||||
// do error checking
|
||||
// remove html tags from user name
|
||||
@@ -119,6 +159,7 @@ if ($add_user) {
|
||||
// test for first name supplied
|
||||
if (strlen(trim($user_fname))) {
|
||||
$fnamesuppld=true;
|
||||
$fnamesuppld_err=false;
|
||||
} else {
|
||||
$fnamesuppld=false;
|
||||
$fnamesuppld_err=true;
|
||||
@@ -126,6 +167,7 @@ if ($add_user) {
|
||||
// test for last name supplied
|
||||
if (strlen(trim($user_lname))) {
|
||||
$lnamesuppld=true;
|
||||
$lnamesuppld_err=false;
|
||||
} else {
|
||||
$lnamesuppld=false;
|
||||
$lnamesuppld_err=true;
|
||||
@@ -136,10 +178,12 @@ if ($add_user) {
|
||||
$usernameunique_err=true;
|
||||
} else {
|
||||
$usernameunique=true;
|
||||
$usernameunique_err=false;
|
||||
}
|
||||
// test for login supplied
|
||||
if (strlen(trim($user_login))) {
|
||||
$loginsuppld=true;
|
||||
$loginsuppld_err=false;
|
||||
} else {
|
||||
$loginsuppld=false;
|
||||
$loginsuppld_err=true;
|
||||
@@ -150,27 +194,30 @@ if ($add_user) {
|
||||
$loginunique_err=true;
|
||||
} else {
|
||||
$loginunique=true;
|
||||
$loginunique_err=false;
|
||||
}
|
||||
// test passwords
|
||||
$passresults=validate_password($user_pass,$user_passconf);
|
||||
if ($passresults['match']) {
|
||||
$passmatch=true;
|
||||
$passmatch_err=false;
|
||||
} else {
|
||||
$passmatch=false;
|
||||
$passmatch_err=true;
|
||||
}
|
||||
if ($passresults['complex']) {
|
||||
$passcomplex=true;
|
||||
$passcomplex_err=false;
|
||||
} else {
|
||||
$passcomplex=false;
|
||||
$passcomplex_err=true;
|
||||
}
|
||||
|
||||
// set role
|
||||
if (!$user_role) $user_role=USER;
|
||||
if (!isset($user_role)) $user_role=USER;
|
||||
|
||||
// set active status
|
||||
if (!$user_active) $user_active=0;
|
||||
if (!isset($user_active)) $user_active=0;
|
||||
|
||||
if ($fnamesuppld && $lnamesuppld && $usernameunique && $loginsuppld && $loginunique && $passcomplex && $passmatch) {
|
||||
// sanitize first name, last name, login
|
||||
@@ -181,6 +228,7 @@ if ($add_user) {
|
||||
$passhash=password_hash($user_pass,PASSWORD_DEFAULT);
|
||||
// modify the table
|
||||
mysqli_query($drs_db,"insert into users(firstname,lastname,login,password_hash,role,active) values(\"$clean_fname\",\"$clean_lname\",\"$clean_login\",\"$passhash\",\"$user_role\",\"$user_active\")");
|
||||
$user_add_fail=false;
|
||||
} else {
|
||||
$user_add_fail=true;
|
||||
}
|
||||
@@ -194,6 +242,7 @@ if ($edit_user) {
|
||||
$userhaswriteups_err=true;
|
||||
} else {
|
||||
$userhaswriteups=false;
|
||||
$userhaswriteups_err=false;
|
||||
}
|
||||
// if none, then remove from db
|
||||
if (!$userhaswriteups) mysqli_query($drs_db,"delete from users where id=\"$user_id\"");
|
||||
@@ -207,6 +256,7 @@ if ($edit_user) {
|
||||
// test for first name supplied
|
||||
if (strlen(trim($user_fname))) {
|
||||
$fnamesuppld=true;
|
||||
$fnamesuppld_err=false;
|
||||
} else {
|
||||
$fnamesuppld=false;
|
||||
$fnamesuppld_err=true;
|
||||
@@ -214,6 +264,7 @@ if ($edit_user) {
|
||||
// test for last name supplied
|
||||
if (strlen(trim($user_lname))) {
|
||||
$lnamesuppld=true;
|
||||
$lnamesuppld_err=false;
|
||||
} else {
|
||||
$lnamesuppld=false;
|
||||
$lnamesuppld_err=true;
|
||||
@@ -221,17 +272,20 @@ if ($edit_user) {
|
||||
// test for name unique
|
||||
if (mysqli_num_rows(mysqli_query($drs_db,"select id from users where firstname=\"$user_fname\" and lastname=\"$user_lname\" and id!=\"$user_id\""))) {
|
||||
if (mysqli_num_rows(mysqli_query($drs_db,"select id from users where firstname=\"$user_fname\" and lastname=\"$user_lname\""))) {
|
||||
$nameunique=false;
|
||||
$nameunique_err=true;
|
||||
$nameunique=false;
|
||||
$nameunique_err=true;
|
||||
} else {
|
||||
$nameunique=true;
|
||||
$nameunique_err=false;
|
||||
}
|
||||
} else {
|
||||
$nameunique=true;
|
||||
$nameunique_err=false;
|
||||
}
|
||||
// test for login supplied
|
||||
if (strlen(trim($user_login))) {
|
||||
$loginsuppld=true;
|
||||
$loginsuppld_err=false;
|
||||
} else {
|
||||
$loginsuppld=false;
|
||||
$loginsuppld_err=true;
|
||||
@@ -243,9 +297,11 @@ if ($edit_user) {
|
||||
$loginunique_err=true;
|
||||
} else {
|
||||
$loginunique=true;
|
||||
$loginunique_err=false;
|
||||
}
|
||||
} else {
|
||||
$loginunique=true;
|
||||
$loginunique_err=false;
|
||||
}
|
||||
// sanitize first name, last name, login
|
||||
$clean_fname=mysqli_real_escape_string($drs_db,$user_fname);
|
||||
@@ -253,22 +309,24 @@ if ($edit_user) {
|
||||
$clean_login=mysqli_real_escape_string($drs_db,$user_login);
|
||||
|
||||
// set role
|
||||
if (!$user_role) $user_role=USER;
|
||||
if (!isset($user_role)) $user_role=USER;
|
||||
|
||||
// set active status
|
||||
if (!$user_active) $user_active=0;
|
||||
if (!isset($user_active)) $user_active=0;
|
||||
|
||||
if ($user_pass!="password_is_unchanged") {
|
||||
// test passwords
|
||||
$passresults=validate_password($user_pass,$user_passconf);
|
||||
if ($passresults['match']) {
|
||||
$passmatch=true;
|
||||
$passmatch_err=false;
|
||||
} else {
|
||||
$passmatch=false;
|
||||
$passmatch_err=true;
|
||||
}
|
||||
if ($passresults['complex']) {
|
||||
$passcomplex=true;
|
||||
$passcomplex_err=false;
|
||||
} else {
|
||||
$passcomplex=false;
|
||||
$passcomplex_err=true;
|
||||
@@ -290,6 +348,10 @@ if ($edit_user) {
|
||||
}
|
||||
|
||||
// devices-------------------------------
|
||||
$devicenameunique_err=$devicenamesuppld_err=false;
|
||||
$devicehaswriteups_err=false;
|
||||
$device_add_fail=false;
|
||||
|
||||
if ($add_device) {
|
||||
// do error checking
|
||||
// remove html tags from device name
|
||||
@@ -297,6 +359,7 @@ if ($add_device) {
|
||||
// test for device name supplied
|
||||
if (strlen(trim($device_name))) {
|
||||
$devicenamesuppld=true;
|
||||
$devicenamesuppld_err=false;
|
||||
} else {
|
||||
$devicenamesuppld=false;
|
||||
$devicenamesuppld_err=true;
|
||||
@@ -307,16 +370,18 @@ if ($add_device) {
|
||||
$devicenameunique_err=true;
|
||||
} else {
|
||||
$devicenameunique=true;
|
||||
$devicenameunique_err=false;
|
||||
}
|
||||
|
||||
// set active status
|
||||
if (!$device_active) $device_active=0;
|
||||
if (!isset($device_active)) $device_active=0;
|
||||
|
||||
if ($devicenamesuppld && $devicenameunique) {
|
||||
// sanitize device name
|
||||
$clean_devicename=mysqli_real_escape_string($drs_db,$device_name);
|
||||
// modify the table
|
||||
mysqli_query($drs_db,"insert into devices(name,active) values(\"$clean_devicename\",\"$device_active\")");
|
||||
$device_add_fail=false;
|
||||
} else {
|
||||
$device_add_fail=true;
|
||||
}
|
||||
@@ -329,6 +394,7 @@ if ($edit_device) {
|
||||
$devicehaswriteups_err=true;
|
||||
} else {
|
||||
$devicehaswriteups=false;
|
||||
$devicehaswriteups_err=false;
|
||||
}
|
||||
// if none, then remove from db
|
||||
if (!$devicehaswriteups) mysqli_query($drs_db,"delete from devices where id=\"$device_id\"");
|
||||
@@ -340,6 +406,7 @@ if ($edit_device) {
|
||||
// test for device name supplied
|
||||
if (strlen(trim($device_name))) {
|
||||
$devicenamesuppld=true;
|
||||
$devicenamesuppld_err=false;
|
||||
} else {
|
||||
$devicenamesuppld=false;
|
||||
$devicenamesuppld_err=true;
|
||||
@@ -347,17 +414,19 @@ if ($edit_device) {
|
||||
// test for device name unique
|
||||
if (mysqli_num_rows(mysqli_query($drs_db,"select id from devices where name=\"$device_name\" and id!=\"$device_id\""))) {
|
||||
if (mysqli_num_rows(mysqli_query($drs_db,"select id from devices where name=\"$device_name\""))) {
|
||||
$devicenameunique=false;
|
||||
$devicenameunique_err=true;
|
||||
$devicenameunique=false;
|
||||
$devicenameunique_err=true;
|
||||
} else {
|
||||
$devicenameunique=true;
|
||||
$devicenameunique_err=false;
|
||||
}
|
||||
} else {
|
||||
$devicenameunique=true;
|
||||
$devicenameunique_err=false;
|
||||
}
|
||||
|
||||
// set active status
|
||||
if (!$user_active) $user_active=0;
|
||||
if (!isset($device_active)) $device_active=0;
|
||||
|
||||
// sanitize device name
|
||||
$clean_devicename=mysqli_real_escape_string($drs_db,$device_name);
|
||||
@@ -370,6 +439,10 @@ if ($edit_device) {
|
||||
}
|
||||
|
||||
// subsystems--------------------------------
|
||||
$ssnameunique_err=$ssnamesuppld_err=false;
|
||||
$sshaswriteups_err=false;
|
||||
$subsystem_add_fail=false;
|
||||
|
||||
if ($add_subsystem) {
|
||||
// do error checking
|
||||
// remove html tags from subsystem name and description
|
||||
@@ -378,6 +451,7 @@ if ($add_subsystem) {
|
||||
// test for subsystem name supplied
|
||||
if (strlen(trim($subsystem_name))) {
|
||||
$ssnamesuppld=true;
|
||||
$ssnamesuppld_err=false;
|
||||
} else {
|
||||
$ssnamesuppld=false;
|
||||
$ssnamesuppld_err=true;
|
||||
@@ -388,10 +462,11 @@ if ($add_subsystem) {
|
||||
$ssnameunique_err=true;
|
||||
} else {
|
||||
$ssnameunique=true;
|
||||
$ssnameunique_err=false;
|
||||
}
|
||||
|
||||
// set active status
|
||||
if (!$subsystem_active) $subsystem_active=0;
|
||||
if (!isset($subsystem_active)) $subsystem_active=0;
|
||||
|
||||
if ($ssnamesuppld && $ssnameunique) {
|
||||
// sanitize subsystem name and description
|
||||
@@ -399,6 +474,7 @@ if ($add_subsystem) {
|
||||
$clean_subsystemdesc=mysqli_real_escape_string($drs_db,$subsystem_desc);
|
||||
// modify the table
|
||||
mysqli_query($drs_db,"insert into subsystems(name,description,active) values(\"$clean_subsystemname\",\"$clean_subsystemdesc\",\"$subsystem_active\")");
|
||||
$subsystem_add_fail=false;
|
||||
} else {
|
||||
$subsystem_add_fail=true;
|
||||
}
|
||||
@@ -411,6 +487,7 @@ if ($edit_subsystem) {
|
||||
$sshaswriteups_err=true;
|
||||
} else {
|
||||
$sshaswriteups=false;
|
||||
$sshaswriteups_err=false;
|
||||
}
|
||||
// if none, then remove from db
|
||||
if (!$sshaswriteups) mysqli_query($drs_db,"delete from subsystems where id=\"$subsystem_id\"");
|
||||
@@ -423,6 +500,7 @@ if ($edit_subsystem) {
|
||||
// test for subsystem name supplied
|
||||
if (strlen(trim($subsystem_name))) {
|
||||
$ssnamesuppld=true;
|
||||
$ssnamesuppld_err=false;
|
||||
} else {
|
||||
$ssnamesuppld=false;
|
||||
$ssnamesuppld_err=true;
|
||||
@@ -430,13 +508,15 @@ if ($edit_subsystem) {
|
||||
// test for subsystem name unique
|
||||
if (mysqli_num_rows(mysqli_query($drs_db,"select id from subsystems where name=\"$subsystem_name\" and id!=\"$subsystem_id\""))) {
|
||||
if (mysqli_num_rows(mysqli_query($drs_db,"select id from subsystems where name=\"$subsystem_name\""))) {
|
||||
$ssnameunique=false;
|
||||
$ssnameunique_err=true;
|
||||
$ssnameunique=false;
|
||||
$ssnameunique_err=true;
|
||||
} else {
|
||||
$ssnameunique=true;
|
||||
$ssnameunique_err=false;
|
||||
}
|
||||
} else {
|
||||
$ssnameunique=true;
|
||||
$ssnameunique_err=false;
|
||||
}
|
||||
// sanitize subsystem name and description
|
||||
$clean_ssname=mysqli_real_escape_string($drs_db,$subsystem_name);
|
||||
@@ -450,6 +530,10 @@ if ($edit_subsystem) {
|
||||
}
|
||||
|
||||
// reasons------------------------------------
|
||||
$reastextunique_err=$reastextsuppld_err=false;
|
||||
$reashaswriteups_err=false;
|
||||
$reason_add_fail=false;
|
||||
|
||||
if ($add_reason) {
|
||||
// do error checking
|
||||
// remove html tags from reason text
|
||||
@@ -457,6 +541,7 @@ if ($add_reason) {
|
||||
// test for reason text supplied
|
||||
if (strlen(trim($reason_text))) {
|
||||
$reastextsuppld=true;
|
||||
$reastextsuppld_err=false;
|
||||
} else {
|
||||
$reastextsuppld=false;
|
||||
$reastextsuppld_err=true;
|
||||
@@ -467,16 +552,18 @@ if ($add_reason) {
|
||||
$reastextunique_err=true;
|
||||
} else {
|
||||
$reastextunique=true;
|
||||
$reastextunique_err=false;
|
||||
}
|
||||
|
||||
// set active status
|
||||
if (!$reason_active) $reason_active=0;
|
||||
if (!isset($reason_active)) $reason_active=0;
|
||||
|
||||
if ($reastextsuppld && $reastextunique) {
|
||||
// sanitize reason text
|
||||
$clean_reastext=mysqli_real_escape_string($drs_db,$reason_text);
|
||||
// modify the table
|
||||
mysqli_query($drs_db,"insert into reasons(text,active) values(\"$clean_reastext\",\"$reason_active\")");
|
||||
$reason_add_fail=false;
|
||||
} else {
|
||||
$reason_add_fail=true;
|
||||
}
|
||||
@@ -489,6 +576,7 @@ if ($edit_reason) {
|
||||
$reashaswriteups_err=true;
|
||||
} else {
|
||||
$reashaswriteups=false;
|
||||
$reashaswriteups_err=false;
|
||||
}
|
||||
// if none, then remove from db
|
||||
if (!$reashaswriteups) mysqli_query($drs_db,"delete from reasons where id=\"$reason_id\"");
|
||||
@@ -500,6 +588,7 @@ if ($edit_reason) {
|
||||
// test for reason text supplied
|
||||
if (strlen(trim($reason_text))) {
|
||||
$reastextsuppld=true;
|
||||
$reastextsuppld_err=false;
|
||||
} else {
|
||||
$reastextsuppld=false;
|
||||
$reastextsuppld_err=true;
|
||||
@@ -511,13 +600,15 @@ if ($edit_reason) {
|
||||
$reastextunique_err=true;
|
||||
} else {
|
||||
$reastextunique=true;
|
||||
$reastextunique_err=false;
|
||||
}
|
||||
} else {
|
||||
$reastextunique=true;
|
||||
$reastextunique_err=false;
|
||||
}
|
||||
|
||||
// set active status
|
||||
if (!$reason_active) $reason_active=0;
|
||||
if (!isset($reason_active)) $reason_active=0;
|
||||
|
||||
// sanitize reason text
|
||||
$clean_reastext=mysqli_real_escape_string($drs_db,$reason_text);
|
||||
@@ -530,6 +621,10 @@ if ($edit_reason) {
|
||||
}
|
||||
|
||||
// when discovered-----------------------------------
|
||||
$discnamesuppld_err=$discnameunique_err=$discdescsuppld_err=false;
|
||||
$dischaswriteups_err=false;
|
||||
$discovered_add_fail=false;
|
||||
|
||||
if ($add_discovered) {
|
||||
// do error checking
|
||||
// remove html tags from name and description
|
||||
@@ -538,6 +633,7 @@ if ($add_discovered) {
|
||||
// test for name supplied
|
||||
if (strlen(trim($discovered_name))) {
|
||||
$discnamesuppld=true;
|
||||
$discnamesuppld_err=false;
|
||||
} else {
|
||||
$discnamesuppld=false;
|
||||
$discnamesuppld_err=true;
|
||||
@@ -548,24 +644,27 @@ if ($add_discovered) {
|
||||
$discnameunique_err=true;
|
||||
} else {
|
||||
$discnameunique=true;
|
||||
$discnameunique_err=false;
|
||||
}
|
||||
// test for description supplied
|
||||
if (strlen(trim($discovered_desc))) {
|
||||
$discdescsuppld=true;
|
||||
$discdescsuppld_err=false;
|
||||
} else {
|
||||
$discdescsuppld=false;
|
||||
$discdescsuppld_err=true;
|
||||
}
|
||||
// test for description unique
|
||||
if (mysqli_num_rows(mysqli_query($drs_db,"select id from description where whendiscovereddesc =\"$discovered_desc\""))) {
|
||||
if (mysqli_num_rows(mysqli_query($drs_db,"select id from discovered where whendiscovereddesc =\"$discovered_desc\""))) {
|
||||
$discdescunique=false;
|
||||
$discdescunique_err=true;
|
||||
} else {
|
||||
$discdescunique=true;
|
||||
$discdescunique_err=false;
|
||||
}
|
||||
|
||||
// set active status
|
||||
if (!$discovered_active) $discovered_active=0;
|
||||
if (!isset($discovered_active)) $discovered_active=0;
|
||||
|
||||
if ($discnamesuppld && $discnameunique && $discdescsuppld) {
|
||||
// sanitize name
|
||||
@@ -574,6 +673,7 @@ if ($add_discovered) {
|
||||
$clean_discovered_desc=mysqli_real_escape_string($drs_db,$discovered_desc);
|
||||
// modify the table
|
||||
mysqli_query($drs_db,"insert into discovered(whendiscoveredname,whendiscovereddesc,active) values(\"$clean_discovered_name\",\"$clean_discovered_desc\",\"$discovered_active\")");
|
||||
$discovered_add_fail=false;
|
||||
} else {
|
||||
$discovered_add_fail=true;
|
||||
}
|
||||
@@ -586,6 +686,7 @@ if ($edit_discovered) {
|
||||
$dischaswriteups_err=true;
|
||||
} else {
|
||||
$dischaswriteups=false;
|
||||
$dischaswriteups_err=false;
|
||||
}
|
||||
// if none, then remove from db
|
||||
if (!$dischaswriteups) mysqli_query($drs_db,"delete from discovered where id=\"$discovered_id\"");
|
||||
@@ -598,6 +699,7 @@ if ($edit_discovered) {
|
||||
// test for name supplied
|
||||
if (strlen(trim($discovered_name))) {
|
||||
$discnamesuppld=true;
|
||||
$discnamesuppld_err=false;
|
||||
} else {
|
||||
$discnamesuppld=false;
|
||||
$discnamesuppld_err=true;
|
||||
@@ -609,30 +711,23 @@ if ($edit_discovered) {
|
||||
$discnameunique_err=true;
|
||||
} else {
|
||||
$discnameunique=true;
|
||||
$discnameunique_err=false;
|
||||
}
|
||||
} else {
|
||||
$discnameunique=true;
|
||||
$discnameunique_err=false;
|
||||
}
|
||||
// test for description supplied
|
||||
if (strlen(trim($discovered_desc))) {
|
||||
$discdescsuppld=true;
|
||||
$discdescsuppld_err=false;
|
||||
} else {
|
||||
$discdescsuppld=false;
|
||||
$discdescsuppld_err=true;
|
||||
}
|
||||
// test for description unique
|
||||
if (mysqli_num_rows(mysqli_query($drs_db,"select id from discovered where whendiscovereddesc=\"$discovered_text\" and id!=\"$discovered_id\""))) {
|
||||
if (mysqli_num_rows(mysqli_query($drs_db,"select id from discovered where whendiscovereddesc =\"$discovered_desc\""))) {
|
||||
$discdescunique=false;
|
||||
$discdescunique_err=true;
|
||||
} else {
|
||||
$discdescunique=true;
|
||||
}
|
||||
} else {
|
||||
$discdescunique=true;
|
||||
}
|
||||
// set active status
|
||||
if (!$discovered_active) $discovered_active=0;
|
||||
|
||||
// set active status
|
||||
if (!isset($discovered_active)) $discovered_active=0;
|
||||
|
||||
// sanitize name
|
||||
$clean_discovered_name=mysqli_real_escape_string($drs_db,$discovered_name);
|
||||
@@ -640,7 +735,7 @@ if ($edit_discovered) {
|
||||
$clean_discovered_desc=mysqli_real_escape_string($drs_db,$discovered_desc);
|
||||
|
||||
$updqry="update discovered set whendiscoveredname=\"$clean_discovered_name\",whendiscovereddesc=\"$clean_discovered_desc\",active=\"$discovered_active\" where id=\"$discovered_id\"";
|
||||
if ($discnamesuppld && $discnameunique && $discdescsuppld && $discdescunique) {
|
||||
if ($discnamesuppld && $discnameunique && $discdescsuppld) {
|
||||
// modify the table
|
||||
mysqli_query($drs_db,$updqry);
|
||||
}
|
||||
@@ -707,7 +802,7 @@ if ($edit_user && !$delete_user) {
|
||||
}
|
||||
} else {
|
||||
// set form options for add
|
||||
if (!$user_add_fail) unset($user_id,$user_fname,$user_lname,$user_login,$user_pass,$user_passconf,$user_role,$user_active);
|
||||
if (!$user_add_fail) $user_id=$user_fname=$user_lname=$user_login=$user_pass=$user_passconf=$user_role=$user_active=NULL;
|
||||
$sectiontitle="<b><font size=\"+1\">Add New User</font></b><br><br>";
|
||||
$formtag="<form method=\"post\" action=\"dbadmin.php#users\">";
|
||||
$buttontags="
|
||||
@@ -812,7 +907,7 @@ if ($edit_device && !$delete_device) {
|
||||
}
|
||||
} else {
|
||||
// set form options for add
|
||||
if (!$device_add_fail) unset($device_id,$device_name,$device_active);
|
||||
if (!$device_add_fail) $device_id=$device_name=$device_active=NULL;
|
||||
$sectiontitle="<b><font size=\"+1\">Add New Device</font></b><br><br>";
|
||||
$formtag="<form method=\"post\" action=\"dbadmin.php#devices\">";
|
||||
$buttontags="
|
||||
@@ -889,7 +984,7 @@ if ($edit_subsystem && !$delete_subsystem) {
|
||||
}
|
||||
} else {
|
||||
// set form options for add
|
||||
if (!$subsystem_add_fail) unset($subsystem_id,$subsystem_name,$subsystem_desc,$subsystem_active);
|
||||
if (!$subsystem_add_fail) $subsystem_id=$subsystem_name=$subsystem_desc=$subsystem_active=NULL;
|
||||
$sectiontitle="<b><font size=\"+1\">Add New Subsystem</font></b><br><br>";
|
||||
$formtag="<form method=\"post\" action=\"dbadmin.php#subsystems\">";
|
||||
$buttontags="
|
||||
@@ -969,7 +1064,7 @@ if ($edit_reason && !$delete_reason) {
|
||||
}
|
||||
} else {
|
||||
// set form options for add
|
||||
if (!$reason_add_fail) unset($reason_id,$reason_text,$reason_active);
|
||||
if (!$reason_add_fail) $reason_id=$reason_text=$reason_active=NULL;
|
||||
$sectiontitle="<b><font size=\"+1\">Add New Reason</font></b><br><br>";
|
||||
$formtag="<form method=\"post\" action=\"dbadmin.php#reasons\">";
|
||||
$buttontags="
|
||||
@@ -1024,6 +1119,7 @@ echo "
|
||||
";
|
||||
if ($discnamesuppld_err) format_message(1,"When Discovered name cannot be blank.");
|
||||
if ($discnameunique_err) format_message(1,"When Discovered name already exists.");
|
||||
if ($discdescsuppld_err) format_message(1,"When Discovered description cannot be blank.");
|
||||
if ($dischaswriteups_err) format_message(1,"When Discovered has writeups in the database and cannot be deleted.");
|
||||
|
||||
if ($edit_discovered && !$delete_discovered) {
|
||||
@@ -1047,7 +1143,7 @@ if ($edit_discovered && !$delete_discovered) {
|
||||
}
|
||||
} else {
|
||||
// set form options for add
|
||||
if (!$discovered_add_fail) unset($discovered_id,$discovered_name,$discovered_desc,$discovered_active);
|
||||
if (!$discovered_add_fail) $discovered_id=$discovered_name=$discovered_desc=$discovered_active=NULL;
|
||||
$sectiontitle="<b><font size=\"+1\">Add New When Discovered</font></b><br><br>";
|
||||
$formtag="<form method=\"post\" action=\"dbadmin.php#discovered\">";
|
||||
$buttontags="
|
||||
|
||||
Reference in New Issue
Block a user