From c42de76fb8101fbf9b95d62efa5db88ca62b0140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CVeLiTi=E2=80=9D?= <“info@veliti.nl”> Date: Thu, 3 Oct 2024 15:26:23 +0200 Subject: [PATCH 1/2] CMXX - New Profile setup --- profiles.php | 153 ++++++++++++++++++++++ settings/settingsmenu.php | 8 +- settings/settingsprofiles.php | 20 +++ settings/settingsviews.php | 63 +++++++++ settings/translations/translations_DE.php | 2 +- settings/translations/translations_NL.php | 1 + settings/translations/translations_US.php | 1 + test.php | 7 +- 8 files changed, 248 insertions(+), 7 deletions(-) create mode 100644 profiles.php create mode 100644 settings/settingsprofiles.php create mode 100644 settings/settingsviews.php diff --git a/profiles.php b/profiles.php new file mode 100644 index 0000000..782021c --- /dev/null +++ b/profiles.php @@ -0,0 +1,153 @@ +'; + if (in_array($view, $profile_contents)){ + $html .= ' '.$view; + } else { + $html .= ' '.$view; + } + $html .= ''; + } + return $html; +} + +// Format tabs +function format_tabs($contents) { + $rows = explode("\n", $contents); + $tab = '
'; + $tab .= 'General'; + for ($i = 0; $i < count($rows); $i++) { + preg_match('/\/\*(.*?)\*\//', $rows[$i], $match); + if ($match) { + $tab .= '' . $match[1] . ''; + } + } + $tab .= '
'; + return $tab; +} +// Format form +function format_form($contents) { + $rows = explode("\n", $contents); + $form = '
'; + for ($i = 0; $i < count($rows); $i++) { + preg_match('/\/\*(.*?)\*\//', $rows[$i], $match); + if ($match) { + $form .= '
'; + } + preg_match('/define\(\'(.*?)\', ?(.*?)\)/', $rows[$i], $match); + if ($match) { + $form .= format_var_html($match[1], $match[2]); + } + } + $form .= '
'; + + return $form; +} +if (isset($_POST['submit']) && !empty($_POST)) { + //remove submit from POST + unset($_POST['submit']); + + //Make POST ready for save into definition + foreach($_POST as $profile_name => $profile_views){ + + $view_input = ''; + foreach($profile_views as $profile_view){ + $view_input .= $profile_view.','; + } + $view_input = substr($view_input,0,-1); + // Update the configuration file with the new keys and values + $contents = preg_replace('/define\(\'' . $profile_name . '\'\, ?(.*?)\)/s', 'define(\'' . $profile_name . '\',' . $view_input . ')', $contents); + + } + //SAVE TO FILE + file_put_contents('./settings/settingsprofiles.php', $contents); + + //Return succesmessage + header('Location: index.php?page=profiles&success_msg=1'); + exit; +} + + +// Handle success messages +if (isset($_GET['success_msg'])) { + if ($_GET['success_msg'] == 1) { + $success_msg = 'Profiles updated successfully!'; + } +} + +template_header('Profiles', 'profiles'); + +$view .= ' +
+ +
+

Profiles

+ +
+'; + +if (isset($success_msg)){ + $view .= '
+ +

'.$success_msg.'

+ +
'; +} + +$view .= format_tabs($contents); +$view .= '
+
+ '; +$view .= format_form($contents); + +$view .= ' +
+
+
+'; + +//Output +echo $view; + +template_footer(); + +?> \ No newline at end of file diff --git a/settings/settingsmenu.php b/settings/settingsmenu.php index a62053f..7d2fc4e 100644 --- a/settings/settingsmenu.php +++ b/settings/settingsmenu.php @@ -16,7 +16,7 @@ $equipments_sub = array('equipments','servicereports','histories','firmwaretool' $sales_sub = array('accounts','contracts'); $admin_sub = array('users','communications','partners'); $reporting_sub = array('report_build','report_healthindex','report_usage'); -$settings_sub = array('config','language','log','maintenance'); +$settings_sub = array('config','language','log','maintenance','profiles'); //URLS $urls = array( @@ -134,6 +134,12 @@ $urls = array( "icon" => "fas fa-tachometer-alt", "name" => "menu_maintenance" ), + "profiles" => array( + "url" => "profiles", + "selected" => "profiles", + "icon" => "fas fa-tachometer-alt", + "name" => "menu_profiles" + ), "marketing" => array( "url" => "marketing&product_group=Emergency_Plug&product_content=Images", "selected" => "marketing", diff --git a/settings/settingsprofiles.php b/settings/settingsprofiles.php new file mode 100644 index 0000000..c8122fc --- /dev/null +++ b/settings/settingsprofiles.php @@ -0,0 +1,20 @@ + \ No newline at end of file diff --git a/settings/settingsviews.php b/settings/settingsviews.php new file mode 100644 index 0000000..68b5fbf --- /dev/null +++ b/settings/settingsviews.php @@ -0,0 +1,63 @@ + \ No newline at end of file diff --git a/settings/translations/translations_DE.php b/settings/translations/translations_DE.php index 3a24bf2..98cfc8d 100644 --- a/settings/translations/translations_DE.php +++ b/settings/translations/translations_DE.php @@ -26,7 +26,7 @@ $menu_report_build = 'Bestand und Produktion'; $menu_report_healthindex= 'Healthindex'; $menu_report_usage = 'Systemnutzung'; $menu_maintenance = 'Maintenance'; - +$menu_profiles = 'Profiles'; //TABS $tab1 = 'Allgemein'; diff --git a/settings/translations/translations_NL.php b/settings/translations/translations_NL.php index a6a1669..310d3b7 100644 --- a/settings/translations/translations_NL.php +++ b/settings/translations/translations_NL.php @@ -26,6 +26,7 @@ $menu_report_build = 'Voorraad en Productie'; $menu_report_healthindex= 'Healthindex'; $menu_report_usage = 'Systeemgebruik'; $menu_maintenance = 'Maintenance'; +$menu_profiles = 'Profielen'; //TABS diff --git a/settings/translations/translations_US.php b/settings/translations/translations_US.php index 8f19e8a..f612842 100644 --- a/settings/translations/translations_US.php +++ b/settings/translations/translations_US.php @@ -26,6 +26,7 @@ $menu_report_build = 'Stock and Production'; $menu_report_healthindex= 'Healthindex'; $menu_report_usage = 'System usage'; $menu_maintenance = 'Maintenance'; +$menu_profiles = 'Profiles'; //TABS $tab1 = 'General'; diff --git a/test.php b/test.php index dd0ec71..be30123 100644 --- a/test.php +++ b/test.php @@ -9,10 +9,7 @@ include './settings/config.php'; include_once './settings/translations/translations_US.php'; include_once './settings/systemfirmware.php'; - -//define('standard_profile','dashboard,profile,equipments,equipment,histories,history,servicereports,servicereport,firmwaretool,application'); - -$allviews = ["dashboard","profile","equipments","equipment","equipmentmanage","equipment_item"]; +$allviews = explode(',' , standard_profile); $admin_profile = ["dashboard","profile","equipments","equipment"]; @@ -20,7 +17,7 @@ $view = '
'; foreach ($allviews as $view){ - if (in_array($view,$admin_profile)){ + if (in_stir($view,$admin_profile)){ $view .= ''; } else { $view .= ''; From 7737be560c24905e713ca7ecbf97d7209af0982e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CVeLiTi=E2=80=9D?= <“info@veliti.nl”> Date: Thu, 3 Oct 2024 16:01:14 +0200 Subject: [PATCH 2/2] CMXX - Bugfixes --- assets/functions.php | 2 +- profiles.php | 12 +++++------- settings/settingsprofiles.php | 12 ++++++------ 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/assets/functions.php b/assets/functions.php index de5d765..bb9da50 100644 --- a/assets/functions.php +++ b/assets/functions.php @@ -608,7 +608,7 @@ function getProfile($profile, $permission){ else { switch ($permission) { case '4': //Admin++ - $profile = admin_profile; + $profile = adminplus_profile; break; case '3': //Admin $profile = admin_profile; diff --git a/profiles.php b/profiles.php index 782021c..d4e13fb 100644 --- a/profiles.php +++ b/profiles.php @@ -1,18 +1,16 @@ '; + $form = '
Each tab represents a profile. Each element in a profile represents a view and or API access.'; for ($i = 0; $i < count($rows); $i++) { preg_match('/\/\*(.*?)\*\//', $rows[$i], $match); if ($match) { @@ -93,7 +91,7 @@ if (isset($_POST['submit']) && !empty($_POST)) { foreach($profile_views as $profile_view){ $view_input .= $profile_view.','; } - $view_input = substr($view_input,0,-1); + $view_input = "'".substr($view_input,0,-1)."'"; // Update the configuration file with the new keys and values $contents = preg_replace('/define\(\'' . $profile_name . '\'\, ?(.*?)\)/s', 'define(\'' . $profile_name . '\',' . $view_input . ')', $contents); diff --git a/settings/settingsprofiles.php b/settings/settingsprofiles.php index c8122fc..811a1bd 100644 --- a/settings/settingsprofiles.php +++ b/settings/settingsprofiles.php @@ -1,16 +1,16 @@