@@ -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 | |