@@ -16,7 +16,7 @@ |
||
| 16 | 16 | 'author' => '', |
| 17 | 17 | 'avatar' => '', |
| 18 | 18 | 'content' => '', |
| 19 | - 'date' => get_date_from_gmt( gmdate( 'Y-m-d H:i:s' )), |
|
| 19 | + 'date' => get_date_from_gmt( gmdate( 'Y-m-d H:i:s' ) ), |
|
| 20 | 20 | 'email' => '', |
| 21 | 21 | 'ip_address' => '', |
| 22 | 22 | 'pinned' => false, |
@@ -32,8 +32,8 @@ discard block |
||
| 32 | 32 | */ |
| 33 | 33 | public static function isPhpValid( $version = '' ) |
| 34 | 34 | { |
| 35 | - if( !empty( $version )) { |
|
| 36 | - static::normalize( array( 'php' => $version )); |
|
| 35 | + if( !empty($version) ) { |
|
| 36 | + static::normalize( array( 'php' => $version ) ); |
|
| 37 | 37 | } |
| 38 | 38 | return !version_compare( PHP_VERSION, static::$versions->php, '<' ); |
| 39 | 39 | } |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | */ |
| 44 | 44 | public static function isValid( array $args = array() ) |
| 45 | 45 | { |
| 46 | - if( !empty( $args )) { |
|
| 46 | + if( !empty($args) ) { |
|
| 47 | 47 | static::normalize( $args ); |
| 48 | 48 | } |
| 49 | 49 | return static::isPhpValid() && static::isWpValid(); |
@@ -56,8 +56,8 @@ discard block |
||
| 56 | 56 | public static function isWpValid( $version = '' ) |
| 57 | 57 | { |
| 58 | 58 | global $wp_version; |
| 59 | - if( !empty( $version )) { |
|
| 60 | - static::normalize( array( 'wordpress' => $version )); |
|
| 59 | + if( !empty($version) ) { |
|
| 60 | + static::normalize( array( 'wordpress' => $version ) ); |
|
| 61 | 61 | } |
| 62 | 62 | return !version_compare( $wp_version, static::$versions->wordpress, '<' ); |
| 63 | 63 | } |
@@ -68,14 +68,14 @@ discard block |
||
| 68 | 68 | */ |
| 69 | 69 | public static function shouldDeactivate( $file, array $args = array() ) |
| 70 | 70 | { |
| 71 | - if( empty( static::$instance )) { |
|
| 71 | + if( empty(static::$instance) ) { |
|
| 72 | 72 | static::$file = realpath( $file ); |
| 73 | 73 | static::$instance = new static; |
| 74 | 74 | static::$versions = static::normalize( $args ); |
| 75 | 75 | } |
| 76 | 76 | if( !static::isValid() ) { |
| 77 | - add_action( 'activated_plugin', array( static::$instance, 'deactivate' )); |
|
| 78 | - add_action( 'admin_notices', array( static::$instance, 'deactivate' )); |
|
| 77 | + add_action( 'activated_plugin', array( static::$instance, 'deactivate' ) ); |
|
| 78 | + add_action( 'admin_notices', array( static::$instance, 'deactivate' ) ); |
|
| 79 | 79 | return true; |
| 80 | 80 | } |
| 81 | 81 | return false; |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | return (object)wp_parse_args( $args, array( |
| 106 | 106 | 'php' => static::MIN_PHP_VERSION, |
| 107 | 107 | 'wordpress' => static::MIN_WORDPRESS_VERSION, |
| 108 | - )); |
|
| 108 | + ) ); |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | /** |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | filter_input( INPUT_GET, 'plugin_status' ), |
| 118 | 118 | filter_input( INPUT_GET, 'paged' ), |
| 119 | 119 | filter_input( INPUT_GET, 's' ) |
| 120 | - ))); |
|
| 120 | + ) ) ); |
|
| 121 | 121 | exit; |
| 122 | 122 | } |
| 123 | 123 | |
@@ -87,7 +87,9 @@ |
||
| 87 | 87 | */ |
| 88 | 88 | public function deactivate( $plugin ) |
| 89 | 89 | { |
| 90 | - if( static::isValid() )return; |
|
| 90 | + if( static::isValid() ) { |
|
| 91 | + return; |
|
| 92 | + } |
|
| 91 | 93 | $pluginSlug = plugin_basename( static::$file ); |
| 92 | 94 | if( $plugin == $pluginSlug ) { |
| 93 | 95 | $this->redirect(); //exit |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | 'label' => '['.$tag.']', |
| 48 | 48 | 'required' => $this->required, |
| 49 | 49 | 'title' => esc_html__( 'Shortcode', 'site-reviews' ), |
| 50 | - ]); |
|
| 50 | + ] ); |
|
| 51 | 51 | return $this; |
| 52 | 52 | } |
| 53 | 53 | |
@@ -57,12 +57,12 @@ discard block |
||
| 57 | 57 | protected function generateFields( array $fields ) |
| 58 | 58 | { |
| 59 | 59 | $generatedFields = array_map( function( $field ) { |
| 60 | - if( empty( $field ))return; |
|
| 60 | + if( empty($field) )return; |
|
| 61 | 61 | $field = $this->normalize( $field ); |
| 62 | - if( !method_exists( $this, $method = 'normalize'.ucfirst( $field['type'] )))return; |
|
| 62 | + if( !method_exists( $this, $method = 'normalize'.ucfirst( $field['type'] ) ) )return; |
|
| 63 | 63 | return $this->$method( $field ); |
| 64 | 64 | }, $fields ); |
| 65 | - return array_values( array_filter( $generatedFields )); |
|
| 65 | + return array_values( array_filter( $generatedFields ) ); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | /** |
@@ -71,15 +71,15 @@ discard block |
||
| 71 | 71 | protected function getFields() |
| 72 | 72 | { |
| 73 | 73 | $fields = $this->generateFields( $this->fields() ); |
| 74 | - if( !empty( $this->errors )) { |
|
| 74 | + if( !empty($this->errors) ) { |
|
| 75 | 75 | $errors = []; |
| 76 | 76 | foreach( $this->required as $name => $alert ) { |
| 77 | - if( false !== array_search( $name, array_column( $fields, 'name' )))continue; |
|
| 77 | + if( false !== array_search( $name, array_column( $fields, 'name' ) ) )continue; |
|
| 78 | 78 | $errors[] = $this->errors[$name]; |
| 79 | 79 | } |
| 80 | 80 | $this->errors = $errors; |
| 81 | 81 | } |
| 82 | - return empty( $this->errors ) |
|
| 82 | + return empty($this->errors) |
|
| 83 | 83 | ? $fields |
| 84 | 84 | : $this->errors; |
| 85 | 85 | } |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | return wp_parse_args( $field, [ |
| 93 | 93 | 'items' => [], |
| 94 | 94 | 'type' => '', |
| 95 | - ]); |
|
| 95 | + ] ); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | /** |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | 'tooltip' => '', |
| 111 | 111 | 'type' => '', |
| 112 | 112 | 'value' => '', |
| 113 | - ]); |
|
| 113 | + ] ); |
|
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | /** |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | */ |
| 119 | 119 | protected function normalizeContainer( array $field ) |
| 120 | 120 | { |
| 121 | - if( !array_key_exists( 'html', $field ) && !array_key_exists( 'items', $field ))return; |
|
| 121 | + if( !array_key_exists( 'html', $field ) && !array_key_exists( 'items', $field ) )return; |
|
| 122 | 122 | $field['items'] = $this->generateFields( $field['items'] ); |
| 123 | 123 | return $field; |
| 124 | 124 | } |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | */ |
| 129 | 129 | protected function normalizeField( array $field, array $defaults ) |
| 130 | 130 | { |
| 131 | - if( !$this->validate( $field ))return; |
|
| 131 | + if( !$this->validate( $field ) )return; |
|
| 132 | 132 | return array_filter( shortcode_atts( $defaults, $field ), function( $value ) { |
| 133 | 133 | return $value !== ''; |
| 134 | 134 | }); |
@@ -148,9 +148,9 @@ discard block |
||
| 148 | 148 | 'tooltip' => '', |
| 149 | 149 | 'type' => '', |
| 150 | 150 | 'value' => '', |
| 151 | - ]); |
|
| 152 | - if( !is_array( $listbox ))return; |
|
| 153 | - if( !array_key_exists( '', $listbox['options'] )) { |
|
| 151 | + ] ); |
|
| 152 | + if( !is_array( $listbox ) )return; |
|
| 153 | + if( !array_key_exists( '', $listbox['options'] ) ) { |
|
| 154 | 154 | $listbox['options'] = ['' => $listbox['placeholder']] + $listbox['options']; |
| 155 | 155 | } |
| 156 | 156 | foreach( $listbox['options'] as $value => $text ) { |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | */ |
| 168 | 168 | protected function normalizePost( array $field ) |
| 169 | 169 | { |
| 170 | - if( !is_array( $field['query_args'] )) { |
|
| 170 | + if( !is_array( $field['query_args'] ) ) { |
|
| 171 | 171 | $field['query_args'] = []; |
| 172 | 172 | } |
| 173 | 173 | $posts = get_posts( wp_parse_args( $field['query_args'], [ |
@@ -175,8 +175,8 @@ discard block |
||
| 175 | 175 | 'orderby' => 'title', |
| 176 | 176 | 'post_type' => 'post', |
| 177 | 177 | 'posts_per_page' => 30, |
| 178 | - ])); |
|
| 179 | - if( !empty( $posts )) { |
|
| 178 | + ] ) ); |
|
| 179 | + if( !empty($posts) ) { |
|
| 180 | 180 | $options = []; |
| 181 | 181 | foreach( $posts as $post ) { |
| 182 | 182 | $options[$post->ID] = esc_html( $post->post_title ); |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | 'tooltip' => '', |
| 207 | 207 | 'type' => '', |
| 208 | 208 | 'value' => '', |
| 209 | - ]); |
|
| 209 | + ] ); |
|
| 210 | 210 | } |
| 211 | 211 | |
| 212 | 212 | /** |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | */ |
| 215 | 215 | protected function validate( array $field ) |
| 216 | 216 | { |
| 217 | - $args = shortcode_atts([ |
|
| 217 | + $args = shortcode_atts( [ |
|
| 218 | 218 | 'label' => '', |
| 219 | 219 | 'name' => false, |
| 220 | 220 | 'required' => false, |
@@ -230,13 +230,13 @@ discard block |
||
| 230 | 230 | */ |
| 231 | 231 | protected function validateErrors( array $args ) |
| 232 | 232 | { |
| 233 | - if( !isset( $args['required']['error'] )) { |
|
| 233 | + if( !isset($args['required']['error']) ) { |
|
| 234 | 234 | return true; |
| 235 | 235 | } |
| 236 | - $this->errors[$args['name']] = $this->normalizeContainer([ |
|
| 236 | + $this->errors[$args['name']] = $this->normalizeContainer( [ |
|
| 237 | 237 | 'html' => $args['required']['error'], |
| 238 | 238 | 'type' => 'container', |
| 239 | - ]); |
|
| 239 | + ] ); |
|
| 240 | 240 | return false; |
| 241 | 241 | } |
| 242 | 242 | |
@@ -249,10 +249,10 @@ discard block |
||
| 249 | 249 | return true; |
| 250 | 250 | } |
| 251 | 251 | $alert = esc_html__( 'Some of the shortcode options are required.', 'site-reviews' ); |
| 252 | - if( isset( $args['required']['alert'] )) { |
|
| 252 | + if( isset($args['required']['alert']) ) { |
|
| 253 | 253 | $alert = $args['required']['alert']; |
| 254 | 254 | } |
| 255 | - else if( !empty( $args['label'] )) { |
|
| 255 | + else if( !empty($args['label']) ) { |
|
| 256 | 256 | $alert = sprintf( |
| 257 | 257 | esc_html_x( 'The "%s" option is required.', 'the option label', 'site-reviews' ), |
| 258 | 258 | str_replace( ':', '', $args['label'] ) |
@@ -57,9 +57,13 @@ discard block |
||
| 57 | 57 | protected function generateFields( array $fields ) |
| 58 | 58 | { |
| 59 | 59 | $generatedFields = array_map( function( $field ) { |
| 60 | - if( empty( $field ))return; |
|
| 60 | + if( empty( $field )) { |
|
| 61 | + return; |
|
| 62 | + } |
|
| 61 | 63 | $field = $this->normalize( $field ); |
| 62 | - if( !method_exists( $this, $method = 'normalize'.ucfirst( $field['type'] )))return; |
|
| 64 | + if( !method_exists( $this, $method = 'normalize'.ucfirst( $field['type'] ))) { |
|
| 65 | + return; |
|
| 66 | + } |
|
| 63 | 67 | return $this->$method( $field ); |
| 64 | 68 | }, $fields ); |
| 65 | 69 | return array_values( array_filter( $generatedFields )); |
@@ -74,7 +78,9 @@ discard block |
||
| 74 | 78 | if( !empty( $this->errors )) { |
| 75 | 79 | $errors = []; |
| 76 | 80 | foreach( $this->required as $name => $alert ) { |
| 77 | - if( false !== array_search( $name, array_column( $fields, 'name' )))continue; |
|
| 81 | + if( false !== array_search( $name, array_column( $fields, 'name' ))) { |
|
| 82 | + continue; |
|
| 83 | + } |
|
| 78 | 84 | $errors[] = $this->errors[$name]; |
| 79 | 85 | } |
| 80 | 86 | $this->errors = $errors; |
@@ -118,7 +124,9 @@ discard block |
||
| 118 | 124 | */ |
| 119 | 125 | protected function normalizeContainer( array $field ) |
| 120 | 126 | { |
| 121 | - if( !array_key_exists( 'html', $field ) && !array_key_exists( 'items', $field ))return; |
|
| 127 | + if( !array_key_exists( 'html', $field ) && !array_key_exists( 'items', $field )) { |
|
| 128 | + return; |
|
| 129 | + } |
|
| 122 | 130 | $field['items'] = $this->generateFields( $field['items'] ); |
| 123 | 131 | return $field; |
| 124 | 132 | } |
@@ -128,7 +136,9 @@ discard block |
||
| 128 | 136 | */ |
| 129 | 137 | protected function normalizeField( array $field, array $defaults ) |
| 130 | 138 | { |
| 131 | - if( !$this->validate( $field ))return; |
|
| 139 | + if( !$this->validate( $field )) { |
|
| 140 | + return; |
|
| 141 | + } |
|
| 132 | 142 | return array_filter( shortcode_atts( $defaults, $field ), function( $value ) { |
| 133 | 143 | return $value !== ''; |
| 134 | 144 | }); |
@@ -149,7 +159,9 @@ discard block |
||
| 149 | 159 | 'type' => '', |
| 150 | 160 | 'value' => '', |
| 151 | 161 | ]); |
| 152 | - if( !is_array( $listbox ))return; |
|
| 162 | + if( !is_array( $listbox )) { |
|
| 163 | + return; |
|
| 164 | + } |
|
| 153 | 165 | if( !array_key_exists( '', $listbox['options'] )) { |
| 154 | 166 | $listbox['options'] = ['' => $listbox['placeholder']] + $listbox['options']; |
| 155 | 167 | } |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | $diff = time() - strtotime( $date ); |
| 32 | 32 | foreach( static::$TIME_PERIODS as $i => $timePeriod ) { |
| 33 | 33 | if( $diff > $timePeriod[0] )continue; |
| 34 | - $unit = intval( floor( $diff / $timePeriod[1] )); |
|
| 34 | + $unit = intval( floor( $diff / $timePeriod[1] ) ); |
|
| 35 | 35 | $relativeDates = [ |
| 36 | 36 | _n( '%s second ago', '%s seconds ago', $unit, 'site-reviews' ), |
| 37 | 37 | _n( '%s minute ago', '%s minutes ago', $unit, 'site-reviews' ), |
@@ -30,7 +30,9 @@ |
||
| 30 | 30 | { |
| 31 | 31 | $diff = time() - strtotime( $date ); |
| 32 | 32 | foreach( static::$TIME_PERIODS as $i => $timePeriod ) { |
| 33 | - if( $diff > $timePeriod[0] )continue; |
|
| 33 | + if( $diff > $timePeriod[0] ) { |
|
| 34 | + continue; |
|
| 35 | + } |
|
| 34 | 36 | $unit = intval( floor( $diff / $timePeriod[1] )); |
| 35 | 37 | $relativeDates = [ |
| 36 | 38 | _n( '%s second ago', '%s seconds ago', $unit, 'site-reviews' ), |
@@ -161,7 +161,9 @@ discard block |
||
| 161 | 161 | if( !empty( $sessions )) { |
| 162 | 162 | $now = time(); |
| 163 | 163 | foreach( $sessions as $session ) { |
| 164 | - if( $now <= $session->expiration )continue; |
|
| 164 | + if( $now <= $session->expiration ) { |
|
| 165 | + continue; |
|
| 166 | + } |
|
| 165 | 167 | $expiredSessions[] = $session->name; |
| 166 | 168 | $expiredSessions[] = str_replace( '_expires_', '_', $session->name ); |
| 167 | 169 | } |
@@ -204,7 +206,9 @@ discard block |
||
| 204 | 206 | */ |
| 205 | 207 | protected function setCookie() |
| 206 | 208 | { |
| 207 | - if( headers_sent() )return; |
|
| 209 | + if( headers_sent() ) { |
|
| 210 | + return; |
|
| 211 | + } |
|
| 208 | 212 | $cookie = $this->sessionId.'||'.$this->expiryTimestamp.'||'.$this->expiryTimestampReset; |
| 209 | 213 | $cookiePath = preg_replace( '|https?://[^/]+|i', '', trailingslashit( (string)get_option( 'home' ))); |
| 210 | 214 | setcookie( static::SESSION_COOKIE, $cookie, $this->expiryTimestamp, $cookiePath ); |
@@ -34,8 +34,8 @@ discard block |
||
| 34 | 34 | |
| 35 | 35 | public function __construct() |
| 36 | 36 | { |
| 37 | - if( $cookieId = filter_input( INPUT_COOKIE, static::SESSION_COOKIE )) { |
|
| 38 | - $cookie = explode( '||', stripslashes( $cookieId )); |
|
| 37 | + if( $cookieId = filter_input( INPUT_COOKIE, static::SESSION_COOKIE ) ) { |
|
| 38 | + $cookie = explode( '||', stripslashes( $cookieId ) ); |
|
| 39 | 39 | $this->sessionId = preg_replace( '/[^A-Za-z0-9_]/', '', $cookie[0] ); |
| 40 | 40 | $this->expiryTimestamp = absint( $cookie[1] ); |
| 41 | 41 | $this->expiryTimestampReset = absint( $cookie[2] ); |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | */ |
| 76 | 76 | public function deleteExpiredSessions( $limit = 1000 ) |
| 77 | 77 | { |
| 78 | - if( $expiredSessions = implode( "','", $this->getExpiredSessions( $limit ))) { |
|
| 78 | + if( $expiredSessions = implode( "','", $this->getExpiredSessions( $limit ) ) ) { |
|
| 79 | 79 | glsr( SqlQueries::class )->deleteExpiredSessions( $expiredSessions ); |
| 80 | 80 | } |
| 81 | 81 | } |
@@ -89,11 +89,11 @@ discard block |
||
| 89 | 89 | public function get( $key, $fallback = '', $unset = false ) |
| 90 | 90 | { |
| 91 | 91 | $key = sanitize_key( $key ); |
| 92 | - $value = isset( $this->sessionData[$key] ) |
|
| 92 | + $value = isset($this->sessionData[$key]) |
|
| 93 | 93 | ? maybe_unserialize( $this->sessionData[$key] ) |
| 94 | 94 | : $fallback; |
| 95 | - if( isset( $this->sessionData[$key] ) && $unset ) { |
|
| 96 | - unset( $this->sessionData[$key] ); |
|
| 95 | + if( isset($this->sessionData[$key]) && $unset ) { |
|
| 96 | + unset($this->sessionData[$key]); |
|
| 97 | 97 | $this->updateSession(); |
| 98 | 98 | } |
| 99 | 99 | return $value; |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | protected function deleteSession() |
| 128 | 128 | { |
| 129 | 129 | delete_option( $this->getSessionId() ); |
| 130 | - delete_option( $this->getSessionId( 'expires' )); |
|
| 130 | + delete_option( $this->getSessionId( 'expires' ) ); |
|
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | /** |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | */ |
| 136 | 136 | protected function generateSessionId() |
| 137 | 137 | { |
| 138 | - return md5(( new PasswordHash( 8, false ))->get_random_bytes( 32 )); |
|
| 138 | + return md5( (new PasswordHash( 8, false ))->get_random_bytes( 32 ) ); |
|
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | /** |
@@ -145,8 +145,8 @@ discard block |
||
| 145 | 145 | protected function getExpiredSessions( $limit ) |
| 146 | 146 | { |
| 147 | 147 | $expiredSessions = []; |
| 148 | - $sessions = glsr( SqlQueries::class )->getExpiredSessions( static::SESSION_COOKIE, absint( $limit )); |
|
| 149 | - if( !empty( $sessions )) { |
|
| 148 | + $sessions = glsr( SqlQueries::class )->getExpiredSessions( static::SESSION_COOKIE, absint( $limit ) ); |
|
| 149 | + if( !empty($sessions) ) { |
|
| 150 | 150 | $now = time(); |
| 151 | 151 | foreach( $sessions as $session ) { |
| 152 | 152 | if( $now <= $session->expiration )continue; |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | */ |
| 164 | 164 | protected function getSessionId( $separator = '' ) |
| 165 | 165 | { |
| 166 | - return implode( '_', array_filter( [static::SESSION_COOKIE, $separator, $this->sessionId] )); |
|
| 166 | + return implode( '_', array_filter( [static::SESSION_COOKIE, $separator, $this->sessionId] ) ); |
|
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | /** |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | { |
| 195 | 195 | if( headers_sent() )return; |
| 196 | 196 | $cookie = $this->sessionId.'||'.$this->expiryTimestamp.'||'.$this->expiryTimestampReset; |
| 197 | - $cookiePath = preg_replace( '|https?://[^/]+|i', '', trailingslashit( (string)get_option( 'home' ))); |
|
| 197 | + $cookiePath = preg_replace( '|https?://[^/]+|i', '', trailingslashit( (string)get_option( 'home' ) ) ); |
|
| 198 | 198 | setcookie( static::SESSION_COOKIE, $cookie, $this->expiryTimestamp, $cookiePath ); |
| 199 | 199 | } |
| 200 | 200 | |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | */ |
| 213 | 213 | protected function updateSession() |
| 214 | 214 | { |
| 215 | - if( false === get_option( $this->getSessionId() )) { |
|
| 215 | + if( false === get_option( $this->getSessionId() ) ) { |
|
| 216 | 216 | return $this->createSession(); |
| 217 | 217 | } |
| 218 | 218 | update_option( $this->getSessionId(), $this->sessionData, false ); |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | natsort( $routines ); |
| 17 | 17 | array_walk( $routines, function( $routine ) { |
| 18 | 18 | $version = str_replace( strtolower( __CLASS__ ).'_', '', $routine ); |
| 19 | - if( version_compare( glsr()->version, $version, '>=' ))return; |
|
| 19 | + if( version_compare( glsr()->version, $version, '>=' ) )return; |
|
| 20 | 20 | call_user_func( [$this, $routine] ); |
| 21 | 21 | }); |
| 22 | 22 | $this->updateVersion(); |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | public function updateVersion() |
| 29 | 29 | { |
| 30 | 30 | $currentVersion = glsr( OptionManager::class )->get( 'version' ); |
| 31 | - if( version_compare( $currentVersion, glsr()->version, '<' )) { |
|
| 31 | + if( version_compare( $currentVersion, glsr()->version, '<' ) ) { |
|
| 32 | 32 | glsr( OptionManager::class )->set( 'version', glsr()->version ); |
| 33 | 33 | } |
| 34 | 34 | if( $currentVersion != glsr()->version ) { |
@@ -16,7 +16,9 @@ discard block |
||
| 16 | 16 | natsort( $routines ); |
| 17 | 17 | array_walk( $routines, function( $routine ) { |
| 18 | 18 | $version = str_replace( strtolower( __CLASS__ ).'_', '', $routine ); |
| 19 | - if( version_compare( glsr()->version, $version, '>=' ))return; |
|
| 19 | + if( version_compare( glsr()->version, $version, '>=' )) { |
|
| 20 | + return; |
|
| 21 | + } |
|
| 20 | 22 | call_user_func( [$this, $routine] ); |
| 21 | 23 | }); |
| 22 | 24 | $this->updateVersion(); |
@@ -37,5 +39,6 @@ discard block |
||
| 37 | 39 | } |
| 38 | 40 | |
| 39 | 41 | protected function upgrade_3_0_0() |
| 40 | - {} |
|
| 42 | + { |
|
| 43 | +} |
|
| 41 | 44 | } |
@@ -22,7 +22,8 @@ |
||
| 22 | 22 | protected $public; |
| 23 | 23 | protected $translator; |
| 24 | 24 | |
| 25 | - public function __construct( Application $app ) { |
|
| 25 | + public function __construct( Application $app ) |
|
| 26 | + { |
|
| 26 | 27 | $this->app = $app; |
| 27 | 28 | $this->admin = $app->make( AdminController::class ); |
| 28 | 29 | $this->basename = plugin_basename( $app->file ); |
@@ -38,27 +38,27 @@ |
||
| 38 | 38 | */ |
| 39 | 39 | public function run() |
| 40 | 40 | { |
| 41 | - add_filter( 'mce_external_plugins', [$this->admin, 'filterTinymcePlugins'], 15 ); |
|
| 42 | - add_filter( 'plugin_action_links_'.$this->basename, [$this->admin, 'filterActionLinks'] ); |
|
| 43 | - add_filter( 'dashboard_glance_items', [$this->admin, 'filterDashboardGlanceItems'] ); |
|
| 44 | - add_filter( 'wp_editor_settings', [$this->editor, 'filterEditorSettings'] ); |
|
| 45 | - add_filter( 'the_editor', [$this->editor, 'filterEditorTextarea'] ); |
|
| 46 | - add_filter( 'gettext', [$this->editor, 'filterPostStatusLabels'], 10, 3 ); |
|
| 47 | - add_filter( 'gettext_with_context', [$this->editor, 'filterPostStatusLabelsWithContext'], 10, 4 ); |
|
| 48 | - add_filter( 'post_updated_messages', [$this->editor, 'filterUpdateMessages'] ); |
|
| 49 | - add_filter( 'bulk_post_updated_messages', [$this->listtable, 'filterBulkUpdateMessages'], 10, 2 ); |
|
| 50 | - add_filter( 'manage_'.Application::POST_TYPE.'_posts_columns', [$this->listtable, 'filterColumnsForPostType'] ); |
|
| 51 | - add_filter( 'post_date_column_status', [$this->listtable, 'filterDateColumnStatus'], 10, 2 ); |
|
| 52 | - add_filter( 'default_hidden_columns', [$this->listtable, 'filterDefaultHiddenColumns'], 10, 2 ); |
|
| 53 | - add_filter( 'display_post_states', [$this->listtable, 'filterPostStates'], 10, 2 ); |
|
| 54 | - add_filter( 'post_row_actions', [$this->listtable, 'filterRowActions'], 10, 2 ); |
|
| 41 | + add_filter( 'mce_external_plugins', [$this->admin, 'filterTinymcePlugins'], 15 ); |
|
| 42 | + add_filter( 'plugin_action_links_'.$this->basename, [$this->admin, 'filterActionLinks'] ); |
|
| 43 | + add_filter( 'dashboard_glance_items', [$this->admin, 'filterDashboardGlanceItems'] ); |
|
| 44 | + add_filter( 'wp_editor_settings', [$this->editor, 'filterEditorSettings'] ); |
|
| 45 | + add_filter( 'the_editor', [$this->editor, 'filterEditorTextarea'] ); |
|
| 46 | + add_filter( 'gettext', [$this->editor, 'filterPostStatusLabels'], 10, 3 ); |
|
| 47 | + add_filter( 'gettext_with_context', [$this->editor, 'filterPostStatusLabelsWithContext'], 10, 4 ); |
|
| 48 | + add_filter( 'post_updated_messages', [$this->editor, 'filterUpdateMessages'] ); |
|
| 49 | + add_filter( 'bulk_post_updated_messages', [$this->listtable, 'filterBulkUpdateMessages'], 10, 2 ); |
|
| 50 | + add_filter( 'manage_'.Application::POST_TYPE.'_posts_columns', [$this->listtable, 'filterColumnsForPostType'] ); |
|
| 51 | + add_filter( 'post_date_column_status', [$this->listtable, 'filterDateColumnStatus'], 10, 2 ); |
|
| 52 | + add_filter( 'default_hidden_columns', [$this->listtable, 'filterDefaultHiddenColumns'], 10, 2 ); |
|
| 53 | + add_filter( 'display_post_states', [$this->listtable, 'filterPostStates'], 10, 2 ); |
|
| 54 | + add_filter( 'post_row_actions', [$this->listtable, 'filterRowActions'], 10, 2 ); |
|
| 55 | 55 | add_filter( 'manage_edit-'.Application::POST_TYPE.'_sortable_columns', [$this->listtable, 'filterSortableColumns'] ); |
| 56 | - add_filter( 'ngettext', [$this->listtable, 'filterStatusText'], 10, 5 ); |
|
| 57 | - add_filter( 'script_loader_tag', [$this->public, 'filterEnqueuedScripts'], 10, 2 ); |
|
| 58 | - add_filter( 'query_vars', [$this->public, 'filterQueryVars'] ); |
|
| 59 | - add_filter( 'gettext', [$this->translator, 'filterGettext'], 10, 3 ); |
|
| 60 | - add_filter( 'gettext_with_context', [$this->translator, 'filterGettextWithContext'], 10, 4 ); |
|
| 61 | - add_filter( 'ngettext', [$this->translator, 'filterNgettext'], 10, 5 ); |
|
| 62 | - add_filter( 'ngettext_with_context', [$this->translator, 'filterNgettextWithContext'], 10, 6 ); |
|
| 56 | + add_filter( 'ngettext', [$this->listtable, 'filterStatusText'], 10, 5 ); |
|
| 57 | + add_filter( 'script_loader_tag', [$this->public, 'filterEnqueuedScripts'], 10, 2 ); |
|
| 58 | + add_filter( 'query_vars', [$this->public, 'filterQueryVars'] ); |
|
| 59 | + add_filter( 'gettext', [$this->translator, 'filterGettext'], 10, 3 ); |
|
| 60 | + add_filter( 'gettext_with_context', [$this->translator, 'filterGettextWithContext'], 10, 4 ); |
|
| 61 | + add_filter( 'ngettext', [$this->translator, 'filterNgettext'], 10, 5 ); |
|
| 62 | + add_filter( 'ngettext_with_context', [$this->translator, 'filterNgettextWithContext'], 10, 6 ); |
|
| 63 | 63 | } |
| 64 | 64 | } |
@@ -10,7 +10,7 @@ |
||
| 10 | 10 | const EXPIRY_TIME = WEEK_IN_SECONDS; |
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | - * @return array |
|
| 13 | + * @return array |
|
| 14 | 14 | */ |
| 15 | 15 | public function getCloudflareIps() |
| 16 | 16 | { |
@@ -19,11 +19,11 @@ discard block |
||
| 19 | 19 | $ipAddresses = array_fill_keys( ['v4', 'v6'], [] ); |
| 20 | 20 | foreach( array_keys( $ipAddresses ) as $version ) { |
| 21 | 21 | $response = wp_remote_get( 'https://www.cloudflare.com/ips-'.$version ); |
| 22 | - if( is_wp_error( $response )) { |
|
| 22 | + if( is_wp_error( $response ) ) { |
|
| 23 | 23 | glsr_log()->error( $response->get_error_message() ); |
| 24 | 24 | continue; |
| 25 | 25 | } |
| 26 | - $ipAddresses[$version] = array_filter( explode( PHP_EOL, wp_remote_retrieve_body( $response ))); |
|
| 26 | + $ipAddresses[$version] = array_filter( explode( PHP_EOL, wp_remote_retrieve_body( $response ) ) ); |
|
| 27 | 27 | } |
| 28 | 28 | set_transient( Application::ID.'_cloudflare_ips', $ipAddresses, static::EXPIRY_TIME ); |
| 29 | 29 | } |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | if( $test === false ) { |
| 58 | 58 | $response = wp_remote_post( 'https://api.wordpress.org/stats/php/1.0/' ); |
| 59 | 59 | $test = !is_wp_error( $response ) |
| 60 | - && in_array( $response['response']['code'], range( 200, 299 )) |
|
| 60 | + && in_array( $response['response']['code'], range( 200, 299 ) ) |
|
| 61 | 61 | ? 'Works' |
| 62 | 62 | : 'Does not work'; |
| 63 | 63 | set_transient( Application::ID.'_remote_post_test', $test, static::EXPIRY_TIME ); |
@@ -12,7 +12,7 @@ discard block |
||
| 12 | 12 | 'name' => 'tripadvisor', |
| 13 | 13 | 'title' => 'Tripadvisor Reviews', |
| 14 | 14 | ], |
| 15 | - ]); |
|
| 15 | + ] ); |
|
| 16 | 16 | $template->render( 'partials/addons/addon', [ |
| 17 | 17 | 'context' => [ |
| 18 | 18 | 'description' => __( 'Sync your Yelp reviews and display them on your site.', 'site-reviews' ), |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | 'name' => 'yelp', |
| 21 | 21 | 'title' => 'Yelp Reviews', |
| 22 | 22 | ], |
| 23 | - ]); |
|
| 23 | + ] ); |
|
| 24 | 24 | ?> |
| 25 | 25 | </div> |
| 26 | 26 | </div> |