diff --git a/pub/api/classes/API.php b/pub/api/classes/API.php index 21da535..4e6e791 100644 --- a/pub/api/classes/API.php +++ b/pub/api/classes/API.php @@ -6,8 +6,8 @@ use JetBrains\PhpStorm\NoReturn; class API { - public $conn; - public $pdo; + public mixed $conn; + public mixed $pdo; # The user uuid that requested the API protected $user_uuid; @@ -21,7 +21,7 @@ class API protected $content_type; # The original posted data to the API, this data is NOT sanitized and validated, never use this data for queries! - public $postedData; + public mixed $postedData; # The validated and sanitized data can be uses for the API actions public $data; @@ -32,7 +32,7 @@ class API # The return url that the frontend request will forward to after the api call is done. if set to false it will only output # the json response with an http code. API calls always respond with json. $return_url can be set to supply the form with an input # with the name _return and value of the url to return to. - public $return_url; + public mixed $return_url; # Used for the query builder base public $baseQuery = false; @@ -46,8 +46,8 @@ class API public function __construct() { - require_once $_SERVER['DOCUMENT_ROOT'] . '/bin/php/db_connect.php'; - include_once $_SERVER['DOCUMENT_ROOT'] . '/bin/php/Functions/globalFunctions.php'; + require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/db_connect.php"; + require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Functions/globalFunctions.php"; # Setup Database connection $this->conn = $GLOBALS['conn']; @@ -100,7 +100,7 @@ class API } - private function InitUserTypeFrontend() + private function InitUserTypeFrontend(): void { $this->user_uuid = $_SESSION['user']['user_uuid']; $this->user_type = 'frontend'; @@ -265,8 +265,11 @@ class API { switch ($rules['type']) { case 'string': + case 'password': + case 'html': if (!is_string($value)) return false; return $this->isValidLength($value, $rules); + case 'slugify': if (!is_string($value) || !preg_match('/^[a-z0-9]+(-[a-z0-9]+)*$/', $value)) return false; return $this->isValidLength($value, $rules); @@ -290,14 +293,6 @@ class API if (!filter_var($value, FILTER_VALIDATE_EMAIL)) return false; return $this->isValidLength($value, $rules); - case 'password': - if (!is_string($value)) return false; - return $this->isValidLength($value, $rules); - - case 'html': - if (!is_string($value)) return false; - return $this->isValidLength($value, $rules); - case 'int': if (!is_int($value) && !ctype_digit($value)) return false; $value = (int)$value; diff --git a/pub/api/classes/API_inserve.php b/pub/api/classes/API_inserve.php index 9edda0e..b399a13 100644 --- a/pub/api/classes/API_inserve.php +++ b/pub/api/classes/API_inserve.php @@ -10,13 +10,13 @@ require_once 'API.php'; class API_inserve extends API { - private $inserve_url; + private string $inserve_url; - private $inserve_token; + private string $inserve_token; - public $inserve_source_uuid; + public string $inserve_source_uuid; - public $inserve_custom_data; + public array $inserve_custom_data; private $ch; diff --git a/pub/api/classes/API_users.php b/pub/api/classes/API_users.php index f7d6aa3..da3ec9f 100644 --- a/pub/api/classes/API_users.php +++ b/pub/api/classes/API_users.php @@ -8,7 +8,7 @@ use bin\php\Classes\mailBuilder; use JetBrains\PhpStorm\NoReturn; require_once 'API.php'; -require_once $_SERVER['DOCUMENT_ROOT'] . '/bin/php/Classes/mailBuilder.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Classes/mailBuilder.php"; class API_users extends API { diff --git a/pub/api/classes/API_usersavatar.php b/pub/api/classes/API_usersavatar.php index cad8ff0..34772aa 100644 --- a/pub/api/classes/API_usersavatar.php +++ b/pub/api/classes/API_usersavatar.php @@ -32,7 +32,7 @@ class API_usersavatar extends API user_profile_picture_thumbnail = ? WHERE user_uuid = ?"; - $stmt = $stmt = $this->prepareStatement($query); + $stmt = $this->prepareStatement($query); $stmt->bind_param("sss", $this->data['user_profile_picture'], $this->data['user_profile_picture_thumbnail'], diff --git a/pub/api/classes/imageProcessor.php b/pub/api/classes/imageProcessor.php index 24e9bb5..cb010c2 100644 --- a/pub/api/classes/imageProcessor.php +++ b/pub/api/classes/imageProcessor.php @@ -115,7 +115,7 @@ class imageProcessor return in_array($mime, ['image/png', 'image/webp']); } - private function setTransparentCanvas($image, $width, $height) + private function setTransparentCanvas($image, $width, $height): void { // Enable alpha blending and preserve alpha channel imagealphablending($image, false); @@ -125,7 +125,6 @@ class imageProcessor $transparent = imagecolorallocatealpha($image, 0, 0, 0, 127); imagefilledrectangle($image, 0, 0, $width, $height, $transparent); - return $image; } private function resizeToFitRestrictions($mime, $width, $height) diff --git a/pub/api/v1/autop/devices/files/index.php b/pub/api/v1/autop/devices/files/index.php index 1627776..f4b4377 100644 --- a/pub/api/v1/autop/devices/files/index.php +++ b/pub/api/v1/autop/devices/files/index.php @@ -3,7 +3,7 @@ use api\classes\API_devices; session_start(); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_devices.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_devices.php"; $API_devices = new API_devices(); diff --git a/pub/api/v1/autop/devices/index.php b/pub/api/v1/autop/devices/index.php index d32b11e..2f4a926 100644 --- a/pub/api/v1/autop/devices/index.php +++ b/pub/api/v1/autop/devices/index.php @@ -3,8 +3,8 @@ use api\classes\API_devices; session_start(); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_devices.php'; -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/imageProcessor.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_devices.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/imageProcessor.php"; $API_devices = new API_devices(); diff --git a/pub/api/v1/autop/platforms/index.php b/pub/api/v1/autop/platforms/index.php index 6842247..c03e683 100644 --- a/pub/api/v1/autop/platforms/index.php +++ b/pub/api/v1/autop/platforms/index.php @@ -4,8 +4,8 @@ use api\classes\API_platforms; use api\classes\imageProcessor; session_start(); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_platforms.php'; -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/imageProcessor.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_platforms.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/imageProcessor.php"; $API_platforms = new API_platforms(); diff --git a/pub/api/v1/autop/vendors/index.php b/pub/api/v1/autop/vendors/index.php index 251536a..705e376 100644 --- a/pub/api/v1/autop/vendors/index.php +++ b/pub/api/v1/autop/vendors/index.php @@ -4,8 +4,8 @@ use api\classes\API_vendors; use api\classes\imageProcessor; session_start(); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_vendors.php'; -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/imageProcessor.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_vendors.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/imageProcessor.php"; $API_vendors = new API_vendors(); diff --git a/pub/api/v1/customers/companies/activate/index.php b/pub/api/v1/customers/companies/activate/index.php index efdea98..ae01c10 100644 --- a/pub/api/v1/customers/companies/activate/index.php +++ b/pub/api/v1/customers/companies/activate/index.php @@ -4,7 +4,7 @@ use api\classes\API_companies; session_start(); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_companies.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_companies.php"; # Check permissions $API_companies = new API_companies(); diff --git a/pub/api/v1/portal-management/group-permissions/index.php b/pub/api/v1/portal-management/group-permissions/index.php index 6b52289..48555bc 100644 --- a/pub/api/v1/portal-management/group-permissions/index.php +++ b/pub/api/v1/portal-management/group-permissions/index.php @@ -4,8 +4,8 @@ use api\classes\API_permissions; use api\classes\API_usergroups; session_start(); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_permissions.php'; -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_usergroups.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_permissions.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_usergroups.php"; $API_permissions = new API_permissions(); $API_usergroups = new API_usergroups(); diff --git a/pub/api/v1/portal-management/mail/test/index.php b/pub/api/v1/portal-management/mail/test/index.php index a38d80d..3f0397c 100644 --- a/pub/api/v1/portal-management/mail/test/index.php +++ b/pub/api/v1/portal-management/mail/test/index.php @@ -4,8 +4,8 @@ use api\classes\API_mailsettings; use bin\php\Classes\mailBuilder; session_start(); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_mailsettings.php'; -require_once $_SERVER['DOCUMENT_ROOT'] . '/bin/php/Classes/mailBuilder.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_mailsettings.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Classes/mailBuilder.php"; $API_mailsettings = new API_mailsettings(); diff --git a/pub/api/v1/portal-management/modules/index.php b/pub/api/v1/portal-management/modules/index.php index be1a9a9..221be9b 100644 --- a/pub/api/v1/portal-management/modules/index.php +++ b/pub/api/v1/portal-management/modules/index.php @@ -3,7 +3,7 @@ use api\classes\API_system_modules; session_start(); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_system_modules.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_system_modules.php"; $API_system_modules = new API_system_modules(); diff --git a/pub/api/v1/portal-management/permissions/index.php b/pub/api/v1/portal-management/permissions/index.php index 3ffbc34..41181d5 100644 --- a/pub/api/v1/portal-management/permissions/index.php +++ b/pub/api/v1/portal-management/permissions/index.php @@ -4,7 +4,7 @@ use api\classes\API_permissions; session_start(); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_permissions.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_permissions.php"; $API_permissions = new API_permissions(); diff --git a/pub/api/v1/portal-management/sources/inserve/index.php b/pub/api/v1/portal-management/sources/inserve/index.php index 47d31f0..52c6c99 100644 --- a/pub/api/v1/portal-management/sources/inserve/index.php +++ b/pub/api/v1/portal-management/sources/inserve/index.php @@ -3,7 +3,7 @@ use api\classes\API_system_sources; session_start(); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_system_sources.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_system_sources.php"; $API_system_sources = new API_system_sources(); diff --git a/pub/api/v1/portal-management/user-groups/index.php b/pub/api/v1/portal-management/user-groups/index.php index 8402bbc..7338fd6 100644 --- a/pub/api/v1/portal-management/user-groups/index.php +++ b/pub/api/v1/portal-management/user-groups/index.php @@ -3,7 +3,7 @@ use api\classes\API_usergroups; session_start(); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_usergroups.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_usergroups.php"; $API_usergroups = new API_usergroups(); diff --git a/pub/api/v1/portal-management/users/index.php b/pub/api/v1/portal-management/users/index.php index 6152c9e..d9e45d4 100644 --- a/pub/api/v1/portal-management/users/index.php +++ b/pub/api/v1/portal-management/users/index.php @@ -3,7 +3,7 @@ use api\classes\API_users; session_start(); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_users.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_users.php"; $API_users = new API_users(); diff --git a/pub/api/v1/servers/index.php b/pub/api/v1/servers/index.php index 308b8db..b0feb7f 100644 --- a/pub/api/v1/servers/index.php +++ b/pub/api/v1/servers/index.php @@ -4,7 +4,7 @@ use api\classes\API_servers; session_start(); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_servers.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_servers.php"; $API_servers = new API_servers(); diff --git a/pub/api/v1/sources/inserve/index.php b/pub/api/v1/sources/inserve/index.php index 26c9a2e..92eb53a 100644 --- a/pub/api/v1/sources/inserve/index.php +++ b/pub/api/v1/sources/inserve/index.php @@ -4,7 +4,7 @@ use api\classes\API_inserve; session_start(); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_inserve.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_inserve.php"; $API_inserve = new API_inserve(); $API_inserve->setupConnection(); diff --git a/pub/api/v1/sources/inserve/sync-cloud-distributor/index.php b/pub/api/v1/sources/inserve/sync-cloud-distributor/index.php index 5370d16..eda868b 100644 --- a/pub/api/v1/sources/inserve/sync-cloud-distributor/index.php +++ b/pub/api/v1/sources/inserve/sync-cloud-distributor/index.php @@ -4,7 +4,7 @@ use api\classes\API_inserve; session_start(); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_inserve.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_inserve.php"; $API_inserve = new API_inserve(); diff --git a/pub/api/v1/sources/inserve/sync-companies/index.php b/pub/api/v1/sources/inserve/sync-companies/index.php index 295f0bd..3de0473 100644 --- a/pub/api/v1/sources/inserve/sync-companies/index.php +++ b/pub/api/v1/sources/inserve/sync-companies/index.php @@ -4,7 +4,7 @@ use api\classes\API_inserve; session_start(); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_inserve.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_inserve.php"; $API_inserve = new API_inserve(); $API_inserve->setupConnection(); @@ -20,7 +20,7 @@ if ($API_inserve->request_method === 'POST' || $API_inserve->request_method === do { $result = $API_inserve->companies($page); - if (!isset($result['data']) || empty($result['data'])) { + if (empty($result['data'])) { break; } diff --git a/pub/api/v1/sources/inserve/sync-server-licenses/index.php b/pub/api/v1/sources/inserve/sync-server-licenses/index.php index 2d37935..2216828 100644 --- a/pub/api/v1/sources/inserve/sync-server-licenses/index.php +++ b/pub/api/v1/sources/inserve/sync-server-licenses/index.php @@ -4,7 +4,7 @@ use api\classes\API_inserve; session_start(); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_inserve.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_inserve.php"; $API_inserve = new API_inserve(); diff --git a/pub/api/v1/sources/inserve/sync-server-subscriptions/index.php b/pub/api/v1/sources/inserve/sync-server-subscriptions/index.php index 24f9d40..bb22a37 100644 --- a/pub/api/v1/sources/inserve/sync-server-subscriptions/index.php +++ b/pub/api/v1/sources/inserve/sync-server-subscriptions/index.php @@ -4,7 +4,7 @@ use api\classes\API_inserve; session_start(); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_inserve.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_inserve.php"; $API_inserve = new API_inserve(); diff --git a/pub/api/v1/user/apitoken/index.php b/pub/api/v1/user/apitoken/index.php index 5b165c6..78868c2 100644 --- a/pub/api/v1/user/apitoken/index.php +++ b/pub/api/v1/user/apitoken/index.php @@ -5,7 +5,7 @@ use api\classes\API_users; session_start(); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_apitoken.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_apitoken.php"; $API_apitoken = new API_apitoken(); diff --git a/pub/api/v1/user/avatar/index.php b/pub/api/v1/user/avatar/index.php index f123825..d5b5839 100644 --- a/pub/api/v1/user/avatar/index.php +++ b/pub/api/v1/user/avatar/index.php @@ -4,8 +4,8 @@ use api\classes\API_usersavatar; session_start(); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_usersavatar.php'; -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/imageProcessor.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_usersavatar.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/imageProcessor.php"; $API_usersavatar = new API_usersavatar(); diff --git a/pub/api/v1/user/mfa/index.php b/pub/api/v1/user/mfa/index.php index 7059431..d06029e 100644 --- a/pub/api/v1/user/mfa/index.php +++ b/pub/api/v1/user/mfa/index.php @@ -1,8 +1,8 @@ 'Last modified date', 'last_update' => 'Last update', 'never' => 'Never', + 'invalid_data' => 'Invalid date', 'save' => 'Save', 'add_vendor' => 'Add vendor', 'edit_vendor' => 'Edit vendor', diff --git a/pub/bin/locales/nl.php b/pub/bin/locales/nl.php index 7e3dcaa..7f448bd 100644 --- a/pub/bin/locales/nl.php +++ b/pub/bin/locales/nl.php @@ -73,6 +73,7 @@ return [ 'last_modified_date' => 'Laatst gewijzigd datum', 'last_update' => 'Laatste update', 'never' => 'Nooit', + 'invalid_data' => 'Ongeldige datum', 'save' => 'Opslaan', 'add_vendor' => 'Vendor toevoegen', 'edit_vendor' => 'Vendor bewerken', diff --git a/pub/bin/pages/autop/pageDevices.php b/pub/bin/pages/autop/pageDevices.php index 1a53178..d339823 100644 --- a/pub/bin/pages/autop/pageDevices.php +++ b/pub/bin/pages/autop/pageDevices.php @@ -3,11 +3,11 @@ if (!defined('APP_INIT')) { exit; } if (isset($_GET['add'])) { - include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/pages/autop/pageDevices_add.php'); + require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/pages/autop/pageDevices_add.php"; } elseif (isset($_GET['edit'])) { - include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/pages/autop/pageDevices_edit.php'); + require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/pages/autop/pageDevices_edit.php"; } elseif (isset($_GET['view'])) { - include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/pages/autop/pageDevices_view.php'); + require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/pages/autop/pageDevices_view.php"; } else { - include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/pages/autop/pageDevices_list.php'); + require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/pages/autop/pageDevices_list.php"; } \ No newline at end of file diff --git a/pub/bin/pages/autop/pageDevices_add.php b/pub/bin/pages/autop/pageDevices_add.php index 83bdd6b..986331b 100644 --- a/pub/bin/pages/autop/pageDevices_add.php +++ b/pub/bin/pages/autop/pageDevices_add.php @@ -10,10 +10,10 @@ if (!defined('APP_INIT')) { # IDE Section # Includes Section -include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/php/Classes/pageNavbar.php'); -include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/php/Classes/formBuilder.php'); -include_once($_SERVER['DOCUMENT_ROOT'] . '/api/classes/API.php'); -include_once($_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_devices.php'); +require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Classes/pageNavbar.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Classes/formBuilder.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_devices.php"; # Check permissions $API = new API(); @@ -145,7 +145,7 @@ $formBuilder->startForm();
- preview + preview
@@ -235,7 +241,7 @@ $pageNavbar->outPutNavbar(); $device_extensions = array(); while ($row = $result->fetch_assoc()) { - array_push($device_extensions, $row['device_uuid']); + $device_extensions[] = $row['device_uuid']; } $stmt->close(); } @@ -252,7 +258,7 @@ $pageNavbar->outPutNavbar(); $result = $stmt->get_result(); while ($row = $result->fetch_assoc()) { - array_push($devicesLinked, $row); + $devicesLinked[] = $row; } $stmt->close(); } diff --git a/pub/bin/pages/autop/pagePlatforms.php b/pub/bin/pages/autop/pagePlatforms.php index e6706fa..bbee253 100644 --- a/pub/bin/pages/autop/pagePlatforms.php +++ b/pub/bin/pages/autop/pagePlatforms.php @@ -3,9 +3,9 @@ if (!defined('APP_INIT')) { exit; } if (isset($_GET['add'])) { - include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/pages/autop/pagePlatforms_add.php'); + require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/pages/autop/pagePlatforms_add.php"; } elseif (isset($_GET['edit'])) { - include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/pages/autop/pagePlatforms_edit.php'); + require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/pages/autop/pagePlatforms_edit.php"; } else { - include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/pages/autop/pagePlatforms_list.php'); + require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/pages/autop/pagePlatforms_list.php"; } \ No newline at end of file diff --git a/pub/bin/pages/autop/pagePlatforms_add.php b/pub/bin/pages/autop/pagePlatforms_add.php index 1bf30ea..9529804 100644 --- a/pub/bin/pages/autop/pagePlatforms_add.php +++ b/pub/bin/pages/autop/pagePlatforms_add.php @@ -1,14 +1,18 @@
- +
- +
diff --git a/pub/bin/pages/autop/pageVendors_list.php b/pub/bin/pages/autop/pageVendors_list.php index a7d9d4d..d801526 100644 --- a/pub/bin/pages/autop/pageVendors_list.php +++ b/pub/bin/pages/autop/pageVendors_list.php @@ -11,9 +11,9 @@ if (!defined('APP_INIT')) { // N/A # Includes Section -include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/php/Classes/pageNavbar.php'); -include_once($_SERVER['DOCUMENT_ROOT'] . '/api/classes/API.php'); -include_once($_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_vendors.php'); +require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Classes/pageNavbar.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_vendors.php"; # Check permissions $API = new API(); diff --git a/pub/bin/pages/customers/pageCompanies.php b/pub/bin/pages/customers/pageCompanies.php index 9598d01..486493e 100644 --- a/pub/bin/pages/customers/pageCompanies.php +++ b/pub/bin/pages/customers/pageCompanies.php @@ -9,7 +9,7 @@ if (!$GLOBALS['modules_enabled']['customers']) { } if (isset($_GET['view'])) { - include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/pages/customers/pageCompanies_company_view.php'); + require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/pages/customers/pageCompanies_company_view.php"; } else { - include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/pages/customers/pageCompanies_view.php'); + require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/pages/customers/pageCompanies_view.php"; } \ No newline at end of file diff --git a/pub/bin/pages/customers/pageCompanies_company_view.php b/pub/bin/pages/customers/pageCompanies_company_view.php index 9007a38..358ba13 100644 --- a/pub/bin/pages/customers/pageCompanies_company_view.php +++ b/pub/bin/pages/customers/pageCompanies_company_view.php @@ -15,9 +15,9 @@ if (!$GLOBALS['modules_enabled']['customers']) { # IDE Section # Includes Section -include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/php/Classes/pageNavbar.php'); -include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/php/Classes/serverOverviewBuilder.php'); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_servers.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Classes/pageNavbar.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Classes/serverOverviewBuilder.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_servers.php"; # Check permissions $API_servers = new API_servers(); diff --git a/pub/bin/pages/customers/pageCompanies_view.php b/pub/bin/pages/customers/pageCompanies_view.php index da6014c..09e0f02 100644 --- a/pub/bin/pages/customers/pageCompanies_view.php +++ b/pub/bin/pages/customers/pageCompanies_view.php @@ -12,8 +12,8 @@ if (!$GLOBALS['modules_enabled']['customers']) { # Includes Section use api\classes\API; -include_once($_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_permissions.php'); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_permissions.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API.php"; # Check permissions $API = new API(); diff --git a/pub/bin/pages/office/pageStompjes.php b/pub/bin/pages/office/pageStompjes.php index 41b262c..f50dffc 100644 --- a/pub/bin/pages/office/pageStompjes.php +++ b/pub/bin/pages/office/pageStompjes.php @@ -1,6 +1,6 @@ checkPermissions('office-stompjes', 'RO', true)) { echo 'error 401 unauthorized'; exit; @@ -35,7 +34,6 @@ $jsScriptLoadData['datepicker'] = true; # PageClasses Setup - # Retrieve Information for the page $stmt = $GLOBALS['conn']->query("SELECT user_uuid, user_full_name, user_first_name, user_profile_picture_thumbnail, user_stompable, user_email FROM system_users WHERE user_stompable = '1'"); $administrators = []; @@ -50,6 +48,7 @@ if (!isset($_GET['fd'])) { $date = str_replace('/', '-', htmlspecialchars($_GET['fd'], ENT_QUOTES, 'UTF-8')); $SelectFromDate = strtotime($date . ' 00:00:00'); } + if (!isset($_GET['td'])) { $SelectTillDate = time(); } else { @@ -72,24 +71,22 @@ foreach ($stompjes as $stompje) {
-
- +
+
:
+
- +
:
+
diff --git a/pub/bin/pages/pageDashboard.php b/pub/bin/pages/pageDashboard.php index da0fc26..1fe0e53 100644 --- a/pub/bin/pages/pageDashboard.php +++ b/pub/bin/pages/pageDashboard.php @@ -8,10 +8,10 @@ if (!defined('APP_INIT')) { # Includes Section use api\classes\API; -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API.php"; $API = new API(); -function showCard($module_name, $page_name, $width = 3) +function showCard($module_name, $page_name): void { $page = $GLOBALS['pages'][$module_name][$page_name]; ?> @@ -40,11 +40,11 @@ function showCard($module_name, $page_name, $width = 3)
checkPermissions('customer-companies', 'RO', true)) { - showCard('customers', 'companies', '6'); + showCard('customers', 'companies'); } if ($GLOBALS['modules_enabled']['servers'] && $API->checkPermissions('servers', 'RO', true)) { - showCard('servers', 'server_overview', '6'); + showCard('servers', 'server_overview'); } if ($GLOBALS['modules_enabled']['office'] && $API->checkPermissions('office-stompjes', 'RO', true)) { diff --git a/pub/bin/pages/pageUserProfile.php b/pub/bin/pages/pageUserProfile.php index 7af3b85..339851b 100644 --- a/pub/bin/pages/pageUserProfile.php +++ b/pub/bin/pages/pageUserProfile.php @@ -3,7 +3,7 @@ if (!defined('APP_INIT')) { exit; } if (isset($_GET['edit'])) { - include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/pages/pageUserProfile_edit.php'); + require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/pages/pageUserProfile_edit.php"; } else { - include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/pages/pageUserProfile_view.php'); + require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/pages/pageUserProfile_view.php"; } diff --git a/pub/bin/pages/pageUserProfile_edit.php b/pub/bin/pages/pageUserProfile_edit.php index 0391dd6..2dcfbef 100644 --- a/pub/bin/pages/pageUserProfile_edit.php +++ b/pub/bin/pages/pageUserProfile_edit.php @@ -9,8 +9,8 @@ if (!defined('APP_INIT')) { # IDE Section # Includes Section -include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/php/Classes/pageNavbar.php'); -include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/php/Classes/formBuilder.php'); +require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Classes/pageNavbar.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Classes/formBuilder.php"; # Page functions # JS Scripts to load for this page @@ -29,7 +29,7 @@ $user_groups_data = $GLOBALS['conn']->query("SELECT * FROM system_user_groups WH $user_groups = array(); $user_data = false; while ($user_group = $user_groups_data->fetch_assoc()) { - array_push($user_groups, $user_group); + $user_groups[] = $user_group; $last_weight = $user_group['user_group_weight']; } @@ -60,7 +60,7 @@ if ($user_data) {
- +
diff --git a/pub/bin/pages/pageUserProfile_view.php b/pub/bin/pages/pageUserProfile_view.php index 9a06205..d8ea5d0 100644 --- a/pub/bin/pages/pageUserProfile_view.php +++ b/pub/bin/pages/pageUserProfile_view.php @@ -9,8 +9,8 @@ if (!defined('APP_INIT')) { # IDE Section # Includes Section -include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/php/Classes/pageNavbar.php'); -include_once($_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_apitoken.php'); +require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Classes/pageNavbar.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_apitoken.php"; # Check permissions @@ -31,7 +31,7 @@ $user_groups_data = $GLOBALS['conn']->query("SELECT * FROM system_user_groups WH $user_groups = array(); $admin_data = false; while ($user_group = $user_groups_data->fetch_assoc()) { - array_push($user_groups, $user_group); + $user_groups[] = $user_group; $last_weight = $user_group['user_group_weight']; } @@ -59,7 +59,7 @@ if (isset($_SESSION['tmp_api_token'])) { if ($API_token->checkPermissions('admin-access-admins', 'RW', true)) { $pageNavbar->AddHTMLButton(' ' . __('edit') . ''); -}; +} # Set breadcrumb data @@ -242,7 +242,7 @@ if ($user_data) { ?>

User history

- To be made. Its going show the history of the user. + To be made. It's going show the history of the user.
@@ -316,7 +316,7 @@ if ($user_data) { ?> checkPermissions('user-apitoken-self', 'RW', true)) { ?> diff --git a/pub/bin/pages/portal-management/pageAccessControl_admin_add.php b/pub/bin/pages/portal-management/pageAccessControl_admin_add.php index 0571911..6b040f1 100644 --- a/pub/bin/pages/portal-management/pageAccessControl_admin_add.php +++ b/pub/bin/pages/portal-management/pageAccessControl_admin_add.php @@ -9,11 +9,10 @@ if (!defined('APP_INIT')) { } # IDE Section - # Includes Section -include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/php/Classes/formBuilder.php'); -include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/php/Classes/pageNavbar.php'); -include_once($_SERVER['DOCUMENT_ROOT'] . '/api/classes/API.php'); +require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Classes/formBuilder.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Classes/pageNavbar.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API.php"; # Check permissions $API = new API(); @@ -41,7 +40,7 @@ $formBuilder = new formBuilder('add_admin', '', '/acc $user_groups_data = $GLOBALS['conn']->query("SELECT * FROM system_user_groups WHERE user_group_type = 'admin' ORDER BY user_group_weight DESC"); $user_groups = array(); while ($user_group = $user_groups_data->fetch_assoc()) { - array_push($user_groups, $user_group); + $user_groups[] = $user_group; $last_weight = $user_group['user_group_weight']; } @@ -78,7 +77,7 @@ $formBuilder->startForm();
- +
diff --git a/pub/bin/pages/portal-management/pageAccessControl_admin_edit.php b/pub/bin/pages/portal-management/pageAccessControl_admin_edit.php index fcf514b..ba815c5 100644 --- a/pub/bin/pages/portal-management/pageAccessControl_admin_edit.php +++ b/pub/bin/pages/portal-management/pageAccessControl_admin_edit.php @@ -10,9 +10,9 @@ if (!defined('APP_INIT')) { # IDE Section # Includes Section -include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/php/Classes/formBuilder.php'); -include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/php/Classes/pageNavbar.php'); -include_once($_SERVER['DOCUMENT_ROOT'] . '/api/classes/API.php'); +require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Classes/formBuilder.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Classes/pageNavbar.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API.php"; # Check permissions $API = new API(); @@ -38,7 +38,7 @@ $user_groups_data = $GLOBALS['conn']->query("SELECT * FROM system_user_groups WH $user_groups = array(); $admin_data = false; while ($user_group = $user_groups_data->fetch_assoc()) { - array_push($user_groups, $user_group); + $user_groups[] = $user_group; $last_weight = $user_group['user_group_weight']; } @@ -82,7 +82,7 @@ if ($admin_data) {
- +
diff --git a/pub/bin/pages/portal-management/pageAccessControl_admin_view.php b/pub/bin/pages/portal-management/pageAccessControl_admin_view.php index dbdb57a..c036ba3 100644 --- a/pub/bin/pages/portal-management/pageAccessControl_admin_view.php +++ b/pub/bin/pages/portal-management/pageAccessControl_admin_view.php @@ -10,8 +10,8 @@ if (!defined('APP_INIT')) { # IDE Section # Includes Section -include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/php/Classes/pageNavbar.php'); -include_once($_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_apitoken.php'); +require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Classes/pageNavbar.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_apitoken.php"; # Check permissions $API = new API(); @@ -45,7 +45,7 @@ $user_groups_data = $GLOBALS['conn']->query("SELECT * FROM system_user_groups WH $user_groups = array(); $admin_data = false; while ($user_group = $user_groups_data->fetch_assoc()) { - array_push($user_groups, $user_group); + $user_groups[] = $user_group; $last_weight = $user_group['user_group_weight']; } @@ -63,7 +63,7 @@ $_GET['user_uuid'] = $user_uuid; $userHashigherGroupWeight = false; if ($admin_data['user_group_weight'] > $_SESSION['user']['user_group_weight']) { $userHashigherGroupWeight = true; -}; +} $API_token = new API_apitoken(); $requiredFields = ['user_uuid' => ['type' => 'uuid']]; @@ -237,15 +237,16 @@ if ($admin_data) { ?>
- - checkPermissions('admin-access-admins-resetpassword', 'RW', true)) { ?> + checkPermissions('admin-access-admins-resetpassword', 'RW', true)) { ?>
- +
+ reset the verified email (to be made)
@@ -304,7 +305,7 @@ if ($admin_data) { ?> checkPermissions('user-apitoken-others', 'RW', true)) { ?> @@ -329,7 +330,7 @@ if ($admin_data) { ?>

User history

- To be made. Its going show the history of the administrator. + To be made. It's going show the history of the administrator.
diff --git a/pub/bin/pages/portal-management/pageAccessControl_permission_add.php b/pub/bin/pages/portal-management/pageAccessControl_permission_add.php index 3f0c7f4..be2e727 100644 --- a/pub/bin/pages/portal-management/pageAccessControl_permission_add.php +++ b/pub/bin/pages/portal-management/pageAccessControl_permission_add.php @@ -10,9 +10,9 @@ if (!defined('APP_INIT')) { # IDE Section # Includes Section -include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/php/Classes/formBuilder.php'); -include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/php/Classes/pageNavbar.php'); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Classes/formBuilder.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Classes/pageNavbar.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API.php"; # Check permissions $API = new API(); @@ -36,7 +36,7 @@ $formBuilder = new formBuilder('add_permission', '', $system_modules_data = $GLOBALS['conn']->query("SELECT * FROM system_modules WHERE module_enabled = 1"); $system_modules = array(); while ($module = $system_modules_data->fetch_assoc()) { - array_push($system_modules, $module); + $system_modules[] = $module; } diff --git a/pub/bin/pages/portal-management/pageAccessControl_permission_edit.php b/pub/bin/pages/portal-management/pageAccessControl_permission_edit.php index 95940ba..a95dc73 100644 --- a/pub/bin/pages/portal-management/pageAccessControl_permission_edit.php +++ b/pub/bin/pages/portal-management/pageAccessControl_permission_edit.php @@ -11,10 +11,10 @@ if (!defined('APP_INIT')) { # IDE Section # Includes Section -include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/php/Classes/formBuilder.php'); -include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/php/Classes/pageNavbar.php'); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API.php'; -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_permissions.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Classes/formBuilder.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Classes/pageNavbar.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_permissions.php"; # Check permissions $API = new API(); @@ -47,7 +47,7 @@ $permission_data = $API_permissions->getPermission()[0]; $system_modules_data = $GLOBALS['conn']->query("SELECT * FROM system_modules WHERE module_enabled = 1"); $system_modules = array(); while ($module = $system_modules_data->fetch_assoc()) { - array_push($system_modules, $module); + $system_modules[] = $module; } # Set breadcrumb data diff --git a/pub/bin/pages/portal-management/pageAccessControl_permission_view.php b/pub/bin/pages/portal-management/pageAccessControl_permission_view.php index c7b2ba6..300afa6 100644 --- a/pub/bin/pages/portal-management/pageAccessControl_permission_view.php +++ b/pub/bin/pages/portal-management/pageAccessControl_permission_view.php @@ -10,9 +10,9 @@ if (!defined('APP_INIT')) { # IDE Section # Includes Section -include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/php/Classes/pageNavbar.php'); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API.php'; -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_permissions.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Classes/pageNavbar.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_permissions.php"; # Check permissions $API = new API(); @@ -125,21 +125,21 @@ if ($permission_data) { ?> diff --git a/pub/bin/pages/portal-management/pageAccessControl_user_group_add.php b/pub/bin/pages/portal-management/pageAccessControl_user_group_add.php index 260011c..15046de 100644 --- a/pub/bin/pages/portal-management/pageAccessControl_user_group_add.php +++ b/pub/bin/pages/portal-management/pageAccessControl_user_group_add.php @@ -10,9 +10,9 @@ if (!defined('APP_INIT')) { # IDE Section # Includes Section -include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/php/Classes/formBuilder.php'); -include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/php/Classes/pageNavbar.php'); -require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API.php'; +require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Classes/formBuilder.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Classes/pageNavbar.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API.php"; # Check permissions $API = new API(); @@ -36,7 +36,7 @@ $formBuilder = new formBuilder('add_user_groups', '', $user_groups_data = $GLOBALS['conn']->query("SELECT * FROM system_user_groups ORDER BY user_group_weight ASC"); $user_groups = array(); while ($user_group = $user_groups_data->fetch_assoc()) { - array_push($user_groups, $user_group); + $user_groups[] = $user_group; $last_weight = $user_group['user_group_weight']; } @@ -80,7 +80,9 @@ $formBuilder->startForm();
- +
diff --git a/pub/bin/pages/portal-management/pageAccessControl_user_group_edit.php b/pub/bin/pages/portal-management/pageAccessControl_user_group_edit.php index 29e4862..c8d684a 100644 --- a/pub/bin/pages/portal-management/pageAccessControl_user_group_edit.php +++ b/pub/bin/pages/portal-management/pageAccessControl_user_group_edit.php @@ -11,10 +11,10 @@ if (!defined('APP_INIT')) { # IDE Section # Includes Section -include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/php/Classes/formBuilder.php'); -include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/php/Classes/pageNavbar.php'); -include_once($_SERVER['DOCUMENT_ROOT'] . '/api/classes/API.php'); -include_once($_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_usergroups.php'); +require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Classes/formBuilder.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Classes/pageNavbar.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_usergroups.php"; # Check permissions $API = new API(); @@ -87,7 +87,9 @@ $formBuilder->startForm();
- +
diff --git a/pub/bin/pages/portal-management/pageAccessControl_user_group_view.php b/pub/bin/pages/portal-management/pageAccessControl_user_group_view.php index f165198..9192a91 100644 --- a/pub/bin/pages/portal-management/pageAccessControl_user_group_view.php +++ b/pub/bin/pages/portal-management/pageAccessControl_user_group_view.php @@ -9,8 +9,8 @@ if (!defined('APP_INIT')) { # IDE Section # Includes Section -include_once($_SERVER['DOCUMENT_ROOT'] . '/bin/php/Classes/pageNavbar.php'); -include_once($_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_usergroups.php'); +require_once "{$_SERVER['DOCUMENT_ROOT']}/bin/php/Classes/pageNavbar.php"; +require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API_usergroups.php"; # Check permissions $API = new API_usergroups(); @@ -145,42 +145,42 @@ $pageNavbar->outPutNavbar(); -