Skip to content

Change to Manager #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
katgirl wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Change to Manager #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a07f5b7
Create FUNDING.yml
cliffparnitzky Mar 11, 2021
119df19
Change to Contao-Manager
Aug 20, 2021
d832066
Update MonitoringScanClientWorker.php
katgirl Sep 21, 2021
8ab753e
Update MonitoringScanClientWorker.php
katgirl Sep 21, 2021
1bfb09b
Update MonitoringScanClientWorker.php
katgirl Sep 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/FUNDING.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github: cliffparnitzky
51 changes: 48 additions & 3 deletions system/modules/MonitoringScanClientWorker/classes/MonitoringScanClientWorker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,54 @@ private function scanClientWorkOffMonitoringEntry($objMonitoringEntry)
if ($objMonitoringEntry != null && !$objMonitoringEntry->disable && $objMonitoringEntry->client_scan_active)
{
$monitoringScanClient = new \MonitoringScanClient();
$response = $monitoringScanClient->scanClient($objMonitoringEntry->client_url, $objMonitoringEntry->client_token);
$response = [];
$response_contao = $monitoringScanClient->scanClient($objMonitoringEntry->website, '/api/server/contao' ,$objMonitoringEntry->client_token);

if( is_array($response_contao) && !array_key_exists('monitoring.server.agent', $response_contao) ) {

foreach($response_contao as $responseKey=>$responseValue)
{
$response['contao.' . $responseKey ] = $responseValue;
}

$response_server = $monitoringScanClient->scanClient($objMonitoringEntry->website, '/api/server/self-update' ,$objMonitoringEntry->client_token);
if (is_array($response_server))
{
foreach($response_server as $responseKey=>$responseValue)
{
$response['contao_manager.' . $responseKey ] = $responseValue;
}
}
else
{
\Message::addError($response_server);
}

$response_config = $monitoringScanClient->scanClient($objMonitoringEntry->website, '/api/server/config' ,$objMonitoringEntry->client_token);
if (is_array($response_config))
{
foreach($response_config as $responseKey=>$responseValue)
{
$response['server.' . $responseKey ] = $responseValue;
}
}
else
{
\Message::addError($response_config);
}
}
elseif (is_array($response_contao) && array_key_exists('monitoring.server.agent', $response_contao))
{
foreach($response_contao as $responseKey=>$responseValue)
{
$response[$responseKey] = $responseValue;
}
}
else
{
\Message::addError($response_contao);
}

if (is_array($response))
{
if (isset($GLOBALS['TL_HOOKS']['monitoringScanClientWork']) && is_array($GLOBALS['TL_HOOKS']['monitoringScanClientWork']))
Expand Down Expand Up @@ -159,5 +206,3 @@ private function logDebugMsg($msg, $origin)
}
}
}

?>