From a2936754cd745ba586c08fd774b4f9b41c226e2b Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 1 Apr 2022 17:20:29 -0400 Subject: [PATCH] Moved Mesh Central and Azure settings from general to its own tab called integrations --- admin_side_nav.php | 7 ++++ post.php | 33 +++++++++++++--- settings-general.php | 63 ------------------------------- settings-integrations.php | 79 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 113 insertions(+), 69 deletions(-) create mode 100644 settings-integrations.php diff --git a/admin_side_nav.php b/admin_side_nav.php index 22293061..4be4fb87 100644 --- a/admin_side_nav.php +++ b/admin_side_nav.php @@ -95,6 +95,13 @@

Online Payment

+ +
  • + "> + +

    Integrations

    +     +
  • " diff --git a/post.php b/post.php index 9f9f7267..d3dde140 100644 --- a/post.php +++ b/post.php @@ -804,13 +804,8 @@ if(isset($_POST['edit_general_settings'])){ } $config_base_url = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_base_url']))); - $mesh_uri = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['meshcentral_uri']))); - $mesh_user = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['meshcentral_user']))); - $mesh_secret = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['meshcentral_secret']))); - $azure_client_id = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['azure_client_id']))); - $azure_client_secret = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['azure_client_secret']))); - mysqli_query($mysqli,"UPDATE settings SET config_base_url = '$config_base_url', config_meshcentral_uri = '$mesh_uri', config_meshcentral_user = '$mesh_user', config_meshcentral_secret = '$mesh_secret', config_azure_client_id = '$azure_client_id', config_azure_client_secret = '$azure_client_secret' WHERE company_id = $session_company_id"); + mysqli_query($mysqli,"UPDATE settings SET config_base_url = '$config_base_url' WHERE company_id = $session_company_id"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modify', log_description = '$session_name modified general settings', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_created_at = NOW(), log_user_id = $session_user_id, company_id = $session_company_id"); @@ -1074,6 +1069,32 @@ if(isset($_POST['edit_online_payment_settings'])){ header("Location: " . $_SERVER["HTTP_REFERER"]); } +if(isset($_POST['edit_integrations_settings'])){ + + if($session_user_role != 3){ + $_SESSION['alert_type'] = "danger"; + $_SESSION['alert_message'] = "You are not permitted to do that!"; + header("Location: " . $_SERVER["HTTP_REFERER"]); + exit(); + } + + $mesh_uri = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['meshcentral_uri']))); + $mesh_user = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['meshcentral_user']))); + $mesh_secret = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['meshcentral_secret']))); + $azure_client_id = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['azure_client_id']))); + $azure_client_secret = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['azure_client_secret']))); + + mysqli_query($mysqli,"UPDATE settings SET config_meshcentral_uri = '$mesh_uri', config_meshcentral_user = '$mesh_user', config_meshcentral_secret = '$mesh_secret', config_azure_client_id = '$azure_client_id', config_azure_client_secret = '$azure_client_secret' WHERE company_id = $session_company_id"); + + //Logging + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modify', log_description = '$session_name modified integrations settings', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_created_at = NOW(), log_user_id = $session_user_id, company_id = $session_company_id"); + + $_SESSION['alert_message'] = "Integrations settings updated"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + if(isset($_POST['edit_backup_settings'])){ if($session_user_role != 3){ diff --git a/settings-general.php b/settings-general.php index 29e15a84..8a58d9a8 100644 --- a/settings-general.php +++ b/settings-general.php @@ -17,69 +17,6 @@ This is used by cron to send the correct url for invoice guest views - -
    - -

    Mesh Central Asset Integration

    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    -
    - This token/user only requires read access to MeshCentral and is stored in plaintext. -
    -
    - -
    - -

    Client Portal SSO via Microsoft Azure AD

    -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    diff --git a/settings-integrations.php b/settings-integrations.php new file mode 100644 index 00000000..f8eec703 --- /dev/null +++ b/settings-integrations.php @@ -0,0 +1,79 @@ + + +
    +
    +

    Integration Settings

    +
    +
    +
    + +

    Mesh Central Asset Integration

    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    + This token/user only requires read access to MeshCentral and is stored in plaintext. +
    +
    + +
    + +

    Client Portal SSO via Microsoft Azure AD

    +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + + + +
    +
    +
    + +