← All changes
|
app/Http/Controllers/AIActivityLoggerController.php
+12
-8
1.10.2
→
2.4.0
View file →
| @@ -2,9 +2,9 @@ | ||
| 2 | 2 | |
| 3 | 3 | namespace FluentSupport\App\Http\Controllers; |
| 4 | 4 | |
| 5 | 5 | use FluentSupport\App\Services\Helper; |
| 6 | -use FluentSupport\Framework\Request\Request; | |
| 6 | +use FluentSupport\Framework\Http\Request\Request; | |
| 7 | 7 | |
| 8 | 8 | /** |
| 9 | 9 | * ActivityLoggerController class for REST API |
| 10 | 10 | * This class is responsible for getting data for all request related to activity and activity settings |
| @@ -16,18 +16,21 @@ | ||
| 16 | 16 | { |
| 17 | 17 | public function getAIActivities(Request $request) |
| 18 | 18 | { |
| 19 | 19 | try { |
| 20 | + $filters = $request->get('filters', null); | |
| 21 | + $filters = is_array($filters) ? map_deep($filters, 'sanitize_text_field') : []; | |
| 22 | + | |
| 20 | 23 | return Helper::getAIActivities( [ |
| 21 | 24 | 'page' => $request->getSafe('page', 'intval', 1), |
| 22 | 25 | 'per_page' => $request->getSafe('per_page', 'intval', 10), |
| 23 | 26 | 'from' => $request->getSafe('from', 'sanitize_text_field', ''), |
| 24 | 27 | 'to' => $request->getSafe('to', 'sanitize_text_field', ''), |
| 25 | - 'filters' => $request->getSafe('filters', null, []), | |
| 28 | + 'filters' => $filters, | |
| 26 | 29 | ] ); |
| 27 | 30 | } catch (\Exception $e) { |
| 28 | 31 | return $this->sendError([ |
| 29 | - 'message' => $e->getMessage() | |
| 32 | + 'message' => Helper::getSafeErrorMessage($e) | |
| 30 | 33 | ]); |
| 31 | 34 | } |
| 32 | 35 | } |
| 33 | 36 | |
| @@ -36,18 +39,19 @@ | ||
| 36 | 39 | * @return \WP_REST_Response | array |
| 37 | 40 | */ |
| 38 | 41 | public function updateSettings (Request $request) |
| 39 | 42 | { |
| 40 | - $settings = $request->get('ai_activity_settings'); | |
| 43 | + $settings = $request->get('ai_activity_settings', null); | |
| 44 | + $settings = is_array($settings) ? $settings : []; | |
| 41 | 45 | $settings = [ |
| 42 | - 'delete_days' => intval($settings['delete_days']), | |
| 43 | - 'disable_logs' => sanitize_text_field($settings['disable_logs']) | |
| 46 | + 'delete_days' => intval($settings['delete_days'] ?? 0), | |
| 47 | + 'disable_logs' => sanitize_text_field($settings['disable_logs'] ?? '') | |
| 44 | 48 | ]; |
| 45 | 49 | try { |
| 46 | 50 | return Helper::updateAISettings($settings); |
| 47 | 51 | } catch (\Exception $e) { |
| 48 | 52 | return $this->sendError([ |
| 49 | - 'message' => $e->getMessage() | |
| 53 | + 'message' => Helper::getSafeErrorMessage($e) | |
| 50 | 54 | ]); |
| 51 | 55 | } |
| 52 | 56 | } |
| 53 | 57 | |
| @@ -60,9 +64,9 @@ | ||
| 60 | 64 | try { |
| 61 | 65 | return Helper::getSettings(); |
| 62 | 66 | } catch (\Exception $e) { |
| 63 | 67 | return $this->sendError([ |
| 64 | - 'message' => $e->getMessage() | |
| 68 | + 'message' => Helper::getSafeErrorMessage($e) | |
| 65 | 69 | ]); |
| 66 | 70 | } |
| 67 | 71 | } |
| 68 | 72 | |