Jingga/oms-OnlineResourceWatcher
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-OnlineResourceWatcher.git synced 2026-02-15 23:48:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Quick backup before crash

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-06-13 18:55:51 +00:00
parent b286b5df03
commit 8295acd65d
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Controller/ApiController.php
View File

@ -220,7 +220,9 @@ final class ApiController extends Controller
/** /**
* Inform users about changed resources * Inform users about changed resources
* *
* @param mixed $var Generic variable * @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
* *
* @return void * @return void
* *
@ -231,6 +233,7 @@ final class ApiController extends Controller
$dateTime = new \DateTime('now'); $dateTime = new \DateTime('now');
$dateTime = $dateTime->modify('-1 hour'); $dateTime = $dateTime->modify('-1 hour');
/** @var \Modules\OnlineResourceWatcher\Models\Report[] $reports */
$reports = ReportMapper::getAll() $reports = ReportMapper::getAll()
->where('status', ReportStatus::CHANGE) ->where('status', ReportStatus::CHANGE)
->where('createdAt', $dateTime, '>=') ->where('createdAt', $dateTime, '>=')
@ -246,7 +249,9 @@ final class ApiController extends Controller
/** /**
* Checks resources for changes * Checks resources for changes
* *
* @param mixed $var Generic variable * @param RequestAbstract $request Request
* @param array $resources Resources to check
* @param mixed $data Generic data
* *
* @return array * @return array
* *
@ -292,11 +297,13 @@ final class ApiController extends Controller
$handler = $this->app->moduleManager->get('Admin', 'Api')->setUpServerMailHandler(); $handler = $this->app->moduleManager->get('Admin', 'Api')->setUpServerMailHandler();
/** @var \Model\Setting $emailSettings */
$emailSettings = $this->app->appSettings->get( $emailSettings = $this->app->appSettings->get(
names: SettingsEnum::MAIL_SERVER_ADDR, names: SettingsEnum::MAIL_SERVER_ADDR,
module: 'OnlineResourceWatcher' module: 'OnlineResourceWatcher'
); );
/** @var \Model\Setting $templateSettings */
$templateSettings = $this->app->appSettings->get( $templateSettings = $this->app->appSettings->get(
names: OrwSettingsEnum::ORW_CHANGE_MAIL_TEMPLATE, names: OrwSettingsEnum::ORW_CHANGE_MAIL_TEMPLATE,
module: 'OnlineResourceWatcher' module: 'OnlineResourceWatcher'
@ -367,6 +374,7 @@ final class ApiController extends Controller
$extension = ''; $extension = '';
$fileName = ''; $fileName = '';
$hasHtml = false;
if (\in_array('index.htm', $filesNew) if (\in_array('index.htm', $filesNew)
|| ($hasHtml = \in_array('index.html', $filesNew)) || ($hasHtml = \in_array('index.html', $filesNew))
) { ) {
@ -379,7 +387,7 @@ final class ApiController extends Controller
$toCheck[$index]['handled'] = true; $toCheck[$index]['handled'] = true;
} else { } else {
foreach ($filesNew as $file) { foreach ($filesNew as $file) {
if ($file === '..' || $file = '.') { if ($file === '..' || $file === '.') {
continue; continue;
} }
@ -426,8 +434,6 @@ final class ApiController extends Controller
\escapeshellarg($resource->uri) . ' ' . \escapeshellarg($basePath . '/' . $resource->id . '/' . $check['timestamp'] . '/index.jpg'), \escapeshellarg($resource->uri) . ' ' . \escapeshellarg($basePath . '/' . $resource->id . '/' . $check['timestamp'] . '/index.jpg'),
true true
); );
\var_dump('wkhtmltoimage ' . \escapeshellarg($resource->uri) . ' ' . \escapeshellarg($basePath . '/' . $resource->id . '/' . $check['timestamp'] . '/index.jpg'));
} catch (\Throwable $t) { } catch (\Throwable $t) {
$this->app->logger->error($t->getMessage()); $this->app->logger->error($t->getMessage());
} }
@ -495,16 +501,20 @@ final class ApiController extends Controller
$elementsNew = $xpathNew->query($resource->path); $elementsNew = $xpathNew->query($resource->path);
$subcontentOld = ''; $subcontentOld = '';
foreach ($elementsOld as $node) { if ($elementsOld !== false) {
foreach ($node->childNodes as $child) { foreach ($elementsOld as $node) {
$subcontentOld .= $xmlOld->saveXML($child); foreach ($node->childNodes as $child) {
$subcontentOld .= $xmlOld->saveXML($child);
}
} }
} }
$subcontentNew = ''; $subcontentNew = '';
foreach ($elementsNew as $node) { if ($elementsNew !== false) {
foreach ($node->childNodes as $child) { foreach ($elementsNew as $node) {
$subcontentNew .= $xmlNew->saveXML($child); foreach ($node->childNodes as $child) {
$subcontentNew .= $xmlNew->saveXML($child);
}
} }
} }