@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | private function add_hooks() { |
| 38 | - /** @see \GV\Field::get_value_filters */ |
|
| 38 | + /** @see \GV\Field::get_value_filters */ |
|
| 39 | 39 | add_filter( "gravityview/field/{$this->name}/output", array( $this, 'get_content' ), 4, 2 ); |
| 40 | 40 | add_action( 'gravityview/template/after', array( $this, 'print_script'), 10, 1 ); |
| 41 | 41 | add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 ); |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | public function get_content( $output, $template ) { |
| 77 | 77 | $entry = $template->entry; |
| 78 | 78 | |
| 79 | - $star_url = GFCommon::get_base_url() .'/images/star' . intval( $entry['is_starred'] ) .'.png'; |
|
| 79 | + $star_url = GFCommon::get_base_url() .'/images/star' . intval( $entry['is_starred'] ) .'.png'; |
|
| 80 | 80 | |
| 81 | 81 | $entry_id = ''; |
| 82 | 82 | |
@@ -94,11 +94,11 @@ discard block |
||
| 94 | 94 | |
| 95 | 95 | /** |
| 96 | 96 | * Add JS to the bottom of the View if there is a star field and user has `gravityview_edit_entries` cap |
| 97 | - * |
|
| 97 | + * |
|
| 98 | 98 | * @param \GV\Template_Context $context The template context |
| 99 | - * @since 2.0 |
|
| 100 | - * |
|
| 101 | - * @return void |
|
| 99 | + * @since 2.0 |
|
| 100 | + * |
|
| 101 | + * @return void |
|
| 102 | 102 | */ |
| 103 | 103 | public function print_script( $context ) { |
| 104 | 104 | |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | if ( ! GravityView_Roles_Capabilities::has_cap( 'gravityview_edit_entries' ) ) { |
| 110 | - return; |
|
| 110 | + return; |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | ?> |
@@ -328,34 +328,34 @@ discard block |
||
| 328 | 328 | } |
| 329 | 329 | |
| 330 | 330 | /** |
| 331 | - * Get the fields for a specific context |
|
| 332 | - * |
|
| 333 | - * @since 1.19.2 |
|
| 334 | - * |
|
| 331 | + * Get the fields for a specific context |
|
| 332 | + * |
|
| 333 | + * @since 1.19.2 |
|
| 334 | + * |
|
| 335 | 335 | * @param string $context [Optional] "directory", "single", or "edit" |
| 336 | 336 | * |
| 337 | 337 | * @return array Array of GravityView field layout configurations |
| 338 | 338 | */ |
| 339 | 339 | public function getContextFields( $context = '' ) { |
| 340 | 340 | |
| 341 | - if( '' === $context ) { |
|
| 342 | - $context = $this->getContext(); |
|
| 343 | - } |
|
| 341 | + if( '' === $context ) { |
|
| 342 | + $context = $this->getContext(); |
|
| 343 | + } |
|
| 344 | 344 | |
| 345 | 345 | $fields = $this->getFields(); |
| 346 | 346 | |
| 347 | - foreach ( (array) $fields as $key => $context_fields ) { |
|
| 347 | + foreach ( (array) $fields as $key => $context_fields ) { |
|
| 348 | 348 | |
| 349 | - // Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against |
|
| 350 | - $matches = explode( '_', $key ); |
|
| 349 | + // Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against |
|
| 350 | + $matches = explode( '_', $key ); |
|
| 351 | 351 | |
| 352 | - if( isset( $matches[0] ) && $matches[0] === $context ) { |
|
| 353 | - return $context_fields; |
|
| 354 | - } |
|
| 355 | - } |
|
| 352 | + if( isset( $matches[0] ) && $matches[0] === $context ) { |
|
| 353 | + return $context_fields; |
|
| 354 | + } |
|
| 355 | + } |
|
| 356 | 356 | |
| 357 | 357 | return array(); |
| 358 | - } |
|
| 358 | + } |
|
| 359 | 359 | |
| 360 | 360 | /** |
| 361 | 361 | * @param array $fields |
@@ -448,10 +448,10 @@ discard block |
||
| 448 | 448 | */ |
| 449 | 449 | public function getPaging() { |
| 450 | 450 | |
| 451 | - $default_params = array( |
|
| 452 | - 'offset' => 0, |
|
| 453 | - 'page_size' => 20, |
|
| 454 | - ); |
|
| 451 | + $default_params = array( |
|
| 452 | + 'offset' => 0, |
|
| 453 | + 'page_size' => 20, |
|
| 454 | + ); |
|
| 455 | 455 | |
| 456 | 456 | return wp_parse_args( $this->paging, $default_params ); |
| 457 | 457 | } |
@@ -508,10 +508,10 @@ discard block |
||
| 508 | 508 | public function getSorting() { |
| 509 | 509 | |
| 510 | 510 | $defaults_params = array( |
| 511 | - 'sort_field' => 'date_created', |
|
| 512 | - 'sort_direction' => 'ASC', |
|
| 513 | - 'is_numeric' => false, |
|
| 514 | - ); |
|
| 511 | + 'sort_field' => 'date_created', |
|
| 512 | + 'sort_direction' => 'ASC', |
|
| 513 | + 'is_numeric' => false, |
|
| 514 | + ); |
|
| 515 | 515 | |
| 516 | 516 | return wp_parse_args( $this->sorting, $defaults_params ); |
| 517 | 517 | } |
@@ -837,7 +837,7 @@ discard block |
||
| 837 | 837 | */ |
| 838 | 838 | public function render_widget_hooks( $view_id_or_context ) { |
| 839 | 839 | |
| 840 | - /** |
|
| 840 | + /** |
|
| 841 | 841 | * @deprecated Numeric argument is deprecated. Pass a \GV\Template_Context instead. |
| 842 | 842 | */ |
| 843 | 843 | if ( is_numeric( $view_id_or_context ) ) { |
@@ -151,11 +151,11 @@ discard block |
||
| 151 | 151 | do_action( 'gravityview/template/list/body/before', $context ); |
| 152 | 152 | |
| 153 | 153 | /** |
| 154 | - * @action `gravityview_list_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows. |
|
| 155 | - * @deprecated Use `gravityview/template/list/body/before` |
|
| 156 | - * @since 1.0.7 |
|
| 157 | - * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
| 158 | - */ |
|
| 154 | + * @action `gravityview_list_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows. |
|
| 155 | + * @deprecated Use `gravityview/template/list/body/before` |
|
| 156 | + * @since 1.0.7 |
|
| 157 | + * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
| 158 | + */ |
|
| 159 | 159 | do_action( 'gravityview_list_body_before', \GravityView_View::getInstance() /** ugh! */ ); |
| 160 | 160 | } |
| 161 | 161 | |
@@ -177,11 +177,11 @@ discard block |
||
| 177 | 177 | do_action( 'gravityview/template/list/body/after', $context ); |
| 178 | 178 | |
| 179 | 179 | /** |
| 180 | - * @action `gravityview_list_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows. |
|
| 181 | - * @deprecated Use `gravityview/template/list/body/after` |
|
| 182 | - * @since 1.0.7 |
|
| 183 | - * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
| 184 | - */ |
|
| 180 | + * @action `gravityview_list_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows. |
|
| 181 | + * @deprecated Use `gravityview/template/list/body/after` |
|
| 182 | + * @since 1.0.7 |
|
| 183 | + * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
| 184 | + */ |
|
| 185 | 185 | do_action( 'gravityview_list_body_after', \GravityView_View::getInstance() /** ugh! */ ); |
| 186 | 186 | } |
| 187 | 187 | |
@@ -212,11 +212,11 @@ discard block |
||
| 212 | 212 | $zone = str_replace( '/', '_', $zone ); |
| 213 | 213 | |
| 214 | 214 | /** |
| 215 | - * @action `gravityview_list_entry_$zone_before` Inside the `entry`, before any rows are rendered. Can be used to insert additional rows. |
|
| 216 | - * @deprecated Use `gravityview/template/list/entry/$zone/before` |
|
| 217 | - * @since 1.0.7 |
|
| 218 | - * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
| 219 | - */ |
|
| 215 | + * @action `gravityview_list_entry_$zone_before` Inside the `entry`, before any rows are rendered. Can be used to insert additional rows. |
|
| 216 | + * @deprecated Use `gravityview/template/list/entry/$zone/before` |
|
| 217 | + * @since 1.0.7 |
|
| 218 | + * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
| 219 | + */ |
|
| 220 | 220 | do_action( sprintf( 'gravityview_list_entry%sbefore', $zone ), $entry->as_entry(), \GravityView_View::getInstance() /** ugh! */ ); |
| 221 | 221 | } |
| 222 | 222 | |
@@ -247,11 +247,11 @@ discard block |
||
| 247 | 247 | $zone = str_replace( '/', '_', $zone ); |
| 248 | 248 | |
| 249 | 249 | /** |
| 250 | - * @action `gravityview_list_entry_$zone_after` Inside the `entry`, after any rows are rendered. Can be used to insert additional rows. |
|
| 251 | - * @deprecated Use `gravityview/template/list/entry/after` |
|
| 252 | - * @since 1.0.7 |
|
| 253 | - * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
| 254 | - */ |
|
| 250 | + * @action `gravityview_list_entry_$zone_after` Inside the `entry`, after any rows are rendered. Can be used to insert additional rows. |
|
| 251 | + * @deprecated Use `gravityview/template/list/entry/after` |
|
| 252 | + * @since 1.0.7 |
|
| 253 | + * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
| 254 | + */ |
|
| 255 | 255 | do_action( sprintf( 'gravityview_list_entry%safter', $zone ), $entry->as_entry(), \GravityView_View::getInstance() /** ugh! */ ); |
| 256 | 256 | } |
| 257 | 257 | } |
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | if( is_array( $search_field['value'] ) ) { |
| 19 | - gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' ); |
|
| 19 | + gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' ); |
|
| 20 | 20 | $search_field['value'] = reset( $search_field['value'] ); |
| 21 | 21 | } |
| 22 | 22 | |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | |
| 14 | 14 | /** |
| 15 | 15 | * @var string The hash key used to generate secure message history |
| 16 | - * @since 2.2.5 |
|
| 16 | + * @since 2.2.5 |
|
| 17 | 17 | */ |
| 18 | 18 | const beacon_key = 'lCXlwbQR707kipR+J0MCqcxrhGOHjGF0ldD6yNbGM0w='; |
| 19 | 19 | |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | 'payment_id' => '', |
| 111 | 111 | 'customer_name' => '', |
| 112 | 112 | 'customer_email' => '', |
| 113 | - 'price_id' => '0', |
|
| 113 | + 'price_id' => '0', |
|
| 114 | 114 | ) ); |
| 115 | 115 | |
| 116 | 116 | // This is just HTML we don't need. |
@@ -127,9 +127,9 @@ discard block |
||
| 127 | 127 | case 3: |
| 128 | 128 | $package = 'All Access'; |
| 129 | 129 | break; |
| 130 | - case 4: |
|
| 131 | - $package = 'Lifetime'; |
|
| 132 | - break; |
|
| 130 | + case 4: |
|
| 131 | + $package = 'Lifetime'; |
|
| 132 | + break; |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | $current_user = wp_get_current_user(); |
@@ -159,27 +159,27 @@ discard block |
||
| 159 | 159 | // Help Scout length limit is 200 characters |
| 160 | 160 | foreach( $data as $key => $value ) { |
| 161 | 161 | if ( ! is_string( $value ) ) { |
| 162 | - continue; |
|
| 162 | + continue; |
|
| 163 | 163 | } |
| 164 | - $data[ $key ] = mb_substr( $value, 0, 200 ); |
|
| 165 | - } |
|
| 164 | + $data[ $key ] = mb_substr( $value, 0, 200 ); |
|
| 165 | + } |
|
| 166 | 166 | |
| 167 | 167 | $localization_data = array( |
| 168 | 168 | 'contactEnabled' => (int)GVCommon::has_cap( 'gravityview_contact_support' ), |
| 169 | 169 | 'data' => $data, |
| 170 | 170 | 'translation' => $translation, |
| 171 | - 'suggest' => array(), |
|
| 171 | + 'suggest' => array(), |
|
| 172 | 172 | ); |
| 173 | 173 | |
| 174 | 174 | /** |
| 175 | - * @filter `gravityview/support_port/localization_data` Filter data passed to the Support Port, before localize_script is run |
|
| 175 | + * @filter `gravityview/support_port/localization_data` Filter data passed to the Support Port, before localize_script is run |
|
| 176 | 176 | * @since 2.0 |
| 177 | - * @param array $localization_data { |
|
| 178 | - * @type int $contactEnabled Can the user contact support? |
|
| 179 | - * @type array $data Support/license info |
|
| 180 | - * @type array $translation i18n strings |
|
| 181 | - * @type array $suggest Article IDs to recommend to the user (per page in the admin |
|
| 182 | - * } |
|
| 177 | + * @param array $localization_data { |
|
| 178 | + * @type int $contactEnabled Can the user contact support? |
|
| 179 | + * @type array $data Support/license info |
|
| 180 | + * @type array $translation i18n strings |
|
| 181 | + * @type array $suggest Article IDs to recommend to the user (per page in the admin |
|
| 182 | + * } |
|
| 183 | 183 | */ |
| 184 | 184 | $localization_data = apply_filters( 'gravityview/support_port/localization_data', $localization_data ); |
| 185 | 185 | |
@@ -193,11 +193,11 @@ discard block |
||
| 193 | 193 | * |
| 194 | 194 | * If the user doesn't have the `gravityview_support_port` capability, returns false; then |
| 195 | 195 | * If global setting is "hide", returns false; then |
| 196 | - * If user preference is not set, return global setting; then |
|
| 197 | - * If user preference is set, return that setting. |
|
| 196 | + * If user preference is not set, return global setting; then |
|
| 197 | + * If user preference is set, return that setting. |
|
| 198 | 198 | * |
| 199 | 199 | * @since 1.15 |
| 200 | - * @since 1.17.5 Changed behavior to respect global setting |
|
| 200 | + * @since 1.17.5 Changed behavior to respect global setting |
|
| 201 | 201 | * |
| 202 | 202 | * @param int $user Optional. ID of the user to check, defaults to 0 for current user. |
| 203 | 203 | * |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | $global_setting = gravityview()->plugin->settings->get( 'support_port' ); |
| 213 | 213 | |
| 214 | 214 | if ( empty( $global_setting ) ) { |
| 215 | - return false; |
|
| 215 | + return false; |
|
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | // Get the per-user Support Port setting |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | * Modifies the output of profile.php to add GravityView Support preference |
| 249 | 249 | * |
| 250 | 250 | * @since 1.15 |
| 251 | - * @since 1.17.5 Only show if global setting is active |
|
| 251 | + * @since 1.17.5 Only show if global setting is active |
|
| 252 | 252 | * |
| 253 | 253 | * @param WP_User $user Current user info |
| 254 | 254 | * |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | $global_setting = gravityview()->plugin->settings->get( 'support_port' ); |
| 260 | 260 | |
| 261 | 261 | if ( empty( $global_setting ) ) { |
| 262 | - return; |
|
| 262 | + return; |
|
| 263 | 263 | } |
| 264 | 264 | |
| 265 | 265 | /** |
@@ -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 | |
@@ -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 ); |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | |
| 139 | 139 | // template areas |
| 140 | 140 | $template_areas_directory = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'directory' ); |
| 141 | - $template_areas_single = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'single' ); |
|
| 141 | + $template_areas_single = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'single' ); |
|
| 142 | 142 | |
| 143 | 143 | // widget areas |
| 144 | 144 | $default_widget_areas = \GV\Widget::get_default_widget_areas(); |
@@ -331,40 +331,40 @@ discard block |
||
| 331 | 331 | // load file |
| 332 | 332 | $xmlstr = file_get_contents( $form_file ); |
| 333 | 333 | |
| 334 | - $options = array( |
|
| 335 | - "page" => array("unserialize_as_array" => true), |
|
| 336 | - "form"=> array("unserialize_as_array" => true), |
|
| 337 | - "field"=> array("unserialize_as_array" => true), |
|
| 338 | - "rule"=> array("unserialize_as_array" => true), |
|
| 339 | - "choice"=> array("unserialize_as_array" => true), |
|
| 340 | - "input"=> array("unserialize_as_array" => true), |
|
| 341 | - "routing_item"=> array("unserialize_as_array" => true), |
|
| 342 | - "creditCard"=> array("unserialize_as_array" => true), |
|
| 343 | - "routin"=> array("unserialize_as_array" => true), |
|
| 344 | - "confirmation" => array("unserialize_as_array" => true), |
|
| 345 | - "notification" => array("unserialize_as_array" => true) |
|
| 346 | - ); |
|
| 334 | + $options = array( |
|
| 335 | + "page" => array("unserialize_as_array" => true), |
|
| 336 | + "form"=> array("unserialize_as_array" => true), |
|
| 337 | + "field"=> array("unserialize_as_array" => true), |
|
| 338 | + "rule"=> array("unserialize_as_array" => true), |
|
| 339 | + "choice"=> array("unserialize_as_array" => true), |
|
| 340 | + "input"=> array("unserialize_as_array" => true), |
|
| 341 | + "routing_item"=> array("unserialize_as_array" => true), |
|
| 342 | + "creditCard"=> array("unserialize_as_array" => true), |
|
| 343 | + "routin"=> array("unserialize_as_array" => true), |
|
| 344 | + "confirmation" => array("unserialize_as_array" => true), |
|
| 345 | + "notification" => array("unserialize_as_array" => true) |
|
| 346 | + ); |
|
| 347 | 347 | |
| 348 | 348 | $xml = new RGXML($options); |
| 349 | - $forms = $xml->unserialize($xmlstr); |
|
| 349 | + $forms = $xml->unserialize($xmlstr); |
|
| 350 | 350 | |
| 351 | - if( !$forms ) { |
|
| 352 | - gravityview()->log->error( 'Importing Form Fields for preset [{template_id}]. Error importing file. (File) {path}', array( 'template_id' => $template_id, 'path' => $form_file ) ); |
|
| 353 | - return false; |
|
| 354 | - } |
|
| 351 | + if( !$forms ) { |
|
| 352 | + gravityview()->log->error( 'Importing Form Fields for preset [{template_id}]. Error importing file. (File) {path}', array( 'template_id' => $template_id, 'path' => $form_file ) ); |
|
| 353 | + return false; |
|
| 354 | + } |
|
| 355 | 355 | |
| 356 | - if( !empty( $forms[0] ) && is_array( $forms[0] ) ) { |
|
| 357 | - $form = $forms[0]; |
|
| 358 | - } |
|
| 356 | + if( !empty( $forms[0] ) && is_array( $forms[0] ) ) { |
|
| 357 | + $form = $forms[0]; |
|
| 358 | + } |
|
| 359 | 359 | |
| 360 | - if( empty( $form ) ) { |
|
| 361 | - gravityview()->log->error( '$form not set.', array( 'data' => $forms ) ); |
|
| 362 | - return false; |
|
| 363 | - } |
|
| 360 | + if( empty( $form ) ) { |
|
| 361 | + gravityview()->log->error( '$form not set.', array( 'data' => $forms ) ); |
|
| 362 | + return false; |
|
| 363 | + } |
|
| 364 | 364 | |
| 365 | - gravityview()->log->debug( '[pre_get_available_fields] Importing Form Fields for preset [{template_id}]. (Form)', array( 'template_id' => $template_id, 'data' => $form ) ); |
|
| 365 | + gravityview()->log->debug( '[pre_get_available_fields] Importing Form Fields for preset [{template_id}]. (Form)', array( 'template_id' => $template_id, 'data' => $form ) ); |
|
| 366 | 366 | |
| 367 | - return $form; |
|
| 367 | + return $form; |
|
| 368 | 368 | |
| 369 | 369 | } |
| 370 | 370 | |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | * @return void |
| 93 | 93 | */ |
| 94 | 94 | public static function connected_form_warning( $form_id = 0 ) { |
| 95 | - global $pagenow; |
|
| 95 | + global $pagenow; |
|
| 96 | 96 | |
| 97 | 97 | if ( empty( $form_id ) || $pagenow === 'post-new.php' ) { |
| 98 | 98 | return; |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | <?php |
| 120 | 120 | } |
| 121 | 121 | |
| 122 | - remove_action( 'gravityview/metaboxes/data-source/before', array( 'GravityView_Admin', 'connected_form_warning' ) ); |
|
| 122 | + remove_action( 'gravityview/metaboxes/data-source/before', array( 'GravityView_Admin', 'connected_form_warning' ) ); |
|
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | /** |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | 7 => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text, |
| 242 | 242 | 8 => __( 'View submitted.', 'gravityview' ), |
| 243 | 243 | 9 => sprintf( |
| 244 | - /* translators: Date and time the View is scheduled to be published */ |
|
| 244 | + /* translators: Date and time the View is scheduled to be published */ |
|
| 245 | 245 | __( 'View scheduled for: %1$s.', 'gravityview' ), |
| 246 | 246 | // translators: Publish box date format, see http://php.net/date |
| 247 | 247 | date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL ) ) ) |
@@ -298,7 +298,6 @@ discard block |
||
| 298 | 298 | * |
| 299 | 299 | * @deprecated since 1.12 |
| 300 | 300 | * @see GravityView_Compatibility::get_plugin_status() |
| 301 | - |
|
| 302 | 301 | * @return boolean|string True: plugin is active; False: plugin file doesn't exist at path; 'inactive' it's inactive |
| 303 | 302 | */ |
| 304 | 303 | static function get_plugin_status( $location = '' ) { |