@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | |
23 | 23 | $this->label = esc_attr__( 'Approve Entries', 'gravityview' ); |
24 | 24 | |
25 | - $this->description = esc_attr__( 'Approve and reject entries from the View.', 'gravityview' ); |
|
25 | + $this->description = esc_attr__( 'Approve and reject entries from the View.', 'gravityview' ); |
|
26 | 26 | |
27 | 27 | $this->add_hooks(); |
28 | 28 | |
@@ -44,11 +44,11 @@ discard block |
||
44 | 44 | */ |
45 | 45 | function field_options( $field_options, $template_id = '', $field_id = '', $context = '', $input_type = '' ) { |
46 | 46 | |
47 | - unset( $field_options['only_loggedin'] ); |
|
47 | + unset( $field_options[ 'only_loggedin' ] ); |
|
48 | 48 | |
49 | - unset( $field_options['new_window'] ); |
|
49 | + unset( $field_options[ 'new_window' ] ); |
|
50 | 50 | |
51 | - unset( $field_options['show_as_link'] ); |
|
51 | + unset( $field_options[ 'show_as_link' ] ); |
|
52 | 52 | |
53 | 53 | return $field_options; |
54 | 54 | } |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | |
69 | 69 | add_action( 'gravityview/field/approval/load_scripts', array( $this, 'enqueue_and_localize_script' ) ); |
70 | 70 | |
71 | - add_action( 'gravityview_datatables_scripts_styles', array( $this, 'enqueue_and_localize_script' ) ); |
|
71 | + add_action( 'gravityview_datatables_scripts_styles', array( $this, 'enqueue_and_localize_script' ) ); |
|
72 | 72 | |
73 | 73 | add_filter( 'gravityview_get_entries', array( $this, 'modify_search_parameters' ), 1000 ); |
74 | 74 | |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | public function maybe_prevent_field_render( $html, $args ) { |
89 | 89 | |
90 | 90 | // If the field is `entry_approval` type but the user doesn't have the moderate entries cap, don't render. |
91 | - if( $this->name === rgar( $args['field'], 'id' ) && ! GVCommon::has_cap('gravityview_moderate_entries') ) { |
|
91 | + if ( $this->name === rgar( $args[ 'field' ], 'id' ) && ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) { |
|
92 | 92 | return ''; |
93 | 93 | } |
94 | 94 | |
@@ -104,8 +104,8 @@ discard block |
||
104 | 104 | */ |
105 | 105 | public function modify_search_parameters( $parameters ) { |
106 | 106 | |
107 | - if( $this->name === rgars( $parameters, 'sorting/key' ) ) { |
|
108 | - $parameters['sorting']['key'] = 'is_approved'; |
|
107 | + if ( $this->name === rgars( $parameters, 'sorting/key' ) ) { |
|
108 | + $parameters[ 'sorting' ][ 'key' ] = 'is_approved'; |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | return $parameters; |
@@ -121,18 +121,18 @@ discard block |
||
121 | 121 | function register_scripts_and_styles() { |
122 | 122 | $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; |
123 | 123 | |
124 | - wp_register_script( 'gravityview-field-approval', GRAVITYVIEW_URL . 'assets/js/field-approval'.$script_debug.'.js', array( 'jquery' ), GravityView_Plugin::version, true ); |
|
124 | + wp_register_script( 'gravityview-field-approval', GRAVITYVIEW_URL . 'assets/js/field-approval' . $script_debug . '.js', array( 'jquery' ), GravityView_Plugin::version, true ); |
|
125 | 125 | |
126 | 126 | $style_path = GRAVITYVIEW_DIR . 'templates/css/field-approval.css'; |
127 | 127 | |
128 | - if( class_exists( 'GravityView_View' ) ) { |
|
128 | + if ( class_exists( 'GravityView_View' ) ) { |
|
129 | 129 | /** |
130 | 130 | * Override CSS file by placing in your theme's /gravityview/css/ sub-directory. |
131 | 131 | */ |
132 | 132 | $style_path = GravityView_View::getInstance()->locate_template( 'css/field-approval.css', false ); |
133 | 133 | } |
134 | 134 | |
135 | - $style_url = plugins_url( 'css/field-approval.css', trailingslashit( dirname( $style_path ) ) ); |
|
135 | + $style_url = plugins_url( 'css/field-approval.css', trailingslashit( dirname( $style_path ) ) ); |
|
136 | 136 | |
137 | 137 | /** |
138 | 138 | * @filter `gravityview/field/approval/css_url` URL to the Approval field CSS file. |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | */ |
142 | 142 | $style_url = apply_filters( 'gravityview/field/approval/css_url', $style_url ); |
143 | 143 | |
144 | - if( ! empty( $style_url ) ) { |
|
144 | + if ( ! empty( $style_url ) ) { |
|
145 | 145 | wp_register_style( 'gravityview-field-approval', $style_url, array( 'dashicons' ), GravityView_Plugin::version, 'screen' ); |
146 | 146 | } |
147 | 147 | |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | public function enqueue_and_localize_script() { |
157 | 157 | |
158 | 158 | // The script is already registered and enqueued |
159 | - if( wp_script_is( 'gravityview-field-approval', 'enqueued' ) ) { |
|
159 | + if ( wp_script_is( 'gravityview-field-approval', 'enqueued' ) ) { |
|
160 | 160 | return; |
161 | 161 | } |
162 | 162 | |
@@ -166,9 +166,9 @@ discard block |
||
166 | 166 | |
167 | 167 | wp_localize_script( 'gravityview-field-approval', 'gvApproval', array( |
168 | 168 | 'ajaxurl' => admin_url( 'admin-ajax.php' ), |
169 | - 'nonce' => wp_create_nonce('gravityview_entry_approval'), |
|
169 | + 'nonce' => wp_create_nonce( 'gravityview_entry_approval' ), |
|
170 | 170 | 'status' => GravityView_Entry_Approval_Status::get_all(), |
171 | - )); |
|
171 | + ) ); |
|
172 | 172 | |
173 | 173 | } |
174 | 174 | |
@@ -185,8 +185,8 @@ discard block |
||
185 | 185 | */ |
186 | 186 | public function filter_gravityview_entry_default_field( $entry_default_fields, $form, $context ) { |
187 | 187 | |
188 | - if ( ! isset( $entry_default_fields["{$this->name}"] ) && 'edit' !== $context ) { |
|
189 | - $entry_default_fields["{$this->name}"] = array( |
|
188 | + if ( ! isset( $entry_default_fields[ "{$this->name}" ] ) && 'edit' !== $context ) { |
|
189 | + $entry_default_fields[ "{$this->name}" ] = array( |
|
190 | 190 | 'label' => $this->label, |
191 | 191 | 'desc' => $this->description, |
192 | 192 | 'type' => $this->name, |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | */ |
86 | 86 | public static function get_instance() { |
87 | 87 | |
88 | - if( empty( self::$instance ) ) { |
|
88 | + if ( empty( self::$instance ) ) { |
|
89 | 89 | self::$instance = new self; |
90 | 90 | } |
91 | 91 | |
@@ -118,9 +118,9 @@ discard block |
||
118 | 118 | |
119 | 119 | $operators = array_merge( self::$SUPPORTED_ARRAY_OPERATORS, self::$SUPPORTED_NUMERIC_OPERATORS, self::$SUPPORTED_SCALAR_OPERATORS, self::$SUPPORTED_CUSTOM_OPERATORS ); |
120 | 120 | |
121 | - if( $with_values ) { |
|
121 | + if ( $with_values ) { |
|
122 | 122 | $operators_with_values = array(); |
123 | - foreach( $operators as $key ) { |
|
123 | + foreach ( $operators as $key ) { |
|
124 | 124 | $operators_with_values[ $key ] = ''; |
125 | 125 | } |
126 | 126 | return $operators_with_values; |
@@ -137,14 +137,14 @@ discard block |
||
137 | 137 | */ |
138 | 138 | function set_operation( $operation = '' ) { |
139 | 139 | |
140 | - if( empty( $operation ) ) { |
|
140 | + if ( empty( $operation ) ) { |
|
141 | 141 | return false; |
142 | 142 | } |
143 | 143 | |
144 | 144 | $operators = $this->get_operators( false ); |
145 | 145 | |
146 | - if( !in_array( $operation, $operators ) ) { |
|
147 | - do_action( 'gravityview_log_debug', __METHOD__ .' Attempted to add invalid operation type.', $operation ); |
|
146 | + if ( ! in_array( $operation, $operators ) ) { |
|
147 | + do_action( 'gravityview_log_debug', __METHOD__ . ' Attempted to add invalid operation type.', $operation ); |
|
148 | 148 | return false; |
149 | 149 | } |
150 | 150 | |
@@ -164,11 +164,11 @@ discard block |
||
164 | 164 | */ |
165 | 165 | private function setup_operation_and_comparison() { |
166 | 166 | |
167 | - foreach( $this->atts as $key => $value ) { |
|
167 | + foreach ( $this->atts as $key => $value ) { |
|
168 | 168 | |
169 | 169 | $valid = $this->set_operation( $key ); |
170 | 170 | |
171 | - if( $valid ) { |
|
171 | + if ( $valid ) { |
|
172 | 172 | $this->comparison = $value; |
173 | 173 | return true; |
174 | 174 | } |
@@ -191,8 +191,8 @@ discard block |
||
191 | 191 | return null; |
192 | 192 | } |
193 | 193 | |
194 | - if( empty( $atts ) ) { |
|
195 | - do_action( 'gravityview_log_error', __METHOD__.' $atts are empty.', $atts ); |
|
194 | + if ( empty( $atts ) ) { |
|
195 | + do_action( 'gravityview_log_error', __METHOD__ . ' $atts are empty.', $atts ); |
|
196 | 196 | return null; |
197 | 197 | } |
198 | 198 | |
@@ -203,16 +203,16 @@ discard block |
||
203 | 203 | $this->parse_atts(); |
204 | 204 | |
205 | 205 | // We need an "if" |
206 | - if( false === $this->if ) { |
|
207 | - do_action( 'gravityview_log_error', __METHOD__.' $atts->if is empty.', $this->passed_atts ); |
|
206 | + if ( false === $this->if ) { |
|
207 | + do_action( 'gravityview_log_error', __METHOD__ . ' $atts->if is empty.', $this->passed_atts ); |
|
208 | 208 | return null; |
209 | 209 | } |
210 | 210 | |
211 | 211 | $setup = $this->setup_operation_and_comparison(); |
212 | 212 | |
213 | 213 | // We need an operation and comparison value |
214 | - if( ! $setup ) { |
|
215 | - do_action( 'gravityview_log_error', __METHOD__.' No valid operators were passed.', $this->atts ); |
|
214 | + if ( ! $setup ) { |
|
215 | + do_action( 'gravityview_log_error', __METHOD__ . ' No valid operators were passed.', $this->atts ); |
|
216 | 216 | return null; |
217 | 217 | } |
218 | 218 | |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | */ |
246 | 246 | private function get_output() { |
247 | 247 | |
248 | - if( $this->is_match ) { |
|
248 | + if ( $this->is_match ) { |
|
249 | 249 | $output = $this->content; |
250 | 250 | } else { |
251 | 251 | $output = $this->else_content; |
@@ -259,9 +259,9 @@ discard block |
||
259 | 259 | * @param string $output HTML/text output |
260 | 260 | * @param GVLogic_Shortcode $this This class |
261 | 261 | */ |
262 | - $output = apply_filters('gravityview/gvlogic/output', $output, $this ); |
|
262 | + $output = apply_filters( 'gravityview/gvlogic/output', $output, $this ); |
|
263 | 263 | |
264 | - do_action( 'gravityview_log_debug', __METHOD__ .' Output: ', $output ); |
|
264 | + do_action( 'gravityview_log_debug', __METHOD__ . ' Output: ', $output ); |
|
265 | 265 | |
266 | 266 | return $output; |
267 | 267 | } |
@@ -277,11 +277,11 @@ discard block |
||
277 | 277 | |
278 | 278 | $content = explode( '[else]', $this->passed_content ); |
279 | 279 | |
280 | - $this->content = $content[0]; |
|
280 | + $this->content = $content[ 0 ]; |
|
281 | 281 | |
282 | - $else_attr = isset( $this->atts['else'] ) ? $this->atts['else'] : NULL; |
|
282 | + $else_attr = isset( $this->atts[ 'else' ] ) ? $this->atts[ 'else' ] : NULL; |
|
283 | 283 | |
284 | - $this->else_content = isset( $content[1] ) ? $content[1] : $else_attr; |
|
284 | + $this->else_content = isset( $content[ 1 ] ) ? $content[ 1 ] : $else_attr; |
|
285 | 285 | } |
286 | 286 | |
287 | 287 | /** |
@@ -304,10 +304,10 @@ discard block |
||
304 | 304 | $this->atts = function_exists( 'array_intersect_key' ) ? array_intersect_key( $this->passed_atts, $this->atts ) : $this->atts; |
305 | 305 | |
306 | 306 | // Strip whitespace if it's not default false |
307 | - $this->if = ( isset( $this->atts['if'] ) && is_string( $this->atts['if'] ) ) ? trim( $this->atts['if'] ) : false; |
|
307 | + $this->if = ( isset( $this->atts[ 'if' ] ) && is_string( $this->atts[ 'if' ] ) ) ? trim( $this->atts[ 'if' ] ) : false; |
|
308 | 308 | |
309 | 309 | // Make sure the "if" isn't processed in self::setup_operation_and_comparison() |
310 | - unset( $this->atts['if'] ); |
|
310 | + unset( $this->atts[ 'if' ] ); |
|
311 | 311 | } |
312 | 312 | } |
313 | 313 |
@@ -107,9 +107,9 @@ discard block |
||
107 | 107 | ) ); |
108 | 108 | |
109 | 109 | // This is just HTML we don't need. |
110 | - unset( $response['message'] ); |
|
110 | + unset( $response[ 'message' ] ); |
|
111 | 111 | |
112 | - switch ( intval( $response['license_limit'] ) ) { |
|
112 | + switch ( intval( $response[ 'license_limit' ] ) ) { |
|
113 | 113 | case 1: |
114 | 114 | $package = 'Sol'; |
115 | 115 | break; |
@@ -120,24 +120,24 @@ discard block |
||
120 | 120 | $package = 'Interstellar'; |
121 | 121 | break; |
122 | 122 | default: |
123 | - $package = sprintf( '%d-Site License', $response['license_limit'] ); |
|
123 | + $package = sprintf( '%d-Site License', $response[ 'license_limit' ] ); |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | $data = array( |
127 | 127 | 'email' => GravityView_Settings::getSetting( 'support-email' ), |
128 | - 'name' => $response['customer_name'], |
|
129 | - 'Valid License?' => ucwords( $response['license'] ), |
|
130 | - 'License Key' => $response['license_key'], |
|
128 | + 'name' => $response[ 'customer_name' ], |
|
129 | + 'Valid License?' => ucwords( $response[ 'license' ] ), |
|
130 | + 'License Key' => $response[ 'license_key' ], |
|
131 | 131 | 'License Level' => $package, |
132 | 132 | 'Site Admin Email' => get_bloginfo( 'admin_email' ), |
133 | 133 | 'Support Email' => GravityView_Settings::getSetting( 'support-email' ), |
134 | - 'License Limit' => $response['license_limit'], |
|
135 | - 'Site Count' => $response['site_count'], |
|
136 | - 'License Expires' => $response['expires'], |
|
137 | - 'Activations Left' => $response['activations_left'], |
|
138 | - 'Payment ID' => $response['payment_id'], |
|
139 | - 'Payment Name' => $response['customer_name'], |
|
140 | - 'Payment Email' => $response['customer_email'], |
|
134 | + 'License Limit' => $response[ 'license_limit' ], |
|
135 | + 'Site Count' => $response[ 'site_count' ], |
|
136 | + 'License Expires' => $response[ 'expires' ], |
|
137 | + 'Activations Left' => $response[ 'activations_left' ], |
|
138 | + 'Payment ID' => $response[ 'payment_id' ], |
|
139 | + 'Payment Name' => $response[ 'customer_name' ], |
|
140 | + 'Payment Email' => $response[ 'customer_email' ], |
|
141 | 141 | 'WordPress Version' => get_bloginfo( 'version', 'display' ), |
142 | 142 | 'PHP Version' => phpversion(), |
143 | 143 | 'GravityView Version' => GravityView_Plugin::version, |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | * @return GV_License_Handler |
47 | 47 | */ |
48 | 48 | public static function get_instance( GravityView_Settings $GFAddOn ) { |
49 | - if( empty( self::$instance ) ) { |
|
49 | + if ( empty( self::$instance ) ) { |
|
50 | 50 | self::$instance = new self( $GFAddOn ); |
51 | 51 | } |
52 | 52 | return self::$instance; |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | 'url' => home_url(), |
124 | 124 | 'site_data' => $this->get_site_data(), |
125 | 125 | ), |
126 | - )); |
|
126 | + ) ); |
|
127 | 127 | |
128 | 128 | // make sure the response came back okay |
129 | 129 | if ( is_wp_error( $response ) ) { |
@@ -149,12 +149,12 @@ discard block |
||
149 | 149 | */ |
150 | 150 | public function refresh_license_status() { |
151 | 151 | |
152 | - if ( defined('DOING_AJAX') && DOING_AJAX ) { |
|
152 | + if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) { |
|
153 | 153 | return; |
154 | 154 | } |
155 | 155 | |
156 | 156 | // The transient is fresh; don't fetch. |
157 | - if( $status = get_transient( self::status_transient_key ) ) { |
|
157 | + if ( $status = get_transient( self::status_transient_key ) ) { |
|
158 | 158 | return; |
159 | 159 | } |
160 | 160 | |
@@ -187,48 +187,48 @@ discard block |
||
187 | 187 | $theme_data = wp_get_theme(); |
188 | 188 | $theme = $theme_data->Name . ' ' . $theme_data->Version; |
189 | 189 | |
190 | - $data['gv_version'] = GravityView_Plugin::version; |
|
191 | - $data['php_version'] = phpversion(); |
|
192 | - $data['wp_version'] = get_bloginfo( 'version' ); |
|
193 | - $data['gf_version'] = GFForms::$version; |
|
194 | - $data['server'] = isset( $_SERVER['SERVER_SOFTWARE'] ) ? $_SERVER['SERVER_SOFTWARE'] : ''; |
|
195 | - $data['multisite'] = is_multisite(); |
|
196 | - $data['theme'] = $theme; |
|
197 | - $data['url'] = home_url(); |
|
198 | - $data['license_key'] = GravityView_Settings::get_instance()->get_app_setting( 'license_key' ); |
|
190 | + $data[ 'gv_version' ] = GravityView_Plugin::version; |
|
191 | + $data[ 'php_version' ] = phpversion(); |
|
192 | + $data[ 'wp_version' ] = get_bloginfo( 'version' ); |
|
193 | + $data[ 'gf_version' ] = GFForms::$version; |
|
194 | + $data[ 'server' ] = isset( $_SERVER[ 'SERVER_SOFTWARE' ] ) ? $_SERVER[ 'SERVER_SOFTWARE' ] : ''; |
|
195 | + $data[ 'multisite' ] = is_multisite(); |
|
196 | + $data[ 'theme' ] = $theme; |
|
197 | + $data[ 'url' ] = home_url(); |
|
198 | + $data[ 'license_key' ] = GravityView_Settings::get_instance()->get_app_setting( 'license_key' ); |
|
199 | 199 | |
200 | 200 | // View Data |
201 | - $gravityview_posts = get_posts('numberposts=-1&post_type=gravityview&post_status=publish&order=ASC'); |
|
201 | + $gravityview_posts = get_posts( 'numberposts=-1&post_type=gravityview&post_status=publish&order=ASC' ); |
|
202 | 202 | |
203 | 203 | if ( ! empty( $gravityview_posts ) ) { |
204 | 204 | $first = array_shift( $gravityview_posts ); |
205 | 205 | $latest = array_pop( $gravityview_posts ); |
206 | - $data['view_count'] = count( $gravityview_posts ); |
|
207 | - $data['view_first'] = $first->post_date; |
|
208 | - $data['view_latest'] = $latest->post_date; |
|
206 | + $data[ 'view_count' ] = count( $gravityview_posts ); |
|
207 | + $data[ 'view_first' ] = $first->post_date; |
|
208 | + $data[ 'view_latest' ] = $latest->post_date; |
|
209 | 209 | } |
210 | 210 | |
211 | 211 | // Form counts |
212 | 212 | if ( class_exists( 'GFFormsModel' ) ) { |
213 | 213 | $form_data = GFFormsModel::get_form_count(); |
214 | - $data['forms_total'] = rgar( $form_data, 'total', 0 ); |
|
215 | - $data['forms_active'] = rgar( $form_data, 'active', 0 ); |
|
216 | - $data['forms_inactive'] = rgar( $form_data, 'inactive', 0 ); |
|
217 | - $data['forms_trash'] = rgar( $form_data, 'inactive', 0 ); |
|
214 | + $data[ 'forms_total' ] = rgar( $form_data, 'total', 0 ); |
|
215 | + $data[ 'forms_active' ] = rgar( $form_data, 'active', 0 ); |
|
216 | + $data[ 'forms_inactive' ] = rgar( $form_data, 'inactive', 0 ); |
|
217 | + $data[ 'forms_trash' ] = rgar( $form_data, 'inactive', 0 ); |
|
218 | 218 | } |
219 | 219 | |
220 | 220 | // Retrieve current plugin information |
221 | - if( ! function_exists( 'get_plugins' ) ) { |
|
221 | + if ( ! function_exists( 'get_plugins' ) ) { |
|
222 | 222 | include ABSPATH . '/wp-admin/includes/plugin.php'; |
223 | 223 | } |
224 | 224 | |
225 | - $data['integrations'] = self::get_related_plugins_and_extensions(); |
|
226 | - $data['active_plugins'] = get_option( 'active_plugins', array() ); |
|
227 | - $data['inactive_plugins'] = array(); |
|
228 | - $data['locale'] = get_locale(); |
|
225 | + $data[ 'integrations' ] = self::get_related_plugins_and_extensions(); |
|
226 | + $data[ 'active_plugins' ] = get_option( 'active_plugins', array() ); |
|
227 | + $data[ 'inactive_plugins' ] = array(); |
|
228 | + $data[ 'locale' ] = get_locale(); |
|
229 | 229 | |
230 | 230 | // Validate request on the GV server |
231 | - $data['hash'] = 'gv_version.url.locale:' . sha1( $data['gv_version'] . $data['url'] . $data['locale'] ); |
|
231 | + $data[ 'hash' ] = 'gv_version.url.locale:' . sha1( $data[ 'gv_version' ] . $data[ 'url' ] . $data[ 'locale' ] ); |
|
232 | 232 | |
233 | 233 | return $data; |
234 | 234 | } |
@@ -260,10 +260,10 @@ discard block |
||
260 | 260 | |
261 | 261 | $plugin_data = get_plugin_data( $active_plugin ); |
262 | 262 | |
263 | - $extensions[] = sprintf( '%s %s', $plugin_data['Name'], $plugin_data['Version'] ); |
|
263 | + $extensions[ ] = sprintf( '%s %s', $plugin_data[ 'Name' ], $plugin_data[ 'Version' ] ); |
|
264 | 264 | } |
265 | 265 | |
266 | - if( ! empty( $extensions ) ) { |
|
266 | + if ( ! empty( $extensions ) ) { |
|
267 | 267 | set_site_transient( self::related_plugins_key, $extensions, HOUR_IN_SECONDS ); |
268 | 268 | } else { |
269 | 269 | return 'There was an error fetching related plugins.'; |
@@ -282,37 +282,37 @@ discard block |
||
282 | 282 | $status = trim( $this->Addon->get_app_setting( 'license_key_status' ) ); |
283 | 283 | $key = trim( $this->Addon->get_app_setting( 'license_key' ) ); |
284 | 284 | |
285 | - if( !empty( $key ) ) { |
|
285 | + if ( ! empty( $key ) ) { |
|
286 | 286 | $response = $this->Addon->get_app_setting( 'license_key_response' ); |
287 | - $response = is_array( $response ) ? (object) $response : json_decode( $response ); |
|
287 | + $response = is_array( $response ) ? (object)$response : json_decode( $response ); |
|
288 | 288 | } else { |
289 | 289 | $response = array(); |
290 | 290 | } |
291 | 291 | |
292 | 292 | wp_localize_script( 'gv-admin-edd-license', 'GVGlobals', array( |
293 | 293 | 'license_box' => $this->get_license_message( $response ) |
294 | - )); |
|
294 | + ) ); |
|
295 | 295 | |
296 | 296 | |
297 | 297 | $fields = array( |
298 | 298 | array( |
299 | 299 | 'name' => 'edd-activate', |
300 | - 'value' => __('Activate License', 'gravityview'), |
|
301 | - 'data-pending_text' => __('Verifying license…', 'gravityview'), |
|
300 | + 'value' => __( 'Activate License', 'gravityview' ), |
|
301 | + 'data-pending_text' => __( 'Verifying license…', 'gravityview' ), |
|
302 | 302 | 'data-edd_action' => 'activate_license', |
303 | 303 | 'class' => 'button-primary', |
304 | 304 | ), |
305 | 305 | array( |
306 | 306 | 'name' => 'edd-deactivate', |
307 | - 'value' => __('Deactivate License', 'gravityview'), |
|
308 | - 'data-pending_text' => __('Deactivating license…', 'gravityview'), |
|
307 | + 'value' => __( 'Deactivate License', 'gravityview' ), |
|
308 | + 'data-pending_text' => __( 'Deactivating license…', 'gravityview' ), |
|
309 | 309 | 'data-edd_action' => 'deactivate_license', |
310 | 310 | 'class' => ( empty( $status ) ? 'button-primary hide' : 'button-primary' ), |
311 | 311 | ), |
312 | 312 | array( |
313 | 313 | 'name' => 'edd-check', |
314 | - 'value' => __('Check License', 'gravityview'), |
|
315 | - 'data-pending_text' => __('Verifying license…', 'gravityview'), |
|
314 | + 'value' => __( 'Check License', 'gravityview' ), |
|
315 | + 'data-pending_text' => __( 'Verifying license…', 'gravityview' ), |
|
316 | 316 | 'title' => 'Check the license before saving it', |
317 | 317 | 'data-edd_action' => 'check_license', |
318 | 318 | 'class' => 'button-secondary', |
@@ -322,17 +322,17 @@ discard block |
||
322 | 322 | |
323 | 323 | $class = 'button gv-edd-action'; |
324 | 324 | |
325 | - $class .= ( !empty( $key ) && $status !== 'valid' ) ? '' : ' hide'; |
|
325 | + $class .= ( ! empty( $key ) && $status !== 'valid' ) ? '' : ' hide'; |
|
326 | 326 | |
327 | 327 | $disabled_attribute = GVCommon::has_cap( 'gravityview_edit_settings' ) ? false : 'disabled'; |
328 | 328 | |
329 | 329 | $submit = '<div class="gv-edd-button-wrapper">'; |
330 | 330 | foreach ( $fields as $field ) { |
331 | - $field['type'] = 'button'; |
|
332 | - $field['class'] = isset( $field['class'] ) ? $field['class'] . ' '. $class : $class; |
|
333 | - $field['style'] = 'margin-left: 10px;'; |
|
334 | - if( $disabled_attribute ) { |
|
335 | - $field['disabled'] = $disabled_attribute; |
|
331 | + $field[ 'type' ] = 'button'; |
|
332 | + $field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] . ' ' . $class : $class; |
|
333 | + $field[ 'style' ] = 'margin-left: 10px;'; |
|
334 | + if ( $disabled_attribute ) { |
|
335 | + $field[ 'disabled' ] = $disabled_attribute; |
|
336 | 336 | } |
337 | 337 | $submit .= $this->Addon->settings_submit( $field, $echo ); |
338 | 338 | } |
@@ -348,8 +348,8 @@ discard block |
||
348 | 348 | */ |
349 | 349 | private function setup_edd() { |
350 | 350 | |
351 | - if( !class_exists('EDD_SL_Plugin_Updater') ) { |
|
352 | - require_once( GRAVITYVIEW_DIR . 'includes/lib/EDD_SL_Plugin_Updater.php'); |
|
351 | + if ( ! class_exists( 'EDD_SL_Plugin_Updater' ) ) { |
|
352 | + require_once( GRAVITYVIEW_DIR . 'includes/lib/EDD_SL_Plugin_Updater.php' ); |
|
353 | 353 | } |
354 | 354 | |
355 | 355 | // setup the updater |
@@ -386,8 +386,8 @@ discard block |
||
386 | 386 | 'url' => home_url(), |
387 | 387 | ); |
388 | 388 | |
389 | - if( !empty( $action ) ) { |
|
390 | - $settings['edd_action'] = esc_attr( $action ); |
|
389 | + if ( ! empty( $action ) ) { |
|
390 | + $settings[ 'edd_action' ] = esc_attr( $action ); |
|
391 | 391 | } |
392 | 392 | |
393 | 393 | $settings = array_map( 'urlencode', $settings ); |
@@ -401,14 +401,14 @@ discard block |
||
401 | 401 | */ |
402 | 402 | private function _license_get_remote_response( $data, $license = '' ) { |
403 | 403 | |
404 | - $api_params = $this->_get_edd_settings( $data['edd_action'], $license ); |
|
404 | + $api_params = $this->_get_edd_settings( $data[ 'edd_action' ], $license ); |
|
405 | 405 | |
406 | 406 | $url = add_query_arg( $api_params, self::url ); |
407 | 407 | |
408 | 408 | $response = wp_remote_get( $url, array( |
409 | 409 | 'timeout' => 15, |
410 | 410 | 'sslverify' => false, |
411 | - )); |
|
411 | + ) ); |
|
412 | 412 | |
413 | 413 | if ( is_wp_error( $response ) ) { |
414 | 414 | return array(); |
@@ -441,11 +441,11 @@ discard block |
||
441 | 441 | */ |
442 | 442 | function get_license_message( $license_data ) { |
443 | 443 | |
444 | - if( empty( $license_data ) ) { |
|
444 | + if ( empty( $license_data ) ) { |
|
445 | 445 | $message = ''; |
446 | 446 | } else { |
447 | 447 | |
448 | - if( ! empty( $license_data->error ) ) { |
|
448 | + if ( ! empty( $license_data->error ) ) { |
|
449 | 449 | $class = 'error'; |
450 | 450 | $string_key = $license_data->error; |
451 | 451 | } else { |
@@ -453,7 +453,7 @@ discard block |
||
453 | 453 | $string_key = $license_data->license; |
454 | 454 | } |
455 | 455 | |
456 | - $message = sprintf( '<p><strong>%s: %s</strong></p>', $this->strings('status'), $this->strings( $string_key, $license_data ) ); |
|
456 | + $message = sprintf( '<p><strong>%s: %s</strong></p>', $this->strings( 'status' ), $this->strings( $string_key, $license_data ) ); |
|
457 | 457 | |
458 | 458 | $message = $this->generate_license_box( $message, $class ); |
459 | 459 | } |
@@ -490,18 +490,18 @@ discard block |
||
490 | 490 | */ |
491 | 491 | public function license_details( $response = array() ) { |
492 | 492 | |
493 | - $response = (array) $response; |
|
493 | + $response = (array)$response; |
|
494 | 494 | |
495 | 495 | $return = ''; |
496 | 496 | $wrapper = '<span class="gv-license-details" aria-live="polite" aria-busy="false">%s</span>'; |
497 | 497 | |
498 | - if( ! empty( $response['license_key'] ) ) { |
|
498 | + if ( ! empty( $response[ 'license_key' ] ) ) { |
|
499 | 499 | |
500 | 500 | $return .= '<h3>' . esc_html__( 'License Details:', 'gravityview' ) . '</h3>'; |
501 | 501 | |
502 | 502 | if ( in_array( rgar( $response, 'license' ), array( 'invalid', 'deactivated' ) ) ) { |
503 | - $return .= $this->strings( $response['license'], $response ); |
|
504 | - } elseif ( ! empty( $response['license_name'] ) ) { |
|
503 | + $return .= $this->strings( $response[ 'license' ], $response ); |
|
504 | + } elseif ( ! empty( $response[ 'license_name' ] ) ) { |
|
505 | 505 | |
506 | 506 | $response_keys = array( |
507 | 507 | 'license_name' => '', |
@@ -516,19 +516,19 @@ discard block |
||
516 | 516 | // Make sure all the keys are set |
517 | 517 | $response = wp_parse_args( $response, $response_keys ); |
518 | 518 | |
519 | - $login_link = sprintf( '<a href="%s" class="howto" rel="external">%s</a>', esc_url( sprintf( 'https://gravityview.co/wp-login.php?username=%s', $response['customer_email'] ) ), esc_html__( 'Access your GravityView account', 'gravityview' ) ); |
|
520 | - $local_text = ( ! empty( $response['is_local'] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' ); |
|
519 | + $login_link = sprintf( '<a href="%s" class="howto" rel="external">%s</a>', esc_url( sprintf( 'https://gravityview.co/wp-login.php?username=%s', $response[ 'customer_email' ] ) ), esc_html__( 'Access your GravityView account', 'gravityview' ) ); |
|
520 | + $local_text = ( ! empty( $response[ 'is_local' ] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' ); |
|
521 | 521 | $details = array( |
522 | - 'license' => sprintf( esc_html__( 'License level: %s', 'gravityview' ), esc_html( $response['license_name'] ), esc_html( $response['license_limit'] ) ), |
|
523 | - 'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), esc_html__( $response['customer_name'], 'gravityview' ), esc_html__( $response['customer_email'], 'gravityview' ) ) . $login_link, |
|
524 | - 'activations' => sprintf( esc_html__( 'Activations: %d of %s sites', 'gravityview' ), intval( $response['site_count'] ), esc_html( $response['license_limit'] ) ) . $local_text, |
|
525 | - 'expires' => 'lifetime' === $response['expires'] ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response['expires'] ) - DAY_IN_SECONDS ) ), |
|
526 | - 'upgrade' => $this->get_upgrade_html( $response['upgrades'] ), |
|
522 | + 'license' => sprintf( esc_html__( 'License level: %s', 'gravityview' ), esc_html( $response[ 'license_name' ] ), esc_html( $response[ 'license_limit' ] ) ), |
|
523 | + 'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), esc_html__( $response[ 'customer_name' ], 'gravityview' ), esc_html__( $response[ 'customer_email' ], 'gravityview' ) ) . $login_link, |
|
524 | + 'activations' => sprintf( esc_html__( 'Activations: %d of %s sites', 'gravityview' ), intval( $response[ 'site_count' ] ), esc_html( $response[ 'license_limit' ] ) ) . $local_text, |
|
525 | + 'expires' => 'lifetime' === $response[ 'expires' ] ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response[ 'expires' ] ) - DAY_IN_SECONDS ) ), |
|
526 | + 'upgrade' => $this->get_upgrade_html( $response[ 'upgrades' ] ), |
|
527 | 527 | ); |
528 | 528 | |
529 | - if ( ! empty( $response['error'] ) && 'expired' === $response['error'] ) { |
|
530 | - unset( $details['upgrade'] ); |
|
531 | - $details['expires'] = '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>'; |
|
529 | + if ( ! empty( $response[ 'error' ] ) && 'expired' === $response[ 'error' ] ) { |
|
530 | + unset( $details[ 'upgrade' ] ); |
|
531 | + $details[ 'expires' ] = '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>'; |
|
532 | 532 | } |
533 | 533 | |
534 | 534 | $return .= '<ul><li>' . implode( '</li><li>', array_filter( $details ) ) . '</li></ul>'; |
@@ -551,11 +551,11 @@ discard block |
||
551 | 551 | |
552 | 552 | $output = ''; |
553 | 553 | |
554 | - if( ! empty( $upgrades ) ) { |
|
554 | + if ( ! empty( $upgrades ) ) { |
|
555 | 555 | |
556 | 556 | $locale_parts = explode( '_', get_locale() ); |
557 | 557 | |
558 | - $is_english = ( 'en' === $locale_parts[0] ); |
|
558 | + $is_english = ( 'en' === $locale_parts[ 0 ] ); |
|
559 | 559 | |
560 | 560 | $output .= '<h4>' . esc_html__( 'Upgrades available:', 'gravityview' ) . '</h4>'; |
561 | 561 | |
@@ -563,14 +563,14 @@ discard block |
||
563 | 563 | |
564 | 564 | foreach ( $upgrades as $upgrade_id => $upgrade ) { |
565 | 565 | |
566 | - $upgrade = (object) $upgrade; |
|
566 | + $upgrade = (object)$upgrade; |
|
567 | 567 | |
568 | 568 | $anchor_text = sprintf( esc_html_x( 'Upgrade to %1$s for %2$s', '1: GravityView upgrade name, 2: Cost of upgrade', 'gravityview' ), esc_attr( $upgrade->name ), esc_attr( $upgrade->price ) ); |
569 | 569 | |
570 | - if( $is_english && isset( $upgrade->description ) ) { |
|
570 | + if ( $is_english && isset( $upgrade->description ) ) { |
|
571 | 571 | $message = esc_html( $upgrade->description ); |
572 | 572 | } else { |
573 | - switch( $upgrade->price_id ) { |
|
573 | + switch ( $upgrade->price_id ) { |
|
574 | 574 | // Interstellar |
575 | 575 | case 1: |
576 | 576 | default: |
@@ -608,16 +608,16 @@ discard block |
||
608 | 608 | */ |
609 | 609 | public function license_call( $array = array() ) { |
610 | 610 | |
611 | - $is_ajax = ( defined('DOING_AJAX') && DOING_AJAX ); |
|
612 | - $data = empty( $array ) ? $_POST['data'] : $array; |
|
611 | + $is_ajax = ( defined( 'DOING_AJAX' ) && DOING_AJAX ); |
|
612 | + $data = empty( $array ) ? $_POST[ 'data' ] : $array; |
|
613 | 613 | $has_cap = GVCommon::has_cap( 'gravityview_edit_settings' ); |
614 | 614 | |
615 | - if ( $is_ajax && empty( $data['license'] ) ) { |
|
616 | - die( - 1 ); |
|
615 | + if ( $is_ajax && empty( $data[ 'license' ] ) ) { |
|
616 | + die( -1 ); |
|
617 | 617 | } |
618 | 618 | |
619 | 619 | // If the user isn't allowed to edit settings, show an error message |
620 | - if( ! $has_cap && empty( $data['all_caps'] ) ) { |
|
620 | + if ( ! $has_cap && empty( $data[ 'all_caps' ] ) ) { |
|
621 | 621 | $license_data = new stdClass(); |
622 | 622 | $license_data->error = 'capability'; |
623 | 623 | $license_data->message = $this->get_license_message( $license_data ); |
@@ -641,9 +641,9 @@ discard block |
||
641 | 641 | |
642 | 642 | $json = json_encode( $license_data ); |
643 | 643 | |
644 | - $update_license = ( ! isset( $data['update'] ) || ! empty( $data['update'] ) ); |
|
644 | + $update_license = ( ! isset( $data[ 'update' ] ) || ! empty( $data[ 'update' ] ) ); |
|
645 | 645 | |
646 | - $is_check_action_button = ( 'check_license' === $data['edd_action'] && defined( 'DOING_AJAX' ) && DOING_AJAX ); |
|
646 | + $is_check_action_button = ( 'check_license' === $data[ 'edd_action' ] && defined( 'DOING_AJAX' ) && DOING_AJAX ); |
|
647 | 647 | |
648 | 648 | // Failed is the response from trying to de-activate a license and it didn't work. |
649 | 649 | // This likely happened because people entered in a different key and clicked "Deactivate", |
@@ -651,7 +651,7 @@ discard block |
||
651 | 651 | // most likely a mistake. |
652 | 652 | if ( $license_data->license !== 'failed' && ! $is_check_action_button && $update_license ) { |
653 | 653 | |
654 | - if ( ! empty( $data['field_id'] ) ) { |
|
654 | + if ( ! empty( $data[ 'field_id' ] ) ) { |
|
655 | 655 | set_transient( self::status_transient_key, $license_data, DAY_IN_SECONDS ); |
656 | 656 | } |
657 | 657 | |
@@ -662,7 +662,7 @@ discard block |
||
662 | 662 | if ( $is_ajax ) { |
663 | 663 | exit( $json ); |
664 | 664 | } else { // Non-ajax call |
665 | - return ( rgget('format', $data ) === 'object' ) ? $license_data : $json; |
|
665 | + return ( rgget( 'format', $data ) === 'object' ) ? $license_data : $json; |
|
666 | 666 | } |
667 | 667 | } |
668 | 668 | |
@@ -676,9 +676,9 @@ discard block |
||
676 | 676 | // Update option with passed data license |
677 | 677 | $settings = $this->Addon->get_app_settings(); |
678 | 678 | |
679 | - $settings['license_key'] = $license_data->license_key = trim( $data['license'] ); |
|
680 | - $settings['license_key_status'] = $license_data->license; |
|
681 | - $settings['license_key_response'] = (array)$license_data; |
|
679 | + $settings[ 'license_key' ] = $license_data->license_key = trim( $data[ 'license' ] ); |
|
680 | + $settings[ 'license_key_status' ] = $license_data->license; |
|
681 | + $settings[ 'license_key_response' ] = (array)$license_data; |
|
682 | 682 | |
683 | 683 | $this->Addon->update_app_settings( $settings ); |
684 | 684 | } |
@@ -691,7 +691,7 @@ discard block |
||
691 | 691 | */ |
692 | 692 | private function get_license_renewal_url( $license_data ) { |
693 | 693 | $license_data = is_array( $license_data ) ? (object)$license_data : $license_data; |
694 | - $renew_license_url = ( ! empty( $license_data ) && !empty( $license_data->license_key ) ) ? sprintf( 'https://gravityview.co/checkout/?download_id=17&edd_license_key=%s&utm_source=admin_notice&utm_medium=admin&utm_content=expired&utm_campaign=Activation&force_login=1', $license_data->license_key ) : 'https://gravityview.co/account/'; |
|
694 | + $renew_license_url = ( ! empty( $license_data ) && ! empty( $license_data->license_key ) ) ? sprintf( 'https://gravityview.co/checkout/?download_id=17&edd_license_key=%s&utm_source=admin_notice&utm_medium=admin&utm_content=expired&utm_campaign=Activation&force_login=1', $license_data->license_key ) : 'https://gravityview.co/account/'; |
|
695 | 695 | return $renew_license_url; |
696 | 696 | } |
697 | 697 | |
@@ -706,31 +706,31 @@ discard block |
||
706 | 706 | |
707 | 707 | |
708 | 708 | $strings = array( |
709 | - 'status' => esc_html__('Status', 'gravityview'), |
|
710 | - 'error' => esc_html__('There was an error processing the request.', 'gravityview'), |
|
711 | - 'failed' => esc_html__('Could not deactivate the license. The license key you attempted to deactivate may not be active or valid.', 'gravityview'), |
|
712 | - 'site_inactive' => esc_html__('The license key is valid, but it has not been activated for this site.', 'gravityview'), |
|
713 | - 'inactive' => esc_html__('The license key is valid, but it has not been activated for this site.', 'gravityview'), |
|
714 | - 'no_activations_left' => esc_html__('Invalid: this license has reached its activation limit.', 'gravityview') . ' ' . sprintf( esc_html__('You can manage license activations %son your GravityView account page%s.', 'gravityview'), '<a href="https://gravityview.co/account/#licenses">', '</a>' ), |
|
715 | - 'deactivated' => esc_html__('The license has been deactivated.', 'gravityview'), |
|
716 | - 'valid' => esc_html__('The license key is valid and active.', 'gravityview'), |
|
717 | - 'invalid' => esc_html__('The license key entered is invalid.', 'gravityview'), |
|
718 | - 'missing' => esc_html__('Invalid license key.', 'gravityview'), |
|
719 | - 'revoked' => esc_html__('This license key has been revoked.', 'gravityview'), |
|
720 | - 'expired' => sprintf( esc_html__('This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview'), '<a href="'. esc_url( $this->get_license_renewal_url( $license_data ) ) .'">', '</a>' ), |
|
709 | + 'status' => esc_html__( 'Status', 'gravityview' ), |
|
710 | + 'error' => esc_html__( 'There was an error processing the request.', 'gravityview' ), |
|
711 | + 'failed' => esc_html__( 'Could not deactivate the license. The license key you attempted to deactivate may not be active or valid.', 'gravityview' ), |
|
712 | + 'site_inactive' => esc_html__( 'The license key is valid, but it has not been activated for this site.', 'gravityview' ), |
|
713 | + 'inactive' => esc_html__( 'The license key is valid, but it has not been activated for this site.', 'gravityview' ), |
|
714 | + 'no_activations_left' => esc_html__( 'Invalid: this license has reached its activation limit.', 'gravityview' ) . ' ' . sprintf( esc_html__( 'You can manage license activations %son your GravityView account page%s.', 'gravityview' ), '<a href="https://gravityview.co/account/#licenses">', '</a>' ), |
|
715 | + 'deactivated' => esc_html__( 'The license has been deactivated.', 'gravityview' ), |
|
716 | + 'valid' => esc_html__( 'The license key is valid and active.', 'gravityview' ), |
|
717 | + 'invalid' => esc_html__( 'The license key entered is invalid.', 'gravityview' ), |
|
718 | + 'missing' => esc_html__( 'Invalid license key.', 'gravityview' ), |
|
719 | + 'revoked' => esc_html__( 'This license key has been revoked.', 'gravityview' ), |
|
720 | + 'expired' => sprintf( esc_html__( 'This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview' ), '<a href="' . esc_url( $this->get_license_renewal_url( $license_data ) ) . '">', '</a>' ), |
|
721 | 721 | 'capability' => esc_html__( 'You don\'t have the ability to edit plugin settings.', 'gravityview' ), |
722 | 722 | |
723 | - 'verifying_license' => esc_html__('Verifying license…', 'gravityview'), |
|
724 | - 'activate_license' => esc_html__('Activate License', 'gravityview'), |
|
725 | - 'deactivate_license' => esc_html__('Deactivate License', 'gravityview'), |
|
726 | - 'check_license' => esc_html__('Verify License', 'gravityview'), |
|
723 | + 'verifying_license' => esc_html__( 'Verifying license…', 'gravityview' ), |
|
724 | + 'activate_license' => esc_html__( 'Activate License', 'gravityview' ), |
|
725 | + 'deactivate_license' => esc_html__( 'Deactivate License', 'gravityview' ), |
|
726 | + 'check_license' => esc_html__( 'Verify License', 'gravityview' ), |
|
727 | 727 | ); |
728 | 728 | |
729 | - if( empty( $status ) ) { |
|
729 | + if ( empty( $status ) ) { |
|
730 | 730 | return $strings; |
731 | 731 | } |
732 | 732 | |
733 | - if( isset( $strings[ $status ] ) ) { |
|
733 | + if ( isset( $strings[ $status ] ) ) { |
|
734 | 734 | return $strings[ $status ]; |
735 | 735 | } |
736 | 736 |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | |
41 | 41 | function field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
42 | 42 | |
43 | - unset ( $field_options['search_filter'], $field_options['show_as_link'] ); |
|
43 | + unset ( $field_options[ 'search_filter' ], $field_options[ 'show_as_link' ] ); |
|
44 | 44 | |
45 | 45 | $new_fields = array( |
46 | 46 | 'content' => array( |
@@ -60,8 +60,8 @@ discard block |
||
60 | 60 | ), |
61 | 61 | ); |
62 | 62 | |
63 | - if( 'edit' === $context ) { |
|
64 | - unset( $field_options['custom_label'], $field_options['show_label'], $field_options['allow_edit_cap'], $new_fields['wpautop'] ); |
|
63 | + if ( 'edit' === $context ) { |
|
64 | + unset( $field_options[ 'custom_label' ], $field_options[ 'show_label' ], $field_options[ 'allow_edit_cap' ], $new_fields[ 'wpautop' ] ); |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | return $new_fields + $field_options; |
@@ -95,9 +95,9 @@ discard block |
||
95 | 95 | |
96 | 96 | // Loop through the configured Edit Entry fields and add Custom Content fields if there are any |
97 | 97 | // TODO: Make this available to other custom GV field types |
98 | - foreach ( (array) $edit_fields as $edit_field ) { |
|
98 | + foreach ( (array)$edit_fields as $edit_field ) { |
|
99 | 99 | |
100 | - if( 'custom' === rgar( $edit_field, 'id') ) { |
|
100 | + if ( 'custom' === rgar( $edit_field, 'id' ) ) { |
|
101 | 101 | |
102 | 102 | $field_data = array( |
103 | 103 | 'label' => rgar( $edit_field, 'custom_label' ), |
@@ -110,13 +110,13 @@ discard block |
||
110 | 110 | $field_data[ $key ] = GravityView_Merge_Tags::replace_variables( $field_datum, $form, $entry, false, false ); |
111 | 111 | } |
112 | 112 | |
113 | - $field_data['cssClass'] = rgar( $edit_field, 'custom_class' ); |
|
113 | + $field_data[ 'cssClass' ] = rgar( $edit_field, 'custom_class' ); |
|
114 | 114 | |
115 | - $new_fields[] = new GF_Field_HTML( $field_data ); |
|
115 | + $new_fields[ ] = new GF_Field_HTML( $field_data ); |
|
116 | 116 | |
117 | 117 | } else { |
118 | - if( isset( $fields[ $i ] ) ) { |
|
119 | - $new_fields[] = $fields[ $i ]; |
|
118 | + if ( isset( $fields[ $i ] ) ) { |
|
119 | + $new_fields[ ] = $fields[ $i ]; |
|
120 | 120 | } |
121 | 121 | $i++; |
122 | 122 | } |
@@ -65,11 +65,11 @@ discard block |
||
65 | 65 | |
66 | 66 | $atts = wp_parse_args( $atts, $defaults ); |
67 | 67 | |
68 | - foreach( $atts as $key => $val ) { |
|
68 | + foreach ( $atts as $key => $val ) { |
|
69 | 69 | $this->{$key} = $val; |
70 | 70 | } |
71 | 71 | |
72 | - $this->class = !empty( $this->class ) ? esc_attr( implode( ' ', (array)$this->class ) ) : $this->class; |
|
72 | + $this->class = ! empty( $this->class ) ? esc_attr( implode( ' ', (array)$this->class ) ) : $this->class; |
|
73 | 73 | |
74 | 74 | $this->set_image_size(); |
75 | 75 | |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | */ |
86 | 86 | function validate_image_src() { |
87 | 87 | |
88 | - if ( !$this->validate_src ) { return true; } |
|
88 | + if ( ! $this->validate_src ) { return true; } |
|
89 | 89 | |
90 | 90 | $info = pathinfo( $this->src ); |
91 | 91 | |
@@ -93,9 +93,9 @@ discard block |
||
93 | 93 | * @filter `gravityview_image_extensions` Extensions that GravityView recognizes as valid images to be shown in an `img` tag |
94 | 94 | * @param array $image_exts Default: `['jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico']` |
95 | 95 | */ |
96 | - $image_exts = apply_filters( 'gravityview_image_extensions', array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico' )); |
|
96 | + $image_exts = apply_filters( 'gravityview_image_extensions', array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico' ) ); |
|
97 | 97 | |
98 | - return isset( $info['extension'] ) && in_array( strtolower( $info['extension'] ), $image_exts); |
|
98 | + return isset( $info[ 'extension' ] ) && in_array( strtolower( $info[ 'extension' ] ), $image_exts ); |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | /** |
@@ -111,16 +111,16 @@ discard block |
||
111 | 111 | |
112 | 112 | // And there is no string size passed |
113 | 113 | // And we want to get the image size using PHP |
114 | - if ( empty( $string ) && !empty( $this->getimagesize ) ) { |
|
114 | + if ( empty( $string ) && ! empty( $this->getimagesize ) ) { |
|
115 | 115 | |
116 | 116 | $image_size = @getimagesize( $this->src ); |
117 | 117 | |
118 | 118 | // If it didn't return a response, it may be a HTTPS/SSL error |
119 | - if ( empty( $image_size[0] ) ) { |
|
119 | + if ( empty( $image_size[ 0 ] ) ) { |
|
120 | 120 | $image_size = @getimagesize( set_url_scheme( $this->src, 'http' ) ); |
121 | 121 | } |
122 | 122 | |
123 | - if ( !empty( $image_size ) ) { |
|
123 | + if ( ! empty( $image_size ) ) { |
|
124 | 124 | list( $width, $height ) = $image_size; |
125 | 125 | } |
126 | 126 | |
@@ -133,33 +133,33 @@ discard block |
||
133 | 133 | * @param array $image_sizes Array of image sizes with the key being the size slug, and the value being an array with `width` and `height` defined, in pixels |
134 | 134 | */ |
135 | 135 | $image_sizes = apply_filters( 'gravityview_image_sizes', array( |
136 | - 'tiny' => array('width' => 40, 'height' => 30), |
|
137 | - 'small' => array('width' => 100, 'height' => 75), |
|
138 | - 'medium' => array('width' => 250, 'height' => 188), |
|
139 | - 'large' => array('width' => 448, 'height' => 336), |
|
136 | + 'tiny' => array( 'width' => 40, 'height' => 30 ), |
|
137 | + 'small' => array( 'width' => 100, 'height' => 75 ), |
|
138 | + 'medium' => array( 'width' => 250, 'height' => 188 ), |
|
139 | + 'large' => array( 'width' => 448, 'height' => 336 ), |
|
140 | 140 | ) ); |
141 | 141 | |
142 | - switch( $this->size ) { |
|
142 | + switch ( $this->size ) { |
|
143 | 143 | case 'tiny': |
144 | - extract($image_sizes['tiny']); |
|
144 | + extract( $image_sizes[ 'tiny' ] ); |
|
145 | 145 | break; |
146 | 146 | case 'small': |
147 | 147 | case 's': |
148 | 148 | case 'thumb': |
149 | - extract($image_sizes['small']); |
|
149 | + extract( $image_sizes[ 'small' ] ); |
|
150 | 150 | break; |
151 | 151 | case 'm': |
152 | 152 | case 'medium': |
153 | - extract($image_sizes['medium']); |
|
153 | + extract( $image_sizes[ 'medium' ] ); |
|
154 | 154 | break; |
155 | 155 | case 'large': |
156 | 156 | case 'l': |
157 | - extract($image_sizes['large']); |
|
157 | + extract( $image_sizes[ 'large' ] ); |
|
158 | 158 | break; |
159 | 159 | default: |
160 | 160 | // Verify that the passed sizes are integers. |
161 | - $width = !empty( $width ) ? intval( $width ) : intval( $this->width ); |
|
162 | - $height = !empty( $height ) ? intval( $height ) : intval( $this->height ); |
|
161 | + $width = ! empty( $width ) ? intval( $width ) : intval( $this->width ); |
|
162 | + $height = ! empty( $height ) ? intval( $height ) : intval( $this->height ); |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | } |
@@ -58,8 +58,8 @@ discard block |
||
58 | 58 | |
59 | 59 | if ( 'address' === rgar( $search_field, 'type' ) ) { |
60 | 60 | |
61 | - $field_id = intval( floor( $search_field['key'] ) ); |
|
62 | - $input_id = gravityview_get_input_id_from_id( $search_field['key'] ); |
|
61 | + $field_id = intval( floor( $search_field[ 'key' ] ) ); |
|
62 | + $input_id = gravityview_get_input_id_from_id( $search_field[ 'key' ] ); |
|
63 | 63 | $form = GravityView_View::getInstance()->getForm(); |
64 | 64 | |
65 | 65 | /** @var GF_Field_Address $address_field */ |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | $choices = array(); |
69 | 69 | |
70 | 70 | $method_name = 'get_choices_' . self::get_input_type_from_input_id( $input_id ); |
71 | - if( method_exists( $this, $method_name ) ) { |
|
71 | + if ( method_exists( $this, $method_name ) ) { |
|
72 | 72 | /** |
73 | 73 | * @uses GravityView_Field_Address::get_choices_country() |
74 | 74 | * @uses GravityView_Field_Address::get_choices_state() |
@@ -76,12 +76,12 @@ discard block |
||
76 | 76 | $choices = $this->{$method_name}( $address_field ); |
77 | 77 | } |
78 | 78 | |
79 | - if( ! empty( $choices ) ) { |
|
80 | - $search_field['choices'] = $choices; |
|
81 | - $search_field['type'] = rgar( $search_field, 'input'); |
|
79 | + if ( ! empty( $choices ) ) { |
|
80 | + $search_field[ 'choices' ] = $choices; |
|
81 | + $search_field[ 'type' ] = rgar( $search_field, 'input' ); |
|
82 | 82 | } else { |
83 | - $search_field['type'] = 'text'; |
|
84 | - $search_field['input'] = 'input_text'; |
|
83 | + $search_field[ 'type' ] = 'text'; |
|
84 | + $search_field[ 'input' ] = 'input_text'; |
|
85 | 85 | } |
86 | 86 | } |
87 | 87 | } |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | $country_choices = array(); |
108 | 108 | |
109 | 109 | foreach ( $countries as $key => $country ) { |
110 | - $country_choices[] = array( |
|
110 | + $country_choices[ ] = array( |
|
111 | 111 | 'value' => $country, |
112 | 112 | 'text' => $country, |
113 | 113 | ); |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | */ |
132 | 132 | private function get_choices_state( $address_field ) { |
133 | 133 | |
134 | - $address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form['id'] ) : $address_field->addressType; |
|
134 | + $address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form[ 'id' ] ) : $address_field->addressType; |
|
135 | 135 | |
136 | 136 | $state_choices = array(); |
137 | 137 | |
@@ -143,12 +143,12 @@ discard block |
||
143 | 143 | $states = GFCommon::get_canadian_provinces(); |
144 | 144 | break; |
145 | 145 | default: |
146 | - $states = empty( $address_types[ $address_type ]['states'] ) ? array() : $address_types[ $address_type ]['states']; |
|
146 | + $states = empty( $address_types[ $address_type ][ 'states' ] ) ? array() : $address_types[ $address_type ][ 'states' ]; |
|
147 | 147 | break; |
148 | 148 | } |
149 | 149 | |
150 | 150 | foreach ( $states as $key => $state ) { |
151 | - $state_choices[] = array( |
|
151 | + $state_choices[ ] = array( |
|
152 | 152 | 'value' => $state, |
153 | 153 | 'text' => $state, |
154 | 154 | ); |
@@ -171,13 +171,13 @@ discard block |
||
171 | 171 | // Use the same inputs as the "text" input type allows |
172 | 172 | $text_inputs = rgar( $input_types, 'text' ); |
173 | 173 | |
174 | - $input_types['street'] = $text_inputs; |
|
175 | - $input_types['street2'] = $text_inputs; |
|
176 | - $input_types['city'] = $text_inputs; |
|
174 | + $input_types[ 'street' ] = $text_inputs; |
|
175 | + $input_types[ 'street2' ] = $text_inputs; |
|
176 | + $input_types[ 'city' ] = $text_inputs; |
|
177 | 177 | |
178 | - $input_types['state'] = array( 'select', 'radio', 'link' ) + $text_inputs; |
|
179 | - $input_types['zip'] = array( 'input_text' ); |
|
180 | - $input_types['country'] = array( 'select', 'radio', 'link' ) + $text_inputs; |
|
178 | + $input_types[ 'state' ] = array( 'select', 'radio', 'link' ) + $text_inputs; |
|
179 | + $input_types[ 'zip' ] = array( 'input_text' ); |
|
180 | + $input_types[ 'country' ] = array( 'select', 'radio', 'link' ) + $text_inputs; |
|
181 | 181 | |
182 | 182 | return $input_types; |
183 | 183 | } |
@@ -198,10 +198,10 @@ discard block |
||
198 | 198 | // Is this search field for an input (eg: 4.2) or the whole address field (eg: 4)? |
199 | 199 | $input_id = gravityview_get_input_id_from_id( $field_id ); |
200 | 200 | |
201 | - if( 'address' === $field_type && $input_id ) { |
|
201 | + if ( 'address' === $field_type && $input_id ) { |
|
202 | 202 | |
203 | 203 | // If the input ID matches an expected address input, set to that. Otherwise, keep existing input type. |
204 | - if( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) { |
|
204 | + if ( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) { |
|
205 | 205 | $input_type = $address_field_name; |
206 | 206 | } |
207 | 207 | } |
@@ -250,20 +250,20 @@ discard block |
||
250 | 250 | function field_options( $field_options, $template_id = '', $field_id = '', $context = '', $input_type = '' ) { |
251 | 251 | |
252 | 252 | // If this is NOT the full address field, return default options. |
253 | - if( floor( $field_id ) !== floatval( $field_id ) ) { |
|
253 | + if ( floor( $field_id ) !== floatval( $field_id ) ) { |
|
254 | 254 | return $field_options; |
255 | 255 | } |
256 | 256 | |
257 | - if( 'edit' === $context ) { |
|
257 | + if ( 'edit' === $context ) { |
|
258 | 258 | return $field_options; |
259 | 259 | } |
260 | 260 | |
261 | 261 | $add_options = array(); |
262 | 262 | |
263 | - $add_options['show_map_link'] = array( |
|
263 | + $add_options[ 'show_map_link' ] = array( |
|
264 | 264 | 'type' => 'checkbox', |
265 | 265 | 'label' => __( 'Show Map Link:', 'gravityview' ), |
266 | - 'desc' => __('Display a "Map It" link below the address', 'gravityview'), |
|
266 | + 'desc' => __( 'Display a "Map It" link below the address', 'gravityview' ), |
|
267 | 267 | 'value' => true, |
268 | 268 | 'merge_tags' => false, |
269 | 269 | ); |
@@ -35,7 +35,7 @@ |
||
35 | 35 | $supports = array( 'title', 'revisions' ); |
36 | 36 | |
37 | 37 | if ( $is_hierarchical ) { |
38 | - $supports[] = 'page-attributes'; |
|
38 | + $supports[ ] = 'page-attributes'; |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | /** |
@@ -14,7 +14,7 @@ |
||
14 | 14 | |
15 | 15 | var $is_numeric = true; |
16 | 16 | |
17 | - var $search_operators = array( 'is', 'isnot', 'starts_with', 'ends_with' ); |
|
17 | + var $search_operators = array( 'is', 'isnot', 'starts_with', 'ends_with' ); |
|
18 | 18 | |
19 | 19 | var $group = 'pricing'; |
20 | 20 |