@@ -8,85 +8,85 @@ |
||
8 | 8 | |
9 | 9 | class BlocksController extends Controller |
10 | 10 | { |
11 | - /** |
|
12 | - * @param array $categories |
|
13 | - * @return array |
|
14 | - * @filter block_categories |
|
15 | - */ |
|
16 | - public function filterBlockCategories($categories) |
|
17 | - { |
|
18 | - $categories = Arr::consolidateArray($categories); |
|
19 | - $categories[] = [ |
|
20 | - 'icon' => null, |
|
21 | - 'slug' => Application::ID, |
|
22 | - 'title' => glsr()->name, |
|
23 | - ]; |
|
24 | - return $categories; |
|
25 | - } |
|
11 | + /** |
|
12 | + * @param array $categories |
|
13 | + * @return array |
|
14 | + * @filter block_categories |
|
15 | + */ |
|
16 | + public function filterBlockCategories($categories) |
|
17 | + { |
|
18 | + $categories = Arr::consolidateArray($categories); |
|
19 | + $categories[] = [ |
|
20 | + 'icon' => null, |
|
21 | + 'slug' => Application::ID, |
|
22 | + 'title' => glsr()->name, |
|
23 | + ]; |
|
24 | + return $categories; |
|
25 | + } |
|
26 | 26 | |
27 | - /** |
|
28 | - * @param array $editors |
|
29 | - * @param string $postType |
|
30 | - * @return array |
|
31 | - * @filter classic_editor_enabled_editors_for_post_type |
|
32 | - * @plugin classic-editor/classic-editor.php |
|
33 | - */ |
|
34 | - public function filterEnabledEditors($editors, $postType) |
|
35 | - { |
|
36 | - return Application::POST_TYPE == $postType |
|
37 | - ? ['block_editor' => false, 'classic_editor' => false] |
|
38 | - : $editors; |
|
39 | - } |
|
27 | + /** |
|
28 | + * @param array $editors |
|
29 | + * @param string $postType |
|
30 | + * @return array |
|
31 | + * @filter classic_editor_enabled_editors_for_post_type |
|
32 | + * @plugin classic-editor/classic-editor.php |
|
33 | + */ |
|
34 | + public function filterEnabledEditors($editors, $postType) |
|
35 | + { |
|
36 | + return Application::POST_TYPE == $postType |
|
37 | + ? ['block_editor' => false, 'classic_editor' => false] |
|
38 | + : $editors; |
|
39 | + } |
|
40 | 40 | |
41 | - /** |
|
42 | - * @param bool $bool |
|
43 | - * @param string $postType |
|
44 | - * @return bool |
|
45 | - * @filter use_block_editor_for_post_type |
|
46 | - */ |
|
47 | - public function filterUseBlockEditor($bool, $postType) |
|
48 | - { |
|
49 | - return Application::POST_TYPE == $postType |
|
50 | - ? false |
|
51 | - : $bool; |
|
52 | - } |
|
41 | + /** |
|
42 | + * @param bool $bool |
|
43 | + * @param string $postType |
|
44 | + * @return bool |
|
45 | + * @filter use_block_editor_for_post_type |
|
46 | + */ |
|
47 | + public function filterUseBlockEditor($bool, $postType) |
|
48 | + { |
|
49 | + return Application::POST_TYPE == $postType |
|
50 | + ? false |
|
51 | + : $bool; |
|
52 | + } |
|
53 | 53 | |
54 | - /** |
|
55 | - * @return void |
|
56 | - */ |
|
57 | - public function registerAssets() |
|
58 | - { |
|
59 | - wp_register_style( |
|
60 | - Application::ID.'/blocks', |
|
61 | - glsr()->url('assets/styles/'.Application::ID.'-blocks.css'), |
|
62 | - ['wp-edit-blocks'], |
|
63 | - glsr()->version |
|
64 | - ); |
|
65 | - wp_register_script( |
|
66 | - Application::ID.'/blocks', |
|
67 | - glsr()->url('assets/scripts/'.Application::ID.'-blocks.js'), |
|
68 | - ['wp-api-fetch', 'wp-blocks', 'wp-i18n', 'wp-editor', 'wp-element', Application::ID], |
|
69 | - glsr()->version |
|
70 | - ); |
|
71 | - } |
|
54 | + /** |
|
55 | + * @return void |
|
56 | + */ |
|
57 | + public function registerAssets() |
|
58 | + { |
|
59 | + wp_register_style( |
|
60 | + Application::ID.'/blocks', |
|
61 | + glsr()->url('assets/styles/'.Application::ID.'-blocks.css'), |
|
62 | + ['wp-edit-blocks'], |
|
63 | + glsr()->version |
|
64 | + ); |
|
65 | + wp_register_script( |
|
66 | + Application::ID.'/blocks', |
|
67 | + glsr()->url('assets/scripts/'.Application::ID.'-blocks.js'), |
|
68 | + ['wp-api-fetch', 'wp-blocks', 'wp-i18n', 'wp-editor', 'wp-element', Application::ID], |
|
69 | + glsr()->version |
|
70 | + ); |
|
71 | + } |
|
72 | 72 | |
73 | - /** |
|
74 | - * @return void |
|
75 | - * @action init |
|
76 | - */ |
|
77 | - public function registerBlocks() |
|
78 | - { |
|
79 | - $blocks = [ |
|
80 | - 'form', 'reviews', 'summary', |
|
81 | - ]; |
|
82 | - foreach ($blocks as $block) { |
|
83 | - $id = str_replace('_reviews', '', Application::ID.'_'.$block); |
|
84 | - $blockClass = Helper::buildClassName($id.'-block', 'Blocks'); |
|
85 | - if (!class_exists($blockClass)) { |
|
86 | - glsr_log()->error(sprintf('Class missing (%s)', $blockClass)); |
|
87 | - continue; |
|
88 | - } |
|
89 | - glsr($blockClass)->register($block); |
|
90 | - } |
|
91 | - } |
|
73 | + /** |
|
74 | + * @return void |
|
75 | + * @action init |
|
76 | + */ |
|
77 | + public function registerBlocks() |
|
78 | + { |
|
79 | + $blocks = [ |
|
80 | + 'form', 'reviews', 'summary', |
|
81 | + ]; |
|
82 | + foreach ($blocks as $block) { |
|
83 | + $id = str_replace('_reviews', '', Application::ID.'_'.$block); |
|
84 | + $blockClass = Helper::buildClassName($id.'-block', 'Blocks'); |
|
85 | + if (!class_exists($blockClass)) { |
|
86 | + glsr_log()->error(sprintf('Class missing (%s)', $blockClass)); |
|
87 | + continue; |
|
88 | + } |
|
89 | + glsr($blockClass)->register($block); |
|
90 | + } |
|
91 | + } |
|
92 | 92 | } |
@@ -13,9 +13,9 @@ discard block |
||
13 | 13 | * @return array |
14 | 14 | * @filter block_categories |
15 | 15 | */ |
16 | - public function filterBlockCategories($categories) |
|
16 | + public function filterBlockCategories( $categories ) |
|
17 | 17 | { |
18 | - $categories = Arr::consolidateArray($categories); |
|
18 | + $categories = Arr::consolidateArray( $categories ); |
|
19 | 19 | $categories[] = [ |
20 | 20 | 'icon' => null, |
21 | 21 | 'slug' => Application::ID, |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | * @filter classic_editor_enabled_editors_for_post_type |
32 | 32 | * @plugin classic-editor/classic-editor.php |
33 | 33 | */ |
34 | - public function filterEnabledEditors($editors, $postType) |
|
34 | + public function filterEnabledEditors( $editors, $postType ) |
|
35 | 35 | { |
36 | 36 | return Application::POST_TYPE == $postType |
37 | 37 | ? ['block_editor' => false, 'classic_editor' => false] |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | * @return bool |
45 | 45 | * @filter use_block_editor_for_post_type |
46 | 46 | */ |
47 | - public function filterUseBlockEditor($bool, $postType) |
|
47 | + public function filterUseBlockEditor( $bool, $postType ) |
|
48 | 48 | { |
49 | 49 | return Application::POST_TYPE == $postType |
50 | 50 | ? false |
@@ -58,13 +58,13 @@ discard block |
||
58 | 58 | { |
59 | 59 | wp_register_style( |
60 | 60 | Application::ID.'/blocks', |
61 | - glsr()->url('assets/styles/'.Application::ID.'-blocks.css'), |
|
61 | + glsr()->url( 'assets/styles/'.Application::ID.'-blocks.css' ), |
|
62 | 62 | ['wp-edit-blocks'], |
63 | 63 | glsr()->version |
64 | 64 | ); |
65 | 65 | wp_register_script( |
66 | 66 | Application::ID.'/blocks', |
67 | - glsr()->url('assets/scripts/'.Application::ID.'-blocks.js'), |
|
67 | + glsr()->url( 'assets/scripts/'.Application::ID.'-blocks.js' ), |
|
68 | 68 | ['wp-api-fetch', 'wp-blocks', 'wp-i18n', 'wp-editor', 'wp-element', Application::ID], |
69 | 69 | glsr()->version |
70 | 70 | ); |
@@ -79,14 +79,14 @@ discard block |
||
79 | 79 | $blocks = [ |
80 | 80 | 'form', 'reviews', 'summary', |
81 | 81 | ]; |
82 | - foreach ($blocks as $block) { |
|
83 | - $id = str_replace('_reviews', '', Application::ID.'_'.$block); |
|
84 | - $blockClass = Helper::buildClassName($id.'-block', 'Blocks'); |
|
85 | - if (!class_exists($blockClass)) { |
|
86 | - glsr_log()->error(sprintf('Class missing (%s)', $blockClass)); |
|
82 | + foreach( $blocks as $block ) { |
|
83 | + $id = str_replace( '_reviews', '', Application::ID.'_'.$block ); |
|
84 | + $blockClass = Helper::buildClassName( $id.'-block', 'Blocks' ); |
|
85 | + if( !class_exists( $blockClass ) ) { |
|
86 | + glsr_log()->error( sprintf( 'Class missing (%s)', $blockClass ) ); |
|
87 | 87 | continue; |
88 | 88 | } |
89 | - glsr($blockClass)->register($block); |
|
89 | + glsr( $blockClass )->register( $block ); |
|
90 | 90 | } |
91 | 91 | } |
92 | 92 | } |
@@ -7,18 +7,18 @@ |
||
7 | 7 | |
8 | 8 | class RegisterShortcodes |
9 | 9 | { |
10 | - /** |
|
11 | - * @return void |
|
12 | - */ |
|
13 | - public function handle(Command $command) |
|
14 | - { |
|
15 | - foreach ($command->shortcodes as $shortcode) { |
|
16 | - $shortcodeClass = Helper::buildClassName($shortcode.'-shortcode', 'Shortcodes'); |
|
17 | - if (!class_exists($shortcodeClass)) { |
|
18 | - glsr_log()->error(sprintf('Class missing (%s)', $shortcodeClass)); |
|
19 | - continue; |
|
20 | - } |
|
21 | - add_shortcode($shortcode, [glsr($shortcodeClass), 'buildShortcode']); |
|
22 | - } |
|
23 | - } |
|
10 | + /** |
|
11 | + * @return void |
|
12 | + */ |
|
13 | + public function handle(Command $command) |
|
14 | + { |
|
15 | + foreach ($command->shortcodes as $shortcode) { |
|
16 | + $shortcodeClass = Helper::buildClassName($shortcode.'-shortcode', 'Shortcodes'); |
|
17 | + if (!class_exists($shortcodeClass)) { |
|
18 | + glsr_log()->error(sprintf('Class missing (%s)', $shortcodeClass)); |
|
19 | + continue; |
|
20 | + } |
|
21 | + add_shortcode($shortcode, [glsr($shortcodeClass), 'buildShortcode']); |
|
22 | + } |
|
23 | + } |
|
24 | 24 | } |
@@ -10,15 +10,15 @@ |
||
10 | 10 | /** |
11 | 11 | * @return void |
12 | 12 | */ |
13 | - public function handle(Command $command) |
|
13 | + public function handle( Command $command ) |
|
14 | 14 | { |
15 | - foreach ($command->shortcodes as $shortcode) { |
|
16 | - $shortcodeClass = Helper::buildClassName($shortcode.'-shortcode', 'Shortcodes'); |
|
17 | - if (!class_exists($shortcodeClass)) { |
|
18 | - glsr_log()->error(sprintf('Class missing (%s)', $shortcodeClass)); |
|
15 | + foreach( $command->shortcodes as $shortcode ) { |
|
16 | + $shortcodeClass = Helper::buildClassName( $shortcode.'-shortcode', 'Shortcodes' ); |
|
17 | + if( !class_exists( $shortcodeClass ) ) { |
|
18 | + glsr_log()->error( sprintf( 'Class missing (%s)', $shortcodeClass ) ); |
|
19 | 19 | continue; |
20 | 20 | } |
21 | - add_shortcode($shortcode, [glsr($shortcodeClass), 'buildShortcode']); |
|
21 | + add_shortcode( $shortcode, [glsr( $shortcodeClass ), 'buildShortcode'] ); |
|
22 | 22 | } |
23 | 23 | } |
24 | 24 | } |
@@ -7,22 +7,22 @@ |
||
7 | 7 | |
8 | 8 | class RegisterTinymcePopups |
9 | 9 | { |
10 | - /** |
|
11 | - * @return void |
|
12 | - */ |
|
13 | - public function handle(Command $command) |
|
14 | - { |
|
15 | - foreach ($command->popups as $slug => $label) { |
|
16 | - $buttonClass = Helper::buildClassName($slug.'-popup', 'Shortcodes'); |
|
17 | - if (!class_exists($buttonClass)) { |
|
18 | - glsr_log()->error(sprintf('Class missing (%s)', $buttonClass)); |
|
19 | - continue; |
|
20 | - } |
|
21 | - $shortcode = glsr($buttonClass)->register($slug, [ |
|
22 | - 'label' => $label, |
|
23 | - 'title' => $label, |
|
24 | - ]); |
|
25 | - glsr()->mceShortcodes[$slug] = $shortcode->properties; |
|
26 | - } |
|
27 | - } |
|
10 | + /** |
|
11 | + * @return void |
|
12 | + */ |
|
13 | + public function handle(Command $command) |
|
14 | + { |
|
15 | + foreach ($command->popups as $slug => $label) { |
|
16 | + $buttonClass = Helper::buildClassName($slug.'-popup', 'Shortcodes'); |
|
17 | + if (!class_exists($buttonClass)) { |
|
18 | + glsr_log()->error(sprintf('Class missing (%s)', $buttonClass)); |
|
19 | + continue; |
|
20 | + } |
|
21 | + $shortcode = glsr($buttonClass)->register($slug, [ |
|
22 | + 'label' => $label, |
|
23 | + 'title' => $label, |
|
24 | + ]); |
|
25 | + glsr()->mceShortcodes[$slug] = $shortcode->properties; |
|
26 | + } |
|
27 | + } |
|
28 | 28 | } |
@@ -10,18 +10,18 @@ |
||
10 | 10 | /** |
11 | 11 | * @return void |
12 | 12 | */ |
13 | - public function handle(Command $command) |
|
13 | + public function handle( Command $command ) |
|
14 | 14 | { |
15 | - foreach ($command->popups as $slug => $label) { |
|
16 | - $buttonClass = Helper::buildClassName($slug.'-popup', 'Shortcodes'); |
|
17 | - if (!class_exists($buttonClass)) { |
|
18 | - glsr_log()->error(sprintf('Class missing (%s)', $buttonClass)); |
|
15 | + foreach( $command->popups as $slug => $label ) { |
|
16 | + $buttonClass = Helper::buildClassName( $slug.'-popup', 'Shortcodes' ); |
|
17 | + if( !class_exists( $buttonClass ) ) { |
|
18 | + glsr_log()->error( sprintf( 'Class missing (%s)', $buttonClass ) ); |
|
19 | 19 | continue; |
20 | 20 | } |
21 | - $shortcode = glsr($buttonClass)->register($slug, [ |
|
21 | + $shortcode = glsr( $buttonClass )->register( $slug, [ |
|
22 | 22 | 'label' => $label, |
23 | 23 | 'title' => $label, |
24 | - ]); |
|
24 | + ] ); |
|
25 | 25 | glsr()->mceShortcodes[$slug] = $shortcode->properties; |
26 | 26 | } |
27 | 27 | } |
@@ -8,21 +8,21 @@ |
||
8 | 8 | |
9 | 9 | class RegisterWidgets |
10 | 10 | { |
11 | - /** |
|
12 | - * @return void |
|
13 | - */ |
|
14 | - public function handle(Command $command) |
|
15 | - { |
|
16 | - global $wp_widget_factory; |
|
17 | - foreach ($command->widgets as $key => $values) { |
|
18 | - $widgetClass = Helper::buildClassName($key.'-widget', 'Widgets'); |
|
19 | - if (!class_exists($widgetClass)) { |
|
20 | - glsr_log()->error(sprintf('Class missing (%s)', $widgetClass)); |
|
21 | - continue; |
|
22 | - } |
|
23 | - // Here we bypass register_widget() in order to pass our custom values to the widget |
|
24 | - $widget = new $widgetClass(Application::ID.'_'.$key, $values['title'], $values); |
|
25 | - $wp_widget_factory->widgets[$widgetClass] = $widget; |
|
26 | - } |
|
27 | - } |
|
11 | + /** |
|
12 | + * @return void |
|
13 | + */ |
|
14 | + public function handle(Command $command) |
|
15 | + { |
|
16 | + global $wp_widget_factory; |
|
17 | + foreach ($command->widgets as $key => $values) { |
|
18 | + $widgetClass = Helper::buildClassName($key.'-widget', 'Widgets'); |
|
19 | + if (!class_exists($widgetClass)) { |
|
20 | + glsr_log()->error(sprintf('Class missing (%s)', $widgetClass)); |
|
21 | + continue; |
|
22 | + } |
|
23 | + // Here we bypass register_widget() in order to pass our custom values to the widget |
|
24 | + $widget = new $widgetClass(Application::ID.'_'.$key, $values['title'], $values); |
|
25 | + $wp_widget_factory->widgets[$widgetClass] = $widget; |
|
26 | + } |
|
27 | + } |
|
28 | 28 | } |
@@ -11,17 +11,17 @@ |
||
11 | 11 | /** |
12 | 12 | * @return void |
13 | 13 | */ |
14 | - public function handle(Command $command) |
|
14 | + public function handle( Command $command ) |
|
15 | 15 | { |
16 | 16 | global $wp_widget_factory; |
17 | - foreach ($command->widgets as $key => $values) { |
|
18 | - $widgetClass = Helper::buildClassName($key.'-widget', 'Widgets'); |
|
19 | - if (!class_exists($widgetClass)) { |
|
20 | - glsr_log()->error(sprintf('Class missing (%s)', $widgetClass)); |
|
17 | + foreach( $command->widgets as $key => $values ) { |
|
18 | + $widgetClass = Helper::buildClassName( $key.'-widget', 'Widgets' ); |
|
19 | + if( !class_exists( $widgetClass ) ) { |
|
20 | + glsr_log()->error( sprintf( 'Class missing (%s)', $widgetClass ) ); |
|
21 | 21 | continue; |
22 | 22 | } |
23 | 23 | // Here we bypass register_widget() in order to pass our custom values to the widget |
24 | - $widget = new $widgetClass(Application::ID.'_'.$key, $values['title'], $values); |
|
24 | + $widget = new $widgetClass( Application::ID.'_'.$key, $values['title'], $values ); |
|
25 | 25 | $wp_widget_factory->widgets[$widgetClass] = $widget; |
26 | 26 | } |
27 | 27 | } |
@@ -6,60 +6,60 @@ |
||
6 | 6 | |
7 | 7 | class DefaultsManager |
8 | 8 | { |
9 | - /** |
|
10 | - * @return array |
|
11 | - */ |
|
12 | - public function defaults() |
|
13 | - { |
|
14 | - $settings = $this->settings(); |
|
15 | - $defaults = (array) array_combine(array_keys($settings), glsr_array_column($settings, 'default')); |
|
16 | - return wp_parse_args($defaults, [ |
|
17 | - 'version' => '', |
|
18 | - 'version_upgraded_from' => '', |
|
19 | - ]); |
|
20 | - } |
|
9 | + /** |
|
10 | + * @return array |
|
11 | + */ |
|
12 | + public function defaults() |
|
13 | + { |
|
14 | + $settings = $this->settings(); |
|
15 | + $defaults = (array) array_combine(array_keys($settings), glsr_array_column($settings, 'default')); |
|
16 | + return wp_parse_args($defaults, [ |
|
17 | + 'version' => '', |
|
18 | + 'version_upgraded_from' => '', |
|
19 | + ]); |
|
20 | + } |
|
21 | 21 | |
22 | - /** |
|
23 | - * @return array |
|
24 | - */ |
|
25 | - public function get() |
|
26 | - { |
|
27 | - return Arr::convertDotNotationArray($this->defaults()); |
|
28 | - } |
|
22 | + /** |
|
23 | + * @return array |
|
24 | + */ |
|
25 | + public function get() |
|
26 | + { |
|
27 | + return Arr::convertDotNotationArray($this->defaults()); |
|
28 | + } |
|
29 | 29 | |
30 | - /** |
|
31 | - * @return array |
|
32 | - */ |
|
33 | - public function set() |
|
34 | - { |
|
35 | - $settings = glsr(OptionManager::class)->all(); |
|
36 | - $currentSettings = Arr::removeEmptyArrayValues($settings); |
|
37 | - $defaultSettings = array_replace_recursive($this->get(), $currentSettings); |
|
38 | - $updatedSettings = array_replace_recursive($settings, $defaultSettings); |
|
39 | - update_option(OptionManager::databaseKey(), $updatedSettings); |
|
40 | - return $defaultSettings; |
|
41 | - } |
|
30 | + /** |
|
31 | + * @return array |
|
32 | + */ |
|
33 | + public function set() |
|
34 | + { |
|
35 | + $settings = glsr(OptionManager::class)->all(); |
|
36 | + $currentSettings = Arr::removeEmptyArrayValues($settings); |
|
37 | + $defaultSettings = array_replace_recursive($this->get(), $currentSettings); |
|
38 | + $updatedSettings = array_replace_recursive($settings, $defaultSettings); |
|
39 | + update_option(OptionManager::databaseKey(), $updatedSettings); |
|
40 | + return $defaultSettings; |
|
41 | + } |
|
42 | 42 | |
43 | - /** |
|
44 | - * @return array |
|
45 | - */ |
|
46 | - public function settings() |
|
47 | - { |
|
48 | - $settings = apply_filters('site-reviews/addon/settings', glsr()->config('settings')); |
|
49 | - return $this->normalize($settings); |
|
50 | - } |
|
43 | + /** |
|
44 | + * @return array |
|
45 | + */ |
|
46 | + public function settings() |
|
47 | + { |
|
48 | + $settings = apply_filters('site-reviews/addon/settings', glsr()->config('settings')); |
|
49 | + return $this->normalize($settings); |
|
50 | + } |
|
51 | 51 | |
52 | - /** |
|
53 | - * @return array |
|
54 | - */ |
|
55 | - protected function normalize(array $settings) |
|
56 | - { |
|
57 | - array_walk($settings, function (&$setting) { |
|
58 | - if (isset($setting['default'])) { |
|
59 | - return; |
|
60 | - } |
|
61 | - $setting['default'] = ''; |
|
62 | - }); |
|
63 | - return $settings; |
|
64 | - } |
|
52 | + /** |
|
53 | + * @return array |
|
54 | + */ |
|
55 | + protected function normalize(array $settings) |
|
56 | + { |
|
57 | + array_walk($settings, function (&$setting) { |
|
58 | + if (isset($setting['default'])) { |
|
59 | + return; |
|
60 | + } |
|
61 | + $setting['default'] = ''; |
|
62 | + }); |
|
63 | + return $settings; |
|
64 | + } |
|
65 | 65 | } |
@@ -12,11 +12,11 @@ discard block |
||
12 | 12 | public function defaults() |
13 | 13 | { |
14 | 14 | $settings = $this->settings(); |
15 | - $defaults = (array) array_combine(array_keys($settings), glsr_array_column($settings, 'default')); |
|
16 | - return wp_parse_args($defaults, [ |
|
15 | + $defaults = (array)array_combine( array_keys( $settings ), glsr_array_column( $settings, 'default' ) ); |
|
16 | + return wp_parse_args( $defaults, [ |
|
17 | 17 | 'version' => '', |
18 | 18 | 'version_upgraded_from' => '', |
19 | - ]); |
|
19 | + ] ); |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | /** |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | */ |
25 | 25 | public function get() |
26 | 26 | { |
27 | - return Arr::convertDotNotationArray($this->defaults()); |
|
27 | + return Arr::convertDotNotationArray( $this->defaults() ); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | /** |
@@ -32,11 +32,11 @@ discard block |
||
32 | 32 | */ |
33 | 33 | public function set() |
34 | 34 | { |
35 | - $settings = glsr(OptionManager::class)->all(); |
|
36 | - $currentSettings = Arr::removeEmptyArrayValues($settings); |
|
37 | - $defaultSettings = array_replace_recursive($this->get(), $currentSettings); |
|
38 | - $updatedSettings = array_replace_recursive($settings, $defaultSettings); |
|
39 | - update_option(OptionManager::databaseKey(), $updatedSettings); |
|
35 | + $settings = glsr( OptionManager::class )->all(); |
|
36 | + $currentSettings = Arr::removeEmptyArrayValues( $settings ); |
|
37 | + $defaultSettings = array_replace_recursive( $this->get(), $currentSettings ); |
|
38 | + $updatedSettings = array_replace_recursive( $settings, $defaultSettings ); |
|
39 | + update_option( OptionManager::databaseKey(), $updatedSettings ); |
|
40 | 40 | return $defaultSettings; |
41 | 41 | } |
42 | 42 | |
@@ -45,17 +45,17 @@ discard block |
||
45 | 45 | */ |
46 | 46 | public function settings() |
47 | 47 | { |
48 | - $settings = apply_filters('site-reviews/addon/settings', glsr()->config('settings')); |
|
49 | - return $this->normalize($settings); |
|
48 | + $settings = apply_filters( 'site-reviews/addon/settings', glsr()->config( 'settings' ) ); |
|
49 | + return $this->normalize( $settings ); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | /** |
53 | 53 | * @return array |
54 | 54 | */ |
55 | - protected function normalize(array $settings) |
|
55 | + protected function normalize( array $settings ) |
|
56 | 56 | { |
57 | - array_walk($settings, function (&$setting) { |
|
58 | - if (isset($setting['default'])) { |
|
57 | + array_walk( $settings, function( &$setting ) { |
|
58 | + if( isset($setting['default']) ) { |
|
59 | 59 | return; |
60 | 60 | } |
61 | 61 | $setting['default'] = ''; |
@@ -9,153 +9,153 @@ |
||
9 | 9 | |
10 | 10 | class OptionManager |
11 | 11 | { |
12 | - /** |
|
13 | - * @var array |
|
14 | - */ |
|
15 | - protected $options; |
|
12 | + /** |
|
13 | + * @var array |
|
14 | + */ |
|
15 | + protected $options; |
|
16 | 16 | |
17 | - /** |
|
18 | - * @return string |
|
19 | - */ |
|
20 | - public static function databaseKey($version = null) |
|
21 | - { |
|
22 | - if (null === $version) { |
|
23 | - $version = explode('.', glsr()->version); |
|
24 | - $version = array_shift($version); |
|
25 | - } |
|
26 | - return Str::snakeCase( |
|
27 | - Application::ID.'-v'.intval($version) |
|
28 | - ); |
|
29 | - } |
|
17 | + /** |
|
18 | + * @return string |
|
19 | + */ |
|
20 | + public static function databaseKey($version = null) |
|
21 | + { |
|
22 | + if (null === $version) { |
|
23 | + $version = explode('.', glsr()->version); |
|
24 | + $version = array_shift($version); |
|
25 | + } |
|
26 | + return Str::snakeCase( |
|
27 | + Application::ID.'-v'.intval($version) |
|
28 | + ); |
|
29 | + } |
|
30 | 30 | |
31 | - /** |
|
32 | - * @return array |
|
33 | - */ |
|
34 | - public function all() |
|
35 | - { |
|
36 | - if (empty($this->options)) { |
|
37 | - $this->reset(); |
|
38 | - } |
|
39 | - return $this->options; |
|
40 | - } |
|
31 | + /** |
|
32 | + * @return array |
|
33 | + */ |
|
34 | + public function all() |
|
35 | + { |
|
36 | + if (empty($this->options)) { |
|
37 | + $this->reset(); |
|
38 | + } |
|
39 | + return $this->options; |
|
40 | + } |
|
41 | 41 | |
42 | - /** |
|
43 | - * @param string $path |
|
44 | - * @return bool |
|
45 | - */ |
|
46 | - public function delete($path) |
|
47 | - { |
|
48 | - $keys = explode('.', $path); |
|
49 | - $last = array_pop($keys); |
|
50 | - $options = $this->all(); |
|
51 | - $pointer = &$options; |
|
52 | - foreach ($keys as $key) { |
|
53 | - if (!isset($pointer[$key]) || !is_array($pointer[$key])) { |
|
54 | - continue; |
|
55 | - } |
|
56 | - $pointer = &$pointer[$key]; |
|
57 | - } |
|
58 | - unset($pointer[$last]); |
|
59 | - return $this->set($options); |
|
60 | - } |
|
42 | + /** |
|
43 | + * @param string $path |
|
44 | + * @return bool |
|
45 | + */ |
|
46 | + public function delete($path) |
|
47 | + { |
|
48 | + $keys = explode('.', $path); |
|
49 | + $last = array_pop($keys); |
|
50 | + $options = $this->all(); |
|
51 | + $pointer = &$options; |
|
52 | + foreach ($keys as $key) { |
|
53 | + if (!isset($pointer[$key]) || !is_array($pointer[$key])) { |
|
54 | + continue; |
|
55 | + } |
|
56 | + $pointer = &$pointer[$key]; |
|
57 | + } |
|
58 | + unset($pointer[$last]); |
|
59 | + return $this->set($options); |
|
60 | + } |
|
61 | 61 | |
62 | - /** |
|
63 | - * @param string $path |
|
64 | - * @param mixed $fallback |
|
65 | - * @param string $cast |
|
66 | - * @return mixed |
|
67 | - */ |
|
68 | - public function get($path = '', $fallback = '', $cast = '') |
|
69 | - { |
|
70 | - $result = Arr::get($this->all(), $path, $fallback); |
|
71 | - return Helper::castTo($cast, $result); |
|
72 | - } |
|
62 | + /** |
|
63 | + * @param string $path |
|
64 | + * @param mixed $fallback |
|
65 | + * @param string $cast |
|
66 | + * @return mixed |
|
67 | + */ |
|
68 | + public function get($path = '', $fallback = '', $cast = '') |
|
69 | + { |
|
70 | + $result = Arr::get($this->all(), $path, $fallback); |
|
71 | + return Helper::castTo($cast, $result); |
|
72 | + } |
|
73 | 73 | |
74 | - /** |
|
75 | - * @param string $path |
|
76 | - * @return bool |
|
77 | - */ |
|
78 | - public function getBool($path) |
|
79 | - { |
|
80 | - return Helper::castTo('bool', $this->get($path)); |
|
81 | - } |
|
74 | + /** |
|
75 | + * @param string $path |
|
76 | + * @return bool |
|
77 | + */ |
|
78 | + public function getBool($path) |
|
79 | + { |
|
80 | + return Helper::castTo('bool', $this->get($path)); |
|
81 | + } |
|
82 | 82 | |
83 | - /** |
|
84 | - * @param string $path |
|
85 | - * @param mixed $fallback |
|
86 | - * @param string $cast |
|
87 | - * @return mixed |
|
88 | - */ |
|
89 | - public function getWP($path, $fallback = '', $cast = '') |
|
90 | - { |
|
91 | - $option = get_option($path, $fallback); |
|
92 | - if (empty($option)) { |
|
93 | - $option = $fallback; |
|
94 | - } |
|
95 | - return Helper::castTo($cast, $option); |
|
96 | - } |
|
83 | + /** |
|
84 | + * @param string $path |
|
85 | + * @param mixed $fallback |
|
86 | + * @param string $cast |
|
87 | + * @return mixed |
|
88 | + */ |
|
89 | + public function getWP($path, $fallback = '', $cast = '') |
|
90 | + { |
|
91 | + $option = get_option($path, $fallback); |
|
92 | + if (empty($option)) { |
|
93 | + $option = $fallback; |
|
94 | + } |
|
95 | + return Helper::castTo($cast, $option); |
|
96 | + } |
|
97 | 97 | |
98 | - /** |
|
99 | - * @return string |
|
100 | - */ |
|
101 | - public function json() |
|
102 | - { |
|
103 | - return json_encode($this->all()); |
|
104 | - } |
|
98 | + /** |
|
99 | + * @return string |
|
100 | + */ |
|
101 | + public function json() |
|
102 | + { |
|
103 | + return json_encode($this->all()); |
|
104 | + } |
|
105 | 105 | |
106 | - /** |
|
107 | - * @return array |
|
108 | - */ |
|
109 | - public function normalize(array $options = []) |
|
110 | - { |
|
111 | - $options = wp_parse_args( |
|
112 | - Arr::flattenArray($options), |
|
113 | - glsr(DefaultsManager::class)->defaults() |
|
114 | - ); |
|
115 | - array_walk($options, function (&$value) { |
|
116 | - if (!is_string($value)) { |
|
117 | - return; |
|
118 | - } |
|
119 | - $value = wp_kses($value, wp_kses_allowed_html('post')); |
|
120 | - }); |
|
121 | - return Arr::convertDotNotationArray($options); |
|
122 | - } |
|
106 | + /** |
|
107 | + * @return array |
|
108 | + */ |
|
109 | + public function normalize(array $options = []) |
|
110 | + { |
|
111 | + $options = wp_parse_args( |
|
112 | + Arr::flattenArray($options), |
|
113 | + glsr(DefaultsManager::class)->defaults() |
|
114 | + ); |
|
115 | + array_walk($options, function (&$value) { |
|
116 | + if (!is_string($value)) { |
|
117 | + return; |
|
118 | + } |
|
119 | + $value = wp_kses($value, wp_kses_allowed_html('post')); |
|
120 | + }); |
|
121 | + return Arr::convertDotNotationArray($options); |
|
122 | + } |
|
123 | 123 | |
124 | - /** |
|
125 | - * @return bool |
|
126 | - */ |
|
127 | - public function isRecaptchaEnabled() |
|
128 | - { |
|
129 | - $integration = $this->get('settings.submissions.recaptcha.integration'); |
|
130 | - return 'all' == $integration || ('guest' == $integration && !is_user_logged_in()); |
|
131 | - } |
|
124 | + /** |
|
125 | + * @return bool |
|
126 | + */ |
|
127 | + public function isRecaptchaEnabled() |
|
128 | + { |
|
129 | + $integration = $this->get('settings.submissions.recaptcha.integration'); |
|
130 | + return 'all' == $integration || ('guest' == $integration && !is_user_logged_in()); |
|
131 | + } |
|
132 | 132 | |
133 | - /** |
|
134 | - * @return array |
|
135 | - */ |
|
136 | - public function reset() |
|
137 | - { |
|
138 | - $options = $this->getWP(static::databaseKey(), []); |
|
139 | - if (!is_array($options) || empty($options)) { |
|
140 | - delete_option(static::databaseKey()); |
|
141 | - $options = glsr()->defaults ?: []; |
|
142 | - } |
|
143 | - $this->options = $options; |
|
144 | - } |
|
133 | + /** |
|
134 | + * @return array |
|
135 | + */ |
|
136 | + public function reset() |
|
137 | + { |
|
138 | + $options = $this->getWP(static::databaseKey(), []); |
|
139 | + if (!is_array($options) || empty($options)) { |
|
140 | + delete_option(static::databaseKey()); |
|
141 | + $options = glsr()->defaults ?: []; |
|
142 | + } |
|
143 | + $this->options = $options; |
|
144 | + } |
|
145 | 145 | |
146 | - /** |
|
147 | - * @param string|array $pathOrOptions |
|
148 | - * @param mixed $value |
|
149 | - * @return bool |
|
150 | - */ |
|
151 | - public function set($pathOrOptions, $value = '') |
|
152 | - { |
|
153 | - if (is_string($pathOrOptions)) { |
|
154 | - $pathOrOptions = Arr::set($this->all(), $pathOrOptions, $value); |
|
155 | - } |
|
156 | - if ($result = update_option(static::databaseKey(), (array) $pathOrOptions)) { |
|
157 | - $this->reset(); |
|
158 | - } |
|
159 | - return $result; |
|
160 | - } |
|
146 | + /** |
|
147 | + * @param string|array $pathOrOptions |
|
148 | + * @param mixed $value |
|
149 | + * @return bool |
|
150 | + */ |
|
151 | + public function set($pathOrOptions, $value = '') |
|
152 | + { |
|
153 | + if (is_string($pathOrOptions)) { |
|
154 | + $pathOrOptions = Arr::set($this->all(), $pathOrOptions, $value); |
|
155 | + } |
|
156 | + if ($result = update_option(static::databaseKey(), (array) $pathOrOptions)) { |
|
157 | + $this->reset(); |
|
158 | + } |
|
159 | + return $result; |
|
160 | + } |
|
161 | 161 | } |
@@ -17,14 +17,14 @@ discard block |
||
17 | 17 | /** |
18 | 18 | * @return string |
19 | 19 | */ |
20 | - public static function databaseKey($version = null) |
|
20 | + public static function databaseKey( $version = null ) |
|
21 | 21 | { |
22 | - if (null === $version) { |
|
23 | - $version = explode('.', glsr()->version); |
|
24 | - $version = array_shift($version); |
|
22 | + if( null === $version ) { |
|
23 | + $version = explode( '.', glsr()->version ); |
|
24 | + $version = array_shift( $version ); |
|
25 | 25 | } |
26 | 26 | return Str::snakeCase( |
27 | - Application::ID.'-v'.intval($version) |
|
27 | + Application::ID.'-v'.intval( $version ) |
|
28 | 28 | ); |
29 | 29 | } |
30 | 30 | |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | */ |
34 | 34 | public function all() |
35 | 35 | { |
36 | - if (empty($this->options)) { |
|
36 | + if( empty($this->options) ) { |
|
37 | 37 | $this->reset(); |
38 | 38 | } |
39 | 39 | return $this->options; |
@@ -43,20 +43,20 @@ discard block |
||
43 | 43 | * @param string $path |
44 | 44 | * @return bool |
45 | 45 | */ |
46 | - public function delete($path) |
|
46 | + public function delete( $path ) |
|
47 | 47 | { |
48 | - $keys = explode('.', $path); |
|
49 | - $last = array_pop($keys); |
|
48 | + $keys = explode( '.', $path ); |
|
49 | + $last = array_pop( $keys ); |
|
50 | 50 | $options = $this->all(); |
51 | 51 | $pointer = &$options; |
52 | - foreach ($keys as $key) { |
|
53 | - if (!isset($pointer[$key]) || !is_array($pointer[$key])) { |
|
52 | + foreach( $keys as $key ) { |
|
53 | + if( !isset($pointer[$key]) || !is_array( $pointer[$key] ) ) { |
|
54 | 54 | continue; |
55 | 55 | } |
56 | 56 | $pointer = &$pointer[$key]; |
57 | 57 | } |
58 | 58 | unset($pointer[$last]); |
59 | - return $this->set($options); |
|
59 | + return $this->set( $options ); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | /** |
@@ -65,19 +65,19 @@ discard block |
||
65 | 65 | * @param string $cast |
66 | 66 | * @return mixed |
67 | 67 | */ |
68 | - public function get($path = '', $fallback = '', $cast = '') |
|
68 | + public function get( $path = '', $fallback = '', $cast = '' ) |
|
69 | 69 | { |
70 | - $result = Arr::get($this->all(), $path, $fallback); |
|
71 | - return Helper::castTo($cast, $result); |
|
70 | + $result = Arr::get( $this->all(), $path, $fallback ); |
|
71 | + return Helper::castTo( $cast, $result ); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | /** |
75 | 75 | * @param string $path |
76 | 76 | * @return bool |
77 | 77 | */ |
78 | - public function getBool($path) |
|
78 | + public function getBool( $path ) |
|
79 | 79 | { |
80 | - return Helper::castTo('bool', $this->get($path)); |
|
80 | + return Helper::castTo( 'bool', $this->get( $path ) ); |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | /** |
@@ -86,13 +86,13 @@ discard block |
||
86 | 86 | * @param string $cast |
87 | 87 | * @return mixed |
88 | 88 | */ |
89 | - public function getWP($path, $fallback = '', $cast = '') |
|
89 | + public function getWP( $path, $fallback = '', $cast = '' ) |
|
90 | 90 | { |
91 | - $option = get_option($path, $fallback); |
|
92 | - if (empty($option)) { |
|
91 | + $option = get_option( $path, $fallback ); |
|
92 | + if( empty($option) ) { |
|
93 | 93 | $option = $fallback; |
94 | 94 | } |
95 | - return Helper::castTo($cast, $option); |
|
95 | + return Helper::castTo( $cast, $option ); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |
@@ -100,25 +100,25 @@ discard block |
||
100 | 100 | */ |
101 | 101 | public function json() |
102 | 102 | { |
103 | - return json_encode($this->all()); |
|
103 | + return json_encode( $this->all() ); |
|
104 | 104 | } |
105 | 105 | |
106 | 106 | /** |
107 | 107 | * @return array |
108 | 108 | */ |
109 | - public function normalize(array $options = []) |
|
109 | + public function normalize( array $options = [] ) |
|
110 | 110 | { |
111 | 111 | $options = wp_parse_args( |
112 | - Arr::flattenArray($options), |
|
113 | - glsr(DefaultsManager::class)->defaults() |
|
112 | + Arr::flattenArray( $options ), |
|
113 | + glsr( DefaultsManager::class )->defaults() |
|
114 | 114 | ); |
115 | - array_walk($options, function (&$value) { |
|
116 | - if (!is_string($value)) { |
|
115 | + array_walk( $options, function( &$value ) { |
|
116 | + if( !is_string( $value ) ) { |
|
117 | 117 | return; |
118 | 118 | } |
119 | - $value = wp_kses($value, wp_kses_allowed_html('post')); |
|
119 | + $value = wp_kses( $value, wp_kses_allowed_html( 'post' ) ); |
|
120 | 120 | }); |
121 | - return Arr::convertDotNotationArray($options); |
|
121 | + return Arr::convertDotNotationArray( $options ); |
|
122 | 122 | } |
123 | 123 | |
124 | 124 | /** |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | */ |
127 | 127 | public function isRecaptchaEnabled() |
128 | 128 | { |
129 | - $integration = $this->get('settings.submissions.recaptcha.integration'); |
|
129 | + $integration = $this->get( 'settings.submissions.recaptcha.integration' ); |
|
130 | 130 | return 'all' == $integration || ('guest' == $integration && !is_user_logged_in()); |
131 | 131 | } |
132 | 132 | |
@@ -135,9 +135,9 @@ discard block |
||
135 | 135 | */ |
136 | 136 | public function reset() |
137 | 137 | { |
138 | - $options = $this->getWP(static::databaseKey(), []); |
|
139 | - if (!is_array($options) || empty($options)) { |
|
140 | - delete_option(static::databaseKey()); |
|
138 | + $options = $this->getWP( static::databaseKey(), [] ); |
|
139 | + if( !is_array( $options ) || empty($options) ) { |
|
140 | + delete_option( static::databaseKey() ); |
|
141 | 141 | $options = glsr()->defaults ?: []; |
142 | 142 | } |
143 | 143 | $this->options = $options; |
@@ -148,12 +148,12 @@ discard block |
||
148 | 148 | * @param mixed $value |
149 | 149 | * @return bool |
150 | 150 | */ |
151 | - public function set($pathOrOptions, $value = '') |
|
151 | + public function set( $pathOrOptions, $value = '' ) |
|
152 | 152 | { |
153 | - if (is_string($pathOrOptions)) { |
|
154 | - $pathOrOptions = Arr::set($this->all(), $pathOrOptions, $value); |
|
153 | + if( is_string( $pathOrOptions ) ) { |
|
154 | + $pathOrOptions = Arr::set( $this->all(), $pathOrOptions, $value ); |
|
155 | 155 | } |
156 | - if ($result = update_option(static::databaseKey(), (array) $pathOrOptions)) { |
|
156 | + if( $result = update_option( static::databaseKey(), (array)$pathOrOptions ) ) { |
|
157 | 157 | $this->reset(); |
158 | 158 | } |
159 | 159 | return $result; |
@@ -9,77 +9,77 @@ |
||
9 | 9 | |
10 | 10 | class RegisterPostType |
11 | 11 | { |
12 | - public $args; |
|
13 | - public $columns; |
|
14 | - public $plural; |
|
15 | - public $postType; |
|
16 | - public $single; |
|
12 | + public $args; |
|
13 | + public $columns; |
|
14 | + public $plural; |
|
15 | + public $postType; |
|
16 | + public $single; |
|
17 | 17 | |
18 | - public function __construct($input) |
|
19 | - { |
|
20 | - $args = glsr(PostTypeDefaults::class)->merge($input); |
|
21 | - $this->normalize($args); |
|
22 | - $this->normalizeColumns(); |
|
23 | - $this->normalizeLabels(); |
|
24 | - } |
|
18 | + public function __construct($input) |
|
19 | + { |
|
20 | + $args = glsr(PostTypeDefaults::class)->merge($input); |
|
21 | + $this->normalize($args); |
|
22 | + $this->normalizeColumns(); |
|
23 | + $this->normalizeLabels(); |
|
24 | + } |
|
25 | 25 | |
26 | - /** |
|
27 | - * @return void |
|
28 | - */ |
|
29 | - protected function normalize(array $args) |
|
30 | - { |
|
31 | - foreach ($args as $key => $value) { |
|
32 | - $property = Helper::buildPropertyName($key); |
|
33 | - if (!property_exists($this, $property)) { |
|
34 | - continue; |
|
35 | - } |
|
36 | - $this->$property = $value; |
|
37 | - unset($args[$key]); |
|
38 | - } |
|
39 | - $this->args = wp_parse_args($args, [ |
|
40 | - 'menu_name' => $this->plural, |
|
41 | - ]); |
|
42 | - } |
|
26 | + /** |
|
27 | + * @return void |
|
28 | + */ |
|
29 | + protected function normalize(array $args) |
|
30 | + { |
|
31 | + foreach ($args as $key => $value) { |
|
32 | + $property = Helper::buildPropertyName($key); |
|
33 | + if (!property_exists($this, $property)) { |
|
34 | + continue; |
|
35 | + } |
|
36 | + $this->$property = $value; |
|
37 | + unset($args[$key]); |
|
38 | + } |
|
39 | + $this->args = wp_parse_args($args, [ |
|
40 | + 'menu_name' => $this->plural, |
|
41 | + ]); |
|
42 | + } |
|
43 | 43 | |
44 | - /** |
|
45 | - * @return void |
|
46 | - */ |
|
47 | - protected function normalizeLabels() |
|
48 | - { |
|
49 | - $this->args['labels'] = wp_parse_args($this->args['labels'], [ |
|
50 | - 'add_new_item' => sprintf(_x('Add New %s', 'Add New Post', 'site-reviews'), $this->plural), |
|
51 | - 'all_items' => sprintf(_x('All %s', 'All Posts', 'site-reviews'), $this->plural), |
|
52 | - 'archives' => sprintf(_x('%s Archives', 'Post Archives', 'site-reviews'), $this->single), |
|
53 | - 'edit_item' => sprintf(_x('Edit %s', 'Edit Post', 'site-reviews'), $this->single), |
|
54 | - 'insert_into_item' => sprintf(_x('Insert into %s', 'Insert into Post', 'site-reviews'), $this->single), |
|
55 | - 'menu_name' => $this->args['menu_name'], |
|
56 | - 'name' => $this->plural, |
|
57 | - 'new_item' => sprintf(_x('New %s', 'New Post', 'site-reviews'), $this->single), |
|
58 | - 'not_found' => sprintf(_x('No %s found', 'No Posts found', 'site-reviews'), $this->plural), |
|
59 | - 'not_found_in_trash' => sprintf(_x('No %s found in Trash', 'No Posts found in Trash', 'site-reviews'), $this->plural), |
|
60 | - 'search_items' => sprintf(_x('Search %s', 'Search Posts', 'site-reviews'), $this->plural), |
|
61 | - 'singular_name' => $this->single, |
|
62 | - 'uploaded_to_this_item' => sprintf(_x('Uploaded to this %s', 'Uploaded to this Post', 'site-reviews'), $this->single), |
|
63 | - 'view_item' => sprintf(_x('View %s', 'View Post', 'site-reviews'), $this->single), |
|
64 | - ]); |
|
65 | - unset($this->args['menu_name']); |
|
66 | - } |
|
44 | + /** |
|
45 | + * @return void |
|
46 | + */ |
|
47 | + protected function normalizeLabels() |
|
48 | + { |
|
49 | + $this->args['labels'] = wp_parse_args($this->args['labels'], [ |
|
50 | + 'add_new_item' => sprintf(_x('Add New %s', 'Add New Post', 'site-reviews'), $this->plural), |
|
51 | + 'all_items' => sprintf(_x('All %s', 'All Posts', 'site-reviews'), $this->plural), |
|
52 | + 'archives' => sprintf(_x('%s Archives', 'Post Archives', 'site-reviews'), $this->single), |
|
53 | + 'edit_item' => sprintf(_x('Edit %s', 'Edit Post', 'site-reviews'), $this->single), |
|
54 | + 'insert_into_item' => sprintf(_x('Insert into %s', 'Insert into Post', 'site-reviews'), $this->single), |
|
55 | + 'menu_name' => $this->args['menu_name'], |
|
56 | + 'name' => $this->plural, |
|
57 | + 'new_item' => sprintf(_x('New %s', 'New Post', 'site-reviews'), $this->single), |
|
58 | + 'not_found' => sprintf(_x('No %s found', 'No Posts found', 'site-reviews'), $this->plural), |
|
59 | + 'not_found_in_trash' => sprintf(_x('No %s found in Trash', 'No Posts found in Trash', 'site-reviews'), $this->plural), |
|
60 | + 'search_items' => sprintf(_x('Search %s', 'Search Posts', 'site-reviews'), $this->plural), |
|
61 | + 'singular_name' => $this->single, |
|
62 | + 'uploaded_to_this_item' => sprintf(_x('Uploaded to this %s', 'Uploaded to this Post', 'site-reviews'), $this->single), |
|
63 | + 'view_item' => sprintf(_x('View %s', 'View Post', 'site-reviews'), $this->single), |
|
64 | + ]); |
|
65 | + unset($this->args['menu_name']); |
|
66 | + } |
|
67 | 67 | |
68 | - /** |
|
69 | - * @return void |
|
70 | - */ |
|
71 | - protected function normalizeColumns() |
|
72 | - { |
|
73 | - $this->columns = ['cb' => ''] + $this->columns; |
|
74 | - if (array_key_exists('category', $this->columns)) { |
|
75 | - $keys = array_keys($this->columns); |
|
76 | - $keys[array_search('category', $keys)] = 'taxonomy-'.Application::TAXONOMY; |
|
77 | - $this->columns = array_combine($keys, $this->columns); |
|
78 | - } |
|
79 | - if (array_key_exists('pinned', $this->columns)) { |
|
80 | - $this->columns['pinned'] = glsr(Builder::class)->span('<span>'.$this->columns['pinned'].'</span>', |
|
81 | - ['class' => 'pinned-icon'] |
|
82 | - ); |
|
83 | - } |
|
84 | - } |
|
68 | + /** |
|
69 | + * @return void |
|
70 | + */ |
|
71 | + protected function normalizeColumns() |
|
72 | + { |
|
73 | + $this->columns = ['cb' => ''] + $this->columns; |
|
74 | + if (array_key_exists('category', $this->columns)) { |
|
75 | + $keys = array_keys($this->columns); |
|
76 | + $keys[array_search('category', $keys)] = 'taxonomy-'.Application::TAXONOMY; |
|
77 | + $this->columns = array_combine($keys, $this->columns); |
|
78 | + } |
|
79 | + if (array_key_exists('pinned', $this->columns)) { |
|
80 | + $this->columns['pinned'] = glsr(Builder::class)->span('<span>'.$this->columns['pinned'].'</span>', |
|
81 | + ['class' => 'pinned-icon'] |
|
82 | + ); |
|
83 | + } |
|
84 | + } |
|
85 | 85 | } |
@@ -15,10 +15,10 @@ discard block |
||
15 | 15 | public $postType; |
16 | 16 | public $single; |
17 | 17 | |
18 | - public function __construct($input) |
|
18 | + public function __construct( $input ) |
|
19 | 19 | { |
20 | - $args = glsr(PostTypeDefaults::class)->merge($input); |
|
21 | - $this->normalize($args); |
|
20 | + $args = glsr( PostTypeDefaults::class )->merge( $input ); |
|
21 | + $this->normalize( $args ); |
|
22 | 22 | $this->normalizeColumns(); |
23 | 23 | $this->normalizeLabels(); |
24 | 24 | } |
@@ -26,19 +26,19 @@ discard block |
||
26 | 26 | /** |
27 | 27 | * @return void |
28 | 28 | */ |
29 | - protected function normalize(array $args) |
|
29 | + protected function normalize( array $args ) |
|
30 | 30 | { |
31 | - foreach ($args as $key => $value) { |
|
32 | - $property = Helper::buildPropertyName($key); |
|
33 | - if (!property_exists($this, $property)) { |
|
31 | + foreach( $args as $key => $value ) { |
|
32 | + $property = Helper::buildPropertyName( $key ); |
|
33 | + if( !property_exists( $this, $property ) ) { |
|
34 | 34 | continue; |
35 | 35 | } |
36 | 36 | $this->$property = $value; |
37 | 37 | unset($args[$key]); |
38 | 38 | } |
39 | - $this->args = wp_parse_args($args, [ |
|
39 | + $this->args = wp_parse_args( $args, [ |
|
40 | 40 | 'menu_name' => $this->plural, |
41 | - ]); |
|
41 | + ] ); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | /** |
@@ -46,22 +46,22 @@ discard block |
||
46 | 46 | */ |
47 | 47 | protected function normalizeLabels() |
48 | 48 | { |
49 | - $this->args['labels'] = wp_parse_args($this->args['labels'], [ |
|
50 | - 'add_new_item' => sprintf(_x('Add New %s', 'Add New Post', 'site-reviews'), $this->plural), |
|
51 | - 'all_items' => sprintf(_x('All %s', 'All Posts', 'site-reviews'), $this->plural), |
|
52 | - 'archives' => sprintf(_x('%s Archives', 'Post Archives', 'site-reviews'), $this->single), |
|
53 | - 'edit_item' => sprintf(_x('Edit %s', 'Edit Post', 'site-reviews'), $this->single), |
|
54 | - 'insert_into_item' => sprintf(_x('Insert into %s', 'Insert into Post', 'site-reviews'), $this->single), |
|
49 | + $this->args['labels'] = wp_parse_args( $this->args['labels'], [ |
|
50 | + 'add_new_item' => sprintf( _x( 'Add New %s', 'Add New Post', 'site-reviews' ), $this->plural ), |
|
51 | + 'all_items' => sprintf( _x( 'All %s', 'All Posts', 'site-reviews' ), $this->plural ), |
|
52 | + 'archives' => sprintf( _x( '%s Archives', 'Post Archives', 'site-reviews' ), $this->single ), |
|
53 | + 'edit_item' => sprintf( _x( 'Edit %s', 'Edit Post', 'site-reviews' ), $this->single ), |
|
54 | + 'insert_into_item' => sprintf( _x( 'Insert into %s', 'Insert into Post', 'site-reviews' ), $this->single ), |
|
55 | 55 | 'menu_name' => $this->args['menu_name'], |
56 | 56 | 'name' => $this->plural, |
57 | - 'new_item' => sprintf(_x('New %s', 'New Post', 'site-reviews'), $this->single), |
|
58 | - 'not_found' => sprintf(_x('No %s found', 'No Posts found', 'site-reviews'), $this->plural), |
|
59 | - 'not_found_in_trash' => sprintf(_x('No %s found in Trash', 'No Posts found in Trash', 'site-reviews'), $this->plural), |
|
60 | - 'search_items' => sprintf(_x('Search %s', 'Search Posts', 'site-reviews'), $this->plural), |
|
57 | + 'new_item' => sprintf( _x( 'New %s', 'New Post', 'site-reviews' ), $this->single ), |
|
58 | + 'not_found' => sprintf( _x( 'No %s found', 'No Posts found', 'site-reviews' ), $this->plural ), |
|
59 | + 'not_found_in_trash' => sprintf( _x( 'No %s found in Trash', 'No Posts found in Trash', 'site-reviews' ), $this->plural ), |
|
60 | + 'search_items' => sprintf( _x( 'Search %s', 'Search Posts', 'site-reviews' ), $this->plural ), |
|
61 | 61 | 'singular_name' => $this->single, |
62 | - 'uploaded_to_this_item' => sprintf(_x('Uploaded to this %s', 'Uploaded to this Post', 'site-reviews'), $this->single), |
|
63 | - 'view_item' => sprintf(_x('View %s', 'View Post', 'site-reviews'), $this->single), |
|
64 | - ]); |
|
62 | + 'uploaded_to_this_item' => sprintf( _x( 'Uploaded to this %s', 'Uploaded to this Post', 'site-reviews' ), $this->single ), |
|
63 | + 'view_item' => sprintf( _x( 'View %s', 'View Post', 'site-reviews' ), $this->single ), |
|
64 | + ] ); |
|
65 | 65 | unset($this->args['menu_name']); |
66 | 66 | } |
67 | 67 | |
@@ -71,13 +71,13 @@ discard block |
||
71 | 71 | protected function normalizeColumns() |
72 | 72 | { |
73 | 73 | $this->columns = ['cb' => ''] + $this->columns; |
74 | - if (array_key_exists('category', $this->columns)) { |
|
75 | - $keys = array_keys($this->columns); |
|
76 | - $keys[array_search('category', $keys)] = 'taxonomy-'.Application::TAXONOMY; |
|
77 | - $this->columns = array_combine($keys, $this->columns); |
|
74 | + if( array_key_exists( 'category', $this->columns ) ) { |
|
75 | + $keys = array_keys( $this->columns ); |
|
76 | + $keys[array_search( 'category', $keys )] = 'taxonomy-'.Application::TAXONOMY; |
|
77 | + $this->columns = array_combine( $keys, $this->columns ); |
|
78 | 78 | } |
79 | - if (array_key_exists('pinned', $this->columns)) { |
|
80 | - $this->columns['pinned'] = glsr(Builder::class)->span('<span>'.$this->columns['pinned'].'</span>', |
|
79 | + if( array_key_exists( 'pinned', $this->columns ) ) { |
|
80 | + $this->columns['pinned'] = glsr( Builder::class )->span( '<span>'.$this->columns['pinned'].'</span>', |
|
81 | 81 | ['class' => 'pinned-icon'] |
82 | 82 | ); |
83 | 83 | } |
@@ -6,140 +6,140 @@ |
||
6 | 6 | |
7 | 7 | class CreateReview |
8 | 8 | { |
9 | - public $ajax_request; |
|
10 | - public $assigned_to; |
|
11 | - public $author; |
|
12 | - public $avatar; |
|
13 | - public $blacklisted; |
|
14 | - public $category; |
|
15 | - public $content; |
|
16 | - public $custom; |
|
17 | - public $date; |
|
18 | - public $email; |
|
19 | - public $form_id; |
|
20 | - public $ip_address; |
|
21 | - public $post_id; |
|
22 | - public $rating; |
|
23 | - public $referer; |
|
24 | - public $request; |
|
25 | - public $response; |
|
26 | - public $terms; |
|
27 | - public $title; |
|
28 | - public $url; |
|
9 | + public $ajax_request; |
|
10 | + public $assigned_to; |
|
11 | + public $author; |
|
12 | + public $avatar; |
|
13 | + public $blacklisted; |
|
14 | + public $category; |
|
15 | + public $content; |
|
16 | + public $custom; |
|
17 | + public $date; |
|
18 | + public $email; |
|
19 | + public $form_id; |
|
20 | + public $ip_address; |
|
21 | + public $post_id; |
|
22 | + public $rating; |
|
23 | + public $referer; |
|
24 | + public $request; |
|
25 | + public $response; |
|
26 | + public $terms; |
|
27 | + public $title; |
|
28 | + public $url; |
|
29 | 29 | |
30 | - public function __construct($input) |
|
31 | - { |
|
32 | - $this->request = $input; |
|
33 | - $this->ajax_request = isset($input['_ajax_request']); |
|
34 | - $this->assigned_to = $this->getNumeric('assign_to'); |
|
35 | - $this->author = sanitize_text_field($this->getUser('name')); |
|
36 | - $this->avatar = $this->getAvatar(); |
|
37 | - $this->blacklisted = isset($input['blacklisted']); |
|
38 | - $this->category = $this->getCategory(); |
|
39 | - $this->content = sanitize_textarea_field($this->get('content')); |
|
40 | - $this->custom = $this->getCustom(); |
|
41 | - $this->date = $this->getDate('date'); |
|
42 | - $this->email = sanitize_email($this->getUser('email')); |
|
43 | - $this->form_id = sanitize_key($this->get('form_id')); |
|
44 | - $this->ip_address = $this->get('ip_address'); |
|
45 | - $this->post_id = intval($this->get('_post_id')); |
|
46 | - $this->rating = intval($this->get('rating')); |
|
47 | - $this->referer = $this->get('_referer'); |
|
48 | - $this->response = sanitize_textarea_field($this->get('response')); |
|
49 | - $this->terms = !empty($input['terms']); |
|
50 | - $this->title = sanitize_text_field($this->get('title')); |
|
51 | - $this->url = esc_url_raw($this->get('url')); |
|
52 | - } |
|
30 | + public function __construct($input) |
|
31 | + { |
|
32 | + $this->request = $input; |
|
33 | + $this->ajax_request = isset($input['_ajax_request']); |
|
34 | + $this->assigned_to = $this->getNumeric('assign_to'); |
|
35 | + $this->author = sanitize_text_field($this->getUser('name')); |
|
36 | + $this->avatar = $this->getAvatar(); |
|
37 | + $this->blacklisted = isset($input['blacklisted']); |
|
38 | + $this->category = $this->getCategory(); |
|
39 | + $this->content = sanitize_textarea_field($this->get('content')); |
|
40 | + $this->custom = $this->getCustom(); |
|
41 | + $this->date = $this->getDate('date'); |
|
42 | + $this->email = sanitize_email($this->getUser('email')); |
|
43 | + $this->form_id = sanitize_key($this->get('form_id')); |
|
44 | + $this->ip_address = $this->get('ip_address'); |
|
45 | + $this->post_id = intval($this->get('_post_id')); |
|
46 | + $this->rating = intval($this->get('rating')); |
|
47 | + $this->referer = $this->get('_referer'); |
|
48 | + $this->response = sanitize_textarea_field($this->get('response')); |
|
49 | + $this->terms = !empty($input['terms']); |
|
50 | + $this->title = sanitize_text_field($this->get('title')); |
|
51 | + $this->url = esc_url_raw($this->get('url')); |
|
52 | + } |
|
53 | 53 | |
54 | - /** |
|
55 | - * @param string $key |
|
56 | - * @return string |
|
57 | - */ |
|
58 | - protected function get($key) |
|
59 | - { |
|
60 | - return (string) Arr::get($this->request, $key); |
|
61 | - } |
|
54 | + /** |
|
55 | + * @param string $key |
|
56 | + * @return string |
|
57 | + */ |
|
58 | + protected function get($key) |
|
59 | + { |
|
60 | + return (string) Arr::get($this->request, $key); |
|
61 | + } |
|
62 | 62 | |
63 | - /** |
|
64 | - * @return string |
|
65 | - */ |
|
66 | - protected function getAvatar() |
|
67 | - { |
|
68 | - $avatar = $this->get('avatar'); |
|
69 | - return !filter_var($avatar, FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED) |
|
70 | - ? (string) get_avatar_url($this->get('email')) |
|
71 | - : $avatar; |
|
72 | - } |
|
63 | + /** |
|
64 | + * @return string |
|
65 | + */ |
|
66 | + protected function getAvatar() |
|
67 | + { |
|
68 | + $avatar = $this->get('avatar'); |
|
69 | + return !filter_var($avatar, FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED) |
|
70 | + ? (string) get_avatar_url($this->get('email')) |
|
71 | + : $avatar; |
|
72 | + } |
|
73 | 73 | |
74 | - /** |
|
75 | - * @return string |
|
76 | - */ |
|
77 | - protected function getCategory() |
|
78 | - { |
|
79 | - $categories = Arr::convertStringToArray($this->get('category')); |
|
80 | - return sanitize_key(Arr::get($categories, 0)); |
|
81 | - } |
|
74 | + /** |
|
75 | + * @return string |
|
76 | + */ |
|
77 | + protected function getCategory() |
|
78 | + { |
|
79 | + $categories = Arr::convertStringToArray($this->get('category')); |
|
80 | + return sanitize_key(Arr::get($categories, 0)); |
|
81 | + } |
|
82 | 82 | |
83 | - /** |
|
84 | - * @return array |
|
85 | - */ |
|
86 | - protected function getCustom() |
|
87 | - { |
|
88 | - $unset = [ |
|
89 | - '_action', '_ajax_request', '_counter', '_nonce', '_post_id', '_recaptcha-token', |
|
90 | - '_referer', 'assign_to', 'category', 'content', 'date', 'email', 'excluded', 'form_id', |
|
91 | - 'gotcha', 'ip_address', 'name', 'rating', 'response', 'terms', 'title', 'url', |
|
92 | - ]; |
|
93 | - $unset = apply_filters('site-reviews/create/unset-keys-from-custom', $unset); |
|
94 | - $custom = $this->request; |
|
95 | - foreach ($unset as $value) { |
|
96 | - unset($custom[$value]); |
|
97 | - } |
|
98 | - return $custom; |
|
99 | - } |
|
83 | + /** |
|
84 | + * @return array |
|
85 | + */ |
|
86 | + protected function getCustom() |
|
87 | + { |
|
88 | + $unset = [ |
|
89 | + '_action', '_ajax_request', '_counter', '_nonce', '_post_id', '_recaptcha-token', |
|
90 | + '_referer', 'assign_to', 'category', 'content', 'date', 'email', 'excluded', 'form_id', |
|
91 | + 'gotcha', 'ip_address', 'name', 'rating', 'response', 'terms', 'title', 'url', |
|
92 | + ]; |
|
93 | + $unset = apply_filters('site-reviews/create/unset-keys-from-custom', $unset); |
|
94 | + $custom = $this->request; |
|
95 | + foreach ($unset as $value) { |
|
96 | + unset($custom[$value]); |
|
97 | + } |
|
98 | + return $custom; |
|
99 | + } |
|
100 | 100 | |
101 | - /** |
|
102 | - * @param string $key |
|
103 | - * @return string |
|
104 | - */ |
|
105 | - protected function getDate($key) |
|
106 | - { |
|
107 | - $date = strtotime($this->get($key)); |
|
108 | - if (false === $date) { |
|
109 | - $date = time(); |
|
110 | - } |
|
111 | - return get_date_from_gmt(gmdate('Y-m-d H:i:s', $date)); |
|
112 | - } |
|
101 | + /** |
|
102 | + * @param string $key |
|
103 | + * @return string |
|
104 | + */ |
|
105 | + protected function getDate($key) |
|
106 | + { |
|
107 | + $date = strtotime($this->get($key)); |
|
108 | + if (false === $date) { |
|
109 | + $date = time(); |
|
110 | + } |
|
111 | + return get_date_from_gmt(gmdate('Y-m-d H:i:s', $date)); |
|
112 | + } |
|
113 | 113 | |
114 | - /** |
|
115 | - * @param string $key |
|
116 | - * @return string |
|
117 | - */ |
|
118 | - protected function getUser($key) |
|
119 | - { |
|
120 | - $value = $this->get($key); |
|
121 | - if (empty($value)) { |
|
122 | - $user = wp_get_current_user(); |
|
123 | - $userValues = [ |
|
124 | - 'email' => 'user_email', |
|
125 | - 'name' => 'display_name', |
|
126 | - ]; |
|
127 | - if ($user->exists() && array_key_exists($key, $userValues)) { |
|
128 | - return $user->{$userValues[$key]}; |
|
129 | - } |
|
130 | - } |
|
131 | - return $value; |
|
132 | - } |
|
114 | + /** |
|
115 | + * @param string $key |
|
116 | + * @return string |
|
117 | + */ |
|
118 | + protected function getUser($key) |
|
119 | + { |
|
120 | + $value = $this->get($key); |
|
121 | + if (empty($value)) { |
|
122 | + $user = wp_get_current_user(); |
|
123 | + $userValues = [ |
|
124 | + 'email' => 'user_email', |
|
125 | + 'name' => 'display_name', |
|
126 | + ]; |
|
127 | + if ($user->exists() && array_key_exists($key, $userValues)) { |
|
128 | + return $user->{$userValues[$key]}; |
|
129 | + } |
|
130 | + } |
|
131 | + return $value; |
|
132 | + } |
|
133 | 133 | |
134 | - /** |
|
135 | - * @param string $key |
|
136 | - * @return string |
|
137 | - */ |
|
138 | - protected function getNumeric($key) |
|
139 | - { |
|
140 | - $value = $this->get($key); |
|
141 | - return is_numeric($value) |
|
142 | - ? $value |
|
143 | - : ''; |
|
144 | - } |
|
134 | + /** |
|
135 | + * @param string $key |
|
136 | + * @return string |
|
137 | + */ |
|
138 | + protected function getNumeric($key) |
|
139 | + { |
|
140 | + $value = $this->get($key); |
|
141 | + return is_numeric($value) |
|
142 | + ? $value |
|
143 | + : ''; |
|
144 | + } |
|
145 | 145 | } |
@@ -27,37 +27,37 @@ discard block |
||
27 | 27 | public $title; |
28 | 28 | public $url; |
29 | 29 | |
30 | - public function __construct($input) |
|
30 | + public function __construct( $input ) |
|
31 | 31 | { |
32 | 32 | $this->request = $input; |
33 | 33 | $this->ajax_request = isset($input['_ajax_request']); |
34 | - $this->assigned_to = $this->getNumeric('assign_to'); |
|
35 | - $this->author = sanitize_text_field($this->getUser('name')); |
|
34 | + $this->assigned_to = $this->getNumeric( 'assign_to' ); |
|
35 | + $this->author = sanitize_text_field( $this->getUser( 'name' ) ); |
|
36 | 36 | $this->avatar = $this->getAvatar(); |
37 | 37 | $this->blacklisted = isset($input['blacklisted']); |
38 | 38 | $this->category = $this->getCategory(); |
39 | - $this->content = sanitize_textarea_field($this->get('content')); |
|
39 | + $this->content = sanitize_textarea_field( $this->get( 'content' ) ); |
|
40 | 40 | $this->custom = $this->getCustom(); |
41 | - $this->date = $this->getDate('date'); |
|
42 | - $this->email = sanitize_email($this->getUser('email')); |
|
43 | - $this->form_id = sanitize_key($this->get('form_id')); |
|
44 | - $this->ip_address = $this->get('ip_address'); |
|
45 | - $this->post_id = intval($this->get('_post_id')); |
|
46 | - $this->rating = intval($this->get('rating')); |
|
47 | - $this->referer = $this->get('_referer'); |
|
48 | - $this->response = sanitize_textarea_field($this->get('response')); |
|
41 | + $this->date = $this->getDate( 'date' ); |
|
42 | + $this->email = sanitize_email( $this->getUser( 'email' ) ); |
|
43 | + $this->form_id = sanitize_key( $this->get( 'form_id' ) ); |
|
44 | + $this->ip_address = $this->get( 'ip_address' ); |
|
45 | + $this->post_id = intval( $this->get( '_post_id' ) ); |
|
46 | + $this->rating = intval( $this->get( 'rating' ) ); |
|
47 | + $this->referer = $this->get( '_referer' ); |
|
48 | + $this->response = sanitize_textarea_field( $this->get( 'response' ) ); |
|
49 | 49 | $this->terms = !empty($input['terms']); |
50 | - $this->title = sanitize_text_field($this->get('title')); |
|
51 | - $this->url = esc_url_raw($this->get('url')); |
|
50 | + $this->title = sanitize_text_field( $this->get( 'title' ) ); |
|
51 | + $this->url = esc_url_raw( $this->get( 'url' ) ); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | /** |
55 | 55 | * @param string $key |
56 | 56 | * @return string |
57 | 57 | */ |
58 | - protected function get($key) |
|
58 | + protected function get( $key ) |
|
59 | 59 | { |
60 | - return (string) Arr::get($this->request, $key); |
|
60 | + return (string)Arr::get( $this->request, $key ); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | /** |
@@ -65,9 +65,9 @@ discard block |
||
65 | 65 | */ |
66 | 66 | protected function getAvatar() |
67 | 67 | { |
68 | - $avatar = $this->get('avatar'); |
|
69 | - return !filter_var($avatar, FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED) |
|
70 | - ? (string) get_avatar_url($this->get('email')) |
|
68 | + $avatar = $this->get( 'avatar' ); |
|
69 | + return !filter_var( $avatar, FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED ) |
|
70 | + ? (string)get_avatar_url( $this->get( 'email' ) ) |
|
71 | 71 | : $avatar; |
72 | 72 | } |
73 | 73 | |
@@ -76,8 +76,8 @@ discard block |
||
76 | 76 | */ |
77 | 77 | protected function getCategory() |
78 | 78 | { |
79 | - $categories = Arr::convertStringToArray($this->get('category')); |
|
80 | - return sanitize_key(Arr::get($categories, 0)); |
|
79 | + $categories = Arr::convertStringToArray( $this->get( 'category' ) ); |
|
80 | + return sanitize_key( Arr::get( $categories, 0 ) ); |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | /** |
@@ -90,9 +90,9 @@ discard block |
||
90 | 90 | '_referer', 'assign_to', 'category', 'content', 'date', 'email', 'excluded', 'form_id', |
91 | 91 | 'gotcha', 'ip_address', 'name', 'rating', 'response', 'terms', 'title', 'url', |
92 | 92 | ]; |
93 | - $unset = apply_filters('site-reviews/create/unset-keys-from-custom', $unset); |
|
93 | + $unset = apply_filters( 'site-reviews/create/unset-keys-from-custom', $unset ); |
|
94 | 94 | $custom = $this->request; |
95 | - foreach ($unset as $value) { |
|
95 | + foreach( $unset as $value ) { |
|
96 | 96 | unset($custom[$value]); |
97 | 97 | } |
98 | 98 | return $custom; |
@@ -102,29 +102,29 @@ discard block |
||
102 | 102 | * @param string $key |
103 | 103 | * @return string |
104 | 104 | */ |
105 | - protected function getDate($key) |
|
105 | + protected function getDate( $key ) |
|
106 | 106 | { |
107 | - $date = strtotime($this->get($key)); |
|
108 | - if (false === $date) { |
|
107 | + $date = strtotime( $this->get( $key ) ); |
|
108 | + if( false === $date ) { |
|
109 | 109 | $date = time(); |
110 | 110 | } |
111 | - return get_date_from_gmt(gmdate('Y-m-d H:i:s', $date)); |
|
111 | + return get_date_from_gmt( gmdate( 'Y-m-d H:i:s', $date ) ); |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | /** |
115 | 115 | * @param string $key |
116 | 116 | * @return string |
117 | 117 | */ |
118 | - protected function getUser($key) |
|
118 | + protected function getUser( $key ) |
|
119 | 119 | { |
120 | - $value = $this->get($key); |
|
121 | - if (empty($value)) { |
|
120 | + $value = $this->get( $key ); |
|
121 | + if( empty($value) ) { |
|
122 | 122 | $user = wp_get_current_user(); |
123 | 123 | $userValues = [ |
124 | 124 | 'email' => 'user_email', |
125 | 125 | 'name' => 'display_name', |
126 | 126 | ]; |
127 | - if ($user->exists() && array_key_exists($key, $userValues)) { |
|
127 | + if( $user->exists() && array_key_exists( $key, $userValues ) ) { |
|
128 | 128 | return $user->{$userValues[$key]}; |
129 | 129 | } |
130 | 130 | } |
@@ -135,10 +135,10 @@ discard block |
||
135 | 135 | * @param string $key |
136 | 136 | * @return string |
137 | 137 | */ |
138 | - protected function getNumeric($key) |
|
138 | + protected function getNumeric( $key ) |
|
139 | 139 | { |
140 | - $value = $this->get($key); |
|
141 | - return is_numeric($value) |
|
140 | + $value = $this->get( $key ); |
|
141 | + return is_numeric( $value ) |
|
142 | 142 | ? $value |
143 | 143 | : ''; |
144 | 144 | } |
@@ -7,162 +7,162 @@ |
||
7 | 7 | |
8 | 8 | class Router |
9 | 9 | { |
10 | - /** |
|
11 | - * @var array |
|
12 | - */ |
|
13 | - protected $unguardedActions = []; |
|
10 | + /** |
|
11 | + * @var array |
|
12 | + */ |
|
13 | + protected $unguardedActions = []; |
|
14 | 14 | |
15 | - public function __construct() |
|
16 | - { |
|
17 | - $this->unguardedActions = apply_filters('site-reviews/router/unguarded-actions', [ |
|
18 | - 'dismiss-notice', |
|
19 | - 'fetch-paged-reviews', |
|
20 | - ]); |
|
21 | - } |
|
15 | + public function __construct() |
|
16 | + { |
|
17 | + $this->unguardedActions = apply_filters('site-reviews/router/unguarded-actions', [ |
|
18 | + 'dismiss-notice', |
|
19 | + 'fetch-paged-reviews', |
|
20 | + ]); |
|
21 | + } |
|
22 | 22 | |
23 | - /** |
|
24 | - * @return void |
|
25 | - */ |
|
26 | - public function routeAdminPostRequest() |
|
27 | - { |
|
28 | - $request = $this->getRequest(); |
|
29 | - if (!$this->isValidPostRequest($request)) { |
|
30 | - return; |
|
31 | - } |
|
32 | - check_admin_referer($request['_action']); |
|
33 | - $this->routeRequest('admin', $request['_action'], $request); |
|
34 | - } |
|
23 | + /** |
|
24 | + * @return void |
|
25 | + */ |
|
26 | + public function routeAdminPostRequest() |
|
27 | + { |
|
28 | + $request = $this->getRequest(); |
|
29 | + if (!$this->isValidPostRequest($request)) { |
|
30 | + return; |
|
31 | + } |
|
32 | + check_admin_referer($request['_action']); |
|
33 | + $this->routeRequest('admin', $request['_action'], $request); |
|
34 | + } |
|
35 | 35 | |
36 | - /** |
|
37 | - * @return void |
|
38 | - */ |
|
39 | - public function routeAjaxRequest() |
|
40 | - { |
|
41 | - $request = $this->getRequest(); |
|
42 | - $this->checkAjaxRequest($request); |
|
43 | - $this->checkAjaxNonce($request); |
|
44 | - $this->routeRequest('ajax', $request['_action'], $request); |
|
45 | - wp_die(); |
|
46 | - } |
|
36 | + /** |
|
37 | + * @return void |
|
38 | + */ |
|
39 | + public function routeAjaxRequest() |
|
40 | + { |
|
41 | + $request = $this->getRequest(); |
|
42 | + $this->checkAjaxRequest($request); |
|
43 | + $this->checkAjaxNonce($request); |
|
44 | + $this->routeRequest('ajax', $request['_action'], $request); |
|
45 | + wp_die(); |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * @return void |
|
50 | - */ |
|
51 | - public function routePublicPostRequest() |
|
52 | - { |
|
53 | - if (is_admin()) { |
|
54 | - return; |
|
55 | - } |
|
56 | - $request = $this->getRequest(); |
|
57 | - if (!$this->isValidPostRequest($request)) { |
|
58 | - return; |
|
59 | - } |
|
60 | - if (!$this->isValidPublicNonce($request)) { |
|
61 | - return; |
|
62 | - } |
|
63 | - $this->routeRequest('public', $request['_action'], $request); |
|
64 | - } |
|
48 | + /** |
|
49 | + * @return void |
|
50 | + */ |
|
51 | + public function routePublicPostRequest() |
|
52 | + { |
|
53 | + if (is_admin()) { |
|
54 | + return; |
|
55 | + } |
|
56 | + $request = $this->getRequest(); |
|
57 | + if (!$this->isValidPostRequest($request)) { |
|
58 | + return; |
|
59 | + } |
|
60 | + if (!$this->isValidPublicNonce($request)) { |
|
61 | + return; |
|
62 | + } |
|
63 | + $this->routeRequest('public', $request['_action'], $request); |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * @return void |
|
68 | - */ |
|
69 | - protected function checkAjaxNonce(array $request) |
|
70 | - { |
|
71 | - if (!is_user_logged_in() || in_array(Arr::get($request, '_action'), $this->unguardedActions)) { |
|
72 | - return; |
|
73 | - } |
|
74 | - if (!isset($request['_nonce'])) { |
|
75 | - $this->sendAjaxError('request is missing a nonce', $request); |
|
76 | - } |
|
77 | - if (!wp_verify_nonce($request['_nonce'], $request['_action'])) { |
|
78 | - $this->sendAjaxError('request failed the nonce check', $request, 403); |
|
79 | - } |
|
80 | - } |
|
66 | + /** |
|
67 | + * @return void |
|
68 | + */ |
|
69 | + protected function checkAjaxNonce(array $request) |
|
70 | + { |
|
71 | + if (!is_user_logged_in() || in_array(Arr::get($request, '_action'), $this->unguardedActions)) { |
|
72 | + return; |
|
73 | + } |
|
74 | + if (!isset($request['_nonce'])) { |
|
75 | + $this->sendAjaxError('request is missing a nonce', $request); |
|
76 | + } |
|
77 | + if (!wp_verify_nonce($request['_nonce'], $request['_action'])) { |
|
78 | + $this->sendAjaxError('request failed the nonce check', $request, 403); |
|
79 | + } |
|
80 | + } |
|
81 | 81 | |
82 | - /** |
|
83 | - * @return void |
|
84 | - */ |
|
85 | - protected function checkAjaxRequest(array $request) |
|
86 | - { |
|
87 | - if (!isset($request['_action'])) { |
|
88 | - $this->sendAjaxError('request must include an action', $request); |
|
89 | - } |
|
90 | - if (empty($request['_ajax_request'])) { |
|
91 | - $this->sendAjaxError('request is invalid', $request); |
|
92 | - } |
|
93 | - } |
|
82 | + /** |
|
83 | + * @return void |
|
84 | + */ |
|
85 | + protected function checkAjaxRequest(array $request) |
|
86 | + { |
|
87 | + if (!isset($request['_action'])) { |
|
88 | + $this->sendAjaxError('request must include an action', $request); |
|
89 | + } |
|
90 | + if (empty($request['_ajax_request'])) { |
|
91 | + $this->sendAjaxError('request is invalid', $request); |
|
92 | + } |
|
93 | + } |
|
94 | 94 | |
95 | - /** |
|
96 | - * All ajax requests in the plugin are triggered by a single action hook: glsr_action, |
|
97 | - * while each ajax route is determined by $_POST[request][_action]. |
|
98 | - * @return array |
|
99 | - */ |
|
100 | - protected function getRequest() |
|
101 | - { |
|
102 | - $request = Helper::filterInputArray(Application::ID); |
|
103 | - if (Helper::filterInput('action') == Application::PREFIX.'action') { |
|
104 | - $request['_ajax_request'] = true; |
|
105 | - } |
|
106 | - if ('submit-review' == Helper::filterInput('_action', $request)) { |
|
107 | - $request['_recaptcha-token'] = Helper::filterInput('g-recaptcha-response'); |
|
108 | - } |
|
109 | - return $request; |
|
110 | - } |
|
95 | + /** |
|
96 | + * All ajax requests in the plugin are triggered by a single action hook: glsr_action, |
|
97 | + * while each ajax route is determined by $_POST[request][_action]. |
|
98 | + * @return array |
|
99 | + */ |
|
100 | + protected function getRequest() |
|
101 | + { |
|
102 | + $request = Helper::filterInputArray(Application::ID); |
|
103 | + if (Helper::filterInput('action') == Application::PREFIX.'action') { |
|
104 | + $request['_ajax_request'] = true; |
|
105 | + } |
|
106 | + if ('submit-review' == Helper::filterInput('_action', $request)) { |
|
107 | + $request['_recaptcha-token'] = Helper::filterInput('g-recaptcha-response'); |
|
108 | + } |
|
109 | + return $request; |
|
110 | + } |
|
111 | 111 | |
112 | - /** |
|
113 | - * @return bool |
|
114 | - */ |
|
115 | - protected function isValidPostRequest(array $request = []) |
|
116 | - { |
|
117 | - return !empty($request['_action']) && empty($request['_ajax_request']); |
|
118 | - } |
|
112 | + /** |
|
113 | + * @return bool |
|
114 | + */ |
|
115 | + protected function isValidPostRequest(array $request = []) |
|
116 | + { |
|
117 | + return !empty($request['_action']) && empty($request['_ajax_request']); |
|
118 | + } |
|
119 | 119 | |
120 | - /** |
|
121 | - * @return bool |
|
122 | - */ |
|
123 | - protected function isValidPublicNonce(array $request) |
|
124 | - { |
|
125 | - if (is_user_logged_in() && !wp_verify_nonce($request['_nonce'], $request['_action'])) { |
|
126 | - glsr_log()->error('nonce check failed for public request')->debug($request); |
|
127 | - return false; |
|
128 | - } |
|
129 | - return true; |
|
130 | - } |
|
120 | + /** |
|
121 | + * @return bool |
|
122 | + */ |
|
123 | + protected function isValidPublicNonce(array $request) |
|
124 | + { |
|
125 | + if (is_user_logged_in() && !wp_verify_nonce($request['_nonce'], $request['_action'])) { |
|
126 | + glsr_log()->error('nonce check failed for public request')->debug($request); |
|
127 | + return false; |
|
128 | + } |
|
129 | + return true; |
|
130 | + } |
|
131 | 131 | |
132 | - /** |
|
133 | - * @param string $type |
|
134 | - * @param string $action |
|
135 | - * @return void |
|
136 | - */ |
|
137 | - protected function routeRequest($type, $action, array $request = []) |
|
138 | - { |
|
139 | - $actionHook = 'site-reviews/route/'.$type.'/request'; |
|
140 | - $controller = glsr(Helper::buildClassName($type.'-controller', 'Controllers')); |
|
141 | - $method = Helper::buildMethodName($action, 'router'); |
|
142 | - $request = apply_filters('site-reviews/route/request', $request, $action, $type); |
|
143 | - do_action($actionHook, $action, $request); |
|
144 | - if (is_callable([$controller, $method])) { |
|
145 | - call_user_func([$controller, $method], $request); |
|
146 | - return; |
|
147 | - } |
|
148 | - if (0 === did_action($actionHook)) { |
|
149 | - glsr_log('Unknown '.$type.' router request: '.$action); |
|
150 | - } |
|
151 | - } |
|
132 | + /** |
|
133 | + * @param string $type |
|
134 | + * @param string $action |
|
135 | + * @return void |
|
136 | + */ |
|
137 | + protected function routeRequest($type, $action, array $request = []) |
|
138 | + { |
|
139 | + $actionHook = 'site-reviews/route/'.$type.'/request'; |
|
140 | + $controller = glsr(Helper::buildClassName($type.'-controller', 'Controllers')); |
|
141 | + $method = Helper::buildMethodName($action, 'router'); |
|
142 | + $request = apply_filters('site-reviews/route/request', $request, $action, $type); |
|
143 | + do_action($actionHook, $action, $request); |
|
144 | + if (is_callable([$controller, $method])) { |
|
145 | + call_user_func([$controller, $method], $request); |
|
146 | + return; |
|
147 | + } |
|
148 | + if (0 === did_action($actionHook)) { |
|
149 | + glsr_log('Unknown '.$type.' router request: '.$action); |
|
150 | + } |
|
151 | + } |
|
152 | 152 | |
153 | - /** |
|
154 | - * @param string $error |
|
155 | - * @param int $statusCode |
|
156 | - * @return void |
|
157 | - */ |
|
158 | - protected function sendAjaxError($error, array $request, $statusCode = 400) |
|
159 | - { |
|
160 | - glsr_log()->error($error)->debug($request); |
|
161 | - glsr(Notice::class)->addError(__('There was an error (try reloading the page).', 'site-reviews').' <code>'.$error.'</code>'); |
|
162 | - wp_send_json_error([ |
|
163 | - 'message' => __('The form could not be submitted. Please notify the site administrator.', 'site-reviews'), |
|
164 | - 'notices' => glsr(Notice::class)->get(), |
|
165 | - 'error' => $error, |
|
166 | - ]); |
|
167 | - } |
|
153 | + /** |
|
154 | + * @param string $error |
|
155 | + * @param int $statusCode |
|
156 | + * @return void |
|
157 | + */ |
|
158 | + protected function sendAjaxError($error, array $request, $statusCode = 400) |
|
159 | + { |
|
160 | + glsr_log()->error($error)->debug($request); |
|
161 | + glsr(Notice::class)->addError(__('There was an error (try reloading the page).', 'site-reviews').' <code>'.$error.'</code>'); |
|
162 | + wp_send_json_error([ |
|
163 | + 'message' => __('The form could not be submitted. Please notify the site administrator.', 'site-reviews'), |
|
164 | + 'notices' => glsr(Notice::class)->get(), |
|
165 | + 'error' => $error, |
|
166 | + ]); |
|
167 | + } |
|
168 | 168 | } |
@@ -14,10 +14,10 @@ discard block |
||
14 | 14 | |
15 | 15 | public function __construct() |
16 | 16 | { |
17 | - $this->unguardedActions = apply_filters('site-reviews/router/unguarded-actions', [ |
|
17 | + $this->unguardedActions = apply_filters( 'site-reviews/router/unguarded-actions', [ |
|
18 | 18 | 'dismiss-notice', |
19 | 19 | 'fetch-paged-reviews', |
20 | - ]); |
|
20 | + ] ); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | /** |
@@ -26,11 +26,11 @@ discard block |
||
26 | 26 | public function routeAdminPostRequest() |
27 | 27 | { |
28 | 28 | $request = $this->getRequest(); |
29 | - if (!$this->isValidPostRequest($request)) { |
|
29 | + if( !$this->isValidPostRequest( $request ) ) { |
|
30 | 30 | return; |
31 | 31 | } |
32 | - check_admin_referer($request['_action']); |
|
33 | - $this->routeRequest('admin', $request['_action'], $request); |
|
32 | + check_admin_referer( $request['_action'] ); |
|
33 | + $this->routeRequest( 'admin', $request['_action'], $request ); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | /** |
@@ -39,9 +39,9 @@ discard block |
||
39 | 39 | public function routeAjaxRequest() |
40 | 40 | { |
41 | 41 | $request = $this->getRequest(); |
42 | - $this->checkAjaxRequest($request); |
|
43 | - $this->checkAjaxNonce($request); |
|
44 | - $this->routeRequest('ajax', $request['_action'], $request); |
|
42 | + $this->checkAjaxRequest( $request ); |
|
43 | + $this->checkAjaxNonce( $request ); |
|
44 | + $this->routeRequest( 'ajax', $request['_action'], $request ); |
|
45 | 45 | wp_die(); |
46 | 46 | } |
47 | 47 | |
@@ -50,45 +50,45 @@ discard block |
||
50 | 50 | */ |
51 | 51 | public function routePublicPostRequest() |
52 | 52 | { |
53 | - if (is_admin()) { |
|
53 | + if( is_admin() ) { |
|
54 | 54 | return; |
55 | 55 | } |
56 | 56 | $request = $this->getRequest(); |
57 | - if (!$this->isValidPostRequest($request)) { |
|
57 | + if( !$this->isValidPostRequest( $request ) ) { |
|
58 | 58 | return; |
59 | 59 | } |
60 | - if (!$this->isValidPublicNonce($request)) { |
|
60 | + if( !$this->isValidPublicNonce( $request ) ) { |
|
61 | 61 | return; |
62 | 62 | } |
63 | - $this->routeRequest('public', $request['_action'], $request); |
|
63 | + $this->routeRequest( 'public', $request['_action'], $request ); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | /** |
67 | 67 | * @return void |
68 | 68 | */ |
69 | - protected function checkAjaxNonce(array $request) |
|
69 | + protected function checkAjaxNonce( array $request ) |
|
70 | 70 | { |
71 | - if (!is_user_logged_in() || in_array(Arr::get($request, '_action'), $this->unguardedActions)) { |
|
71 | + if( !is_user_logged_in() || in_array( Arr::get( $request, '_action' ), $this->unguardedActions ) ) { |
|
72 | 72 | return; |
73 | 73 | } |
74 | - if (!isset($request['_nonce'])) { |
|
75 | - $this->sendAjaxError('request is missing a nonce', $request); |
|
74 | + if( !isset($request['_nonce']) ) { |
|
75 | + $this->sendAjaxError( 'request is missing a nonce', $request ); |
|
76 | 76 | } |
77 | - if (!wp_verify_nonce($request['_nonce'], $request['_action'])) { |
|
78 | - $this->sendAjaxError('request failed the nonce check', $request, 403); |
|
77 | + if( !wp_verify_nonce( $request['_nonce'], $request['_action'] ) ) { |
|
78 | + $this->sendAjaxError( 'request failed the nonce check', $request, 403 ); |
|
79 | 79 | } |
80 | 80 | } |
81 | 81 | |
82 | 82 | /** |
83 | 83 | * @return void |
84 | 84 | */ |
85 | - protected function checkAjaxRequest(array $request) |
|
85 | + protected function checkAjaxRequest( array $request ) |
|
86 | 86 | { |
87 | - if (!isset($request['_action'])) { |
|
88 | - $this->sendAjaxError('request must include an action', $request); |
|
87 | + if( !isset($request['_action']) ) { |
|
88 | + $this->sendAjaxError( 'request must include an action', $request ); |
|
89 | 89 | } |
90 | - if (empty($request['_ajax_request'])) { |
|
91 | - $this->sendAjaxError('request is invalid', $request); |
|
90 | + if( empty($request['_ajax_request']) ) { |
|
91 | + $this->sendAjaxError( 'request is invalid', $request ); |
|
92 | 92 | } |
93 | 93 | } |
94 | 94 | |
@@ -99,12 +99,12 @@ discard block |
||
99 | 99 | */ |
100 | 100 | protected function getRequest() |
101 | 101 | { |
102 | - $request = Helper::filterInputArray(Application::ID); |
|
103 | - if (Helper::filterInput('action') == Application::PREFIX.'action') { |
|
102 | + $request = Helper::filterInputArray( Application::ID ); |
|
103 | + if( Helper::filterInput( 'action' ) == Application::PREFIX.'action' ) { |
|
104 | 104 | $request['_ajax_request'] = true; |
105 | 105 | } |
106 | - if ('submit-review' == Helper::filterInput('_action', $request)) { |
|
107 | - $request['_recaptcha-token'] = Helper::filterInput('g-recaptcha-response'); |
|
106 | + if( 'submit-review' == Helper::filterInput( '_action', $request ) ) { |
|
107 | + $request['_recaptcha-token'] = Helper::filterInput( 'g-recaptcha-response' ); |
|
108 | 108 | } |
109 | 109 | return $request; |
110 | 110 | } |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | /** |
113 | 113 | * @return bool |
114 | 114 | */ |
115 | - protected function isValidPostRequest(array $request = []) |
|
115 | + protected function isValidPostRequest( array $request = [] ) |
|
116 | 116 | { |
117 | 117 | return !empty($request['_action']) && empty($request['_ajax_request']); |
118 | 118 | } |
@@ -120,10 +120,10 @@ discard block |
||
120 | 120 | /** |
121 | 121 | * @return bool |
122 | 122 | */ |
123 | - protected function isValidPublicNonce(array $request) |
|
123 | + protected function isValidPublicNonce( array $request ) |
|
124 | 124 | { |
125 | - if (is_user_logged_in() && !wp_verify_nonce($request['_nonce'], $request['_action'])) { |
|
126 | - glsr_log()->error('nonce check failed for public request')->debug($request); |
|
125 | + if( is_user_logged_in() && !wp_verify_nonce( $request['_nonce'], $request['_action'] ) ) { |
|
126 | + glsr_log()->error( 'nonce check failed for public request' )->debug( $request ); |
|
127 | 127 | return false; |
128 | 128 | } |
129 | 129 | return true; |
@@ -134,19 +134,19 @@ discard block |
||
134 | 134 | * @param string $action |
135 | 135 | * @return void |
136 | 136 | */ |
137 | - protected function routeRequest($type, $action, array $request = []) |
|
137 | + protected function routeRequest( $type, $action, array $request = [] ) |
|
138 | 138 | { |
139 | 139 | $actionHook = 'site-reviews/route/'.$type.'/request'; |
140 | - $controller = glsr(Helper::buildClassName($type.'-controller', 'Controllers')); |
|
141 | - $method = Helper::buildMethodName($action, 'router'); |
|
142 | - $request = apply_filters('site-reviews/route/request', $request, $action, $type); |
|
143 | - do_action($actionHook, $action, $request); |
|
144 | - if (is_callable([$controller, $method])) { |
|
145 | - call_user_func([$controller, $method], $request); |
|
140 | + $controller = glsr( Helper::buildClassName( $type.'-controller', 'Controllers' ) ); |
|
141 | + $method = Helper::buildMethodName( $action, 'router' ); |
|
142 | + $request = apply_filters( 'site-reviews/route/request', $request, $action, $type ); |
|
143 | + do_action( $actionHook, $action, $request ); |
|
144 | + if( is_callable( [$controller, $method] ) ) { |
|
145 | + call_user_func( [$controller, $method], $request ); |
|
146 | 146 | return; |
147 | 147 | } |
148 | - if (0 === did_action($actionHook)) { |
|
149 | - glsr_log('Unknown '.$type.' router request: '.$action); |
|
148 | + if( 0 === did_action( $actionHook ) ) { |
|
149 | + glsr_log( 'Unknown '.$type.' router request: '.$action ); |
|
150 | 150 | } |
151 | 151 | } |
152 | 152 | |
@@ -155,14 +155,14 @@ discard block |
||
155 | 155 | * @param int $statusCode |
156 | 156 | * @return void |
157 | 157 | */ |
158 | - protected function sendAjaxError($error, array $request, $statusCode = 400) |
|
158 | + protected function sendAjaxError( $error, array $request, $statusCode = 400 ) |
|
159 | 159 | { |
160 | - glsr_log()->error($error)->debug($request); |
|
161 | - glsr(Notice::class)->addError(__('There was an error (try reloading the page).', 'site-reviews').' <code>'.$error.'</code>'); |
|
162 | - wp_send_json_error([ |
|
163 | - 'message' => __('The form could not be submitted. Please notify the site administrator.', 'site-reviews'), |
|
164 | - 'notices' => glsr(Notice::class)->get(), |
|
160 | + glsr_log()->error( $error )->debug( $request ); |
|
161 | + glsr( Notice::class )->addError( __( 'There was an error (try reloading the page).', 'site-reviews' ).' <code>'.$error.'</code>' ); |
|
162 | + wp_send_json_error( [ |
|
163 | + 'message' => __( 'The form could not be submitted. Please notify the site administrator.', 'site-reviews' ), |
|
164 | + 'notices' => glsr( Notice::class )->get(), |
|
165 | 165 | 'error' => $error, |
166 | - ]); |
|
166 | + ] ); |
|
167 | 167 | } |
168 | 168 | } |