@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | |
| 31 | 31 | $is_table_layout = preg_match( '/table/ism', $template_id ); |
| 32 | 32 | |
| 33 | - if( 'field' === $field_type ) { |
|
| 33 | + if ( 'field' === $field_type ) { |
|
| 34 | 34 | |
| 35 | 35 | // Default options - fields |
| 36 | 36 | $field_options = array( |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | 'custom_class' => array( |
| 50 | 50 | 'type' => 'text', |
| 51 | 51 | 'label' => __( 'Custom CSS Class:', 'gravityview' ), |
| 52 | - 'desc' => __( 'This class will be added to the field container', 'gravityview'), |
|
| 52 | + 'desc' => __( 'This class will be added to the field container', 'gravityview' ), |
|
| 53 | 53 | 'value' => '', |
| 54 | 54 | 'merge_tags' => true, |
| 55 | 55 | 'tooltip' => 'gv_css_merge_tags', |
@@ -70,11 +70,11 @@ discard block |
||
| 70 | 70 | ); |
| 71 | 71 | |
| 72 | 72 | // Match Table as well as DataTables |
| 73 | - if( $is_table_layout && 'directory' === $context ) { |
|
| 74 | - $field_options['width'] = array( |
|
| 73 | + if ( $is_table_layout && 'directory' === $context ) { |
|
| 74 | + $field_options[ 'width' ] = array( |
|
| 75 | 75 | 'type' => 'number', |
| 76 | - 'label' => __('Percent Width', 'gravityview'), |
|
| 77 | - 'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview'), |
|
| 76 | + 'label' => __( 'Percent Width', 'gravityview' ), |
|
| 77 | + 'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview' ), |
|
| 78 | 78 | 'class' => 'code widefat', |
| 79 | 79 | 'value' => '', |
| 80 | 80 | ); |
@@ -129,8 +129,8 @@ discard block |
||
| 129 | 129 | 'manage_options' => __( 'Administrator', 'gravityview' ), |
| 130 | 130 | ); |
| 131 | 131 | |
| 132 | - if( is_multisite() ) { |
|
| 133 | - $select_cap_choices['manage_network'] = __('Multisite Super Admin', 'gravityview' ); |
|
| 132 | + if ( is_multisite() ) { |
|
| 133 | + $select_cap_choices[ 'manage_network' ] = __( 'Multisite Super Admin', 'gravityview' ); |
|
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | /** |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | * @param string $context Optional. What context are we in? Example: `single` or `directory` |
| 144 | 144 | * @param string $input_type Optional. (textarea, list, select, etc.) |
| 145 | 145 | */ |
| 146 | - $select_cap_choices = apply_filters('gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type ); |
|
| 146 | + $select_cap_choices = apply_filters( 'gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type ); |
|
| 147 | 147 | |
| 148 | 148 | return $select_cap_choices; |
| 149 | 149 | } |
@@ -171,27 +171,27 @@ discard block |
||
| 171 | 171 | */ |
| 172 | 172 | public static function render_field_options( $form_id, $field_type, $template_id, $field_id, $field_label, $area, $input_type = NULL, $uniqid = '', $current = '', $context = 'single', $item = array() ) { |
| 173 | 173 | |
| 174 | - if( empty( $uniqid ) ) { |
|
| 174 | + if ( empty( $uniqid ) ) { |
|
| 175 | 175 | //generate a unique field id |
| 176 | - $uniqid = uniqid('', false); |
|
| 176 | + $uniqid = uniqid( '', false ); |
|
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | // get field/widget options |
| 180 | 180 | $options = self::get_default_field_options( $field_type, $template_id, $field_id, $context, $input_type, $form_id ); |
| 181 | 181 | |
| 182 | 182 | // two different post arrays, depending of the field type |
| 183 | - $name_prefix = $field_type .'s' .'['. $area .']['. $uniqid .']'; |
|
| 183 | + $name_prefix = $field_type . 's' . '[' . $area . '][' . $uniqid . ']'; |
|
| 184 | 184 | |
| 185 | 185 | // build output |
| 186 | 186 | $output = ''; |
| 187 | - $output .= '<input type="hidden" class="field-key" name="'. $name_prefix .'[id]" value="'. esc_attr( $field_id ) .'">'; |
|
| 188 | - $output .= '<input type="hidden" class="field-label" name="'. $name_prefix .'[label]" value="'. esc_attr( $field_label ) .'">'; |
|
| 187 | + $output .= '<input type="hidden" class="field-key" name="' . $name_prefix . '[id]" value="' . esc_attr( $field_id ) . '">'; |
|
| 188 | + $output .= '<input type="hidden" class="field-label" name="' . $name_prefix . '[label]" value="' . esc_attr( $field_label ) . '">'; |
|
| 189 | 189 | if ( $form_id ) { |
| 190 | - $output .= '<input type="hidden" class="field-form-id" name="'. $name_prefix .'[form_id]" value="'. esc_attr( $form_id ) .'">'; |
|
| 190 | + $output .= '<input type="hidden" class="field-form-id" name="' . $name_prefix . '[form_id]" value="' . esc_attr( $form_id ) . '">'; |
|
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | // If there are no options, return what we got. |
| 194 | - if(empty($options)) { |
|
| 194 | + if ( empty( $options ) ) { |
|
| 195 | 195 | |
| 196 | 196 | // This is here for checking if the output is empty in render_label() |
| 197 | 197 | $output .= '<!-- No Options -->'; |
@@ -199,33 +199,33 @@ discard block |
||
| 199 | 199 | return $output; |
| 200 | 200 | } |
| 201 | 201 | |
| 202 | - $output .= '<div class="gv-dialog-options" title="'. esc_attr( sprintf( __( 'Options: %s', 'gravityview' ) , strip_tags( html_entity_decode( $field_label ) ) ) ) .'">'; |
|
| 202 | + $output .= '<div class="gv-dialog-options" title="' . esc_attr( sprintf( __( 'Options: %s', 'gravityview' ), strip_tags( html_entity_decode( $field_label ) ) ) ) . '">'; |
|
| 203 | 203 | |
| 204 | 204 | /** |
| 205 | 205 | * @since 1.8 |
| 206 | 206 | */ |
| 207 | - if( !empty( $item['subtitle'] ) ) { |
|
| 208 | - $output .= '<div class="subtitle">' . $item['subtitle'] . '</div>'; |
|
| 207 | + if ( ! empty( $item[ 'subtitle' ] ) ) { |
|
| 208 | + $output .= '<div class="subtitle">' . $item[ 'subtitle' ] . '</div>'; |
|
| 209 | 209 | } |
| 210 | 210 | |
| 211 | - foreach( $options as $key => $option ) { |
|
| 211 | + foreach ( $options as $key => $option ) { |
|
| 212 | 212 | |
| 213 | 213 | $value = isset( $current[ $key ] ) ? $current[ $key ] : NULL; |
| 214 | 214 | |
| 215 | - $field_output = self::render_field_option( $name_prefix . '['. $key .']' , $option, $value); |
|
| 215 | + $field_output = self::render_field_option( $name_prefix . '[' . $key . ']', $option, $value ); |
|
| 216 | 216 | |
| 217 | 217 | // The setting is empty |
| 218 | - if( empty( $field_output ) ) { |
|
| 218 | + if ( empty( $field_output ) ) { |
|
| 219 | 219 | continue; |
| 220 | 220 | } |
| 221 | 221 | |
| 222 | - switch( $option['type'] ) { |
|
| 222 | + switch ( $option[ 'type' ] ) { |
|
| 223 | 223 | // Hide hidden fields |
| 224 | 224 | case 'hidden': |
| 225 | - $output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . ' screen-reader-text">'. $field_output . '</div>'; |
|
| 225 | + $output .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . ' screen-reader-text">' . $field_output . '</div>'; |
|
| 226 | 226 | break; |
| 227 | 227 | default: |
| 228 | - $output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . '">'. $field_output .'</div>'; |
|
| 228 | + $output .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . '">' . $field_output . '</div>'; |
|
| 229 | 229 | } |
| 230 | 230 | } |
| 231 | 231 | |
@@ -254,17 +254,17 @@ discard block |
||
| 254 | 254 | * @deprecated setting index 'default' was replaced by 'value' |
| 255 | 255 | * @see GravityView_FieldType::get_field_defaults |
| 256 | 256 | */ |
| 257 | - if( !empty( $option['default'] ) && empty( $option['value'] ) ) { |
|
| 258 | - $option['value'] = $option['default']; |
|
| 259 | - _deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting '. $name .' details' ); |
|
| 257 | + if ( ! empty( $option[ 'default' ] ) && empty( $option[ 'value' ] ) ) { |
|
| 258 | + $option[ 'value' ] = $option[ 'default' ]; |
|
| 259 | + _deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting ' . $name . ' details' ); |
|
| 260 | 260 | } |
| 261 | 261 | |
| 262 | 262 | // prepare to render option field type |
| 263 | - if( isset( $option['type'] ) ) { |
|
| 263 | + if ( isset( $option[ 'type' ] ) ) { |
|
| 264 | 264 | |
| 265 | 265 | $type_class = self::load_type_class( $option ); |
| 266 | 266 | |
| 267 | - if( class_exists( $type_class ) ) { |
|
| 267 | + if ( class_exists( $type_class ) ) { |
|
| 268 | 268 | |
| 269 | 269 | /** @var GravityView_FieldType $render_type */ |
| 270 | 270 | $render_type = new $type_class( $name, $option, $curr_value ); |
@@ -281,7 +281,7 @@ discard block |
||
| 281 | 281 | * @param[in,out] string $output field class name |
| 282 | 282 | * @param[in] array $option option field data |
| 283 | 283 | */ |
| 284 | - $output = apply_filters( "gravityview/option/output/{$option['type']}" , $output, $option ); |
|
| 284 | + $output = apply_filters( "gravityview/option/output/{$option[ 'type' ]}", $output, $option ); |
|
| 285 | 285 | } |
| 286 | 286 | |
| 287 | 287 | } // isset option[type] |
@@ -316,27 +316,27 @@ discard block |
||
| 316 | 316 | * @deprecated setting index 'name' was replaced by 'label' |
| 317 | 317 | * @see GravityView_FieldType::get_field_defaults |
| 318 | 318 | */ |
| 319 | - if( isset( $setting['name'] ) && empty( $setting['label'] ) ) { |
|
| 320 | - $setting['label'] = $setting['name']; |
|
| 321 | - _deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting '. $key .' details' ); |
|
| 319 | + if ( isset( $setting[ 'name' ] ) && empty( $setting[ 'label' ] ) ) { |
|
| 320 | + $setting[ 'label' ] = $setting[ 'name' ]; |
|
| 321 | + _deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting ' . $key . ' details' ); |
|
| 322 | 322 | } |
| 323 | 323 | |
| 324 | 324 | $name = esc_attr( sprintf( $name, $key ) ); |
| 325 | - $setting['id'] = esc_attr( sprintf( $id, $key ) ); |
|
| 326 | - $setting['tooltip'] = 'gv_' . $key; |
|
| 325 | + $setting[ 'id' ] = esc_attr( sprintf( $id, $key ) ); |
|
| 326 | + $setting[ 'tooltip' ] = 'gv_' . $key; |
|
| 327 | 327 | |
| 328 | 328 | // Use default if current setting isn't set. |
| 329 | - $curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting['value']; |
|
| 329 | + $curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting[ 'value' ]; |
|
| 330 | 330 | |
| 331 | 331 | // default setting type = text |
| 332 | - $setting['type'] = empty( $setting['type'] ) ? 'text' : $setting['type']; |
|
| 332 | + $setting[ 'type' ] = empty( $setting[ 'type' ] ) ? 'text' : $setting[ 'type' ]; |
|
| 333 | 333 | |
| 334 | 334 | // merge tags |
| 335 | - if( !isset( $setting['merge_tags'] ) ) { |
|
| 336 | - if( $setting['type'] === 'text' ) { |
|
| 337 | - $setting['merge_tags'] = true; |
|
| 335 | + if ( ! isset( $setting[ 'merge_tags' ] ) ) { |
|
| 336 | + if ( $setting[ 'type' ] === 'text' ) { |
|
| 337 | + $setting[ 'merge_tags' ] = true; |
|
| 338 | 338 | } else { |
| 339 | - $setting['merge_tags'] = false; |
|
| 339 | + $setting[ 'merge_tags' ] = false; |
|
| 340 | 340 | } |
| 341 | 341 | } |
| 342 | 342 | |
@@ -344,7 +344,7 @@ discard block |
||
| 344 | 344 | |
| 345 | 345 | // render the setting |
| 346 | 346 | $type_class = self::load_type_class( $setting ); |
| 347 | - if( class_exists( $type_class ) ) { |
|
| 347 | + if ( class_exists( $type_class ) ) { |
|
| 348 | 348 | /** @var GravityView_FieldType $render_type */ |
| 349 | 349 | $render_type = new $type_class( $name, $setting, $curr_value ); |
| 350 | 350 | ob_start(); |
@@ -353,25 +353,25 @@ discard block |
||
| 353 | 353 | } |
| 354 | 354 | |
| 355 | 355 | // Check if setting is specific for a template |
| 356 | - if( !empty( $setting['show_in_template'] ) ) { |
|
| 357 | - if( !is_array( $setting['show_in_template'] ) ) { |
|
| 358 | - $setting['show_in_template'] = array( $setting['show_in_template'] ); |
|
| 356 | + if ( ! empty( $setting[ 'show_in_template' ] ) ) { |
|
| 357 | + if ( ! is_array( $setting[ 'show_in_template' ] ) ) { |
|
| 358 | + $setting[ 'show_in_template' ] = array( $setting[ 'show_in_template' ] ); |
|
| 359 | 359 | } |
| 360 | - $show_if = ' data-show-if="'. implode( ' ', $setting['show_in_template'] ).'"'; |
|
| 360 | + $show_if = ' data-show-if="' . implode( ' ', $setting[ 'show_in_template' ] ) . '"'; |
|
| 361 | 361 | } else { |
| 362 | 362 | $show_if = ''; |
| 363 | 363 | } |
| 364 | 364 | |
| 365 | - if( ! empty( $setting['requires'] ) ) { |
|
| 366 | - $show_if .= sprintf( ' data-requires="%s"', $setting['requires'] ); |
|
| 365 | + if ( ! empty( $setting[ 'requires' ] ) ) { |
|
| 366 | + $show_if .= sprintf( ' data-requires="%s"', $setting[ 'requires' ] ); |
|
| 367 | 367 | } |
| 368 | 368 | |
| 369 | - if( ! empty( $setting['requires_not'] ) ) { |
|
| 370 | - $show_if .= sprintf( ' data-requires-not="%s"', $setting['requires_not'] ); |
|
| 369 | + if ( ! empty( $setting[ 'requires_not' ] ) ) { |
|
| 370 | + $show_if .= sprintf( ' data-requires-not="%s"', $setting[ 'requires_not' ] ); |
|
| 371 | 371 | } |
| 372 | 372 | |
| 373 | 373 | // output |
| 374 | - echo '<tr valign="top" '. $show_if .'>' . $output . '</tr>'; |
|
| 374 | + echo '<tr valign="top" ' . $show_if . '>' . $output . '</tr>'; |
|
| 375 | 375 | |
| 376 | 376 | } |
| 377 | 377 | |
@@ -383,7 +383,7 @@ discard block |
||
| 383 | 383 | */ |
| 384 | 384 | public static function load_type_class( $field = NULL ) { |
| 385 | 385 | |
| 386 | - if( empty( $field['type'] ) ) { |
|
| 386 | + if ( empty( $field[ 'type' ] ) ) { |
|
| 387 | 387 | return NULL; |
| 388 | 388 | } |
| 389 | 389 | |
@@ -392,19 +392,19 @@ discard block |
||
| 392 | 392 | * @param string $class_suffix field class suffix; `GravityView_FieldType_{$class_suffix}` |
| 393 | 393 | * @param array $field field data |
| 394 | 394 | */ |
| 395 | - $type_class = apply_filters( "gravityview/setting/class/{$field['type']}", 'GravityView_FieldType_' . $field['type'], $field ); |
|
| 395 | + $type_class = apply_filters( "gravityview/setting/class/{$field[ 'type' ]}", 'GravityView_FieldType_' . $field[ 'type' ], $field ); |
|
| 396 | 396 | |
| 397 | - if( !class_exists( $type_class ) ) { |
|
| 397 | + if ( ! class_exists( $type_class ) ) { |
|
| 398 | 398 | |
| 399 | 399 | /** |
| 400 | 400 | * @filter `gravityview/setting/class_file/{field_type}` |
| 401 | 401 | * @param string $field_type_include_path field class file path |
| 402 | 402 | * @param array $field field data |
| 403 | 403 | */ |
| 404 | - $class_file = apply_filters( "gravityview/setting/class_file/{$field['type']}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field['type']}.php", $field ); |
|
| 404 | + $class_file = apply_filters( "gravityview/setting/class_file/{$field[ 'type' ]}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field[ 'type' ]}.php", $field ); |
|
| 405 | 405 | |
| 406 | - if( $class_file ) { |
|
| 407 | - if( file_exists( $class_file ) ) { |
|
| 406 | + if ( $class_file ) { |
|
| 407 | + if ( file_exists( $class_file ) ) { |
|
| 408 | 408 | require_once( $class_file ); |
| 409 | 409 | } |
| 410 | 410 | } |
@@ -429,8 +429,8 @@ discard block |
||
| 429 | 429 | |
| 430 | 430 | _deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_checkbox::render_input' ); |
| 431 | 431 | |
| 432 | - $output = '<input name="'. esc_attr( $name ) .'" type="hidden" value="0">'; |
|
| 433 | - $output .= '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="checkbox" value="1" '. checked( $current, '1', false ) .' >'; |
|
| 432 | + $output = '<input name="' . esc_attr( $name ) . '" type="hidden" value="0">'; |
|
| 433 | + $output .= '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="checkbox" value="1" ' . checked( $current, '1', false ) . ' >'; |
|
| 434 | 434 | |
| 435 | 435 | return $output; |
| 436 | 436 | } |
@@ -450,22 +450,22 @@ discard block |
||
| 450 | 450 | _deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_text::render_input' ); |
| 451 | 451 | |
| 452 | 452 | // Show the merge tags if the field is a list view |
| 453 | - $is_list = ( preg_match( '/_list-/ism', $name )); |
|
| 453 | + $is_list = ( preg_match( '/_list-/ism', $name ) ); |
|
| 454 | 454 | |
| 455 | 455 | // Or is a single entry view |
| 456 | - $is_single = ( preg_match( '/single_/ism', $name )); |
|
| 456 | + $is_single = ( preg_match( '/single_/ism', $name ) ); |
|
| 457 | 457 | $show = ( $is_single || $is_list ); |
| 458 | 458 | |
| 459 | 459 | $class = ''; |
| 460 | 460 | // and $add_merge_tags is not false |
| 461 | - if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) { |
|
| 461 | + if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) { |
|
| 462 | 462 | $class = 'merge-tag-support mt-position-right mt-hide_all_fields '; |
| 463 | 463 | } |
| 464 | 464 | |
| 465 | - $class .= !empty( $args['class'] ) ? $args['class'] : 'widefat'; |
|
| 466 | - $type = !empty( $args['type'] ) ? $args['type'] : 'text'; |
|
| 465 | + $class .= ! empty( $args[ 'class' ] ) ? $args[ 'class' ] : 'widefat'; |
|
| 466 | + $type = ! empty( $args[ 'type' ] ) ? $args[ 'type' ] : 'text'; |
|
| 467 | 467 | |
| 468 | - return '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="'.esc_attr($type).'" value="'. esc_attr( $current ) .'" class="'.esc_attr( $class ).'">'; |
|
| 468 | + return '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="' . esc_attr( $type ) . '" value="' . esc_attr( $current ) . '" class="' . esc_attr( $class ) . '">'; |
|
| 469 | 469 | } |
| 470 | 470 | |
| 471 | 471 | /** |
@@ -482,21 +482,21 @@ discard block |
||
| 482 | 482 | _deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_textarea::render_input' ); |
| 483 | 483 | |
| 484 | 484 | // Show the merge tags if the field is a list view |
| 485 | - $is_list = ( preg_match( '/_list-/ism', $name )); |
|
| 485 | + $is_list = ( preg_match( '/_list-/ism', $name ) ); |
|
| 486 | 486 | |
| 487 | 487 | // Or is a single entry view |
| 488 | - $is_single = ( preg_match( '/single_/ism', $name )); |
|
| 488 | + $is_single = ( preg_match( '/single_/ism', $name ) ); |
|
| 489 | 489 | $show = ( $is_single || $is_list ); |
| 490 | 490 | |
| 491 | 491 | $class = ''; |
| 492 | 492 | // and $add_merge_tags is not false |
| 493 | - if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) { |
|
| 493 | + if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) { |
|
| 494 | 494 | $class = 'merge-tag-support mt-position-right mt-hide_all_fields '; |
| 495 | 495 | } |
| 496 | 496 | |
| 497 | - $class .= !empty( $args['class'] ) ? 'widefat '.$args['class'] : 'widefat'; |
|
| 497 | + $class .= ! empty( $args[ 'class' ] ) ? 'widefat ' . $args[ 'class' ] : 'widefat'; |
|
| 498 | 498 | |
| 499 | - return '<textarea name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" class="'.esc_attr( $class ).'">'. esc_textarea( $current ) .'</textarea>'; |
|
| 499 | + return '<textarea name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" class="' . esc_attr( $class ) . '">' . esc_textarea( $current ) . '</textarea>'; |
|
| 500 | 500 | } |
| 501 | 501 | |
| 502 | 502 | /** |
@@ -512,9 +512,9 @@ discard block |
||
| 512 | 512 | |
| 513 | 513 | _deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_select::render_input' ); |
| 514 | 514 | |
| 515 | - $output = '<select name="'. $name .'" id="'. $id .'">'; |
|
| 516 | - foreach( $choices as $value => $label ) { |
|
| 517 | - $output .= '<option value="'. esc_attr( $value ) .'" '. selected( $value, $current, false ) .'>'. esc_html( $label ) .'</option>'; |
|
| 515 | + $output = '<select name="' . $name . '" id="' . $id . '">'; |
|
| 516 | + foreach ( $choices as $value => $label ) { |
|
| 517 | + $output .= '<option value="' . esc_attr( $value ) . '" ' . selected( $value, $current, false ) . '>' . esc_html( $label ) . '</option>'; |
|
| 518 | 518 | } |
| 519 | 519 | $output .= '</select>'; |
| 520 | 520 | |
@@ -31,11 +31,11 @@ discard block |
||
| 31 | 31 | |
| 32 | 32 | <?php |
| 33 | 33 | |
| 34 | - do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID ); |
|
| 34 | + do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID ); |
|
| 35 | 35 | |
| 36 | - do_action('gravityview_render_field_pickers', 'directory' ); |
|
| 36 | + do_action('gravityview_render_field_pickers', 'directory' ); |
|
| 37 | 37 | |
| 38 | - ?> |
|
| 38 | + ?> |
|
| 39 | 39 | |
| 40 | 40 | <?php // list of available widgets to be shown in the popup ?> |
| 41 | 41 | <div id="directory-available-widgets" class="hide-if-js gv-tooltip"> |
@@ -60,13 +60,13 @@ discard block |
||
| 60 | 60 | |
| 61 | 61 | <div id="single-active-fields" class="gv-grid"> |
| 62 | 62 | <?php |
| 63 | - if(!empty( $curr_template ) ) { |
|
| 64 | - do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true ); |
|
| 65 | - } |
|
| 66 | - ?> |
|
| 63 | + if(!empty( $curr_template ) ) { |
|
| 64 | + do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true ); |
|
| 65 | + } |
|
| 66 | + ?> |
|
| 67 | 67 | </div> |
| 68 | 68 | <?php |
| 69 | - do_action('gravityview_render_field_pickers', 'single' ); |
|
| 69 | + do_action('gravityview_render_field_pickers', 'single' ); |
|
| 70 | 70 | ?> |
| 71 | 71 | </div> |
| 72 | 72 | |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | </div> |
| 86 | 86 | |
| 87 | 87 | <?php |
| 88 | - do_action('gravityview_render_field_pickers', 'edit' ); |
|
| 88 | + do_action('gravityview_render_field_pickers', 'edit' ); |
|
| 89 | 89 | ?> |
| 90 | 90 | |
| 91 | 91 | </div> |
@@ -15,32 +15,32 @@ discard block |
||
| 15 | 15 | |
| 16 | 16 | <div id="directory-fields" class="gv-section"> |
| 17 | 17 | |
| 18 | - <h4><?php esc_html_e( 'Above Entries Widgets', 'gravityview'); ?> <span><?php esc_html_e( 'These widgets will be shown above entries.', 'gravityview'); ?></span></h4> |
|
| 18 | + <h4><?php esc_html_e( 'Above Entries Widgets', 'gravityview' ); ?> <span><?php esc_html_e( 'These widgets will be shown above entries.', 'gravityview' ); ?></span></h4> |
|
| 19 | 19 | |
| 20 | - <?php do_action('gravityview_render_widgets_active_areas', $curr_template, 'header', $post->ID ); ?> |
|
| 20 | + <?php do_action( 'gravityview_render_widgets_active_areas', $curr_template, 'header', $post->ID ); ?> |
|
| 21 | 21 | |
| 22 | - <h4><?php esc_html_e( 'Entries Fields', 'gravityview'); ?> <span><?php esc_html_e( 'These fields will be shown for each entry.', 'gravityview'); ?></span></h4> |
|
| 22 | + <h4><?php esc_html_e( 'Entries Fields', 'gravityview' ); ?> <span><?php esc_html_e( 'These fields will be shown for each entry.', 'gravityview' ); ?></span></h4> |
|
| 23 | 23 | |
| 24 | 24 | <div id="directory-active-fields" class="gv-grid"> |
| 25 | - <?php if(!empty( $curr_template ) ) { |
|
| 26 | - do_action('gravityview_render_directory_active_areas', $curr_template, 'directory', $post->ID, true ); |
|
| 25 | + <?php if ( ! empty( $curr_template ) ) { |
|
| 26 | + do_action( 'gravityview_render_directory_active_areas', $curr_template, 'directory', $post->ID, true ); |
|
| 27 | 27 | } ?> |
| 28 | 28 | </div> |
| 29 | 29 | |
| 30 | - <h4><?php esc_html_e( 'Below Entries Widgets', 'gravityview'); ?> <span><?php esc_html_e( 'These widgets will be shown below entries.', 'gravityview'); ?></span></h4> |
|
| 30 | + <h4><?php esc_html_e( 'Below Entries Widgets', 'gravityview' ); ?> <span><?php esc_html_e( 'These widgets will be shown below entries.', 'gravityview' ); ?></span></h4> |
|
| 31 | 31 | |
| 32 | 32 | <?php |
| 33 | 33 | |
| 34 | - do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID ); |
|
| 34 | + do_action( 'gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID ); |
|
| 35 | 35 | |
| 36 | - do_action('gravityview_render_field_pickers', 'directory' ); |
|
| 36 | + do_action( 'gravityview_render_field_pickers', 'directory' ); |
|
| 37 | 37 | |
| 38 | 38 | ?> |
| 39 | 39 | |
| 40 | 40 | <?php // list of available widgets to be shown in the popup ?> |
| 41 | 41 | <div id="directory-available-widgets" class="hide-if-js gv-tooltip"> |
| 42 | 42 | <span class="close" role="button" aria-label="<?php esc_html_e( 'Close', 'gravityview' ); ?>"><i class="dashicons dashicons-dismiss"></i></span> |
| 43 | - <?php do_action('gravityview_render_available_widgets' ); ?> |
|
| 43 | + <?php do_action( 'gravityview_render_available_widgets' ); ?> |
|
| 44 | 44 | </div> |
| 45 | 45 | |
| 46 | 46 | </div> |
@@ -56,17 +56,17 @@ discard block |
||
| 56 | 56 | |
| 57 | 57 | <div id="single-fields" class="gv-section"> |
| 58 | 58 | |
| 59 | - <h4><?php esc_html_e( 'These fields will be shown in Single Entry view.', 'gravityview'); ?></h4> |
|
| 59 | + <h4><?php esc_html_e( 'These fields will be shown in Single Entry view.', 'gravityview' ); ?></h4> |
|
| 60 | 60 | |
| 61 | 61 | <div id="single-active-fields" class="gv-grid"> |
| 62 | 62 | <?php |
| 63 | - if(!empty( $curr_template ) ) { |
|
| 64 | - do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true ); |
|
| 63 | + if ( ! empty( $curr_template ) ) { |
|
| 64 | + do_action( 'gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true ); |
|
| 65 | 65 | } |
| 66 | 66 | ?> |
| 67 | 67 | </div> |
| 68 | 68 | <?php |
| 69 | - do_action('gravityview_render_field_pickers', 'single' ); |
|
| 69 | + do_action( 'gravityview_render_field_pickers', 'single' ); |
|
| 70 | 70 | ?> |
| 71 | 71 | </div> |
| 72 | 72 | |
@@ -76,16 +76,16 @@ discard block |
||
| 76 | 76 | |
| 77 | 77 | <div id="edit-fields" class="gv-section"> |
| 78 | 78 | |
| 79 | - <h4><?php esc_html_e( 'Fields shown when editing an entry.', 'gravityview'); ?> <span><?php esc_html_e('If not configured, all form fields will be displayed.', 'gravityview'); ?></span></h4> |
|
| 79 | + <h4><?php esc_html_e( 'Fields shown when editing an entry.', 'gravityview' ); ?> <span><?php esc_html_e( 'If not configured, all form fields will be displayed.', 'gravityview' ); ?></span></h4> |
|
| 80 | 80 | |
| 81 | 81 | <div id="edit-active-fields" class="gv-grid"> |
| 82 | 82 | <?php |
| 83 | - do_action('gravityview_render_directory_active_areas', apply_filters( 'gravityview/template/edit', 'default_table_edit' ), 'edit', $post->ID, true ); |
|
| 83 | + do_action( 'gravityview_render_directory_active_areas', apply_filters( 'gravityview/template/edit', 'default_table_edit' ), 'edit', $post->ID, true ); |
|
| 84 | 84 | ?> |
| 85 | 85 | </div> |
| 86 | 86 | |
| 87 | 87 | <?php |
| 88 | - do_action('gravityview_render_field_pickers', 'edit' ); |
|
| 88 | + do_action( 'gravityview_render_field_pickers', 'edit' ); |
|
| 89 | 89 | ?> |
| 90 | 90 | |
| 91 | 91 | </div> |
@@ -22,27 +22,27 @@ |
||
| 22 | 22 | |
| 23 | 23 | <?php // list all the available templates (type= fresh or custom ) ?> |
| 24 | 24 | <div class="gv-grid"> |
| 25 | - <?php foreach( $templates as $id => $template ) { |
|
| 25 | + <?php foreach ( $templates as $id => $template ) { |
|
| 26 | 26 | $selected = ( $id == $current_template ) ? ' gv-selected' : ''; ?> |
| 27 | 27 | |
| 28 | 28 | <div class="gv-grid-col-1-3"> |
| 29 | - <div class="gv-view-types-module<?php echo $selected; ?>" data-filter="<?php echo esc_attr( $template['type'] ); ?>"> |
|
| 29 | + <div class="gv-view-types-module<?php echo $selected; ?>" data-filter="<?php echo esc_attr( $template[ 'type' ] ); ?>"> |
|
| 30 | 30 | <div class="gv-view-types-hover"> |
| 31 | 31 | <div> |
| 32 | - <?php if( !empty( $template['buy_source'] ) ) { ?> |
|
| 33 | - <p><a href="<?php echo esc_url( $template['buy_source'] ); ?>" class="button-primary button-buy-now"><?php esc_html_e( 'Buy Now', 'gravityview'); ?></a></p> |
|
| 32 | + <?php if ( ! empty( $template[ 'buy_source' ] ) ) { ?> |
|
| 33 | + <p><a href="<?php echo esc_url( $template[ 'buy_source' ] ); ?>" class="button-primary button-buy-now"><?php esc_html_e( 'Buy Now', 'gravityview' ); ?></a></p> |
|
| 34 | 34 | <?php } else { ?> |
| 35 | - <p><button href="#gv_select_template" class="gv_select_template button button-hero button-primary" data-templateid="<?php echo esc_attr( $id ); ?>"><?php esc_html_e( 'Select', 'gravityview'); ?></button></p> |
|
| 36 | - <?php if( !empty( $template['preview'] ) ) { ?> |
|
| 37 | - <a href="<?php echo esc_url( $template['preview'] ); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-admin-links" title="<?php esc_html_e( 'View a live demo of this preset', 'gravityview'); ?>"></i></a> |
|
| 35 | + <p><button href="#gv_select_template" class="gv_select_template button button-hero button-primary" data-templateid="<?php echo esc_attr( $id ); ?>"><?php esc_html_e( 'Select', 'gravityview' ); ?></button></p> |
|
| 36 | + <?php if ( ! empty( $template[ 'preview' ] ) ) { ?> |
|
| 37 | + <a href="<?php echo esc_url( $template[ 'preview' ] ); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-admin-links" title="<?php esc_html_e( 'View a live demo of this preset', 'gravityview' ); ?>"></i></a> |
|
| 38 | 38 | <?php } ?> |
| 39 | 39 | <?php } ?> |
| 40 | 40 | </div> |
| 41 | 41 | </div> |
| 42 | 42 | <div class="gv-view-types-normal"> |
| 43 | - <img src="<?php echo esc_url( $template['logo'] ); ?>" alt="<?php echo esc_attr( $template['label'] ); ?>"> |
|
| 44 | - <h5><?php echo esc_html( $template['label'] ); ?></h5> |
|
| 45 | - <p class="description"><?php echo esc_html( $template['description'] ); ?></p> |
|
| 43 | + <img src="<?php echo esc_url( $template[ 'logo' ] ); ?>" alt="<?php echo esc_attr( $template[ 'label' ] ); ?>"> |
|
| 44 | + <h5><?php echo esc_html( $template[ 'label' ] ); ?></h5> |
|
| 45 | + <p class="description"><?php echo esc_html( $template[ 'description' ] ); ?></p> |
|
| 46 | 46 | </div> |
| 47 | 47 | </div> |
| 48 | 48 | </div> |
@@ -10,13 +10,13 @@ discard block |
||
| 10 | 10 | wp_nonce_field( 'gravityview_select_form', 'gravityview_select_form_nonce' ); |
| 11 | 11 | |
| 12 | 12 | //current value |
| 13 | -$current_form = (int) \GV\Utils::_GET( 'form_id', gravityview_get_form_id( $post->ID ) ); |
|
| 13 | +$current_form = (int)\GV\Utils::_GET( 'form_id', gravityview_get_form_id( $post->ID ) ); |
|
| 14 | 14 | |
| 15 | 15 | // If form is in trash or not existing, show error |
| 16 | 16 | GravityView_Admin::connected_form_warning( $current_form ); |
| 17 | 17 | |
| 18 | 18 | // check for available gravity forms |
| 19 | -$forms = gravityview_get_forms('any'); |
|
| 19 | +$forms = gravityview_get_forms( 'any' ); |
|
| 20 | 20 | |
| 21 | 21 | /** |
| 22 | 22 | * @param int $current_form Form currently selected in the View (0 if none selected) |
@@ -35,24 +35,24 @@ discard block |
||
| 35 | 35 | ?> |
| 36 | 36 | <a class="button button-primary" href="#gv_start_fresh" title="<?php esc_attr_e( 'Use a Form Preset', 'gravityview' ); ?>"><?php esc_html_e( 'Use a Form Preset', 'gravityview' ); ?></a> |
| 37 | 37 | |
| 38 | - <?php if( !empty( $forms ) ) { ?> |
|
| 38 | + <?php if ( ! empty( $forms ) ) { ?> |
|
| 39 | 39 | <span> <?php esc_html_e( 'or use an existing form', 'gravityview' ); ?> </span> |
| 40 | 40 | <?php } |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | // If there are no forms to select, show no forms. |
| 44 | - if( !empty( $forms ) ) { ?> |
|
| 44 | + if ( ! empty( $forms ) ) { ?> |
|
| 45 | 45 | <select name="gravityview_form_id" id="gravityview_form_id"> |
| 46 | 46 | <option value="" <?php selected( '', $current_form, true ); ?>>— <?php esc_html_e( 'list of forms', 'gravityview' ); ?> —</option> |
| 47 | - <?php foreach( $forms as $form ) { ?> |
|
| 48 | - <option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option> |
|
| 47 | + <?php foreach ( $forms as $form ) { ?> |
|
| 48 | + <option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option> |
|
| 49 | 49 | <?php } ?> |
| 50 | 50 | </select> |
| 51 | 51 | <?php } else { ?> |
| 52 | 52 | <select name="gravityview_form_id" id="gravityview_form_id" class="hidden"><option selected="selected" value=""></option></select> |
| 53 | 53 | <?php } ?> |
| 54 | 54 | |
| 55 | - <button class="button button-primary" <?php if( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></button> |
|
| 55 | + <button class="button button-primary" <?php if ( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></button> |
|
| 56 | 56 | </p> |
| 57 | 57 | |
| 58 | 58 | <?php // confirm dialog box ?> |
@@ -44,12 +44,12 @@ discard block |
||
| 44 | 44 | */ |
| 45 | 45 | protected $form_id; |
| 46 | 46 | |
| 47 | - function __construct( $title = '', $item_id, $item = array(), $settings = array(), $form_id = null) { |
|
| 47 | + function __construct( $title = '', $item_id, $item = array(), $settings = array(), $form_id = null ) { |
|
| 48 | 48 | |
| 49 | 49 | // Backward compat |
| 50 | - if ( ! empty( $item['type'] ) ) { |
|
| 51 | - $item['input_type'] = $item['type']; |
|
| 52 | - unset( $item['type'] ); |
|
| 50 | + if ( ! empty( $item[ 'type' ] ) ) { |
|
| 51 | + $item[ 'input_type' ] = $item[ 'type' ]; |
|
| 52 | + unset( $item[ 'type' ] ); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | if ( $admin_label = \GV\Utils::get( $settings, 'admin_label' ) ) { |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | $this->id = $item_id; |
| 76 | 76 | $this->form_id = $form_id; |
| 77 | 77 | $this->settings = $settings; |
| 78 | - $this->label_type = $item['label_type']; |
|
| 78 | + $this->label_type = $item[ 'label_type' ]; |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | /** |
@@ -119,14 +119,14 @@ discard block |
||
| 119 | 119 | |
| 120 | 120 | foreach ( $field_info_items as $item ) { |
| 121 | 121 | |
| 122 | - if( \GV\Utils::get( $item, 'hide_in_picker', false ) ) { |
|
| 122 | + if ( \GV\Utils::get( $item, 'hide_in_picker', false ) ) { |
|
| 123 | 123 | continue; |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | - $class = isset( $item['class'] ) ? sanitize_html_class( $item['class'] ) . ' description' : 'description'; |
|
| 126 | + $class = isset( $item[ 'class' ] ) ? sanitize_html_class( $item[ 'class' ] ) . ' description' : 'description'; |
|
| 127 | 127 | // Add the title in case the value's long, in which case, it'll be truncated by CSS. |
| 128 | 128 | $output .= '<span class="' . $class . '">'; |
| 129 | - $output .= esc_html( $item['value'] ); |
|
| 129 | + $output .= esc_html( $item[ 'value' ] ); |
|
| 130 | 130 | $output .= '</span>'; |
| 131 | 131 | } |
| 132 | 132 | |
@@ -154,21 +154,21 @@ discard block |
||
| 154 | 154 | |
| 155 | 155 | // $settings_html will just be hidden inputs if empty. Otherwise, it'll have an <ul>. Ugly hack, I know. |
| 156 | 156 | // TODO: Un-hack this |
| 157 | - $hide_settings_link_class = ( empty( $this->item['settings_html'] ) || strpos( $this->item['settings_html'], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : ''; |
|
| 158 | - $settings_link = sprintf( '<button class="gv-field-settings" title="%1$s" aria-label="%1$s"><span class="dashicons-admin-generic dashicons %2$s"></span></button>', esc_attr( $settings_title ), $hide_settings_link_class ); |
|
| 157 | + $hide_settings_link_class = ( empty( $this->item[ 'settings_html' ] ) || strpos( $this->item[ 'settings_html' ], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : ''; |
|
| 158 | + $settings_link = sprintf( '<button class="gv-field-settings" title="%1$s" aria-label="%1$s"><span class="dashicons-admin-generic dashicons %2$s"></span></button>', esc_attr( $settings_title ), $hide_settings_link_class ); |
|
| 159 | 159 | |
| 160 | 160 | // Should we show the icon that the field is being used as a link to single entry? |
| 161 | - $hide_show_as_link_class = empty( $this->settings['show_as_link'] ) ? 'hide-if-js' : ''; |
|
| 161 | + $hide_show_as_link_class = empty( $this->settings[ 'show_as_link' ] ) ? 'hide-if-js' : ''; |
|
| 162 | 162 | $show_as_link = '<span class="dashicons dashicons-admin-links ' . $hide_show_as_link_class . '" title="' . esc_attr( $single_link_title ) . '"></span>'; |
| 163 | 163 | |
| 164 | 164 | // When a field label is empty, use the Field ID |
| 165 | 165 | $label = empty( $this->title ) ? sprintf( _x( 'Field #%s (No Label)', 'Label in field picker for empty label', 'gravityview' ), $this->id ) : $this->title; |
| 166 | 166 | |
| 167 | 167 | // If there's a custom label, and show label is checked, use that as the field heading |
| 168 | - if ( ! empty( $this->settings['custom_label'] ) && ! empty( $this->settings['show_label'] ) ) { |
|
| 169 | - $label = $this->settings['custom_label']; |
|
| 170 | - } else if ( ! empty( $this->item['customLabel'] ) ) { |
|
| 171 | - $label = $this->item['customLabel']; |
|
| 168 | + if ( ! empty( $this->settings[ 'custom_label' ] ) && ! empty( $this->settings[ 'show_label' ] ) ) { |
|
| 169 | + $label = $this->settings[ 'custom_label' ]; |
|
| 170 | + } else if ( ! empty( $this->item[ 'customLabel' ] ) ) { |
|
| 171 | + $label = $this->item[ 'customLabel' ]; |
|
| 172 | 172 | } |
| 173 | 173 | $label = esc_attr( $label ); |
| 174 | 174 | |
@@ -176,8 +176,8 @@ discard block |
||
| 176 | 176 | |
| 177 | 177 | $output .= '<h5 class="selectable gfield field-id-' . esc_attr( $this->id ) . '">'; |
| 178 | 178 | |
| 179 | - if ( ! empty( $this->item['parent'] ) ) { |
|
| 180 | - $label .= ' <small>(' . esc_attr( $this->item['parent']['label'] ) . ')</small>'; |
|
| 179 | + if ( ! empty( $this->item[ 'parent' ] ) ) { |
|
| 180 | + $label .= ' <small>(' . esc_attr( $this->item[ 'parent' ][ 'label' ] ) . ')</small>'; |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | // Name of field / widget |
@@ -193,10 +193,10 @@ discard block |
||
| 193 | 193 | |
| 194 | 194 | $output .= '</h5>'; |
| 195 | 195 | |
| 196 | - $container_class = ! empty( $this->item['parent'] ) ? ' gv-child-field' : ''; |
|
| 197 | - $data_form_id = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : ''; |
|
| 196 | + $container_class = ! empty( $this->item[ 'parent' ] ) ? ' gv-child-field' : ''; |
|
| 197 | + $data_form_id = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : ''; |
|
| 198 | 198 | |
| 199 | - $output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item['input_type'] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item['settings_html'] . '</div>'; |
|
| 199 | + $output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item[ 'input_type' ] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item[ 'settings_html' ] . '</div>'; |
|
| 200 | 200 | |
| 201 | 201 | return $output; |
| 202 | 202 | } |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | wp_embed_register_handler( 'gravityview_entry', self::get_entry_regex(), array( __CLASS__, 'render' ), 20000 ); |
| 27 | 27 | wp_oembed_add_provider( self::get_entry_regex(), self::$provider_url, true ); |
| 28 | 28 | |
| 29 | - if ( ! empty( $_GET['gv_oembed_provider'] ) && ! empty( $_GET['url'] ) ) { |
|
| 29 | + if ( ! empty( $_GET[ 'gv_oembed_provider' ] ) && ! empty( $_GET[ 'url' ] ) ) { |
|
| 30 | 30 | add_action( 'template_redirect', array( __CLASS__, 'render_provider_request' ) ); |
| 31 | 31 | } |
| 32 | 32 | |
@@ -43,8 +43,8 @@ discard block |
||
| 43 | 43 | * @return void |
| 44 | 44 | */ |
| 45 | 45 | public static function render_provider_request() { |
| 46 | - if ( ! empty( $_GET['url'] ) ) { |
|
| 47 | - $url = $_GET['url']; |
|
| 46 | + if ( ! empty( $_GET[ 'url' ] ) ) { |
|
| 47 | + $url = $_GET[ 'url' ]; |
|
| 48 | 48 | } else { |
| 49 | 49 | header( 'HTTP/1.0 404 Not Found' ); |
| 50 | 50 | exit; |
@@ -111,18 +111,18 @@ discard block |
||
| 111 | 111 | */ |
| 112 | 112 | private static function parse_matches( $matches, $url ) { |
| 113 | 113 | // If not using permalinks, re-assign values for matching groups |
| 114 | - if ( ! empty( $matches['entry_slug2'] ) ) { |
|
| 115 | - $matches['is_cpt'] = $matches['is_cpt2']; |
|
| 116 | - $matches['slug'] = $matches['slug2']; |
|
| 117 | - $matches['entry_slug'] = $matches['entry_slug2']; |
|
| 118 | - unset( $matches['is_cpt2'], $matches['slug2'], $matches['entry_slug2'] ); |
|
| 114 | + if ( ! empty( $matches[ 'entry_slug2' ] ) ) { |
|
| 115 | + $matches[ 'is_cpt' ] = $matches[ 'is_cpt2' ]; |
|
| 116 | + $matches[ 'slug' ] = $matches[ 'slug2' ]; |
|
| 117 | + $matches[ 'entry_slug' ] = $matches[ 'entry_slug2' ]; |
|
| 118 | + unset( $matches[ 'is_cpt2' ], $matches[ 'slug2' ], $matches[ 'entry_slug2' ] ); |
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | - if ( empty( $matches['entry_slug'] ) ) { |
|
| 121 | + if ( empty( $matches[ 'entry_slug' ] ) ) { |
|
| 122 | 122 | gravityview()->log->error( 'Entry slug not parsed by regex.', array( 'data' => $matches ) ); |
| 123 | 123 | return null; |
| 124 | 124 | } else { |
| 125 | - $entry_id = $matches['entry_slug']; |
|
| 125 | + $entry_id = $matches[ 'entry_slug' ]; |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | if ( ! $entry = \GV\GF_Entry::by_id( $entry_id ) ) { |
@@ -140,12 +140,12 @@ discard block |
||
| 140 | 140 | if ( ! $view ) { |
| 141 | 141 | |
| 142 | 142 | // If the slug doesn't work, maybe using Plain permalinks and not the slug, only ID |
| 143 | - if( is_numeric( $matches['slug'] ) ) { |
|
| 144 | - $view = \GV\View::by_id( $matches['slug'] ); |
|
| 143 | + if ( is_numeric( $matches[ 'slug' ] ) ) { |
|
| 144 | + $view = \GV\View::by_id( $matches[ 'slug' ] ); |
|
| 145 | 145 | } |
| 146 | 146 | |
| 147 | - if( ! $view ) { |
|
| 148 | - $view = \GV\View::from_post( get_page_by_path( $matches['slug'], OBJECT, 'gravityview' ) ); |
|
| 147 | + if ( ! $view ) { |
|
| 148 | + $view = \GV\View::from_post( get_page_by_path( $matches[ 'slug' ], OBJECT, 'gravityview' ) ); |
|
| 149 | 149 | } |
| 150 | 150 | } |
| 151 | 151 | |
@@ -176,9 +176,9 @@ discard block |
||
| 176 | 176 | |
| 177 | 177 | return ' |
| 178 | 178 | <div class="loading-placeholder" style="background-color:#e6f0f5;"> |
| 179 | - <h3 style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">'.$image.$embed_heading.'</h3> |
|
| 179 | + <h3 style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">'.$image . $embed_heading . '</h3> |
|
| 180 | 180 | <p style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;"> |
| 181 | - '.$embed_text.' |
|
| 181 | + '.$embed_text . ' |
|
| 182 | 182 | </p> |
| 183 | 183 | <br style="clear: both;"> |
| 184 | 184 | </div>'; |
@@ -192,8 +192,8 @@ discard block |
||
| 192 | 192 | private static function render_preview_notice() { |
| 193 | 193 | $floaty = \GravityView_Admin::get_floaty(); |
| 194 | 194 | $title = esc_html__( 'This will look better when it is embedded.', 'gravityview' ); |
| 195 | - $message = esc_html__( 'Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview'); |
|
| 196 | - return '<div class="updated notice">'.$floaty.'<h3>'.$title.'</h3><p>'.$message.'</p><br style="clear:both;" /></div>'; |
|
| 195 | + $message = esc_html__( 'Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview' ); |
|
| 196 | + return '<div class="updated notice">' . $floaty . '<h3>' . $title . '</h3><p>' . $message . '</p><br style="clear:both;" /></div>'; |
|
| 197 | 197 | } |
| 198 | 198 | |
| 199 | 199 | /** |
@@ -212,13 +212,13 @@ discard block |
||
| 212 | 212 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
| 213 | 213 | } |
| 214 | 214 | |
| 215 | - if ( $entry && 'active' !== $entry['status'] ) { |
|
| 215 | + if ( $entry && 'active' !== $entry[ 'status' ] ) { |
|
| 216 | 216 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) ); |
| 217 | 217 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
| 218 | 218 | } |
| 219 | 219 | |
| 220 | 220 | if ( $view->settings->get( 'show_only_approved' ) ) { |
| 221 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 221 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 222 | 222 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) ); |
| 223 | 223 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
| 224 | 224 | } |
@@ -249,9 +249,9 @@ discard block |
||
| 249 | 249 | * Mocks old context, etc. |
| 250 | 250 | */ |
| 251 | 251 | $loader = \GravityView_Edit_Entry::getInstance(); |
| 252 | - $render = $loader->instances['render']; |
|
| 252 | + $render = $loader->instances[ 'render' ]; |
|
| 253 | 253 | |
| 254 | - $form = \GFAPI::get_form( $entry['form_id'] ); |
|
| 254 | + $form = \GFAPI::get_form( $entry[ 'form_id' ] ); |
|
| 255 | 255 | |
| 256 | 256 | // @todo We really need to rewrite Edit Entry soon |
| 257 | 257 | \GravityView_View::$instance = null; |
@@ -260,13 +260,13 @@ discard block |
||
| 260 | 260 | $data = \GravityView_View_Data::getInstance( get_post( $view->ID ) ); |
| 261 | 261 | $template = \GravityView_View::getInstance( array( |
| 262 | 262 | 'form' => $form, |
| 263 | - 'form_id' => $form['id'], |
|
| 263 | + 'form_id' => $form[ 'id' ], |
|
| 264 | 264 | 'view_id' => $view->ID, |
| 265 | 265 | 'entries' => array( $entry->as_entry() ), |
| 266 | 266 | 'atts' => \GVCommon::get_template_settings( $view->ID ), |
| 267 | 267 | ) ); |
| 268 | 268 | |
| 269 | - ob_start() && $render->init( $data, \GV\Entry::by_id( $entry['id'] ), $view ); |
|
| 269 | + ob_start() && $render->init( $data, \GV\Entry::by_id( $entry[ 'id' ] ), $view ); |
|
| 270 | 270 | $output = ob_get_clean(); // Render :) |
| 271 | 271 | } else { |
| 272 | 272 | /** Remove the back link. */ |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | // Catch either |
| 311 | 311 | $match_regex = "(?:{$using_permalinks}|{$not_using_permalinks})"; |
| 312 | 312 | |
| 313 | - return '#'.$match_regex.'#i'; |
|
| 313 | + return '#' . $match_regex . '#i'; |
|
| 314 | 314 | } |
| 315 | 315 | |
| 316 | 316 | /** |