@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | $meta_keys = apply_filters_ref_array( 'gravityview/view_collection/from_post/meta_keys', array( array(), $post, &$views ) ); |
100 | 100 | |
101 | 101 | if ( function_exists( 'apply_filters_deprecated' ) ) { |
102 | - $meta_keys = (array) apply_filters_deprecated( 'gravityview/data/parse/meta_keys', array( $meta_keys, $post->ID ), '2.0.7', 'gravityview/view_collection/from_post/meta_keys' ); |
|
102 | + $meta_keys = (array)apply_filters_deprecated( 'gravityview/data/parse/meta_keys', array( $meta_keys, $post->ID ), '2.0.7', 'gravityview/view_collection/from_post/meta_keys' ); |
|
103 | 103 | } else { |
104 | 104 | /** |
105 | 105 | * @filter `gravityview/data/parse/meta_keys` |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | * @todo Require WP 4.6.0 so that `apply_filters_deprecated` is always available |
108 | 108 | * @see The `gravityview/view_collection/from_post/meta_keys` filter. |
109 | 109 | */ |
110 | - $meta_keys = (array) apply_filters( 'gravityview/data/parse/meta_keys', $meta_keys, $post->ID ); |
|
110 | + $meta_keys = (array)apply_filters( 'gravityview/data/parse/meta_keys', $meta_keys, $post->ID ); |
|
111 | 111 | } |
112 | 112 | |
113 | 113 | /** What about inside post meta values? */ |
@@ -137,12 +137,12 @@ discard block |
||
137 | 137 | |
138 | 138 | /** Let's find us some [gravityview] shortcodes perhaps. */ |
139 | 139 | foreach ( Shortcode::parse( $content ) as $shortcode ) { |
140 | - if ( $shortcode->name != 'gravityview' || empty( $shortcode->atts['id'] ) ) { |
|
140 | + if ( $shortcode->name != 'gravityview' || empty( $shortcode->atts[ 'id' ] ) ) { |
|
141 | 141 | continue; |
142 | 142 | } |
143 | 143 | |
144 | - if ( is_numeric( $shortcode->atts['id'] ) ) { |
|
145 | - $view = View::by_id( $shortcode->atts['id'] ); |
|
144 | + if ( is_numeric( $shortcode->atts[ 'id' ] ) ) { |
|
145 | + $view = View::by_id( $shortcode->atts[ 'id' ] ); |
|
146 | 146 | if ( ! $view ) { |
147 | 147 | continue; |
148 | 148 | } |
@@ -39,19 +39,19 @@ discard block |
||
39 | 39 | */ |
40 | 40 | function merge_content_meta_keys( $meta_keys = array(), $post = null, & $views = null ) { |
41 | 41 | |
42 | - if( empty( $post->panels_data ) || empty( $post->panels_data['widgets'] ) ) { |
|
42 | + if ( empty( $post->panels_data ) || empty( $post->panels_data[ 'widgets' ] ) ) { |
|
43 | 43 | return $meta_keys; |
44 | 44 | } |
45 | 45 | |
46 | - foreach ( (array) $post->panels_data['widgets'] as $widget ) { |
|
46 | + foreach ( (array)$post->panels_data[ 'widgets' ] as $widget ) { |
|
47 | 47 | |
48 | 48 | $views->merge( \GV\View_Collection::from_content( \GV\Utils::get( $widget, 'text' ) ) ); |
49 | 49 | |
50 | - if ( empty( $widget['tabs'] ) || ! is_array( $widget['tabs'] ) ) { |
|
50 | + if ( empty( $widget[ 'tabs' ] ) || ! is_array( $widget[ 'tabs' ] ) ) { |
|
51 | 51 | continue; |
52 | 52 | } |
53 | 53 | |
54 | - foreach ( $widget['tabs'] as $tab ) { |
|
54 | + foreach ( $widget[ 'tabs' ] as $tab ) { |
|
55 | 55 | |
56 | 56 | // Livemesh Tabs |
57 | 57 | $backup = \GV\Utils::get( $tab, 'tab_content' ); |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | // SiteOrigin Tabs |
60 | 60 | $content = \GV\Utils::get( $tab, 'content_text', $backup ); |
61 | 61 | |
62 | - if( $content ) { |
|
62 | + if ( $content ) { |
|
63 | 63 | $views->merge( \GV\View_Collection::from_content( $content ) ); |
64 | 64 | } |
65 | 65 | } |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | |
56 | 56 | $acf_keys = get_field_objects( $post->ID, array( 'load_value' => false ) ); |
57 | 57 | |
58 | - if( $acf_keys ) { |
|
58 | + if ( $acf_keys ) { |
|
59 | 59 | return array_merge( array_keys( $acf_keys ), $meta_keys ); |
60 | 60 | } |
61 | 61 | |
@@ -70,9 +70,9 @@ discard block |
||
70 | 70 | * @return void |
71 | 71 | */ |
72 | 72 | private function fix_posted_fields() { |
73 | - if( is_admin() && isset( $_POST['action'] ) && isset( $_POST['post_type'] ) ) { |
|
74 | - if( 'editpost' === $_POST['action'] && 'gravityview' === $_POST['post_type'] ) { |
|
75 | - $_POST['fields'] = _gravityview_process_posted_fields(); |
|
73 | + if ( is_admin() && isset( $_POST[ 'action' ] ) && isset( $_POST[ 'post_type' ] ) ) { |
|
74 | + if ( 'editpost' === $_POST[ 'action' ] && 'gravityview' === $_POST[ 'post_type' ] ) { |
|
75 | + $_POST[ 'fields' ] = _gravityview_process_posted_fields(); |
|
76 | 76 | } |
77 | 77 | } |
78 | 78 | } |
@@ -24,9 +24,8 @@ |
||
24 | 24 | /** |
25 | 25 | * Get a \GV\Field by Field ID for this data source. |
26 | 26 | * |
27 | - * @param int $field_id The internal field ID (custom content, etc.) |
|
28 | 27 | * |
29 | - * @return \GV\Field|null The requested field or null if not found. |
|
28 | + * @return null|Internal_Field The requested field or null if not found. |
|
30 | 29 | */ |
31 | 30 | public static function get_field( /** varargs */ ) { |
32 | 31 | $args = func_get_args(); |
@@ -44,16 +44,16 @@ discard block |
||
44 | 44 | */ |
45 | 45 | $atts = apply_filters( 'gravityview/shortcodes/gventry/atts', $atts ); |
46 | 46 | |
47 | - $view = \GV\View::by_id( $atts['view_id'] ); |
|
47 | + $view = \GV\View::by_id( $atts[ 'view_id' ] ); |
|
48 | 48 | |
49 | 49 | if ( ! $view ) { |
50 | - gravityview()->log->error( 'View does not exist #{view_id}', array( 'view_id' => $atts['view_id'] ) ); |
|
50 | + gravityview()->log->error( 'View does not exist #{view_id}', array( 'view_id' => $atts[ 'view_id' ] ) ); |
|
51 | 51 | return apply_filters( 'gravityview/shortcodes/gventry/output', '', null, null, $atts ); |
52 | 52 | } |
53 | 53 | |
54 | - $entry_id = ! empty( $atts['entry_id'] ) ? $atts['entry_id'] : $atts['id']; |
|
54 | + $entry_id = ! empty( $atts[ 'entry_id' ] ) ? $atts[ 'entry_id' ] : $atts[ 'id' ]; |
|
55 | 55 | |
56 | - switch( $entry_id ): |
|
56 | + switch ( $entry_id ): |
|
57 | 57 | case 'last': |
58 | 58 | if ( class_exists( '\GF_Query' ) ) { |
59 | 59 | /** |
@@ -62,17 +62,17 @@ discard block |
||
62 | 62 | * Since we're using \GF_Query shorthand initialization we have to reverse the order parameters here. |
63 | 63 | */ |
64 | 64 | add_filter( 'gravityview_get_entries', $filter = function( $parameters, $args, $form_id ) { |
65 | - if ( ! empty( $parameters['sorting'] ) ) { |
|
65 | + if ( ! empty( $parameters[ 'sorting' ] ) ) { |
|
66 | 66 | /** |
67 | 67 | * Reverse existing sorts. |
68 | 68 | */ |
69 | - $sort = &$parameters['sorting']; |
|
70 | - $sort['direction'] = $sort['direction'] == 'RAND' ? : ( $sort['direction'] == 'ASC' ? 'DESC' : 'ASC' ); |
|
69 | + $sort = &$parameters[ 'sorting' ]; |
|
70 | + $sort[ 'direction' ] = $sort[ 'direction' ] == 'RAND' ?: ( $sort[ 'direction' ] == 'ASC' ? 'DESC' : 'ASC' ); |
|
71 | 71 | } else { |
72 | 72 | /** |
73 | 73 | * Otherwise, sort by date_created. |
74 | 74 | */ |
75 | - $parameters['sorting'] = array( |
|
75 | + $parameters[ 'sorting' ] = array( |
|
76 | 76 | 'key' => 'id', |
77 | 77 | 'direction' => 'ASC', |
78 | 78 | 'is_numeric' => true |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | |
88 | 88 | /** If a sort already exists, reverse it. */ |
89 | 89 | if ( $sort = end( $entries->sorts ) ) { |
90 | - $entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ? : ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode ); |
|
90 | + $entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ?: ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode ); |
|
91 | 91 | } else { |
92 | 92 | /** Otherwise, sort by date_created */ |
93 | 93 | $entries = $entries->sort( new \GV\Entry_Sort( \GV\Internal_Field::by_id( 'id' ), \GV\Entry_Sort::ASC ), \GV\Entry_Sort::NUMERIC ); |
@@ -105,12 +105,12 @@ discard block |
||
105 | 105 | break; |
106 | 106 | default: |
107 | 107 | if ( ! $entry = \GV\GF_Entry::by_id( $entry_id ) ) { |
108 | - gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts['view_id'] ) ); |
|
108 | + gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts[ 'view_id' ] ) ); |
|
109 | 109 | return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, null, $atts ); |
110 | 110 | } |
111 | 111 | endswitch; |
112 | 112 | |
113 | - if ( $view->form->ID != $entry['form_id'] ) { |
|
113 | + if ( $view->form->ID != $entry[ 'form_id' ] ) { |
|
114 | 114 | gravityview()->log->error( 'Entry does not belong to view (form mismatch)' ); |
115 | 115 | return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts ); |
116 | 116 | } |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | return apply_filters( 'gravityview/shortcodes/gventry/output', get_the_password_form( $view->ID ), $view, $entry, $atts ); |
121 | 121 | } |
122 | 122 | |
123 | - if ( ! $view->form ) { |
|
123 | + if ( ! $view->form ) { |
|
124 | 124 | gravityview()->log->notice( 'View #{id} has no form attached to it.', array( 'id' => $view->ID ) ); |
125 | 125 | |
126 | 126 | /** |
@@ -143,15 +143,15 @@ discard block |
||
143 | 143 | } |
144 | 144 | |
145 | 145 | /** Unapproved entries. */ |
146 | - if ( $entry['status'] != 'active' ) { |
|
146 | + if ( $entry[ 'status' ] != 'active' ) { |
|
147 | 147 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) ); |
148 | 148 | return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts ); |
149 | 149 | } |
150 | 150 | |
151 | - $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID ); |
|
151 | + $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID ); |
|
152 | 152 | |
153 | 153 | if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
154 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
154 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
155 | 155 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) ); |
156 | 156 | return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts ); |
157 | 157 | } |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | $renderer = new \GV\Entry_Renderer(); |
164 | 164 | |
165 | 165 | $request = new \GV\Mock_Request(); |
166 | - $request->returns['is_entry'] = $entry; |
|
166 | + $request->returns[ 'is_entry' ] = $entry; |
|
167 | 167 | |
168 | 168 | $output = $renderer->render( $entry, $view, $request ); |
169 | 169 |
@@ -29,12 +29,12 @@ |
||
29 | 29 | */ |
30 | 30 | public static function from_configuration( $configuration ) { |
31 | 31 | |
32 | - if ( empty( $configuration['id'] ) || ! is_string( $configuration['id'] ) ) { |
|
32 | + if ( empty( $configuration[ 'id' ] ) || ! is_string( $configuration[ 'id' ] ) ) { |
|
33 | 33 | gravityview()->log->error( 'Invalid configuration[id] supplied.' ); |
34 | 34 | return null; |
35 | 35 | } |
36 | 36 | |
37 | - $field = self::by_id( $configuration['id'] ); |
|
37 | + $field = self::by_id( $configuration[ 'id' ] ); |
|
38 | 38 | |
39 | 39 | $field->update_configuration( $configuration ); |
40 | 40 |
@@ -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; |
@@ -53,7 +53,6 @@ discard block |
||
53 | 53 | * Columns are able to be added to View layouts, but not separately searched! |
54 | 54 | * |
55 | 55 | * @param array $fields |
56 | - * @param int $form_id |
|
57 | 56 | * |
58 | 57 | * @return array |
59 | 58 | */ |
@@ -133,7 +132,7 @@ discard block |
||
133 | 132 | * |
134 | 133 | * @param GF_Field_List $field Gravity Forms field |
135 | 134 | * @param string|array $field_value Serialized or unserialized array value for the field |
136 | - * @param int|string $column_id The numeric key of the column (0-index) or the label of the column |
|
135 | + * @param integer $column_id The numeric key of the column (0-index) or the label of the column |
|
137 | 136 | * @param string $format If set to 'raw', return an array of values for the column. Otherwise, allow Gravity Forms to render using `html` or `text` |
138 | 137 | * |
139 | 138 | * @return array|string|null Returns null if the $field_value passed wasn't an array or serialized array |
@@ -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 |
@@ -48,8 +48,8 @@ discard block |
||
48 | 48 | gravityview()->log->debug( '$passed_atts: ', array( 'data' => $passed_atts ) ); |
49 | 49 | |
50 | 50 | // Get details about the current View |
51 | - if( !empty( $passed_atts['detail'] ) ) { |
|
52 | - return $this->get_view_detail( $passed_atts['detail'] ); |
|
51 | + if ( ! empty( $passed_atts[ 'detail' ] ) ) { |
|
52 | + return $this->get_view_detail( $passed_atts[ 'detail' ] ); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | $atts = $this->parse_and_sanitize_atts( $passed_atts ); |
@@ -85,16 +85,16 @@ discard block |
||
85 | 85 | $filtered_atts = shortcode_atts( $supported_atts, $passed_atts, 'gravityview' ); |
86 | 86 | |
87 | 87 | // Only keep the passed attributes after making sure that they're valid pairs |
88 | - $filtered_atts = array_intersect_key( (array) $passed_atts, $filtered_atts ); |
|
88 | + $filtered_atts = array_intersect_key( (array)$passed_atts, $filtered_atts ); |
|
89 | 89 | |
90 | 90 | $atts = array(); |
91 | 91 | |
92 | - foreach( $filtered_atts as $key => $passed_value ) { |
|
92 | + foreach ( $filtered_atts as $key => $passed_value ) { |
|
93 | 93 | |
94 | 94 | // Allow using GravityView merge tags in shortcode attributes, like {get} and {created_by} |
95 | 95 | $passed_value = GravityView_Merge_Tags::replace_variables( $passed_value ); |
96 | 96 | |
97 | - switch( $defaults[ $key ]['type'] ) { |
|
97 | + switch ( $defaults[ $key ][ 'type' ] ) { |
|
98 | 98 | |
99 | 99 | /** |
100 | 100 | * Make sure number fields are numeric. |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | * @see http://php.net/manual/en/function.is-numeric.php#107326 |
103 | 103 | */ |
104 | 104 | case 'number': |
105 | - if( is_numeric( $passed_value ) ) { |
|
105 | + if ( is_numeric( $passed_value ) ) { |
|
106 | 106 | $atts[ $key ] = ( $passed_value + 0 ); |
107 | 107 | } |
108 | 108 | break; |
@@ -117,8 +117,8 @@ discard block |
||
117 | 117 | */ |
118 | 118 | case 'select': |
119 | 119 | case 'radio': |
120 | - $options = isset( $defaults[ $key ]['choices'] ) ? $defaults[ $key ]['choices'] : $defaults[ $key ]['options']; |
|
121 | - if( in_array( $passed_value, array_keys( $options ) ) ) { |
|
120 | + $options = isset( $defaults[ $key ][ 'choices' ] ) ? $defaults[ $key ][ 'choices' ] : $defaults[ $key ][ 'options' ]; |
|
121 | + if ( in_array( $passed_value, array_keys( $options ) ) ) { |
|
122 | 122 | $atts[ $key ] = $passed_value; |
123 | 123 | } |
124 | 124 | break; |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | $gravityview_view = GravityView_View::getInstance(); |
148 | 148 | $return = ''; |
149 | 149 | |
150 | - switch( $detail ) { |
|
150 | + switch ( $detail ) { |
|
151 | 151 | case 'total_entries': |
152 | 152 | $return = number_format_i18n( $gravityview_view->getTotalEntries() ); |
153 | 153 | break; |