Jingga/oms-OnlineResourceWatcher
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-OnlineResourceWatcher.git synced 2026-01-11 07:58:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

code fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-03-15 20:24:38 +00:00
parent 094aa4ad30
commit a72fb93533
4 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Controller/ApiController.php
View File

@ -262,12 +262,13 @@ final class ApiController extends Controller
->execute();
$ids = \array_map(
function (Report $report) : void {
$report->resource;
function (Report $report) : int {
return $report->resource;
},
$reports
);
/** @var Resource[] $resources */
$resources = ResourceMapper::getAll()
->with('owner')
->with('owner/l11n')
@ -333,10 +334,10 @@ final class ApiController extends Controller
$mail->template = \array_merge(
$mail->template,
[
'{resource.id}' => $resource->id,
'{email}' => $inform->email,
'{resource.id}' => (string) $resource->id,
'{email}' => $inform->email,
'{resource.url}' => $resource->uri,
'{owner_email}' => $resource->owner->getEmail(),
'{owner_email}' => $resource->owner->getEmail(),
]
);
@ -612,23 +613,24 @@ final class ApiController extends Controller
$contentNew = \Modules\Media\Controller\ApiController::loadFileContent($newPath, $extension, 'txt', ['path' => $resource->xpath]);
$contentOld = \preg_replace('/(\ {2,}|\t)/', ' ', $contentOld);
$contentOld = \preg_replace('/(\s{2,})/', "\n", $contentOld);
$contentOld = \preg_replace('/(\s{2,})/', "\n", $contentOld ?? '');
$contentNew = \preg_replace('/(\ {2,}|\t)/', ' ', $contentNew);
$contentNew = \preg_replace('/(\s{2,})/', "\n", $contentNew);
$contentNew = \preg_replace('/(\s{2,})/', "\n", $contentNew ?? '');
// Calculate difference index
$difference = \levenshtein($contentOld, $contentNew);
$difference = 1;
if ($contentNew !== null && $contentOld !== null) {
// Calculate difference index
$difference = \levenshtein($contentOld, $contentNew);
}
$diffPath = \dirname($newPath) . '/_' . \basename($newPath);
var_dump($diffPath);
\file_put_contents(
$diffPath,
\phpOMS\Utils\StringUtils::createDiffMarkup(
$contentOld,
$contentNew,
$contentOld ?? '',
$contentNew ?? '',
' '
)
);

2
Theme/Backend/Lang/de.lang.php
View File

@ -24,7 +24,7 @@ return ['OnlineResourceWatcher' => [
'BillingSettings' => 'Billing Settings',
'Bills' => 'Bills',
'By' => 'By',
'Difference' => 'Unterschiede',
'Difference' => 'Unterschiede',
'Cancel' => 'Cancel',
'Checked' => 'Checked',
'City' => 'City',

2
Theme/Backend/Lang/en.lang.php
View File

@ -24,7 +24,7 @@ return ['OnlineResourceWatcher' => [
'BillingSettings' => 'Billing Settings',
'Bills' => 'Bills',
'By' => 'By',
'Difference' => 'Difference',
'Difference' => 'Difference',
'Cancel' => 'Cancel',
'Checked' => 'Checked',
'City' => 'City',

4
Theme/Backend/resource-comparison-inline.tpl.php
View File

@ -69,7 +69,7 @@ use phpOMS\Uri\UriFactory;
}
} else {
$oldWebPath = '../../../../Web/Backend/img/404.svg';
$type = 'img';
$type = 'img';
}
}
@ -112,7 +112,7 @@ use phpOMS\Uri\UriFactory;
}
}
$base = __DIR__ . '/../../../../';
$base = __DIR__ . '/../../../../';
$newDiffPath = '';
if ($type === 'pdf') {