From 6eb96df277293d853fb483b4163f4e1202e1848c Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sat, 17 Sep 2022 16:46:12 -0400 Subject: [PATCH] Operation Cleanup Round 2 - Remove Custom Links. This should really be handled by a startpage of some sort --- admin_side_nav.php | 7 --- custom_link_add_modal.php | 52 ------------------ custom_link_edit_modal.php | 53 ------------------- custom_links.php | 106 ------------------------------------- database_updates.php | 12 ++++- database_version.php | 2 +- post.php | 53 ------------------- side_nav.php | 41 -------------- 8 files changed, 11 insertions(+), 315 deletions(-) delete mode 100644 custom_link_add_modal.php delete mode 100644 custom_link_edit_modal.php delete mode 100644 custom_links.php diff --git a/admin_side_nav.php b/admin_side_nav.php index dba55799..6b55df8d 100644 --- a/admin_side_nav.php +++ b/admin_side_nav.php @@ -152,13 +152,6 @@

Modules

- -
  • - "> - -

    Custom Links

    -     -
  • "> diff --git a/custom_link_add_modal.php b/custom_link_add_modal.php deleted file mode 100644 index 59bffc62..00000000 --- a/custom_link_add_modal.php +++ /dev/null @@ -1,52 +0,0 @@ - \ No newline at end of file diff --git a/custom_link_edit_modal.php b/custom_link_edit_modal.php deleted file mode 100644 index b42b02a4..00000000 --- a/custom_link_edit_modal.php +++ /dev/null @@ -1,53 +0,0 @@ - \ No newline at end of file diff --git a/custom_links.php b/custom_links.php deleted file mode 100644 index f0543f64..00000000 --- a/custom_links.php +++ /dev/null @@ -1,106 +0,0 @@ - $sb, 'o' => $o))); - -$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM custom_links - WHERE custom_link_name LIKE '%$q%' - AND company_id = $session_company_id - ORDER BY $sb $o LIMIT $record_from, $record_to" -); - -$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); - -?> - - -
    -
    -

    Custom Links

    -
    - -
    -
    -
    -
    -
    -
    -
    - -
    - -
    -
    -
    -
    -
    -
    -
    - - "> - - - - - - - - "; - }else{ - $custom_link_icon_display = ""; - } - $custom_link_url = $row['custom_link_url']; - - ?> - - - - - - - - - -
    NameURLAction
    -
    - -
    - Edit -
    - Delete -
    -
    -
    -
    - -
    -
    - - \ No newline at end of file diff --git a/database_updates.php b/database_updates.php index 84d29995..54abcec3 100644 --- a/database_updates.php +++ b/database_updates.php @@ -299,11 +299,19 @@ if(LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION){ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.6'"); } - //if(CURRENT_DATABASE_VERSION == '0.1.6'){ + if(CURRENT_DATABASE_VERSION == '0.1.6'){ // Insert queries here required to update to DB version 0.1.7 + //Remove custom links + mysqli_query($mysqli, "DROP TABLE custom_links"); + // Then, update the database to the next sequential version + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.7'"); + } + + //if(CURRENT_DATABASE_VERSION == '0.1.7'){ + // Insert queries here required to update to DB version 0.1.8 // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.7'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.1.8'"); //} } diff --git a/database_version.php b/database_version.php index 49ec8dc6..f69e4149 100644 --- a/database_version.php +++ b/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "0.1.6"); \ No newline at end of file +DEFINE("LATEST_DATABASE_VERSION", "0.1.7"); \ No newline at end of file diff --git a/post.php b/post.php index 5ea58bfe..3e9d00d5 100644 --- a/post.php +++ b/post.php @@ -711,7 +711,6 @@ if(isset($_GET['delete_company'])){ mysqli_query($mysqli,"DELETE FROM clients WHERE company_id = $company_id"); mysqli_query($mysqli,"DELETE FROM contacts WHERE company_id = $company_id"); - mysqli_query($mysqli,"DELETE FROM custom_links WHERE company_id = $company_id"); mysqli_query($mysqli,"DELETE FROM documents WHERE company_id = $company_id"); mysqli_query($mysqli,"DELETE FROM domains WHERE company_id = $company_id"); mysqli_query($mysqli,"DELETE FROM events WHERE company_id = $company_id"); @@ -2286,58 +2285,6 @@ if(isset($_GET['delete_tax'])){ //End Tax -//Custom Link -if(isset($_POST['add_custom_link'])){ - - $name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['name']))); - $icon = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['icon']))); - $url = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['url']))); - - mysqli_query($mysqli,"INSERT INTO custom_links SET custom_link_name = '$name', custom_link_icon = '$icon', custom_link_url = '$url', company_id = $session_company_id"); - - //Logging - mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Custom Link', log_action = 'Create', log_description = '$name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, company_id = $session_company_id"); - - $_SESSION['alert_message'] = "Custom link added"; - - header("Location: " . $_SERVER["HTTP_REFERER"]); - -} - -if(isset($_POST['edit_custom_link'])){ - - $custom_link_id = intval($_POST['custom_link_id']); - $name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['name']))); - $icon = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['icon']))); - $url = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['url']))); - - mysqli_query($mysqli,"UPDATE custom_links SET custom_link_name = '$name', custom_link_icon = '$icon', custom_link_url = '$url' WHERE custom_link_id = $custom_link_id AND company_id = $session_company_id"); - - //Logging - mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Custom Link', log_action = 'Modify', log_description = '$name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, company_id = $session_company_id"); - - $_SESSION['alert_message'] = "Custom link modified"; - - header("Location: custom_links.php"); - -} - -if(isset($_GET['delete_custom_link'])){ - $custom_link_id = intval($_GET['delete_custom_link']); - - mysqli_query($mysqli,"DELETE FROM custom_links WHERE custom_link_id = $custom_link_id AND company_id = $session_company_id"); - - //Logging - mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Custom Link', log_action = 'Delete', log_description = '$custom_link_id', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, company_id = $session_company_id"); - - $_SESSION['alert_message'] = "Custom link deleted"; - $_SESSION['alert_type'] = "error"; - - header("Location: " . $_SERVER["HTTP_REFERER"]); - -} -//End Custom Link - if(isset($_GET['dismiss_notification'])){ $notification_id = intval($_GET['dismiss_notification']); diff --git a/side_nav.php b/side_nav.php index 2cbceeff..1fc75840 100644 --- a/side_nav.php +++ b/side_nav.php @@ -191,47 +191,6 @@ - 0){ - - ?> - -
  • EXTERNAL LINKS
    • - - - -
  • - - -

    -     -
    • - - -