@@ -31,110 +31,110 @@ |
||
31 | 31 | */ |
32 | 32 | class TasksList implements RequestHandlerInterface |
33 | 33 | { |
34 | - /** |
|
35 | - * @var AdminTasksModule $module |
|
36 | - */ |
|
37 | - private $module; |
|
34 | + /** |
|
35 | + * @var AdminTasksModule $module |
|
36 | + */ |
|
37 | + private $module; |
|
38 | 38 | |
39 | - /** |
|
40 | - * @var TaskScheduleService $taskschedules_service |
|
41 | - */ |
|
42 | - private $taskschedules_service; |
|
39 | + /** |
|
40 | + * @var TaskScheduleService $taskschedules_service |
|
41 | + */ |
|
42 | + private $taskschedules_service; |
|
43 | 43 | |
44 | - /** |
|
45 | - * @var DatatablesService $datatables_service |
|
46 | - */ |
|
47 | - private $datatables_service; |
|
44 | + /** |
|
45 | + * @var DatatablesService $datatables_service |
|
46 | + */ |
|
47 | + private $datatables_service; |
|
48 | 48 | |
49 | - /** |
|
50 | - * Constructor for TasksList Request Handler |
|
51 | - * |
|
52 | - * @param ModuleService $module_service |
|
53 | - * @param TaskScheduleService $taskschedules_service |
|
54 | - * @param DatatablesService $datatables_service |
|
55 | - */ |
|
56 | - public function __construct( |
|
57 | - ModuleService $module_service, |
|
58 | - TaskScheduleService $taskschedules_service, |
|
59 | - DatatablesService $datatables_service |
|
60 | - ) { |
|
61 | - $this->module = $module_service->findByInterface(AdminTasksModule::class)->first(); |
|
62 | - $this->taskschedules_service = $taskschedules_service; |
|
63 | - $this->datatables_service = $datatables_service; |
|
64 | - } |
|
49 | + /** |
|
50 | + * Constructor for TasksList Request Handler |
|
51 | + * |
|
52 | + * @param ModuleService $module_service |
|
53 | + * @param TaskScheduleService $taskschedules_service |
|
54 | + * @param DatatablesService $datatables_service |
|
55 | + */ |
|
56 | + public function __construct( |
|
57 | + ModuleService $module_service, |
|
58 | + TaskScheduleService $taskschedules_service, |
|
59 | + DatatablesService $datatables_service |
|
60 | + ) { |
|
61 | + $this->module = $module_service->findByInterface(AdminTasksModule::class)->first(); |
|
62 | + $this->taskschedules_service = $taskschedules_service; |
|
63 | + $this->datatables_service = $datatables_service; |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * {@inheritDoc} |
|
68 | - * @see \Psr\Http\Server\RequestHandlerInterface::handle() |
|
69 | - */ |
|
70 | - public function handle(ServerRequestInterface $request): ResponseInterface |
|
71 | - { |
|
72 | - if ($this->module === null) { |
|
73 | - throw new HttpNotFoundException(I18N::translate('The attached module could not be found.')); |
|
74 | - } |
|
66 | + /** |
|
67 | + * {@inheritDoc} |
|
68 | + * @see \Psr\Http\Server\RequestHandlerInterface::handle() |
|
69 | + */ |
|
70 | + public function handle(ServerRequestInterface $request): ResponseInterface |
|
71 | + { |
|
72 | + if ($this->module === null) { |
|
73 | + throw new HttpNotFoundException(I18N::translate('The attached module could not be found.')); |
|
74 | + } |
|
75 | 75 | |
76 | - $task_schedules = $this->taskschedules_service->all(true, true) |
|
77 | - ->map(function (TaskSchedule $value) { |
|
76 | + $task_schedules = $this->taskschedules_service->all(true, true) |
|
77 | + ->map(function (TaskSchedule $value) { |
|
78 | 78 | |
79 | - $row = $value->toArray(); |
|
80 | - $task = $this->taskschedules_service->findTask($row['task_id']); |
|
81 | - $row['task_name'] = $task !== null ? $task->name() : I18N::translate('Task not found'); |
|
82 | - return $row; |
|
83 | - }); |
|
79 | + $row = $value->toArray(); |
|
80 | + $task = $this->taskschedules_service->findTask($row['task_id']); |
|
81 | + $row['task_name'] = $task !== null ? $task->name() : I18N::translate('Task not found'); |
|
82 | + return $row; |
|
83 | + }); |
|
84 | 84 | |
85 | - $search_columns = ['task_name']; |
|
86 | - $sort_columns = ['task_name', 'enabled', 'last_run']; |
|
87 | - $module_name = $this->module->name(); |
|
85 | + $search_columns = ['task_name']; |
|
86 | + $sort_columns = ['task_name', 'enabled', 'last_run']; |
|
87 | + $module_name = $this->module->name(); |
|
88 | 88 | |
89 | - $callback = function (array $row) use ($module_name): array { |
|
89 | + $callback = function (array $row) use ($module_name): array { |
|
90 | 90 | |
91 | - $row['frequency']->setLocale(I18N::locale()->code()); |
|
91 | + $row['frequency']->setLocale(I18N::locale()->code()); |
|
92 | 92 | |
93 | - $task_options_params = [ |
|
94 | - 'task_sched_id' => $row['id'], |
|
95 | - 'task_sched_enabled' => $row['enabled'], |
|
96 | - 'task_edit_route' => route(TaskEditPage::class, ['task' => $row['id']]), |
|
97 | - 'task_status_route' => route(TaskStatusAction::class, [ |
|
98 | - 'task' => $row['id'], |
|
99 | - 'enable' => $row['enabled'] ? 0 : 1 |
|
100 | - ]) |
|
101 | - ]; |
|
93 | + $task_options_params = [ |
|
94 | + 'task_sched_id' => $row['id'], |
|
95 | + 'task_sched_enabled' => $row['enabled'], |
|
96 | + 'task_edit_route' => route(TaskEditPage::class, ['task' => $row['id']]), |
|
97 | + 'task_status_route' => route(TaskStatusAction::class, [ |
|
98 | + 'task' => $row['id'], |
|
99 | + 'enable' => $row['enabled'] ? 0 : 1 |
|
100 | + ]) |
|
101 | + ]; |
|
102 | 102 | |
103 | - $task_run_params = [ |
|
104 | - 'task_sched_id' => $row['id'], |
|
105 | - 'run_route' => route(TaskTrigger::class, [ |
|
106 | - 'task' => $row['task_id'], |
|
107 | - 'force' => $this->module->getPreference('MAJ_AT_FORCE_EXEC_TOKEN') |
|
108 | - ]) |
|
109 | - ]; |
|
103 | + $task_run_params = [ |
|
104 | + 'task_sched_id' => $row['id'], |
|
105 | + 'run_route' => route(TaskTrigger::class, [ |
|
106 | + 'task' => $row['task_id'], |
|
107 | + 'force' => $this->module->getPreference('MAJ_AT_FORCE_EXEC_TOKEN') |
|
108 | + ]) |
|
109 | + ]; |
|
110 | 110 | |
111 | - $datum = [ |
|
112 | - view($module_name . '::admin/tasks-table-options', $task_options_params), |
|
113 | - view($module_name . '::components/yes-no-icons', ['yes' => $row['enabled']]), |
|
114 | - '<span dir="auto">' . e($row['task_name']) . '</span>', |
|
115 | - $row['last_run']->unix() === 0 ? |
|
116 | - view('components/datetime', ['timestamp' => $row['last_run']]) : |
|
117 | - view('components/datetime-diff', ['timestamp' => $row['last_run']]), |
|
118 | - view($module_name . '::components/yes-no-icons', ['yes' => $row['last_result']]), |
|
119 | - '<span dir="auto">' . e($row['frequency']->cascade()->forHumans()) . '</span>', |
|
120 | - $row['nb_occurrences'] > 0 ? I18N::number($row['nb_occurrences']) : I18N::translate('Unlimited'), |
|
121 | - view($module_name . '::components/yes-no-icons', [ |
|
122 | - 'yes' => $row['is_running'], |
|
123 | - 'text_yes' => I18N::translate('Running'), |
|
124 | - 'text_no' => I18N::translate('Not running') |
|
125 | - ]), |
|
126 | - view($module_name . '::admin/tasks-table-run', $task_run_params) |
|
127 | - ]; |
|
111 | + $datum = [ |
|
112 | + view($module_name . '::admin/tasks-table-options', $task_options_params), |
|
113 | + view($module_name . '::components/yes-no-icons', ['yes' => $row['enabled']]), |
|
114 | + '<span dir="auto">' . e($row['task_name']) . '</span>', |
|
115 | + $row['last_run']->unix() === 0 ? |
|
116 | + view('components/datetime', ['timestamp' => $row['last_run']]) : |
|
117 | + view('components/datetime-diff', ['timestamp' => $row['last_run']]), |
|
118 | + view($module_name . '::components/yes-no-icons', ['yes' => $row['last_result']]), |
|
119 | + '<span dir="auto">' . e($row['frequency']->cascade()->forHumans()) . '</span>', |
|
120 | + $row['nb_occurrences'] > 0 ? I18N::number($row['nb_occurrences']) : I18N::translate('Unlimited'), |
|
121 | + view($module_name . '::components/yes-no-icons', [ |
|
122 | + 'yes' => $row['is_running'], |
|
123 | + 'text_yes' => I18N::translate('Running'), |
|
124 | + 'text_no' => I18N::translate('Not running') |
|
125 | + ]), |
|
126 | + view($module_name . '::admin/tasks-table-run', $task_run_params) |
|
127 | + ]; |
|
128 | 128 | |
129 | - return $datum; |
|
130 | - }; |
|
129 | + return $datum; |
|
130 | + }; |
|
131 | 131 | |
132 | - return $this->datatables_service->handleCollection( |
|
133 | - $request, |
|
134 | - $task_schedules, |
|
135 | - $search_columns, |
|
136 | - $sort_columns, |
|
137 | - $callback |
|
138 | - ); |
|
139 | - } |
|
132 | + return $this->datatables_service->handleCollection( |
|
133 | + $request, |
|
134 | + $task_schedules, |
|
135 | + $search_columns, |
|
136 | + $sort_columns, |
|
137 | + $callback |
|
138 | + ); |
|
139 | + } |
|
140 | 140 | } |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | } |
75 | 75 | |
76 | 76 | $task_schedules = $this->taskschedules_service->all(true, true) |
77 | - ->map(function (TaskSchedule $value) { |
|
77 | + ->map(function(TaskSchedule $value) { |
|
78 | 78 | |
79 | 79 | $row = $value->toArray(); |
80 | 80 | $task = $this->taskschedules_service->findTask($row['task_id']); |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | $sort_columns = ['task_name', 'enabled', 'last_run']; |
87 | 87 | $module_name = $this->module->name(); |
88 | 88 | |
89 | - $callback = function (array $row) use ($module_name): array { |
|
89 | + $callback = function(array $row) use ($module_name): array { |
|
90 | 90 | |
91 | 91 | $row['frequency']->setLocale(I18N::locale()->code()); |
92 | 92 | |
@@ -109,21 +109,20 @@ discard block |
||
109 | 109 | ]; |
110 | 110 | |
111 | 111 | $datum = [ |
112 | - view($module_name . '::admin/tasks-table-options', $task_options_params), |
|
113 | - view($module_name . '::components/yes-no-icons', ['yes' => $row['enabled']]), |
|
114 | - '<span dir="auto">' . e($row['task_name']) . '</span>', |
|
112 | + view($module_name.'::admin/tasks-table-options', $task_options_params), |
|
113 | + view($module_name.'::components/yes-no-icons', ['yes' => $row['enabled']]), |
|
114 | + '<span dir="auto">'.e($row['task_name']).'</span>', |
|
115 | 115 | $row['last_run']->unix() === 0 ? |
116 | - view('components/datetime', ['timestamp' => $row['last_run']]) : |
|
117 | - view('components/datetime-diff', ['timestamp' => $row['last_run']]), |
|
118 | - view($module_name . '::components/yes-no-icons', ['yes' => $row['last_result']]), |
|
119 | - '<span dir="auto">' . e($row['frequency']->cascade()->forHumans()) . '</span>', |
|
116 | + view('components/datetime', ['timestamp' => $row['last_run']]) : view('components/datetime-diff', ['timestamp' => $row['last_run']]), |
|
117 | + view($module_name.'::components/yes-no-icons', ['yes' => $row['last_result']]), |
|
118 | + '<span dir="auto">'.e($row['frequency']->cascade()->forHumans()).'</span>', |
|
120 | 119 | $row['nb_occurrences'] > 0 ? I18N::number($row['nb_occurrences']) : I18N::translate('Unlimited'), |
121 | - view($module_name . '::components/yes-no-icons', [ |
|
120 | + view($module_name.'::components/yes-no-icons', [ |
|
122 | 121 | 'yes' => $row['is_running'], |
123 | 122 | 'text_yes' => I18N::translate('Running'), |
124 | 123 | 'text_no' => I18N::translate('Not running') |
125 | 124 | ]), |
126 | - view($module_name . '::admin/tasks-table-run', $task_run_params) |
|
125 | + view($module_name.'::admin/tasks-table-run', $task_run_params) |
|
127 | 126 | ]; |
128 | 127 | |
129 | 128 | return $datum; |
@@ -30,65 +30,65 @@ |
||
30 | 30 | class TaskStatusAction implements RequestHandlerInterface |
31 | 31 | { |
32 | 32 | |
33 | - /** |
|
34 | - * @var AdminTasksModule $module |
|
35 | - */ |
|
36 | - private $module; |
|
33 | + /** |
|
34 | + * @var AdminTasksModule $module |
|
35 | + */ |
|
36 | + private $module; |
|
37 | 37 | |
38 | - /** |
|
39 | - * @var TaskScheduleService $taskschedules_service |
|
40 | - */ |
|
41 | - private $taskschedules_service; |
|
38 | + /** |
|
39 | + * @var TaskScheduleService $taskschedules_service |
|
40 | + */ |
|
41 | + private $taskschedules_service; |
|
42 | 42 | |
43 | - /** |
|
44 | - * Constructor for TaskStatusAction Request Handler |
|
45 | - * |
|
46 | - * @param ModuleService $module_service |
|
47 | - * @param TaskScheduleService $taskschedules_service |
|
48 | - */ |
|
49 | - public function __construct(ModuleService $module_service, TaskScheduleService $taskschedules_service) |
|
50 | - { |
|
51 | - $this->module = $module_service->findByInterface(AdminTasksModule::class)->first(); |
|
52 | - $this->taskschedules_service = $taskschedules_service; |
|
53 | - } |
|
43 | + /** |
|
44 | + * Constructor for TaskStatusAction Request Handler |
|
45 | + * |
|
46 | + * @param ModuleService $module_service |
|
47 | + * @param TaskScheduleService $taskschedules_service |
|
48 | + */ |
|
49 | + public function __construct(ModuleService $module_service, TaskScheduleService $taskschedules_service) |
|
50 | + { |
|
51 | + $this->module = $module_service->findByInterface(AdminTasksModule::class)->first(); |
|
52 | + $this->taskschedules_service = $taskschedules_service; |
|
53 | + } |
|
54 | 54 | |
55 | - /** |
|
56 | - * {@inheritDoc} |
|
57 | - * @see \Psr\Http\Server\RequestHandlerInterface::handle() |
|
58 | - */ |
|
59 | - public function handle(ServerRequestInterface $request): ResponseInterface |
|
60 | - { |
|
61 | - $task_sched_id = (int) $request->getAttribute('task'); |
|
62 | - $task_schedule = $this->taskschedules_service->find($task_sched_id); |
|
55 | + /** |
|
56 | + * {@inheritDoc} |
|
57 | + * @see \Psr\Http\Server\RequestHandlerInterface::handle() |
|
58 | + */ |
|
59 | + public function handle(ServerRequestInterface $request): ResponseInterface |
|
60 | + { |
|
61 | + $task_sched_id = (int) $request->getAttribute('task'); |
|
62 | + $task_schedule = $this->taskschedules_service->find($task_sched_id); |
|
63 | 63 | |
64 | - $admin_config_route = route(AdminConfigPage::class); |
|
64 | + $admin_config_route = route(AdminConfigPage::class); |
|
65 | 65 | |
66 | - if ($task_schedule === null) { |
|
67 | - FlashMessages::addMessage( |
|
68 | - I18N::translate('The task shedule with ID “%d” does not exist.', I18N::number($task_sched_id)), |
|
69 | - 'danger' |
|
70 | - ); |
|
71 | - return redirect($admin_config_route); |
|
72 | - } |
|
66 | + if ($task_schedule === null) { |
|
67 | + FlashMessages::addMessage( |
|
68 | + I18N::translate('The task shedule with ID “%d” does not exist.', I18N::number($task_sched_id)), |
|
69 | + 'danger' |
|
70 | + ); |
|
71 | + return redirect($admin_config_route); |
|
72 | + } |
|
73 | 73 | |
74 | - ((bool) $request->getAttribute('enable', false)) ? $task_schedule->enable() : $task_schedule->disable(); |
|
74 | + ((bool) $request->getAttribute('enable', false)) ? $task_schedule->enable() : $task_schedule->disable(); |
|
75 | 75 | |
76 | - if ($this->taskschedules_service->update($task_schedule) > 0) { |
|
77 | - FlashMessages::addMessage( |
|
78 | - I18N::translate('The scheduled task has been successfully updated'), |
|
79 | - 'success' |
|
80 | - ); |
|
81 | - //phpcs:ignore Generic.Files.LineLength.TooLong |
|
82 | - Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” has been updated.'); |
|
83 | - } else { |
|
84 | - FlashMessages::addMessage( |
|
85 | - I18N::translate('An error occured while updating the scheduled task'), |
|
86 | - 'danger' |
|
87 | - ); |
|
88 | - //phpcs:ignore Generic.Files.LineLength.TooLong |
|
89 | - Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” could not be updated. See error log.'); |
|
90 | - } |
|
76 | + if ($this->taskschedules_service->update($task_schedule) > 0) { |
|
77 | + FlashMessages::addMessage( |
|
78 | + I18N::translate('The scheduled task has been successfully updated'), |
|
79 | + 'success' |
|
80 | + ); |
|
81 | + //phpcs:ignore Generic.Files.LineLength.TooLong |
|
82 | + Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” has been updated.'); |
|
83 | + } else { |
|
84 | + FlashMessages::addMessage( |
|
85 | + I18N::translate('An error occured while updating the scheduled task'), |
|
86 | + 'danger' |
|
87 | + ); |
|
88 | + //phpcs:ignore Generic.Files.LineLength.TooLong |
|
89 | + Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” could not be updated. See error log.'); |
|
90 | + } |
|
91 | 91 | |
92 | - return redirect($admin_config_route); |
|
93 | - } |
|
92 | + return redirect($admin_config_route); |
|
93 | + } |
|
94 | 94 | } |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | */ |
59 | 59 | public function handle(ServerRequestInterface $request): ResponseInterface |
60 | 60 | { |
61 | - $task_sched_id = (int) $request->getAttribute('task'); |
|
61 | + $task_sched_id = (int)$request->getAttribute('task'); |
|
62 | 62 | $task_schedule = $this->taskschedules_service->find($task_sched_id); |
63 | 63 | |
64 | 64 | $admin_config_route = route(AdminConfigPage::class); |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | return redirect($admin_config_route); |
72 | 72 | } |
73 | 73 | |
74 | - ((bool) $request->getAttribute('enable', false)) ? $task_schedule->enable() : $task_schedule->disable(); |
|
74 | + ((bool)$request->getAttribute('enable', false)) ? $task_schedule->enable() : $task_schedule->disable(); |
|
75 | 75 | |
76 | 76 | if ($this->taskschedules_service->update($task_schedule) > 0) { |
77 | 77 | FlashMessages::addMessage( |
@@ -79,14 +79,14 @@ discard block |
||
79 | 79 | 'success' |
80 | 80 | ); |
81 | 81 | //phpcs:ignore Generic.Files.LineLength.TooLong |
82 | - Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” has been updated.'); |
|
82 | + Log::addConfigurationLog('Module '.$this->module->title().' : Task Schedule “'.$task_schedule->id().'” has been updated.'); |
|
83 | 83 | } else { |
84 | 84 | FlashMessages::addMessage( |
85 | 85 | I18N::translate('An error occured while updating the scheduled task'), |
86 | 86 | 'danger' |
87 | 87 | ); |
88 | 88 | //phpcs:ignore Generic.Files.LineLength.TooLong |
89 | - Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” could not be updated. See error log.'); |
|
89 | + Log::addConfigurationLog('Module '.$this->module->title().' : Task Schedule “'.$task_schedule->id().'” could not be updated. See error log.'); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | return redirect($admin_config_route); |
@@ -29,35 +29,35 @@ |
||
29 | 29 | */ |
30 | 30 | class TokenGenerate implements RequestHandlerInterface |
31 | 31 | { |
32 | - /** |
|
33 | - * @var AdminTasksModule $module |
|
34 | - */ |
|
35 | - private $module; |
|
32 | + /** |
|
33 | + * @var AdminTasksModule $module |
|
34 | + */ |
|
35 | + private $module; |
|
36 | 36 | |
37 | - /** |
|
38 | - * Constructor for TokenGenerate request handler |
|
39 | - * |
|
40 | - * @param ModuleService $module_service |
|
41 | - */ |
|
42 | - public function __construct(ModuleService $module_service) |
|
43 | - { |
|
44 | - $this->module = $module_service->findByInterface(AdminTasksModule::class)->first(); |
|
45 | - } |
|
37 | + /** |
|
38 | + * Constructor for TokenGenerate request handler |
|
39 | + * |
|
40 | + * @param ModuleService $module_service |
|
41 | + */ |
|
42 | + public function __construct(ModuleService $module_service) |
|
43 | + { |
|
44 | + $this->module = $module_service->findByInterface(AdminTasksModule::class)->first(); |
|
45 | + } |
|
46 | 46 | |
47 | - /** |
|
48 | - * {@inheritDoc} |
|
49 | - * @see \Psr\Http\Server\RequestHandlerInterface::handle() |
|
50 | - */ |
|
51 | - public function handle(ServerRequestInterface $request): ResponseInterface |
|
52 | - { |
|
53 | - if ($this->module === null) { |
|
54 | - throw new HttpNotFoundException(I18N::translate('The attached module could not be found.')); |
|
55 | - } |
|
47 | + /** |
|
48 | + * {@inheritDoc} |
|
49 | + * @see \Psr\Http\Server\RequestHandlerInterface::handle() |
|
50 | + */ |
|
51 | + public function handle(ServerRequestInterface $request): ResponseInterface |
|
52 | + { |
|
53 | + if ($this->module === null) { |
|
54 | + throw new HttpNotFoundException(I18N::translate('The attached module could not be found.')); |
|
55 | + } |
|
56 | 56 | |
57 | - $token = Functions::generateRandomToken(); |
|
58 | - $this->module->setPreference('MAJ_AT_FORCE_EXEC_TOKEN', $token); |
|
59 | - Log::addConfigurationLog($this->module->title() . ' : New token generated.'); |
|
57 | + $token = Functions::generateRandomToken(); |
|
58 | + $this->module->setPreference('MAJ_AT_FORCE_EXEC_TOKEN', $token); |
|
59 | + Log::addConfigurationLog($this->module->title() . ' : New token generated.'); |
|
60 | 60 | |
61 | - return response(['token' => $token]); |
|
62 | - } |
|
61 | + return response(['token' => $token]); |
|
62 | + } |
|
63 | 63 | } |
@@ -56,7 +56,7 @@ |
||
56 | 56 | |
57 | 57 | $token = Functions::generateRandomToken(); |
58 | 58 | $this->module->setPreference('MAJ_AT_FORCE_EXEC_TOKEN', $token); |
59 | - Log::addConfigurationLog($this->module->title() . ' : New token generated.'); |
|
59 | + Log::addConfigurationLog($this->module->title().' : New token generated.'); |
|
60 | 60 | |
61 | 61 | return response(['token' => $token]); |
62 | 62 | } |
@@ -30,55 +30,55 @@ |
||
30 | 30 | */ |
31 | 31 | class AdminConfigPage implements RequestHandlerInterface |
32 | 32 | { |
33 | - use ViewResponseTrait; |
|
33 | + use ViewResponseTrait; |
|
34 | 34 | |
35 | - /** |
|
36 | - * @var AdminTasksModule $module |
|
37 | - */ |
|
38 | - private $module; |
|
35 | + /** |
|
36 | + * @var AdminTasksModule $module |
|
37 | + */ |
|
38 | + private $module; |
|
39 | 39 | |
40 | - /** |
|
41 | - * |
|
42 | - * @var UserService $user_service |
|
43 | - */ |
|
44 | - private $user_service; |
|
40 | + /** |
|
41 | + * |
|
42 | + * @var UserService $user_service |
|
43 | + */ |
|
44 | + private $user_service; |
|
45 | 45 | |
46 | - /** |
|
47 | - * Constructor for Admin Config request handler |
|
48 | - * |
|
49 | - * @param ModuleService $module_service |
|
50 | - * @param UserService $user_service |
|
51 | - */ |
|
52 | - public function __construct(ModuleService $module_service, UserService $user_service) |
|
53 | - { |
|
54 | - $this->module = $module_service->findByInterface(AdminTasksModule::class)->first(); |
|
55 | - $this->user_service = $user_service; |
|
56 | - } |
|
46 | + /** |
|
47 | + * Constructor for Admin Config request handler |
|
48 | + * |
|
49 | + * @param ModuleService $module_service |
|
50 | + * @param UserService $user_service |
|
51 | + */ |
|
52 | + public function __construct(ModuleService $module_service, UserService $user_service) |
|
53 | + { |
|
54 | + $this->module = $module_service->findByInterface(AdminTasksModule::class)->first(); |
|
55 | + $this->user_service = $user_service; |
|
56 | + } |
|
57 | 57 | |
58 | - /** |
|
59 | - * {@inheritDoc} |
|
60 | - * @see \Psr\Http\Server\RequestHandlerInterface::handle() |
|
61 | - */ |
|
62 | - public function handle(ServerRequestInterface $request): ResponseInterface |
|
63 | - { |
|
64 | - $this->layout = 'layouts/administration'; |
|
58 | + /** |
|
59 | + * {@inheritDoc} |
|
60 | + * @see \Psr\Http\Server\RequestHandlerInterface::handle() |
|
61 | + */ |
|
62 | + public function handle(ServerRequestInterface $request): ResponseInterface |
|
63 | + { |
|
64 | + $this->layout = 'layouts/administration'; |
|
65 | 65 | |
66 | - if ($this->module === null) { |
|
67 | - throw new HttpNotFoundException(I18N::translate('The attached module could not be found.')); |
|
68 | - } |
|
66 | + if ($this->module === null) { |
|
67 | + throw new HttpNotFoundException(I18N::translate('The attached module could not be found.')); |
|
68 | + } |
|
69 | 69 | |
70 | - $token = $this->module->getPreference('MAJ_AT_FORCE_EXEC_TOKEN'); |
|
71 | - if ($token === '') { |
|
72 | - $token = Functions::generateRandomToken(); |
|
73 | - $this->module->setPreference('PAT_FORCE_EXEC_TOKEN', $token); |
|
74 | - } |
|
70 | + $token = $this->module->getPreference('MAJ_AT_FORCE_EXEC_TOKEN'); |
|
71 | + if ($token === '') { |
|
72 | + $token = Functions::generateRandomToken(); |
|
73 | + $this->module->setPreference('PAT_FORCE_EXEC_TOKEN', $token); |
|
74 | + } |
|
75 | 75 | |
76 | - return $this->viewResponse($this->module->name() . '::admin/config', [ |
|
77 | - 'title' => $this->module->title(), |
|
78 | - 'trigger_token' => $token, |
|
79 | - 'trigger_route' => route(TaskTrigger::class, ['task' => '__TASKNAME__', 'force' => '__TOKEN__']), |
|
80 | - 'new_token_route' => route(TokenGenerate::class), |
|
81 | - 'tasks_data_route' => route(TasksList::class) |
|
82 | - ]); |
|
83 | - } |
|
76 | + return $this->viewResponse($this->module->name() . '::admin/config', [ |
|
77 | + 'title' => $this->module->title(), |
|
78 | + 'trigger_token' => $token, |
|
79 | + 'trigger_route' => route(TaskTrigger::class, ['task' => '__TASKNAME__', 'force' => '__TOKEN__']), |
|
80 | + 'new_token_route' => route(TokenGenerate::class), |
|
81 | + 'tasks_data_route' => route(TasksList::class) |
|
82 | + ]); |
|
83 | + } |
|
84 | 84 | } |
@@ -73,7 +73,7 @@ |
||
73 | 73 | $this->module->setPreference('PAT_FORCE_EXEC_TOKEN', $token); |
74 | 74 | } |
75 | 75 | |
76 | - return $this->viewResponse($this->module->name() . '::admin/config', [ |
|
76 | + return $this->viewResponse($this->module->name().'::admin/config', [ |
|
77 | 77 | 'title' => $this->module->title(), |
78 | 78 | 'trigger_token' => $token, |
79 | 79 | 'trigger_route' => route(TaskTrigger::class, ['task' => '__TASKNAME__', 'force' => '__TOKEN__']), |
@@ -34,142 +34,142 @@ |
||
34 | 34 | */ |
35 | 35 | class TaskEditAction implements RequestHandlerInterface |
36 | 36 | { |
37 | - /** |
|
38 | - * @var AdminTasksModule $module |
|
39 | - */ |
|
40 | - private $module; |
|
37 | + /** |
|
38 | + * @var AdminTasksModule $module |
|
39 | + */ |
|
40 | + private $module; |
|
41 | 41 | |
42 | - /** |
|
43 | - * @var TaskScheduleService $taskschedules_service |
|
44 | - */ |
|
45 | - private $taskschedules_service; |
|
42 | + /** |
|
43 | + * @var TaskScheduleService $taskschedules_service |
|
44 | + */ |
|
45 | + private $taskschedules_service; |
|
46 | 46 | |
47 | - /** |
|
48 | - * Constructor for TaskEditAction Request Handler |
|
49 | - * |
|
50 | - * @param ModuleService $module_service |
|
51 | - * @param TaskScheduleService $taskschedules_service |
|
52 | - */ |
|
53 | - public function __construct(ModuleService $module_service, TaskScheduleService $taskschedules_service) |
|
54 | - { |
|
55 | - $this->module = $module_service->findByInterface(AdminTasksModule::class)->first(); |
|
56 | - $this->taskschedules_service = $taskschedules_service; |
|
57 | - } |
|
47 | + /** |
|
48 | + * Constructor for TaskEditAction Request Handler |
|
49 | + * |
|
50 | + * @param ModuleService $module_service |
|
51 | + * @param TaskScheduleService $taskschedules_service |
|
52 | + */ |
|
53 | + public function __construct(ModuleService $module_service, TaskScheduleService $taskschedules_service) |
|
54 | + { |
|
55 | + $this->module = $module_service->findByInterface(AdminTasksModule::class)->first(); |
|
56 | + $this->taskschedules_service = $taskschedules_service; |
|
57 | + } |
|
58 | 58 | |
59 | - /** |
|
60 | - * {@inheritDoc} |
|
61 | - * @see \Psr\Http\Server\RequestHandlerInterface::handle() |
|
62 | - */ |
|
63 | - public function handle(ServerRequestInterface $request): ResponseInterface |
|
64 | - { |
|
65 | - $task_sched_id = (int) $request->getAttribute('task'); |
|
66 | - $task_schedule = $this->taskschedules_service->find($task_sched_id); |
|
59 | + /** |
|
60 | + * {@inheritDoc} |
|
61 | + * @see \Psr\Http\Server\RequestHandlerInterface::handle() |
|
62 | + */ |
|
63 | + public function handle(ServerRequestInterface $request): ResponseInterface |
|
64 | + { |
|
65 | + $task_sched_id = (int) $request->getAttribute('task'); |
|
66 | + $task_schedule = $this->taskschedules_service->find($task_sched_id); |
|
67 | 67 | |
68 | - $admin_config_route = route(AdminConfigPage::class); |
|
68 | + $admin_config_route = route(AdminConfigPage::class); |
|
69 | 69 | |
70 | - if ($task_schedule === null) { |
|
71 | - FlashMessages::addMessage( |
|
72 | - I18N::translate('The task shedule with ID “%d” does not exist.', I18N::number($task_sched_id)), |
|
73 | - 'danger' |
|
74 | - ); |
|
75 | - return redirect($admin_config_route); |
|
76 | - } |
|
70 | + if ($task_schedule === null) { |
|
71 | + FlashMessages::addMessage( |
|
72 | + I18N::translate('The task shedule with ID “%d” does not exist.', I18N::number($task_sched_id)), |
|
73 | + 'danger' |
|
74 | + ); |
|
75 | + return redirect($admin_config_route); |
|
76 | + } |
|
77 | 77 | |
78 | - $success = $this->updateGeneralSettings($task_schedule, $request); |
|
79 | - $success = $success && $this->updateSpecificSettings($task_schedule, $request); |
|
78 | + $success = $this->updateGeneralSettings($task_schedule, $request); |
|
79 | + $success = $success && $this->updateSpecificSettings($task_schedule, $request); |
|
80 | 80 | |
81 | - if ($success) { |
|
82 | - FlashMessages::addMessage( |
|
83 | - I18N::translate('The scheduled task has been successfully updated'), |
|
84 | - 'success' |
|
85 | - ); |
|
86 | - //phpcs:ignore Generic.Files.LineLength.TooLong |
|
87 | - Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” has been updated.'); |
|
88 | - } |
|
81 | + if ($success) { |
|
82 | + FlashMessages::addMessage( |
|
83 | + I18N::translate('The scheduled task has been successfully updated'), |
|
84 | + 'success' |
|
85 | + ); |
|
86 | + //phpcs:ignore Generic.Files.LineLength.TooLong |
|
87 | + Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” has been updated.'); |
|
88 | + } |
|
89 | 89 | |
90 | - return redirect($admin_config_route); |
|
91 | - } |
|
90 | + return redirect($admin_config_route); |
|
91 | + } |
|
92 | 92 | |
93 | - /** |
|
94 | - * Update general settings for the task, based on the request parameters |
|
95 | - * |
|
96 | - * @param TaskSchedule $task_schedule |
|
97 | - * @param ServerRequestInterface $request |
|
98 | - * @return bool |
|
99 | - */ |
|
100 | - private function updateGeneralSettings(TaskSchedule $task_schedule, ServerRequestInterface $request): bool |
|
101 | - { |
|
102 | - $params = (array) $request->getParsedBody(); |
|
93 | + /** |
|
94 | + * Update general settings for the task, based on the request parameters |
|
95 | + * |
|
96 | + * @param TaskSchedule $task_schedule |
|
97 | + * @param ServerRequestInterface $request |
|
98 | + * @return bool |
|
99 | + */ |
|
100 | + private function updateGeneralSettings(TaskSchedule $task_schedule, ServerRequestInterface $request): bool |
|
101 | + { |
|
102 | + $params = (array) $request->getParsedBody(); |
|
103 | 103 | |
104 | - $frequency = (int) $params['frequency']; |
|
105 | - if ($frequency > 0) { |
|
106 | - $task_schedule->setFrequency(CarbonInterval::minutes($frequency)); |
|
107 | - } else { |
|
108 | - FlashMessages::addMessage(I18N::translate('The frequency is not in a valid format'), 'danger'); |
|
109 | - } |
|
104 | + $frequency = (int) $params['frequency']; |
|
105 | + if ($frequency > 0) { |
|
106 | + $task_schedule->setFrequency(CarbonInterval::minutes($frequency)); |
|
107 | + } else { |
|
108 | + FlashMessages::addMessage(I18N::translate('The frequency is not in a valid format'), 'danger'); |
|
109 | + } |
|
110 | 110 | |
111 | - $is_limited = (bool) $params['is_limited']; |
|
112 | - $nb_occur = (int) $params['nb_occur']; |
|
111 | + $is_limited = (bool) $params['is_limited']; |
|
112 | + $nb_occur = (int) $params['nb_occur']; |
|
113 | 113 | |
114 | - if ($is_limited) { |
|
115 | - if ($nb_occur > 0) { |
|
116 | - $task_schedule->setRemainingOccurences($nb_occur); |
|
117 | - } else { |
|
118 | - FlashMessages::addMessage( |
|
119 | - I18N::translate('The number of remaining occurences is not in a valid format'), |
|
120 | - 'danger' |
|
121 | - ); |
|
122 | - } |
|
123 | - } else { |
|
124 | - $task_schedule->setRemainingOccurences(0); |
|
125 | - } |
|
114 | + if ($is_limited) { |
|
115 | + if ($nb_occur > 0) { |
|
116 | + $task_schedule->setRemainingOccurences($nb_occur); |
|
117 | + } else { |
|
118 | + FlashMessages::addMessage( |
|
119 | + I18N::translate('The number of remaining occurences is not in a valid format'), |
|
120 | + 'danger' |
|
121 | + ); |
|
122 | + } |
|
123 | + } else { |
|
124 | + $task_schedule->setRemainingOccurences(0); |
|
125 | + } |
|
126 | 126 | |
127 | - try { |
|
128 | - $this->taskschedules_service->update($task_schedule); |
|
129 | - return true; |
|
130 | - } catch (Exception $ex) { |
|
131 | - Log::addErrorLog( |
|
132 | - sprintf( |
|
133 | - 'Error while updating the Task Schedule "%s". Exception: %s', |
|
134 | - $task_schedule->id(), |
|
135 | - $ex->getMessage() |
|
136 | - ) |
|
137 | - ); |
|
138 | - } |
|
127 | + try { |
|
128 | + $this->taskschedules_service->update($task_schedule); |
|
129 | + return true; |
|
130 | + } catch (Exception $ex) { |
|
131 | + Log::addErrorLog( |
|
132 | + sprintf( |
|
133 | + 'Error while updating the Task Schedule "%s". Exception: %s', |
|
134 | + $task_schedule->id(), |
|
135 | + $ex->getMessage() |
|
136 | + ) |
|
137 | + ); |
|
138 | + } |
|
139 | 139 | |
140 | - FlashMessages::addMessage(I18N::translate('An error occured while updating the scheduled task'), 'danger'); |
|
141 | - //@phpcs:ignore Generic.Files.LineLength.TooLong |
|
142 | - Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” could not be updated. See error log.'); |
|
143 | - return false; |
|
144 | - } |
|
140 | + FlashMessages::addMessage(I18N::translate('An error occured while updating the scheduled task'), 'danger'); |
|
141 | + //@phpcs:ignore Generic.Files.LineLength.TooLong |
|
142 | + Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” could not be updated. See error log.'); |
|
143 | + return false; |
|
144 | + } |
|
145 | 145 | |
146 | - /** |
|
147 | - * Update general settings for the task, based on the request parameters |
|
148 | - * |
|
149 | - * @param TaskSchedule $task_schedule |
|
150 | - * @param ServerRequestInterface $request |
|
151 | - * @return bool |
|
152 | - */ |
|
153 | - private function updateSpecificSettings(TaskSchedule $task_schedule, ServerRequestInterface $request): bool |
|
154 | - { |
|
155 | - $task = $this->taskschedules_service->findTask($task_schedule->taskId()); |
|
156 | - if ($task === null || !($task instanceof ConfigurableTaskInterface)) { |
|
157 | - return true; |
|
158 | - } |
|
146 | + /** |
|
147 | + * Update general settings for the task, based on the request parameters |
|
148 | + * |
|
149 | + * @param TaskSchedule $task_schedule |
|
150 | + * @param ServerRequestInterface $request |
|
151 | + * @return bool |
|
152 | + */ |
|
153 | + private function updateSpecificSettings(TaskSchedule $task_schedule, ServerRequestInterface $request): bool |
|
154 | + { |
|
155 | + $task = $this->taskschedules_service->findTask($task_schedule->taskId()); |
|
156 | + if ($task === null || !($task instanceof ConfigurableTaskInterface)) { |
|
157 | + return true; |
|
158 | + } |
|
159 | 159 | |
160 | - /** @var TaskInterface|ConfigurableTaskInterface $task */ |
|
161 | - if (!$task->updateConfig($request, $task_schedule)) { |
|
162 | - FlashMessages::addMessage( |
|
163 | - I18N::translate( |
|
164 | - 'An error occured while updating the specific settings of administrative task “%s”', |
|
165 | - $task->name() |
|
166 | - ), |
|
167 | - 'danger' |
|
168 | - ); |
|
169 | - //phpcs:ignore Generic.Files.LineLength.TooLong |
|
170 | - Log::addConfigurationLog('Module ' . $this->module->title() . ' : AdminTask “' . $task->name() . '” specific settings could not be updated. See error log.'); |
|
171 | - } |
|
160 | + /** @var TaskInterface|ConfigurableTaskInterface $task */ |
|
161 | + if (!$task->updateConfig($request, $task_schedule)) { |
|
162 | + FlashMessages::addMessage( |
|
163 | + I18N::translate( |
|
164 | + 'An error occured while updating the specific settings of administrative task “%s”', |
|
165 | + $task->name() |
|
166 | + ), |
|
167 | + 'danger' |
|
168 | + ); |
|
169 | + //phpcs:ignore Generic.Files.LineLength.TooLong |
|
170 | + Log::addConfigurationLog('Module ' . $this->module->title() . ' : AdminTask “' . $task->name() . '” specific settings could not be updated. See error log.'); |
|
171 | + } |
|
172 | 172 | |
173 | - return true; |
|
174 | - } |
|
173 | + return true; |
|
174 | + } |
|
175 | 175 | } |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | */ |
63 | 63 | public function handle(ServerRequestInterface $request): ResponseInterface |
64 | 64 | { |
65 | - $task_sched_id = (int) $request->getAttribute('task'); |
|
65 | + $task_sched_id = (int)$request->getAttribute('task'); |
|
66 | 66 | $task_schedule = $this->taskschedules_service->find($task_sched_id); |
67 | 67 | |
68 | 68 | $admin_config_route = route(AdminConfigPage::class); |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | 'success' |
85 | 85 | ); |
86 | 86 | //phpcs:ignore Generic.Files.LineLength.TooLong |
87 | - Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” has been updated.'); |
|
87 | + Log::addConfigurationLog('Module '.$this->module->title().' : Task Schedule “'.$task_schedule->id().'” has been updated.'); |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | return redirect($admin_config_route); |
@@ -99,17 +99,17 @@ discard block |
||
99 | 99 | */ |
100 | 100 | private function updateGeneralSettings(TaskSchedule $task_schedule, ServerRequestInterface $request): bool |
101 | 101 | { |
102 | - $params = (array) $request->getParsedBody(); |
|
102 | + $params = (array)$request->getParsedBody(); |
|
103 | 103 | |
104 | - $frequency = (int) $params['frequency']; |
|
104 | + $frequency = (int)$params['frequency']; |
|
105 | 105 | if ($frequency > 0) { |
106 | 106 | $task_schedule->setFrequency(CarbonInterval::minutes($frequency)); |
107 | 107 | } else { |
108 | 108 | FlashMessages::addMessage(I18N::translate('The frequency is not in a valid format'), 'danger'); |
109 | 109 | } |
110 | 110 | |
111 | - $is_limited = (bool) $params['is_limited']; |
|
112 | - $nb_occur = (int) $params['nb_occur']; |
|
111 | + $is_limited = (bool)$params['is_limited']; |
|
112 | + $nb_occur = (int)$params['nb_occur']; |
|
113 | 113 | |
114 | 114 | if ($is_limited) { |
115 | 115 | if ($nb_occur > 0) { |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | |
140 | 140 | FlashMessages::addMessage(I18N::translate('An error occured while updating the scheduled task'), 'danger'); |
141 | 141 | //@phpcs:ignore Generic.Files.LineLength.TooLong |
142 | - Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” could not be updated. See error log.'); |
|
142 | + Log::addConfigurationLog('Module '.$this->module->title().' : Task Schedule “'.$task_schedule->id().'” could not be updated. See error log.'); |
|
143 | 143 | return false; |
144 | 144 | } |
145 | 145 | |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | 'danger' |
168 | 168 | ); |
169 | 169 | //phpcs:ignore Generic.Files.LineLength.TooLong |
170 | - Log::addConfigurationLog('Module ' . $this->module->title() . ' : AdminTask “' . $task->name() . '” specific settings could not be updated. See error log.'); |
|
170 | + Log::addConfigurationLog('Module '.$this->module->title().' : AdminTask “'.$task->name().'” specific settings could not be updated. See error log.'); |
|
171 | 171 | } |
172 | 172 | |
173 | 173 | return true; |
@@ -29,48 +29,48 @@ |
||
29 | 29 | */ |
30 | 30 | class TaskTrigger implements RequestHandlerInterface |
31 | 31 | { |
32 | - /** |
|
33 | - * @var AdminTasksModule $module |
|
34 | - */ |
|
35 | - private $module; |
|
32 | + /** |
|
33 | + * @var AdminTasksModule $module |
|
34 | + */ |
|
35 | + private $module; |
|
36 | 36 | |
37 | - /** |
|
38 | - * @var TaskScheduleService $taskschedules_service |
|
39 | - */ |
|
40 | - private $taskschedules_service; |
|
37 | + /** |
|
38 | + * @var TaskScheduleService $taskschedules_service |
|
39 | + */ |
|
40 | + private $taskschedules_service; |
|
41 | 41 | |
42 | - /** |
|
43 | - * Constructor for TaskTrigger request handler |
|
44 | - * @param ModuleService $module_service |
|
45 | - * @param TaskScheduleService $taskschedules_service |
|
46 | - */ |
|
47 | - public function __construct(ModuleService $module_service, TaskScheduleService $taskschedules_service) |
|
48 | - { |
|
49 | - $this->module = $module_service->findByInterface(AdminTasksModule::class)->first(); |
|
50 | - $this->taskschedules_service = $taskschedules_service; |
|
51 | - } |
|
42 | + /** |
|
43 | + * Constructor for TaskTrigger request handler |
|
44 | + * @param ModuleService $module_service |
|
45 | + * @param TaskScheduleService $taskschedules_service |
|
46 | + */ |
|
47 | + public function __construct(ModuleService $module_service, TaskScheduleService $taskschedules_service) |
|
48 | + { |
|
49 | + $this->module = $module_service->findByInterface(AdminTasksModule::class)->first(); |
|
50 | + $this->taskschedules_service = $taskschedules_service; |
|
51 | + } |
|
52 | 52 | |
53 | - /** |
|
54 | - * {@inheritDoc} |
|
55 | - * @see \Psr\Http\Server\RequestHandlerInterface::handle() |
|
56 | - */ |
|
57 | - public function handle(ServerRequestInterface $request): ResponseInterface |
|
58 | - { |
|
59 | - if ($this->module === null) { |
|
60 | - throw new HttpNotFoundException(I18N::translate('The attached module could not be found.')); |
|
61 | - } |
|
53 | + /** |
|
54 | + * {@inheritDoc} |
|
55 | + * @see \Psr\Http\Server\RequestHandlerInterface::handle() |
|
56 | + */ |
|
57 | + public function handle(ServerRequestInterface $request): ResponseInterface |
|
58 | + { |
|
59 | + if ($this->module === null) { |
|
60 | + throw new HttpNotFoundException(I18N::translate('The attached module could not be found.')); |
|
61 | + } |
|
62 | 62 | |
63 | - $task_id = $request->getAttribute('task'); |
|
64 | - $token = $this->module->getPreference('MAJ_AT_FORCE_EXEC_TOKEN'); |
|
65 | - $force_token = $request->getQueryParams()['force'] ?? ''; |
|
66 | - $force = $token == $force_token; |
|
63 | + $task_id = $request->getAttribute('task'); |
|
64 | + $token = $this->module->getPreference('MAJ_AT_FORCE_EXEC_TOKEN'); |
|
65 | + $force_token = $request->getQueryParams()['force'] ?? ''; |
|
66 | + $force = $token == $force_token; |
|
67 | 67 | |
68 | - $task_schedules = $this->taskschedules_service->findTasksToRun($force, $task_id); |
|
68 | + $task_schedules = $this->taskschedules_service->findTasksToRun($force, $task_id); |
|
69 | 69 | |
70 | - foreach ($task_schedules as $task_schedule) { |
|
71 | - $this->taskschedules_service->run($task_schedule, $force); |
|
72 | - } |
|
70 | + foreach ($task_schedules as $task_schedule) { |
|
71 | + $this->taskschedules_service->run($task_schedule, $force); |
|
72 | + } |
|
73 | 73 | |
74 | - return response(); |
|
75 | - } |
|
74 | + return response(); |
|
75 | + } |
|
76 | 76 | } |
@@ -39,188 +39,188 @@ |
||
39 | 39 | */ |
40 | 40 | class HealthCheckEmailTask implements TaskInterface, ConfigurableTaskInterface |
41 | 41 | { |
42 | - /** |
|
43 | - * Name of the Tree preference to check if the task is enabled for that tree |
|
44 | - * @var string |
|
45 | - */ |
|
46 | - public const TREE_PREFERENCE_NAME = 'MAJ_AT_HEALTHCHECK_ENABLED'; |
|
42 | + /** |
|
43 | + * Name of the Tree preference to check if the task is enabled for that tree |
|
44 | + * @var string |
|
45 | + */ |
|
46 | + public const TREE_PREFERENCE_NAME = 'MAJ_AT_HEALTHCHECK_ENABLED'; |
|
47 | 47 | |
48 | - /** |
|
49 | - * @var AdminTasksModule $module |
|
50 | - */ |
|
51 | - private $module; |
|
48 | + /** |
|
49 | + * @var AdminTasksModule $module |
|
50 | + */ |
|
51 | + private $module; |
|
52 | 52 | |
53 | - /** |
|
54 | - * @var HealthCheckService $healthcheck_service; |
|
55 | - */ |
|
56 | - private $healthcheck_service; |
|
53 | + /** |
|
54 | + * @var HealthCheckService $healthcheck_service; |
|
55 | + */ |
|
56 | + private $healthcheck_service; |
|
57 | 57 | |
58 | - /** |
|
59 | - * @var EmailService $email_service; |
|
60 | - */ |
|
61 | - private $email_service; |
|
58 | + /** |
|
59 | + * @var EmailService $email_service; |
|
60 | + */ |
|
61 | + private $email_service; |
|
62 | 62 | |
63 | - /** |
|
64 | - * @var UserService $user_service |
|
65 | - */ |
|
66 | - private $user_service; |
|
63 | + /** |
|
64 | + * @var UserService $user_service |
|
65 | + */ |
|
66 | + private $user_service; |
|
67 | 67 | |
68 | - /** |
|
69 | - * @var TreeService $tree_service |
|
70 | - */ |
|
71 | - private $tree_service; |
|
68 | + /** |
|
69 | + * @var TreeService $tree_service |
|
70 | + */ |
|
71 | + private $tree_service; |
|
72 | 72 | |
73 | - /** |
|
74 | - * @var UpgradeService $upgrade_service |
|
75 | - */ |
|
76 | - private $upgrade_service; |
|
73 | + /** |
|
74 | + * @var UpgradeService $upgrade_service |
|
75 | + */ |
|
76 | + private $upgrade_service; |
|
77 | 77 | |
78 | - /** |
|
79 | - * Constructor for HealthCheckTask |
|
80 | - * |
|
81 | - * @param ModuleService $module_service |
|
82 | - * @param HealthCheckService $healthcheck_service |
|
83 | - * @param EmailService $email_service |
|
84 | - * @param UserService $user_service |
|
85 | - * @param TreeService $tree_service |
|
86 | - * @param UpgradeService $upgrade_service |
|
87 | - */ |
|
88 | - public function __construct( |
|
89 | - ModuleService $module_service, |
|
90 | - HealthCheckService $healthcheck_service, |
|
91 | - EmailService $email_service, |
|
92 | - UserService $user_service, |
|
93 | - TreeService $tree_service, |
|
94 | - UpgradeService $upgrade_service |
|
95 | - ) { |
|
96 | - $this->module = $module_service->findByInterface(AdminTasksModule::class)->first(); |
|
97 | - $this->healthcheck_service = $healthcheck_service; |
|
98 | - $this->email_service = $email_service; |
|
99 | - $this->user_service = $user_service; |
|
100 | - $this->tree_service = $tree_service; |
|
101 | - $this->upgrade_service = $upgrade_service; |
|
102 | - } |
|
78 | + /** |
|
79 | + * Constructor for HealthCheckTask |
|
80 | + * |
|
81 | + * @param ModuleService $module_service |
|
82 | + * @param HealthCheckService $healthcheck_service |
|
83 | + * @param EmailService $email_service |
|
84 | + * @param UserService $user_service |
|
85 | + * @param TreeService $tree_service |
|
86 | + * @param UpgradeService $upgrade_service |
|
87 | + */ |
|
88 | + public function __construct( |
|
89 | + ModuleService $module_service, |
|
90 | + HealthCheckService $healthcheck_service, |
|
91 | + EmailService $email_service, |
|
92 | + UserService $user_service, |
|
93 | + TreeService $tree_service, |
|
94 | + UpgradeService $upgrade_service |
|
95 | + ) { |
|
96 | + $this->module = $module_service->findByInterface(AdminTasksModule::class)->first(); |
|
97 | + $this->healthcheck_service = $healthcheck_service; |
|
98 | + $this->email_service = $email_service; |
|
99 | + $this->user_service = $user_service; |
|
100 | + $this->tree_service = $tree_service; |
|
101 | + $this->upgrade_service = $upgrade_service; |
|
102 | + } |
|
103 | 103 | |
104 | 104 | |
105 | - /** |
|
106 | - * {@inheritDoc} |
|
107 | - * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskInterface::name() |
|
108 | - */ |
|
109 | - public function name(): string |
|
110 | - { |
|
111 | - return I18N::translate('Healthcheck Email'); |
|
112 | - } |
|
105 | + /** |
|
106 | + * {@inheritDoc} |
|
107 | + * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskInterface::name() |
|
108 | + */ |
|
109 | + public function name(): string |
|
110 | + { |
|
111 | + return I18N::translate('Healthcheck Email'); |
|
112 | + } |
|
113 | 113 | |
114 | - /** |
|
115 | - * {@inheritDoc} |
|
116 | - * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskInterface::defaultFrequency() |
|
117 | - */ |
|
118 | - public function defaultFrequency(): int |
|
119 | - { |
|
120 | - return 10080; // = 1 week = 7 * 24 * 60 min |
|
121 | - } |
|
114 | + /** |
|
115 | + * {@inheritDoc} |
|
116 | + * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskInterface::defaultFrequency() |
|
117 | + */ |
|
118 | + public function defaultFrequency(): int |
|
119 | + { |
|
120 | + return 10080; // = 1 week = 7 * 24 * 60 min |
|
121 | + } |
|
122 | 122 | |
123 | - /** |
|
124 | - * {@inheritDoc} |
|
125 | - * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskInterface::run() |
|
126 | - */ |
|
127 | - public function run(TaskSchedule $task_schedule): bool |
|
128 | - { |
|
129 | - if ($this->module === null) { |
|
130 | - return false; |
|
131 | - } |
|
123 | + /** |
|
124 | + * {@inheritDoc} |
|
125 | + * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskInterface::run() |
|
126 | + */ |
|
127 | + public function run(TaskSchedule $task_schedule): bool |
|
128 | + { |
|
129 | + if ($this->module === null) { |
|
130 | + return false; |
|
131 | + } |
|
132 | 132 | |
133 | - $res = true; |
|
133 | + $res = true; |
|
134 | 134 | |
135 | - // Compute the number of days to compute |
|
136 | - $interval_lastrun = $task_schedule->lastRunTime()->diffAsCarbonInterval(Carbon::now()); |
|
137 | - //@phpcs:ignore Generic.Files.LineLength.TooLong |
|
138 | - $interval = $interval_lastrun->greaterThan($task_schedule->frequency()) ? $interval_lastrun : $task_schedule->frequency(); |
|
139 | - $nb_days = (int) $interval->ceilDay()->totalDays; |
|
135 | + // Compute the number of days to compute |
|
136 | + $interval_lastrun = $task_schedule->lastRunTime()->diffAsCarbonInterval(Carbon::now()); |
|
137 | + //@phpcs:ignore Generic.Files.LineLength.TooLong |
|
138 | + $interval = $interval_lastrun->greaterThan($task_schedule->frequency()) ? $interval_lastrun : $task_schedule->frequency(); |
|
139 | + $nb_days = (int) $interval->ceilDay()->totalDays; |
|
140 | 140 | |
141 | - $view_params_site = [ |
|
142 | - 'nb_days' => $nb_days, |
|
143 | - 'upgrade_available' => $this->upgrade_service->isUpgradeAvailable(), |
|
144 | - 'latest_version' => $this->upgrade_service->latestVersion(), |
|
145 | - 'download_url' => $this->upgrade_service->downloadUrl(), |
|
146 | - 'all_users' => $this->user_service->all(), |
|
147 | - 'unapproved' => $this->user_service->unapproved(), |
|
148 | - 'unverified' => $this->user_service->unverified(), |
|
149 | - ]; |
|
141 | + $view_params_site = [ |
|
142 | + 'nb_days' => $nb_days, |
|
143 | + 'upgrade_available' => $this->upgrade_service->isUpgradeAvailable(), |
|
144 | + 'latest_version' => $this->upgrade_service->latestVersion(), |
|
145 | + 'download_url' => $this->upgrade_service->downloadUrl(), |
|
146 | + 'all_users' => $this->user_service->all(), |
|
147 | + 'unapproved' => $this->user_service->unapproved(), |
|
148 | + 'unverified' => $this->user_service->unverified(), |
|
149 | + ]; |
|
150 | 150 | |
151 | - foreach ($this->tree_service->all() as $tree) { |
|
152 | - /** @var Tree $tree */ |
|
151 | + foreach ($this->tree_service->all() as $tree) { |
|
152 | + /** @var Tree $tree */ |
|
153 | 153 | |
154 | - if ($tree->getPreference(self::TREE_PREFERENCE_NAME) !== '1') { |
|
155 | - continue; |
|
156 | - } |
|
154 | + if ($tree->getPreference(self::TREE_PREFERENCE_NAME) !== '1') { |
|
155 | + continue; |
|
156 | + } |
|
157 | 157 | |
158 | - $webmaster = $this->user_service->find((int) $tree->getPreference('WEBMASTER_USER_ID')); |
|
159 | - if ($webmaster === null) { |
|
160 | - continue; |
|
161 | - } |
|
162 | - I18N::init($webmaster->getPreference('language')); |
|
158 | + $webmaster = $this->user_service->find((int) $tree->getPreference('WEBMASTER_USER_ID')); |
|
159 | + if ($webmaster === null) { |
|
160 | + continue; |
|
161 | + } |
|
162 | + I18N::init($webmaster->getPreference('language')); |
|
163 | 163 | |
164 | - $error_logs = $this->healthcheck_service->errorLogs($tree, $nb_days); |
|
165 | - $nb_errors = $error_logs->sum('nblogs'); |
|
164 | + $error_logs = $this->healthcheck_service->errorLogs($tree, $nb_days); |
|
165 | + $nb_errors = $error_logs->sum('nblogs'); |
|
166 | 166 | |
167 | - $view_params = array_merge($view_params_site, [ |
|
168 | - 'tree' => $tree, |
|
169 | - 'total_by_type' => $this->healthcheck_service->countByRecordType($tree), |
|
170 | - 'change_by_type' => $this->healthcheck_service->changesByRecordType($tree, $nb_days), |
|
171 | - 'error_logs' => $error_logs, |
|
172 | - 'nb_errors' => $nb_errors |
|
173 | - ]); |
|
167 | + $view_params = array_merge($view_params_site, [ |
|
168 | + 'tree' => $tree, |
|
169 | + 'total_by_type' => $this->healthcheck_service->countByRecordType($tree), |
|
170 | + 'change_by_type' => $this->healthcheck_service->changesByRecordType($tree, $nb_days), |
|
171 | + 'error_logs' => $error_logs, |
|
172 | + 'nb_errors' => $nb_errors |
|
173 | + ]); |
|
174 | 174 | |
175 | - $res = $res && $this->email_service->send( |
|
176 | - new TreeUser($tree), |
|
177 | - $webmaster, |
|
178 | - new NoReplyUser(), |
|
179 | - I18N::translate('Health Check Report') . ' - ' . I18N::translate('Tree %s', $tree->name()), |
|
180 | - view($this->module->name() . '::tasks/healthcheck/email-healthcheck-text', $view_params), |
|
181 | - view($this->module->name() . '::tasks/healthcheck/email-healthcheck-html', $view_params) |
|
182 | - ); |
|
183 | - } |
|
175 | + $res = $res && $this->email_service->send( |
|
176 | + new TreeUser($tree), |
|
177 | + $webmaster, |
|
178 | + new NoReplyUser(), |
|
179 | + I18N::translate('Health Check Report') . ' - ' . I18N::translate('Tree %s', $tree->name()), |
|
180 | + view($this->module->name() . '::tasks/healthcheck/email-healthcheck-text', $view_params), |
|
181 | + view($this->module->name() . '::tasks/healthcheck/email-healthcheck-html', $view_params) |
|
182 | + ); |
|
183 | + } |
|
184 | 184 | |
185 | - return $res; |
|
186 | - } |
|
185 | + return $res; |
|
186 | + } |
|
187 | 187 | |
188 | - /** |
|
189 | - * {@inheritDoc} |
|
190 | - * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\ConfigurableTaskInterface::configView() |
|
191 | - */ |
|
192 | - public function configView(ServerRequestInterface $request): string |
|
193 | - { |
|
194 | - return view($this->module->name() . '::tasks/healthcheck/config', [ |
|
195 | - 'all_trees' => $this->tree_service->all() |
|
196 | - ]); |
|
197 | - } |
|
188 | + /** |
|
189 | + * {@inheritDoc} |
|
190 | + * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\ConfigurableTaskInterface::configView() |
|
191 | + */ |
|
192 | + public function configView(ServerRequestInterface $request): string |
|
193 | + { |
|
194 | + return view($this->module->name() . '::tasks/healthcheck/config', [ |
|
195 | + 'all_trees' => $this->tree_service->all() |
|
196 | + ]); |
|
197 | + } |
|
198 | 198 | |
199 | - /** |
|
200 | - * {@inheritDoc} |
|
201 | - * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\ConfigurableTaskInterface::updateConfig() |
|
202 | - */ |
|
203 | - public function updateConfig(ServerRequestInterface $request, TaskSchedule $task_schedule): bool |
|
204 | - { |
|
205 | - try { |
|
206 | - $params = (array) $request->getParsedBody(); |
|
199 | + /** |
|
200 | + * {@inheritDoc} |
|
201 | + * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\ConfigurableTaskInterface::updateConfig() |
|
202 | + */ |
|
203 | + public function updateConfig(ServerRequestInterface $request, TaskSchedule $task_schedule): bool |
|
204 | + { |
|
205 | + try { |
|
206 | + $params = (array) $request->getParsedBody(); |
|
207 | 207 | |
208 | - foreach ($this->tree_service->all() as $tree) { |
|
209 | - if (Auth::isManager($tree)) { |
|
210 | - $tree_enabled = (bool) ($params['HEALTHCHECK_ENABLED_' . $tree->id()] ?? false); |
|
211 | - $tree->setPreference(self::TREE_PREFERENCE_NAME, $tree_enabled ? '1' : '0'); |
|
212 | - } |
|
213 | - } |
|
214 | - return true; |
|
215 | - } catch (Exception $ex) { |
|
216 | - Log::addErrorLog( |
|
217 | - sprintf( |
|
218 | - 'Error while updating the Task schedule "%s". Exception: %s', |
|
219 | - $task_schedule->id(), |
|
220 | - $ex->getMessage() |
|
221 | - ) |
|
222 | - ); |
|
223 | - } |
|
224 | - return false; |
|
225 | - } |
|
208 | + foreach ($this->tree_service->all() as $tree) { |
|
209 | + if (Auth::isManager($tree)) { |
|
210 | + $tree_enabled = (bool) ($params['HEALTHCHECK_ENABLED_' . $tree->id()] ?? false); |
|
211 | + $tree->setPreference(self::TREE_PREFERENCE_NAME, $tree_enabled ? '1' : '0'); |
|
212 | + } |
|
213 | + } |
|
214 | + return true; |
|
215 | + } catch (Exception $ex) { |
|
216 | + Log::addErrorLog( |
|
217 | + sprintf( |
|
218 | + 'Error while updating the Task schedule "%s". Exception: %s', |
|
219 | + $task_schedule->id(), |
|
220 | + $ex->getMessage() |
|
221 | + ) |
|
222 | + ); |
|
223 | + } |
|
224 | + return false; |
|
225 | + } |
|
226 | 226 | } |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | $interval_lastrun = $task_schedule->lastRunTime()->diffAsCarbonInterval(Carbon::now()); |
137 | 137 | //@phpcs:ignore Generic.Files.LineLength.TooLong |
138 | 138 | $interval = $interval_lastrun->greaterThan($task_schedule->frequency()) ? $interval_lastrun : $task_schedule->frequency(); |
139 | - $nb_days = (int) $interval->ceilDay()->totalDays; |
|
139 | + $nb_days = (int)$interval->ceilDay()->totalDays; |
|
140 | 140 | |
141 | 141 | $view_params_site = [ |
142 | 142 | 'nb_days' => $nb_days, |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | continue; |
156 | 156 | } |
157 | 157 | |
158 | - $webmaster = $this->user_service->find((int) $tree->getPreference('WEBMASTER_USER_ID')); |
|
158 | + $webmaster = $this->user_service->find((int)$tree->getPreference('WEBMASTER_USER_ID')); |
|
159 | 159 | if ($webmaster === null) { |
160 | 160 | continue; |
161 | 161 | } |
@@ -176,9 +176,9 @@ discard block |
||
176 | 176 | new TreeUser($tree), |
177 | 177 | $webmaster, |
178 | 178 | new NoReplyUser(), |
179 | - I18N::translate('Health Check Report') . ' - ' . I18N::translate('Tree %s', $tree->name()), |
|
180 | - view($this->module->name() . '::tasks/healthcheck/email-healthcheck-text', $view_params), |
|
181 | - view($this->module->name() . '::tasks/healthcheck/email-healthcheck-html', $view_params) |
|
179 | + I18N::translate('Health Check Report').' - '.I18N::translate('Tree %s', $tree->name()), |
|
180 | + view($this->module->name().'::tasks/healthcheck/email-healthcheck-text', $view_params), |
|
181 | + view($this->module->name().'::tasks/healthcheck/email-healthcheck-html', $view_params) |
|
182 | 182 | ); |
183 | 183 | } |
184 | 184 | |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | */ |
192 | 192 | public function configView(ServerRequestInterface $request): string |
193 | 193 | { |
194 | - return view($this->module->name() . '::tasks/healthcheck/config', [ |
|
194 | + return view($this->module->name().'::tasks/healthcheck/config', [ |
|
195 | 195 | 'all_trees' => $this->tree_service->all() |
196 | 196 | ]); |
197 | 197 | } |
@@ -203,11 +203,11 @@ discard block |
||
203 | 203 | public function updateConfig(ServerRequestInterface $request, TaskSchedule $task_schedule): bool |
204 | 204 | { |
205 | 205 | try { |
206 | - $params = (array) $request->getParsedBody(); |
|
206 | + $params = (array)$request->getParsedBody(); |
|
207 | 207 | |
208 | 208 | foreach ($this->tree_service->all() as $tree) { |
209 | 209 | if (Auth::isManager($tree)) { |
210 | - $tree_enabled = (bool) ($params['HEALTHCHECK_ENABLED_' . $tree->id()] ?? false); |
|
210 | + $tree_enabled = (bool)($params['HEALTHCHECK_ENABLED_'.$tree->id()] ?? false); |
|
211 | 211 | $tree->setPreference(self::TREE_PREFERENCE_NAME, $tree_enabled ? '1' : '0'); |
212 | 212 | } |
213 | 213 | } |
@@ -40,125 +40,125 @@ |
||
40 | 40 | * Allow for tasks to be run on a (nearly-)regular schedule |
41 | 41 | */ |
42 | 42 | class AdminTasksModule extends AbstractModuleMaj implements |
43 | - ModuleCustomInterface, |
|
44 | - ModuleConfigInterface, |
|
45 | - ModuleGlobalInterface, |
|
46 | - ModuleTasksProviderInterface |
|
43 | + ModuleCustomInterface, |
|
44 | + ModuleConfigInterface, |
|
45 | + ModuleGlobalInterface, |
|
46 | + ModuleTasksProviderInterface |
|
47 | 47 | { |
48 | - use ModuleConfigTrait; |
|
49 | - use ModuleGlobalTrait; |
|
48 | + use ModuleConfigTrait; |
|
49 | + use ModuleGlobalTrait; |
|
50 | 50 | |
51 | - //How to update the database schema for this module |
|
52 | - private const SCHEMA_TARGET_VERSION = 2; |
|
53 | - private const SCHEMA_SETTING_NAME = 'MAJ_ADMTASKS_SCHEMA_VERSION'; |
|
54 | - private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__ . '\Schema'; |
|
51 | + //How to update the database schema for this module |
|
52 | + private const SCHEMA_TARGET_VERSION = 2; |
|
53 | + private const SCHEMA_SETTING_NAME = 'MAJ_ADMTASKS_SCHEMA_VERSION'; |
|
54 | + private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__ . '\Schema'; |
|
55 | 55 | |
56 | - /** |
|
57 | - * {@inheritDoc} |
|
58 | - * @see \Fisharebest\Webtrees\Module\AbstractModule::title() |
|
59 | - */ |
|
60 | - public function title(): string |
|
61 | - { |
|
62 | - return I18N::translate('Administration Tasks'); |
|
63 | - } |
|
56 | + /** |
|
57 | + * {@inheritDoc} |
|
58 | + * @see \Fisharebest\Webtrees\Module\AbstractModule::title() |
|
59 | + */ |
|
60 | + public function title(): string |
|
61 | + { |
|
62 | + return I18N::translate('Administration Tasks'); |
|
63 | + } |
|
64 | 64 | |
65 | - /** |
|
66 | - * {@inheritDoc} |
|
67 | - * @see \Fisharebest\Webtrees\Module\AbstractModule::description() |
|
68 | - */ |
|
69 | - public function description(): string |
|
70 | - { |
|
71 | - return I18N::translate('Manage and run nearly-scheduled administration tasks.'); |
|
72 | - } |
|
65 | + /** |
|
66 | + * {@inheritDoc} |
|
67 | + * @see \Fisharebest\Webtrees\Module\AbstractModule::description() |
|
68 | + */ |
|
69 | + public function description(): string |
|
70 | + { |
|
71 | + return I18N::translate('Manage and run nearly-scheduled administration tasks.'); |
|
72 | + } |
|
73 | 73 | |
74 | - /** |
|
75 | - * {@inheritDoc} |
|
76 | - * @see \Fisharebest\Webtrees\Module\AbstractModule::boot() |
|
77 | - */ |
|
78 | - public function boot(): void |
|
79 | - { |
|
80 | - parent::boot(); |
|
81 | - app(MigrationService::class)->updateSchema( |
|
82 | - self::SCHEMA_MIGRATION_PREFIX, |
|
83 | - self::SCHEMA_SETTING_NAME, |
|
84 | - self::SCHEMA_TARGET_VERSION |
|
85 | - ); |
|
86 | - } |
|
74 | + /** |
|
75 | + * {@inheritDoc} |
|
76 | + * @see \Fisharebest\Webtrees\Module\AbstractModule::boot() |
|
77 | + */ |
|
78 | + public function boot(): void |
|
79 | + { |
|
80 | + parent::boot(); |
|
81 | + app(MigrationService::class)->updateSchema( |
|
82 | + self::SCHEMA_MIGRATION_PREFIX, |
|
83 | + self::SCHEMA_SETTING_NAME, |
|
84 | + self::SCHEMA_TARGET_VERSION |
|
85 | + ); |
|
86 | + } |
|
87 | 87 | |
88 | - /** |
|
89 | - * {@inheritDoc} |
|
90 | - * @see \MyArtJaub\Webtrees\Module\AbstractModuleMaj::loadRoutes() |
|
91 | - */ |
|
92 | - public function loadRoutes(Map $router): void |
|
93 | - { |
|
94 | - $router->attach('', '', static function (Map $router) { |
|
88 | + /** |
|
89 | + * {@inheritDoc} |
|
90 | + * @see \MyArtJaub\Webtrees\Module\AbstractModuleMaj::loadRoutes() |
|
91 | + */ |
|
92 | + public function loadRoutes(Map $router): void |
|
93 | + { |
|
94 | + $router->attach('', '', static function (Map $router) { |
|
95 | 95 | |
96 | - $router->attach('', '/module-maj/admintasks', static function (Map $router) { |
|
96 | + $router->attach('', '/module-maj/admintasks', static function (Map $router) { |
|
97 | 97 | |
98 | - $router->attach('', '/admin', static function (Map $router) { |
|
98 | + $router->attach('', '/admin', static function (Map $router) { |
|
99 | 99 | |
100 | - $router->extras([ |
|
101 | - 'middleware' => [ |
|
102 | - AuthAdministrator::class, |
|
103 | - ], |
|
104 | - ]); |
|
105 | - $router->get(AdminConfigPage::class, '/config', AdminConfigPage::class); |
|
100 | + $router->extras([ |
|
101 | + 'middleware' => [ |
|
102 | + AuthAdministrator::class, |
|
103 | + ], |
|
104 | + ]); |
|
105 | + $router->get(AdminConfigPage::class, '/config', AdminConfigPage::class); |
|
106 | 106 | |
107 | - $router->attach('', '/tasks', static function (Map $router) { |
|
107 | + $router->attach('', '/tasks', static function (Map $router) { |
|
108 | 108 | |
109 | - $router->get(TasksList::class, '', TasksList::class); |
|
110 | - $router->get(TaskEditPage::class, '/{task}', TaskEditPage::class); |
|
111 | - $router->post(TaskEditAction::class, '/{task}', TaskEditAction::class); |
|
112 | - $router->get(TaskStatusAction::class, '/{task}/status/{enable}', TaskStatusAction::class); |
|
113 | - }); |
|
114 | - }); |
|
109 | + $router->get(TasksList::class, '', TasksList::class); |
|
110 | + $router->get(TaskEditPage::class, '/{task}', TaskEditPage::class); |
|
111 | + $router->post(TaskEditAction::class, '/{task}', TaskEditAction::class); |
|
112 | + $router->get(TaskStatusAction::class, '/{task}/status/{enable}', TaskStatusAction::class); |
|
113 | + }); |
|
114 | + }); |
|
115 | 115 | |
116 | - $router->get(TaskTrigger::class, '/trigger{/task}', TaskTrigger::class) |
|
117 | - ->allows(RequestMethodInterface::METHOD_POST); |
|
116 | + $router->get(TaskTrigger::class, '/trigger{/task}', TaskTrigger::class) |
|
117 | + ->allows(RequestMethodInterface::METHOD_POST); |
|
118 | 118 | |
119 | - $router->post(TokenGenerate::class, '/token', TokenGenerate::class) |
|
120 | - ->extras(['middleware' => [AuthAdministrator::class]]); |
|
121 | - }); |
|
122 | - }); |
|
123 | - } |
|
119 | + $router->post(TokenGenerate::class, '/token', TokenGenerate::class) |
|
120 | + ->extras(['middleware' => [AuthAdministrator::class]]); |
|
121 | + }); |
|
122 | + }); |
|
123 | + } |
|
124 | 124 | |
125 | - /** |
|
126 | - * {@inheritDoc} |
|
127 | - * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleLatestVersion() |
|
128 | - */ |
|
129 | - public function customModuleVersion(): string |
|
130 | - { |
|
131 | - return '2.0.5-v.1'; |
|
132 | - } |
|
125 | + /** |
|
126 | + * {@inheritDoc} |
|
127 | + * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleLatestVersion() |
|
128 | + */ |
|
129 | + public function customModuleVersion(): string |
|
130 | + { |
|
131 | + return '2.0.5-v.1'; |
|
132 | + } |
|
133 | 133 | |
134 | - /** |
|
135 | - * {@inheritDoc} |
|
136 | - * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink() |
|
137 | - */ |
|
138 | - public function getConfigLink(): string |
|
139 | - { |
|
140 | - return route(AdminConfigPage::class); |
|
141 | - } |
|
134 | + /** |
|
135 | + * {@inheritDoc} |
|
136 | + * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink() |
|
137 | + */ |
|
138 | + public function getConfigLink(): string |
|
139 | + { |
|
140 | + return route(AdminConfigPage::class); |
|
141 | + } |
|
142 | 142 | |
143 | - /** |
|
144 | - * {@inheritDoc} |
|
145 | - * @see \Fisharebest\Webtrees\Module\ModuleGlobalInterface::bodyContent() |
|
146 | - */ |
|
147 | - public function bodyContent(): string |
|
148 | - { |
|
149 | - $parameters['url'] = route(TaskTrigger::class); |
|
143 | + /** |
|
144 | + * {@inheritDoc} |
|
145 | + * @see \Fisharebest\Webtrees\Module\ModuleGlobalInterface::bodyContent() |
|
146 | + */ |
|
147 | + public function bodyContent(): string |
|
148 | + { |
|
149 | + $parameters['url'] = route(TaskTrigger::class); |
|
150 | 150 | |
151 | - return view($this->name() . '::snippet', $parameters); |
|
152 | - } |
|
151 | + return view($this->name() . '::snippet', $parameters); |
|
152 | + } |
|
153 | 153 | |
154 | - /** |
|
155 | - * {@inheritDoc} |
|
156 | - * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\ModuleTasksProviderInterface::listTasks() |
|
157 | - */ |
|
158 | - public function listTasks(): array |
|
159 | - { |
|
160 | - return [ |
|
161 | - 'maj-healthcheck' => HealthCheckEmailTask::class |
|
162 | - ]; |
|
163 | - } |
|
154 | + /** |
|
155 | + * {@inheritDoc} |
|
156 | + * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\ModuleTasksProviderInterface::listTasks() |
|
157 | + */ |
|
158 | + public function listTasks(): array |
|
159 | + { |
|
160 | + return [ |
|
161 | + 'maj-healthcheck' => HealthCheckEmailTask::class |
|
162 | + ]; |
|
163 | + } |
|
164 | 164 | } |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | //How to update the database schema for this module |
52 | 52 | private const SCHEMA_TARGET_VERSION = 2; |
53 | 53 | private const SCHEMA_SETTING_NAME = 'MAJ_ADMTASKS_SCHEMA_VERSION'; |
54 | - private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__ . '\Schema'; |
|
54 | + private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__.'\Schema'; |
|
55 | 55 | |
56 | 56 | /** |
57 | 57 | * {@inheritDoc} |
@@ -91,11 +91,11 @@ discard block |
||
91 | 91 | */ |
92 | 92 | public function loadRoutes(Map $router): void |
93 | 93 | { |
94 | - $router->attach('', '', static function (Map $router) { |
|
94 | + $router->attach('', '', static function(Map $router) { |
|
95 | 95 | |
96 | - $router->attach('', '/module-maj/admintasks', static function (Map $router) { |
|
96 | + $router->attach('', '/module-maj/admintasks', static function(Map $router) { |
|
97 | 97 | |
98 | - $router->attach('', '/admin', static function (Map $router) { |
|
98 | + $router->attach('', '/admin', static function(Map $router) { |
|
99 | 99 | |
100 | 100 | $router->extras([ |
101 | 101 | 'middleware' => [ |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | ]); |
105 | 105 | $router->get(AdminConfigPage::class, '/config', AdminConfigPage::class); |
106 | 106 | |
107 | - $router->attach('', '/tasks', static function (Map $router) { |
|
107 | + $router->attach('', '/tasks', static function(Map $router) { |
|
108 | 108 | |
109 | 109 | $router->get(TasksList::class, '', TasksList::class); |
110 | 110 | $router->get(TaskEditPage::class, '/{task}', TaskEditPage::class); |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | { |
149 | 149 | $parameters['url'] = route(TaskTrigger::class); |
150 | 150 | |
151 | - return view($this->name() . '::snippet', $parameters); |
|
151 | + return view($this->name().'::snippet', $parameters); |
|
152 | 152 | } |
153 | 153 | |
154 | 154 | /** |
@@ -20,11 +20,11 @@ |
||
20 | 20 | interface ModuleTasksProviderInterface |
21 | 21 | { |
22 | 22 | |
23 | - /** |
|
24 | - * List tasks provided by the module as an associative array. |
|
25 | - * They keys are used as task IDs for storage and reference. |
|
26 | - * |
|
27 | - * @return array List of tasks |
|
28 | - */ |
|
29 | - public function listTasks(): array; |
|
23 | + /** |
|
24 | + * List tasks provided by the module as an associative array. |
|
25 | + * They keys are used as task IDs for storage and reference. |
|
26 | + * |
|
27 | + * @return array List of tasks |
|
28 | + */ |
|
29 | + public function listTasks(): array; |
|
30 | 30 | } |