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

phpcs autofixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-28 12:19:03 +00:00
parent cfee20a379
commit dbe3a122e4
13 changed files with 204 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Admin/Install/Messages.php
View File

@ -49,10 +49,10 @@ class Messages
$settings = [ $settings = [
[ [
'id' => null, 'id' => null,
'name' => SettingsEnum::LOGIN_MAIL_REGISTRATION_TEMPLATE, 'name' => SettingsEnum::LOGIN_MAIL_REGISTRATION_TEMPLATE,
'content' => (string) $messages['email_template'][0]['id'], 'content' => (string) $messages['email_template'][0]['id'],
'module' => 'OnlineResourceWatcher', 'module' => 'OnlineResourceWatcher',
], ],
]; ];

4
Admin/Installer.php
View File

@ -49,7 +49,7 @@ final class Installer extends InstallerAbstract
'Directory /var/www is not writable. Please allow the apache user (www-data) to write to this directory.' 'Directory /var/www is not writable. Please allow the apache user (www-data) to write to this directory.'
); );
var_dump('NOT WRITABLE'); \var_dump('NOT WRITABLE');
return; return;
} }
@ -57,7 +57,7 @@ final class Installer extends InstallerAbstract
parent::install($app, $info, $cfgHandler); parent::install($app, $info, $cfgHandler);
if (!\is_dir(__DIR__ . '/../Files')) { if (!\is_dir(__DIR__ . '/../Files')) {
mkdir(__DIR__ . '/../Files'); \mkdir(__DIR__ . '/../Files');
} }
} }
} }

5
Admin/Routes/Cli.php
View File

@ -15,7 +15,6 @@ declare(strict_types=1);
use Modules\OnlineResourceWatcher\Controller\ApiController; use Modules\OnlineResourceWatcher\Controller\ApiController;
use Modules\OnlineResourceWatcher\Models\PermissionCategory; use Modules\OnlineResourceWatcher\Models\PermissionCategory;
use phpOMS\Account\PermissionType; use phpOMS\Account\PermissionType;
use phpOMS\Router\RouteVerb;
return [ return [
'^.*/orw/check -i all*$' => [ '^.*/orw/check -i all*$' => [
@ -27,5 +26,5 @@ return [
'state' => PermissionCategory::RESOURCE, 'state' => PermissionCategory::RESOURCE,
], ],
], ],
] ],
]; ];

52
Controller/ApiController.php
View File

@ -15,7 +15,10 @@ declare(strict_types=1);
namespace Modules\OnlineResourceWatcher\Controller; namespace Modules\OnlineResourceWatcher\Controller;
use Modules\Admin\Models\NullAccount; use Modules\Admin\Models\NullAccount;
use Modules\Admin\Models\SettingsEnum;
use Modules\Messages\Models\EmailMapper;
use Modules\OnlineResourceWatcher\Models\Inform; use Modules\OnlineResourceWatcher\Models\Inform;
use Modules\OnlineResourceWatcher\Models\InformBlacklistMapper;
use Modules\OnlineResourceWatcher\Models\InformMapper; use Modules\OnlineResourceWatcher\Models\InformMapper;
use Modules\OnlineResourceWatcher\Models\Report; use Modules\OnlineResourceWatcher\Models\Report;
use Modules\OnlineResourceWatcher\Models\ReportMapper; use Modules\OnlineResourceWatcher\Models\ReportMapper;
@ -23,6 +26,7 @@ use Modules\OnlineResourceWatcher\Models\ReportStatus;
use Modules\OnlineResourceWatcher\Models\Resource; use Modules\OnlineResourceWatcher\Models\Resource;
use Modules\OnlineResourceWatcher\Models\ResourceMapper; use Modules\OnlineResourceWatcher\Models\ResourceMapper;
use Modules\OnlineResourceWatcher\Models\ResourceStatus; use Modules\OnlineResourceWatcher\Models\ResourceStatus;
use Modules\OnlineResourceWatcher\Models\SettingsEnum as OrwSettingsEnum;
use phpOMS\Message\Http\HttpRequest; use phpOMS\Message\Http\HttpRequest;
use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Message\NotificationLevel; use phpOMS\Message\NotificationLevel;
@ -30,14 +34,10 @@ use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
use phpOMS\Model\Message\FormValidation; use phpOMS\Model\Message\FormValidation;
use phpOMS\System\File\Local\Directory; use phpOMS\System\File\Local\Directory;
use phpOMS\System\SystemUtils;
use phpOMS\Utils\StringUtils;
use Modules\Admin\Models\SettingsEnum;
use Modules\OnlineResourceWatcher\Models\SettingsEnum as OrwSettingsEnum;
use Modules\Messages\Models\EmailMapper;
use Modules\OnlineResourceWatcher\Models\InformBlacklistMapper;
use phpOMS\System\OperatingSystem; use phpOMS\System\OperatingSystem;
use phpOMS\System\SystemType; use phpOMS\System\SystemType;
use phpOMS\System\SystemUtils;
use phpOMS\Utils\StringUtils;
/** /**
* OnlineResourceWatcher controller class. * OnlineResourceWatcher controller class.
@ -69,7 +69,7 @@ final class ApiController extends Controller
->where('id', (int) $request->getData('id')) ->where('id', (int) $request->getData('id'))
->execute(); ->execute();
$path = ''; $path = '';
$basePath = __DIR__ . '/../Files/' . $resource->path . '/' . $resource->lastVersionPath; $basePath = __DIR__ . '/../Files/' . $resource->path . '/' . $resource->lastVersionPath;
if (\is_file($basePath . '/index.htm')) { if (\is_file($basePath . '/index.htm')) {
@ -268,11 +268,11 @@ final class ApiController extends Controller
$path .= 'temp/' . $resource->id . '/' . $timestamp; $path .= 'temp/' . $resource->id . '/' . $timestamp;
$toCheck[] = [ $toCheck[] = [
'resource' => $resource, 'resource' => $resource,
'timestamp' => $timestamp, 'timestamp' => $timestamp,
'path' => $path, 'path' => $path,
'handled' => false, 'handled' => false,
'loop' => 0, 'loop' => 0,
]; ];
try { try {
@ -333,7 +333,7 @@ final class ApiController extends Controller
$report->status = ReportStatus::DOWNLOAD_ERROR; $report->status = ReportStatus::DOWNLOAD_ERROR;
$this->createModel($request->header->account, $report, ReportMapper::class, 'report', $request->getOrigin()); $this->createModel($request->header->account, $report, ReportMapper::class, 'report', $request->getOrigin());
$old = clone $resource; $old = clone $resource;
$resource->checkedAt = $report->createdAt; $resource->checkedAt = $report->createdAt;
$this->updateModel($request->header->account, $old, $resource, ResourceMapper::class, 'resource', $request->getOrigin()); $this->updateModel($request->header->account, $old, $resource, ResourceMapper::class, 'resource', $request->getOrigin());
@ -370,8 +370,8 @@ final class ApiController extends Controller
\rename($path . '/index.html', $path . '/index.htm'); \rename($path . '/index.html', $path . '/index.htm');
} }
$extension = 'htm'; $extension = 'htm';
$fileName = 'index.htm'; $fileName = 'index.htm';
$toCheck[$index]['handled'] = true; $toCheck[$index]['handled'] = true;
} else { } else {
foreach ($filesNew as $file) { foreach ($filesNew as $file) {
@ -387,8 +387,8 @@ final class ApiController extends Controller
|| StringUtils::endsWith($file, '.md') || StringUtils::endsWith($file, '.md')
|| StringUtils::endsWith($file, '.txt') || StringUtils::endsWith($file, '.txt')
) { ) {
$fileName = $file; $fileName = $file;
$extension = \substr($file, \strripos($file, '.') + 1); $extension = \substr($file, \strripos($file, '.') + 1);
$toCheck[$index]['handled'] = true; $toCheck[$index]['handled'] = true;
break; break;
@ -411,7 +411,7 @@ final class ApiController extends Controller
} }
$this->createModel($request->header->account, $report, ReportMapper::class, 'report', $request->getOrigin()); $this->createModel($request->header->account, $report, ReportMapper::class, 'report', $request->getOrigin());
$old = clone $resource; $old = clone $resource;
$resource->path = (string) $resource->id; $resource->path = (string) $resource->id;
$resource->lastVersionPath = (string) $check['timestamp']; $resource->lastVersionPath = (string) $check['timestamp'];
$resource->lastVersionDate = $report->createdAt; $resource->lastVersionDate = $report->createdAt;
@ -454,8 +454,8 @@ final class ApiController extends Controller
} }
} }
$lastVersionPath = $basePath . '/' . $id . '/' . $lastVersionTimestamp; $lastVersionPath = $basePath . '/' . $id . '/' . $lastVersionTimestamp;
$oldPath = $lastVersionPath . '/' . $fileName; $oldPath = $lastVersionPath . '/' . $fileName;
$newPath = $path . '/' . $fileName; $newPath = $path . '/' . $fileName;
if (!\is_file($newPath) || !$toCheck[$index]['handled']) { if (!\is_file($newPath) || !$toCheck[$index]['handled']) {
@ -552,8 +552,8 @@ final class ApiController extends Controller
} }
// @todo: move to informUsers function // @todo: move to informUsers function
$owner = new Inform(); $owner = new Inform();
$owner->email = $resource->owner->getEmail(); $owner->email = $resource->owner->getEmail();
$resource->inform[] = $owner; $resource->inform[] = $owner;
foreach ($resource->inform as $inform) { foreach ($resource->inform as $inform) {
@ -588,7 +588,7 @@ final class ApiController extends Controller
$resource->id, $resource->id,
$inform->email, $inform->email,
$resource->uri, $resource->uri,
$resource->owner->getEmail() $resource->owner->getEmail(),
], ],
$mailL11n->body $mailL11n->body
); );
@ -605,7 +605,7 @@ final class ApiController extends Controller
$resource->id, $resource->id,
$inform->email, $inform->email,
$resource->uri, $resource->uri,
$resource->owner->getEmail() $resource->owner->getEmail(),
], ],
$mailL11n->bodyAlt $mailL11n->bodyAlt
); );
@ -862,9 +862,9 @@ final class ApiController extends Controller
*/ */
private function createInformFromRequest(RequestAbstract $request) : Inform private function createInformFromRequest(RequestAbstract $request) : Inform
{ {
$inform = new Inform(); $inform = new Inform();
$inform->account = $request->getDataInt('account'); $inform->account = $request->getDataInt('account');
$inform->email = $request->getDataString('email'); $inform->email = $request->getDataString('email');
$inform->resource = $request->getDataInt('resource'); $inform->resource = $request->getDataInt('resource');
return $inform; return $inform;

3
Models/InformBlacklistMapper.php
View File

@ -14,7 +14,6 @@ declare(strict_types=1);
namespace Modules\OnlineResourceWatcher\Models; namespace Modules\OnlineResourceWatcher\Models;
use Modules\Admin\Models\AccountMapper;
use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
/** /**
@ -38,7 +37,7 @@ final class InformBlacklistMapper extends DataMapperFactory
*/ */
public const COLUMNS = [ public const COLUMNS = [
'orw_resource_blacklist_id' => ['name' => 'orw_resource_blacklist_id', 'type' => 'int', 'internal' => 'id'], 'orw_resource_blacklist_id' => ['name' => 'orw_resource_blacklist_id', 'type' => 'int', 'internal' => 'id'],
'orw_resource_blacklist_mail' => ['name' => 'orw_resource_blacklist_mail', 'type' => 'string', 'internal' => 'email',], 'orw_resource_blacklist_mail' => ['name' => 'orw_resource_blacklist_mail', 'type' => 'string', 'internal' => 'email',],
]; ];
/** /**

7
Models/InformMapper.php
View File

@ -14,7 +14,6 @@ declare(strict_types=1);
namespace Modules\OnlineResourceWatcher\Models; namespace Modules\OnlineResourceWatcher\Models;
use Modules\Admin\Models\AccountMapper;
use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
/** /**
@ -37,9 +36,9 @@ final class InformMapper extends DataMapperFactory
* @since 1.0.0 * @since 1.0.0
*/ */
public const COLUMNS = [ public const COLUMNS = [
'orw_resource_info_id' => ['name' => 'orw_resource_info_id', 'type' => 'int', 'internal' => 'id'], 'orw_resource_info_id' => ['name' => 'orw_resource_info_id', 'type' => 'int', 'internal' => 'id'],
'orw_resource_info_mail' => ['name' => 'orw_resource_info_mail', 'type' => 'string', 'internal' => 'email',], 'orw_resource_info_mail' => ['name' => 'orw_resource_info_mail', 'type' => 'string', 'internal' => 'email',],
'orw_resource_info_account' => ['name' => 'orw_resource_info_account', 'type' => 'int', 'internal' => 'account',], 'orw_resource_info_account' => ['name' => 'orw_resource_info_account', 'type' => 'int', 'internal' => 'account',],
'orw_resource_info_resource' => ['name' => 'orw_resource_info_resource', 'type' => 'int', 'internal' => 'resource',], 'orw_resource_info_resource' => ['name' => 'orw_resource_info_resource', 'type' => 'int', 'internal' => 'resource',],
]; ];

11
Models/Report.php
View File

@ -14,9 +14,6 @@ declare(strict_types=1);
namespace Modules\OnlineResourceWatcher\Models; namespace Modules\OnlineResourceWatcher\Models;
use Modules\Admin\Models\Account;
use Modules\Admin\Models\NullAccount;
/** /**
* Report class. * Report class.
* *
@ -69,10 +66,10 @@ class Report implements \JsonSerializable
public function toArray() : array public function toArray() : array
{ {
return [ return [
'id' => $this->id, 'id' => $this->id,
'createdAt' => $this->createdAt, 'createdAt' => $this->createdAt,
'resource' => $this->resource, 'resource' => $this->resource,
'status' => $this->status, 'status' => $this->status,
'changemetric' => $this->changeMetric, 'changemetric' => $this->changeMetric,
]; ];
} }

10
Models/ReportMapper.php
View File

@ -36,13 +36,13 @@ final class ReportMapper extends DataMapperFactory
* @since 1.0.0 * @since 1.0.0
*/ */
public const COLUMNS = [ public const COLUMNS = [
'orw_resource_report_id' => ['name' => 'orw_resource_report_id', 'type' => 'int', 'internal' => 'id'], 'orw_resource_report_id' => ['name' => 'orw_resource_report_id', 'type' => 'int', 'internal' => 'id'],
'orw_resource_report_status' => ['name' => 'orw_resource_report_status', 'type' => 'int', 'internal' => 'status',], 'orw_resource_report_status' => ['name' => 'orw_resource_report_status', 'type' => 'int', 'internal' => 'status',],
'orw_resource_report_metric' => ['name' => 'orw_resource_report_metric', 'type' => 'int', 'internal' => 'changeMetric',], 'orw_resource_report_metric' => ['name' => 'orw_resource_report_metric', 'type' => 'int', 'internal' => 'changeMetric',],
'orw_resource_report_path' => ['name' => 'orw_resource_report_path', 'type' => 'string', 'internal' => 'versionPath',], 'orw_resource_report_path' => ['name' => 'orw_resource_report_path', 'type' => 'string', 'internal' => 'versionPath',],
'orw_resource_report_change' => ['name' => 'orw_resource_report_change', 'type' => 'string', 'internal' => 'change',], 'orw_resource_report_change' => ['name' => 'orw_resource_report_change', 'type' => 'string', 'internal' => 'change',],
'orw_resource_report_resource' => ['name' => 'orw_resource_report_resource', 'type' => 'int', 'internal' => 'resource',], 'orw_resource_report_resource' => ['name' => 'orw_resource_report_resource', 'type' => 'int', 'internal' => 'resource',],
'orw_resource_report_created_at' => ['name' => 'orw_resource_report_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt',], 'orw_resource_report_created_at' => ['name' => 'orw_resource_report_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt',],
]; ];
/** /**

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

@ -13,74 +13,74 @@
declare(strict_types=1); declare(strict_types=1);
return ['OnlineResourceWatcher' => [ return ['OnlineResourceWatcher' => [
'Action' => 'Action', 'Action' => 'Action',
'Add' => 'Add', 'Add' => 'Add',
'Admin' => 'Admin', 'Admin' => 'Admin',
'Back' => 'Back', 'Back' => 'Back',
'Bills' => 'Bills', 'Bills' => 'Bills',
'By' => 'By', 'By' => 'By',
'Cancel' => 'Cancel', 'Cancel' => 'Cancel',
'Checked' => 'Checked', 'Checked' => 'Checked',
'Dashboard' => 'Dashboard', 'Dashboard' => 'Dashboard',
'Date' => 'Date', 'Date' => 'Date',
'Filter' => 'Filter', 'Filter' => 'Filter',
'ForgotPassword' => 'Forgot Password', 'ForgotPassword' => 'Forgot Password',
'Home' => 'Home', 'Home' => 'Home',
'ID' => 'ID', 'ID' => 'ID',
'Imprint' => 'Imprint', 'Imprint' => 'Imprint',
'Legal' => 'Legal', 'Legal' => 'Legal',
'Log' => 'Log', 'Log' => 'Log',
'Logo' => 'Logo', 'Logo' => 'Logo',
'SignOut' => 'Sign Out', 'SignOut' => 'Sign Out',
'Logs' => 'Logs', 'Logs' => 'Logs',
'Organization' => 'Organization', 'Organization' => 'Organization',
'Organizations' => 'Organizations', 'Organizations' => 'Organizations',
'Password' => 'Password', 'Password' => 'Password',
'PrivacyPolicy' => 'Privacy Policy', 'PrivacyPolicy' => 'Privacy Policy',
'Ref' => 'Ref', 'Ref' => 'Ref',
'Report' => 'Report', 'Report' => 'Report',
'Reports' => 'Reports', 'Reports' => 'Reports',
'Reset' => 'Reset', 'Reset' => 'Reset',
'Resource' => 'Resource', 'Resource' => 'Resource',
'Resources' => 'Resources', 'Resources' => 'Resources',
'Create' => 'Create', 'Create' => 'Create',
'Delete' => 'Delete', 'Delete' => 'Delete',
'Suspend' => 'Suspend', 'Suspend' => 'Suspend',
'Send' => 'Send', 'Send' => 'Send',
'Save' => 'Save', 'Save' => 'Save',
'Search' => 'Search', 'Search' => 'Search',
'Settings' => 'Settings', 'Settings' => 'Settings',
'SignIn' => 'Sign In', 'SignIn' => 'Sign In',
'Status' => 'Status', 'Status' => 'Status',
'Submit' => 'Submit', 'Submit' => 'Submit',
'Terms' => 'Terms', 'Terms' => 'Terms',
'Trigger' => 'Trigger', 'Trigger' => 'Trigger',
'Type' => 'Type', 'Type' => 'Type',
'User' => 'User', 'User' => 'User',
'Username' => 'Username', 'Username' => 'Username',
'Users' => 'Users', 'Users' => 'Users',
'New' => 'New', 'New' => 'New',
'Number' => 'Number', 'Number' => 'Number',
'CustomerNo' => 'Customer No.', 'CustomerNo' => 'Customer No.',
'CustomerName' => 'Customer Name', 'CustomerName' => 'Customer Name',
'Amount' => 'Amount', 'Amount' => 'Amount',
'Members' => 'Members', 'Members' => 'Members',
'Name' => 'Name', 'Name' => 'Name',
'Active' => 'Active', 'Active' => 'Active',
'Address' => 'Address', 'Address' => 'Address',
'Postal' => 'Postal', 'Postal' => 'Postal',
'City' => 'City', 'City' => 'City',
'BillingEmail' => 'Billing Email', 'BillingEmail' => 'Billing Email',
'Statistics' => 'Statistics', 'Statistics' => 'Statistics',
'PlanSettings' => 'Plan Settings', 'PlanSettings' => 'Plan Settings',
'BillingSettings' => 'Billing Settings', 'BillingSettings' => 'Billing Settings',
'UserSettings' => 'User Settings', 'UserSettings' => 'User Settings',
'Login' => 'Login', 'Login' => 'Login',
'Email' => 'Email', 'Email' => 'Email',
'NewPassword' => 'New Password', 'NewPassword' => 'New Password',
'CreateResource' => 'Create Resource', 'CreateResource' => 'Create Resource',
'Inform' => 'Inform', 'Inform' => 'Inform',
'Element' => 'Element', 'Element' => 'Element',
'Exit' => 'Exit', 'Exit' => 'Exit',
'Url' => 'Url', 'Url' => 'Url',
]]; ]];

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

@ -13,82 +13,82 @@
declare(strict_types=1); declare(strict_types=1);
return ['OnlineResourceWatcher' => [ return ['OnlineResourceWatcher' => [
'Action' => 'Action', 'Action' => 'Action',
'Add' => 'Add', 'Add' => 'Add',
'Admin' => 'Admin', 'Admin' => 'Admin',
'Back' => 'Back', 'Back' => 'Back',
'Bills' => 'Bills', 'Bills' => 'Bills',
'By' => 'By', 'By' => 'By',
'Cancel' => 'Cancel', 'Cancel' => 'Cancel',
'Checked' => 'Checked', 'Checked' => 'Checked',
'Dashboard' => 'Dashboard', 'Dashboard' => 'Dashboard',
'Date' => 'Date', 'Date' => 'Date',
'Filter' => 'Filter', 'Filter' => 'Filter',
'ForgotPassword' => 'Forgot Password', 'ForgotPassword' => 'Forgot Password',
'Home' => 'Home', 'Home' => 'Home',
'ID' => 'ID', 'ID' => 'ID',
'Imprint' => 'Imprint', 'Imprint' => 'Imprint',
'Legal' => 'Legal', 'Legal' => 'Legal',
'Log' => 'Log', 'Log' => 'Log',
'Logo' => 'Logo', 'Logo' => 'Logo',
'SignOut' => 'Sign Out', 'SignOut' => 'Sign Out',
'Logs' => 'Logs', 'Logs' => 'Logs',
'Organization' => 'Organization', 'Organization' => 'Organization',
'Organizations' => 'Organizations', 'Organizations' => 'Organizations',
'Password' => 'Password', 'Password' => 'Password',
'PrivacyPolicy' => 'Privacy Policy', 'PrivacyPolicy' => 'Privacy Policy',
'Ref' => 'Ref', 'Ref' => 'Ref',
'Report' => 'Report', 'Report' => 'Report',
'Reports' => 'Reports', 'Reports' => 'Reports',
'Reset' => 'Reset', 'Reset' => 'Reset',
'Resource' => 'Resource', 'Resource' => 'Resource',
'Resources' => 'Resources', 'Resources' => 'Resources',
'Create' => 'Create', 'Create' => 'Create',
'Delete' => 'Delete', 'Delete' => 'Delete',
'Suspend' => 'Suspend', 'Suspend' => 'Suspend',
'Send' => 'Send', 'Send' => 'Send',
'Save' => 'Save', 'Save' => 'Save',
'Search' => 'Search', 'Search' => 'Search',
'Settings' => 'Settings', 'Settings' => 'Settings',
'SignIn' => 'Sign In', 'SignIn' => 'Sign In',
'Status' => 'Status', 'Status' => 'Status',
'Submit' => 'Submit', 'Submit' => 'Submit',
'Terms' => 'Terms', 'Terms' => 'Terms',
'Trigger' => 'Trigger', 'Trigger' => 'Trigger',
'Type' => 'Type', 'Type' => 'Type',
'User' => 'User', 'User' => 'User',
'Username' => 'Username', 'Username' => 'Username',
'Users' => 'Users', 'Users' => 'Users',
'New' => 'New', 'New' => 'New',
'Number' => 'Number', 'Number' => 'Number',
'CustomerNo' => 'Customer No.', 'CustomerNo' => 'Customer No.',
'CustomerName' => 'Customer Name', 'CustomerName' => 'Customer Name',
'Amount' => 'Amount', 'Amount' => 'Amount',
'Members' => 'Members', 'Members' => 'Members',
'Name' => 'Name', 'Name' => 'Name',
'Active' => 'Active', 'Active' => 'Active',
'Address' => 'Address', 'Address' => 'Address',
'Postal' => 'Postal', 'Postal' => 'Postal',
'City' => 'City', 'City' => 'City',
'BillingEmail' => 'Billing Email', 'BillingEmail' => 'Billing Email',
'Statistics' => 'Statistics', 'Statistics' => 'Statistics',
'PlanSettings' => 'Plan Settings', 'PlanSettings' => 'Plan Settings',
'BillingSettings' => 'Billing Settings', 'BillingSettings' => 'Billing Settings',
'UserSettings' => 'User Settings', 'UserSettings' => 'User Settings',
'Login' => 'Login', 'Login' => 'Login',
'Email' => 'Email', 'Email' => 'Email',
'NewPassword' => 'New Password', 'NewPassword' => 'New Password',
'CreateResource' => 'Create Resource', 'CreateResource' => 'Create Resource',
'Inform' => 'Inform', 'Inform' => 'Inform',
'Element' => 'Element', 'Element' => 'Element',
'Exit' => 'Exit', 'Exit' => 'Exit',
'Url' => 'Url', 'Url' => 'Url',
'Preview' => 'Preview', 'Preview' => 'Preview',
'XPath' => 'XPath', 'XPath' => 'XPath',
'Comparison' => 'Comparison', 'Comparison' => 'Comparison',
'History' => 'History', 'History' => 'History',
'rstatus-1' => 'Resource added', 'rstatus-1' => 'Resource added',
'rstatus-2' => 'No change', 'rstatus-2' => 'No change',
'rstatus-3' => 'Changed', 'rstatus-3' => 'Changed',
'rstatus--1' => 'Download error', 'rstatus--1' => 'Download error',
]]; ]];

1
Theme/Backend/resource-create.tpl.php
View File

@ -13,6 +13,7 @@
declare(strict_types=1); declare(strict_types=1);
use phpOMS\Uri\UriFactory; use phpOMS\Uri\UriFactory;
?> ?>
<div class="row"> <div class="row">
<div class="col-xs-12 col-md-6"> <div class="col-xs-12 col-md-6">

8
Theme/Backend/resource-single.tpl.php
View File

@ -16,7 +16,7 @@ use phpOMS\Uri\UriFactory;
/** @var \Modules\OnlineResourceWatcher\Models\Resource */ /** @var \Modules\OnlineResourceWatcher\Models\Resource */
$resource = $this->getData('resource') ?? new \Modules\OnlineResourceWatcher\Models\NullResource(); $resource = $this->getData('resource') ?? new \Modules\OnlineResourceWatcher\Models\NullResource();
$reports = $resource->reports; $reports = $resource->reports;
?> ?>
<div class="row"> <div class="row">
<div class="col-xs-8"> <div class="col-xs-8">
@ -82,10 +82,10 @@ $reports = $resource->reports;
<div class="portlet-body col-simple"> <div class="portlet-body col-simple">
<?php <?php
$type = ''; $type = '';
$basePath = __DIR__ . '/../../Files/' . $resource->path . '/' . $resource->lastVersionPath; $basePath = __DIR__ . '/../../Files/' . $resource->path . '/' . $resource->lastVersionPath;
$path = ''; $path = '';
$webPath = 'Modules/OnlineResourceWatcher/Files/' . $resource->path . '/' . $resource->lastVersionPath; $webPath = 'Modules/OnlineResourceWatcher/Files/' . $resource->path . '/' . $resource->lastVersionPath;
if (\is_file($basePath . '/index.jpg')) { if (\is_file($basePath . '/index.jpg')) {
$type = 'img'; $type = 'img';

15
tests/Controller/ApiControllerTest.php
View File

@ -25,7 +25,6 @@ use phpOMS\Event\EventManager;
use phpOMS\Localization\L11nManager; use phpOMS\Localization\L11nManager;
use phpOMS\Message\Http\HttpRequest; use phpOMS\Message\Http\HttpRequest;
use phpOMS\Message\Http\HttpResponse; use phpOMS\Message\Http\HttpResponse;
use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Module\ModuleAbstract; use phpOMS\Module\ModuleAbstract;
use phpOMS\Module\ModuleManager; use phpOMS\Module\ModuleManager;
use phpOMS\Router\WebRouter; use phpOMS\Router\WebRouter;
@ -56,14 +55,14 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
protected string $appName = 'Api'; protected string $appName = 'Api';
}; };
$this->app->dbPool = $GLOBALS['dbpool']; $this->app->dbPool = $GLOBALS['dbpool'];
$this->app->unitId = 1; $this->app->unitId = 1;
$this->app->accountManager = new AccountManager($GLOBALS['session']); $this->app->accountManager = new AccountManager($GLOBALS['session']);
$this->app->appSettings = new CoreSettings(); $this->app->appSettings = new CoreSettings();
$this->app->moduleManager = new ModuleManager($this->app, __DIR__ . '/../../../Modules/'); $this->app->moduleManager = new ModuleManager($this->app, __DIR__ . '/../../../Modules/');
$this->app->dispatcher = new Dispatcher($this->app); $this->app->dispatcher = new Dispatcher($this->app);
$this->app->eventManager = new EventManager($this->app->dispatcher); $this->app->eventManager = new EventManager($this->app->dispatcher);
$this->app->l11nManager = new L11nManager(); $this->app->l11nManager = new L11nManager();
$this->app->eventManager->importFromFile(__DIR__ . '/../../../Web/Api/Hooks.php'); $this->app->eventManager->importFromFile(__DIR__ . '/../../../Web/Api/Hooks.php');
$account = new Account(); $account = new Account();