@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | * @return \GV\Field The field implementation from configuration (\GV\GF_Field, \GV\Internal_Field). |
167 | 167 | */ |
168 | 168 | public static function from_configuration( $configuration ) { |
169 | - if ( empty( $configuration['id'] ) ) { |
|
169 | + if ( empty( $configuration[ 'id' ] ) ) { |
|
170 | 170 | $field = new self(); |
171 | 171 | gravityview()->log->error( 'Trying to get field from configuration without a field ID.', array( 'data' => $configuration ) ); |
172 | 172 | $field->update_configuration( $configuration ); |
@@ -179,8 +179,8 @@ discard block |
||
179 | 179 | } else { |
180 | 180 | $trace = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS ); |
181 | 181 | } |
182 | - $trace = $trace[1]; |
|
183 | - if ( $trace['function'] == 'from_configuration' && $trace['class'] == __CLASS__ ) { |
|
182 | + $trace = $trace[ 1 ]; |
|
183 | + if ( $trace[ 'function' ] == 'from_configuration' && $trace[ 'class' ] == __CLASS__ ) { |
|
184 | 184 | $field = new self(); |
185 | 185 | gravityview()->log->error( 'Infinite loop protection tripped. Returning default class here.' ); |
186 | 186 | $field->update_configuration( $configuration ); |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | } |
189 | 189 | |
190 | 190 | /** @var \GV\GF_Field|\GV\Internal_Field $field_class Determine the field implementation to use, and try to use. */ |
191 | - $field_class = is_numeric( $configuration['id'] ) ? '\GV\GF_Field' : '\GV\Internal_Field'; |
|
191 | + $field_class = is_numeric( $configuration[ 'id' ] ) ? '\GV\GF_Field' : '\GV\Internal_Field'; |
|
192 | 192 | |
193 | 193 | /** |
194 | 194 | * @filter `gravityview/field/class` Filter the field class about to be created from the configuration. |
@@ -227,24 +227,24 @@ discard block |
||
227 | 227 | public function update_configuration( $configuration ) { |
228 | 228 | $configuration = wp_parse_args( $configuration, $this->as_configuration() ); |
229 | 229 | |
230 | - if ( $this->ID != $configuration['id'] ) { |
|
230 | + if ( $this->ID != $configuration[ 'id' ] ) { |
|
231 | 231 | /** Smelling trouble here... */ |
232 | 232 | gravityview()->log->warning( 'ID is being changed for {field_class} instance, but implementation is not. Use ::from_configuration instead', array( 'field_class', __CLASS__ ) ); |
233 | 233 | } |
234 | 234 | |
235 | - $this->ID = $configuration['id']; |
|
236 | - $this->label = $configuration['label']; |
|
237 | - $this->show_label = $configuration['show_label'] == '1'; |
|
238 | - $this->custom_label = $configuration['custom_label']; |
|
239 | - $this->custom_class = $configuration['custom_class']; |
|
240 | - $this->cap = $configuration['only_loggedin'] == '1' ? $configuration['only_loggedin_cap'] : ''; |
|
241 | - $this->search_filter = $configuration['search_filter'] == '1'; |
|
242 | - $this->show_as_link = $configuration['show_as_link'] == '1'; |
|
235 | + $this->ID = $configuration[ 'id' ]; |
|
236 | + $this->label = $configuration[ 'label' ]; |
|
237 | + $this->show_label = $configuration[ 'show_label' ] == '1'; |
|
238 | + $this->custom_label = $configuration[ 'custom_label' ]; |
|
239 | + $this->custom_class = $configuration[ 'custom_class' ]; |
|
240 | + $this->cap = $configuration[ 'only_loggedin' ] == '1' ? $configuration[ 'only_loggedin_cap' ] : ''; |
|
241 | + $this->search_filter = $configuration[ 'search_filter' ] == '1'; |
|
242 | + $this->show_as_link = $configuration[ 'show_as_link' ] == '1'; |
|
243 | 243 | |
244 | 244 | /** Shared among all field types (sort of). */ |
245 | 245 | $shared_configuration_keys = array( |
246 | 246 | 'id', 'label', 'show_label', 'custom_label', 'custom_class', |
247 | - 'only_loggedin' ,'only_loggedin_cap', 'search_filter', 'show_as_link', |
|
247 | + 'only_loggedin', 'only_loggedin_cap', 'search_filter', 'show_as_link', |
|
248 | 248 | ); |
249 | 249 | |
250 | 250 | /** Everything else goes into the properties for now. @todo subclasses! */ |
@@ -273,7 +273,7 @@ discard block |
||
273 | 273 | |
274 | 274 | /** A custom label is available. */ |
275 | 275 | if ( ! empty( $this->custom_label ) ) { |
276 | - return \GravityView_API::replace_variables( $this->custom_label, $source ? $source->form ? : null : null, $entry ? $entry->as_entry() : null ); |
|
276 | + return \GravityView_API::replace_variables( $this->custom_label, $source ? $source->form ?: null : null, $entry ? $entry->as_entry() : null ); |
|
277 | 277 | } |
278 | 278 | |
279 | 279 | return ''; |
@@ -350,7 +350,7 @@ discard block |
||
350 | 350 | * @return mixed|null The value for the given configuration key, null if doesn't exist. |
351 | 351 | */ |
352 | 352 | public function __get( $key ) { |
353 | - switch( $key ) { |
|
353 | + switch ( $key ) { |
|
354 | 354 | default: |
355 | 355 | if ( isset( $this->configuration[ $key ] ) ) { |
356 | 356 | return $this->configuration[ $key ]; |
@@ -368,7 +368,7 @@ discard block |
||
368 | 368 | * @return boolean Whether this $key is set or not. |
369 | 369 | */ |
370 | 370 | public function __isset( $key ) { |
371 | - switch( $key ) { |
|
371 | + switch ( $key ) { |
|
372 | 372 | default: |
373 | 373 | return isset( $this->configuration[ $key ] ); |
374 | 374 | } |
@@ -134,28 +134,28 @@ discard block |
||
134 | 134 | */ |
135 | 135 | public function add_network_menu() { |
136 | 136 | |
137 | - if ( ! gravityview()->plugin->is_network_activated() ) { |
|
137 | + if ( ! gravityview()->plugin->is_network_activated() ) { |
|
138 | 138 | return; |
139 | 139 | } |
140 | 140 | |
141 | - add_menu_page( __( 'Settings', 'gravityview' ), __( 'GravityView', 'gravityview' ), $this->_capabilities_app_settings, "{$this->_slug}_settings", array( $this, 'app_tab_page' ), 'none' ); |
|
141 | + add_menu_page( __( 'Settings', 'gravityview' ), __( 'GravityView', 'gravityview' ), $this->_capabilities_app_settings, "{$this->_slug}_settings", array( $this, 'app_tab_page' ), 'none' ); |
|
142 | 142 | } |
143 | 143 | |
144 | 144 | /** |
145 | - * Uninstall all traces of GravityView |
|
146 | - * |
|
147 | - * Note: method is public because parent method is public |
|
148 | - * |
|
145 | + * Uninstall all traces of GravityView |
|
146 | + * |
|
147 | + * Note: method is public because parent method is public |
|
148 | + * |
|
149 | 149 | * @return bool |
150 | 150 | */ |
151 | 151 | public function uninstall() { |
152 | 152 | gravityview()->plugin->uninstall(); |
153 | 153 | |
154 | 154 | /** |
155 | - * Set the path so that Gravity Forms can de-activate GravityView |
|
156 | - * @see GFAddOn::uninstall_addon |
|
157 | - * @uses deactivate_plugins() |
|
158 | - */ |
|
155 | + * Set the path so that Gravity Forms can de-activate GravityView |
|
156 | + * @see GFAddOn::uninstall_addon |
|
157 | + * @uses deactivate_plugins() |
|
158 | + */ |
|
159 | 159 | $this->_path = GRAVITYVIEW_FILE; |
160 | 160 | |
161 | 161 | return true; |
@@ -185,42 +185,42 @@ discard block |
||
185 | 185 | } |
186 | 186 | |
187 | 187 | /** |
188 | - * Get an array of reasons why the plugin might be uninstalled |
|
189 | - * |
|
190 | - * @since 1.17.5 |
|
191 | - * |
|
188 | + * Get an array of reasons why the plugin might be uninstalled |
|
189 | + * |
|
190 | + * @since 1.17.5 |
|
191 | + * |
|
192 | 192 | * @return array Array of reasons with the label and followup questions for each uninstall reason |
193 | 193 | */ |
194 | 194 | private function get_uninstall_reasons() { |
195 | 195 | $reasons = array( |
196 | 196 | 'will-continue' => array( |
197 | - 'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ), |
|
198 | - ), |
|
197 | + 'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ), |
|
198 | + ), |
|
199 | 199 | 'no-longer-need' => array( |
200 | - 'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ), |
|
201 | - ), |
|
200 | + 'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ), |
|
201 | + ), |
|
202 | 202 | 'doesnt-work' => array( |
203 | - 'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ), |
|
204 | - ), |
|
203 | + 'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ), |
|
204 | + ), |
|
205 | 205 | 'found-other' => array( |
206 | - 'label' => esc_html__( 'I found a better plugin', 'gravityview' ), |
|
207 | - 'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ), |
|
208 | - ), |
|
206 | + 'label' => esc_html__( 'I found a better plugin', 'gravityview' ), |
|
207 | + 'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ), |
|
208 | + ), |
|
209 | 209 | 'other' => array( |
210 | - 'label' => esc_html__( 'Other', 'gravityview' ), |
|
211 | - ), |
|
210 | + 'label' => esc_html__( 'Other', 'gravityview' ), |
|
211 | + ), |
|
212 | 212 | ); |
213 | 213 | |
214 | 214 | shuffle( $reasons ); |
215 | 215 | |
216 | 216 | return $reasons; |
217 | - } |
|
217 | + } |
|
218 | 218 | |
219 | 219 | /** |
220 | - * Display a feedback form when the plugin is uninstalled |
|
221 | - * |
|
222 | - * @since 1.17.5 |
|
223 | - * |
|
220 | + * Display a feedback form when the plugin is uninstalled |
|
221 | + * |
|
222 | + * @since 1.17.5 |
|
223 | + * |
|
224 | 224 | * @return string HTML of the uninstallation form |
225 | 225 | */ |
226 | 226 | public function uninstall_form() { |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | <h2><?php esc_html_e( 'Why did you uninstall GravityView?', 'gravityview' ); ?></h2> |
301 | 301 | <ul> |
302 | 302 | <?php |
303 | - $reasons = $this->get_uninstall_reasons(); |
|
303 | + $reasons = $this->get_uninstall_reasons(); |
|
304 | 304 | foreach ( $reasons as $reason ) { |
305 | 305 | printf( '<li><label><input name="reason" type="radio" value="other" data-followup="%s"> %s</label></li>', Utils::get( $reason, 'followup' ), Utils::get( $reason, 'label' ) ); |
306 | 306 | } |
@@ -394,12 +394,12 @@ discard block |
||
394 | 394 | } |
395 | 395 | |
396 | 396 | public function app_settings_tab() { |
397 | - parent::app_settings_tab(); |
|
397 | + parent::app_settings_tab(); |
|
398 | 398 | |
399 | 399 | if ( $this->maybe_uninstall() ) { |
400 | - echo $this->uninstall_form(); |
|
400 | + echo $this->uninstall_form(); |
|
401 | 401 | } |
402 | - } |
|
402 | + } |
|
403 | 403 | |
404 | 404 | /** |
405 | 405 | * The Settings title |
@@ -558,8 +558,8 @@ discard block |
||
558 | 558 | type="' . $field['type'] . '" |
559 | 559 | name="' . esc_attr( $name ) . '" |
560 | 560 | value="' . $value . '" ' . |
561 | - implode( ' ', $attributes ) . |
|
562 | - ' />'; |
|
561 | + implode( ' ', $attributes ) . |
|
562 | + ' />'; |
|
563 | 563 | |
564 | 564 | if ( $echo ) { |
565 | 565 | echo $html; |
@@ -577,12 +577,12 @@ discard block |
||
577 | 577 | } |
578 | 578 | |
579 | 579 | /** |
580 | - * Check whether GravityView is being saved |
|
581 | - * |
|
582 | - * The generic is_save_postback() is true for all addons |
|
583 | - * |
|
584 | - * @since 2.0.8 |
|
585 | - * |
|
580 | + * Check whether GravityView is being saved |
|
581 | + * |
|
582 | + * The generic is_save_postback() is true for all addons |
|
583 | + * |
|
584 | + * @since 2.0.8 |
|
585 | + * |
|
586 | 586 | * @return bool |
587 | 587 | */ |
588 | 588 | public function is_save_postback() { |
@@ -596,16 +596,16 @@ discard block |
||
596 | 596 | */ |
597 | 597 | public function license_key_notice() { |
598 | 598 | |
599 | - if( $this->is_save_postback() ) { |
|
600 | - $settings = $this->get_posted_settings(); |
|
601 | - $license_key = \GV\Utils::get( $settings, 'license_key' ); |
|
602 | - $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' ); |
|
603 | - } else { |
|
604 | - $license_status = $this->get( 'license_key_status', 'inactive' ); |
|
605 | - $license_key = $this->get( 'license_key' ); |
|
606 | - } |
|
599 | + if( $this->is_save_postback() ) { |
|
600 | + $settings = $this->get_posted_settings(); |
|
601 | + $license_key = \GV\Utils::get( $settings, 'license_key' ); |
|
602 | + $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' ); |
|
603 | + } else { |
|
604 | + $license_status = $this->get( 'license_key_status', 'inactive' ); |
|
605 | + $license_key = $this->get( 'license_key' ); |
|
606 | + } |
|
607 | 607 | |
608 | - $license_id = empty( $license_key ) ? 'license' : $license_key; |
|
608 | + $license_id = empty( $license_key ) ? 'license' : $license_key; |
|
609 | 609 | |
610 | 610 | $message = esc_html__( 'Your GravityView license %s. This means you’re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview' ); |
611 | 611 | |
@@ -622,7 +622,7 @@ discard block |
||
622 | 622 | $update_below = false; |
623 | 623 | $primary_button_link = admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ); |
624 | 624 | |
625 | - switch ( $license_status ) { |
|
625 | + switch ( $license_status ) { |
|
626 | 626 | /** @since 1.17 */ |
627 | 627 | case 'expired': |
628 | 628 | $title = __( 'Expired License', 'gravityview' ); |
@@ -660,13 +660,13 @@ discard block |
||
660 | 660 | return; |
661 | 661 | } |
662 | 662 | |
663 | - \GravityView_Admin_Notices::add_notice( array( |
|
664 | - 'message' => $message, |
|
665 | - 'class' => 'notice notice-warning', |
|
666 | - 'title' => $title, |
|
667 | - 'cap' => 'gravityview_edit_settings', |
|
668 | - 'dismiss' => sha1( $license_status . '_' . $license_id . '_' . date( 'z' ) ), // Show every day, instead of every 8 weeks (which is the default) |
|
669 | - ) ); |
|
663 | + \GravityView_Admin_Notices::add_notice( array( |
|
664 | + 'message' => $message, |
|
665 | + 'class' => 'notice notice-warning', |
|
666 | + 'title' => $title, |
|
667 | + 'cap' => 'gravityview_edit_settings', |
|
668 | + 'dismiss' => sha1( $license_status . '_' . $license_id . '_' . date( 'z' ) ), // Show every day, instead of every 8 weeks (which is the default) |
|
669 | + ) ); |
|
670 | 670 | } |
671 | 671 | |
672 | 672 | /** |
@@ -680,12 +680,12 @@ discard block |
||
680 | 680 | } |
681 | 681 | |
682 | 682 | /** |
683 | - * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason. |
|
684 | - * |
|
685 | - * @since 1.21.5 |
|
686 | - * |
|
687 | - * @see GFAddOn::scripts() |
|
688 | - * |
|
683 | + * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason. |
|
684 | + * |
|
685 | + * @since 1.21.5 |
|
686 | + * |
|
687 | + * @see GFAddOn::scripts() |
|
688 | + * |
|
689 | 689 | * @return array Array of scripts |
690 | 690 | */ |
691 | 691 | public function scripts() { |
@@ -694,10 +694,10 @@ discard block |
||
694 | 694 | $scripts[] = array( |
695 | 695 | 'handle' => 'gform_tooltip_init', |
696 | 696 | 'enqueue' => array( |
697 | - array( |
|
698 | - 'admin_page' => array( 'app_settings' ) |
|
699 | - ) |
|
700 | - ) |
|
697 | + array( |
|
698 | + 'admin_page' => array( 'app_settings' ) |
|
699 | + ) |
|
700 | + ) |
|
701 | 701 | ); |
702 | 702 | |
703 | 703 | return $scripts; |
@@ -715,10 +715,10 @@ discard block |
||
715 | 715 | 'src' => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ), |
716 | 716 | 'version' => Plugin::$version, |
717 | 717 | 'deps' => array( |
718 | - 'gform_admin', |
|
718 | + 'gform_admin', |
|
719 | 719 | 'gaddon_form_settings_css', |
720 | - 'gform_tooltip', |
|
721 | - 'gform_font_awesome', |
|
720 | + 'gform_tooltip', |
|
721 | + 'gform_font_awesome', |
|
722 | 722 | ), |
723 | 723 | 'enqueue' => array( |
724 | 724 | array( 'admin_page' => array( |
@@ -886,7 +886,7 @@ discard block |
||
886 | 886 | array( |
887 | 887 | 'label' => esc_html__( 'Show me beta versions if they are available.', 'gravityview' ), |
888 | 888 | 'value' => '1', |
889 | - 'name' => 'beta', |
|
889 | + 'name' => 'beta', |
|
890 | 890 | ), |
891 | 891 | ), |
892 | 892 | 'description' => __( 'You will have early access to the latest GravityView features and improvements. There may be bugs! If you encounter an issue, help make GravityView better by reporting it!', 'gravityview' ), |
@@ -924,38 +924,38 @@ discard block |
||
924 | 924 | |
925 | 925 | if ( empty( $field['disabled'] ) ) { |
926 | 926 | unset( $field['disabled'] ); |
927 | - } |
|
927 | + } |
|
928 | 928 | } |
929 | 929 | |
930 | - $sections = array( |
|
931 | - array( |
|
932 | - 'description' => sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), Plugin::$version ) ), |
|
933 | - 'fields' => $fields, |
|
934 | - ) |
|
935 | - ); |
|
930 | + $sections = array( |
|
931 | + array( |
|
932 | + 'description' => sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), Plugin::$version ) ), |
|
933 | + 'fields' => $fields, |
|
934 | + ) |
|
935 | + ); |
|
936 | 936 | |
937 | - // custom 'update settings' button |
|
938 | - $button = array( |
|
939 | - 'class' => 'button button-primary button-hero', |
|
940 | - 'type' => 'save', |
|
941 | - ); |
|
937 | + // custom 'update settings' button |
|
938 | + $button = array( |
|
939 | + 'class' => 'button button-primary button-hero', |
|
940 | + 'type' => 'save', |
|
941 | + ); |
|
942 | 942 | |
943 | 943 | if ( $disabled_attribute ) { |
944 | 944 | $button['disabled'] = $disabled_attribute; |
945 | 945 | } |
946 | 946 | |
947 | - /** |
|
948 | - * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page |
|
949 | - * Extensions can tap in here to insert their own section and settings. |
|
950 | - * <code> |
|
951 | - * $sections[] = array( |
|
952 | - * 'title' => __( 'GravityView My Extension Settings', 'gravityview' ), |
|
953 | - * 'fields' => $settings, |
|
954 | - * ); |
|
955 | - * </code> |
|
956 | - * @param array $extension_settings Empty array, ready for extension settings! |
|
957 | - */ |
|
958 | - $extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() ); |
|
947 | + /** |
|
948 | + * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page |
|
949 | + * Extensions can tap in here to insert their own section and settings. |
|
950 | + * <code> |
|
951 | + * $sections[] = array( |
|
952 | + * 'title' => __( 'GravityView My Extension Settings', 'gravityview' ), |
|
953 | + * 'fields' => $settings, |
|
954 | + * ); |
|
955 | + * </code> |
|
956 | + * @param array $extension_settings Empty array, ready for extension settings! |
|
957 | + */ |
|
958 | + $extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() ); |
|
959 | 959 | |
960 | 960 | // If there are extensions, add a section for them |
961 | 961 | if ( ! empty( $extension_sections ) ) { |
@@ -968,13 +968,13 @@ discard block |
||
968 | 968 | } |
969 | 969 | } |
970 | 970 | |
971 | - $k = count( $extension_sections ) - 1 ; |
|
972 | - $extension_sections[ $k ]['fields'][] = $button; |
|
971 | + $k = count( $extension_sections ) - 1 ; |
|
972 | + $extension_sections[ $k ]['fields'][] = $button; |
|
973 | 973 | $sections = array_merge( $sections, $extension_sections ); |
974 | 974 | } else { |
975 | - // add the 'update settings' button to the general section |
|
976 | - $sections[0]['fields'][] = $button; |
|
977 | - } |
|
975 | + // add the 'update settings' button to the general section |
|
976 | + $sections[0]['fields'][] = $button; |
|
977 | + } |
|
978 | 978 | |
979 | 979 | return $sections; |
980 | 980 | } |
@@ -1028,9 +1028,9 @@ discard block |
||
1028 | 1028 | */ |
1029 | 1029 | protected function settings_edd_license( $field, $echo = true ) { |
1030 | 1030 | |
1031 | - if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) { |
|
1032 | - $field['input_type'] = 'password'; |
|
1033 | - } |
|
1031 | + if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) { |
|
1032 | + $field['input_type'] = 'password'; |
|
1033 | + } |
|
1034 | 1034 | |
1035 | 1035 | $text = $this->settings_text( $field, false ); |
1036 | 1036 | |
@@ -1047,9 +1047,9 @@ discard block |
||
1047 | 1047 | |
1048 | 1048 | /** |
1049 | 1049 | * Allow pure HTML settings row |
1050 | - * |
|
1051 | - * @since 2.0.6 |
|
1052 | - * |
|
1050 | + * |
|
1051 | + * @since 2.0.6 |
|
1052 | + * |
|
1053 | 1053 | * @param array $field |
1054 | 1054 | * @param bool $echo Whether to echo the |
1055 | 1055 | * |
@@ -1115,19 +1115,19 @@ discard block |
||
1115 | 1115 | } |
1116 | 1116 | |
1117 | 1117 | /** |
1118 | - * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it |
|
1119 | - * |
|
1120 | - * Converts `$field['description']` to `$field['gv_description']` |
|
1121 | - * Converts `$field['subtitle']` to `$field['description']` |
|
1122 | - * |
|
1123 | - * @see \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description` |
|
1124 | - * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description |
|
1125 | - * |
|
1126 | - * @since 1.21.5.2 |
|
1127 | - * |
|
1118 | + * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it |
|
1119 | + * |
|
1120 | + * Converts `$field['description']` to `$field['gv_description']` |
|
1121 | + * Converts `$field['subtitle']` to `$field['description']` |
|
1122 | + * |
|
1123 | + * @see \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description` |
|
1124 | + * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description |
|
1125 | + * |
|
1126 | + * @since 1.21.5.2 |
|
1127 | + * |
|
1128 | 1128 | * @param array $field |
1129 | - * |
|
1130 | - * @return void |
|
1129 | + * |
|
1130 | + * @return void |
|
1131 | 1131 | */ |
1132 | 1132 | public function single_setting_row( $field ) { |
1133 | 1133 | $field['gv_description'] = Utils::get( $field, 'description' ); |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | * @return array |
103 | 103 | */ |
104 | 104 | public function modify_app_settings_menu_title( $setting_tabs ) { |
105 | - $setting_tabs[0]['label'] = __( 'GravityView Settings', 'gravityview' ); |
|
105 | + $setting_tabs[ 0 ][ 'label' ] = __( 'GravityView Settings', 'gravityview' ); |
|
106 | 106 | return $setting_tabs; |
107 | 107 | } |
108 | 108 | |
@@ -308,15 +308,15 @@ discard block |
||
308 | 308 | </ul> |
309 | 309 | <div class="gv-followup widefat"> |
310 | 310 | <p><strong><label for="gv-reason-details"><?php esc_html_e( 'Comments', 'gravityview' ); ?></label></strong></p> |
311 | - <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview') ?>" placeholder="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview'); ?>" class="large-text"></textarea> |
|
311 | + <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ) ?>" placeholder="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ); ?>" class="large-text"></textarea> |
|
312 | 312 | </div> |
313 | 313 | <div class="scale-description"> |
314 | 314 | <p><strong><?php esc_html_e( 'How likely are you to recommend GravityView?', 'gravityview' ); ?></strong></p> |
315 | 315 | <ul class="inline"> |
316 | 316 | <?php |
317 | 317 | $i = 0; |
318 | - while( $i < 11 ) { |
|
319 | - echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_'.$i.'" value="'.$i.'" type="radio"> '.$i.'</label></li>'; |
|
318 | + while ( $i < 11 ) { |
|
319 | + echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_' . $i . '" value="' . $i . '" type="radio"> ' . $i . '</label></li>'; |
|
320 | 320 | $i++; |
321 | 321 | } |
322 | 322 | ?> |
@@ -538,15 +538,15 @@ discard block |
||
538 | 538 | * @return string The HTML |
539 | 539 | */ |
540 | 540 | public function as_html( $field, $echo = true ) { |
541 | - $field['type'] = ( isset( $field['type'] ) && in_array( $field['type'], array( 'submit','reset','button' ) ) ) ? $field['type'] : 'submit'; |
|
541 | + $field[ 'type' ] = ( isset( $field[ 'type' ] ) && in_array( $field[ 'type' ], array( 'submit', 'reset', 'button' ) ) ) ? $field[ 'type' ] : 'submit'; |
|
542 | 542 | |
543 | 543 | $attributes = $this->get_field_attributes( $field ); |
544 | 544 | $default_value = Utils::get( $field, 'value', Utils::get( $field, 'default_value' ) ); |
545 | - $value = $this->get( $field['name'], $default_value ); |
|
545 | + $value = $this->get( $field[ 'name' ], $default_value ); |
|
546 | 546 | |
547 | 547 | |
548 | - $attributes['class'] = isset( $attributes['class'] ) ? esc_attr( $attributes['class'] ) : 'button-primary gfbutton'; |
|
549 | - $name = ( $field['name'] === 'gform-settings-save' ) ? $field['name'] : '_gaddon_setting_' . $field['name']; |
|
548 | + $attributes[ 'class' ] = isset( $attributes[ 'class' ] ) ? esc_attr( $attributes[ 'class' ] ) : 'button-primary gfbutton'; |
|
549 | + $name = ( $field[ 'name' ] === 'gform-settings-save' ) ? $field[ 'name' ] : '_gaddon_setting_' . $field[ 'name' ]; |
|
550 | 550 | |
551 | 551 | if ( empty( $value ) ) { |
552 | 552 | $value = __( 'Update Settings', 'gravityview' ); |
@@ -555,7 +555,7 @@ discard block |
||
555 | 555 | $attributes = $this->get_field_attributes( $field ); |
556 | 556 | |
557 | 557 | $html = '<input |
558 | - type="' . $field['type'] . '" |
|
558 | + type="' . $field[ 'type' ] . '" |
|
559 | 559 | name="' . esc_attr( $name ) . '" |
560 | 560 | value="' . $value . '" ' . |
561 | 561 | implode( ' ', $attributes ) . |
@@ -586,7 +586,7 @@ discard block |
||
586 | 586 | * @return bool |
587 | 587 | */ |
588 | 588 | public function is_save_postback() { |
589 | - return isset( $_POST['gform-settings-save'] ) && isset( $_POST['_gravityview_save_settings_nonce'] ); |
|
589 | + return isset( $_POST[ 'gform-settings-save' ] ) && isset( $_POST[ '_gravityview_save_settings_nonce' ] ); |
|
590 | 590 | } |
591 | 591 | |
592 | 592 | /** |
@@ -596,7 +596,7 @@ discard block |
||
596 | 596 | */ |
597 | 597 | public function license_key_notice() { |
598 | 598 | |
599 | - if( $this->is_save_postback() ) { |
|
599 | + if ( $this->is_save_postback() ) { |
|
600 | 600 | $settings = $this->get_posted_settings(); |
601 | 601 | $license_key = \GV\Utils::get( $settings, 'license_key' ); |
602 | 602 | $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' ); |
@@ -617,7 +617,7 @@ discard block |
||
617 | 617 | * but didn't want to mess up the translation strings for the translators. |
618 | 618 | */ |
619 | 619 | $message = mb_substr( $message, 0, mb_strlen( $message ) - 1 ); |
620 | - $title = __( 'Inactive License', 'gravityview'); |
|
620 | + $title = __( 'Inactive License', 'gravityview' ); |
|
621 | 621 | $status = ''; |
622 | 622 | $update_below = false; |
623 | 623 | $primary_button_link = admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ); |
@@ -647,7 +647,7 @@ discard block |
||
647 | 647 | $update_below = __( 'Activate your license key below.', 'gravityview' ); |
648 | 648 | break; |
649 | 649 | } |
650 | - $url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content='.$license_status.'&utm_campaign=Admin%20Notice'; |
|
650 | + $url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content=' . $license_status . '&utm_campaign=Admin%20Notice'; |
|
651 | 651 | |
652 | 652 | // Show a different notice on settings page for inactive licenses (hide the buttons) |
653 | 653 | if ( $update_below && gravityview()->request->is_admin( '', 'settings' ) ) { |
@@ -691,7 +691,7 @@ discard block |
||
691 | 691 | public function scripts() { |
692 | 692 | $scripts = parent::scripts(); |
693 | 693 | |
694 | - $scripts[] = array( |
|
694 | + $scripts[ ] = array( |
|
695 | 695 | 'handle' => 'gform_tooltip_init', |
696 | 696 | 'enqueue' => array( |
697 | 697 | array( |
@@ -710,7 +710,7 @@ discard block |
||
710 | 710 | public function styles() { |
711 | 711 | $styles = parent::styles(); |
712 | 712 | |
713 | - $styles[] = array( |
|
713 | + $styles[ ] = array( |
|
714 | 714 | 'handle' => 'gravityview_settings', |
715 | 715 | 'src' => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ), |
716 | 716 | 'version' => Plugin::$version, |
@@ -741,7 +741,7 @@ discard block |
||
741 | 741 | * If multisite and not network admin, we don't want the settings to show. |
742 | 742 | * @since 1.7.6 |
743 | 743 | */ |
744 | - $show_submenu = ( ! is_multisite() ) || is_main_site() || ( ! gravityview()->plugin->is_network_activated() ) || ( is_network_admin() && gravityview()->plugin->is_network_activated() ); |
|
744 | + $show_submenu = ( ! is_multisite() ) || is_main_site() || ( ! gravityview()->plugin->is_network_activated() ) || ( is_network_admin() && gravityview()->plugin->is_network_activated() ); |
|
745 | 745 | |
746 | 746 | /** |
747 | 747 | * Override whether to show the Settings menu on a per-blog basis. |
@@ -789,26 +789,26 @@ discard block |
||
789 | 789 | 'label' => __( 'License Key', 'gravityview' ), |
790 | 790 | 'description' => __( 'Enter the license key that was sent to you on purchase. This enables plugin updates & support.', 'gravityview' ) . $this->get_license_handler()->license_details( $this->get_app_setting( 'license_key_response' ) ), |
791 | 791 | 'type' => 'edd_license', |
792 | - 'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ), |
|
792 | + 'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ), |
|
793 | 793 | 'data-pending-text' => __( 'Verifying license…', 'gravityview' ), |
794 | - 'default_value' => $default_settings['license_key'], |
|
794 | + 'default_value' => $default_settings[ 'license_key' ], |
|
795 | 795 | 'class' => ( '' == $this->get( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key', |
796 | 796 | ), |
797 | 797 | array( |
798 | 798 | 'name' => 'license_key_response', |
799 | - 'default_value' => $default_settings['license_key_response'], |
|
799 | + 'default_value' => $default_settings[ 'license_key_response' ], |
|
800 | 800 | 'type' => 'hidden', |
801 | 801 | ), |
802 | 802 | array( |
803 | 803 | 'name' => 'license_key_status', |
804 | - 'default_value' => $default_settings['license_key_status'], |
|
804 | + 'default_value' => $default_settings[ 'license_key_status' ], |
|
805 | 805 | 'type' => 'hidden', |
806 | 806 | ), |
807 | 807 | array( |
808 | 808 | 'name' => 'support-email', |
809 | 809 | 'type' => 'text', |
810 | 810 | 'validate' => 'email', |
811 | - 'default_value' => $default_settings['support-email'], |
|
811 | + 'default_value' => $default_settings[ 'support-email' ], |
|
812 | 812 | 'label' => __( 'Support Email', 'gravityview' ), |
813 | 813 | 'description' => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ), |
814 | 814 | 'class' => 'code regular-text', |
@@ -820,7 +820,7 @@ discard block |
||
820 | 820 | 'name' => 'support_port', |
821 | 821 | 'type' => 'radio', |
822 | 822 | 'label' => __( 'Show Support Port?', 'gravityview' ), |
823 | - 'default_value' => $default_settings['support_port'], |
|
823 | + 'default_value' => $default_settings[ 'support_port' ], |
|
824 | 824 | 'horizontal' => 1, |
825 | 825 | 'choices' => array( |
826 | 826 | array( |
@@ -839,7 +839,7 @@ discard block |
||
839 | 839 | 'name' => 'no-conflict-mode', |
840 | 840 | 'type' => 'radio', |
841 | 841 | 'label' => __( 'No-Conflict Mode', 'gravityview' ), |
842 | - 'default_value' => $default_settings['no-conflict-mode'], |
|
842 | + 'default_value' => $default_settings[ 'no-conflict-mode' ], |
|
843 | 843 | 'horizontal' => 1, |
844 | 844 | 'choices' => array( |
845 | 845 | array( |
@@ -861,7 +861,7 @@ discard block |
||
861 | 861 | 'name' => 'rest_api', |
862 | 862 | 'type' => 'radio', |
863 | 863 | 'label' => __( 'REST API', 'gravityview' ), |
864 | - 'default_value' => $default_settings['rest_api'], |
|
864 | + 'default_value' => $default_settings[ 'rest_api' ], |
|
865 | 865 | 'horizontal' => 1, |
866 | 866 | 'choices' => array( |
867 | 867 | array( |
@@ -880,7 +880,7 @@ discard block |
||
880 | 880 | 'name' => 'beta', |
881 | 881 | 'type' => 'checkbox', |
882 | 882 | 'label' => __( 'Become a Beta Tester', 'gravityview' ), |
883 | - 'default_value' => $default_settings['beta'], |
|
883 | + 'default_value' => $default_settings[ 'beta' ], |
|
884 | 884 | 'horizontal' => 1, |
885 | 885 | 'choices' => array( |
886 | 886 | array( |
@@ -913,17 +913,17 @@ discard block |
||
913 | 913 | * @since 1.7.4 |
914 | 914 | */ |
915 | 915 | foreach ( $fields as &$field ) { |
916 | - $field['name'] = isset( $field['name'] ) ? $field['name'] : Utils::get( $field, 'id' ); |
|
917 | - $field['label'] = isset( $field['label'] ) ? $field['label'] : Utils::get( $field, 'title' ); |
|
918 | - $field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : Utils::get( $field, 'default' ); |
|
919 | - $field['description'] = isset( $field['description'] ) ? $field['description'] : Utils::get( $field, 'subtitle' ); |
|
916 | + $field[ 'name' ] = isset( $field[ 'name' ] ) ? $field[ 'name' ] : Utils::get( $field, 'id' ); |
|
917 | + $field[ 'label' ] = isset( $field[ 'label' ] ) ? $field[ 'label' ] : Utils::get( $field, 'title' ); |
|
918 | + $field[ 'default_value' ] = isset( $field[ 'default_value' ] ) ? $field[ 'default_value' ] : Utils::get( $field, 'default' ); |
|
919 | + $field[ 'description' ] = isset( $field[ 'description' ] ) ? $field[ 'description' ] : Utils::get( $field, 'subtitle' ); |
|
920 | 920 | |
921 | 921 | if ( $disabled_attribute ) { |
922 | - $field['disabled'] = $disabled_attribute; |
|
922 | + $field[ 'disabled' ] = $disabled_attribute; |
|
923 | 923 | } |
924 | 924 | |
925 | - if ( empty( $field['disabled'] ) ) { |
|
926 | - unset( $field['disabled'] ); |
|
925 | + if ( empty( $field[ 'disabled' ] ) ) { |
|
926 | + unset( $field[ 'disabled' ] ); |
|
927 | 927 | } |
928 | 928 | } |
929 | 929 | |
@@ -941,7 +941,7 @@ discard block |
||
941 | 941 | ); |
942 | 942 | |
943 | 943 | if ( $disabled_attribute ) { |
944 | - $button['disabled'] = $disabled_attribute; |
|
944 | + $button[ 'disabled' ] = $disabled_attribute; |
|
945 | 945 | } |
946 | 946 | |
947 | 947 | /** |
@@ -960,20 +960,20 @@ discard block |
||
960 | 960 | // If there are extensions, add a section for them |
961 | 961 | if ( ! empty( $extension_sections ) ) { |
962 | 962 | |
963 | - if( $disabled_attribute ) { |
|
963 | + if ( $disabled_attribute ) { |
|
964 | 964 | foreach ( $extension_sections as &$section ) { |
965 | - foreach ( $section['fields'] as &$field ) { |
|
966 | - $field['disabled'] = $disabled_attribute; |
|
965 | + foreach ( $section[ 'fields' ] as &$field ) { |
|
966 | + $field[ 'disabled' ] = $disabled_attribute; |
|
967 | 967 | } |
968 | 968 | } |
969 | 969 | } |
970 | 970 | |
971 | - $k = count( $extension_sections ) - 1 ; |
|
972 | - $extension_sections[ $k ]['fields'][] = $button; |
|
971 | + $k = count( $extension_sections ) - 1; |
|
972 | + $extension_sections[ $k ][ 'fields' ][ ] = $button; |
|
973 | 973 | $sections = array_merge( $sections, $extension_sections ); |
974 | 974 | } else { |
975 | 975 | // add the 'update settings' button to the general section |
976 | - $sections[0]['fields'][] = $button; |
|
976 | + $sections[ 0 ][ 'fields' ][ ] = $button; |
|
977 | 977 | } |
978 | 978 | |
979 | 979 | return $sections; |
@@ -1029,7 +1029,7 @@ discard block |
||
1029 | 1029 | protected function settings_edd_license( $field, $echo = true ) { |
1030 | 1030 | |
1031 | 1031 | if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) { |
1032 | - $field['input_type'] = 'password'; |
|
1032 | + $field[ 'input_type' ] = 'password'; |
|
1033 | 1033 | } |
1034 | 1034 | |
1035 | 1035 | $text = $this->settings_text( $field, false ); |
@@ -1078,7 +1078,7 @@ discard block |
||
1078 | 1078 | public function single_setting_row_html( $field ) { |
1079 | 1079 | ?> |
1080 | 1080 | |
1081 | - <tr id="gaddon-setting-row-<?php echo esc_attr( $field['name'] ); ?>"> |
|
1081 | + <tr id="gaddon-setting-row-<?php echo esc_attr( $field[ 'name' ] ); ?>"> |
|
1082 | 1082 | <td colspan="2"> |
1083 | 1083 | <?php $this->single_setting( $field ); ?> |
1084 | 1084 | </td> |
@@ -1096,10 +1096,10 @@ discard block |
||
1096 | 1096 | * @return string |
1097 | 1097 | */ |
1098 | 1098 | public function settings_save( $field, $echo = true ) { |
1099 | - $field['type'] = 'submit'; |
|
1100 | - $field['name'] = 'gform-settings-save'; |
|
1101 | - $field['class'] = isset( $field['class'] ) ? $field['class'] : 'button-primary gfbutton'; |
|
1102 | - $field['value'] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) ); |
|
1099 | + $field[ 'type' ] = 'submit'; |
|
1100 | + $field[ 'name' ] = 'gform-settings-save'; |
|
1101 | + $field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] : 'button-primary gfbutton'; |
|
1102 | + $field[ 'value' ] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) ); |
|
1103 | 1103 | |
1104 | 1104 | $output = $this->settings_submit( $field, false ); |
1105 | 1105 | |
@@ -1130,8 +1130,8 @@ discard block |
||
1130 | 1130 | * @return void |
1131 | 1131 | */ |
1132 | 1132 | public function single_setting_row( $field ) { |
1133 | - $field['gv_description'] = Utils::get( $field, 'description' ); |
|
1134 | - $field['description'] = Utils::get( $field, 'subtitle' ); |
|
1133 | + $field[ 'gv_description' ] = Utils::get( $field, 'description' ); |
|
1134 | + $field[ 'description' ] = Utils::get( $field, 'subtitle' ); |
|
1135 | 1135 | parent::single_setting_row( $field ); |
1136 | 1136 | } |
1137 | 1137 | |
@@ -1143,7 +1143,7 @@ discard block |
||
1143 | 1143 | public function single_setting_label( $field ) { |
1144 | 1144 | parent::single_setting_label( $field ); |
1145 | 1145 | if ( $description = Utils::get( $field, 'gv_description' ) ) { |
1146 | - echo '<span class="description">'. $description .'</span>'; |
|
1146 | + echo '<span class="description">' . $description . '</span>'; |
|
1147 | 1147 | } |
1148 | 1148 | } |
1149 | 1149 | |
@@ -1183,10 +1183,10 @@ discard block |
||
1183 | 1183 | // then we assume it's changed. If it's changed, unset the status and the previous response. |
1184 | 1184 | if ( ! $added_message && ( $local_key !== $response_key ) ) { |
1185 | 1185 | |
1186 | - unset( $posted_settings['license_key_response'] ); |
|
1187 | - unset( $posted_settings['license_key_status'] ); |
|
1186 | + unset( $posted_settings[ 'license_key_response' ] ); |
|
1187 | + unset( $posted_settings[ 'license_key_status' ] ); |
|
1188 | 1188 | |
1189 | - \GFCommon::add_error_message( __('The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) ); |
|
1189 | + \GFCommon::add_error_message( __( 'The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) ); |
|
1190 | 1190 | |
1191 | 1191 | $added_message = true; |
1192 | 1192 | } |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | |
77 | 77 | /** |
78 | 78 | * Render the page size widget |
79 | - * |
|
79 | + * |
|
80 | 80 | * @param array $widget_args The Widget shortcode args. |
81 | 81 | * @param string $content The content. |
82 | 82 | * @param string|\GV\Template_Context $context The context, if available. |
@@ -117,10 +117,10 @@ discard block |
||
117 | 117 | <?php } ?> |
118 | 118 | </select> |
119 | 119 | <input type="submit" value="Submit" style="visibility: hidden; position: absolute;" /><?php |
120 | - if( ! empty( $_GET ) ) { |
|
121 | - $get = $_GET; |
|
122 | - unset( $get['page_size'] ); |
|
123 | - foreach ( $get as $key => $value ) { |
|
120 | + if( ! empty( $_GET ) ) { |
|
121 | + $get = $_GET; |
|
122 | + unset( $get['page_size'] ); |
|
123 | + foreach ( $get as $key => $value ) { |
|
124 | 124 | if ( is_array( $value ) ) { |
125 | 125 | foreach ( $value as $_key => $_value ) { |
126 | 126 | printf( '<input type="hidden" name="%s[%s]" value="%s" />', esc_attr( $key ), esc_attr( $_key ), esc_attr( $_value ) ); |
@@ -128,9 +128,9 @@ discard block |
||
128 | 128 | } else { |
129 | 129 | printf( '<input type="hidden" name="%s" value="%s" />', esc_attr( $key ), esc_attr( $value ) ); |
130 | 130 | } |
131 | - } |
|
132 | - } |
|
133 | - ?> |
|
131 | + } |
|
132 | + } |
|
133 | + ?> |
|
134 | 134 | </div> |
135 | 135 | </form> |
136 | 136 | </div> |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | $default_size = 25; |
48 | 48 | |
49 | 49 | if ( $context instanceof \GV\Template_Context ) { |
50 | - $default_size = (int) $context->view->settings->get( 'page_size' ); |
|
50 | + $default_size = (int)$context->view->settings->get( 'page_size' ); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | $sizes = array( 10, 25, $default_size, 50, 100 ); |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | |
59 | 59 | $page_sizes = array(); |
60 | 60 | foreach ( $sizes as $size ) { |
61 | - $page_sizes [] = array( |
|
61 | + $page_sizes [ ] = array( |
|
62 | 62 | 'value' => $size, |
63 | 63 | 'text' => $size |
64 | 64 | ); |
@@ -83,11 +83,11 @@ discard block |
||
83 | 83 | */ |
84 | 84 | public function render_frontend( $widget_args, $content = '', $context = null ) { |
85 | 85 | |
86 | - if( ! $this->pre_render_frontend() ) { |
|
86 | + if ( ! $this->pre_render_frontend() ) { |
|
87 | 87 | return; |
88 | 88 | } |
89 | 89 | |
90 | - $page_size = (int) \GV\Utils::_GET( 'page_size', $context->view->settings->get( 'page_size' ) ); |
|
90 | + $page_size = (int)\GV\Utils::_GET( 'page_size', $context->view->settings->get( 'page_size' ) ); |
|
91 | 91 | |
92 | 92 | $settings = shortcode_atts( array( |
93 | 93 | 'label' => __( 'Page Size', 'gravityview' ), |
@@ -106,20 +106,20 @@ discard block |
||
106 | 106 | <div class="gv-widget-page-size"> |
107 | 107 | <form method="get" action="<?php echo esc_url( add_query_arg( array() ) ); ?>" onchange="this.submit();"> |
108 | 108 | <div> |
109 | - <?php if( ! empty( $settings['label'] ) ) { ?> |
|
110 | - <label for="gv-page_size"><?php echo esc_html( $settings['label'] ); ?></label> |
|
109 | + <?php if ( ! empty( $settings[ 'label' ] ) ) { ?> |
|
110 | + <label for="gv-page_size"><?php echo esc_html( $settings[ 'label' ] ); ?></label> |
|
111 | 111 | <?php } ?> |
112 | 112 | <select name="page_size" id="gv-page_size"> |
113 | - <option value=""><?php echo esc_html( $settings['default_choice_text'] ); ?></option> |
|
113 | + <option value=""><?php echo esc_html( $settings[ 'default_choice_text' ] ); ?></option> |
|
114 | 114 | <?php |
115 | - foreach ( $settings['choices'] as $choice ) { ?> |
|
116 | - <option value='<?php echo esc_attr( $choice['value'] ); ?>'<?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $page_size ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option> |
|
115 | + foreach ( $settings[ 'choices' ] as $choice ) { ?> |
|
116 | + <option value='<?php echo esc_attr( $choice[ 'value' ] ); ?>'<?php gv_selected( esc_attr( $choice[ 'value' ] ), esc_attr( $page_size ), true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option> |
|
117 | 117 | <?php } ?> |
118 | 118 | </select> |
119 | 119 | <input type="submit" value="Submit" style="visibility: hidden; position: absolute;" /><?php |
120 | - if( ! empty( $_GET ) ) { |
|
120 | + if ( ! empty( $_GET ) ) { |
|
121 | 121 | $get = $_GET; |
122 | - unset( $get['page_size'] ); |
|
122 | + unset( $get[ 'page_size' ] ); |
|
123 | 123 | foreach ( $get as $key => $value ) { |
124 | 124 | if ( is_array( $value ) ) { |
125 | 125 | foreach ( $value as $_key => $_value ) { |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | } |
159 | 159 | |
160 | 160 | // Already overridden |
161 | - if ( (int) $page_size === (int) $view->settings->get( 'page_size' ) ) { |
|
161 | + if ( (int)$page_size === (int)$view->settings->get( 'page_size' ) ) { |
|
162 | 162 | return; |
163 | 163 | } |
164 | 164 | |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | 'view' => $view, |
167 | 167 | ) ); |
168 | 168 | |
169 | - if ( ! in_array( (int) $page_size, wp_list_pluck( self::get_page_sizes( $context ), 'value' ), true ) ) { |
|
169 | + if ( ! in_array( (int)$page_size, wp_list_pluck( self::get_page_sizes( $context ), 'value' ), true ) ) { |
|
170 | 170 | gravityview()->log->warning( 'The passed page size is not allowed: {page_size}. Not modifying result.', array( 'page_size' => $page_size ) ); |
171 | 171 | return; |
172 | 172 | } |
@@ -12,9 +12,9 @@ |
||
12 | 12 | // Output the Clear button, if enabled |
13 | 13 | GravityView_Widget_Search::the_clear_search_button(); |
14 | 14 | |
15 | - if ( isset( $_GET['page_size'] ) ) { |
|
15 | + if ( isset( $_GET[ 'page_size' ] ) ) { |
|
16 | 16 | ?> |
17 | - <input type="hidden" name="page_size" value="<?php echo esc_attr( $_GET['page_size'] ); ?>" /> |
|
17 | + <input type="hidden" name="page_size" value="<?php echo esc_attr( $_GET[ 'page_size' ] ); ?>" /> |
|
18 | 18 | <?php |
19 | 19 | } |
20 | 20 |
@@ -30,25 +30,25 @@ |
||
30 | 30 | |
31 | 31 | public function __construct() { |
32 | 32 | $this->label = esc_html__( 'Link to Entry', 'gravityview' ); |
33 | - $this->description = esc_html__('A dedicated link to the single entry with customizable text.', 'gravityview'); |
|
33 | + $this->description = esc_html__( 'A dedicated link to the single entry with customizable text.', 'gravityview' ); |
|
34 | 34 | parent::__construct(); |
35 | 35 | } |
36 | 36 | |
37 | 37 | public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) { |
38 | 38 | |
39 | 39 | // Always a link! |
40 | - unset( $field_options['show_as_link'], $field_options['search_filter'] ); |
|
40 | + unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] ); |
|
41 | 41 | |
42 | - if( 'edit' === $context ) { |
|
42 | + if ( 'edit' === $context ) { |
|
43 | 43 | return $field_options; |
44 | 44 | } |
45 | 45 | |
46 | 46 | $add_options = array(); |
47 | - $add_options['entry_link_text'] = array( |
|
47 | + $add_options[ 'entry_link_text' ] = array( |
|
48 | 48 | 'type' => 'text', |
49 | 49 | 'label' => __( 'Link Text:', 'gravityview' ), |
50 | 50 | 'desc' => NULL, |
51 | - 'value' => __('View Details', 'gravityview'), |
|
51 | + 'value' => __( 'View Details', 'gravityview' ), |
|
52 | 52 | 'merge_tags' => true, |
53 | 53 | ); |
54 | 54 |
@@ -24,13 +24,13 @@ discard block |
||
24 | 24 | |
25 | 25 | public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) { |
26 | 26 | |
27 | - unset( $field_options['show_as_link'] ); |
|
27 | + unset( $field_options[ 'show_as_link' ] ); |
|
28 | 28 | |
29 | - if( 'edit' === $context ) { |
|
29 | + if ( 'edit' === $context ) { |
|
30 | 30 | return $field_options; |
31 | 31 | } |
32 | 32 | |
33 | - $this->add_field_support('dynamic_data', $field_options ); |
|
33 | + $this->add_field_support( 'dynamic_data', $field_options ); |
|
34 | 34 | |
35 | 35 | return $field_options; |
36 | 36 | } |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | */ |
47 | 47 | public function get_field_input( $form, $value = '', $entry = null, GF_Field_Post_Content $field ) { |
48 | 48 | |
49 | - $id = (int) $field->id; |
|
49 | + $id = (int)$field->id; |
|
50 | 50 | $input_name = "input_{$id}"; |
51 | 51 | $class = esc_attr( $field->size ); |
52 | 52 | $tabindex = $field->get_tabindex(); |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | |
12 | 12 | var $is_searchable = true; |
13 | 13 | |
14 | - var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains'); |
|
14 | + var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' ); |
|
15 | 15 | |
16 | 16 | var $_gf_field_class_name = 'GF_Field_Post_Category'; |
17 | 17 | |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | $entry = GFAPI::get_entry( $entry_id ); |
45 | 45 | $post_id = \GV\Utils::get( $entry, 'post_id' ); |
46 | 46 | |
47 | - if( empty( $post_id ) ) { |
|
47 | + if ( empty( $post_id ) ) { |
|
48 | 48 | return false; |
49 | 49 | } |
50 | 50 | |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | |
53 | 53 | $post_category_fields = GFAPI::get_fields_by_type( $form, 'post_category' ); |
54 | 54 | |
55 | - if( $post_category_fields ) { |
|
55 | + if ( $post_category_fields ) { |
|
56 | 56 | |
57 | 57 | $updated_categories = array(); |
58 | 58 | |
@@ -119,18 +119,18 @@ discard block |
||
119 | 119 | * |
120 | 120 | * @return mixed |
121 | 121 | */ |
122 | - function edit_entry_post_category_choices( $choices, $field, $form_id ) { |
|
122 | + function edit_entry_post_category_choices( $choices, $field, $form_id ) { |
|
123 | 123 | |
124 | - $entry = GravityView_Edit_Entry::getInstance()->instances['render']->get_entry(); |
|
124 | + $entry = GravityView_Edit_Entry::getInstance()->instances[ 'render' ]->get_entry(); |
|
125 | 125 | |
126 | 126 | // $entry['post_id'] should always be set, but we check to make sure. |
127 | - if( $entry && isset( $entry['post_id'] ) && $post_id = $entry['post_id'] ) { |
|
127 | + if ( $entry && isset( $entry[ 'post_id' ] ) && $post_id = $entry[ 'post_id' ] ) { |
|
128 | 128 | |
129 | 129 | $post_categories = wp_get_post_categories( $post_id, array( 'fields' => 'ids' ) ); |
130 | 130 | |
131 | 131 | // Always use the live value |
132 | 132 | foreach ( $choices as &$choice ) { |
133 | - $choice['isSelected'] = in_array( $choice['value'], array_values( $post_categories ) ); |
|
133 | + $choice[ 'isSelected' ] = in_array( $choice[ 'value' ], array_values( $post_categories ) ); |
|
134 | 134 | } |
135 | 135 | } |
136 | 136 | |
@@ -139,12 +139,12 @@ discard block |
||
139 | 139 | |
140 | 140 | public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) { |
141 | 141 | |
142 | - if( 'edit' === $context ) { |
|
142 | + if ( 'edit' === $context ) { |
|
143 | 143 | return $field_options; |
144 | 144 | } |
145 | 145 | |
146 | - $this->add_field_support('dynamic_data', $field_options ); |
|
147 | - $this->add_field_support('link_to_term', $field_options ); |
|
146 | + $this->add_field_support( 'dynamic_data', $field_options ); |
|
147 | + $this->add_field_support( 'link_to_term', $field_options ); |
|
148 | 148 | |
149 | 149 | return $field_options; |
150 | 150 | } |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | |
15 | 15 | var $is_searchable = true; |
16 | 16 | |
17 | - var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains'); |
|
17 | + var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' ); |
|
18 | 18 | |
19 | 19 | var $_gf_field_class_name = 'GF_Field_Post_Tags'; |
20 | 20 | |
@@ -27,12 +27,12 @@ discard block |
||
27 | 27 | |
28 | 28 | public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) { |
29 | 29 | |
30 | - if( 'edit' === $context ) { |
|
30 | + if ( 'edit' === $context ) { |
|
31 | 31 | return $field_options; |
32 | 32 | } |
33 | 33 | |
34 | - $this->add_field_support('dynamic_data', $field_options ); |
|
35 | - $this->add_field_support('link_to_term', $field_options ); |
|
34 | + $this->add_field_support( 'dynamic_data', $field_options ); |
|
35 | + $this->add_field_support( 'link_to_term', $field_options ); |
|
36 | 36 | |
37 | 37 | return $field_options; |
38 | 38 | } |
@@ -37,23 +37,23 @@ discard block |
||
37 | 37 | |
38 | 38 | $merge_tags = array( |
39 | 39 | array( |
40 | - 'label' => __('Entry Creator: Display Name', 'gravityview'), |
|
40 | + 'label' => __( 'Entry Creator: Display Name', 'gravityview' ), |
|
41 | 41 | 'tag' => '{created_by:display_name}' |
42 | 42 | ), |
43 | 43 | array( |
44 | - 'label' => __('Entry Creator: Email', 'gravityview'), |
|
44 | + 'label' => __( 'Entry Creator: Email', 'gravityview' ), |
|
45 | 45 | 'tag' => '{created_by:user_email}' |
46 | 46 | ), |
47 | 47 | array( |
48 | - 'label' => __('Entry Creator: Username', 'gravityview'), |
|
48 | + 'label' => __( 'Entry Creator: Username', 'gravityview' ), |
|
49 | 49 | 'tag' => '{created_by:user_login}' |
50 | 50 | ), |
51 | 51 | array( |
52 | - 'label' => __('Entry Creator: User ID', 'gravityview'), |
|
52 | + 'label' => __( 'Entry Creator: User ID', 'gravityview' ), |
|
53 | 53 | 'tag' => '{created_by:ID}' |
54 | 54 | ), |
55 | 55 | array( |
56 | - 'label' => __('Entry Creator: Roles', 'gravityview'), |
|
56 | + 'label' => __( 'Entry Creator: Roles', 'gravityview' ), |
|
57 | 57 | 'tag' => '{created_by:roles}' |
58 | 58 | ), |
59 | 59 | ); |
@@ -81,19 +81,19 @@ discard block |
||
81 | 81 | public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) { |
82 | 82 | |
83 | 83 | // If there are no matches OR the Entry `created_by` isn't set or is 0 (no user) |
84 | - if( empty( $entry['created_by'] ) ) { |
|
84 | + if ( empty( $entry[ 'created_by' ] ) ) { |
|
85 | 85 | return $text; |
86 | 86 | } |
87 | 87 | |
88 | 88 | // Get the creator of the entry |
89 | - $entry_creator = new WP_User( $entry['created_by'] ); |
|
89 | + $entry_creator = new WP_User( $entry[ 'created_by' ] ); |
|
90 | 90 | |
91 | 91 | foreach ( $matches as $match ) { |
92 | 92 | |
93 | - $full_tag = $match[0]; |
|
94 | - $property = $match[1]; |
|
93 | + $full_tag = $match[ 0 ]; |
|
94 | + $property = $match[ 1 ]; |
|
95 | 95 | |
96 | - switch( $property ) { |
|
96 | + switch ( $property ) { |
|
97 | 97 | /** @since 1.13.2 */ |
98 | 98 | case 'roles': |
99 | 99 | $value = implode( ', ', $entry_creator->roles ); |
@@ -116,18 +116,18 @@ discard block |
||
116 | 116 | |
117 | 117 | public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) { |
118 | 118 | |
119 | - if( 'edit' === $context ) { |
|
119 | + if ( 'edit' === $context ) { |
|
120 | 120 | return $field_options; |
121 | 121 | } |
122 | 122 | |
123 | - $field_options['name_display'] = array( |
|
123 | + $field_options[ 'name_display' ] = array( |
|
124 | 124 | 'type' => 'select', |
125 | 125 | 'label' => __( 'User Format', 'gravityview' ), |
126 | - 'desc' => __( 'How should the User information be displayed?', 'gravityview'), |
|
126 | + 'desc' => __( 'How should the User information be displayed?', 'gravityview' ), |
|
127 | 127 | 'choices' => array( |
128 | - 'display_name' => __('Display Name (Example: "Ellen Ripley")', 'gravityview'), |
|
129 | - 'user_login' => __('Username (Example: "nostromo")', 'gravityview'), |
|
130 | - 'ID' => __('User ID # (Example: 426)', 'gravityview'), |
|
128 | + 'display_name' => __( 'Display Name (Example: "Ellen Ripley")', 'gravityview' ), |
|
129 | + 'user_login' => __( 'Username (Example: "nostromo")', 'gravityview' ), |
|
130 | + 'ID' => __( 'User ID # (Example: 426)', 'gravityview' ), |
|
131 | 131 | ), |
132 | 132 | 'value' => 'display_name' |
133 | 133 | ); |