@@ -28,18 +28,18 @@ |
||
| 28 | 28 | |
| 29 | 29 | $sort_fields_input = '<select name="template_settings[sort_field][]" class="gravityview_sort_field" id="gravityview_sort_field_%d">%s</select>'; |
| 30 | 30 | |
| 31 | - if ( is_array( $current_settings['sort_field'] ) ) { |
|
| 32 | - $primary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings['sort_field'][0] ); |
|
| 33 | - $secondary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings['sort_field'][1] ); |
|
| 31 | + if ( is_array( $current_settings[ 'sort_field' ] ) ) { |
|
| 32 | + $primary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings[ 'sort_field' ][ 0 ] ); |
|
| 33 | + $secondary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings[ 'sort_field' ][ 1 ] ); |
|
| 34 | 34 | } else { |
| 35 | - $primary_sort_fields = $secondary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings['sort_field'] ); |
|
| 35 | + $primary_sort_fields = $secondary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings[ 'sort_field' ] ); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | // Splice the sort direction |
| 39 | 39 | $_directions = array(); |
| 40 | 40 | foreach ( (array)\GV\Utils::get( $current_settings, 'sort_direction', array() ) as $i => $direction ) { |
| 41 | 41 | if ( ! $i ) { |
| 42 | - $_directions['sort_direction'] = $direction; |
|
| 42 | + $_directions[ 'sort_direction' ] = $direction; |
|
| 43 | 43 | } else { |
| 44 | 44 | $_directions[ sprintf( 'sort_direction_%d', $i + 1 ) ] = $direction; |
| 45 | 45 | } |
@@ -19,8 +19,8 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | |
| 21 | 21 | /** |
| 22 | - * Constructor. Add filters to modify output. |
|
| 23 | - * |
|
| 22 | + * Constructor. Add filters to modify output. |
|
| 23 | + * |
|
| 24 | 24 | * @since 2.0.4 |
| 25 | 25 | * |
| 26 | 26 | * @param View $view |
@@ -29,19 +29,19 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | public function __construct( View $view, Entry_Collection $entries, Request $request ) { |
| 31 | 31 | |
| 32 | - add_filter( 'gravityview/template/field/label', array( __CLASS__, 'add_columns_sort_links' ), 100, 2 ); |
|
| 32 | + add_filter( 'gravityview/template/field/label', array( __CLASS__, 'add_columns_sort_links' ), 100, 2 ); |
|
| 33 | 33 | |
| 34 | 34 | parent::__construct( $view, $entries, $request ); |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | - * Add sorting links to HTML columns that support sorting |
|
| 39 | - * |
|
| 40 | - * @since 2.0.4 |
|
| 41 | - * @since 2.0.5 Made static |
|
| 42 | - * |
|
| 43 | - * @static |
|
| 44 | - * |
|
| 38 | + * Add sorting links to HTML columns that support sorting |
|
| 39 | + * |
|
| 40 | + * @since 2.0.4 |
|
| 41 | + * @since 2.0.5 Made static |
|
| 42 | + * |
|
| 43 | + * @static |
|
| 44 | + * |
|
| 45 | 45 | * @param string $column_label Label for the table column |
| 46 | 46 | * @param \GV\Template_Context $context |
| 47 | 47 | * |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | $sort_columns = $context->view->settings->get( 'sort_columns' ); |
| 53 | 53 | |
| 54 | 54 | if ( empty( $sort_columns ) ) { |
| 55 | - return $column_label; |
|
| 55 | + return $column_label; |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | if ( ! \GravityView_frontend::getInstance()->is_field_sortable( $context->field->ID, $context->view->form->form ) ) { |
@@ -102,22 +102,22 @@ discard block |
||
| 102 | 102 | // If we are already sorting by the current field... |
| 103 | 103 | if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) { |
| 104 | 104 | |
| 105 | - switch( $sorting['direction'] ) { |
|
| 106 | - // No sort |
|
| 107 | - case '': |
|
| 108 | - $sort_args[1] = 'asc'; |
|
| 109 | - $class .= ' gv-icon-caret-up-down'; |
|
| 110 | - break; |
|
| 111 | - case 'desc': |
|
| 112 | - $sort_args[1] = ''; |
|
| 113 | - $class .= ' gv-icon-sort-asc'; |
|
| 114 | - break; |
|
| 115 | - case 'asc': |
|
| 116 | - default: |
|
| 117 | - $sort_args[1] = 'desc'; |
|
| 118 | - $class .= ' gv-icon-sort-desc'; |
|
| 119 | - break; |
|
| 120 | - } |
|
| 105 | + switch( $sorting['direction'] ) { |
|
| 106 | + // No sort |
|
| 107 | + case '': |
|
| 108 | + $sort_args[1] = 'asc'; |
|
| 109 | + $class .= ' gv-icon-caret-up-down'; |
|
| 110 | + break; |
|
| 111 | + case 'desc': |
|
| 112 | + $sort_args[1] = ''; |
|
| 113 | + $class .= ' gv-icon-sort-asc'; |
|
| 114 | + break; |
|
| 115 | + case 'asc': |
|
| 116 | + default: |
|
| 117 | + $sort_args[1] = 'desc'; |
|
| 118 | + $class .= ' gv-icon-sort-desc'; |
|
| 119 | + break; |
|
| 120 | + } |
|
| 121 | 121 | |
| 122 | 122 | } else { |
| 123 | 123 | $class .= ' gv-icon-caret-up-down'; |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | $url = remove_query_arg( 'sort', $url ); |
| 128 | 128 | $multisort_url = self::_get_multisort_url( $url, $sort_args, $context->field->ID ); |
| 129 | 129 | |
| 130 | - $url = add_query_arg( $sort_args[0], $sort_args[1], $url ); |
|
| 130 | + $url = add_query_arg( $sort_args[0], $sort_args[1], $url ); |
|
| 131 | 131 | |
| 132 | 132 | $return = '<a href="'. esc_url_raw( $url ) .'"'; |
| 133 | 133 | |
@@ -141,50 +141,50 @@ discard block |
||
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | /** |
| 144 | - * Get the multi-sort URL used in the sorting links |
|
| 145 | - * |
|
| 146 | - * @todo Consider moving to Utils? |
|
| 147 | - * |
|
| 148 | - * @since 2.3 |
|
| 149 | - * |
|
| 150 | - * @see add_columns_sort_links |
|
| 144 | + * Get the multi-sort URL used in the sorting links |
|
| 145 | + * |
|
| 146 | + * @todo Consider moving to Utils? |
|
| 147 | + * |
|
| 148 | + * @since 2.3 |
|
| 149 | + * |
|
| 150 | + * @see add_columns_sort_links |
|
| 151 | 151 | * @param string $url Single-sort URL |
| 152 | 152 | * @param array $sort_args Single sorting for rules, in [ field_id, dir ] format |
| 153 | - * @param string|int $field_id ID of the current field being displayed |
|
| 154 | - * |
|
| 155 | - * @return string Multisort URL, if there are multiple sorts. Otherwise, existing $url |
|
| 153 | + * @param string|int $field_id ID of the current field being displayed |
|
| 154 | + * |
|
| 155 | + * @return string Multisort URL, if there are multiple sorts. Otherwise, existing $url |
|
| 156 | 156 | */ |
| 157 | 157 | static public function _get_multisort_url( $url, $sort_args, $field_id ) { |
| 158 | 158 | |
| 159 | 159 | $sorts = Utils::_GET( 'sort' ); |
| 160 | 160 | |
| 161 | 161 | if ( ! is_array( $sorts ) ) { |
| 162 | - return $url; |
|
| 162 | + return $url; |
|
| 163 | 163 | } |
| 164 | 164 | |
| 165 | - $multisort_url = $url; |
|
| 165 | + $multisort_url = $url; |
|
| 166 | 166 | |
| 167 | 167 | // If the field has already been sorted by, add the field to the URL |
| 168 | - if ( ! in_array( $field_id, $keys = array_keys( $sorts ) ) ) { |
|
| 169 | - if ( count( $keys ) ) { |
|
| 170 | - $multisort_url = add_query_arg( sprintf( 'sort[%s]', end( $keys ) ), $sorts[ end( $keys ) ], $multisort_url ); |
|
| 171 | - $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url ); |
|
| 172 | - } else { |
|
| 173 | - $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url ); |
|
| 174 | - } |
|
| 175 | - } |
|
| 176 | - // Otherwise, we are just updating the sort order |
|
| 177 | - else { |
|
| 178 | - |
|
| 179 | - // Pass empty value to unset |
|
| 180 | - if( '' === $sort_args[1] ) { |
|
| 181 | - unset( $sorts[ $field_id ] ); |
|
| 182 | - } else { |
|
| 183 | - $sorts[ $field_id ] = $sort_args[1]; |
|
| 184 | - } |
|
| 185 | - |
|
| 186 | - $multisort_url = add_query_arg( array( 'sort' => $sorts ), $multisort_url ); |
|
| 187 | - } |
|
| 168 | + if ( ! in_array( $field_id, $keys = array_keys( $sorts ) ) ) { |
|
| 169 | + if ( count( $keys ) ) { |
|
| 170 | + $multisort_url = add_query_arg( sprintf( 'sort[%s]', end( $keys ) ), $sorts[ end( $keys ) ], $multisort_url ); |
|
| 171 | + $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url ); |
|
| 172 | + } else { |
|
| 173 | + $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url ); |
|
| 174 | + } |
|
| 175 | + } |
|
| 176 | + // Otherwise, we are just updating the sort order |
|
| 177 | + else { |
|
| 178 | + |
|
| 179 | + // Pass empty value to unset |
|
| 180 | + if( '' === $sort_args[1] ) { |
|
| 181 | + unset( $sorts[ $field_id ] ); |
|
| 182 | + } else { |
|
| 183 | + $sorts[ $field_id ] = $sort_args[1]; |
|
| 184 | + } |
|
| 185 | + |
|
| 186 | + $multisort_url = add_query_arg( array( 'sort' => $sorts ), $multisort_url ); |
|
| 187 | + } |
|
| 188 | 188 | |
| 189 | 189 | return $multisort_url; |
| 190 | 190 | } |
@@ -214,10 +214,10 @@ discard block |
||
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | /** |
| 217 | - * Returns the label for a column, with support for all deprecated filters |
|
| 218 | - * |
|
| 219 | - * @since 2.1 |
|
| 220 | - * |
|
| 217 | + * Returns the label for a column, with support for all deprecated filters |
|
| 218 | + * |
|
| 219 | + * @since 2.1 |
|
| 220 | + * |
|
| 221 | 221 | * @param \GV\Field $field |
| 222 | 222 | * @param \GV\Template_Context $context |
| 223 | 223 | */ |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | $column_label = apply_filters( 'gravityview/template/field/label', $column_label, $context ); |
| 241 | 241 | |
| 242 | 242 | return $column_label; |
| 243 | - } |
|
| 243 | + } |
|
| 244 | 244 | |
| 245 | 245 | /** |
| 246 | 246 | * Output the entry row. |
@@ -309,15 +309,15 @@ discard block |
||
| 309 | 309 | */ |
| 310 | 310 | do_action( 'gravityview/template/table/cells/before', $context ); |
| 311 | 311 | |
| 312 | - /** |
|
| 313 | - * @action `gravityview_table_cells_before` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells. |
|
| 314 | - * @since 1.0.7 |
|
| 312 | + /** |
|
| 313 | + * @action `gravityview_table_cells_before` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells. |
|
| 314 | + * @since 1.0.7 |
|
| 315 | 315 | * @param \GravityView_View $this Current GravityView_View object |
| 316 | 316 | * @deprecated Use `gravityview/template/table/cells/before` |
| 317 | - */ |
|
| 318 | - do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() ); |
|
| 317 | + */ |
|
| 318 | + do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() ); |
|
| 319 | 319 | |
| 320 | - foreach ( $fields->all() as $field ) { |
|
| 320 | + foreach ( $fields->all() as $field ) { |
|
| 321 | 321 | if ( isset( $this->view->unions[ $entry['form_id'] ] ) ) { |
| 322 | 322 | if ( isset( $this->view->unions[ $entry['form_id'] ][ $field->ID ] ) ) { |
| 323 | 323 | $field = $this->view->unions[ $entry['form_id'] ][ $field->ID ]; |
@@ -337,13 +337,13 @@ discard block |
||
| 337 | 337 | */ |
| 338 | 338 | do_action( 'gravityview/template/table/cells/after', $context ); |
| 339 | 339 | |
| 340 | - /** |
|
| 341 | - * @action `gravityview_table_cells_after` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells. |
|
| 342 | - * @since 1.0.7 |
|
| 340 | + /** |
|
| 341 | + * @action `gravityview_table_cells_after` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells. |
|
| 342 | + * @since 1.0.7 |
|
| 343 | 343 | * @param \GravityView_View $this Current GravityView_View object |
| 344 | 344 | * @deprecated Use `gravityview/template/table/cells/after` |
| 345 | - */ |
|
| 346 | - do_action( 'gravityview_table_cells_after', \GravityView_View::getInstance() ); |
|
| 345 | + */ |
|
| 346 | + do_action( 'gravityview_table_cells_after', \GravityView_View::getInstance() ); |
|
| 347 | 347 | |
| 348 | 348 | ?> |
| 349 | 349 | </tr> |
@@ -384,9 +384,9 @@ discard block |
||
| 384 | 384 | 'value' => $value, |
| 385 | 385 | 'hide_empty' => false, |
| 386 | 386 | 'zone_id' => 'directory_table-columns', |
| 387 | - 'label' => self::get_field_column_label( $field, $context ), |
|
| 387 | + 'label' => self::get_field_column_label( $field, $context ), |
|
| 388 | 388 | 'markup' => '<td id="{{ field_id }}" class="{{ class }}" data-label="{{label_value:data-label}}">{{ value }}</td>', |
| 389 | - 'form' => $form, |
|
| 389 | + 'form' => $form, |
|
| 390 | 390 | ); |
| 391 | 391 | |
| 392 | 392 | /** Output. */ |
@@ -411,11 +411,11 @@ discard block |
||
| 411 | 411 | do_action( 'gravityview/template/table/body/before', $context ); |
| 412 | 412 | |
| 413 | 413 | /** |
| 414 | - * @action `gravityview_table_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows. |
|
| 415 | - * @deprecated Use `gravityview/template/table/body/before` |
|
| 416 | - * @since 1.0.7 |
|
| 417 | - * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
| 418 | - */ |
|
| 414 | + * @action `gravityview_table_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows. |
|
| 415 | + * @deprecated Use `gravityview/template/table/body/before` |
|
| 416 | + * @since 1.0.7 |
|
| 417 | + * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
| 418 | + */ |
|
| 419 | 419 | do_action( 'gravityview_table_body_before', \GravityView_View::getInstance() /** ugh! */ ); |
| 420 | 420 | } |
| 421 | 421 | |
@@ -437,11 +437,11 @@ discard block |
||
| 437 | 437 | do_action( 'gravityview/template/table/body/after', $context ); |
| 438 | 438 | |
| 439 | 439 | /** |
| 440 | - * @action `gravityview_table_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows. |
|
| 441 | - * @deprecated Use `gravityview/template/table/body/after` |
|
| 442 | - * @since 1.0.7 |
|
| 443 | - * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
| 444 | - */ |
|
| 440 | + * @action `gravityview_table_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows. |
|
| 441 | + * @deprecated Use `gravityview/template/table/body/after` |
|
| 442 | + * @since 1.0.7 |
|
| 443 | + * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
| 444 | + */ |
|
| 445 | 445 | do_action( 'gravityview_table_body_after', \GravityView_View::getInstance() /** ugh! */ ); |
| 446 | 446 | } |
| 447 | 447 | |
@@ -69,22 +69,22 @@ discard block |
||
| 69 | 69 | if ( is_array( $sorts ) ) { |
| 70 | 70 | foreach ( (array)$sorts as $key => $direction ) { |
| 71 | 71 | if ( $key == $context->field->ID ) { |
| 72 | - $sorting['key'] = $context->field->ID; |
|
| 73 | - $sorting['direction'] = strtolower( $direction ); |
|
| 72 | + $sorting[ 'key' ] = $context->field->ID; |
|
| 73 | + $sorting[ 'direction' ] = strtolower( $direction ); |
|
| 74 | 74 | break; |
| 75 | 75 | } |
| 76 | 76 | } |
| 77 | 77 | } else { |
| 78 | 78 | if ( $sorts == $context->field->ID ) { |
| 79 | - $sorting['key'] = $context->field->ID; |
|
| 80 | - $sorting['direction'] = strtolower( Utils::_GET( 'dir', '' ) ); |
|
| 79 | + $sorting[ 'key' ] = $context->field->ID; |
|
| 80 | + $sorting[ 'direction' ] = strtolower( Utils::_GET( 'dir', '' ) ); |
|
| 81 | 81 | } |
| 82 | 82 | } |
| 83 | 83 | } else { |
| 84 | 84 | foreach ( (array)$context->view->settings->get( 'sort_field', array() ) as $i => $sort_field ) { |
| 85 | 85 | if ( $sort_field == $context->field->ID ) { |
| 86 | - $sorting['key'] = $sort_field; |
|
| 87 | - $sorting['direction'] = strtolower( Utils::get( $directions, $i, '' ) ); |
|
| 86 | + $sorting[ 'key' ] = $sort_field; |
|
| 87 | + $sorting[ 'direction' ] = strtolower( Utils::get( $directions, $i, '' ) ); |
|
| 88 | 88 | break; // Only get the first sort |
| 89 | 89 | } |
| 90 | 90 | } |
@@ -100,21 +100,21 @@ discard block |
||
| 100 | 100 | ); |
| 101 | 101 | |
| 102 | 102 | // If we are already sorting by the current field... |
| 103 | - if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) { |
|
| 103 | + if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) { |
|
| 104 | 104 | |
| 105 | - switch( $sorting['direction'] ) { |
|
| 105 | + switch ( $sorting[ 'direction' ] ) { |
|
| 106 | 106 | // No sort |
| 107 | 107 | case '': |
| 108 | - $sort_args[1] = 'asc'; |
|
| 108 | + $sort_args[ 1 ] = 'asc'; |
|
| 109 | 109 | $class .= ' gv-icon-caret-up-down'; |
| 110 | 110 | break; |
| 111 | 111 | case 'desc': |
| 112 | - $sort_args[1] = ''; |
|
| 112 | + $sort_args[ 1 ] = ''; |
|
| 113 | 113 | $class .= ' gv-icon-sort-asc'; |
| 114 | 114 | break; |
| 115 | 115 | case 'asc': |
| 116 | 116 | default: |
| 117 | - $sort_args[1] = 'desc'; |
|
| 117 | + $sort_args[ 1 ] = 'desc'; |
|
| 118 | 118 | $class .= ' gv-icon-sort-desc'; |
| 119 | 119 | break; |
| 120 | 120 | } |
@@ -127,15 +127,15 @@ discard block |
||
| 127 | 127 | $url = remove_query_arg( 'sort', $url ); |
| 128 | 128 | $multisort_url = self::_get_multisort_url( $url, $sort_args, $context->field->ID ); |
| 129 | 129 | |
| 130 | - $url = add_query_arg( $sort_args[0], $sort_args[1], $url ); |
|
| 130 | + $url = add_query_arg( $sort_args[ 0 ], $sort_args[ 1 ], $url ); |
|
| 131 | 131 | |
| 132 | - $return = '<a href="'. esc_url_raw( $url ) .'"'; |
|
| 132 | + $return = '<a href="' . esc_url_raw( $url ) . '"'; |
|
| 133 | 133 | |
| 134 | 134 | if ( ! empty( $multisort_url ) ) { |
| 135 | - $return .= ' data-multisort-href="'. esc_url_raw( $multisort_url ) . '"'; |
|
| 135 | + $return .= ' data-multisort-href="' . esc_url_raw( $multisort_url ) . '"'; |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | - $return .= ' class="'. $class .'" ></a> '. $column_label; |
|
| 138 | + $return .= ' class="' . $class . '" ></a> ' . $column_label; |
|
| 139 | 139 | |
| 140 | 140 | return $return; |
| 141 | 141 | } |
@@ -168,19 +168,19 @@ discard block |
||
| 168 | 168 | if ( ! in_array( $field_id, $keys = array_keys( $sorts ) ) ) { |
| 169 | 169 | if ( count( $keys ) ) { |
| 170 | 170 | $multisort_url = add_query_arg( sprintf( 'sort[%s]', end( $keys ) ), $sorts[ end( $keys ) ], $multisort_url ); |
| 171 | - $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url ); |
|
| 171 | + $multisort_url = add_query_arg( $sort_args[ 0 ], $sort_args[ 1 ], $multisort_url ); |
|
| 172 | 172 | } else { |
| 173 | - $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url ); |
|
| 173 | + $multisort_url = add_query_arg( $sort_args[ 0 ], $sort_args[ 1 ], $multisort_url ); |
|
| 174 | 174 | } |
| 175 | 175 | } |
| 176 | 176 | // Otherwise, we are just updating the sort order |
| 177 | 177 | else { |
| 178 | 178 | |
| 179 | 179 | // Pass empty value to unset |
| 180 | - if( '' === $sort_args[1] ) { |
|
| 180 | + if ( '' === $sort_args[ 1 ] ) { |
|
| 181 | 181 | unset( $sorts[ $field_id ] ); |
| 182 | 182 | } else { |
| 183 | - $sorts[ $field_id ] = $sort_args[1]; |
|
| 183 | + $sorts[ $field_id ] = $sort_args[ 1 ]; |
|
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | $multisort_url = add_query_arg( array( 'sort' => $sorts ), $multisort_url ); |
@@ -318,9 +318,9 @@ discard block |
||
| 318 | 318 | do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() ); |
| 319 | 319 | |
| 320 | 320 | foreach ( $fields->all() as $field ) { |
| 321 | - if ( isset( $this->view->unions[ $entry['form_id'] ] ) ) { |
|
| 322 | - if ( isset( $this->view->unions[ $entry['form_id'] ][ $field->ID ] ) ) { |
|
| 323 | - $field = $this->view->unions[ $entry['form_id'] ][ $field->ID ]; |
|
| 321 | + if ( isset( $this->view->unions[ $entry[ 'form_id' ] ] ) ) { |
|
| 322 | + if ( isset( $this->view->unions[ $entry[ 'form_id' ] ][ $field->ID ] ) ) { |
|
| 323 | + $field = $this->view->unions[ $entry[ 'form_id' ] ][ $field->ID ]; |
|
| 324 | 324 | } else { |
| 325 | 325 | if ( ! $field instanceof Internal_Field ) { |
| 326 | 326 | $field = Internal_Field::from_configuration( array( 'id' => 'custom' ) ); |
@@ -170,10 +170,10 @@ |
||
| 170 | 170 | */ |
| 171 | 171 | public function is_edit_entry( $form_id = 0 ) { |
| 172 | 172 | /** |
| 173 | - * @filter `gravityview_is_edit_entry` Whether we're currently on the Edit Entry screen \n |
|
| 174 | - * The Edit Entry functionality overrides this value. |
|
| 175 | - * @param boolean $is_edit_entry |
|
| 176 | - */ |
|
| 173 | + * @filter `gravityview_is_edit_entry` Whether we're currently on the Edit Entry screen \n |
|
| 174 | + * The Edit Entry functionality overrides this value. |
|
| 175 | + * @param boolean $is_edit_entry |
|
| 176 | + */ |
|
| 177 | 177 | if ( ( $entry = $this->is_entry( $form_id ) ) && apply_filters( 'gravityview_is_edit_entry', false ) ) { |
| 178 | 178 | if ( $entry->is_multi() ) { |
| 179 | 179 | return array_pop( $entry->entries ); |
@@ -173,7 +173,7 @@ |
||
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | $entry = Multi_Entry::from_entries( array_filter( $multientry ) ); |
| 176 | - } else { |
|
| 176 | + } else { |
|
| 177 | 177 | /** |
| 178 | 178 | * A regular one. |
| 179 | 179 | */ |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | */ |
| 70 | 70 | public static function is_add_oembed_preview() { |
| 71 | 71 | /** The preview request is a parse-embed AJAX call without a type set. */ |
| 72 | - return ( self::is_ajax() && ! empty( $_POST['action'] ) && $_POST['action'] == 'parse-embed' && ! isset( $_POST['type'] ) ); |
|
| 72 | + return ( self::is_ajax() && ! empty( $_POST[ 'action' ] ) && $_POST[ 'action' ] == 'parse-embed' && ! isset( $_POST[ 'type' ] ) ); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | /** |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | * @return boolean |
| 88 | 88 | */ |
| 89 | 89 | public static function is_rest() { |
| 90 | - return ! empty( $GLOBALS['wp']->query_vars['rest_route'] ); |
|
| 90 | + return ! empty( $GLOBALS[ 'wp' ]->query_vars[ 'rest_route' ] ); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | /** |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | return false; |
| 163 | 163 | } |
| 164 | 164 | |
| 165 | - if ( ! in_array( $e['form_id'], $valid_forms ) ) { |
|
| 165 | + if ( ! in_array( $e[ 'form_id' ], $valid_forms ) ) { |
|
| 166 | 166 | return false; |
| 167 | 167 | } |
| 168 | 168 | |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | } |
| 179 | 179 | |
| 180 | 180 | $entry = Multi_Entry::from_entries( array_filter( $multientry ) ); |
| 181 | - } else { |
|
| 181 | + } else { |
|
| 182 | 182 | /** |
| 183 | 183 | * A regular one. |
| 184 | 184 | */ |
@@ -236,15 +236,15 @@ discard block |
||
| 236 | 236 | $get = $_GET; |
| 237 | 237 | } |
| 238 | 238 | |
| 239 | - unset( $get['mode'] ); |
|
| 239 | + unset( $get[ 'mode' ] ); |
|
| 240 | 240 | |
| 241 | 241 | $get = array_filter( $get, 'gravityview_is_not_empty_string' ); |
| 242 | 242 | |
| 243 | - if( $this->_has_field_key( $get ) ) { |
|
| 243 | + if ( $this->_has_field_key( $get ) ) { |
|
| 244 | 244 | return true; |
| 245 | 245 | } |
| 246 | 246 | |
| 247 | - return isset( $get['gv_search'] ) || isset( $get['gv_start'] ) || isset( $get['gv_end'] ) || isset( $get['gv_by'] ) || isset( $get['gv_id'] ); |
|
| 247 | + return isset( $get[ 'gv_search' ] ) || isset( $get[ 'gv_start' ] ) || isset( $get[ 'gv_end' ] ) || isset( $get[ 'gv_by' ] ) || isset( $get[ 'gv_id' ] ); |
|
| 248 | 248 | } |
| 249 | 249 | |
| 250 | 250 | /** |
@@ -267,13 +267,13 @@ discard block |
||
| 267 | 267 | |
| 268 | 268 | $meta = array(); |
| 269 | 269 | foreach ( $fields as $field ) { |
| 270 | - if( empty( $field->_gf_field_class_name ) ) { |
|
| 271 | - $meta[] = preg_quote( $field->name ); |
|
| 270 | + if ( empty( $field->_gf_field_class_name ) ) { |
|
| 271 | + $meta[ ] = preg_quote( $field->name ); |
|
| 272 | 272 | } |
| 273 | 273 | } |
| 274 | 274 | |
| 275 | 275 | foreach ( $get as $key => $value ) { |
| 276 | - if ( preg_match('/^(filter|input)_(([0-9_]+)|'. implode( '|', $meta ) .')$/sm', $key ) ) { |
|
| 276 | + if ( preg_match( '/^(filter|input)_(([0-9_]+)|' . implode( '|', $meta ) . ')$/sm', $key ) ) { |
|
| 277 | 277 | $has_field_key = true; |
| 278 | 278 | break; |
| 279 | 279 | } |
@@ -326,6 +326,6 @@ |
||
| 326 | 326 | <a href="#" data-approved="{$choices['approved']['value']}" aria-role="button" aria-live="polite" class="gv-approval-toggle gv-approval-approved popover" title="{$choices['approved']['action']}"><span class="screen-reader-text">{$choices['approved']['action']}</span></a> |
| 327 | 327 | <a href="#" data-approved="{$choices['disapproved']['value']}" aria-role="button" aria-live="polite" class="gv-approval-toggle gv-approval-disapproved popover" title="{$choices['disapproved']['action']}"><span class="screen-reader-text">{$choices['disapproved']['action']}</span></a> |
| 328 | 328 | <a href="#" data-approved="{$choices['unapproved']['value']}" aria-role="button" aria-live="polite" class="gv-approval-toggle gv-approval-unapproved popover" title="{$choices['unapproved']['action']}"><span class="screen-reader-text">{$choices['unapproved']['action']}</span></a> |
| 329 | -TEMPLATE; |
|
| 329 | +template; |
|
| 330 | 330 | } |
| 331 | 331 | } |
@@ -39,13 +39,13 @@ discard block |
||
| 39 | 39 | private function add_hooks() { |
| 40 | 40 | |
| 41 | 41 | // in case entry is edited (on admin or frontend) |
| 42 | - add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2); |
|
| 42 | + add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2 ); |
|
| 43 | 43 | |
| 44 | 44 | // when using the User opt-in field, check on entry submission |
| 45 | 45 | add_action( 'gform_after_submission', array( $this, 'after_submission' ), 10, 2 ); |
| 46 | 46 | |
| 47 | 47 | // process ajax approve entry requests |
| 48 | - add_action('wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved')); |
|
| 48 | + add_action( 'wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved' ) ); |
|
| 49 | 49 | |
| 50 | 50 | // autounapprove |
| 51 | 51 | add_action( 'gravityview/edit_entry/after_update', array( __CLASS__, 'autounapprove' ), 10, 4 ); |
@@ -98,10 +98,10 @@ discard block |
||
| 98 | 98 | return; |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | - $form = GFAPI::get_form( $entry['form_id'] ); |
|
| 101 | + $form = GFAPI::get_form( $entry[ 'form_id' ] ); |
|
| 102 | 102 | |
| 103 | 103 | if ( ! $form ) { |
| 104 | - gravityview()->log->error( 'Form not found at ID #{form_id} for entry #{entry_id}', array( 'form_id' => $entry['form_id'], 'entry_id' => $entry_id ) ); |
|
| 104 | + gravityview()->log->error( 'Form not found at ID #{form_id} for entry #{entry_id}', array( 'form_id' => $entry[ 'form_id' ], 'entry_id' => $entry_id ) ); |
|
| 105 | 105 | return; |
| 106 | 106 | } |
| 107 | 107 | |
@@ -118,10 +118,10 @@ discard block |
||
| 118 | 118 | */ |
| 119 | 119 | public static function add_approval_notification_events( $notification_events = array(), $form = array() ) { |
| 120 | 120 | |
| 121 | - $notification_events['gravityview/approve_entries/approved'] = 'GravityView - ' . esc_html_x( 'Entry is approved', 'The title for an event in a notifications drop down list.', 'gk-gravityview' ); |
|
| 122 | - $notification_events['gravityview/approve_entries/disapproved'] = 'GravityView - ' . esc_html_x( 'Entry is disapproved', 'The title for an event in a notifications drop down list.', 'gk-gravityview' ); |
|
| 123 | - $notification_events['gravityview/approve_entries/unapproved'] = 'GravityView - ' . esc_html_x( 'Entry approval is reset', 'The title for an event in a notifications drop down list.', 'gk-gravityview' ); |
|
| 124 | - $notification_events['gravityview/approve_entries/updated'] = 'GravityView - ' . esc_html_x( 'Entry approval is changed', 'The title for an event in a notifications drop down list.', 'gk-gravityview' ); |
|
| 121 | + $notification_events[ 'gravityview/approve_entries/approved' ] = 'GravityView - ' . esc_html_x( 'Entry is approved', 'The title for an event in a notifications drop down list.', 'gk-gravityview' ); |
|
| 122 | + $notification_events[ 'gravityview/approve_entries/disapproved' ] = 'GravityView - ' . esc_html_x( 'Entry is disapproved', 'The title for an event in a notifications drop down list.', 'gk-gravityview' ); |
|
| 123 | + $notification_events[ 'gravityview/approve_entries/unapproved' ] = 'GravityView - ' . esc_html_x( 'Entry approval is reset', 'The title for an event in a notifications drop down list.', 'gk-gravityview' ); |
|
| 124 | + $notification_events[ 'gravityview/approve_entries/updated' ] = 'GravityView - ' . esc_html_x( 'Entry approval is changed', 'The title for an event in a notifications drop down list.', 'gk-gravityview' ); |
|
| 125 | 125 | |
| 126 | 126 | return $notification_events; |
| 127 | 127 | } |
@@ -139,13 +139,13 @@ discard block |
||
| 139 | 139 | */ |
| 140 | 140 | public static function get_entry_status( $entry, $value_or_label = 'label' ) { |
| 141 | 141 | |
| 142 | - $entry_id = is_array( $entry ) ? $entry['id'] : GVCommon::get_entry_id( $entry, true ); |
|
| 142 | + $entry_id = is_array( $entry ) ? $entry[ 'id' ] : GVCommon::get_entry_id( $entry, true ); |
|
| 143 | 143 | |
| 144 | 144 | $status = gform_get_meta( $entry_id, self::meta_key ); |
| 145 | 145 | |
| 146 | 146 | $status = GravityView_Entry_Approval_Status::maybe_convert_status( $status ); |
| 147 | 147 | |
| 148 | - if( 'value' === $value_or_label ) { |
|
| 148 | + if ( 'value' === $value_or_label ) { |
|
| 149 | 149 | return $status; |
| 150 | 150 | } |
| 151 | 151 | |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | $nonce = \GV\Utils::_POST( 'nonce' ); |
| 184 | 184 | |
| 185 | 185 | // Valid status |
| 186 | - if( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) { |
|
| 186 | + if ( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) { |
|
| 187 | 187 | |
| 188 | 188 | gravityview()->log->error( 'Invalid approval status', array( 'data' => $_POST ) ); |
| 189 | 189 | |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | |
| 215 | 215 | gravityview()->log->error( 'User does not have the `gravityview_moderate_entries` capability.' ); |
| 216 | 216 | |
| 217 | - $result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gk-gravityview') ); |
|
| 217 | + $result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gk-gravityview' ) ); |
|
| 218 | 218 | |
| 219 | 219 | } |
| 220 | 220 | |
@@ -276,10 +276,10 @@ discard block |
||
| 276 | 276 | } |
| 277 | 277 | |
| 278 | 278 | // Set default |
| 279 | - self::update_approved_meta( $entry['id'], $default_status, $entry['form_id'] ); |
|
| 279 | + self::update_approved_meta( $entry[ 'id' ], $default_status, $entry[ 'form_id' ] ); |
|
| 280 | 280 | |
| 281 | 281 | // Then check for if there is an approval column, and use that value instead |
| 282 | - $this->after_update_entry_update_approved_meta( $form , $entry['id'] ); |
|
| 282 | + $this->after_update_entry_update_approved_meta( $form, $entry[ 'id' ] ); |
|
| 283 | 283 | } |
| 284 | 284 | |
| 285 | 285 | /** |
@@ -293,12 +293,12 @@ discard block |
||
| 293 | 293 | */ |
| 294 | 294 | public function after_update_entry_update_approved_meta( $form, $entry_id = NULL ) { |
| 295 | 295 | |
| 296 | - $approved_column = self::get_approved_column( $form['id'] ); |
|
| 296 | + $approved_column = self::get_approved_column( $form[ 'id' ] ); |
|
| 297 | 297 | |
| 298 | 298 | /** |
| 299 | 299 | * If the form doesn't contain the approve field, don't assume anything. |
| 300 | 300 | */ |
| 301 | - if( empty( $approved_column ) ) { |
|
| 301 | + if ( empty( $approved_column ) ) { |
|
| 302 | 302 | return; |
| 303 | 303 | } |
| 304 | 304 | |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | */ |
| 321 | 321 | $value = apply_filters( 'gravityview/approve_entries/update_unapproved_meta', $value, $form, $entry ); |
| 322 | 322 | |
| 323 | - self::update_approved_meta( $entry_id, $value, $form['id'] ); |
|
| 323 | + self::update_approved_meta( $entry_id, $value, $form[ 'id' ] ); |
|
| 324 | 324 | } |
| 325 | 325 | |
| 326 | 326 | /** |
@@ -337,12 +337,12 @@ discard block |
||
| 337 | 337 | */ |
| 338 | 338 | public static function update_bulk( $entries = array(), $approved = 0, $form_id = 0 ) { |
| 339 | 339 | |
| 340 | - if( empty($entries) || ( $entries !== true && !is_array($entries) ) ) { |
|
| 340 | + if ( empty( $entries ) || ( $entries !== true && ! is_array( $entries ) ) ) { |
|
| 341 | 341 | gravityview()->log->error( 'Entries were empty or malformed.', array( 'data' => $entries ) ); |
| 342 | 342 | return NULL; |
| 343 | 343 | } |
| 344 | 344 | |
| 345 | - if( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) { |
|
| 345 | + if ( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) { |
|
| 346 | 346 | gravityview()->log->error( 'User does not have the `gravityview_moderate_entries` capability.' ); |
| 347 | 347 | return NULL; |
| 348 | 348 | } |
@@ -357,10 +357,10 @@ discard block |
||
| 357 | 357 | $approved_column_id = self::get_approved_column( $form_id ); |
| 358 | 358 | |
| 359 | 359 | $success = true; |
| 360 | - foreach( $entries as $entry_id ) { |
|
| 360 | + foreach ( $entries as $entry_id ) { |
|
| 361 | 361 | $update_success = self::update_approved( (int)$entry_id, $approved, $form_id, $approved_column_id ); |
| 362 | 362 | |
| 363 | - if( ! $update_success ) { |
|
| 363 | + if ( ! $update_success ) { |
|
| 364 | 364 | $success = false; |
| 365 | 365 | } |
| 366 | 366 | } |
@@ -383,12 +383,12 @@ discard block |
||
| 383 | 383 | */ |
| 384 | 384 | public static function update_approved( $entry_id = 0, $approved = 2, $form_id = 0, $approvedcolumn = 0 ) { |
| 385 | 385 | |
| 386 | - if( !class_exists( 'GFAPI' ) ) { |
|
| 386 | + if ( ! class_exists( 'GFAPI' ) ) { |
|
| 387 | 387 | gravityview()->log->error( 'GFAPI does not exist' ); |
| 388 | 388 | return false; |
| 389 | 389 | } |
| 390 | 390 | |
| 391 | - if( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) { |
|
| 391 | + if ( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) { |
|
| 392 | 392 | gravityview()->log->error( 'Not a valid approval value.' ); |
| 393 | 393 | return false; |
| 394 | 394 | } |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | // If the form has an Approve/Reject field, update that value |
| 406 | 406 | $result = self::update_approved_column( $entry_id, $approved, $form_id, $approvedcolumn ); |
| 407 | 407 | |
| 408 | - if( is_wp_error( $result ) ) { |
|
| 408 | + if ( is_wp_error( $result ) ) { |
|
| 409 | 409 | gravityview()->log->error( 'Entry approval not updated: {error}', array( 'error' => $result->get_error_message() ) ); |
| 410 | 410 | return false; |
| 411 | 411 | } |
@@ -417,7 +417,7 @@ discard block |
||
| 417 | 417 | |
| 418 | 418 | // add note to entry if approval field updating worked or there was no approved field |
| 419 | 419 | // There's no validation for the meta |
| 420 | - if( true === $result ) { |
|
| 420 | + if ( true === $result ) { |
|
| 421 | 421 | |
| 422 | 422 | // Add an entry note |
| 423 | 423 | self::add_approval_status_updated_note( $entry_id, $approved ); |
@@ -470,7 +470,7 @@ discard block |
||
| 470 | 470 | |
| 471 | 471 | $note_id = false; |
| 472 | 472 | |
| 473 | - if( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) { |
|
| 473 | + if ( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) { |
|
| 474 | 474 | |
| 475 | 475 | $current_user = wp_get_current_user(); |
| 476 | 476 | |
@@ -492,7 +492,7 @@ discard block |
||
| 492 | 492 | */ |
| 493 | 493 | private static function update_approved_column( $entry_id = 0, $status = '0', $form_id = 0, $approvedcolumn = 0 ) { |
| 494 | 494 | |
| 495 | - if( empty( $approvedcolumn ) ) { |
|
| 495 | + if ( empty( $approvedcolumn ) ) { |
|
| 496 | 496 | $approvedcolumn = self::get_approved_column( $form_id ); |
| 497 | 497 | } |
| 498 | 498 | |
@@ -515,12 +515,12 @@ discard block |
||
| 515 | 515 | $status = GravityView_Entry_Approval_Status::maybe_convert_status( $status ); |
| 516 | 516 | |
| 517 | 517 | $new_value = ''; |
| 518 | - if( GravityView_Entry_Approval_Status::APPROVED === $status ) { |
|
| 518 | + if ( GravityView_Entry_Approval_Status::APPROVED === $status ) { |
|
| 519 | 519 | $new_value = self::get_approved_column_input_label( $form_id, $approvedcolumn ); |
| 520 | 520 | } |
| 521 | 521 | |
| 522 | 522 | //update entry |
| 523 | - $entry["{$approvedcolumn}"] = $new_value; |
|
| 523 | + $entry[ "{$approvedcolumn}" ] = $new_value; |
|
| 524 | 524 | |
| 525 | 525 | /** |
| 526 | 526 | * Note: GFAPI::update_entry() doesn't trigger `gform_after_update_entry`, so we trigger updating the meta ourselves |
@@ -551,12 +551,12 @@ discard block |
||
| 551 | 551 | // If the user has enabled a different value than the label (for some reason), use it. |
| 552 | 552 | // This is highly unlikely |
| 553 | 553 | if ( is_array( $field->choices ) && ! empty( $field->choices ) ) { |
| 554 | - return isset( $field->choices[0]['value'] ) ? $field->choices[0]['value'] : $field->choices[0]['text']; |
|
| 554 | + return isset( $field->choices[ 0 ][ 'value' ] ) ? $field->choices[ 0 ][ 'value' ] : $field->choices[ 0 ][ 'text' ]; |
|
| 555 | 555 | } |
| 556 | 556 | |
| 557 | 557 | // Otherwise, fall back on the inputs array |
| 558 | 558 | if ( is_array( $field->inputs ) && ! empty( $field->inputs ) ) { |
| 559 | - return $field->inputs[0]['label']; |
|
| 559 | + return $field->inputs[ 0 ][ 'label' ]; |
|
| 560 | 560 | } |
| 561 | 561 | |
| 562 | 562 | return null; |
@@ -608,7 +608,7 @@ discard block |
||
| 608 | 608 | * @since 1.18 Added "unapproved" |
| 609 | 609 | * @param int $entry_id ID of the Gravity Forms entry |
| 610 | 610 | */ |
| 611 | - do_action( 'gravityview/approve_entries/' . $action , $entry_id ); |
|
| 611 | + do_action( 'gravityview/approve_entries/' . $action, $entry_id ); |
|
| 612 | 612 | } |
| 613 | 613 | |
| 614 | 614 | /** |
@@ -620,11 +620,11 @@ discard block |
||
| 620 | 620 | */ |
| 621 | 621 | static public function get_approved_column( $form ) { |
| 622 | 622 | |
| 623 | - if( empty( $form ) ) { |
|
| 623 | + if ( empty( $form ) ) { |
|
| 624 | 624 | return null; |
| 625 | 625 | } |
| 626 | 626 | |
| 627 | - if( !is_array( $form ) ) { |
|
| 627 | + if ( ! is_array( $form ) ) { |
|
| 628 | 628 | $form = GVCommon::get_form( $form ); |
| 629 | 629 | } |
| 630 | 630 | |
@@ -634,22 +634,22 @@ discard block |
||
| 634 | 634 | * @var string $key |
| 635 | 635 | * @var GF_Field $field |
| 636 | 636 | */ |
| 637 | - foreach( $form['fields'] as $key => $field ) { |
|
| 637 | + foreach ( $form[ 'fields' ] as $key => $field ) { |
|
| 638 | 638 | |
| 639 | 639 | $inputs = $field->get_entry_inputs(); |
| 640 | 640 | |
| 641 | - if( !empty( $field->gravityview_approved ) ) { |
|
| 642 | - if ( ! empty( $inputs ) && !empty( $inputs[0]['id'] ) ) { |
|
| 643 | - $approved_column_id = $inputs[0]['id']; |
|
| 641 | + if ( ! empty( $field->gravityview_approved ) ) { |
|
| 642 | + if ( ! empty( $inputs ) && ! empty( $inputs[ 0 ][ 'id' ] ) ) { |
|
| 643 | + $approved_column_id = $inputs[ 0 ][ 'id' ]; |
|
| 644 | 644 | break; |
| 645 | 645 | } |
| 646 | 646 | } |
| 647 | 647 | |
| 648 | 648 | // Note: This is just for backward compatibility from GF Directory plugin and old GV versions - when using i18n it may not work.. |
| 649 | - if( 'checkbox' === $field->type && ! empty( $inputs ) ) { |
|
| 649 | + if ( 'checkbox' === $field->type && ! empty( $inputs ) ) { |
|
| 650 | 650 | foreach ( $inputs as $input ) { |
| 651 | - if ( 'approved' === strtolower( $input['label'] ) ) { |
|
| 652 | - $approved_column_id = $input['id']; |
|
| 651 | + if ( 'approved' === strtolower( $input[ 'label' ] ) ) { |
|
| 652 | + $approved_column_id = $input[ 'id' ]; |
|
| 653 | 653 | break; |
| 654 | 654 | } |
| 655 | 655 | } |
@@ -675,7 +675,7 @@ discard block |
||
| 675 | 675 | |
| 676 | 676 | $view_keys = array_keys( $gv_data->get_views() ); |
| 677 | 677 | |
| 678 | - $view = \GV\View::by_id( $view_keys[0] ); |
|
| 678 | + $view = \GV\View::by_id( $view_keys[ 0 ] ); |
|
| 679 | 679 | |
| 680 | 680 | if ( ! $view->settings->get( 'unapprove_edit' ) ) { |
| 681 | 681 | return; |
@@ -700,11 +700,11 @@ discard block |
||
| 700 | 700 | return; |
| 701 | 701 | } |
| 702 | 702 | |
| 703 | - if( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) { |
|
| 703 | + if ( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) { |
|
| 704 | 704 | $approval_status = GravityView_Entry_Approval_Status::UNAPPROVED; |
| 705 | 705 | } |
| 706 | 706 | |
| 707 | - self::update_approved_meta( $entry_id, $approval_status, $form['id'] ); |
|
| 707 | + self::update_approved_meta( $entry_id, $approval_status, $form[ 'id' ] ); |
|
| 708 | 708 | } |
| 709 | 709 | |
| 710 | 710 | /** |
@@ -742,9 +742,9 @@ discard block |
||
| 742 | 742 | $choices = GravityView_Entry_Approval_Status::get_all(); |
| 743 | 743 | |
| 744 | 744 | return <<<TEMPLATE |
| 745 | -<a href="#" data-approved="{$choices['approved']['value']}" aria-role="button" aria-live="polite" class="gv-approval-toggle gv-approval-approved popover" title="{$choices['approved']['action']}"><span class="screen-reader-text">{$choices['approved']['action']}</span></a> |
|
| 746 | -<a href="#" data-approved="{$choices['disapproved']['value']}" aria-role="button" aria-live="polite" class="gv-approval-toggle gv-approval-disapproved popover" title="{$choices['disapproved']['action']}"><span class="screen-reader-text">{$choices['disapproved']['action']}</span></a> |
|
| 747 | -<a href="#" data-approved="{$choices['unapproved']['value']}" aria-role="button" aria-live="polite" class="gv-approval-toggle gv-approval-unapproved popover" title="{$choices['unapproved']['action']}"><span class="screen-reader-text">{$choices['unapproved']['action']}</span></a> |
|
| 745 | +<a href="#" data-approved="{$choices[ 'approved' ][ 'value' ]}" aria-role="button" aria-live="polite" class="gv-approval-toggle gv-approval-approved popover" title="{$choices[ 'approved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'approved' ][ 'action' ]}</span></a> |
|
| 746 | +<a href="#" data-approved="{$choices[ 'disapproved' ][ 'value' ]}" aria-role="button" aria-live="polite" class="gv-approval-toggle gv-approval-disapproved popover" title="{$choices[ 'disapproved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'disapproved' ][ 'action' ]}</span></a> |
|
| 747 | +<a href="#" data-approved="{$choices[ 'unapproved' ][ 'value' ]}" aria-role="button" aria-live="polite" class="gv-approval-toggle gv-approval-unapproved popover" title="{$choices[ 'unapproved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'unapproved' ][ 'action' ]}</span></a> |
|
| 748 | 748 | TEMPLATE; |
| 749 | 749 | } |
| 750 | 750 | } |
@@ -104,11 +104,11 @@ discard block |
||
| 104 | 104 | |
| 105 | 105 | /** Call all lazy callbacks. */ |
| 106 | 106 | foreach ( $this->callbacks as $callback ) { |
| 107 | - if ( $callback[0] != 'count' ) { |
|
| 107 | + if ( $callback[ 0 ] != 'count' ) { |
|
| 108 | 108 | continue; |
| 109 | 109 | } |
| 110 | 110 | |
| 111 | - $total += $callback[1]( $this->filters ); |
|
| 111 | + $total += $callback[ 1 ]( $this->filters ); |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | if ( ! $total ) { |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | |
| 149 | 149 | foreach ( $this->all() as $entry ) { |
| 150 | 150 | $entry = $entry->as_entry(); |
| 151 | - $result[] = Utils::get( $entry, $key, null ); |
|
| 151 | + $result[ ] = Utils::get( $entry, $key, null ); |
|
| 152 | 152 | } |
| 153 | 153 | |
| 154 | 154 | return $result; |
@@ -206,11 +206,11 @@ discard block |
||
| 206 | 206 | |
| 207 | 207 | /** Call all lazy callbacks. */ |
| 208 | 208 | foreach ( $this->callbacks as $i => $callback ) { |
| 209 | - if ( $callback[0] != 'fetch' ) { |
|
| 209 | + if ( $callback[ 0 ] != 'fetch' ) { |
|
| 210 | 210 | continue; |
| 211 | 211 | } |
| 212 | 212 | |
| 213 | - $this->merge( $callback[1]( $this->filters, $this->sorts, $offset ) ); |
|
| 213 | + $this->merge( $callback[ 1 ]( $this->filters, $this->sorts, $offset ) ); |
|
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | $this->fetched = parent::count(); |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | return; |
| 367 | 367 | } |
| 368 | 368 | |
| 369 | - $this->callbacks []= array( $type, $callback ); |
|
| 369 | + $this->callbacks [ ] = array( $type, $callback ); |
|
| 370 | 370 | } |
| 371 | 371 | |
| 372 | 372 | /** |
@@ -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> |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | $default_size = 25; |
| 50 | 50 | |
| 51 | 51 | if ( $context instanceof \GV\Template_Context ) { |
| 52 | - $default_size = (int) $context->view->settings->get( 'page_size' ); |
|
| 52 | + $default_size = (int)$context->view->settings->get( 'page_size' ); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | $sizes = array( 10, 25, $default_size, 50, 100 ); |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | |
| 61 | 61 | $page_sizes = array(); |
| 62 | 62 | foreach ( $sizes as $size ) { |
| 63 | - $page_sizes [] = array( |
|
| 63 | + $page_sizes [ ] = array( |
|
| 64 | 64 | 'value' => $size, |
| 65 | 65 | 'text' => $size |
| 66 | 66 | ); |
@@ -85,11 +85,11 @@ discard block |
||
| 85 | 85 | */ |
| 86 | 86 | public function render_frontend( $widget_args, $content = '', $context = null ) { |
| 87 | 87 | |
| 88 | - if( ! $this->pre_render_frontend() ) { |
|
| 88 | + if ( ! $this->pre_render_frontend() ) { |
|
| 89 | 89 | return; |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | - $page_size = (int) \GV\Utils::_GET( 'page_size', $context->view->settings->get( 'page_size' ) ); |
|
| 92 | + $page_size = (int)\GV\Utils::_GET( 'page_size', $context->view->settings->get( 'page_size' ) ); |
|
| 93 | 93 | |
| 94 | 94 | $settings = shortcode_atts( array( |
| 95 | 95 | 'label' => __( 'Page Size', 'gk-gravityview' ), |
@@ -108,20 +108,20 @@ discard block |
||
| 108 | 108 | <div class="gv-widget-page-size"> |
| 109 | 109 | <form method="get" action="<?php echo esc_url( add_query_arg( array() ) ); ?>" onchange="this.submit();"> |
| 110 | 110 | <div> |
| 111 | - <?php if( ! empty( $settings['label'] ) ) { ?> |
|
| 112 | - <label for="gv-page_size"><?php echo esc_html( $settings['label'] ); ?></label> |
|
| 111 | + <?php if ( ! empty( $settings[ 'label' ] ) ) { ?> |
|
| 112 | + <label for="gv-page_size"><?php echo esc_html( $settings[ 'label' ] ); ?></label> |
|
| 113 | 113 | <?php } ?> |
| 114 | 114 | <select name="page_size" id="gv-page_size"> |
| 115 | - <option value=""><?php echo esc_html( $settings['default_choice_text'] ); ?></option> |
|
| 115 | + <option value=""><?php echo esc_html( $settings[ 'default_choice_text' ] ); ?></option> |
|
| 116 | 116 | <?php |
| 117 | - foreach ( $settings['choices'] as $choice ) { ?> |
|
| 118 | - <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 | + foreach ( $settings[ 'choices' ] as $choice ) { ?> |
|
| 118 | + <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> |
|
| 119 | 119 | <?php } ?> |
| 120 | 120 | </select> |
| 121 | 121 | <input type="submit" value="Submit" style="visibility: hidden; position: absolute;" /><?php |
| 122 | - if( ! empty( $_GET ) ) { |
|
| 122 | + if ( ! empty( $_GET ) ) { |
|
| 123 | 123 | $get = $_GET; |
| 124 | - unset( $get['page_size'] ); |
|
| 124 | + unset( $get[ 'page_size' ] ); |
|
| 125 | 125 | foreach ( $get as $key => $value ) { |
| 126 | 126 | if ( is_array( $value ) ) { |
| 127 | 127 | foreach ( $value as $_key => $_value ) { |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | // Already overridden |
| 163 | - if ( (int) $page_size === (int) $view->settings->get( 'page_size' ) ) { |
|
| 163 | + if ( (int)$page_size === (int)$view->settings->get( 'page_size' ) ) { |
|
| 164 | 164 | return; |
| 165 | 165 | } |
| 166 | 166 | |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | 'view' => $view, |
| 169 | 169 | ) ); |
| 170 | 170 | |
| 171 | - if ( ! in_array( (int) $page_size, wp_list_pluck( self::get_page_sizes( $context ), 'value' ), true ) ) { |
|
| 171 | + if ( ! in_array( (int)$page_size, wp_list_pluck( self::get_page_sizes( $context ), 'value' ), true ) ) { |
|
| 172 | 172 | gravityview()->log->warning( 'The passed page size is not allowed: {page_size}. Not modifying result.', array( 'page_size' => $page_size ) ); |
| 173 | 173 | return; |
| 174 | 174 | } |
@@ -24,13 +24,13 @@ |
||
| 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 | } |
@@ -28,13 +28,13 @@ |
||
| 28 | 28 | |
| 29 | 29 | public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) { |
| 30 | 30 | |
| 31 | - if( 'edit' === $context ) { |
|
| 31 | + if ( 'edit' === $context ) { |
|
| 32 | 32 | return $field_options; |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | - $this->add_field_support('link_to_post', $field_options ); |
|
| 35 | + $this->add_field_support( 'link_to_post', $field_options ); |
|
| 36 | 36 | |
| 37 | - $this->add_field_support('dynamic_data', $field_options ); |
|
| 37 | + $this->add_field_support( 'dynamic_data', $field_options ); |
|
| 38 | 38 | |
| 39 | 39 | return $field_options; |
| 40 | 40 | } |
@@ -35,11 +35,11 @@ discard block |
||
| 35 | 35 | |
| 36 | 36 | public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) { |
| 37 | 37 | |
| 38 | - if( 'edit' === $context ) { |
|
| 38 | + if ( 'edit' === $context ) { |
|
| 39 | 39 | return $field_options; |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | - $this->add_field_support('date_display', $field_options ); |
|
| 42 | + $this->add_field_support( 'date_display', $field_options ); |
|
| 43 | 43 | |
| 44 | 44 | return $field_options; |
| 45 | 45 | } |
@@ -61,9 +61,9 @@ discard block |
||
| 61 | 61 | public function get_content( $output = '', $entry = array(), $field_settings = array(), $field = array() ) { |
| 62 | 62 | |
| 63 | 63 | /** Overridden by a template. */ |
| 64 | - if( ! empty( $field['field_path'] ) ) { return $output; } |
|
| 64 | + if ( ! empty( $field[ 'field_path' ] ) ) { return $output; } |
|
| 65 | 65 | |
| 66 | - return GVCommon::format_date( $field['value'], 'format=' . \GV\Utils::get( $field_settings, 'date_display' ) ); |
|
| 66 | + return GVCommon::format_date( $field[ 'value' ], 'format=' . \GV\Utils::get( $field_settings, 'date_display' ) ); |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | /** |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | * |
| 82 | 82 | * @return string Original text if {date_created} isn't found. Otherwise, replaced text. |
| 83 | 83 | */ |
| 84 | - public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) { |
|
| 84 | + public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) { |
|
| 85 | 85 | |
| 86 | 86 | $return = $text; |
| 87 | 87 | |
@@ -90,8 +90,8 @@ discard block |
||
| 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 | 96 | $formatted_date = GravityView_Merge_Tags::format_date( $date_created, $property ); |
| 97 | 97 | |