@@ -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 | /** 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 ]; |
@@ -366,7 +366,7 @@ discard block |
||
366 | 366 | * @return boolean Whether this $key is set or not. |
367 | 367 | */ |
368 | 368 | public function __isset( $key ) { |
369 | - switch( $key ): |
|
369 | + switch ( $key ): |
|
370 | 370 | default: |
371 | 371 | return isset( $this->configuration[ $key ] ); |
372 | 372 | endswitch; |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | public function remove_columns_from_searchable_fields( $fields ) { |
61 | 61 | |
62 | 62 | foreach ( $fields as $key => $field ) { |
63 | - if ( isset( $field['parent'] ) && $field['parent'] instanceof \GF_Field_List ) { |
|
63 | + if ( isset( $field[ 'parent' ] ) && $field[ 'parent' ] instanceof \GF_Field_List ) { |
|
64 | 64 | unset( $fields[ $key ] ); |
65 | 65 | } |
66 | 66 | } |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | // Add the list columns |
87 | 87 | foreach ( $list_fields as $list_field ) { |
88 | 88 | |
89 | - if( empty( $list_field->enableColumns ) ) { |
|
89 | + if ( empty( $list_field->enableColumns ) ) { |
|
90 | 90 | continue; |
91 | 91 | } |
92 | 92 | |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | } |
108 | 108 | |
109 | 109 | // If there are columns, add them under the parent field |
110 | - if( ! empty( $list_columns ) ) { |
|
110 | + if ( ! empty( $list_columns ) ) { |
|
111 | 111 | |
112 | 112 | $index = array_search( $list_field->id, array_keys( $fields ) ) + 1; |
113 | 113 | |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | * Merge the $list_columns into the $fields array at $index |
116 | 116 | * @see https://stackoverflow.com/a/1783125 |
117 | 117 | */ |
118 | - $fields = array_slice( $fields, 0, $index, true) + $list_columns + array_slice( $fields, $index, null, true); |
|
118 | + $fields = array_slice( $fields, 0, $index, true ) + $list_columns + array_slice( $fields, $index, null, true ); |
|
119 | 119 | } |
120 | 120 | |
121 | 121 | unset( $list_columns, $index, $input_id ); |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | |
143 | 143 | $list_rows = maybe_unserialize( $field_value ); |
144 | 144 | |
145 | - if( ! is_array( $list_rows ) ) { |
|
145 | + if ( ! is_array( $list_rows ) ) { |
|
146 | 146 | gravityview()->log->error( '$field_value did not unserialize', array( 'data' => $field_value ) ); |
147 | 147 | return null; |
148 | 148 | } |
@@ -152,18 +152,18 @@ discard block |
||
152 | 152 | // Each list row |
153 | 153 | foreach ( $list_rows as $list_row ) { |
154 | 154 | $current_column = 0; |
155 | - foreach ( (array) $list_row as $column_key => $column_value ) { |
|
155 | + foreach ( (array)$list_row as $column_key => $column_value ) { |
|
156 | 156 | |
157 | 157 | // If the label of the column matches $column_id, or the numeric key value matches, add the value |
158 | - if( (string)$column_key === (string)$column_id || ( is_numeric( $column_id ) && (int)$column_id === $current_column ) ) { |
|
159 | - $column_values[] = $column_value; |
|
158 | + if ( (string)$column_key === (string)$column_id || ( is_numeric( $column_id ) && (int)$column_id === $current_column ) ) { |
|
159 | + $column_values[ ] = $column_value; |
|
160 | 160 | } |
161 | 161 | $current_column++; |
162 | 162 | } |
163 | 163 | } |
164 | 164 | |
165 | 165 | // Return the array of values |
166 | - if( 'raw' === $format ) { |
|
166 | + if ( 'raw' === $format ) { |
|
167 | 167 | return $column_values; |
168 | 168 | } |
169 | 169 | // Return the Gravity Forms Field output |
@@ -186,22 +186,22 @@ discard block |
||
186 | 186 | */ |
187 | 187 | public function _filter_field_label( $label, $field, $form, $entry ) { |
188 | 188 | |
189 | - $field_object = RGFormsModel::get_field( $form, $field['id'] ); |
|
189 | + $field_object = RGFormsModel::get_field( $form, $field[ 'id' ] ); |
|
190 | 190 | |
191 | 191 | // Not a list field |
192 | - if( ! $field_object || 'list' !== $field_object->type ) { |
|
192 | + if ( ! $field_object || 'list' !== $field_object->type ) { |
|
193 | 193 | return $label; |
194 | 194 | } |
195 | 195 | |
196 | 196 | // Custom label is defined, so use it |
197 | - if( ! empty( $field['custom_label'] ) ) { |
|
197 | + if ( ! empty( $field[ 'custom_label' ] ) ) { |
|
198 | 198 | return $label; |
199 | 199 | } |
200 | 200 | |
201 | - $column_id = gravityview_get_input_id_from_id( $field['id'] ); |
|
201 | + $column_id = gravityview_get_input_id_from_id( $field[ 'id' ] ); |
|
202 | 202 | |
203 | 203 | // Parent field, not column field |
204 | - if( false === $column_id ) { |
|
204 | + if ( false === $column_id ) { |
|
205 | 205 | return $label; |
206 | 206 | } |
207 | 207 | |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | public static function get_column_label( GF_Field_List $field, $column_id, $backup_label = '' ) { |
223 | 223 | |
224 | 224 | // Doesn't have columns enabled |
225 | - if( ! isset( $field->choices ) || ! $field->enableColumns ) { |
|
225 | + if ( ! isset( $field->choices ) || ! $field->enableColumns ) { |
|
226 | 226 | return $backup_label; |
227 | 227 | } |
228 | 228 |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | * @return array |
102 | 102 | */ |
103 | 103 | public function modify_app_settings_menu_title( $setting_tabs ) { |
104 | - $setting_tabs[0]['label'] = __( 'GravityView Settings', 'gravityview' ); |
|
104 | + $setting_tabs[ 0 ][ 'label' ] = __( 'GravityView Settings', 'gravityview' ); |
|
105 | 105 | return $setting_tabs; |
106 | 106 | } |
107 | 107 | |
@@ -304,15 +304,15 @@ discard block |
||
304 | 304 | </ul> |
305 | 305 | <div class="gv-followup widefat"> |
306 | 306 | <p><strong><label for="gv-reason-details"><?php esc_html_e( 'Comments', 'gravityview' ); ?></label></strong></p> |
307 | - <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> |
|
307 | + <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> |
|
308 | 308 | </div> |
309 | 309 | <div class="scale-description"> |
310 | 310 | <p><strong><?php esc_html_e( 'How likely are you to recommend GravityView?', 'gravityview' ); ?></strong></p> |
311 | 311 | <ul class="inline"> |
312 | 312 | <?php |
313 | 313 | $i = 0; |
314 | - while( $i < 11 ) { |
|
315 | - echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_'.$i.'" value="'.$i.'" type="radio"> '.$i.'</label></li>'; |
|
314 | + while ( $i < 11 ) { |
|
315 | + echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_' . $i . '" value="' . $i . '" type="radio"> ' . $i . '</label></li>'; |
|
316 | 316 | $i++; |
317 | 317 | } |
318 | 318 | ?> |
@@ -529,15 +529,15 @@ discard block |
||
529 | 529 | * @return string The HTML |
530 | 530 | */ |
531 | 531 | public function as_html( $field, $echo = true ) { |
532 | - $field['type'] = ( isset( $field['type'] ) && in_array( $field['type'], array( 'submit','reset','button' ) ) ) ? $field['type'] : 'submit'; |
|
532 | + $field[ 'type' ] = ( isset( $field[ 'type' ] ) && in_array( $field[ 'type' ], array( 'submit', 'reset', 'button' ) ) ) ? $field[ 'type' ] : 'submit'; |
|
533 | 533 | |
534 | 534 | $attributes = $this->get_field_attributes( $field ); |
535 | 535 | $default_value = Utils::get( $field, 'value', Utils::get( $field, 'default_value' ) ); |
536 | - $value = $this->get( $field['name'], $default_value ); |
|
536 | + $value = $this->get( $field[ 'name' ], $default_value ); |
|
537 | 537 | |
538 | 538 | |
539 | - $attributes['class'] = isset( $attributes['class'] ) ? esc_attr( $attributes['class'] ) : 'button-primary gfbutton'; |
|
540 | - $name = ( $field['name'] === 'gform-settings-save' ) ? $field['name'] : '_gaddon_setting_' . $field['name']; |
|
539 | + $attributes[ 'class' ] = isset( $attributes[ 'class' ] ) ? esc_attr( $attributes[ 'class' ] ) : 'button-primary gfbutton'; |
|
540 | + $name = ( $field[ 'name' ] === 'gform-settings-save' ) ? $field[ 'name' ] : '_gaddon_setting_' . $field[ 'name' ]; |
|
541 | 541 | |
542 | 542 | if ( empty( $value ) ) { |
543 | 543 | $value = __( 'Update Settings', 'gravityview' ); |
@@ -546,7 +546,7 @@ discard block |
||
546 | 546 | $attributes = $this->get_field_attributes( $field ); |
547 | 547 | |
548 | 548 | $html = '<input |
549 | - type="' . $field['type'] . '" |
|
549 | + type="' . $field[ 'type' ] . '" |
|
550 | 550 | name="' . esc_attr( $name ) . '" |
551 | 551 | value="' . $value . '" ' . |
552 | 552 | implode( ' ', $attributes ) . |
@@ -577,7 +577,7 @@ discard block |
||
577 | 577 | * @return bool |
578 | 578 | */ |
579 | 579 | public function is_save_postback() { |
580 | - return isset( $_POST['gform-settings-save'] ) && isset( $_POST['_gravityview_save_settings_nonce'] ); |
|
580 | + return isset( $_POST[ 'gform-settings-save' ] ) && isset( $_POST[ '_gravityview_save_settings_nonce' ] ); |
|
581 | 581 | } |
582 | 582 | |
583 | 583 | /** |
@@ -587,7 +587,7 @@ discard block |
||
587 | 587 | */ |
588 | 588 | public function license_key_notice() { |
589 | 589 | |
590 | - if( $this->is_save_postback() ) { |
|
590 | + if ( $this->is_save_postback() ) { |
|
591 | 591 | $settings = $this->get_posted_settings(); |
592 | 592 | $license_key = \GV\Utils::get( $settings, 'license_key' ); |
593 | 593 | $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' ); |
@@ -605,7 +605,7 @@ discard block |
||
605 | 605 | * but didn't want to mess up the translation strings for the translators. |
606 | 606 | */ |
607 | 607 | $message = mb_substr( $message, 0, mb_strlen( $message ) - 1 ); |
608 | - $title = __ ( 'Inactive License', 'gravityview'); |
|
608 | + $title = __( 'Inactive License', 'gravityview' ); |
|
609 | 609 | $status = ''; |
610 | 610 | $update_below = false; |
611 | 611 | $primary_button_link = admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ); |
@@ -635,7 +635,7 @@ discard block |
||
635 | 635 | $update_below = __( 'Activate your license key below.', 'gravityview' ); |
636 | 636 | break; |
637 | 637 | } |
638 | - $url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content='.$license_status.'&utm_campaign=Admin%20Notice'; |
|
638 | + $url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content=' . $license_status . '&utm_campaign=Admin%20Notice'; |
|
639 | 639 | |
640 | 640 | // Show a different notice on settings page for inactive licenses (hide the buttons) |
641 | 641 | if ( $update_below && gravityview_is_admin_page( '', 'settings' ) ) { |
@@ -677,7 +677,7 @@ discard block |
||
677 | 677 | public function scripts() { |
678 | 678 | $scripts = parent::scripts(); |
679 | 679 | |
680 | - $scripts[] = array( |
|
680 | + $scripts[ ] = array( |
|
681 | 681 | 'handle' => 'gform_tooltip_init', |
682 | 682 | 'enqueue' => array( |
683 | 683 | array( |
@@ -696,7 +696,7 @@ discard block |
||
696 | 696 | public function styles() { |
697 | 697 | $styles = parent::styles(); |
698 | 698 | |
699 | - $styles[] = array( |
|
699 | + $styles[ ] = array( |
|
700 | 700 | 'handle' => 'gravityview_settings', |
701 | 701 | 'src' => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ), |
702 | 702 | 'version' => Plugin::$version, |
@@ -727,7 +727,7 @@ discard block |
||
727 | 727 | * If multisite and not network admin, we don't want the settings to show. |
728 | 728 | * @since 1.7.6 |
729 | 729 | */ |
730 | - $show_submenu = ( ! is_multisite() ) || is_main_site() || ( ! gravityview()->plugin->is_network_activated() ) || ( is_network_admin() && gravityview()->plugin->is_network_activated() ); |
|
730 | + $show_submenu = ( ! is_multisite() ) || is_main_site() || ( ! gravityview()->plugin->is_network_activated() ) || ( is_network_admin() && gravityview()->plugin->is_network_activated() ); |
|
731 | 731 | |
732 | 732 | /** |
733 | 733 | * Override whether to show the Settings menu on a per-blog basis. |
@@ -775,26 +775,26 @@ discard block |
||
775 | 775 | 'label' => __( 'License Key', 'gravityview' ), |
776 | 776 | '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' ) ), |
777 | 777 | 'type' => 'edd_license', |
778 | - 'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ), |
|
778 | + 'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ), |
|
779 | 779 | 'data-pending-text' => __( 'Verifying license…', 'gravityview' ), |
780 | - 'default_value' => $default_settings['license_key'], |
|
780 | + 'default_value' => $default_settings[ 'license_key' ], |
|
781 | 781 | 'class' => ( '' == $this->get( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key', |
782 | 782 | ), |
783 | 783 | array( |
784 | 784 | 'name' => 'license_key_response', |
785 | - 'default_value' => $default_settings['license_key_response'], |
|
785 | + 'default_value' => $default_settings[ 'license_key_response' ], |
|
786 | 786 | 'type' => 'hidden', |
787 | 787 | ), |
788 | 788 | array( |
789 | 789 | 'name' => 'license_key_status', |
790 | - 'default_value' => $default_settings['license_key_status'], |
|
790 | + 'default_value' => $default_settings[ 'license_key_status' ], |
|
791 | 791 | 'type' => 'hidden', |
792 | 792 | ), |
793 | 793 | array( |
794 | 794 | 'name' => 'support-email', |
795 | 795 | 'type' => 'text', |
796 | 796 | 'validate' => 'email', |
797 | - 'default_value' => $default_settings['support-email'], |
|
797 | + 'default_value' => $default_settings[ 'support-email' ], |
|
798 | 798 | 'label' => __( 'Support Email', 'gravityview' ), |
799 | 799 | 'description' => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ), |
800 | 800 | 'class' => 'code regular-text', |
@@ -806,7 +806,7 @@ discard block |
||
806 | 806 | 'name' => 'support_port', |
807 | 807 | 'type' => 'radio', |
808 | 808 | 'label' => __( 'Show Support Port?', 'gravityview' ), |
809 | - 'default_value' => $default_settings['support_port'], |
|
809 | + 'default_value' => $default_settings[ 'support_port' ], |
|
810 | 810 | 'horizontal' => 1, |
811 | 811 | 'choices' => array( |
812 | 812 | array( |
@@ -825,7 +825,7 @@ discard block |
||
825 | 825 | 'name' => 'no-conflict-mode', |
826 | 826 | 'type' => 'radio', |
827 | 827 | 'label' => __( 'No-Conflict Mode', 'gravityview' ), |
828 | - 'default_value' => $default_settings['no-conflict-mode'], |
|
828 | + 'default_value' => $default_settings[ 'no-conflict-mode' ], |
|
829 | 829 | 'horizontal' => 1, |
830 | 830 | 'choices' => array( |
831 | 831 | array( |
@@ -847,7 +847,7 @@ discard block |
||
847 | 847 | 'name' => 'rest_api', |
848 | 848 | 'type' => 'radio', |
849 | 849 | 'label' => __( 'REST API', 'gravityview' ), |
850 | - 'default_value' => $default_settings['rest_api'], |
|
850 | + 'default_value' => $default_settings[ 'rest_api' ], |
|
851 | 851 | 'horizontal' => 1, |
852 | 852 | 'choices' => array( |
853 | 853 | array( |
@@ -866,7 +866,7 @@ discard block |
||
866 | 866 | 'name' => 'beta', |
867 | 867 | 'type' => 'checkbox', |
868 | 868 | 'label' => __( 'Become a Beta Tester', 'gravityview' ), |
869 | - 'default_value' => $default_settings['beta'], |
|
869 | + 'default_value' => $default_settings[ 'beta' ], |
|
870 | 870 | 'horizontal' => 1, |
871 | 871 | 'choices' => array( |
872 | 872 | array( |
@@ -899,17 +899,17 @@ discard block |
||
899 | 899 | * @since 1.7.4 |
900 | 900 | */ |
901 | 901 | foreach ( $fields as &$field ) { |
902 | - $field['name'] = isset( $field['name'] ) ? $field['name'] : Utils::get( $field, 'id' ); |
|
903 | - $field['label'] = isset( $field['label'] ) ? $field['label'] : Utils::get( $field, 'title' ); |
|
904 | - $field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : Utils::get( $field, 'default' ); |
|
905 | - $field['description'] = isset( $field['description'] ) ? $field['description'] : Utils::get( $field, 'subtitle' ); |
|
902 | + $field[ 'name' ] = isset( $field[ 'name' ] ) ? $field[ 'name' ] : Utils::get( $field, 'id' ); |
|
903 | + $field[ 'label' ] = isset( $field[ 'label' ] ) ? $field[ 'label' ] : Utils::get( $field, 'title' ); |
|
904 | + $field[ 'default_value' ] = isset( $field[ 'default_value' ] ) ? $field[ 'default_value' ] : Utils::get( $field, 'default' ); |
|
905 | + $field[ 'description' ] = isset( $field[ 'description' ] ) ? $field[ 'description' ] : Utils::get( $field, 'subtitle' ); |
|
906 | 906 | |
907 | 907 | if ( $disabled_attribute ) { |
908 | - $field['disabled'] = $disabled_attribute; |
|
908 | + $field[ 'disabled' ] = $disabled_attribute; |
|
909 | 909 | } |
910 | 910 | |
911 | - if ( empty( $field['disabled'] ) ) { |
|
912 | - unset( $field['disabled'] ); |
|
911 | + if ( empty( $field[ 'disabled' ] ) ) { |
|
912 | + unset( $field[ 'disabled' ] ); |
|
913 | 913 | } |
914 | 914 | } |
915 | 915 | |
@@ -927,7 +927,7 @@ discard block |
||
927 | 927 | ); |
928 | 928 | |
929 | 929 | if ( $disabled_attribute ) { |
930 | - $button['disabled'] = $disabled_attribute; |
|
930 | + $button[ 'disabled' ] = $disabled_attribute; |
|
931 | 931 | } |
932 | 932 | |
933 | 933 | /** |
@@ -946,20 +946,20 @@ discard block |
||
946 | 946 | // If there are extensions, add a section for them |
947 | 947 | if ( ! empty( $extension_sections ) ) { |
948 | 948 | |
949 | - if( $disabled_attribute ) { |
|
949 | + if ( $disabled_attribute ) { |
|
950 | 950 | foreach ( $extension_sections as &$section ) { |
951 | - foreach ( $section['fields'] as &$field ) { |
|
952 | - $field['disabled'] = $disabled_attribute; |
|
951 | + foreach ( $section[ 'fields' ] as &$field ) { |
|
952 | + $field[ 'disabled' ] = $disabled_attribute; |
|
953 | 953 | } |
954 | 954 | } |
955 | 955 | } |
956 | 956 | |
957 | - $k = count( $extension_sections ) - 1 ; |
|
958 | - $extension_sections[ $k ]['fields'][] = $button; |
|
957 | + $k = count( $extension_sections ) - 1; |
|
958 | + $extension_sections[ $k ][ 'fields' ][ ] = $button; |
|
959 | 959 | $sections = array_merge( $sections, $extension_sections ); |
960 | 960 | } else { |
961 | 961 | // add the 'update settings' button to the general section |
962 | - $sections[0]['fields'][] = $button; |
|
962 | + $sections[ 0 ][ 'fields' ][ ] = $button; |
|
963 | 963 | } |
964 | 964 | |
965 | 965 | return $sections; |
@@ -1015,7 +1015,7 @@ discard block |
||
1015 | 1015 | protected function settings_edd_license( $field, $echo = true ) { |
1016 | 1016 | |
1017 | 1017 | if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) { |
1018 | - $field['input_type'] = 'password'; |
|
1018 | + $field[ 'input_type' ] = 'password'; |
|
1019 | 1019 | } |
1020 | 1020 | |
1021 | 1021 | $text = $this->settings_text( $field, false ); |
@@ -1064,7 +1064,7 @@ discard block |
||
1064 | 1064 | public function single_setting_row_html( $field ) { |
1065 | 1065 | ?> |
1066 | 1066 | |
1067 | - <tr id="gaddon-setting-row-<?php echo esc_attr( $field['name'] ); ?>"> |
|
1067 | + <tr id="gaddon-setting-row-<?php echo esc_attr( $field[ 'name' ] ); ?>"> |
|
1068 | 1068 | <td colspan="2"> |
1069 | 1069 | <?php $this->single_setting( $field ); ?> |
1070 | 1070 | </td> |
@@ -1082,10 +1082,10 @@ discard block |
||
1082 | 1082 | * @return string |
1083 | 1083 | */ |
1084 | 1084 | public function settings_save( $field, $echo = true ) { |
1085 | - $field['type'] = 'submit'; |
|
1086 | - $field['name'] = 'gform-settings-save'; |
|
1087 | - $field['class'] = isset( $field['class'] ) ? $field['class'] : 'button-primary gfbutton'; |
|
1088 | - $field['value'] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) ); |
|
1085 | + $field[ 'type' ] = 'submit'; |
|
1086 | + $field[ 'name' ] = 'gform-settings-save'; |
|
1087 | + $field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] : 'button-primary gfbutton'; |
|
1088 | + $field[ 'value' ] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) ); |
|
1089 | 1089 | |
1090 | 1090 | $output = $this->settings_submit( $field, false ); |
1091 | 1091 | |
@@ -1116,8 +1116,8 @@ discard block |
||
1116 | 1116 | * @return void |
1117 | 1117 | */ |
1118 | 1118 | public function single_setting_row( $field ) { |
1119 | - $field['gv_description'] = Utils::get( $field, 'description' ); |
|
1120 | - $field['description'] = Utils::get( $field, 'subtitle' ); |
|
1119 | + $field[ 'gv_description' ] = Utils::get( $field, 'description' ); |
|
1120 | + $field[ 'description' ] = Utils::get( $field, 'subtitle' ); |
|
1121 | 1121 | parent::single_setting_row( $field ); |
1122 | 1122 | } |
1123 | 1123 | |
@@ -1129,7 +1129,7 @@ discard block |
||
1129 | 1129 | public function single_setting_label( $field ) { |
1130 | 1130 | parent::single_setting_label( $field ); |
1131 | 1131 | if ( $description = Utils::get( $field, 'gv_description' ) ) { |
1132 | - echo '<span class="description">'. $description .'</span>'; |
|
1132 | + echo '<span class="description">' . $description . '</span>'; |
|
1133 | 1133 | } |
1134 | 1134 | } |
1135 | 1135 | |
@@ -1166,9 +1166,9 @@ discard block |
||
1166 | 1166 | // If the posted key doesn't match the activated/deactivated key (set using the Activate License button, AJAX response), |
1167 | 1167 | // then we assume it's changed. If it's changed, unset the status and the previous response. |
1168 | 1168 | if ( $local_key !== $response_key ) { |
1169 | - unset( $posted_settings['license_key_response'] ); |
|
1170 | - unset( $posted_settings['license_key_status'] ); |
|
1171 | - \GFCommon::add_error_message( __('The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) ); |
|
1169 | + unset( $posted_settings[ 'license_key_response' ] ); |
|
1170 | + unset( $posted_settings[ 'license_key_status' ] ); |
|
1171 | + \GFCommon::add_error_message( __( 'The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) ); |
|
1172 | 1172 | } |
1173 | 1173 | return $posted_settings; |
1174 | 1174 | } |