@@ -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 | } |
@@ -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 | } |
@@ -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 | } |
@@ -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 | } |
@@ -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 | } |
@@ -12,385 +12,385 @@ |
||
| 12 | 12 | |
| 13 | 13 | class CountsManager |
| 14 | 14 | { |
| 15 | - const LIMIT = 500; |
|
| 16 | - const META_AVERAGE = '_glsr_average'; |
|
| 17 | - const META_COUNT = '_glsr_count'; |
|
| 18 | - const META_RANKING = '_glsr_ranking'; |
|
| 15 | + const LIMIT = 500; |
|
| 16 | + const META_AVERAGE = '_glsr_average'; |
|
| 17 | + const META_COUNT = '_glsr_count'; |
|
| 18 | + const META_RANKING = '_glsr_ranking'; |
|
| 19 | 19 | |
| 20 | - /** |
|
| 21 | - * @return array |
|
| 22 | - * @todo verify the additional type checks are needed |
|
| 23 | - */ |
|
| 24 | - public function buildCounts(array $args = []) |
|
| 25 | - { |
|
| 26 | - $counts = []; |
|
| 27 | - $query = $this->queryReviews($args); |
|
| 28 | - while ($query) { |
|
| 29 | - $types = array_keys(array_flip(glsr_array_column($query->reviews, 'type'))); |
|
| 30 | - $types = array_unique(array_merge(['local'], $types)); |
|
| 31 | - foreach ($types as $type) { |
|
| 32 | - $type = $this->normalizeType($type); |
|
| 33 | - if (isset($counts[$type])) { |
|
| 34 | - continue; |
|
| 35 | - } |
|
| 36 | - $counts[$type] = array_fill_keys(range(0, glsr()->constant('MAX_RATING', Rating::class)), 0); |
|
| 37 | - } |
|
| 38 | - foreach ($query->reviews as $review) { |
|
| 39 | - $type = $this->normalizeType($review->type); |
|
| 40 | - ++$counts[$type][$review->rating]; |
|
| 41 | - } |
|
| 42 | - $query = $query->has_more |
|
| 43 | - ? $this->queryReviews($args, end($query->reviews)->ID) |
|
| 44 | - : false; |
|
| 45 | - } |
|
| 46 | - return $counts; |
|
| 47 | - } |
|
| 20 | + /** |
|
| 21 | + * @return array |
|
| 22 | + * @todo verify the additional type checks are needed |
|
| 23 | + */ |
|
| 24 | + public function buildCounts(array $args = []) |
|
| 25 | + { |
|
| 26 | + $counts = []; |
|
| 27 | + $query = $this->queryReviews($args); |
|
| 28 | + while ($query) { |
|
| 29 | + $types = array_keys(array_flip(glsr_array_column($query->reviews, 'type'))); |
|
| 30 | + $types = array_unique(array_merge(['local'], $types)); |
|
| 31 | + foreach ($types as $type) { |
|
| 32 | + $type = $this->normalizeType($type); |
|
| 33 | + if (isset($counts[$type])) { |
|
| 34 | + continue; |
|
| 35 | + } |
|
| 36 | + $counts[$type] = array_fill_keys(range(0, glsr()->constant('MAX_RATING', Rating::class)), 0); |
|
| 37 | + } |
|
| 38 | + foreach ($query->reviews as $review) { |
|
| 39 | + $type = $this->normalizeType($review->type); |
|
| 40 | + ++$counts[$type][$review->rating]; |
|
| 41 | + } |
|
| 42 | + $query = $query->has_more |
|
| 43 | + ? $this->queryReviews($args, end($query->reviews)->ID) |
|
| 44 | + : false; |
|
| 45 | + } |
|
| 46 | + return $counts; |
|
| 47 | + } |
|
| 48 | 48 | |
| 49 | - /** |
|
| 50 | - * @param int $postId |
|
| 51 | - * @return array |
|
| 52 | - */ |
|
| 53 | - public function buildPostCounts($postId) |
|
| 54 | - { |
|
| 55 | - return $this->buildCounts(['post_ids' => [$postId]]); |
|
| 56 | - } |
|
| 49 | + /** |
|
| 50 | + * @param int $postId |
|
| 51 | + * @return array |
|
| 52 | + */ |
|
| 53 | + public function buildPostCounts($postId) |
|
| 54 | + { |
|
| 55 | + return $this->buildCounts(['post_ids' => [$postId]]); |
|
| 56 | + } |
|
| 57 | 57 | |
| 58 | - /** |
|
| 59 | - * @param int $termTaxonomyId |
|
| 60 | - * @return array |
|
| 61 | - */ |
|
| 62 | - public function buildTermCounts($termTaxonomyId) |
|
| 63 | - { |
|
| 64 | - return $this->buildCounts(['term_ids' => [$termTaxonomyId]]); |
|
| 65 | - } |
|
| 58 | + /** |
|
| 59 | + * @param int $termTaxonomyId |
|
| 60 | + * @return array |
|
| 61 | + */ |
|
| 62 | + public function buildTermCounts($termTaxonomyId) |
|
| 63 | + { |
|
| 64 | + return $this->buildCounts(['term_ids' => [$termTaxonomyId]]); |
|
| 65 | + } |
|
| 66 | 66 | |
| 67 | - /** |
|
| 68 | - * @return void |
|
| 69 | - */ |
|
| 70 | - public function countAll() |
|
| 71 | - { |
|
| 72 | - $terms = glsr(Database::class)->getTerms(['fields' => 'all']); |
|
| 73 | - foreach ($terms as $term) { |
|
| 74 | - $this->setTermCounts($term->term_id, $this->buildTermCounts($term->term_taxonomy_id)); |
|
| 75 | - } |
|
| 76 | - $postIds = glsr(SqlQueries::class)->getReviewsMeta('assigned_to'); |
|
| 77 | - foreach ($postIds as $postId) { |
|
| 78 | - $this->setPostCounts($postId, $this->buildPostCounts($postId)); |
|
| 79 | - } |
|
| 80 | - $this->setCounts($this->buildCounts()); |
|
| 81 | - } |
|
| 67 | + /** |
|
| 68 | + * @return void |
|
| 69 | + */ |
|
| 70 | + public function countAll() |
|
| 71 | + { |
|
| 72 | + $terms = glsr(Database::class)->getTerms(['fields' => 'all']); |
|
| 73 | + foreach ($terms as $term) { |
|
| 74 | + $this->setTermCounts($term->term_id, $this->buildTermCounts($term->term_taxonomy_id)); |
|
| 75 | + } |
|
| 76 | + $postIds = glsr(SqlQueries::class)->getReviewsMeta('assigned_to'); |
|
| 77 | + foreach ($postIds as $postId) { |
|
| 78 | + $this->setPostCounts($postId, $this->buildPostCounts($postId)); |
|
| 79 | + } |
|
| 80 | + $this->setCounts($this->buildCounts()); |
|
| 81 | + } |
|
| 82 | 82 | |
| 83 | - /** |
|
| 84 | - * @return void |
|
| 85 | - */ |
|
| 86 | - public function decrease(Review $review) |
|
| 87 | - { |
|
| 88 | - $this->decreaseCounts($review); |
|
| 89 | - $this->decreasePostCounts($review); |
|
| 90 | - $this->decreaseTermCounts($review); |
|
| 91 | - } |
|
| 83 | + /** |
|
| 84 | + * @return void |
|
| 85 | + */ |
|
| 86 | + public function decrease(Review $review) |
|
| 87 | + { |
|
| 88 | + $this->decreaseCounts($review); |
|
| 89 | + $this->decreasePostCounts($review); |
|
| 90 | + $this->decreaseTermCounts($review); |
|
| 91 | + } |
|
| 92 | 92 | |
| 93 | - /** |
|
| 94 | - * @return void |
|
| 95 | - */ |
|
| 96 | - public function decreaseCounts(Review $review) |
|
| 97 | - { |
|
| 98 | - $this->setCounts($this->decreaseRating( |
|
| 99 | - $this->getCounts(), |
|
| 100 | - $review->review_type, |
|
| 101 | - $review->rating |
|
| 102 | - )); |
|
| 103 | - } |
|
| 93 | + /** |
|
| 94 | + * @return void |
|
| 95 | + */ |
|
| 96 | + public function decreaseCounts(Review $review) |
|
| 97 | + { |
|
| 98 | + $this->setCounts($this->decreaseRating( |
|
| 99 | + $this->getCounts(), |
|
| 100 | + $review->review_type, |
|
| 101 | + $review->rating |
|
| 102 | + )); |
|
| 103 | + } |
|
| 104 | 104 | |
| 105 | - /** |
|
| 106 | - * @return void |
|
| 107 | - */ |
|
| 108 | - public function decreasePostCounts(Review $review) |
|
| 109 | - { |
|
| 110 | - if (empty($counts = $this->getPostCounts($review->assigned_to))) { |
|
| 111 | - return; |
|
| 112 | - } |
|
| 113 | - $counts = $this->decreaseRating($counts, $review->review_type, $review->rating); |
|
| 114 | - $this->setPostCounts($review->assigned_to, $counts); |
|
| 115 | - } |
|
| 105 | + /** |
|
| 106 | + * @return void |
|
| 107 | + */ |
|
| 108 | + public function decreasePostCounts(Review $review) |
|
| 109 | + { |
|
| 110 | + if (empty($counts = $this->getPostCounts($review->assigned_to))) { |
|
| 111 | + return; |
|
| 112 | + } |
|
| 113 | + $counts = $this->decreaseRating($counts, $review->review_type, $review->rating); |
|
| 114 | + $this->setPostCounts($review->assigned_to, $counts); |
|
| 115 | + } |
|
| 116 | 116 | |
| 117 | - /** |
|
| 118 | - * @return void |
|
| 119 | - */ |
|
| 120 | - public function decreaseTermCounts(Review $review) |
|
| 121 | - { |
|
| 122 | - foreach ($review->term_ids as $termId) { |
|
| 123 | - if (empty($counts = $this->getTermCounts($termId))) { |
|
| 124 | - continue; |
|
| 125 | - } |
|
| 126 | - $counts = $this->decreaseRating($counts, $review->review_type, $review->rating); |
|
| 127 | - $this->setTermCounts($termId, $counts); |
|
| 128 | - } |
|
| 129 | - } |
|
| 117 | + /** |
|
| 118 | + * @return void |
|
| 119 | + */ |
|
| 120 | + public function decreaseTermCounts(Review $review) |
|
| 121 | + { |
|
| 122 | + foreach ($review->term_ids as $termId) { |
|
| 123 | + if (empty($counts = $this->getTermCounts($termId))) { |
|
| 124 | + continue; |
|
| 125 | + } |
|
| 126 | + $counts = $this->decreaseRating($counts, $review->review_type, $review->rating); |
|
| 127 | + $this->setTermCounts($termId, $counts); |
|
| 128 | + } |
|
| 129 | + } |
|
| 130 | 130 | |
| 131 | - /** |
|
| 132 | - * @return array |
|
| 133 | - */ |
|
| 134 | - public function flatten(array $reviewCounts, array $args = []) |
|
| 135 | - { |
|
| 136 | - $counts = []; |
|
| 137 | - array_walk_recursive($reviewCounts, function ($num, $index) use (&$counts) { |
|
| 138 | - $counts[$index] = $num + intval(Arr::get($counts, $index, 0)); |
|
| 139 | - }); |
|
| 140 | - $args = wp_parse_args($args, [ |
|
| 141 | - 'max' => glsr()->constant('MAX_RATING', Rating::class), |
|
| 142 | - 'min' => glsr()->constant('MIN_RATING', Rating::class), |
|
| 143 | - ]); |
|
| 144 | - foreach ($counts as $index => &$num) { |
|
| 145 | - if ($index >= intval($args['min']) && $index <= intval($args['max'])) { |
|
| 146 | - continue; |
|
| 147 | - } |
|
| 148 | - $num = 0; |
|
| 149 | - } |
|
| 150 | - return $counts; |
|
| 151 | - } |
|
| 131 | + /** |
|
| 132 | + * @return array |
|
| 133 | + */ |
|
| 134 | + public function flatten(array $reviewCounts, array $args = []) |
|
| 135 | + { |
|
| 136 | + $counts = []; |
|
| 137 | + array_walk_recursive($reviewCounts, function ($num, $index) use (&$counts) { |
|
| 138 | + $counts[$index] = $num + intval(Arr::get($counts, $index, 0)); |
|
| 139 | + }); |
|
| 140 | + $args = wp_parse_args($args, [ |
|
| 141 | + 'max' => glsr()->constant('MAX_RATING', Rating::class), |
|
| 142 | + 'min' => glsr()->constant('MIN_RATING', Rating::class), |
|
| 143 | + ]); |
|
| 144 | + foreach ($counts as $index => &$num) { |
|
| 145 | + if ($index >= intval($args['min']) && $index <= intval($args['max'])) { |
|
| 146 | + continue; |
|
| 147 | + } |
|
| 148 | + $num = 0; |
|
| 149 | + } |
|
| 150 | + return $counts; |
|
| 151 | + } |
|
| 152 | 152 | |
| 153 | - /** |
|
| 154 | - * @return array |
|
| 155 | - */ |
|
| 156 | - public function get(array $args = []) |
|
| 157 | - { |
|
| 158 | - $args = $this->normalizeArgs($args); |
|
| 159 | - $counts = []; |
|
| 160 | - if ($this->isMixedCount($args)) { |
|
| 161 | - $counts = [$this->buildCounts($args)]; // force query the database |
|
| 162 | - } else { |
|
| 163 | - foreach ($args['post_ids'] as $postId) { |
|
| 164 | - $counts[] = $this->getPostCounts($postId); |
|
| 165 | - } |
|
| 166 | - foreach ($args['term_ids'] as $termId) { |
|
| 167 | - $counts[] = $this->getTermCounts($termId); |
|
| 168 | - } |
|
| 169 | - if (empty($counts)) { |
|
| 170 | - $counts[] = $this->getCounts(); |
|
| 171 | - } |
|
| 172 | - } |
|
| 173 | - return in_array($args['type'], ['', 'all']) |
|
| 174 | - ? $this->normalize([$this->flatten($counts)]) |
|
| 175 | - : $this->normalize(glsr_array_column($counts, $args['type'])); |
|
| 176 | - } |
|
| 153 | + /** |
|
| 154 | + * @return array |
|
| 155 | + */ |
|
| 156 | + public function get(array $args = []) |
|
| 157 | + { |
|
| 158 | + $args = $this->normalizeArgs($args); |
|
| 159 | + $counts = []; |
|
| 160 | + if ($this->isMixedCount($args)) { |
|
| 161 | + $counts = [$this->buildCounts($args)]; // force query the database |
|
| 162 | + } else { |
|
| 163 | + foreach ($args['post_ids'] as $postId) { |
|
| 164 | + $counts[] = $this->getPostCounts($postId); |
|
| 165 | + } |
|
| 166 | + foreach ($args['term_ids'] as $termId) { |
|
| 167 | + $counts[] = $this->getTermCounts($termId); |
|
| 168 | + } |
|
| 169 | + if (empty($counts)) { |
|
| 170 | + $counts[] = $this->getCounts(); |
|
| 171 | + } |
|
| 172 | + } |
|
| 173 | + return in_array($args['type'], ['', 'all']) |
|
| 174 | + ? $this->normalize([$this->flatten($counts)]) |
|
| 175 | + : $this->normalize(glsr_array_column($counts, $args['type'])); |
|
| 176 | + } |
|
| 177 | 177 | |
| 178 | - /** |
|
| 179 | - * @return array |
|
| 180 | - */ |
|
| 181 | - public function getCounts() |
|
| 182 | - { |
|
| 183 | - $counts = glsr(OptionManager::class)->get('counts', []); |
|
| 184 | - if (!is_array($counts)) { |
|
| 185 | - glsr_log()->error('Review counts is not an array; possibly due to incorrectly imported reviews.')->debug($counts); |
|
| 186 | - return []; |
|
| 187 | - } |
|
| 188 | - return $counts; |
|
| 189 | - } |
|
| 178 | + /** |
|
| 179 | + * @return array |
|
| 180 | + */ |
|
| 181 | + public function getCounts() |
|
| 182 | + { |
|
| 183 | + $counts = glsr(OptionManager::class)->get('counts', []); |
|
| 184 | + if (!is_array($counts)) { |
|
| 185 | + glsr_log()->error('Review counts is not an array; possibly due to incorrectly imported reviews.')->debug($counts); |
|
| 186 | + return []; |
|
| 187 | + } |
|
| 188 | + return $counts; |
|
| 189 | + } |
|
| 190 | 190 | |
| 191 | - /** |
|
| 192 | - * @param int $postId |
|
| 193 | - * @return array |
|
| 194 | - */ |
|
| 195 | - public function getPostCounts($postId) |
|
| 196 | - { |
|
| 197 | - return array_filter((array) get_post_meta($postId, static::META_COUNT, true)); |
|
| 198 | - } |
|
| 191 | + /** |
|
| 192 | + * @param int $postId |
|
| 193 | + * @return array |
|
| 194 | + */ |
|
| 195 | + public function getPostCounts($postId) |
|
| 196 | + { |
|
| 197 | + return array_filter((array) get_post_meta($postId, static::META_COUNT, true)); |
|
| 198 | + } |
|
| 199 | 199 | |
| 200 | - /** |
|
| 201 | - * @param int $termId |
|
| 202 | - * @return array |
|
| 203 | - */ |
|
| 204 | - public function getTermCounts($termId) |
|
| 205 | - { |
|
| 206 | - return array_filter((array) get_term_meta($termId, static::META_COUNT, true)); |
|
| 207 | - } |
|
| 200 | + /** |
|
| 201 | + * @param int $termId |
|
| 202 | + * @return array |
|
| 203 | + */ |
|
| 204 | + public function getTermCounts($termId) |
|
| 205 | + { |
|
| 206 | + return array_filter((array) get_term_meta($termId, static::META_COUNT, true)); |
|
| 207 | + } |
|
| 208 | 208 | |
| 209 | - /** |
|
| 210 | - * @return void |
|
| 211 | - */ |
|
| 212 | - public function increase(Review $review) |
|
| 213 | - { |
|
| 214 | - $this->increaseCounts($review); |
|
| 215 | - $this->increasePostCounts($review); |
|
| 216 | - $this->increaseTermCounts($review); |
|
| 217 | - } |
|
| 209 | + /** |
|
| 210 | + * @return void |
|
| 211 | + */ |
|
| 212 | + public function increase(Review $review) |
|
| 213 | + { |
|
| 214 | + $this->increaseCounts($review); |
|
| 215 | + $this->increasePostCounts($review); |
|
| 216 | + $this->increaseTermCounts($review); |
|
| 217 | + } |
|
| 218 | 218 | |
| 219 | - /** |
|
| 220 | - * @return void |
|
| 221 | - */ |
|
| 222 | - public function increaseCounts(Review $review) |
|
| 223 | - { |
|
| 224 | - if (empty($counts = $this->getCounts())) { |
|
| 225 | - $counts = $this->buildCounts(); |
|
| 226 | - } |
|
| 227 | - $this->setCounts($this->increaseRating($counts, $review->review_type, $review->rating)); |
|
| 228 | - } |
|
| 219 | + /** |
|
| 220 | + * @return void |
|
| 221 | + */ |
|
| 222 | + public function increaseCounts(Review $review) |
|
| 223 | + { |
|
| 224 | + if (empty($counts = $this->getCounts())) { |
|
| 225 | + $counts = $this->buildCounts(); |
|
| 226 | + } |
|
| 227 | + $this->setCounts($this->increaseRating($counts, $review->review_type, $review->rating)); |
|
| 228 | + } |
|
| 229 | 229 | |
| 230 | - /** |
|
| 231 | - * @return void |
|
| 232 | - */ |
|
| 233 | - public function increasePostCounts(Review $review) |
|
| 234 | - { |
|
| 235 | - if (!(get_post($review->assigned_to) instanceof WP_Post)) { |
|
| 236 | - return; |
|
| 237 | - } |
|
| 238 | - $counts = $this->getPostCounts($review->assigned_to); |
|
| 239 | - $counts = empty($counts) |
|
| 240 | - ? $this->buildPostCounts($review->assigned_to) |
|
| 241 | - : $this->increaseRating($counts, $review->review_type, $review->rating); |
|
| 242 | - $this->setPostCounts($review->assigned_to, $counts); |
|
| 243 | - } |
|
| 230 | + /** |
|
| 231 | + * @return void |
|
| 232 | + */ |
|
| 233 | + public function increasePostCounts(Review $review) |
|
| 234 | + { |
|
| 235 | + if (!(get_post($review->assigned_to) instanceof WP_Post)) { |
|
| 236 | + return; |
|
| 237 | + } |
|
| 238 | + $counts = $this->getPostCounts($review->assigned_to); |
|
| 239 | + $counts = empty($counts) |
|
| 240 | + ? $this->buildPostCounts($review->assigned_to) |
|
| 241 | + : $this->increaseRating($counts, $review->review_type, $review->rating); |
|
| 242 | + $this->setPostCounts($review->assigned_to, $counts); |
|
| 243 | + } |
|
| 244 | 244 | |
| 245 | - /** |
|
| 246 | - * @return void |
|
| 247 | - */ |
|
| 248 | - public function increaseTermCounts(Review $review) |
|
| 249 | - { |
|
| 250 | - $terms = glsr(ReviewManager::class)->normalizeTerms(implode(',', $review->term_ids)); |
|
| 251 | - foreach ($terms as $term) { |
|
| 252 | - $counts = $this->getTermCounts($term['term_id']); |
|
| 253 | - $counts = empty($counts) |
|
| 254 | - ? $this->buildTermCounts($term['term_taxonomy_id']) |
|
| 255 | - : $this->increaseRating($counts, $review->review_type, $review->rating); |
|
| 256 | - $this->setTermCounts($term['term_id'], $counts); |
|
| 257 | - } |
|
| 258 | - } |
|
| 245 | + /** |
|
| 246 | + * @return void |
|
| 247 | + */ |
|
| 248 | + public function increaseTermCounts(Review $review) |
|
| 249 | + { |
|
| 250 | + $terms = glsr(ReviewManager::class)->normalizeTerms(implode(',', $review->term_ids)); |
|
| 251 | + foreach ($terms as $term) { |
|
| 252 | + $counts = $this->getTermCounts($term['term_id']); |
|
| 253 | + $counts = empty($counts) |
|
| 254 | + ? $this->buildTermCounts($term['term_taxonomy_id']) |
|
| 255 | + : $this->increaseRating($counts, $review->review_type, $review->rating); |
|
| 256 | + $this->setTermCounts($term['term_id'], $counts); |
|
| 257 | + } |
|
| 258 | + } |
|
| 259 | 259 | |
| 260 | - /** |
|
| 261 | - * @return void |
|
| 262 | - */ |
|
| 263 | - public function setCounts(array $reviewCounts) |
|
| 264 | - { |
|
| 265 | - glsr(OptionManager::class)->set('counts', $reviewCounts); |
|
| 266 | - } |
|
| 260 | + /** |
|
| 261 | + * @return void |
|
| 262 | + */ |
|
| 263 | + public function setCounts(array $reviewCounts) |
|
| 264 | + { |
|
| 265 | + glsr(OptionManager::class)->set('counts', $reviewCounts); |
|
| 266 | + } |
|
| 267 | 267 | |
| 268 | - /** |
|
| 269 | - * @param int $postId |
|
| 270 | - * @return void |
|
| 271 | - */ |
|
| 272 | - public function setPostCounts($postId, array $reviewCounts) |
|
| 273 | - { |
|
| 274 | - $ratingCounts = $this->flatten($reviewCounts); |
|
| 275 | - update_post_meta($postId, static::META_COUNT, $reviewCounts); |
|
| 276 | - update_post_meta($postId, static::META_AVERAGE, glsr(Rating::class)->getAverage($ratingCounts)); |
|
| 277 | - update_post_meta($postId, static::META_RANKING, glsr(Rating::class)->getRanking($ratingCounts)); |
|
| 278 | - } |
|
| 268 | + /** |
|
| 269 | + * @param int $postId |
|
| 270 | + * @return void |
|
| 271 | + */ |
|
| 272 | + public function setPostCounts($postId, array $reviewCounts) |
|
| 273 | + { |
|
| 274 | + $ratingCounts = $this->flatten($reviewCounts); |
|
| 275 | + update_post_meta($postId, static::META_COUNT, $reviewCounts); |
|
| 276 | + update_post_meta($postId, static::META_AVERAGE, glsr(Rating::class)->getAverage($ratingCounts)); |
|
| 277 | + update_post_meta($postId, static::META_RANKING, glsr(Rating::class)->getRanking($ratingCounts)); |
|
| 278 | + } |
|
| 279 | 279 | |
| 280 | - /** |
|
| 281 | - * @param int $termId |
|
| 282 | - * @return void |
|
| 283 | - */ |
|
| 284 | - public function setTermCounts($termId, array $reviewCounts) |
|
| 285 | - { |
|
| 286 | - $term = get_term($termId, Application::TAXONOMY); |
|
| 287 | - if (!isset($term->term_id)) { |
|
| 288 | - return; |
|
| 289 | - } |
|
| 290 | - $ratingCounts = $this->flatten($reviewCounts); |
|
| 291 | - update_term_meta($termId, static::META_COUNT, $reviewCounts); |
|
| 292 | - update_term_meta($termId, static::META_AVERAGE, glsr(Rating::class)->getAverage($ratingCounts)); |
|
| 293 | - update_term_meta($termId, static::META_RANKING, glsr(Rating::class)->getRanking($ratingCounts)); |
|
| 294 | - } |
|
| 280 | + /** |
|
| 281 | + * @param int $termId |
|
| 282 | + * @return void |
|
| 283 | + */ |
|
| 284 | + public function setTermCounts($termId, array $reviewCounts) |
|
| 285 | + { |
|
| 286 | + $term = get_term($termId, Application::TAXONOMY); |
|
| 287 | + if (!isset($term->term_id)) { |
|
| 288 | + return; |
|
| 289 | + } |
|
| 290 | + $ratingCounts = $this->flatten($reviewCounts); |
|
| 291 | + update_term_meta($termId, static::META_COUNT, $reviewCounts); |
|
| 292 | + update_term_meta($termId, static::META_AVERAGE, glsr(Rating::class)->getAverage($ratingCounts)); |
|
| 293 | + update_term_meta($termId, static::META_RANKING, glsr(Rating::class)->getRanking($ratingCounts)); |
|
| 294 | + } |
|
| 295 | 295 | |
| 296 | - /** |
|
| 297 | - * @param string $type |
|
| 298 | - * @param int $rating |
|
| 299 | - * @return array |
|
| 300 | - */ |
|
| 301 | - protected function decreaseRating(array $reviewCounts, $type, $rating) |
|
| 302 | - { |
|
| 303 | - if (isset($reviewCounts[$type][$rating])) { |
|
| 304 | - $reviewCounts[$type][$rating] = max(0, $reviewCounts[$type][$rating] - 1); |
|
| 305 | - } |
|
| 306 | - return $reviewCounts; |
|
| 307 | - } |
|
| 296 | + /** |
|
| 297 | + * @param string $type |
|
| 298 | + * @param int $rating |
|
| 299 | + * @return array |
|
| 300 | + */ |
|
| 301 | + protected function decreaseRating(array $reviewCounts, $type, $rating) |
|
| 302 | + { |
|
| 303 | + if (isset($reviewCounts[$type][$rating])) { |
|
| 304 | + $reviewCounts[$type][$rating] = max(0, $reviewCounts[$type][$rating] - 1); |
|
| 305 | + } |
|
| 306 | + return $reviewCounts; |
|
| 307 | + } |
|
| 308 | 308 | |
| 309 | - /** |
|
| 310 | - * @param string $type |
|
| 311 | - * @param int $rating |
|
| 312 | - * @return array |
|
| 313 | - */ |
|
| 314 | - protected function increaseRating(array $reviewCounts, $type, $rating) |
|
| 315 | - { |
|
| 316 | - if (!array_key_exists($type, glsr()->reviewTypes)) { |
|
| 317 | - return $reviewCounts; |
|
| 318 | - } |
|
| 319 | - if (!array_key_exists($type, $reviewCounts)) { |
|
| 320 | - $reviewCounts[$type] = []; |
|
| 321 | - } |
|
| 322 | - $reviewCounts = $this->normalize($reviewCounts); |
|
| 323 | - $reviewCounts[$type][$rating] = intval($reviewCounts[$type][$rating]) + 1; |
|
| 324 | - return $reviewCounts; |
|
| 325 | - } |
|
| 309 | + /** |
|
| 310 | + * @param string $type |
|
| 311 | + * @param int $rating |
|
| 312 | + * @return array |
|
| 313 | + */ |
|
| 314 | + protected function increaseRating(array $reviewCounts, $type, $rating) |
|
| 315 | + { |
|
| 316 | + if (!array_key_exists($type, glsr()->reviewTypes)) { |
|
| 317 | + return $reviewCounts; |
|
| 318 | + } |
|
| 319 | + if (!array_key_exists($type, $reviewCounts)) { |
|
| 320 | + $reviewCounts[$type] = []; |
|
| 321 | + } |
|
| 322 | + $reviewCounts = $this->normalize($reviewCounts); |
|
| 323 | + $reviewCounts[$type][$rating] = intval($reviewCounts[$type][$rating]) + 1; |
|
| 324 | + return $reviewCounts; |
|
| 325 | + } |
|
| 326 | 326 | |
| 327 | - /** |
|
| 328 | - * @return bool |
|
| 329 | - */ |
|
| 330 | - protected function isMixedCount(array $args) |
|
| 331 | - { |
|
| 332 | - return !empty($args['post_ids']) && !empty($args['term_ids']); |
|
| 333 | - } |
|
| 327 | + /** |
|
| 328 | + * @return bool |
|
| 329 | + */ |
|
| 330 | + protected function isMixedCount(array $args) |
|
| 331 | + { |
|
| 332 | + return !empty($args['post_ids']) && !empty($args['term_ids']); |
|
| 333 | + } |
|
| 334 | 334 | |
| 335 | - /** |
|
| 336 | - * @return array |
|
| 337 | - */ |
|
| 338 | - protected function normalize(array $reviewCounts) |
|
| 339 | - { |
|
| 340 | - if (empty($reviewCounts)) { |
|
| 341 | - $reviewCounts = [[]]; |
|
| 342 | - } |
|
| 343 | - foreach ($reviewCounts as &$counts) { |
|
| 344 | - foreach (range(0, glsr()->constant('MAX_RATING', Rating::class)) as $index) { |
|
| 345 | - if (isset($counts[$index])) { |
|
| 346 | - continue; |
|
| 347 | - } |
|
| 348 | - $counts[$index] = 0; |
|
| 349 | - } |
|
| 350 | - ksort($counts); |
|
| 351 | - } |
|
| 352 | - return $reviewCounts; |
|
| 353 | - } |
|
| 335 | + /** |
|
| 336 | + * @return array |
|
| 337 | + */ |
|
| 338 | + protected function normalize(array $reviewCounts) |
|
| 339 | + { |
|
| 340 | + if (empty($reviewCounts)) { |
|
| 341 | + $reviewCounts = [[]]; |
|
| 342 | + } |
|
| 343 | + foreach ($reviewCounts as &$counts) { |
|
| 344 | + foreach (range(0, glsr()->constant('MAX_RATING', Rating::class)) as $index) { |
|
| 345 | + if (isset($counts[$index])) { |
|
| 346 | + continue; |
|
| 347 | + } |
|
| 348 | + $counts[$index] = 0; |
|
| 349 | + } |
|
| 350 | + ksort($counts); |
|
| 351 | + } |
|
| 352 | + return $reviewCounts; |
|
| 353 | + } |
|
| 354 | 354 | |
| 355 | - /** |
|
| 356 | - * @return array |
|
| 357 | - */ |
|
| 358 | - protected function normalizeArgs(array $args) |
|
| 359 | - { |
|
| 360 | - $args = wp_parse_args(array_filter($args), [ |
|
| 361 | - 'post_ids' => [], |
|
| 362 | - 'term_ids' => [], |
|
| 363 | - 'type' => 'local', |
|
| 364 | - ]); |
|
| 365 | - $args['post_ids'] = glsr(Polylang::class)->getPostIds($args['post_ids']); |
|
| 366 | - $args['type'] = $this->normalizeType($args['type']); |
|
| 367 | - return $args; |
|
| 368 | - } |
|
| 355 | + /** |
|
| 356 | + * @return array |
|
| 357 | + */ |
|
| 358 | + protected function normalizeArgs(array $args) |
|
| 359 | + { |
|
| 360 | + $args = wp_parse_args(array_filter($args), [ |
|
| 361 | + 'post_ids' => [], |
|
| 362 | + 'term_ids' => [], |
|
| 363 | + 'type' => 'local', |
|
| 364 | + ]); |
|
| 365 | + $args['post_ids'] = glsr(Polylang::class)->getPostIds($args['post_ids']); |
|
| 366 | + $args['type'] = $this->normalizeType($args['type']); |
|
| 367 | + return $args; |
|
| 368 | + } |
|
| 369 | 369 | |
| 370 | - /** |
|
| 371 | - * @param string $type |
|
| 372 | - * @return string |
|
| 373 | - */ |
|
| 374 | - protected function normalizeType($type) |
|
| 375 | - { |
|
| 376 | - return empty($type) || !is_string($type) |
|
| 377 | - ? 'local' |
|
| 378 | - : $type; |
|
| 379 | - } |
|
| 370 | + /** |
|
| 371 | + * @param string $type |
|
| 372 | + * @return string |
|
| 373 | + */ |
|
| 374 | + protected function normalizeType($type) |
|
| 375 | + { |
|
| 376 | + return empty($type) || !is_string($type) |
|
| 377 | + ? 'local' |
|
| 378 | + : $type; |
|
| 379 | + } |
|
| 380 | 380 | |
| 381 | - /** |
|
| 382 | - * @param int $lastPostId |
|
| 383 | - * @return object |
|
| 384 | - */ |
|
| 385 | - protected function queryReviews(array $args = [], $lastPostId = 0) |
|
| 386 | - { |
|
| 387 | - $reviews = glsr(SqlQueries::class)->getReviewCounts($args, $lastPostId, static::LIMIT); |
|
| 388 | - $hasMore = is_array($reviews) |
|
| 389 | - ? count($reviews) == static::LIMIT |
|
| 390 | - : false; |
|
| 391 | - return (object) [ |
|
| 392 | - 'has_more' => $hasMore, |
|
| 393 | - 'reviews' => $reviews, |
|
| 394 | - ]; |
|
| 395 | - } |
|
| 381 | + /** |
|
| 382 | + * @param int $lastPostId |
|
| 383 | + * @return object |
|
| 384 | + */ |
|
| 385 | + protected function queryReviews(array $args = [], $lastPostId = 0) |
|
| 386 | + { |
|
| 387 | + $reviews = glsr(SqlQueries::class)->getReviewCounts($args, $lastPostId, static::LIMIT); |
|
| 388 | + $hasMore = is_array($reviews) |
|
| 389 | + ? count($reviews) == static::LIMIT |
|
| 390 | + : false; |
|
| 391 | + return (object) [ |
|
| 392 | + 'has_more' => $hasMore, |
|
| 393 | + 'reviews' => $reviews, |
|
| 394 | + ]; |
|
| 395 | + } |
|
| 396 | 396 | } |
@@ -8,23 +8,23 @@ discard block |
||
| 8 | 8 | |
| 9 | 9 | class SqlQueries |
| 10 | 10 | { |
| 11 | - protected $db; |
|
| 12 | - protected $postType; |
|
| 11 | + protected $db; |
|
| 12 | + protected $postType; |
|
| 13 | 13 | |
| 14 | - public function __construct() |
|
| 15 | - { |
|
| 16 | - global $wpdb; |
|
| 17 | - $this->db = $wpdb; |
|
| 18 | - $this->postType = Application::POST_TYPE; |
|
| 19 | - } |
|
| 14 | + public function __construct() |
|
| 15 | + { |
|
| 16 | + global $wpdb; |
|
| 17 | + $this->db = $wpdb; |
|
| 18 | + $this->postType = Application::POST_TYPE; |
|
| 19 | + } |
|
| 20 | 20 | |
| 21 | - /** |
|
| 22 | - * @param string $metaReviewId |
|
| 23 | - * @return int |
|
| 24 | - */ |
|
| 25 | - public function getPostIdFromReviewId($metaReviewId) |
|
| 26 | - { |
|
| 27 | - $postId = $this->db->get_var(" |
|
| 21 | + /** |
|
| 22 | + * @param string $metaReviewId |
|
| 23 | + * @return int |
|
| 24 | + */ |
|
| 25 | + public function getPostIdFromReviewId($metaReviewId) |
|
| 26 | + { |
|
| 27 | + $postId = $this->db->get_var(" |
|
| 28 | 28 | SELECT p.ID |
| 29 | 29 | FROM {$this->db->posts} AS p |
| 30 | 30 | INNER JOIN {$this->db->postmeta} AS m ON p.ID = m.post_id |
@@ -32,17 +32,17 @@ discard block |
||
| 32 | 32 | AND m.meta_key = '_review_id' |
| 33 | 33 | AND m.meta_value = '{$metaReviewId}' |
| 34 | 34 | "); |
| 35 | - return intval($postId); |
|
| 36 | - } |
|
| 35 | + return intval($postId); |
|
| 36 | + } |
|
| 37 | 37 | |
| 38 | - /** |
|
| 39 | - * @param int $lastPostId |
|
| 40 | - * @param int $limit |
|
| 41 | - * @return array |
|
| 42 | - */ |
|
| 43 | - public function getReviewCounts(array $args, $lastPostId = 0, $limit = 500) |
|
| 44 | - { |
|
| 45 | - return (array) $this->db->get_results(" |
|
| 38 | + /** |
|
| 39 | + * @param int $lastPostId |
|
| 40 | + * @param int $limit |
|
| 41 | + * @return array |
|
| 42 | + */ |
|
| 43 | + public function getReviewCounts(array $args, $lastPostId = 0, $limit = 500) |
|
| 44 | + { |
|
| 45 | + return (array) $this->db->get_results(" |
|
| 46 | 46 | SELECT DISTINCT p.ID, m1.meta_value AS rating, m2.meta_value AS type |
| 47 | 47 | FROM {$this->db->posts} AS p |
| 48 | 48 | INNER JOIN {$this->db->postmeta} AS m1 ON p.ID = m1.post_id |
@@ -57,17 +57,17 @@ discard block |
||
| 57 | 57 | ORDER By p.ID ASC |
| 58 | 58 | LIMIT {$limit} |
| 59 | 59 | "); |
| 60 | - } |
|
| 60 | + } |
|
| 61 | 61 | |
| 62 | - /** |
|
| 63 | - * @todo remove this? |
|
| 64 | - * @param string $metaKey |
|
| 65 | - * @return array |
|
| 66 | - */ |
|
| 67 | - public function getReviewCountsFor($metaKey) |
|
| 68 | - { |
|
| 69 | - $metaKey = Str::prefix('_', $metaKey); |
|
| 70 | - return (array) $this->db->get_results(" |
|
| 62 | + /** |
|
| 63 | + * @todo remove this? |
|
| 64 | + * @param string $metaKey |
|
| 65 | + * @return array |
|
| 66 | + */ |
|
| 67 | + public function getReviewCountsFor($metaKey) |
|
| 68 | + { |
|
| 69 | + $metaKey = Str::prefix('_', $metaKey); |
|
| 70 | + return (array) $this->db->get_results(" |
|
| 71 | 71 | SELECT DISTINCT m.meta_value AS name, COUNT(*) num_posts |
| 72 | 72 | FROM {$this->db->posts} AS p |
| 73 | 73 | INNER JOIN {$this->db->postmeta} AS m ON p.ID = m.post_id |
@@ -75,16 +75,16 @@ discard block |
||
| 75 | 75 | AND m.meta_key = '{$metaKey}' |
| 76 | 76 | GROUP BY name |
| 77 | 77 | "); |
| 78 | - } |
|
| 78 | + } |
|
| 79 | 79 | |
| 80 | - /** |
|
| 81 | - * @todo remove this? |
|
| 82 | - * @param string $reviewType |
|
| 83 | - * @return array |
|
| 84 | - */ |
|
| 85 | - public function getReviewIdsByType($reviewType) |
|
| 86 | - { |
|
| 87 | - $results = $this->db->get_col(" |
|
| 80 | + /** |
|
| 81 | + * @todo remove this? |
|
| 82 | + * @param string $reviewType |
|
| 83 | + * @return array |
|
| 84 | + */ |
|
| 85 | + public function getReviewIdsByType($reviewType) |
|
| 86 | + { |
|
| 87 | + $results = $this->db->get_col(" |
|
| 88 | 88 | SELECT DISTINCT m1.meta_value AS review_id |
| 89 | 89 | FROM {$this->db->posts} AS p |
| 90 | 90 | INNER JOIN {$this->db->postmeta} AS m1 ON p.ID = m1.post_id |
@@ -94,20 +94,20 @@ discard block |
||
| 94 | 94 | AND m2.meta_key = '_review_type' |
| 95 | 95 | AND m2.meta_value = '{$reviewType}' |
| 96 | 96 | "); |
| 97 | - return array_keys(array_flip($results)); |
|
| 98 | - } |
|
| 97 | + return array_keys(array_flip($results)); |
|
| 98 | + } |
|
| 99 | 99 | |
| 100 | - /** |
|
| 101 | - * @param int $greaterThanId |
|
| 102 | - * @param int $limit |
|
| 103 | - * @return array |
|
| 104 | - */ |
|
| 105 | - public function getReviewRatingsFromIds(array $postIds, $greaterThanId = 0, $limit = 100) |
|
| 106 | - { |
|
| 107 | - sort($postIds); |
|
| 108 | - $postIds = array_slice($postIds, intval(array_search($greaterThanId, $postIds)), $limit); |
|
| 109 | - $postIds = implode(',', $postIds); |
|
| 110 | - return (array) $this->db->get_results(" |
|
| 100 | + /** |
|
| 101 | + * @param int $greaterThanId |
|
| 102 | + * @param int $limit |
|
| 103 | + * @return array |
|
| 104 | + */ |
|
| 105 | + public function getReviewRatingsFromIds(array $postIds, $greaterThanId = 0, $limit = 100) |
|
| 106 | + { |
|
| 107 | + sort($postIds); |
|
| 108 | + $postIds = array_slice($postIds, intval(array_search($greaterThanId, $postIds)), $limit); |
|
| 109 | + $postIds = implode(',', $postIds); |
|
| 110 | + return (array) $this->db->get_results(" |
|
| 111 | 111 | SELECT p.ID, m.meta_value AS rating |
| 112 | 112 | FROM {$this->db->posts} AS p |
| 113 | 113 | INNER JOIN {$this->db->postmeta} AS m ON p.ID = m.post_id |
@@ -120,17 +120,17 @@ discard block |
||
| 120 | 120 | ORDER By p.ID ASC |
| 121 | 121 | LIMIT {$limit} |
| 122 | 122 | "); |
| 123 | - } |
|
| 123 | + } |
|
| 124 | 124 | |
| 125 | - /** |
|
| 126 | - * @param string $key |
|
| 127 | - * @param string $status |
|
| 128 | - * @return array |
|
| 129 | - */ |
|
| 130 | - public function getReviewsMeta($key, $status = 'publish') |
|
| 131 | - { |
|
| 132 | - $key = Str::prefix('_', $key); |
|
| 133 | - $values = $this->db->get_col(" |
|
| 125 | + /** |
|
| 126 | + * @param string $key |
|
| 127 | + * @param string $status |
|
| 128 | + * @return array |
|
| 129 | + */ |
|
| 130 | + public function getReviewsMeta($key, $status = 'publish') |
|
| 131 | + { |
|
| 132 | + $key = Str::prefix('_', $key); |
|
| 133 | + $values = $this->db->get_col(" |
|
| 134 | 134 | SELECT DISTINCT m.meta_value |
| 135 | 135 | FROM {$this->db->postmeta} m |
| 136 | 136 | LEFT JOIN {$this->db->posts} p ON p.ID = m.post_id |
@@ -141,42 +141,42 @@ discard block |
||
| 141 | 141 | GROUP BY p.ID -- remove duplicate meta_value entries |
| 142 | 142 | ORDER BY m.meta_id ASC -- sort by oldest meta_value |
| 143 | 143 | "); |
| 144 | - sort($values); |
|
| 145 | - return $values; |
|
| 146 | - } |
|
| 144 | + sort($values); |
|
| 145 | + return $values; |
|
| 146 | + } |
|
| 147 | 147 | |
| 148 | - /** |
|
| 149 | - * @param string $and |
|
| 150 | - * @return string |
|
| 151 | - */ |
|
| 152 | - protected function getAndForCounts(array $args, $and = '') |
|
| 153 | - { |
|
| 154 | - $postIds = implode(',', array_filter(Arr::get($args, 'post_ids', []))); |
|
| 155 | - $termIds = implode(',', array_filter(Arr::get($args, 'term_ids', []))); |
|
| 156 | - if (!empty($args['type'])) { |
|
| 157 | - $and.= "AND m2.meta_value = '{$args['type']}' "; |
|
| 158 | - } |
|
| 159 | - if ($postIds) { |
|
| 160 | - $and.= "AND m3.meta_key = '_assigned_to' AND m3.meta_value IN ({$postIds}) "; |
|
| 161 | - } |
|
| 162 | - if ($termIds) { |
|
| 163 | - $and.= "AND tr.term_taxonomy_id IN ({$termIds}) "; |
|
| 164 | - } |
|
| 165 | - return apply_filters('site-reviews/query/and-for-counts', $and); |
|
| 166 | - } |
|
| 148 | + /** |
|
| 149 | + * @param string $and |
|
| 150 | + * @return string |
|
| 151 | + */ |
|
| 152 | + protected function getAndForCounts(array $args, $and = '') |
|
| 153 | + { |
|
| 154 | + $postIds = implode(',', array_filter(Arr::get($args, 'post_ids', []))); |
|
| 155 | + $termIds = implode(',', array_filter(Arr::get($args, 'term_ids', []))); |
|
| 156 | + if (!empty($args['type'])) { |
|
| 157 | + $and.= "AND m2.meta_value = '{$args['type']}' "; |
|
| 158 | + } |
|
| 159 | + if ($postIds) { |
|
| 160 | + $and.= "AND m3.meta_key = '_assigned_to' AND m3.meta_value IN ({$postIds}) "; |
|
| 161 | + } |
|
| 162 | + if ($termIds) { |
|
| 163 | + $and.= "AND tr.term_taxonomy_id IN ({$termIds}) "; |
|
| 164 | + } |
|
| 165 | + return apply_filters('site-reviews/query/and-for-counts', $and); |
|
| 166 | + } |
|
| 167 | 167 | |
| 168 | - /** |
|
| 169 | - * @param string $innerJoin |
|
| 170 | - * @return string |
|
| 171 | - */ |
|
| 172 | - protected function getInnerJoinForCounts(array $args, $innerJoin = '') |
|
| 173 | - { |
|
| 174 | - if (!empty(Arr::get($args, 'post_ids'))) { |
|
| 175 | - $innerJoin.= "INNER JOIN {$this->db->postmeta} AS m3 ON p.ID = m3.post_id "; |
|
| 176 | - } |
|
| 177 | - if (!empty(Arr::get($args, 'term_ids'))) { |
|
| 178 | - $innerJoin.= "INNER JOIN {$this->db->term_relationships} AS tr ON p.ID = tr.object_id "; |
|
| 179 | - } |
|
| 180 | - return apply_filters('site-reviews/query/inner-join-for-counts', $innerJoin); |
|
| 181 | - } |
|
| 168 | + /** |
|
| 169 | + * @param string $innerJoin |
|
| 170 | + * @return string |
|
| 171 | + */ |
|
| 172 | + protected function getInnerJoinForCounts(array $args, $innerJoin = '') |
|
| 173 | + { |
|
| 174 | + if (!empty(Arr::get($args, 'post_ids'))) { |
|
| 175 | + $innerJoin.= "INNER JOIN {$this->db->postmeta} AS m3 ON p.ID = m3.post_id "; |
|
| 176 | + } |
|
| 177 | + if (!empty(Arr::get($args, 'term_ids'))) { |
|
| 178 | + $innerJoin.= "INNER JOIN {$this->db->term_relationships} AS tr ON p.ID = tr.object_id "; |
|
| 179 | + } |
|
| 180 | + return apply_filters('site-reviews/query/inner-join-for-counts', $innerJoin); |
|
| 181 | + } |
|
| 182 | 182 | } |
@@ -8,97 +8,97 @@ |
||
| 8 | 8 | |
| 9 | 9 | class TaxonomyController |
| 10 | 10 | { |
| 11 | - /** |
|
| 12 | - * @return void |
|
| 13 | - * @action Application::TAXONOMY._add_form_fields |
|
| 14 | - * @action Application::TAXONOMY._edit_form |
|
| 15 | - */ |
|
| 16 | - public function disableParents() |
|
| 17 | - { |
|
| 18 | - global $wp_taxonomies; |
|
| 19 | - $wp_taxonomies[Application::TAXONOMY]->hierarchical = false; |
|
| 20 | - } |
|
| 11 | + /** |
|
| 12 | + * @return void |
|
| 13 | + * @action Application::TAXONOMY._add_form_fields |
|
| 14 | + * @action Application::TAXONOMY._edit_form |
|
| 15 | + */ |
|
| 16 | + public function disableParents() |
|
| 17 | + { |
|
| 18 | + global $wp_taxonomies; |
|
| 19 | + $wp_taxonomies[Application::TAXONOMY]->hierarchical = false; |
|
| 20 | + } |
|
| 21 | 21 | |
| 22 | - /** |
|
| 23 | - * @return void |
|
| 24 | - * @action Application::TAXONOMY._term_edit_form_top |
|
| 25 | - * @action Application::TAXONOMY._term_new_form_tag |
|
| 26 | - */ |
|
| 27 | - public function enableParents() |
|
| 28 | - { |
|
| 29 | - global $wp_taxonomies; |
|
| 30 | - $wp_taxonomies[Application::TAXONOMY]->hierarchical = true; |
|
| 31 | - } |
|
| 22 | + /** |
|
| 23 | + * @return void |
|
| 24 | + * @action Application::TAXONOMY._term_edit_form_top |
|
| 25 | + * @action Application::TAXONOMY._term_new_form_tag |
|
| 26 | + */ |
|
| 27 | + public function enableParents() |
|
| 28 | + { |
|
| 29 | + global $wp_taxonomies; |
|
| 30 | + $wp_taxonomies[Application::TAXONOMY]->hierarchical = true; |
|
| 31 | + } |
|
| 32 | 32 | |
| 33 | - /** |
|
| 34 | - * @return void |
|
| 35 | - * @action restrict_manage_posts |
|
| 36 | - */ |
|
| 37 | - public function renderTaxonomyFilter() |
|
| 38 | - { |
|
| 39 | - if (!is_object_in_taxonomy(glsr_current_screen()->post_type, Application::TAXONOMY)) { |
|
| 40 | - return; |
|
| 41 | - } |
|
| 42 | - echo glsr(Builder::class)->label(__('Filter by category', 'site-reviews'), [ |
|
| 43 | - 'class' => 'screen-reader-text', |
|
| 44 | - 'for' => Application::TAXONOMY, |
|
| 45 | - ]); |
|
| 46 | - wp_dropdown_categories([ |
|
| 47 | - 'depth' => 3, |
|
| 48 | - 'hide_empty' => true, |
|
| 49 | - 'hide_if_empty' => true, |
|
| 50 | - 'hierarchical' => true, |
|
| 51 | - 'name' => Application::TAXONOMY, |
|
| 52 | - 'orderby' => 'name', |
|
| 53 | - 'selected' => $this->getSelected(), |
|
| 54 | - 'show_count' => false, |
|
| 55 | - 'show_option_all' => $this->getShowOptionAll(), |
|
| 56 | - 'taxonomy' => Application::TAXONOMY, |
|
| 57 | - 'value_field' => 'slug', |
|
| 58 | - ]); |
|
| 59 | - } |
|
| 33 | + /** |
|
| 34 | + * @return void |
|
| 35 | + * @action restrict_manage_posts |
|
| 36 | + */ |
|
| 37 | + public function renderTaxonomyFilter() |
|
| 38 | + { |
|
| 39 | + if (!is_object_in_taxonomy(glsr_current_screen()->post_type, Application::TAXONOMY)) { |
|
| 40 | + return; |
|
| 41 | + } |
|
| 42 | + echo glsr(Builder::class)->label(__('Filter by category', 'site-reviews'), [ |
|
| 43 | + 'class' => 'screen-reader-text', |
|
| 44 | + 'for' => Application::TAXONOMY, |
|
| 45 | + ]); |
|
| 46 | + wp_dropdown_categories([ |
|
| 47 | + 'depth' => 3, |
|
| 48 | + 'hide_empty' => true, |
|
| 49 | + 'hide_if_empty' => true, |
|
| 50 | + 'hierarchical' => true, |
|
| 51 | + 'name' => Application::TAXONOMY, |
|
| 52 | + 'orderby' => 'name', |
|
| 53 | + 'selected' => $this->getSelected(), |
|
| 54 | + 'show_count' => false, |
|
| 55 | + 'show_option_all' => $this->getShowOptionAll(), |
|
| 56 | + 'taxonomy' => Application::TAXONOMY, |
|
| 57 | + 'value_field' => 'slug', |
|
| 58 | + ]); |
|
| 59 | + } |
|
| 60 | 60 | |
| 61 | - /** |
|
| 62 | - * @param int $postId |
|
| 63 | - * @param array $terms |
|
| 64 | - * @param array $newTTIds |
|
| 65 | - * @param string $taxonomy |
|
| 66 | - * @param bool $append |
|
| 67 | - * @param array $oldTTIds |
|
| 68 | - * @return void |
|
| 69 | - * @action set_object_terms |
|
| 70 | - */ |
|
| 71 | - public function restrictTermSelection($postId, $terms, $newTTIds, $taxonomy, $append, $oldTTIds) |
|
| 72 | - { |
|
| 73 | - if (Application::TAXONOMY != $taxonomy || count($newTTIds) <= 1) { |
|
| 74 | - return; |
|
| 75 | - } |
|
| 76 | - $diff = array_diff($newTTIds, $oldTTIds); |
|
| 77 | - if (empty($newTerm = array_shift($diff))) { |
|
| 78 | - $newTerm = array_shift($newTTIds); |
|
| 79 | - } |
|
| 80 | - if ($newTerm) { |
|
| 81 | - wp_set_object_terms($postId, intval($newTerm), $taxonomy); |
|
| 82 | - } |
|
| 83 | - } |
|
| 61 | + /** |
|
| 62 | + * @param int $postId |
|
| 63 | + * @param array $terms |
|
| 64 | + * @param array $newTTIds |
|
| 65 | + * @param string $taxonomy |
|
| 66 | + * @param bool $append |
|
| 67 | + * @param array $oldTTIds |
|
| 68 | + * @return void |
|
| 69 | + * @action set_object_terms |
|
| 70 | + */ |
|
| 71 | + public function restrictTermSelection($postId, $terms, $newTTIds, $taxonomy, $append, $oldTTIds) |
|
| 72 | + { |
|
| 73 | + if (Application::TAXONOMY != $taxonomy || count($newTTIds) <= 1) { |
|
| 74 | + return; |
|
| 75 | + } |
|
| 76 | + $diff = array_diff($newTTIds, $oldTTIds); |
|
| 77 | + if (empty($newTerm = array_shift($diff))) { |
|
| 78 | + $newTerm = array_shift($newTTIds); |
|
| 79 | + } |
|
| 80 | + if ($newTerm) { |
|
| 81 | + wp_set_object_terms($postId, intval($newTerm), $taxonomy); |
|
| 82 | + } |
|
| 83 | + } |
|
| 84 | 84 | |
| 85 | - /** |
|
| 86 | - * @return string |
|
| 87 | - */ |
|
| 88 | - protected function getSelected() |
|
| 89 | - { |
|
| 90 | - global $wp_query; |
|
| 91 | - return Arr::get($wp_query->query, Application::TAXONOMY); |
|
| 92 | - } |
|
| 85 | + /** |
|
| 86 | + * @return string |
|
| 87 | + */ |
|
| 88 | + protected function getSelected() |
|
| 89 | + { |
|
| 90 | + global $wp_query; |
|
| 91 | + return Arr::get($wp_query->query, Application::TAXONOMY); |
|
| 92 | + } |
|
| 93 | 93 | |
| 94 | - /** |
|
| 95 | - * @return string |
|
| 96 | - */ |
|
| 97 | - protected function getShowOptionAll() |
|
| 98 | - { |
|
| 99 | - $taxonomy = get_taxonomy(Application::TAXONOMY); |
|
| 100 | - return $taxonomy |
|
| 101 | - ? ucfirst(strtolower($taxonomy->labels->all_items)) |
|
| 102 | - : ''; |
|
| 103 | - } |
|
| 94 | + /** |
|
| 95 | + * @return string |
|
| 96 | + */ |
|
| 97 | + protected function getShowOptionAll() |
|
| 98 | + { |
|
| 99 | + $taxonomy = get_taxonomy(Application::TAXONOMY); |
|
| 100 | + return $taxonomy |
|
| 101 | + ? ucfirst(strtolower($taxonomy->labels->all_items)) |
|
| 102 | + : ''; |
|
| 103 | + } |
|
| 104 | 104 | } |
@@ -9,113 +9,113 @@ |
||
| 9 | 9 | |
| 10 | 10 | class SettingsController extends Controller |
| 11 | 11 | { |
| 12 | - /** |
|
| 13 | - * @param mixed $input |
|
| 14 | - * @return array |
|
| 15 | - * @callback register_setting |
|
| 16 | - */ |
|
| 17 | - public function callbackRegisterSettings($input) |
|
| 18 | - { |
|
| 19 | - $settings = Arr::consolidateArray($input); |
|
| 20 | - if (1 === count($settings) && array_key_exists('settings', $settings)) { |
|
| 21 | - $options = array_replace_recursive(glsr(OptionManager::class)->all(), $input); |
|
| 22 | - $options = $this->sanitizeGeneral($input, $options); |
|
| 23 | - $options = $this->sanitizeSubmissions($input, $options); |
|
| 24 | - $options = $this->sanitizeTranslations($input, $options); |
|
| 25 | - $options = apply_filters('site-reviews/settings/callback', $options, $settings); |
|
| 26 | - if (filter_input(INPUT_POST, 'option_page') == Application::ID.'-settings') { |
|
| 27 | - glsr(Notice::class)->addSuccess(__('Settings updated.', 'site-reviews')); |
|
| 28 | - } |
|
| 29 | - return $options; |
|
| 30 | - } |
|
| 31 | - return $input; |
|
| 32 | - } |
|
| 12 | + /** |
|
| 13 | + * @param mixed $input |
|
| 14 | + * @return array |
|
| 15 | + * @callback register_setting |
|
| 16 | + */ |
|
| 17 | + public function callbackRegisterSettings($input) |
|
| 18 | + { |
|
| 19 | + $settings = Arr::consolidateArray($input); |
|
| 20 | + if (1 === count($settings) && array_key_exists('settings', $settings)) { |
|
| 21 | + $options = array_replace_recursive(glsr(OptionManager::class)->all(), $input); |
|
| 22 | + $options = $this->sanitizeGeneral($input, $options); |
|
| 23 | + $options = $this->sanitizeSubmissions($input, $options); |
|
| 24 | + $options = $this->sanitizeTranslations($input, $options); |
|
| 25 | + $options = apply_filters('site-reviews/settings/callback', $options, $settings); |
|
| 26 | + if (filter_input(INPUT_POST, 'option_page') == Application::ID.'-settings') { |
|
| 27 | + glsr(Notice::class)->addSuccess(__('Settings updated.', 'site-reviews')); |
|
| 28 | + } |
|
| 29 | + return $options; |
|
| 30 | + } |
|
| 31 | + return $input; |
|
| 32 | + } |
|
| 33 | 33 | |
| 34 | - /** |
|
| 35 | - * @return void |
|
| 36 | - * @action admin_init |
|
| 37 | - */ |
|
| 38 | - public function registerSettings() |
|
| 39 | - { |
|
| 40 | - register_setting(Application::ID.'-settings', OptionManager::databaseKey(), [ |
|
| 41 | - 'sanitize_callback' => [$this, 'callbackRegisterSettings'], |
|
| 42 | - ]); |
|
| 43 | - } |
|
| 34 | + /** |
|
| 35 | + * @return void |
|
| 36 | + * @action admin_init |
|
| 37 | + */ |
|
| 38 | + public function registerSettings() |
|
| 39 | + { |
|
| 40 | + register_setting(Application::ID.'-settings', OptionManager::databaseKey(), [ |
|
| 41 | + 'sanitize_callback' => [$this, 'callbackRegisterSettings'], |
|
| 42 | + ]); |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * @return array |
|
| 47 | - */ |
|
| 48 | - protected function sanitizeGeneral(array $input, array $options) |
|
| 49 | - { |
|
| 50 | - $inputForm = $input['settings']['general']; |
|
| 51 | - if (!$this->hasMultilingualIntegration($inputForm['support']['multilingual'])) { |
|
| 52 | - $options['settings']['general']['support']['multilingual'] = ''; |
|
| 53 | - } |
|
| 54 | - if ('' == trim($inputForm['notification_message'])) { |
|
| 55 | - $options['settings']['general']['notification_message'] = glsr()->defaults['settings']['general']['notification_message']; |
|
| 56 | - } |
|
| 57 | - $options['settings']['general']['notifications'] = Arr::get($inputForm, 'notifications', []); |
|
| 58 | - return $options; |
|
| 59 | - } |
|
| 45 | + /** |
|
| 46 | + * @return array |
|
| 47 | + */ |
|
| 48 | + protected function sanitizeGeneral(array $input, array $options) |
|
| 49 | + { |
|
| 50 | + $inputForm = $input['settings']['general']; |
|
| 51 | + if (!$this->hasMultilingualIntegration($inputForm['support']['multilingual'])) { |
|
| 52 | + $options['settings']['general']['support']['multilingual'] = ''; |
|
| 53 | + } |
|
| 54 | + if ('' == trim($inputForm['notification_message'])) { |
|
| 55 | + $options['settings']['general']['notification_message'] = glsr()->defaults['settings']['general']['notification_message']; |
|
| 56 | + } |
|
| 57 | + $options['settings']['general']['notifications'] = Arr::get($inputForm, 'notifications', []); |
|
| 58 | + return $options; |
|
| 59 | + } |
|
| 60 | 60 | |
| 61 | - /** |
|
| 62 | - * @return array |
|
| 63 | - */ |
|
| 64 | - protected function sanitizeSubmissions(array $input, array $options) |
|
| 65 | - { |
|
| 66 | - $inputForm = $input['settings']['submissions']; |
|
| 67 | - $options['settings']['submissions']['required'] = isset($inputForm['required']) |
|
| 68 | - ? $inputForm['required'] |
|
| 69 | - : []; |
|
| 70 | - return $options; |
|
| 71 | - } |
|
| 61 | + /** |
|
| 62 | + * @return array |
|
| 63 | + */ |
|
| 64 | + protected function sanitizeSubmissions(array $input, array $options) |
|
| 65 | + { |
|
| 66 | + $inputForm = $input['settings']['submissions']; |
|
| 67 | + $options['settings']['submissions']['required'] = isset($inputForm['required']) |
|
| 68 | + ? $inputForm['required'] |
|
| 69 | + : []; |
|
| 70 | + return $options; |
|
| 71 | + } |
|
| 72 | 72 | |
| 73 | - /** |
|
| 74 | - * @return array |
|
| 75 | - */ |
|
| 76 | - protected function sanitizeTranslations(array $input, array $options) |
|
| 77 | - { |
|
| 78 | - if (isset($input['settings']['strings'])) { |
|
| 79 | - $options['settings']['strings'] = array_values(array_filter($input['settings']['strings'])); |
|
| 80 | - $allowedTags = [ |
|
| 81 | - 'a' => ['class' => [], 'href' => [], 'target' => []], |
|
| 82 | - 'span' => ['class' => []], |
|
| 83 | - ]; |
|
| 84 | - array_walk($options['settings']['strings'], function (&$string) use ($allowedTags) { |
|
| 85 | - if (isset($string['s2'])) { |
|
| 86 | - $string['s2'] = wp_kses($string['s2'], $allowedTags); |
|
| 87 | - } |
|
| 88 | - if (isset($string['p2'])) { |
|
| 89 | - $string['p2'] = wp_kses($string['p2'], $allowedTags); |
|
| 90 | - } |
|
| 91 | - }); |
|
| 92 | - } |
|
| 93 | - return $options; |
|
| 94 | - } |
|
| 73 | + /** |
|
| 74 | + * @return array |
|
| 75 | + */ |
|
| 76 | + protected function sanitizeTranslations(array $input, array $options) |
|
| 77 | + { |
|
| 78 | + if (isset($input['settings']['strings'])) { |
|
| 79 | + $options['settings']['strings'] = array_values(array_filter($input['settings']['strings'])); |
|
| 80 | + $allowedTags = [ |
|
| 81 | + 'a' => ['class' => [], 'href' => [], 'target' => []], |
|
| 82 | + 'span' => ['class' => []], |
|
| 83 | + ]; |
|
| 84 | + array_walk($options['settings']['strings'], function (&$string) use ($allowedTags) { |
|
| 85 | + if (isset($string['s2'])) { |
|
| 86 | + $string['s2'] = wp_kses($string['s2'], $allowedTags); |
|
| 87 | + } |
|
| 88 | + if (isset($string['p2'])) { |
|
| 89 | + $string['p2'] = wp_kses($string['p2'], $allowedTags); |
|
| 90 | + } |
|
| 91 | + }); |
|
| 92 | + } |
|
| 93 | + return $options; |
|
| 94 | + } |
|
| 95 | 95 | |
| 96 | - /** |
|
| 97 | - * @return bool |
|
| 98 | - */ |
|
| 99 | - protected function hasMultilingualIntegration($integration) |
|
| 100 | - { |
|
| 101 | - if (!in_array($integration, ['polylang', 'wpml'])) { |
|
| 102 | - return false; |
|
| 103 | - } |
|
| 104 | - $integrationClass = 'GeminiLabs\SiteReviews\Modules\\'.ucfirst($integration); |
|
| 105 | - if (!glsr($integrationClass)->isActive()) { |
|
| 106 | - glsr(Notice::class)->addError(sprintf( |
|
| 107 | - __('Please install/activate the %s plugin to enable integration.', 'site-reviews'), |
|
| 108 | - constant($integrationClass.'::PLUGIN_NAME') |
|
| 109 | - )); |
|
| 110 | - return false; |
|
| 111 | - } elseif (!glsr($integrationClass)->isSupported()) { |
|
| 112 | - glsr(Notice::class)->addError(sprintf( |
|
| 113 | - __('Please update the %s plugin to v%s or greater to enable integration.', 'site-reviews'), |
|
| 114 | - constant($integrationClass.'::PLUGIN_NAME'), |
|
| 115 | - constant($integrationClass.'::SUPPORTED_VERSION') |
|
| 116 | - )); |
|
| 117 | - return false; |
|
| 118 | - } |
|
| 119 | - return true; |
|
| 120 | - } |
|
| 96 | + /** |
|
| 97 | + * @return bool |
|
| 98 | + */ |
|
| 99 | + protected function hasMultilingualIntegration($integration) |
|
| 100 | + { |
|
| 101 | + if (!in_array($integration, ['polylang', 'wpml'])) { |
|
| 102 | + return false; |
|
| 103 | + } |
|
| 104 | + $integrationClass = 'GeminiLabs\SiteReviews\Modules\\'.ucfirst($integration); |
|
| 105 | + if (!glsr($integrationClass)->isActive()) { |
|
| 106 | + glsr(Notice::class)->addError(sprintf( |
|
| 107 | + __('Please install/activate the %s plugin to enable integration.', 'site-reviews'), |
|
| 108 | + constant($integrationClass.'::PLUGIN_NAME') |
|
| 109 | + )); |
|
| 110 | + return false; |
|
| 111 | + } elseif (!glsr($integrationClass)->isSupported()) { |
|
| 112 | + glsr(Notice::class)->addError(sprintf( |
|
| 113 | + __('Please update the %s plugin to v%s or greater to enable integration.', 'site-reviews'), |
|
| 114 | + constant($integrationClass.'::PLUGIN_NAME'), |
|
| 115 | + constant($integrationClass.'::SUPPORTED_VERSION') |
|
| 116 | + )); |
|
| 117 | + return false; |
|
| 118 | + } |
|
| 119 | + return true; |
|
| 120 | + } |
|
| 121 | 121 | } |