@@ -21,12 +21,12 @@ discard block |
||
| 21 | 21 | gravityview()->request = new \GV\Dummy_Request(); |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | - if( !empty( $passed_post ) ) { |
|
| 24 | + if ( ! empty( $passed_post ) ) { |
|
| 25 | 25 | |
| 26 | 26 | $id_or_id_array = $this->maybe_get_view_id( $passed_post ); |
| 27 | 27 | |
| 28 | 28 | if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) { |
| 29 | - foreach( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) { |
|
| 29 | + foreach ( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) { |
|
| 30 | 30 | if ( \GV\View::exists( $view_id ) && ! gravityview()->views->contains( $view_id ) ) { |
| 31 | 31 | gravityview()->views->add( \GV\View::by_id( $view_id ) ); |
| 32 | 32 | } |
@@ -73,24 +73,24 @@ discard block |
||
| 73 | 73 | public function maybe_get_view_id( $passed_post ) { |
| 74 | 74 | $ids = array(); |
| 75 | 75 | |
| 76 | - if( ! empty( $passed_post ) ) { |
|
| 76 | + if ( ! empty( $passed_post ) ) { |
|
| 77 | 77 | |
| 78 | - if( is_numeric( $passed_post ) ) { |
|
| 78 | + if ( is_numeric( $passed_post ) ) { |
|
| 79 | 79 | $passed_post = get_post( $passed_post ); |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | // Convert WP_Posts into WP_Posts[] array |
| 83 | - if( $passed_post instanceof WP_Post ) { |
|
| 83 | + if ( $passed_post instanceof WP_Post ) { |
|
| 84 | 84 | $passed_post = array( $passed_post ); |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | - if( is_array( $passed_post ) ) { |
|
| 87 | + if ( is_array( $passed_post ) ) { |
|
| 88 | 88 | |
| 89 | - foreach ( $passed_post as &$post) { |
|
| 89 | + foreach ( $passed_post as &$post ) { |
|
| 90 | 90 | if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) && $post instanceof WP_Post ) { |
| 91 | 91 | $views = \GV\View_Collection::from_post( $post ); |
| 92 | 92 | foreach ( $views->all() as $view ) { |
| 93 | - $ids []= $view->ID; |
|
| 93 | + $ids [ ] = $view->ID; |
|
| 94 | 94 | |
| 95 | 95 | /** And as a side-effect... add each view to the global scope. */ |
| 96 | 96 | if ( ! gravityview()->views->contains( $view->ID ) ) { |
@@ -99,19 +99,19 @@ discard block |
||
| 99 | 99 | } |
| 100 | 100 | } else { |
| 101 | 101 | /** Deprecated, see \GV\View_Collection::from_post */ |
| 102 | - if( ( get_post_type( $post ) === 'gravityview' ) ) { |
|
| 103 | - $ids[] = $post->ID; |
|
| 104 | - } else{ |
|
| 102 | + if ( ( get_post_type( $post ) === 'gravityview' ) ) { |
|
| 103 | + $ids[ ] = $post->ID; |
|
| 104 | + } else { |
|
| 105 | 105 | // Parse the Post Content |
| 106 | 106 | $id = $this->parse_post_content( $post->post_content ); |
| 107 | - if( $id ) { |
|
| 108 | - $ids = array_merge( $ids, (array) $id ); |
|
| 107 | + if ( $id ) { |
|
| 108 | + $ids = array_merge( $ids, (array)$id ); |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | // Parse the Post Meta |
| 112 | 112 | $id = $this->parse_post_meta( $post->ID ); |
| 113 | - if( $id ) { |
|
| 114 | - $ids = array_merge( $ids, (array) $id ); |
|
| 113 | + if ( $id ) { |
|
| 114 | + $ids = array_merge( $ids, (array)$id ); |
|
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | 117 | } |
@@ -125,37 +125,37 @@ discard block |
||
| 125 | 125 | if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) { |
| 126 | 126 | $shortcodes = \GV\Shortcode::parse( $passed_post ); |
| 127 | 127 | foreach ( $shortcodes as $shortcode ) { |
| 128 | - if ( $shortcode->name == 'gravityview' && !empty( $shortcode->atts['id'] ) ) { |
|
| 129 | - $ids []= $shortcode->atts['id']; |
|
| 128 | + if ( $shortcode->name == 'gravityview' && ! empty( $shortcode->atts[ 'id' ] ) ) { |
|
| 129 | + $ids [ ] = $shortcode->atts[ 'id' ]; |
|
| 130 | 130 | |
| 131 | 131 | /** And as a side-effect... add each view to the global scope. */ |
| 132 | - if ( ! gravityview()->views->contains( $shortcode->atts['id'] ) && \GV\View::exists( $shortcode->atts['id'] ) ) { |
|
| 133 | - gravityview()->views->add( $shortcode->atts['id'] ); |
|
| 132 | + if ( ! gravityview()->views->contains( $shortcode->atts[ 'id' ] ) && \GV\View::exists( $shortcode->atts[ 'id' ] ) ) { |
|
| 133 | + gravityview()->views->add( $shortcode->atts[ 'id' ] ); |
|
| 134 | 134 | } |
| 135 | 135 | } |
| 136 | 136 | } |
| 137 | 137 | } else { |
| 138 | 138 | /** Deprecated, use \GV\Shortcode::parse. */ |
| 139 | 139 | $id = $this->parse_post_content( $passed_post ); |
| 140 | - if( $id ) { |
|
| 141 | - $ids = array_merge( $ids, (array) $id ); |
|
| 140 | + if ( $id ) { |
|
| 141 | + $ids = array_merge( $ids, (array)$id ); |
|
| 142 | 142 | } |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | } else { |
| 146 | 146 | $id = $this->get_id_from_atts( $passed_post ); |
| 147 | - $ids[] = intval( $id ); |
|
| 147 | + $ids[ ] = intval( $id ); |
|
| 148 | 148 | } |
| 149 | 149 | } |
| 150 | 150 | } |
| 151 | 151 | |
| 152 | - if( empty($ids) ) { |
|
| 152 | + if ( empty( $ids ) ) { |
|
| 153 | 153 | return NULL; |
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | // If it's just one ID, return that. |
| 157 | 157 | // Otherwise, return array of IDs |
| 158 | - return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids; |
|
| 158 | + return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids; |
|
| 159 | 159 | } |
| 160 | 160 | |
| 161 | 161 | /** |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | */ |
| 164 | 164 | public static function getInstance( $passed_post = NULL ) { |
| 165 | 165 | |
| 166 | - if( empty( self::$instance ) ) { |
|
| 166 | + if ( empty( self::$instance ) ) { |
|
| 167 | 167 | self::$instance = new GravityView_View_Data( $passed_post ); |
| 168 | 168 | } |
| 169 | 169 | |
@@ -180,8 +180,8 @@ discard block |
||
| 180 | 180 | return array(); |
| 181 | 181 | } |
| 182 | 182 | return array_combine( |
| 183 | - array_map( function ( $view ) { return $view->ID; }, gravityview()->views->all() ), |
|
| 184 | - array_map( function ( $view ) { return $view->as_data(); }, gravityview()->views->all() ) |
|
| 183 | + array_map( function( $view ) { return $view->ID; }, gravityview()->views->all() ), |
|
| 184 | + array_map( function( $view ) { return $view->as_data(); }, gravityview()->views->all() ) |
|
| 185 | 185 | ); |
| 186 | 186 | } |
| 187 | 187 | return $this->views; |
@@ -208,19 +208,19 @@ discard block |
||
| 208 | 208 | return $view->as_data(); |
| 209 | 209 | } |
| 210 | 210 | |
| 211 | - if( ! is_numeric( $view_id) ) { |
|
| 212 | - do_action('gravityview_log_error', sprintf('GravityView_View_Data[get_view] $view_id passed is not numeric.', $view_id) ); |
|
| 211 | + if ( ! is_numeric( $view_id ) ) { |
|
| 212 | + do_action( 'gravityview_log_error', sprintf( 'GravityView_View_Data[get_view] $view_id passed is not numeric.', $view_id ) ); |
|
| 213 | 213 | return false; |
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | // Backup: the view hasn't been fetched yet. Doing it now. |
| 217 | 217 | if ( ! isset( $this->views[ $view_id ] ) ) { |
| 218 | - do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] View #%s not set yet.', $view_id) ); |
|
| 218 | + do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[get_view] View #%s not set yet.', $view_id ) ); |
|
| 219 | 219 | return $this->add_view( $view_id, $atts ); |
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | if ( empty( $this->views[ $view_id ] ) ) { |
| 223 | - do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] Returning; View #%s was empty.', $view_id) ); |
|
| 223 | + do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[get_view] Returning; View #%s was empty.', $view_id ) ); |
|
| 224 | 224 | return false; |
| 225 | 225 | } |
| 226 | 226 | |
@@ -265,8 +265,8 @@ discard block |
||
| 265 | 265 | } |
| 266 | 266 | |
| 267 | 267 | // Handle array of IDs |
| 268 | - if( is_array( $view_id ) ) { |
|
| 269 | - foreach( $view_id as $id ) { |
|
| 268 | + if ( is_array( $view_id ) ) { |
|
| 269 | + foreach ( $view_id as $id ) { |
|
| 270 | 270 | |
| 271 | 271 | $this->add_view( $id, $atts ); |
| 272 | 272 | } |
@@ -275,21 +275,21 @@ discard block |
||
| 275 | 275 | } |
| 276 | 276 | |
| 277 | 277 | // The view has been set already; returning stored view. |
| 278 | - if ( !empty( $this->views[ $view_id ] ) ) { |
|
| 279 | - do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s already exists.', $view_id) ); |
|
| 278 | + if ( ! empty( $this->views[ $view_id ] ) ) { |
|
| 279 | + do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] Returning; View #%s already exists.', $view_id ) ); |
|
| 280 | 280 | return $this->views[ $view_id ]; |
| 281 | 281 | } |
| 282 | 282 | |
| 283 | - if( ! $this->view_exists( $view_id ) ) { |
|
| 284 | - do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s does not exist.', $view_id) ); |
|
| 283 | + if ( ! $this->view_exists( $view_id ) ) { |
|
| 284 | + do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] Returning; View #%s does not exist.', $view_id ) ); |
|
| 285 | 285 | return false; |
| 286 | 286 | } |
| 287 | 287 | |
| 288 | 288 | $form_id = gravityview_get_form_id( $view_id ); |
| 289 | 289 | |
| 290 | - if( empty( $form_id ) ) { |
|
| 290 | + if ( empty( $form_id ) ) { |
|
| 291 | 291 | |
| 292 | - do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; Post ID #%s does not have a connected form.', $view_id) ); |
|
| 292 | + do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] Returning; Post ID #%s does not have a connected form.', $view_id ) ); |
|
| 293 | 293 | |
| 294 | 294 | return false; |
| 295 | 295 | } |
@@ -297,21 +297,21 @@ discard block |
||
| 297 | 297 | // Get the settings for the View ID |
| 298 | 298 | $view_settings = gravityview_get_template_settings( $view_id ); |
| 299 | 299 | |
| 300 | - do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Settings pulled in from View #%s', $view_id), $view_settings ); |
|
| 300 | + do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] Settings pulled in from View #%s', $view_id ), $view_settings ); |
|
| 301 | 301 | |
| 302 | 302 | // Merge the view settings with the defaults |
| 303 | 303 | $view_defaults = wp_parse_args( $view_settings, defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ? \GV\View_Settings::defaults() : self::get_default_args() ); |
| 304 | 304 | |
| 305 | - do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] View Defaults after merging View Settings with the default args.', $view_defaults ); |
|
| 305 | + do_action( 'gravityview_log_debug', 'GravityView_View_Data[add_view] View Defaults after merging View Settings with the default args.', $view_defaults ); |
|
| 306 | 306 | |
| 307 | - if( ! empty( $atts ) && is_array( $atts ) ) { |
|
| 307 | + if ( ! empty( $atts ) && is_array( $atts ) ) { |
|
| 308 | 308 | |
| 309 | - do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts before merging with the $view_defaults', $atts ); |
|
| 309 | + do_action( 'gravityview_log_debug', 'GravityView_View_Data[add_view] $atts before merging with the $view_defaults', $atts ); |
|
| 310 | 310 | |
| 311 | 311 | // Get the settings from the shortcode and merge them with defaults. |
| 312 | 312 | $atts = shortcode_atts( $view_defaults, $atts ); |
| 313 | 313 | |
| 314 | - do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts after merging with the $view_defaults', $atts ); |
|
| 314 | + do_action( 'gravityview_log_debug', 'GravityView_View_Data[add_view] $atts after merging with the $view_defaults', $atts ); |
|
| 315 | 315 | |
| 316 | 316 | } else { |
| 317 | 317 | |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | |
| 321 | 321 | } |
| 322 | 322 | |
| 323 | - unset( $atts['id'], $view_defaults, $view_settings ); |
|
| 323 | + unset( $atts[ 'id' ], $view_defaults, $view_settings ); |
|
| 324 | 324 | |
| 325 | 325 | $data = array( |
| 326 | 326 | 'id' => $view_id, |
@@ -333,7 +333,7 @@ discard block |
||
| 333 | 333 | 'form' => gravityview_get_form( $form_id ), |
| 334 | 334 | ); |
| 335 | 335 | |
| 336 | - do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] View #%s being added.', $view_id), $data ); |
|
| 336 | + do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] View #%s being added.', $view_id ), $data ); |
|
| 337 | 337 | |
| 338 | 338 | $this->views[ $view_id ] = $data; |
| 339 | 339 | |
@@ -383,15 +383,15 @@ discard block |
||
| 383 | 383 | throw new Exception( __METHOD__ . ' should not be called anymore. Why was it?' ); |
| 384 | 384 | } |
| 385 | 385 | |
| 386 | - if( empty( $dir_fields ) || !is_array( $dir_fields ) ) { |
|
| 386 | + if ( empty( $dir_fields ) || ! is_array( $dir_fields ) ) { |
|
| 387 | 387 | return $dir_fields; |
| 388 | 388 | } |
| 389 | 389 | |
| 390 | - foreach( $dir_fields as $area => $fields ) { |
|
| 390 | + foreach ( $dir_fields as $area => $fields ) { |
|
| 391 | 391 | |
| 392 | - foreach( (array)$fields as $uniqid => $properties ) { |
|
| 392 | + foreach ( (array)$fields as $uniqid => $properties ) { |
|
| 393 | 393 | |
| 394 | - if( $this->hide_field_check_conditions( $properties ) ) { |
|
| 394 | + if ( $this->hide_field_check_conditions( $properties ) ) { |
|
| 395 | 395 | unset( $dir_fields[ $area ][ $uniqid ] ); |
| 396 | 396 | } |
| 397 | 397 | |
@@ -418,7 +418,7 @@ discard block |
||
| 418 | 418 | } |
| 419 | 419 | |
| 420 | 420 | // logged-in visibility |
| 421 | - if( ! empty( $properties['only_loggedin'] ) && ! GVCommon::has_cap( $properties['only_loggedin_cap'] ) ) { |
|
| 421 | + if ( ! empty( $properties[ 'only_loggedin' ] ) && ! GVCommon::has_cap( $properties[ 'only_loggedin_cap' ] ) ) { |
|
| 422 | 422 | return true; |
| 423 | 423 | } |
| 424 | 424 | |
@@ -449,14 +449,14 @@ discard block |
||
| 449 | 449 | // Get the settings from the shortcode and merge them with defaults. |
| 450 | 450 | $atts = wp_parse_args( $atts, defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ? \GV\View_Settings::defaults() : self::get_default_args() ); |
| 451 | 451 | |
| 452 | - $view_id = ! empty( $atts['view_id'] ) ? (int)$atts['view_id'] : NULL; |
|
| 452 | + $view_id = ! empty( $atts[ 'view_id' ] ) ? (int)$atts[ 'view_id' ] : NULL; |
|
| 453 | 453 | |
| 454 | - if( empty( $view_id ) && !empty( $atts['id'] ) ) { |
|
| 455 | - $view_id = (int)$atts['id']; |
|
| 454 | + if ( empty( $view_id ) && ! empty( $atts[ 'id' ] ) ) { |
|
| 455 | + $view_id = (int)$atts[ 'id' ]; |
|
| 456 | 456 | } |
| 457 | 457 | |
| 458 | - if( empty( $view_id ) ) { |
|
| 459 | - do_action('gravityview_log_error', 'GravityView_View_Data[get_id_from_atts] Returning; no ID defined (Atts)', $atts ); |
|
| 458 | + if ( empty( $view_id ) ) { |
|
| 459 | + do_action( 'gravityview_log_error', 'GravityView_View_Data[get_id_from_atts] Returning; no ID defined (Atts)', $atts ); |
|
| 460 | 460 | return; |
| 461 | 461 | } |
| 462 | 462 | |
@@ -480,68 +480,68 @@ discard block |
||
| 480 | 480 | if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) { |
| 481 | 481 | $ids = array(); |
| 482 | 482 | foreach ( \GV\Shortcode::parse( $content ) as $shortcode ) { |
| 483 | - if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts['id'] ) ) { |
|
| 484 | - if ( \GV\View::exists( $shortcode->atts['id'] ) && ! gravityview()->views->contains( $shortcode->atts['id'] ) ) { |
|
| 485 | - gravityview()->views->add( \GV\View::by_id( $shortcode->atts['id'] ) ); |
|
| 483 | + if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts[ 'id' ] ) ) { |
|
| 484 | + if ( \GV\View::exists( $shortcode->atts[ 'id' ] ) && ! gravityview()->views->contains( $shortcode->atts[ 'id' ] ) ) { |
|
| 485 | + gravityview()->views->add( \GV\View::by_id( $shortcode->atts[ 'id' ] ) ); |
|
| 486 | 486 | } |
| 487 | 487 | /** |
| 488 | 488 | * The original function outputs the ID even though it wasn't added by ::add_view() |
| 489 | 489 | * Wether this is a bug or not remains a mystery. But we need to emulate this behavior |
| 490 | 490 | * until better times. |
| 491 | 491 | */ |
| 492 | - $ids []= $shortcode->atts['id']; |
|
| 492 | + $ids [ ] = $shortcode->atts[ 'id' ]; |
|
| 493 | 493 | } |
| 494 | 494 | } |
| 495 | 495 | if ( empty ( $ids ) ) { |
| 496 | 496 | return null; |
| 497 | 497 | } |
| 498 | - return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids; |
|
| 498 | + return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids; |
|
| 499 | 499 | } |
| 500 | 500 | |
| 501 | 501 | /** |
| 502 | 502 | * @hack This is so that the shortcode is registered for the oEmbed preview in the Admin |
| 503 | 503 | * @since 1.6 |
| 504 | 504 | */ |
| 505 | - if( ! shortcode_exists('gravityview') && class_exists( 'GravityView_Shortcode' ) ) { |
|
| 505 | + if ( ! shortcode_exists( 'gravityview' ) && class_exists( 'GravityView_Shortcode' ) ) { |
|
| 506 | 506 | new GravityView_Shortcode; |
| 507 | 507 | } |
| 508 | 508 | |
| 509 | 509 | $shortcodes = gravityview_has_shortcode_r( $content, 'gravityview' ); |
| 510 | 510 | |
| 511 | - if( empty( $shortcodes ) ) { |
|
| 511 | + if ( empty( $shortcodes ) ) { |
|
| 512 | 512 | return NULL; |
| 513 | 513 | } |
| 514 | 514 | |
| 515 | - do_action('gravityview_log_debug', 'GravityView_View_Data[parse_post_content] Parsing content, found shortcodes:', $shortcodes ); |
|
| 515 | + do_action( 'gravityview_log_debug', 'GravityView_View_Data[parse_post_content] Parsing content, found shortcodes:', $shortcodes ); |
|
| 516 | 516 | |
| 517 | 517 | $ids = array(); |
| 518 | 518 | |
| 519 | - foreach ($shortcodes as $key => $shortcode) { |
|
| 519 | + foreach ( $shortcodes as $key => $shortcode ) { |
|
| 520 | 520 | |
| 521 | - $shortcode[3] = htmlspecialchars_decode( $shortcode[3], ENT_QUOTES ); |
|
| 521 | + $shortcode[ 3 ] = htmlspecialchars_decode( $shortcode[ 3 ], ENT_QUOTES ); |
|
| 522 | 522 | |
| 523 | - $args = shortcode_parse_atts( $shortcode[3] ); |
|
| 523 | + $args = shortcode_parse_atts( $shortcode[ 3 ] ); |
|
| 524 | 524 | |
| 525 | - if( empty( $args['id'] ) ) { |
|
| 526 | - do_action('gravityview_log_error', 'GravityView_View_Data[parse_post_content] Returning; no ID defined in shortcode atts', $shortcode ); |
|
| 525 | + if ( empty( $args[ 'id' ] ) ) { |
|
| 526 | + do_action( 'gravityview_log_error', 'GravityView_View_Data[parse_post_content] Returning; no ID defined in shortcode atts', $shortcode ); |
|
| 527 | 527 | continue; |
| 528 | 528 | } |
| 529 | 529 | |
| 530 | - do_action('gravityview_log_debug', sprintf('GravityView_View_Data[parse_post_content] Adding view #%s with shortcode args', $args['id']), $args ); |
|
| 530 | + do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[parse_post_content] Adding view #%s with shortcode args', $args[ 'id' ] ), $args ); |
|
| 531 | 531 | |
| 532 | 532 | // Store the View to the object for later fetching. |
| 533 | - $this->add_view( $args['id'], $args ); |
|
| 533 | + $this->add_view( $args[ 'id' ], $args ); |
|
| 534 | 534 | |
| 535 | - $ids[] = $args['id']; |
|
| 535 | + $ids[ ] = $args[ 'id' ]; |
|
| 536 | 536 | } |
| 537 | 537 | |
| 538 | - if( empty($ids) ) { |
|
| 538 | + if ( empty( $ids ) ) { |
|
| 539 | 539 | return NULL; |
| 540 | 540 | } |
| 541 | 541 | |
| 542 | 542 | // If it's just one ID, return that. |
| 543 | 543 | // Otherwise, return array of IDs |
| 544 | - return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids; |
|
| 544 | + return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids; |
|
| 545 | 545 | |
| 546 | 546 | } |
| 547 | 547 | |
@@ -570,7 +570,7 @@ discard block |
||
| 570 | 570 | */ |
| 571 | 571 | $meta_keys = (array)apply_filters( 'gravityview/data/parse/meta_keys', array(), $post_id ); |
| 572 | 572 | |
| 573 | - if( empty( $meta_keys ) ) { |
|
| 573 | + if ( empty( $meta_keys ) ) { |
|
| 574 | 574 | return NULL; |
| 575 | 575 | } |
| 576 | 576 | |
@@ -578,16 +578,16 @@ discard block |
||
| 578 | 578 | |
| 579 | 579 | $meta_content = ''; |
| 580 | 580 | |
| 581 | - foreach( $meta_keys as $key ) { |
|
| 582 | - $meta = get_post_meta( $post_id, $key , true ); |
|
| 583 | - if( ! is_string( $meta ) ) { |
|
| 581 | + foreach ( $meta_keys as $key ) { |
|
| 582 | + $meta = get_post_meta( $post_id, $key, true ); |
|
| 583 | + if ( ! is_string( $meta ) ) { |
|
| 584 | 584 | continue; |
| 585 | 585 | } |
| 586 | 586 | $meta_content .= $meta . ' '; |
| 587 | 587 | } |
| 588 | 588 | |
| 589 | - if( empty( $meta_content ) ) { |
|
| 590 | - do_action('gravityview_log_error', sprintf( 'GravityView_View_Data[parse_post_meta] Returning; Empty custom fields for Post #%s (Custom fields keys:)', $post_id ), $meta_keys ); |
|
| 589 | + if ( empty( $meta_content ) ) { |
|
| 590 | + do_action( 'gravityview_log_error', sprintf( 'GravityView_View_Data[parse_post_meta] Returning; Empty custom fields for Post #%s (Custom fields keys:)', $post_id ), $meta_keys ); |
|
| 591 | 591 | return NULL; |
| 592 | 592 | } |
| 593 | 593 | |
@@ -615,16 +615,16 @@ discard block |
||
| 615 | 615 | $message = NULL; |
| 616 | 616 | |
| 617 | 617 | // Not invalid if not set! |
| 618 | - if( empty( $post_id ) || empty( $view_id ) ) { |
|
| 618 | + if ( empty( $post_id ) || empty( $view_id ) ) { |
|
| 619 | 619 | |
| 620 | - if( $empty_is_valid ) { |
|
| 620 | + if ( $empty_is_valid ) { |
|
| 621 | 621 | return true; |
| 622 | 622 | } |
| 623 | 623 | |
| 624 | 624 | $message = esc_html__( 'The ID is required.', 'gravityview' ); |
| 625 | 625 | } |
| 626 | 626 | |
| 627 | - if( ! $message ) { |
|
| 627 | + if ( ! $message ) { |
|
| 628 | 628 | $status = get_post_status( $post_id ); |
| 629 | 629 | |
| 630 | 630 | // Nothing exists with that post ID. |
@@ -636,7 +636,7 @@ discard block |
||
| 636 | 636 | } |
| 637 | 637 | } |
| 638 | 638 | |
| 639 | - if( ! $message ) { |
|
| 639 | + if ( ! $message ) { |
|
| 640 | 640 | |
| 641 | 641 | // Nothing exists with that post ID. |
| 642 | 642 | if ( empty( $status ) || in_array( $status, array( 'revision', 'attachment' ) ) ) { |
@@ -645,8 +645,8 @@ discard block |
||
| 645 | 645 | |
| 646 | 646 | } |
| 647 | 647 | |
| 648 | - if( ! $message ) { |
|
| 649 | - if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) && $post = get_post( $post_id ) ) { |
|
| 648 | + if ( ! $message ) { |
|
| 649 | + if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) && $post = get_post( $post_id ) ) { |
|
| 650 | 650 | $views = GV\View_Collection::from_post( $post ); |
| 651 | 651 | $view_ids_in_post = array_map( function( $view ) { return $view->ID; }, $views->all() ); |
| 652 | 652 | } else { |
@@ -655,21 +655,21 @@ discard block |
||
| 655 | 655 | } |
| 656 | 656 | |
| 657 | 657 | // The post or page specified does not contain the shortcode. |
| 658 | - if ( false === in_array( $view_id, (array) $view_ids_in_post ) ) { |
|
| 658 | + if ( false === in_array( $view_id, (array)$view_ids_in_post ) ) { |
|
| 659 | 659 | $message = sprintf( esc_html__( 'The Post ID entered is not valid. You may have entered a post or page that does not contain the selected View. Make sure the post contains the following shortcode: %s', 'gravityview' ), '<br /><code>[gravityview id="' . intval( $view_id ) . '"]</code>' ); |
| 660 | 660 | } |
| 661 | 661 | } |
| 662 | 662 | |
| 663 | - if( ! $message ) { |
|
| 663 | + if ( ! $message ) { |
|
| 664 | 664 | |
| 665 | 665 | // It's a View |
| 666 | 666 | if ( ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) && \GV\View::exists( $post_id ) ) |
| 667 | 667 | || 'gravityview' === get_post_type( $post_id ) ) { |
| 668 | - $message = esc_html__( 'The ID is already a View.', 'gravityview' );; |
|
| 668 | + $message = esc_html__( 'The ID is already a View.', 'gravityview' ); ; |
|
| 669 | 669 | } |
| 670 | 670 | } |
| 671 | 671 | |
| 672 | - if( $message ) { |
|
| 672 | + if ( $message ) { |
|
| 673 | 673 | return new WP_Error( 'invalid_embed_id', $message ); |
| 674 | 674 | } |
| 675 | 675 | |
@@ -686,7 +686,7 @@ discard block |
||
| 686 | 686 | |
| 687 | 687 | $args = defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ? \GV\View_Settings::defaults( $with_details ) : self::get_default_args( $with_details ); |
| 688 | 688 | |
| 689 | - if( !isset( $args[ $key ] ) ) { return NULL; } |
|
| 689 | + if ( ! isset( $args[ $key ] ) ) { return NULL; } |
|
| 690 | 690 | |
| 691 | 691 | return $args[ $key ]; |
| 692 | 692 | } |
@@ -723,7 +723,7 @@ discard block |
||
| 723 | 723 | */ |
| 724 | 724 | $default_settings = apply_filters( 'gravityview_default_args', array( |
| 725 | 725 | 'id' => array( |
| 726 | - 'label' => __('View ID', 'gravityview'), |
|
| 726 | + 'label' => __( 'View ID', 'gravityview' ), |
|
| 727 | 727 | 'type' => 'number', |
| 728 | 728 | 'group' => 'default', |
| 729 | 729 | 'value' => NULL, |
@@ -731,7 +731,7 @@ discard block |
||
| 731 | 731 | 'show_in_shortcode' => false, |
| 732 | 732 | ), |
| 733 | 733 | 'page_size' => array( |
| 734 | - 'label' => __('Number of entries per page', 'gravityview'), |
|
| 734 | + 'label' => __( 'Number of entries per page', 'gravityview' ), |
|
| 735 | 735 | 'type' => 'number', |
| 736 | 736 | 'class' => 'small-text', |
| 737 | 737 | 'group' => 'default', |
@@ -739,7 +739,7 @@ discard block |
||
| 739 | 739 | 'show_in_shortcode' => true, |
| 740 | 740 | ), |
| 741 | 741 | 'offset' => array( |
| 742 | - 'label' => __('Offset entries starting from', 'gravityview'), |
|
| 742 | + 'label' => __( 'Offset entries starting from', 'gravityview' ), |
|
| 743 | 743 | 'type' => 'number', |
| 744 | 744 | 'class' => 'small-text', |
| 745 | 745 | 'group' => 'default', |
@@ -763,8 +763,8 @@ discard block |
||
| 763 | 763 | ), |
| 764 | 764 | 'admin_show_all_statuses' => array( |
| 765 | 765 | 'label' => __( 'Show all entries to administrators', 'gravityview' ), |
| 766 | - 'desc' => __('Administrators will be able to see entries with any approval status.', 'gravityview'), |
|
| 767 | - 'tooltip' => __('Logged-out visitors and non-administrators will only see approved entries, while administrators will see entries with all statuses. This makes it easier for administrators to moderate entries from a View.', 'gravityview'), |
|
| 766 | + 'desc' => __( 'Administrators will be able to see entries with any approval status.', 'gravityview' ), |
|
| 767 | + 'tooltip' => __( 'Logged-out visitors and non-administrators will only see approved entries, while administrators will see entries with all statuses. This makes it easier for administrators to moderate entries from a View.', 'gravityview' ), |
|
| 768 | 768 | 'requires' => 'show_only_approved', |
| 769 | 769 | 'type' => 'checkbox', |
| 770 | 770 | 'group' => 'default', |
@@ -789,40 +789,40 @@ discard block |
||
| 789 | 789 | 'user_edit' => array( |
| 790 | 790 | 'label' => __( 'Allow User Edit', 'gravityview' ), |
| 791 | 791 | 'group' => 'default', |
| 792 | - 'desc' => __('Allow logged-in users to edit entries they created.', 'gravityview'), |
|
| 792 | + 'desc' => __( 'Allow logged-in users to edit entries they created.', 'gravityview' ), |
|
| 793 | 793 | 'value' => 0, |
| 794 | - 'tooltip' => __('Display "Edit Entry" fields to non-administrator users if they created the entry. Edit Entry fields will always be displayed to site administrators.', 'gravityview'), |
|
| 794 | + 'tooltip' => __( 'Display "Edit Entry" fields to non-administrator users if they created the entry. Edit Entry fields will always be displayed to site administrators.', 'gravityview' ), |
|
| 795 | 795 | 'type' => 'checkbox', |
| 796 | 796 | 'show_in_shortcode' => true, |
| 797 | 797 | ), |
| 798 | 798 | 'user_delete' => array( |
| 799 | 799 | 'label' => __( 'Allow User Delete', 'gravityview' ), |
| 800 | 800 | 'group' => 'default', |
| 801 | - 'desc' => __('Allow logged-in users to delete entries they created.', 'gravityview'), |
|
| 801 | + 'desc' => __( 'Allow logged-in users to delete entries they created.', 'gravityview' ), |
|
| 802 | 802 | 'value' => 0, |
| 803 | - 'tooltip' => __('Display "Delete Entry" fields to non-administrator users if they created the entry. Delete Entry fields will always be displayed to site administrators.', 'gravityview'), |
|
| 803 | + 'tooltip' => __( 'Display "Delete Entry" fields to non-administrator users if they created the entry. Delete Entry fields will always be displayed to site administrators.', 'gravityview' ), |
|
| 804 | 804 | 'type' => 'checkbox', |
| 805 | 805 | 'show_in_shortcode' => true, |
| 806 | 806 | ), |
| 807 | 807 | 'sort_field' => array( |
| 808 | - 'label' => __('Sort by field', 'gravityview'), |
|
| 808 | + 'label' => __( 'Sort by field', 'gravityview' ), |
|
| 809 | 809 | 'type' => 'select', |
| 810 | 810 | 'value' => '', |
| 811 | 811 | 'group' => 'sort', |
| 812 | 812 | 'options' => array( |
| 813 | - '' => __( 'Default', 'gravityview'), |
|
| 814 | - 'date_created' => __( 'Date Created', 'gravityview'), |
|
| 813 | + '' => __( 'Default', 'gravityview' ), |
|
| 814 | + 'date_created' => __( 'Date Created', 'gravityview' ), |
|
| 815 | 815 | ), |
| 816 | 816 | 'show_in_shortcode' => true, |
| 817 | 817 | ), |
| 818 | 818 | 'sort_direction' => array( |
| 819 | - 'label' => __('Sort direction', 'gravityview'), |
|
| 819 | + 'label' => __( 'Sort direction', 'gravityview' ), |
|
| 820 | 820 | 'type' => 'select', |
| 821 | 821 | 'value' => 'ASC', |
| 822 | 822 | 'group' => 'sort', |
| 823 | 823 | 'options' => array( |
| 824 | - 'ASC' => __('ASC', 'gravityview'), |
|
| 825 | - 'DESC' => __('DESC', 'gravityview'), |
|
| 824 | + 'ASC' => __( 'ASC', 'gravityview' ), |
|
| 825 | + 'DESC' => __( 'DESC', 'gravityview' ), |
|
| 826 | 826 | //'RAND' => __('Random', 'gravityview'), |
| 827 | 827 | ), |
| 828 | 828 | 'show_in_shortcode' => true, |
@@ -838,69 +838,69 @@ discard block |
||
| 838 | 838 | 'show_in_template' => array( 'default_table' ), |
| 839 | 839 | ), |
| 840 | 840 | 'start_date' => array( |
| 841 | - 'label' => __('Filter by Start Date', 'gravityview'), |
|
| 841 | + 'label' => __( 'Filter by Start Date', 'gravityview' ), |
|
| 842 | 842 | 'class' => 'gv-datepicker', |
| 843 | - 'desc' => __('Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ), |
|
| 843 | + 'desc' => __( 'Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ), |
|
| 844 | 844 | 'type' => 'text', |
| 845 | 845 | 'value' => '', |
| 846 | 846 | 'group' => 'filter', |
| 847 | 847 | 'show_in_shortcode' => true, |
| 848 | 848 | ), |
| 849 | 849 | 'end_date' => array( |
| 850 | - 'label' => __('Filter by End Date', 'gravityview'), |
|
| 850 | + 'label' => __( 'Filter by End Date', 'gravityview' ), |
|
| 851 | 851 | 'class' => 'gv-datepicker', |
| 852 | - 'desc' => __('Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ), |
|
| 852 | + 'desc' => __( 'Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ), |
|
| 853 | 853 | 'type' => 'text', |
| 854 | 854 | 'value' => '', |
| 855 | 855 | 'group' => 'filter', |
| 856 | 856 | 'show_in_shortcode' => true, |
| 857 | 857 | ), |
| 858 | 858 | 'class' => array( |
| 859 | - 'label' => __('CSS Class', 'gravityview'), |
|
| 860 | - 'desc' => __('CSS class to add to the wrapping HTML container.', 'gravityview'), |
|
| 859 | + 'label' => __( 'CSS Class', 'gravityview' ), |
|
| 860 | + 'desc' => __( 'CSS class to add to the wrapping HTML container.', 'gravityview' ), |
|
| 861 | 861 | 'group' => 'default', |
| 862 | 862 | 'type' => 'text', |
| 863 | 863 | 'value' => '', |
| 864 | 864 | 'show_in_shortcode' => false, |
| 865 | 865 | ), |
| 866 | 866 | 'search_value' => array( |
| 867 | - 'label' => __('Search Value', 'gravityview'), |
|
| 868 | - 'desc' => __('Define a default search value for the View', 'gravityview'), |
|
| 867 | + 'label' => __( 'Search Value', 'gravityview' ), |
|
| 868 | + 'desc' => __( 'Define a default search value for the View', 'gravityview' ), |
|
| 869 | 869 | 'type' => 'text', |
| 870 | 870 | 'value' => '', |
| 871 | 871 | 'group' => 'filter', |
| 872 | 872 | 'show_in_shortcode' => false, |
| 873 | 873 | ), |
| 874 | 874 | 'search_field' => array( |
| 875 | - 'label' => __('Search Field', 'gravityview'), |
|
| 876 | - 'desc' => __('If Search Value is set, you can define a specific field to search in. Otherwise, all fields will be searched.', 'gravityview'), |
|
| 875 | + 'label' => __( 'Search Field', 'gravityview' ), |
|
| 876 | + 'desc' => __( 'If Search Value is set, you can define a specific field to search in. Otherwise, all fields will be searched.', 'gravityview' ), |
|
| 877 | 877 | 'type' => 'number', |
| 878 | 878 | 'value' => '', |
| 879 | 879 | 'group' => 'filter', |
| 880 | 880 | 'show_in_shortcode' => false, |
| 881 | 881 | ), |
| 882 | 882 | 'single_title' => array( |
| 883 | - 'label' => __('Single Entry Title', 'gravityview'), |
|
| 883 | + 'label' => __( 'Single Entry Title', 'gravityview' ), |
|
| 884 | 884 | 'type' => 'text', |
| 885 | - 'desc' => __('When viewing a single entry, change the title of the page to this setting. Otherwise, the title will not change between the Multiple Entries and Single Entry views.', 'gravityview'), |
|
| 885 | + 'desc' => __( 'When viewing a single entry, change the title of the page to this setting. Otherwise, the title will not change between the Multiple Entries and Single Entry views.', 'gravityview' ), |
|
| 886 | 886 | 'group' => 'default', |
| 887 | 887 | 'value' => '', |
| 888 | 888 | 'show_in_shortcode' => false, |
| 889 | 889 | 'full_width' => true, |
| 890 | 890 | ), |
| 891 | 891 | 'back_link_label' => array( |
| 892 | - 'label' => __('Back Link Label', 'gravityview'), |
|
| 892 | + 'label' => __( 'Back Link Label', 'gravityview' ), |
|
| 893 | 893 | 'group' => 'default', |
| 894 | - 'desc' => __('The text of the link that returns to the multiple entries view.', 'gravityview'), |
|
| 894 | + 'desc' => __( 'The text of the link that returns to the multiple entries view.', 'gravityview' ), |
|
| 895 | 895 | 'type' => 'text', |
| 896 | 896 | 'value' => '', |
| 897 | 897 | 'show_in_shortcode' => false, |
| 898 | 898 | 'full_width' => true, |
| 899 | 899 | ), |
| 900 | 900 | 'embed_only' => array( |
| 901 | - 'label' => __('Prevent Direct Access', 'gravityview'), |
|
| 901 | + 'label' => __( 'Prevent Direct Access', 'gravityview' ), |
|
| 902 | 902 | 'group' => 'default', |
| 903 | - 'desc' => __('Only allow access to this View when embedded using the shortcode.', 'gravityview'), |
|
| 903 | + 'desc' => __( 'Only allow access to this View when embedded using the shortcode.', 'gravityview' ), |
|
| 904 | 904 | 'type' => 'checkbox', |
| 905 | 905 | 'value' => '', |
| 906 | 906 | 'show_in_shortcode' => false, |
@@ -911,15 +911,15 @@ discard block |
||
| 911 | 911 | 'value' => '', |
| 912 | 912 | 'show_in_shortcode' => false, |
| 913 | 913 | ), |
| 914 | - )); |
|
| 914 | + ) ); |
|
| 915 | 915 | |
| 916 | 916 | // By default, we only want the key => value pairing, not the whole array. |
| 917 | - if( empty( $with_details ) ) { |
|
| 917 | + if ( empty( $with_details ) ) { |
|
| 918 | 918 | |
| 919 | 919 | $defaults = array(); |
| 920 | 920 | |
| 921 | - foreach( $default_settings as $key => $value ) { |
|
| 922 | - $defaults[ $key ] = $value['value']; |
|
| 921 | + foreach ( $default_settings as $key => $value ) { |
|
| 922 | + $defaults[ $key ] = $value[ 'value' ]; |
|
| 923 | 923 | } |
| 924 | 924 | |
| 925 | 925 | return $defaults; |
@@ -928,12 +928,12 @@ discard block |
||
| 928 | 928 | // But sometimes, we want all the details. |
| 929 | 929 | else { |
| 930 | 930 | |
| 931 | - foreach ($default_settings as $key => $value) { |
|
| 931 | + foreach ( $default_settings as $key => $value ) { |
|
| 932 | 932 | |
| 933 | 933 | // If the $group argument is set for the method, |
| 934 | 934 | // ignore any settings that aren't in that group. |
| 935 | - if( !empty( $group ) && is_string( $group ) ) { |
|
| 936 | - if( empty( $value['group'] ) || $value['group'] !== $group ) { |
|
| 935 | + if ( ! empty( $group ) && is_string( $group ) ) { |
|
| 936 | + if ( empty( $value[ 'group' ] ) || $value[ 'group' ] !== $group ) { |
|
| 937 | 937 | unset( $default_settings[ $key ] ); |
| 938 | 938 | } |
| 939 | 939 | } |
@@ -106,16 +106,16 @@ discard block |
||
| 106 | 106 | function load() { |
| 107 | 107 | |
| 108 | 108 | /** @define "GRAVITYVIEW_DIR" "../../../" */ |
| 109 | - include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' ); |
|
| 109 | + include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' ); |
|
| 110 | 110 | |
| 111 | 111 | // Don't display an embedded form when editing an entry |
| 112 | 112 | add_action( 'wp_head', array( $this, 'prevent_render_form' ) ); |
| 113 | 113 | add_action( 'wp_footer', array( $this, 'prevent_render_form' ) ); |
| 114 | 114 | |
| 115 | 115 | // Stop Gravity Forms processing what is ours! |
| 116 | - add_filter( 'wp', array( $this, 'prevent_maybe_process_form'), 8 ); |
|
| 116 | + add_filter( 'wp', array( $this, 'prevent_maybe_process_form' ), 8 ); |
|
| 117 | 117 | |
| 118 | - add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') ); |
|
| 118 | + add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry' ) ); |
|
| 119 | 119 | |
| 120 | 120 | add_action( 'gravityview_edit_entry', array( $this, 'init' ) ); |
| 121 | 121 | |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 ); |
| 127 | 127 | |
| 128 | 128 | // Add fields expected by GFFormDisplay::validate() |
| 129 | - add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') ); |
|
| 129 | + add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation' ) ); |
|
| 130 | 130 | |
| 131 | 131 | } |
| 132 | 132 | |
@@ -141,8 +141,8 @@ discard block |
||
| 141 | 141 | * @return void |
| 142 | 142 | */ |
| 143 | 143 | public function prevent_render_form() { |
| 144 | - if( $this->is_edit_entry() ) { |
|
| 145 | - if( 'wp_head' === current_filter() ) { |
|
| 144 | + if ( $this->is_edit_entry() ) { |
|
| 145 | + if ( 'wp_head' === current_filter() ) { |
|
| 146 | 146 | add_filter( 'gform_shortcode_form', '__return_empty_string' ); |
| 147 | 147 | } else { |
| 148 | 148 | remove_filter( 'gform_shortcode_form', '__return_empty_string' ); |
@@ -157,13 +157,13 @@ discard block |
||
| 157 | 157 | */ |
| 158 | 158 | public function prevent_maybe_process_form() { |
| 159 | 159 | |
| 160 | - if( ! empty( $_POST ) ) { |
|
| 160 | + if ( ! empty( $_POST ) ) { |
|
| 161 | 161 | do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) ); |
| 162 | 162 | } |
| 163 | 163 | |
| 164 | - if( $this->is_edit_entry_submission() ) { |
|
| 165 | - remove_action( 'wp', array( 'RGForms', 'maybe_process_form'), 9 ); |
|
| 166 | - remove_action( 'wp', array( 'GFForms', 'maybe_process_form'), 9 ); |
|
| 164 | + if ( $this->is_edit_entry_submission() ) { |
|
| 165 | + remove_action( 'wp', array( 'RGForms', 'maybe_process_form' ), 9 ); |
|
| 166 | + remove_action( 'wp', array( 'GFForms', 'maybe_process_form' ), 9 ); |
|
| 167 | 167 | } |
| 168 | 168 | } |
| 169 | 169 | |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | */ |
| 174 | 174 | public function is_edit_entry() { |
| 175 | 175 | |
| 176 | - $is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET['edit'] ); |
|
| 176 | + $is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET[ 'edit' ] ); |
|
| 177 | 177 | |
| 178 | 178 | return ( $is_edit_entry || $this->is_edit_entry_submission() ); |
| 179 | 179 | } |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | * @return boolean |
| 185 | 185 | */ |
| 186 | 186 | public function is_edit_entry_submission() { |
| 187 | - return !empty( $_POST[ self::$nonce_field ] ); |
|
| 187 | + return ! empty( $_POST[ self::$nonce_field ] ); |
|
| 188 | 188 | } |
| 189 | 189 | |
| 190 | 190 | /** |
@@ -195,15 +195,15 @@ discard block |
||
| 195 | 195 | |
| 196 | 196 | |
| 197 | 197 | $entries = $gravityview_view->getEntries(); |
| 198 | - self::$original_entry = $entries[0]; |
|
| 199 | - $this->entry = $entries[0]; |
|
| 198 | + self::$original_entry = $entries[ 0 ]; |
|
| 199 | + $this->entry = $entries[ 0 ]; |
|
| 200 | 200 | |
| 201 | 201 | self::$original_form = $gravityview_view->getForm(); |
| 202 | 202 | $this->form = $gravityview_view->getForm(); |
| 203 | 203 | $this->form_id = $gravityview_view->getFormId(); |
| 204 | 204 | $this->view_id = $gravityview_view->getViewId(); |
| 205 | 205 | |
| 206 | - self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] ); |
|
| 206 | + self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry[ 'id' ] ); |
|
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | |
@@ -224,14 +224,14 @@ discard block |
||
| 224 | 224 | |
| 225 | 225 | // Multiple Views embedded, don't proceed if nonce fails |
| 226 | 226 | $multiple_views = defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ? gravityview()->views->count() > 1 : $gv_data->has_multiple_views(); |
| 227 | - if( $multiple_views && ! wp_verify_nonce( $_GET['edit'], self::$nonce_key ) ) { |
|
| 228 | - do_action('gravityview_log_error', __METHOD__ . ': Nonce validation failed for the Edit Entry request; returning' ); |
|
| 227 | + if ( $multiple_views && ! wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ) ) { |
|
| 228 | + do_action( 'gravityview_log_error', __METHOD__ . ': Nonce validation failed for the Edit Entry request; returning' ); |
|
| 229 | 229 | return; |
| 230 | 230 | } |
| 231 | 231 | |
| 232 | 232 | // Sorry, you're not allowed here. |
| 233 | - if( false === $this->user_can_edit_entry( true ) ) { |
|
| 234 | - do_action('gravityview_log_error', __METHOD__ . ': User is not allowed to edit this entry; returning', $this->entry ); |
|
| 233 | + if ( false === $this->user_can_edit_entry( true ) ) { |
|
| 234 | + do_action( 'gravityview_log_error', __METHOD__ . ': User is not allowed to edit this entry; returning', $this->entry ); |
|
| 235 | 235 | return; |
| 236 | 236 | } |
| 237 | 237 | |
@@ -251,9 +251,9 @@ discard block |
||
| 251 | 251 | private function print_scripts() { |
| 252 | 252 | $gravityview_view = GravityView_View::getInstance(); |
| 253 | 253 | |
| 254 | - wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
| 254 | + wp_register_script( 'gform_gravityforms', GFCommon::get_base_url() . '/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
| 255 | 255 | |
| 256 | - GFFormDisplay::enqueue_form_scripts($gravityview_view->getForm(), false); |
|
| 256 | + GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false ); |
|
| 257 | 257 | |
| 258 | 258 | // Sack is required for images |
| 259 | 259 | wp_print_scripts( array( 'sack', 'gform_gravityforms' ) ); |
@@ -265,32 +265,32 @@ discard block |
||
| 265 | 265 | */ |
| 266 | 266 | private function process_save() { |
| 267 | 267 | |
| 268 | - if( empty( $_POST ) || ! isset( $_POST['lid'] ) ) { |
|
| 268 | + if ( empty( $_POST ) || ! isset( $_POST[ 'lid' ] ) ) { |
|
| 269 | 269 | return; |
| 270 | 270 | } |
| 271 | 271 | |
| 272 | 272 | // Make sure the entry, view, and form IDs are all correct |
| 273 | 273 | $valid = $this->verify_nonce(); |
| 274 | 274 | |
| 275 | - if( !$valid ) { |
|
| 276 | - do_action('gravityview_log_error', __METHOD__ . ' Nonce validation failed.' ); |
|
| 275 | + if ( ! $valid ) { |
|
| 276 | + do_action( 'gravityview_log_error', __METHOD__ . ' Nonce validation failed.' ); |
|
| 277 | 277 | return; |
| 278 | 278 | } |
| 279 | 279 | |
| 280 | - if( $this->entry['id'] !== $_POST['lid'] ) { |
|
| 281 | - do_action('gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' ); |
|
| 280 | + if ( $this->entry[ 'id' ] !== $_POST[ 'lid' ] ) { |
|
| 281 | + do_action( 'gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' ); |
|
| 282 | 282 | return; |
| 283 | 283 | } |
| 284 | 284 | |
| 285 | - do_action('gravityview_log_debug', __METHOD__ . ': $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) ); |
|
| 285 | + do_action( 'gravityview_log_debug', __METHOD__ . ': $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) ); |
|
| 286 | 286 | |
| 287 | 287 | $this->process_save_process_files( $this->form_id ); |
| 288 | 288 | |
| 289 | 289 | $this->validate(); |
| 290 | 290 | |
| 291 | - if( $this->is_valid ) { |
|
| 291 | + if ( $this->is_valid ) { |
|
| 292 | 292 | |
| 293 | - do_action('gravityview_log_debug', __METHOD__ . ': Submission is valid.' ); |
|
| 293 | + do_action( 'gravityview_log_debug', __METHOD__ . ': Submission is valid.' ); |
|
| 294 | 294 | |
| 295 | 295 | /** |
| 296 | 296 | * @hack This step is needed to unset the adminOnly from form fields, to add the calculation fields |
@@ -300,22 +300,22 @@ discard block |
||
| 300 | 300 | /** |
| 301 | 301 | * @hack to avoid the capability validation of the method save_lead for GF 1.9+ |
| 302 | 302 | */ |
| 303 | - unset( $_GET['page'] ); |
|
| 303 | + unset( $_GET[ 'page' ] ); |
|
| 304 | 304 | |
| 305 | - $date_created = $this->entry['date_created']; |
|
| 305 | + $date_created = $this->entry[ 'date_created' ]; |
|
| 306 | 306 | |
| 307 | 307 | /** |
| 308 | 308 | * @hack to force Gravity Forms to use $read_value_from_post in GFFormsModel::save_lead() |
| 309 | 309 | * @since 1.17.2 |
| 310 | 310 | */ |
| 311 | - unset( $this->entry['date_created'] ); |
|
| 311 | + unset( $this->entry[ 'date_created' ] ); |
|
| 312 | 312 | |
| 313 | 313 | GFFormsModel::save_lead( $form, $this->entry ); |
| 314 | 314 | |
| 315 | 315 | // Delete the values for hidden inputs |
| 316 | 316 | $this->unset_hidden_field_values(); |
| 317 | 317 | |
| 318 | - $this->entry['date_created'] = $date_created; |
|
| 318 | + $this->entry[ 'date_created' ] = $date_created; |
|
| 319 | 319 | |
| 320 | 320 | // Process calculation fields |
| 321 | 321 | $this->update_calculation_fields(); |
@@ -335,10 +335,10 @@ discard block |
||
| 335 | 335 | * @param string $entry_id Numeric ID of the entry that was updated |
| 336 | 336 | * @param GravityView_Edit_Entry_Render $this This object |
| 337 | 337 | */ |
| 338 | - do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'], $this ); |
|
| 338 | + do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ], $this ); |
|
| 339 | 339 | |
| 340 | 340 | } else { |
| 341 | - do_action('gravityview_log_error', __METHOD__ . ': Submission is NOT valid.', $this->entry ); |
|
| 341 | + do_action( 'gravityview_log_error', __METHOD__ . ': Submission is NOT valid.', $this->entry ); |
|
| 342 | 342 | } |
| 343 | 343 | |
| 344 | 344 | } // process_save |
@@ -355,8 +355,8 @@ discard block |
||
| 355 | 355 | private function unset_hidden_field_values() { |
| 356 | 356 | global $wpdb; |
| 357 | 357 | |
| 358 | - $lead_detail_table = GFFormsModel::get_lead_details_table_name(); |
|
| 359 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) ); |
|
| 358 | + $lead_detail_table = GFFormsModel::get_lead_details_table_name(); |
|
| 359 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry[ 'id' ] ) ); |
|
| 360 | 360 | |
| 361 | 361 | foreach ( $this->entry as $input_id => $field_value ) { |
| 362 | 362 | |
@@ -436,7 +436,7 @@ discard block |
||
| 436 | 436 | } |
| 437 | 437 | |
| 438 | 438 | /** No file is being uploaded. */ |
| 439 | - if ( empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 439 | + if ( empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
| 440 | 440 | /** So return the original upload */ |
| 441 | 441 | return $entry[ $input_id ]; |
| 442 | 442 | } |
@@ -454,11 +454,11 @@ discard block |
||
| 454 | 454 | * @return mixed |
| 455 | 455 | */ |
| 456 | 456 | public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) { |
| 457 | - if( ! $this->is_edit_entry() ) { |
|
| 457 | + if ( ! $this->is_edit_entry() ) { |
|
| 458 | 458 | return $plupload_init; |
| 459 | 459 | } |
| 460 | 460 | |
| 461 | - $plupload_init['gf_vars']['max_files'] = 0; |
|
| 461 | + $plupload_init[ 'gf_vars' ][ 'max_files' ] = 0; |
|
| 462 | 462 | |
| 463 | 463 | return $plupload_init; |
| 464 | 464 | } |
@@ -473,22 +473,22 @@ discard block |
||
| 473 | 473 | $form = $this->form; |
| 474 | 474 | |
| 475 | 475 | /** @var GF_Field $field */ |
| 476 | - foreach( $form['fields'] as $k => &$field ) { |
|
| 476 | + foreach ( $form[ 'fields' ] as $k => &$field ) { |
|
| 477 | 477 | |
| 478 | 478 | /** |
| 479 | 479 | * Remove the fields with calculation formulas before save to avoid conflicts with GF logic |
| 480 | 480 | * @since 1.16.3 |
| 481 | 481 | * @var GF_Field $field |
| 482 | 482 | */ |
| 483 | - if( $field->has_calculation() ) { |
|
| 484 | - unset( $form['fields'][ $k ] ); |
|
| 483 | + if ( $field->has_calculation() ) { |
|
| 484 | + unset( $form[ 'fields' ][ $k ] ); |
|
| 485 | 485 | } |
| 486 | 486 | |
| 487 | 487 | $field->adminOnly = false; |
| 488 | 488 | |
| 489 | - if( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
| 490 | - foreach( $field->inputs as $key => $input ) { |
|
| 491 | - $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
| 489 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
| 490 | + foreach ( $field->inputs as $key => $input ) { |
|
| 491 | + $field->inputs[ $key ][ 'id' ] = (string)$input[ 'id' ]; |
|
| 492 | 492 | } |
| 493 | 493 | } |
| 494 | 494 | } |
@@ -502,30 +502,30 @@ discard block |
||
| 502 | 502 | $update = false; |
| 503 | 503 | |
| 504 | 504 | // get the most up to date entry values |
| 505 | - $entry = GFAPI::get_entry( $this->entry['id'] ); |
|
| 505 | + $entry = GFAPI::get_entry( $this->entry[ 'id' ] ); |
|
| 506 | 506 | |
| 507 | - if( !empty( $this->fields_with_calculation ) ) { |
|
| 507 | + if ( ! empty( $this->fields_with_calculation ) ) { |
|
| 508 | 508 | $update = true; |
| 509 | 509 | foreach ( $this->fields_with_calculation as $calc_field ) { |
| 510 | 510 | $inputs = $calc_field->get_entry_inputs(); |
| 511 | 511 | if ( is_array( $inputs ) ) { |
| 512 | 512 | foreach ( $inputs as $input ) { |
| 513 | - $input_name = 'input_' . str_replace( '.', '_', $input['id'] ); |
|
| 514 | - $entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry ); |
|
| 513 | + $input_name = 'input_' . str_replace( '.', '_', $input[ 'id' ] ); |
|
| 514 | + $entry[ strval( $input[ 'id' ] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry[ 'id' ], $entry ); |
|
| 515 | 515 | } |
| 516 | 516 | } else { |
| 517 | - $input_name = 'input_' . str_replace( '.', '_', $calc_field->id); |
|
| 518 | - $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry ); |
|
| 517 | + $input_name = 'input_' . str_replace( '.', '_', $calc_field->id ); |
|
| 518 | + $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry[ 'id' ], $entry ); |
|
| 519 | 519 | } |
| 520 | 520 | } |
| 521 | 521 | |
| 522 | 522 | } |
| 523 | 523 | |
| 524 | - if( $update ) { |
|
| 524 | + if ( $update ) { |
|
| 525 | 525 | |
| 526 | 526 | $return_entry = GFAPI::update_entry( $entry ); |
| 527 | 527 | |
| 528 | - if( is_wp_error( $return_entry ) ) { |
|
| 528 | + if ( is_wp_error( $return_entry ) ) { |
|
| 529 | 529 | do_action( 'gravityview_log_error', 'Updating the entry calculation fields failed', $return_entry ); |
| 530 | 530 | } else { |
| 531 | 531 | do_action( 'gravityview_log_debug', 'Updating the entry calculation fields succeeded' ); |
@@ -556,18 +556,18 @@ discard block |
||
| 556 | 556 | |
| 557 | 557 | $input_name = 'input_' . $field_id; |
| 558 | 558 | |
| 559 | - if ( !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 559 | + if ( ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
| 560 | 560 | |
| 561 | 561 | // We have a new image |
| 562 | 562 | |
| 563 | - $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] ); |
|
| 563 | + $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ] ); |
|
| 564 | 564 | |
| 565 | 565 | $ary = ! empty( $value ) ? explode( '|:|', $value ) : array(); |
| 566 | 566 | $img_url = rgar( $ary, 0 ); |
| 567 | 567 | |
| 568 | - $img_title = count( $ary ) > 1 ? $ary[1] : ''; |
|
| 569 | - $img_caption = count( $ary ) > 2 ? $ary[2] : ''; |
|
| 570 | - $img_description = count( $ary ) > 3 ? $ary[3] : ''; |
|
| 568 | + $img_title = count( $ary ) > 1 ? $ary[ 1 ] : ''; |
|
| 569 | + $img_caption = count( $ary ) > 2 ? $ary[ 2 ] : ''; |
|
| 570 | + $img_description = count( $ary ) > 3 ? $ary[ 3 ] : ''; |
|
| 571 | 571 | |
| 572 | 572 | $image_meta = array( |
| 573 | 573 | 'post_excerpt' => $img_caption, |
@@ -576,7 +576,7 @@ discard block |
||
| 576 | 576 | |
| 577 | 577 | //adding title only if it is not empty. It will default to the file name if it is not in the array |
| 578 | 578 | if ( ! empty( $img_title ) ) { |
| 579 | - $image_meta['post_title'] = $img_title; |
|
| 579 | + $image_meta[ 'post_title' ] = $img_title; |
|
| 580 | 580 | } |
| 581 | 581 | |
| 582 | 582 | /** |
@@ -591,22 +591,22 @@ discard block |
||
| 591 | 591 | set_post_thumbnail( $post_id, $media_id ); |
| 592 | 592 | } |
| 593 | 593 | |
| 594 | - } elseif ( !empty( $_POST[ $input_name ] ) && is_array( $value ) ) { |
|
| 594 | + } elseif ( ! empty( $_POST[ $input_name ] ) && is_array( $value ) ) { |
|
| 595 | 595 | |
| 596 | 596 | // Same image although the image title, caption or description might have changed |
| 597 | 597 | |
| 598 | 598 | $ary = array(); |
| 599 | - if( ! empty( $entry[ $field_id ] ) ) { |
|
| 599 | + if ( ! empty( $entry[ $field_id ] ) ) { |
|
| 600 | 600 | $ary = is_array( $entry[ $field_id ] ) ? $entry[ $field_id ] : explode( '|:|', $entry[ $field_id ] ); |
| 601 | 601 | } |
| 602 | 602 | $img_url = rgar( $ary, 0 ); |
| 603 | 603 | |
| 604 | 604 | // is this really the same image or something went wrong ? |
| 605 | - if( $img_url === $_POST[ $input_name ] ) { |
|
| 605 | + if ( $img_url === $_POST[ $input_name ] ) { |
|
| 606 | 606 | |
| 607 | - $img_title = rgar( $value, $field_id .'.1' ); |
|
| 608 | - $img_caption = rgar( $value, $field_id .'.4' ); |
|
| 609 | - $img_description = rgar( $value, $field_id .'.7' ); |
|
| 607 | + $img_title = rgar( $value, $field_id . '.1' ); |
|
| 608 | + $img_caption = rgar( $value, $field_id . '.4' ); |
|
| 609 | + $img_description = rgar( $value, $field_id . '.7' ); |
|
| 610 | 610 | |
| 611 | 611 | $value = ! empty( $img_url ) ? $img_url . "|:|" . $img_title . "|:|" . $img_caption . "|:|" . $img_description : ''; |
| 612 | 612 | |
@@ -646,16 +646,16 @@ discard block |
||
| 646 | 646 | */ |
| 647 | 647 | private function maybe_update_post_fields( $form ) { |
| 648 | 648 | |
| 649 | - if( empty( $this->entry['post_id'] ) ) { |
|
| 649 | + if ( empty( $this->entry[ 'post_id' ] ) ) { |
|
| 650 | 650 | do_action( 'gravityview_log_debug', __METHOD__ . ': This entry has no post fields. Continuing...' ); |
| 651 | 651 | return; |
| 652 | 652 | } |
| 653 | 653 | |
| 654 | - $post_id = $this->entry['post_id']; |
|
| 654 | + $post_id = $this->entry[ 'post_id' ]; |
|
| 655 | 655 | |
| 656 | 656 | // Security check |
| 657 | - if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
| 658 | - do_action( 'gravityview_log_error', 'The current user does not have the ability to edit Post #'.$post_id ); |
|
| 657 | + if ( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
| 658 | + do_action( 'gravityview_log_error', 'The current user does not have the ability to edit Post #' . $post_id ); |
|
| 659 | 659 | return; |
| 660 | 660 | } |
| 661 | 661 | |
@@ -667,25 +667,25 @@ discard block |
||
| 667 | 667 | |
| 668 | 668 | $field = RGFormsModel::get_field( $form, $field_id ); |
| 669 | 669 | |
| 670 | - if( ! $field ) { |
|
| 670 | + if ( ! $field ) { |
|
| 671 | 671 | continue; |
| 672 | 672 | } |
| 673 | 673 | |
| 674 | - if( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
| 674 | + if ( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
| 675 | 675 | |
| 676 | 676 | // Get the value of the field, including $_POSTed value |
| 677 | 677 | $value = RGFormsModel::get_field_value( $field ); |
| 678 | 678 | |
| 679 | 679 | // Use temporary entry variable, to make values available to fill_post_template() and update_post_image() |
| 680 | 680 | $entry_tmp = $this->entry; |
| 681 | - $entry_tmp["{$field_id}"] = $value; |
|
| 681 | + $entry_tmp[ "{$field_id}" ] = $value; |
|
| 682 | 682 | |
| 683 | - switch( $field->type ) { |
|
| 683 | + switch ( $field->type ) { |
|
| 684 | 684 | |
| 685 | 685 | case 'post_title': |
| 686 | 686 | $post_title = $value; |
| 687 | - if( rgar( $form, 'postTitleTemplateEnabled' ) ) { |
|
| 688 | - $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
| 687 | + if ( rgar( $form, 'postTitleTemplateEnabled' ) ) { |
|
| 688 | + $post_title = $this->fill_post_template( $form[ 'postTitleTemplate' ], $form, $entry_tmp ); |
|
| 689 | 689 | } |
| 690 | 690 | $updated_post->post_title = $post_title; |
| 691 | 691 | $updated_post->post_name = $post_title; |
@@ -694,8 +694,8 @@ discard block |
||
| 694 | 694 | |
| 695 | 695 | case 'post_content': |
| 696 | 696 | $post_content = $value; |
| 697 | - if( rgar( $form, 'postContentTemplateEnabled' ) ) { |
|
| 698 | - $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
| 697 | + if ( rgar( $form, 'postContentTemplateEnabled' ) ) { |
|
| 698 | + $post_content = $this->fill_post_template( $form[ 'postContentTemplate' ], $form, $entry_tmp, true ); |
|
| 699 | 699 | } |
| 700 | 700 | $updated_post->post_content = $post_content; |
| 701 | 701 | unset( $post_content ); |
@@ -709,12 +709,12 @@ discard block |
||
| 709 | 709 | case 'post_category': |
| 710 | 710 | break; |
| 711 | 711 | case 'post_custom_field': |
| 712 | - if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
| 712 | + if ( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
| 713 | 713 | $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
| 714 | 714 | } |
| 715 | 715 | |
| 716 | 716 | if ( $this->is_field_json_encoded( $field ) && ! is_string( $value ) ) { |
| 717 | - $value = function_exists('wp_json_encode') ? wp_json_encode( $value ) : json_encode( $value ); |
|
| 717 | + $value = function_exists( 'wp_json_encode' ) ? wp_json_encode( $value ) : json_encode( $value ); |
|
| 718 | 718 | } |
| 719 | 719 | |
| 720 | 720 | update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
@@ -727,7 +727,7 @@ discard block |
||
| 727 | 727 | } |
| 728 | 728 | |
| 729 | 729 | // update entry after |
| 730 | - $this->entry["{$field_id}"] = $value; |
|
| 730 | + $this->entry[ "{$field_id}" ] = $value; |
|
| 731 | 731 | |
| 732 | 732 | $update_entry = true; |
| 733 | 733 | |
@@ -736,25 +736,25 @@ discard block |
||
| 736 | 736 | |
| 737 | 737 | } |
| 738 | 738 | |
| 739 | - if( $update_entry ) { |
|
| 739 | + if ( $update_entry ) { |
|
| 740 | 740 | |
| 741 | 741 | $return_entry = GFAPI::update_entry( $this->entry ); |
| 742 | 742 | |
| 743 | - if( is_wp_error( $return_entry ) ) { |
|
| 743 | + if ( is_wp_error( $return_entry ) ) { |
|
| 744 | 744 | do_action( 'gravityview_log_error', 'Updating the entry post fields failed', array( '$this->entry' => $this->entry, '$return_entry' => $return_entry ) ); |
| 745 | 745 | } else { |
| 746 | - do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #'.$post_id.' succeeded' ); |
|
| 746 | + do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #' . $post_id . ' succeeded' ); |
|
| 747 | 747 | } |
| 748 | 748 | |
| 749 | 749 | } |
| 750 | 750 | |
| 751 | 751 | $return_post = wp_update_post( $updated_post, true ); |
| 752 | 752 | |
| 753 | - if( is_wp_error( $return_post ) ) { |
|
| 753 | + if ( is_wp_error( $return_post ) ) { |
|
| 754 | 754 | $return_post->add_data( $updated_post, '$updated_post' ); |
| 755 | 755 | do_action( 'gravityview_log_error', 'Updating the post content failed', compact( 'updated_post', 'return_post' ) ); |
| 756 | 756 | } else { |
| 757 | - do_action( 'gravityview_log_debug', 'Updating the post content for post #'.$post_id.' succeeded', $updated_post ); |
|
| 757 | + do_action( 'gravityview_log_debug', 'Updating the post content for post #' . $post_id . ' succeeded', $updated_post ); |
|
| 758 | 758 | } |
| 759 | 759 | } |
| 760 | 760 | |
@@ -772,7 +772,7 @@ discard block |
||
| 772 | 772 | $input_type = RGFormsModel::get_input_type( $field ); |
| 773 | 773 | |
| 774 | 774 | // Only certain custom field types are supported |
| 775 | - switch( $input_type ) { |
|
| 775 | + switch ( $input_type ) { |
|
| 776 | 776 | case 'fileupload': |
| 777 | 777 | case 'list': |
| 778 | 778 | case 'multiselect': |
@@ -809,7 +809,7 @@ discard block |
||
| 809 | 809 | $output = GFCommon::replace_variables( $output, $form, $entry, false, false, false ); |
| 810 | 810 | |
| 811 | 811 | // replace conditional shortcodes |
| 812 | - if( $do_shortcode ) { |
|
| 812 | + if ( $do_shortcode ) { |
|
| 813 | 813 | $output = do_shortcode( $output ); |
| 814 | 814 | } |
| 815 | 815 | |
@@ -828,18 +828,18 @@ discard block |
||
| 828 | 828 | */ |
| 829 | 829 | private function after_update() { |
| 830 | 830 | |
| 831 | - do_action( 'gform_after_update_entry', $this->form, $this->entry['id'], self::$original_entry ); |
|
| 832 | - do_action( "gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id'], self::$original_entry ); |
|
| 831 | + do_action( 'gform_after_update_entry', $this->form, $this->entry[ 'id' ], self::$original_entry ); |
|
| 832 | + do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", $this->form, $this->entry[ 'id' ], self::$original_entry ); |
|
| 833 | 833 | |
| 834 | 834 | // Re-define the entry now that we've updated it. |
| 835 | - $entry = RGFormsModel::get_lead( $this->entry['id'] ); |
|
| 835 | + $entry = RGFormsModel::get_lead( $this->entry[ 'id' ] ); |
|
| 836 | 836 | |
| 837 | 837 | $entry = GFFormsModel::set_entry_meta( $entry, $this->form ); |
| 838 | 838 | |
| 839 | 839 | // We need to clear the cache because Gravity Forms caches the field values, which |
| 840 | 840 | // we have just updated. |
| 841 | - foreach ($this->form['fields'] as $key => $field) { |
|
| 842 | - GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id ); |
|
| 841 | + foreach ( $this->form[ 'fields' ] as $key => $field ) { |
|
| 842 | + GFFormsModel::refresh_lead_field_value( $entry[ 'id' ], $field->id ); |
|
| 843 | 843 | } |
| 844 | 844 | |
| 845 | 845 | $this->entry = $entry; |
@@ -857,7 +857,7 @@ discard block |
||
| 857 | 857 | |
| 858 | 858 | <div class="gv-edit-entry-wrapper"><?php |
| 859 | 859 | |
| 860 | - $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this ); |
|
| 860 | + $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/inline-javascript.php', $this ); |
|
| 861 | 861 | |
| 862 | 862 | /** |
| 863 | 863 | * Fixes weird wpautop() issue |
@@ -873,7 +873,7 @@ discard block |
||
| 873 | 873 | * @param string $edit_entry_title Modify the "Edit Entry" title |
| 874 | 874 | * @param GravityView_Edit_Entry_Render $this This object |
| 875 | 875 | */ |
| 876 | - $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
| 876 | + $edit_entry_title = apply_filters( 'gravityview_edit_entry_title', __( 'Edit Entry', 'gravityview' ), $this ); |
|
| 877 | 877 | |
| 878 | 878 | echo esc_attr( $edit_entry_title ); |
| 879 | 879 | ?></span> |
@@ -919,20 +919,20 @@ discard block |
||
| 919 | 919 | */ |
| 920 | 920 | private function maybe_print_message() { |
| 921 | 921 | |
| 922 | - if( rgpost('action') === 'update' ) { |
|
| 922 | + if ( rgpost( 'action' ) === 'update' ) { |
|
| 923 | 923 | |
| 924 | 924 | $back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) ); |
| 925 | 925 | |
| 926 | - if( ! $this->is_valid ){ |
|
| 926 | + if ( ! $this->is_valid ) { |
|
| 927 | 927 | |
| 928 | 928 | // Keeping this compatible with Gravity Forms. |
| 929 | - $validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>"; |
|
| 930 | - $message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form); |
|
| 929 | + $validation_message = "<div class='validation_error'>" . __( 'There was a problem with your submission.', 'gravityview' ) . " " . __( 'Errors have been highlighted below.', 'gravityview' ) . "</div>"; |
|
| 930 | + $message = apply_filters( "gform_validation_message_{$this->form[ 'id' ]}", apply_filters( "gform_validation_message", $validation_message, $this->form ), $this->form ); |
|
| 931 | 931 | |
| 932 | - echo GVCommon::generate_notice( $message , 'gv-error' ); |
|
| 932 | + echo GVCommon::generate_notice( $message, 'gv-error' ); |
|
| 933 | 933 | |
| 934 | 934 | } else { |
| 935 | - $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. $back_link .'">', '</a>' ); |
|
| 935 | + $entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturn to Entry%s', 'gravityview' ), '<a href="' . $back_link . '">', '</a>' ); |
|
| 936 | 936 | |
| 937 | 937 | /** |
| 938 | 938 | * @filter `gravityview/edit_entry/success` Modify the edit entry success message (including the anchor link) |
@@ -942,7 +942,7 @@ discard block |
||
| 942 | 942 | * @param array $entry Gravity Forms entry array |
| 943 | 943 | * @param string $back_link URL to return to the original entry. @since 1.6 |
| 944 | 944 | */ |
| 945 | - $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link ); |
|
| 945 | + $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message, $this->view_id, $this->entry, $back_link ); |
|
| 946 | 946 | |
| 947 | 947 | echo GVCommon::generate_notice( $message ); |
| 948 | 948 | } |
@@ -966,21 +966,21 @@ discard block |
||
| 966 | 966 | */ |
| 967 | 967 | do_action( 'gravityview/edit-entry/render/before', $this ); |
| 968 | 968 | |
| 969 | - add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 ); |
|
| 970 | - add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') ); |
|
| 969 | + add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 ); |
|
| 970 | + add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
|
| 971 | 971 | add_filter( 'gform_disable_view_counter', '__return_true' ); |
| 972 | 972 | |
| 973 | 973 | add_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5, 5 ); |
| 974 | 974 | add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 ); |
| 975 | 975 | |
| 976 | 976 | // We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin. |
| 977 | - unset( $_GET['page'] ); |
|
| 977 | + unset( $_GET[ 'page' ] ); |
|
| 978 | 978 | |
| 979 | 979 | // TODO: Verify multiple-page forms |
| 980 | 980 | |
| 981 | 981 | ob_start(); // Prevent PHP warnings possibly caused by prefilling list fields for conditional logic |
| 982 | 982 | |
| 983 | - $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry ); |
|
| 983 | + $html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry ); |
|
| 984 | 984 | |
| 985 | 985 | ob_get_clean(); |
| 986 | 986 | |
@@ -1006,7 +1006,7 @@ discard block |
||
| 1006 | 1006 | * @return string |
| 1007 | 1007 | */ |
| 1008 | 1008 | public function render_form_buttons() { |
| 1009 | - return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this ); |
|
| 1009 | + return gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/form-buttons.php', $this ); |
|
| 1010 | 1010 | } |
| 1011 | 1011 | |
| 1012 | 1012 | |
@@ -1026,10 +1026,10 @@ discard block |
||
| 1026 | 1026 | public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) { |
| 1027 | 1027 | |
| 1028 | 1028 | // In case we have validated the form, use it to inject the validation results into the form render |
| 1029 | - if( isset( $this->form_after_validation ) ) { |
|
| 1029 | + if ( isset( $this->form_after_validation ) ) { |
|
| 1030 | 1030 | $form = $this->form_after_validation; |
| 1031 | 1031 | } else { |
| 1032 | - $form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
| 1032 | + $form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
| 1033 | 1033 | } |
| 1034 | 1034 | |
| 1035 | 1035 | $form = $this->filter_conditional_logic( $form ); |
@@ -1037,8 +1037,8 @@ discard block |
||
| 1037 | 1037 | $form = $this->prefill_conditional_logic( $form ); |
| 1038 | 1038 | |
| 1039 | 1039 | // for now we don't support Save and Continue feature. |
| 1040 | - if( ! self::$supports_save_and_continue ) { |
|
| 1041 | - unset( $form['save'] ); |
|
| 1040 | + if ( ! self::$supports_save_and_continue ) { |
|
| 1041 | + unset( $form[ 'save' ] ); |
|
| 1042 | 1042 | } |
| 1043 | 1043 | |
| 1044 | 1044 | return $form; |
@@ -1059,29 +1059,29 @@ discard block |
||
| 1059 | 1059 | */ |
| 1060 | 1060 | public function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) { |
| 1061 | 1061 | |
| 1062 | - if( GFCommon::is_post_field( $field ) ) { |
|
| 1062 | + if ( GFCommon::is_post_field( $field ) ) { |
|
| 1063 | 1063 | |
| 1064 | 1064 | $message = null; |
| 1065 | 1065 | |
| 1066 | 1066 | // First, make sure they have the capability to edit the post. |
| 1067 | - if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
| 1067 | + if ( false === current_user_can( 'edit_post', $this->entry[ 'post_id' ] ) ) { |
|
| 1068 | 1068 | |
| 1069 | 1069 | /** |
| 1070 | 1070 | * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
| 1071 | 1071 | * @param string $message The existing "You don't have permission..." text |
| 1072 | 1072 | */ |
| 1073 | - $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
| 1073 | + $message = apply_filters( 'gravityview/edit_entry/unsupported_post_field_text', __( 'You don’t have permission to edit this post.', 'gravityview' ) ); |
|
| 1074 | 1074 | |
| 1075 | - } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
| 1075 | + } elseif ( null === get_post( $this->entry[ 'post_id' ] ) ) { |
|
| 1076 | 1076 | /** |
| 1077 | 1077 | * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
| 1078 | 1078 | * @param string $message The existing "This field is not editable; the post no longer exists." text |
| 1079 | 1079 | */ |
| 1080 | - $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
| 1080 | + $message = apply_filters( 'gravityview/edit_entry/no_post_text', __( 'This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
| 1081 | 1081 | } |
| 1082 | 1082 | |
| 1083 | - if( $message ) { |
|
| 1084 | - $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
| 1083 | + if ( $message ) { |
|
| 1084 | + $field_content = sprintf( '<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
| 1085 | 1085 | } |
| 1086 | 1086 | } |
| 1087 | 1087 | |
@@ -1106,8 +1106,8 @@ discard block |
||
| 1106 | 1106 | |
| 1107 | 1107 | // If the form has been submitted, then we don't need to pre-fill the values, |
| 1108 | 1108 | // Except for fileupload type and when a field input is overridden- run always!! |
| 1109 | - if( |
|
| 1110 | - ( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
| 1109 | + if ( |
|
| 1110 | + ( $this->is_edit_entry_submission() && ! in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
| 1111 | 1111 | && false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) |
| 1112 | 1112 | && ! GFCommon::is_product_field( $field->type ) |
| 1113 | 1113 | || ! empty( $field_content ) |
@@ -1127,7 +1127,7 @@ discard block |
||
| 1127 | 1127 | $return = null; |
| 1128 | 1128 | |
| 1129 | 1129 | /** @var GravityView_Field $gv_field */ |
| 1130 | - if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
| 1130 | + if ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
| 1131 | 1131 | $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field ); |
| 1132 | 1132 | } else { |
| 1133 | 1133 | $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
@@ -1136,7 +1136,7 @@ discard block |
||
| 1136 | 1136 | // If there was output, it's an error |
| 1137 | 1137 | $warnings = ob_get_clean(); |
| 1138 | 1138 | |
| 1139 | - if( !empty( $warnings ) ) { |
|
| 1139 | + if ( ! empty( $warnings ) ) { |
|
| 1140 | 1140 | do_action( 'gravityview_log_error', __METHOD__ . $warnings, $field_value ); |
| 1141 | 1141 | } |
| 1142 | 1142 | |
@@ -1161,7 +1161,7 @@ discard block |
||
| 1161 | 1161 | $override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field ); |
| 1162 | 1162 | |
| 1163 | 1163 | // We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs) |
| 1164 | - if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
| 1164 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) && ! in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
| 1165 | 1165 | |
| 1166 | 1166 | $field_value = array(); |
| 1167 | 1167 | |
@@ -1170,10 +1170,10 @@ discard block |
||
| 1170 | 1170 | |
| 1171 | 1171 | foreach ( (array)$field->inputs as $input ) { |
| 1172 | 1172 | |
| 1173 | - $input_id = strval( $input['id'] ); |
|
| 1173 | + $input_id = strval( $input[ 'id' ] ); |
|
| 1174 | 1174 | |
| 1175 | 1175 | if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) { |
| 1176 | - $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
| 1176 | + $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
| 1177 | 1177 | $allow_pre_populated = false; |
| 1178 | 1178 | } |
| 1179 | 1179 | |
@@ -1181,7 +1181,7 @@ discard block |
||
| 1181 | 1181 | |
| 1182 | 1182 | $pre_value = $field->get_value_submission( array(), false ); |
| 1183 | 1183 | |
| 1184 | - $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
| 1184 | + $field_value = ! $allow_pre_populated && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
| 1185 | 1185 | |
| 1186 | 1186 | } else { |
| 1187 | 1187 | |
@@ -1192,13 +1192,13 @@ discard block |
||
| 1192 | 1192 | |
| 1193 | 1193 | // saved field entry value (if empty, fallback to the pre-populated value, if exists) |
| 1194 | 1194 | // or pre-populated value if not empty and set to override saved value |
| 1195 | - $field_value = !gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value; |
|
| 1195 | + $field_value = ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value; |
|
| 1196 | 1196 | |
| 1197 | 1197 | // in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs. |
| 1198 | - if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) { |
|
| 1198 | + if ( 'post_category' === $field->type && ! gv_empty( $field_value, false, false ) ) { |
|
| 1199 | 1199 | $categories = array(); |
| 1200 | 1200 | foreach ( explode( ',', $field_value ) as $cat_string ) { |
| 1201 | - $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
| 1201 | + $categories[ ] = GFCommon::format_post_category( $cat_string, true ); |
|
| 1202 | 1202 | } |
| 1203 | 1203 | $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories ); |
| 1204 | 1204 | } |
@@ -1226,7 +1226,7 @@ discard block |
||
| 1226 | 1226 | * @param GF_Field $field Gravity Forms field object |
| 1227 | 1227 | * @param GravityView_Edit_Entry_Render $this Current object |
| 1228 | 1228 | */ |
| 1229 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
| 1229 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type, $field_value, $field, $this ); |
|
| 1230 | 1230 | |
| 1231 | 1231 | return $field_value; |
| 1232 | 1232 | } |
@@ -1243,12 +1243,12 @@ discard block |
||
| 1243 | 1243 | */ |
| 1244 | 1244 | public function gform_pre_validation( $form ) { |
| 1245 | 1245 | |
| 1246 | - if( ! $this->verify_nonce() ) { |
|
| 1246 | + if ( ! $this->verify_nonce() ) { |
|
| 1247 | 1247 | return $form; |
| 1248 | 1248 | } |
| 1249 | 1249 | |
| 1250 | 1250 | // Fix PHP warning regarding undefined index. |
| 1251 | - foreach ( $form['fields'] as &$field) { |
|
| 1251 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
| 1252 | 1252 | |
| 1253 | 1253 | // This is because we're doing admin form pretending to be front-end, so Gravity Forms |
| 1254 | 1254 | // expects certain field array items to be set. |
@@ -1256,7 +1256,7 @@ discard block |
||
| 1256 | 1256 | $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
| 1257 | 1257 | } |
| 1258 | 1258 | |
| 1259 | - switch( RGFormsModel::get_input_type( $field ) ) { |
|
| 1259 | + switch ( RGFormsModel::get_input_type( $field ) ) { |
|
| 1260 | 1260 | |
| 1261 | 1261 | /** |
| 1262 | 1262 | * this whole fileupload hack is because in the admin, Gravity Forms simply doesn't update any fileupload field if it's empty, but it DOES in the frontend. |
@@ -1270,37 +1270,37 @@ discard block |
||
| 1270 | 1270 | // Set the previous value |
| 1271 | 1271 | $entry = $this->get_entry(); |
| 1272 | 1272 | |
| 1273 | - $input_name = 'input_'.$field->id; |
|
| 1274 | - $form_id = $form['id']; |
|
| 1273 | + $input_name = 'input_' . $field->id; |
|
| 1274 | + $form_id = $form[ 'id' ]; |
|
| 1275 | 1275 | |
| 1276 | 1276 | $value = NULL; |
| 1277 | 1277 | |
| 1278 | 1278 | // Use the previous entry value as the default. |
| 1279 | - if( isset( $entry[ $field->id ] ) ) { |
|
| 1279 | + if ( isset( $entry[ $field->id ] ) ) { |
|
| 1280 | 1280 | $value = $entry[ $field->id ]; |
| 1281 | 1281 | } |
| 1282 | 1282 | |
| 1283 | 1283 | // If this is a single upload file |
| 1284 | - if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 1285 | - $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
| 1286 | - $value = $file_path['url']; |
|
| 1284 | + if ( ! empty( $_FILES[ $input_name ] ) && ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
| 1285 | + $file_path = GFFormsModel::get_file_upload_path( $form[ 'id' ], $_FILES[ $input_name ][ 'name' ] ); |
|
| 1286 | + $value = $file_path[ 'url' ]; |
|
| 1287 | 1287 | |
| 1288 | 1288 | } else { |
| 1289 | 1289 | |
| 1290 | 1290 | // Fix PHP warning on line 1498 of form_display.php for post_image fields |
| 1291 | 1291 | // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
| 1292 | - $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
| 1292 | + $_FILES[ $input_name ] = array( 'name' => '', 'size' => '' ); |
|
| 1293 | 1293 | |
| 1294 | 1294 | } |
| 1295 | 1295 | |
| 1296 | - if( rgar($field, "multipleFiles") ) { |
|
| 1296 | + if ( rgar( $field, "multipleFiles" ) ) { |
|
| 1297 | 1297 | |
| 1298 | 1298 | // If there are fresh uploads, process and merge them. |
| 1299 | 1299 | // Otherwise, use the passed values, which should be json-encoded array of URLs |
| 1300 | - if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
| 1300 | + if ( isset( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) { |
|
| 1301 | 1301 | $value = empty( $value ) ? '[]' : $value; |
| 1302 | 1302 | $value = stripslashes_deep( $value ); |
| 1303 | - $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
| 1303 | + $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], array() ); |
|
| 1304 | 1304 | } |
| 1305 | 1305 | |
| 1306 | 1306 | } else { |
@@ -1318,8 +1318,8 @@ discard block |
||
| 1318 | 1318 | |
| 1319 | 1319 | case 'number': |
| 1320 | 1320 | // Fix "undefined index" issue at line 1286 in form_display.php |
| 1321 | - if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
| 1322 | - $_POST['input_'.$field->id ] = NULL; |
|
| 1321 | + if ( ! isset( $_POST[ 'input_' . $field->id ] ) ) { |
|
| 1322 | + $_POST[ 'input_' . $field->id ] = NULL; |
|
| 1323 | 1323 | } |
| 1324 | 1324 | break; |
| 1325 | 1325 | } |
@@ -1356,7 +1356,7 @@ discard block |
||
| 1356 | 1356 | * You can enter whatever you want! |
| 1357 | 1357 | * We try validating, and customize the results using `self::custom_validation()` |
| 1358 | 1358 | */ |
| 1359 | - add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4); |
|
| 1359 | + add_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10, 4 ); |
|
| 1360 | 1360 | |
| 1361 | 1361 | // Needed by the validate funtion |
| 1362 | 1362 | $failed_validation_page = NULL; |
@@ -1364,14 +1364,14 @@ discard block |
||
| 1364 | 1364 | |
| 1365 | 1365 | // Prevent entry limit from running when editing an entry, also |
| 1366 | 1366 | // prevent form scheduling from preventing editing |
| 1367 | - unset( $this->form['limitEntries'], $this->form['scheduleForm'] ); |
|
| 1367 | + unset( $this->form[ 'limitEntries' ], $this->form[ 'scheduleForm' ] ); |
|
| 1368 | 1368 | |
| 1369 | 1369 | // Hide fields depending on Edit Entry settings |
| 1370 | - $this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
| 1370 | + $this->form[ 'fields' ] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
| 1371 | 1371 | |
| 1372 | 1372 | $this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page ); |
| 1373 | 1373 | |
| 1374 | - remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
| 1374 | + remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
| 1375 | 1375 | } |
| 1376 | 1376 | |
| 1377 | 1377 | |
@@ -1388,13 +1388,13 @@ discard block |
||
| 1388 | 1388 | */ |
| 1389 | 1389 | public function custom_validation( $validation_results ) { |
| 1390 | 1390 | |
| 1391 | - do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results ); |
|
| 1391 | + do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results ); |
|
| 1392 | 1392 | |
| 1393 | - do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) ); |
|
| 1393 | + do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) ); |
|
| 1394 | 1394 | |
| 1395 | 1395 | $gv_valid = true; |
| 1396 | 1396 | |
| 1397 | - foreach ( $validation_results['form']['fields'] as $key => &$field ) { |
|
| 1397 | + foreach ( $validation_results[ 'form' ][ 'fields' ] as $key => &$field ) { |
|
| 1398 | 1398 | |
| 1399 | 1399 | $value = RGFormsModel::get_field_value( $field ); |
| 1400 | 1400 | $field_type = RGFormsModel::get_input_type( $field ); |
@@ -1407,35 +1407,35 @@ discard block |
||
| 1407 | 1407 | case 'post_image': |
| 1408 | 1408 | |
| 1409 | 1409 | // in case nothing is uploaded but there are already files saved |
| 1410 | - if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
| 1410 | + if ( ! empty( $field->failed_validation ) && ! empty( $field->isRequired ) && ! empty( $value ) ) { |
|
| 1411 | 1411 | $field->failed_validation = false; |
| 1412 | 1412 | unset( $field->validation_message ); |
| 1413 | 1413 | } |
| 1414 | 1414 | |
| 1415 | 1415 | // validate if multi file upload reached max number of files [maxFiles] => 2 |
| 1416 | - if( rgobj( $field, 'maxFiles') && rgobj( $field, 'multipleFiles') ) { |
|
| 1416 | + if ( rgobj( $field, 'maxFiles' ) && rgobj( $field, 'multipleFiles' ) ) { |
|
| 1417 | 1417 | |
| 1418 | 1418 | $input_name = 'input_' . $field->id; |
| 1419 | 1419 | //uploaded |
| 1420 | - $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
| 1420 | + $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] : array(); |
|
| 1421 | 1421 | |
| 1422 | 1422 | //existent |
| 1423 | 1423 | $entry = $this->get_entry(); |
| 1424 | 1424 | $value = NULL; |
| 1425 | - if( isset( $entry[ $field->id ] ) ) { |
|
| 1425 | + if ( isset( $entry[ $field->id ] ) ) { |
|
| 1426 | 1426 | $value = json_decode( $entry[ $field->id ], true ); |
| 1427 | 1427 | } |
| 1428 | 1428 | |
| 1429 | 1429 | // count uploaded files and existent entry files |
| 1430 | 1430 | $count_files = count( $file_names ) + count( $value ); |
| 1431 | 1431 | |
| 1432 | - if( $count_files > $field->maxFiles ) { |
|
| 1432 | + if ( $count_files > $field->maxFiles ) { |
|
| 1433 | 1433 | $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
| 1434 | 1434 | $field->failed_validation = 1; |
| 1435 | 1435 | $gv_valid = false; |
| 1436 | 1436 | |
| 1437 | 1437 | // in case of error make sure the newest upload files are removed from the upload input |
| 1438 | - GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
| 1438 | + GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ] = null; |
|
| 1439 | 1439 | } |
| 1440 | 1440 | |
| 1441 | 1441 | } |
@@ -1446,7 +1446,7 @@ discard block |
||
| 1446 | 1446 | } |
| 1447 | 1447 | |
| 1448 | 1448 | // This field has failed validation. |
| 1449 | - if( !empty( $field->failed_validation ) ) { |
|
| 1449 | + if ( ! empty( $field->failed_validation ) ) { |
|
| 1450 | 1450 | |
| 1451 | 1451 | do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'field' => $field, 'value' => $value ) ); |
| 1452 | 1452 | |
@@ -1464,32 +1464,32 @@ discard block |
||
| 1464 | 1464 | } |
| 1465 | 1465 | |
| 1466 | 1466 | // You can't continue inside a switch, so we do it after. |
| 1467 | - if( empty( $field->failed_validation ) ) { |
|
| 1467 | + if ( empty( $field->failed_validation ) ) { |
|
| 1468 | 1468 | continue; |
| 1469 | 1469 | } |
| 1470 | 1470 | |
| 1471 | 1471 | // checks if the No Duplicates option is not validating entry against itself, since |
| 1472 | 1472 | // we're editing a stored entry, it would also assume it's a duplicate. |
| 1473 | - if( !empty( $field->noDuplicates ) ) { |
|
| 1473 | + if ( ! empty( $field->noDuplicates ) ) { |
|
| 1474 | 1474 | |
| 1475 | 1475 | $entry = $this->get_entry(); |
| 1476 | 1476 | |
| 1477 | 1477 | // If the value of the entry is the same as the stored value |
| 1478 | 1478 | // Then we can assume it's not a duplicate, it's the same. |
| 1479 | - if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
| 1479 | + if ( ! empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
| 1480 | 1480 | //if value submitted was not changed, then don't validate |
| 1481 | 1481 | $field->failed_validation = false; |
| 1482 | 1482 | |
| 1483 | 1483 | unset( $field->validation_message ); |
| 1484 | 1484 | |
| 1485 | - do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry ); |
|
| 1485 | + do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry ); |
|
| 1486 | 1486 | |
| 1487 | 1487 | continue; |
| 1488 | 1488 | } |
| 1489 | 1489 | } |
| 1490 | 1490 | |
| 1491 | 1491 | // if here then probably we are facing the validation 'At least one field must be filled out' |
| 1492 | - if( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
| 1492 | + if ( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
| 1493 | 1493 | unset( $field->validation_message ); |
| 1494 | 1494 | $field->validation_message = false; |
| 1495 | 1495 | continue; |
@@ -1501,12 +1501,12 @@ discard block |
||
| 1501 | 1501 | |
| 1502 | 1502 | } |
| 1503 | 1503 | |
| 1504 | - $validation_results['is_valid'] = $gv_valid; |
|
| 1504 | + $validation_results[ 'is_valid' ] = $gv_valid; |
|
| 1505 | 1505 | |
| 1506 | - do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results ); |
|
| 1506 | + do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results ); |
|
| 1507 | 1507 | |
| 1508 | 1508 | // We'll need this result when rendering the form ( on GFFormDisplay::get_form ) |
| 1509 | - $this->form_after_validation = $validation_results['form']; |
|
| 1509 | + $this->form_after_validation = $validation_results[ 'form' ]; |
|
| 1510 | 1510 | |
| 1511 | 1511 | return $validation_results; |
| 1512 | 1512 | } |
@@ -1519,7 +1519,7 @@ discard block |
||
| 1519 | 1519 | */ |
| 1520 | 1520 | public function get_entry() { |
| 1521 | 1521 | |
| 1522 | - if( empty( $this->entry ) ) { |
|
| 1522 | + if ( empty( $this->entry ) ) { |
|
| 1523 | 1523 | // Get the database value of the entry that's being edited |
| 1524 | 1524 | $this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() ); |
| 1525 | 1525 | } |
@@ -1554,10 +1554,10 @@ discard block |
||
| 1554 | 1554 | } |
| 1555 | 1555 | |
| 1556 | 1556 | // If edit tab not yet configured, show all fields |
| 1557 | - $edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL; |
|
| 1557 | + $edit_fields = ! empty( $properties[ 'edit_edit-fields' ] ) ? $properties[ 'edit_edit-fields' ] : NULL; |
|
| 1558 | 1558 | |
| 1559 | 1559 | // Hide fields depending on admin settings |
| 1560 | - $fields = $this->filter_fields( $form['fields'], $edit_fields ); |
|
| 1560 | + $fields = $this->filter_fields( $form[ 'fields' ], $edit_fields ); |
|
| 1561 | 1561 | |
| 1562 | 1562 | // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
| 1563 | 1563 | $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
@@ -1589,7 +1589,7 @@ discard block |
||
| 1589 | 1589 | */ |
| 1590 | 1590 | private function filter_fields( $fields, $configured_fields ) { |
| 1591 | 1591 | |
| 1592 | - if( empty( $fields ) || !is_array( $fields ) ) { |
|
| 1592 | + if ( empty( $fields ) || ! is_array( $fields ) ) { |
|
| 1593 | 1593 | return $fields; |
| 1594 | 1594 | } |
| 1595 | 1595 | |
@@ -1602,18 +1602,18 @@ discard block |
||
| 1602 | 1602 | |
| 1603 | 1603 | // Remove the fields that have calculation properties and keep them to be used later |
| 1604 | 1604 | // @since 1.16.2 |
| 1605 | - if( $field->has_calculation() ) { |
|
| 1606 | - $this->fields_with_calculation[] = $field; |
|
| 1605 | + if ( $field->has_calculation() ) { |
|
| 1606 | + $this->fields_with_calculation[ ] = $field; |
|
| 1607 | 1607 | // don't remove the calculation fields on form render. |
| 1608 | 1608 | } |
| 1609 | 1609 | |
| 1610 | - if( in_array( $field->type, $field_type_blacklist ) ) { |
|
| 1610 | + if ( in_array( $field->type, $field_type_blacklist ) ) { |
|
| 1611 | 1611 | unset( $fields[ $key ] ); |
| 1612 | 1612 | } |
| 1613 | 1613 | } |
| 1614 | 1614 | |
| 1615 | 1615 | // The Edit tab has not been configured, so we return all fields by default. |
| 1616 | - if( empty( $configured_fields ) ) { |
|
| 1616 | + if ( empty( $configured_fields ) ) { |
|
| 1617 | 1617 | return $fields; |
| 1618 | 1618 | } |
| 1619 | 1619 | |
@@ -1623,8 +1623,8 @@ discard block |
||
| 1623 | 1623 | /** @var GF_Field $field */ |
| 1624 | 1624 | foreach ( $fields as $field ) { |
| 1625 | 1625 | |
| 1626 | - if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
| 1627 | - $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
| 1626 | + if ( intval( $configured_field[ 'id' ] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
| 1627 | + $edit_fields[ ] = $this->merge_field_properties( $field, $configured_field ); |
|
| 1628 | 1628 | break; |
| 1629 | 1629 | } |
| 1630 | 1630 | |
@@ -1647,14 +1647,14 @@ discard block |
||
| 1647 | 1647 | |
| 1648 | 1648 | $return_field = $field; |
| 1649 | 1649 | |
| 1650 | - if( empty( $field_setting['show_label'] ) ) { |
|
| 1650 | + if ( empty( $field_setting[ 'show_label' ] ) ) { |
|
| 1651 | 1651 | $return_field->label = ''; |
| 1652 | - } elseif ( !empty( $field_setting['custom_label'] ) ) { |
|
| 1653 | - $return_field->label = $field_setting['custom_label']; |
|
| 1652 | + } elseif ( ! empty( $field_setting[ 'custom_label' ] ) ) { |
|
| 1653 | + $return_field->label = $field_setting[ 'custom_label' ]; |
|
| 1654 | 1654 | } |
| 1655 | 1655 | |
| 1656 | - if( !empty( $field_setting['custom_class'] ) ) { |
|
| 1657 | - $return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] ); |
|
| 1656 | + if ( ! empty( $field_setting[ 'custom_class' ] ) ) { |
|
| 1657 | + $return_field->cssClass .= ' ' . gravityview_sanitize_html_class( $field_setting[ 'custom_class' ] ); |
|
| 1658 | 1658 | } |
| 1659 | 1659 | |
| 1660 | 1660 | /** |
@@ -1692,16 +1692,16 @@ discard block |
||
| 1692 | 1692 | */ |
| 1693 | 1693 | $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
| 1694 | 1694 | |
| 1695 | - if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
| 1696 | - foreach( $fields as $k => $field ) { |
|
| 1697 | - if( $field->adminOnly ) { |
|
| 1695 | + if ( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry[ 'id' ] ) ) { |
|
| 1696 | + foreach ( $fields as $k => $field ) { |
|
| 1697 | + if ( $field->adminOnly ) { |
|
| 1698 | 1698 | unset( $fields[ $k ] ); |
| 1699 | 1699 | } |
| 1700 | 1700 | } |
| 1701 | 1701 | return $fields; |
| 1702 | 1702 | } |
| 1703 | 1703 | |
| 1704 | - foreach( $fields as &$field ) { |
|
| 1704 | + foreach ( $fields as &$field ) { |
|
| 1705 | 1705 | $field->adminOnly = false; |
| 1706 | 1706 | } |
| 1707 | 1707 | |
@@ -1725,22 +1725,22 @@ discard block |
||
| 1725 | 1725 | */ |
| 1726 | 1726 | function prefill_conditional_logic( $form ) { |
| 1727 | 1727 | |
| 1728 | - if( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
| 1728 | + if ( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
| 1729 | 1729 | return $form; |
| 1730 | 1730 | } |
| 1731 | 1731 | |
| 1732 | 1732 | // Have Conditional Logic pre-fill fields as if the data were default values |
| 1733 | 1733 | /** @var GF_Field $field */ |
| 1734 | - foreach ( $form['fields'] as &$field ) { |
|
| 1734 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
| 1735 | 1735 | |
| 1736 | - if( 'checkbox' === $field->type ) { |
|
| 1736 | + if ( 'checkbox' === $field->type ) { |
|
| 1737 | 1737 | foreach ( $field->get_entry_inputs() as $key => $input ) { |
| 1738 | - $input_id = $input['id']; |
|
| 1738 | + $input_id = $input[ 'id' ]; |
|
| 1739 | 1739 | $choice = $field->choices[ $key ]; |
| 1740 | 1740 | $value = rgar( $this->entry, $input_id ); |
| 1741 | 1741 | $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
| 1742 | - if( $match ) { |
|
| 1743 | - $field->choices[ $key ]['isSelected'] = true; |
|
| 1742 | + if ( $match ) { |
|
| 1743 | + $field->choices[ $key ][ 'isSelected' ] = true; |
|
| 1744 | 1744 | } |
| 1745 | 1745 | } |
| 1746 | 1746 | } else { |
@@ -1748,15 +1748,15 @@ discard block |
||
| 1748 | 1748 | // We need to run through each field to set the default values |
| 1749 | 1749 | foreach ( $this->entry as $field_id => $field_value ) { |
| 1750 | 1750 | |
| 1751 | - if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
| 1751 | + if ( floatval( $field_id ) === floatval( $field->id ) ) { |
|
| 1752 | 1752 | |
| 1753 | - if( 'list' === $field->type ) { |
|
| 1753 | + if ( 'list' === $field->type ) { |
|
| 1754 | 1754 | $list_rows = maybe_unserialize( $field_value ); |
| 1755 | 1755 | |
| 1756 | 1756 | $list_field_value = array(); |
| 1757 | - foreach ( (array) $list_rows as $row ) { |
|
| 1758 | - foreach ( (array) $row as $column ) { |
|
| 1759 | - $list_field_value[] = $column; |
|
| 1757 | + foreach ( (array)$list_rows as $row ) { |
|
| 1758 | + foreach ( (array)$row as $column ) { |
|
| 1759 | + $list_field_value[ ] = $column; |
|
| 1760 | 1760 | } |
| 1761 | 1761 | } |
| 1762 | 1762 | |
@@ -1791,16 +1791,16 @@ discard block |
||
| 1791 | 1791 | */ |
| 1792 | 1792 | $use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form ); |
| 1793 | 1793 | |
| 1794 | - if( $use_conditional_logic ) { |
|
| 1794 | + if ( $use_conditional_logic ) { |
|
| 1795 | 1795 | return $form; |
| 1796 | 1796 | } |
| 1797 | 1797 | |
| 1798 | - foreach( $form['fields'] as &$field ) { |
|
| 1798 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
| 1799 | 1799 | /* @var GF_Field $field */ |
| 1800 | 1800 | $field->conditionalLogic = null; |
| 1801 | 1801 | } |
| 1802 | 1802 | |
| 1803 | - unset( $form['button']['conditionalLogic'] ); |
|
| 1803 | + unset( $form[ 'button' ][ 'conditionalLogic' ] ); |
|
| 1804 | 1804 | |
| 1805 | 1805 | return $form; |
| 1806 | 1806 | |
@@ -1817,7 +1817,7 @@ discard block |
||
| 1817 | 1817 | */ |
| 1818 | 1818 | public function manage_conditional_logic( $has_conditional_logic, $form ) { |
| 1819 | 1819 | |
| 1820 | - if( ! $this->is_edit_entry() ) { |
|
| 1820 | + if ( ! $this->is_edit_entry() ) { |
|
| 1821 | 1821 | return $has_conditional_logic; |
| 1822 | 1822 | } |
| 1823 | 1823 | |
@@ -1849,44 +1849,44 @@ discard block |
||
| 1849 | 1849 | * 2. There are two entries embedded using oEmbed |
| 1850 | 1850 | * 3. One of the entries has just been saved |
| 1851 | 1851 | */ |
| 1852 | - if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) { |
|
| 1852 | + if ( ! empty( $_POST[ 'lid' ] ) && ! empty( $_GET[ 'entry' ] ) && ( $_POST[ 'lid' ] !== $_GET[ 'entry' ] ) ) { |
|
| 1853 | 1853 | |
| 1854 | 1854 | $error = true; |
| 1855 | 1855 | |
| 1856 | 1856 | } |
| 1857 | 1857 | |
| 1858 | - if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) { |
|
| 1858 | + if ( ! empty( $_GET[ 'entry' ] ) && (string)$this->entry[ 'id' ] !== $_GET[ 'entry' ] ) { |
|
| 1859 | 1859 | |
| 1860 | 1860 | $error = true; |
| 1861 | 1861 | |
| 1862 | - } elseif( ! $this->verify_nonce() ) { |
|
| 1862 | + } elseif ( ! $this->verify_nonce() ) { |
|
| 1863 | 1863 | |
| 1864 | 1864 | /** |
| 1865 | 1865 | * If the Entry is embedded, there may be two entries on the same page. |
| 1866 | 1866 | * If that's the case, and one is being edited, the other should fail gracefully and not display an error. |
| 1867 | 1867 | */ |
| 1868 | - if( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
| 1868 | + if ( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
| 1869 | 1869 | $error = true; |
| 1870 | 1870 | } else { |
| 1871 | - $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview'); |
|
| 1871 | + $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview' ); |
|
| 1872 | 1872 | } |
| 1873 | 1873 | |
| 1874 | 1874 | } |
| 1875 | 1875 | |
| 1876 | - if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
| 1877 | - $error = __( 'You do not have permission to edit this entry.', 'gravityview'); |
|
| 1876 | + if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
| 1877 | + $error = __( 'You do not have permission to edit this entry.', 'gravityview' ); |
|
| 1878 | 1878 | } |
| 1879 | 1879 | |
| 1880 | - if( $this->entry['status'] === 'trash' ) { |
|
| 1881 | - $error = __('You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
| 1880 | + if ( $this->entry[ 'status' ] === 'trash' ) { |
|
| 1881 | + $error = __( 'You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
| 1882 | 1882 | } |
| 1883 | 1883 | |
| 1884 | 1884 | // No errors; everything's fine here! |
| 1885 | - if( empty( $error ) ) { |
|
| 1885 | + if ( empty( $error ) ) { |
|
| 1886 | 1886 | return true; |
| 1887 | 1887 | } |
| 1888 | 1888 | |
| 1889 | - if( $echo && $error !== true ) { |
|
| 1889 | + if ( $echo && $error !== true ) { |
|
| 1890 | 1890 | |
| 1891 | 1891 | $error = esc_html( $error ); |
| 1892 | 1892 | |
@@ -1894,13 +1894,13 @@ discard block |
||
| 1894 | 1894 | * @since 1.9 |
| 1895 | 1895 | */ |
| 1896 | 1896 | if ( ! empty( $this->entry ) ) { |
| 1897 | - $error .= ' ' . gravityview_get_link( '#', _x('Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) ); |
|
| 1897 | + $error .= ' ' . gravityview_get_link( '#', _x( 'Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) ); |
|
| 1898 | 1898 | } |
| 1899 | 1899 | |
| 1900 | - echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error'); |
|
| 1900 | + echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error' ); |
|
| 1901 | 1901 | } |
| 1902 | 1902 | |
| 1903 | - do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error ); |
|
| 1903 | + do_action( 'gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error ); |
|
| 1904 | 1904 | |
| 1905 | 1905 | return false; |
| 1906 | 1906 | } |
@@ -1917,20 +1917,20 @@ discard block |
||
| 1917 | 1917 | |
| 1918 | 1918 | $error = NULL; |
| 1919 | 1919 | |
| 1920 | - if( ! $this->check_user_cap_edit_field( $field ) ) { |
|
| 1921 | - $error = __( 'You do not have permission to edit this field.', 'gravityview'); |
|
| 1920 | + if ( ! $this->check_user_cap_edit_field( $field ) ) { |
|
| 1921 | + $error = __( 'You do not have permission to edit this field.', 'gravityview' ); |
|
| 1922 | 1922 | } |
| 1923 | 1923 | |
| 1924 | 1924 | // No errors; everything's fine here! |
| 1925 | - if( empty( $error ) ) { |
|
| 1925 | + if ( empty( $error ) ) { |
|
| 1926 | 1926 | return true; |
| 1927 | 1927 | } |
| 1928 | 1928 | |
| 1929 | - if( $echo ) { |
|
| 1930 | - echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error'); |
|
| 1929 | + if ( $echo ) { |
|
| 1930 | + echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error' ); |
|
| 1931 | 1931 | } |
| 1932 | 1932 | |
| 1933 | - do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_field]' . $error ); |
|
| 1933 | + do_action( 'gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_field]' . $error ); |
|
| 1934 | 1934 | |
| 1935 | 1935 | return false; |
| 1936 | 1936 | |
@@ -1948,15 +1948,15 @@ discard block |
||
| 1948 | 1948 | private function check_user_cap_edit_field( $field ) { |
| 1949 | 1949 | |
| 1950 | 1950 | // If they can edit any entries (as defined in Gravity Forms), we're good. |
| 1951 | - if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
| 1951 | + if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
| 1952 | 1952 | return true; |
| 1953 | 1953 | } |
| 1954 | 1954 | |
| 1955 | - $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false; |
|
| 1955 | + $field_cap = isset( $field[ 'allow_edit_cap' ] ) ? $field[ 'allow_edit_cap' ] : false; |
|
| 1956 | 1956 | |
| 1957 | 1957 | // If the field has custom editing capaibilities set, check those |
| 1958 | - if( $field_cap ) { |
|
| 1959 | - return GVCommon::has_cap( $field['allow_edit_cap'] ); |
|
| 1958 | + if ( $field_cap ) { |
|
| 1959 | + return GVCommon::has_cap( $field[ 'allow_edit_cap' ] ); |
|
| 1960 | 1960 | } |
| 1961 | 1961 | |
| 1962 | 1962 | return false; |
@@ -1970,17 +1970,17 @@ discard block |
||
| 1970 | 1970 | public function verify_nonce() { |
| 1971 | 1971 | |
| 1972 | 1972 | // Verify form submitted for editing single |
| 1973 | - if( $this->is_edit_entry_submission() ) { |
|
| 1973 | + if ( $this->is_edit_entry_submission() ) { |
|
| 1974 | 1974 | $valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field ); |
| 1975 | 1975 | } |
| 1976 | 1976 | |
| 1977 | 1977 | // Verify |
| 1978 | - else if( ! $this->is_edit_entry() ) { |
|
| 1978 | + else if ( ! $this->is_edit_entry() ) { |
|
| 1979 | 1979 | $valid = false; |
| 1980 | 1980 | } |
| 1981 | 1981 | |
| 1982 | 1982 | else { |
| 1983 | - $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key ); |
|
| 1983 | + $valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ); |
|
| 1984 | 1984 | } |
| 1985 | 1985 | |
| 1986 | 1986 | /** |
@@ -328,8 +328,8 @@ discard block |
||
| 328 | 328 | * @param mixed $field_id Field ID or Field array |
| 329 | 329 | * @return string field type |
| 330 | 330 | */ |
| 331 | -function gravityview_get_field_type( $form = null , $field_id = '' ) { |
|
| 332 | - return GVCommon::get_field_type( $form, $field_id ); |
|
| 331 | +function gravityview_get_field_type( $form = null, $field_id = '' ) { |
|
| 332 | + return GVCommon::get_field_type( $form, $field_id ); |
|
| 333 | 333 | } |
| 334 | 334 | |
| 335 | 335 | |
@@ -342,8 +342,8 @@ discard block |
||
| 342 | 342 | * @return string HTML of the output. Empty string if $view_id is empty. |
| 343 | 343 | */ |
| 344 | 344 | function get_gravityview( $view_id = '', $atts = array() ) { |
| 345 | - if( !empty( $view_id ) ) { |
|
| 346 | - $atts['id'] = $view_id; |
|
| 345 | + if ( ! empty( $view_id ) ) { |
|
| 346 | + $atts[ 'id' ] = $view_id; |
|
| 347 | 347 | $args = wp_parse_args( $atts, defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ? \GV\View_Settings::defaults() : GravityView_View_Data::get_default_args() ); |
| 348 | 348 | $GravityView_frontend = GravityView_frontend::getInstance(); |
| 349 | 349 | $GravityView_frontend->setGvOutputData( GravityView_View_Data::getInstance( $view_id ) ); |
@@ -386,19 +386,19 @@ discard block |
||
| 386 | 386 | */ |
| 387 | 387 | function gravityview_view_has_single_checkbox_or_radio( $form, $view_fields ) { |
| 388 | 388 | |
| 389 | - if( $form_fields = GFFormsModel::get_fields_by_type( $form, array( 'checkbox', 'radio' ) ) ) { |
|
| 389 | + if ( $form_fields = GFFormsModel::get_fields_by_type( $form, array( 'checkbox', 'radio' ) ) ) { |
|
| 390 | 390 | |
| 391 | 391 | /** @var GF_Field_Radio|GF_Field_Checkbox $form_field */ |
| 392 | - foreach( $form_fields as $form_field ) { |
|
| 392 | + foreach ( $form_fields as $form_field ) { |
|
| 393 | 393 | $field_id = $form_field->id; |
| 394 | - foreach( $view_fields as $zone ) { |
|
| 394 | + foreach ( $view_fields as $zone ) { |
|
| 395 | 395 | |
| 396 | 396 | // ACF compatibility; ACF-added fields aren't arrays |
| 397 | 397 | if ( ! is_array( $zone ) ) { continue; } |
| 398 | 398 | |
| 399 | - foreach( $zone as $field ) { |
|
| 399 | + foreach ( $zone as $field ) { |
|
| 400 | 400 | // If it's an input, not the parent and the parent ID matches a checkbox or radio |
| 401 | - if( ( strpos( $field['id'], '.' ) > 0 ) && floor( $field['id'] ) === floor( $field_id ) ) { |
|
| 401 | + if ( ( strpos( $field[ 'id' ], '.' ) > 0 ) && floor( $field[ 'id' ] ) === floor( $field_id ) ) { |
|
| 402 | 402 | return true; |
| 403 | 403 | } |
| 404 | 404 | } |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | /** @var WP_Admin_Bar $wp_admin_bar */ |
| 39 | 39 | global $wp_admin_bar; |
| 40 | 40 | |
| 41 | - if( is_admin() || ! GVCommon::has_cap( array( 'edit_gravityviews', 'gravityview_edit_entry', 'gravityforms_edit_forms' ) ) ) { |
|
| 41 | + if ( is_admin() || ! GVCommon::has_cap( array( 'edit_gravityviews', 'gravityview_edit_entry', 'gravityforms_edit_forms' ) ) ) { |
|
| 42 | 42 | return; |
| 43 | 43 | } |
| 44 | 44 | |
@@ -110,9 +110,9 @@ discard block |
||
| 110 | 110 | 'parent' => 'gravityview', |
| 111 | 111 | 'title' => __( 'Edit Entry', 'gravityview' ), |
| 112 | 112 | 'meta' => array( |
| 113 | - 'title' => sprintf( __( 'Edit Entry %s', 'gravityview' ), GravityView_API::get_entry_slug( $entry['id'], $entry ) ), |
|
| 113 | + 'title' => sprintf( __( 'Edit Entry %s', 'gravityview' ), GravityView_API::get_entry_slug( $entry[ 'id' ], $entry ) ), |
|
| 114 | 114 | ), |
| 115 | - 'href' => esc_url_raw( admin_url( sprintf( 'admin.php?page=gf_entries&screen_mode=edit&view=entry&id=%d&lid=%d', $entry['form_id'], $entry['id'] ) ) ), |
|
| 115 | + 'href' => esc_url_raw( admin_url( sprintf( 'admin.php?page=gf_entries&screen_mode=edit&view=entry&id=%d&lid=%d', $entry[ 'form_id' ], $entry[ 'id' ] ) ) ), |
|
| 116 | 116 | ) ); |
| 117 | 117 | |
| 118 | 118 | } |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | /** @var WP_Admin_Bar $wp_admin_bar */ |
| 129 | 129 | global $wp_admin_bar; |
| 130 | 130 | |
| 131 | - if( GVCommon::has_cap( array( 'edit_gravityviews', 'edit_gravityview', 'gravityforms_edit_forms' ) ) ) { |
|
| 131 | + if ( GVCommon::has_cap( array( 'edit_gravityviews', 'edit_gravityview', 'gravityforms_edit_forms' ) ) ) { |
|
| 132 | 132 | |
| 133 | 133 | if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) { |
| 134 | 134 | $views = gravityview()->views->all(); |
@@ -152,21 +152,21 @@ discard block |
||
| 152 | 152 | $form_id = $view->form ? $view->form->ID : null; |
| 153 | 153 | } else { |
| 154 | 154 | /** Deprecated. */ |
| 155 | - $view_id = $view['id']; |
|
| 156 | - $form_id = $view['form_id']; |
|
| 155 | + $view_id = $view[ 'id' ]; |
|
| 156 | + $form_id = $view[ 'form_id' ]; |
|
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | $edit_view_title = __( 'Edit View', 'gravityview' ); |
| 160 | 160 | $edit_form_title = __( 'Edit Form', 'gravityview' ); |
| 161 | 161 | |
| 162 | - if( sizeof( $views ) > 1 ) { |
|
| 162 | + if ( sizeof( $views ) > 1 ) { |
|
| 163 | 163 | $edit_view_title = sprintf( _x( 'Edit View #%d', 'Edit View with the ID of %d', 'gravityview' ), $view_id ); |
| 164 | 164 | $edit_form_title = sprintf( __( 'Edit Form #%d', 'Edit Form with the ID of %d', 'gravityview' ), $form_id ); |
| 165 | 165 | } |
| 166 | 166 | |
| 167 | - if( GVCommon::has_cap( 'edit_gravityview', $view_id ) && ! in_array( $view_id, $added_views ) ) { |
|
| 167 | + if ( GVCommon::has_cap( 'edit_gravityview', $view_id ) && ! in_array( $view_id, $added_views ) ) { |
|
| 168 | 168 | |
| 169 | - $added_views[] = $view_id; |
|
| 169 | + $added_views[ ] = $view_id; |
|
| 170 | 170 | |
| 171 | 171 | $wp_admin_bar->add_menu( array( |
| 172 | 172 | 'id' => 'edit-view-' . $view_id, |
@@ -176,9 +176,9 @@ discard block |
||
| 176 | 176 | ) ); |
| 177 | 177 | } |
| 178 | 178 | |
| 179 | - if ( ! empty( $form_id ) && GVCommon::has_cap( array( 'gravityforms_edit_forms' ), $form_id ) && ! in_array( $form_id, $added_forms ) ) { |
|
| 179 | + if ( ! empty( $form_id ) && GVCommon::has_cap( array( 'gravityforms_edit_forms' ), $form_id ) && ! in_array( $form_id, $added_forms ) ) { |
|
| 180 | 180 | |
| 181 | - $added_forms[] = $form_id; |
|
| 181 | + $added_forms[ ] = $form_id; |
|
| 182 | 182 | |
| 183 | 183 | $wp_admin_bar->add_menu( array( |
| 184 | 184 | 'id' => 'edit-form-' . $form_id, |
@@ -85,9 +85,9 @@ discard block |
||
| 85 | 85 | private function __construct() {} |
| 86 | 86 | |
| 87 | 87 | private function initialize() { |
| 88 | - add_action( 'wp', array( $this, 'parse_content'), 11 ); |
|
| 88 | + add_action( 'wp', array( $this, 'parse_content' ), 11 ); |
|
| 89 | 89 | add_filter( 'parse_query', array( $this, 'parse_query_fix_frontpage' ), 10 ); |
| 90 | - add_action( 'template_redirect', array( $this, 'set_entry_data'), 1 ); |
|
| 90 | + add_action( 'template_redirect', array( $this, 'set_entry_data' ), 1 ); |
|
| 91 | 91 | |
| 92 | 92 | // Enqueue scripts and styles after GravityView_Template::register_styles() |
| 93 | 93 | add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 20 ); |
@@ -237,12 +237,12 @@ discard block |
||
| 237 | 237 | |
| 238 | 238 | $this->context_view_id = $view_id; |
| 239 | 239 | |
| 240 | - } elseif ( isset( $_GET['gvid'] ) && $multiple_views ) { |
|
| 240 | + } elseif ( isset( $_GET[ 'gvid' ] ) && $multiple_views ) { |
|
| 241 | 241 | /** |
| 242 | 242 | * used on a has_multiple_views context |
| 243 | 243 | * @see GravityView_API::entry_link |
| 244 | 244 | */ |
| 245 | - $this->context_view_id = $_GET['gvid']; |
|
| 245 | + $this->context_view_id = $_GET[ 'gvid' ]; |
|
| 246 | 246 | |
| 247 | 247 | } elseif ( ! $multiple_views ) { |
| 248 | 248 | if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) { |
@@ -285,24 +285,24 @@ discard block |
||
| 285 | 285 | global $wp_rewrite; |
| 286 | 286 | |
| 287 | 287 | $is_front_page = ( $query->is_home || $query->is_page ); |
| 288 | - $show_on_front = ( 'page' === get_option('show_on_front') ); |
|
| 289 | - $front_page_id = get_option('page_on_front'); |
|
| 288 | + $show_on_front = ( 'page' === get_option( 'show_on_front' ) ); |
|
| 289 | + $front_page_id = get_option( 'page_on_front' ); |
|
| 290 | 290 | |
| 291 | - if ( $is_front_page && $show_on_front && $front_page_id ) { |
|
| 291 | + if ( $is_front_page && $show_on_front && $front_page_id ) { |
|
| 292 | 292 | |
| 293 | 293 | // Force to be an array, potentially a query string ( entry=16 ) |
| 294 | 294 | $_query = wp_parse_args( $query->query ); |
| 295 | 295 | |
| 296 | 296 | // pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename. |
| 297 | - if ( isset( $_query['pagename'] ) && '' === $_query['pagename'] ) { |
|
| 298 | - unset( $_query['pagename'] ); |
|
| 297 | + if ( isset( $_query[ 'pagename' ] ) && '' === $_query[ 'pagename' ] ) { |
|
| 298 | + unset( $_query[ 'pagename' ] ); |
|
| 299 | 299 | } |
| 300 | 300 | |
| 301 | 301 | // this is where will break from core wordpress |
| 302 | 302 | $ignore = array( 'preview', 'page', 'paged', 'cpage' ); |
| 303 | 303 | $endpoints = rgobj( $wp_rewrite, 'endpoints' ); |
| 304 | - foreach ( (array) $endpoints as $endpoint ) { |
|
| 305 | - $ignore[] = $endpoint[1]; |
|
| 304 | + foreach ( (array)$endpoints as $endpoint ) { |
|
| 305 | + $ignore[ ] = $endpoint[ 1 ]; |
|
| 306 | 306 | } |
| 307 | 307 | unset( $endpoints ); |
| 308 | 308 | |
@@ -312,21 +312,21 @@ discard block |
||
| 312 | 312 | // - The query includes keys that are associated with registered endpoints. `entry`, for example. |
| 313 | 313 | if ( empty( $_query ) || ! array_diff( array_keys( $_query ), $ignore ) ) { |
| 314 | 314 | |
| 315 | - $qv =& $query->query_vars; |
|
| 315 | + $qv = & $query->query_vars; |
|
| 316 | 316 | |
| 317 | 317 | // Prevent redirect when on the single entry endpoint |
| 318 | - if( self::is_single_entry() ) { |
|
| 318 | + if ( self::is_single_entry() ) { |
|
| 319 | 319 | add_filter( 'redirect_canonical', '__return_false' ); |
| 320 | 320 | } |
| 321 | 321 | |
| 322 | 322 | $query->is_page = true; |
| 323 | 323 | $query->is_home = false; |
| 324 | - $qv['page_id'] = $front_page_id; |
|
| 324 | + $qv[ 'page_id' ] = $front_page_id; |
|
| 325 | 325 | |
| 326 | 326 | // Correct <!--nextpage--> for page_on_front |
| 327 | - if ( ! empty( $qv['paged'] ) ) { |
|
| 328 | - $qv['page'] = $qv['paged']; |
|
| 329 | - unset( $qv['paged'] ); |
|
| 327 | + if ( ! empty( $qv[ 'paged' ] ) ) { |
|
| 328 | + $qv[ 'page' ] = $qv[ 'paged' ]; |
|
| 329 | + unset( $qv[ 'paged' ] ); |
|
| 330 | 330 | } |
| 331 | 331 | } |
| 332 | 332 | |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | |
| 360 | 360 | $this->setIsGravityviewPostType( get_post_type( $post ) === 'gravityview' ); |
| 361 | 361 | |
| 362 | - $post_id = $this->getPostId() ? $this->getPostId() : (isset( $post ) ? $post->ID : null ); |
|
| 362 | + $post_id = $this->getPostId() ? $this->getPostId() : ( isset( $post ) ? $post->ID : null ); |
|
| 363 | 363 | $this->setPostId( $post_id ); |
| 364 | 364 | $post_has_shortcode = ! empty( $post->post_content ) ? gravityview_has_shortcode_r( $post->post_content, 'gravityview' ) : false; |
| 365 | 365 | $this->setPostHasShortcode( $this->isGravityviewPostType() ? null : ! empty( $post_has_shortcode ) ); |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | |
| 396 | 396 | $search_method = GravityView_Widget_Search::getInstance()->get_search_method(); |
| 397 | 397 | |
| 398 | - if( 'post' === $search_method ) { |
|
| 398 | + if ( 'post' === $search_method ) { |
|
| 399 | 399 | $get = $_POST; |
| 400 | 400 | } else { |
| 401 | 401 | $get = $_GET; |
@@ -451,20 +451,20 @@ discard block |
||
| 451 | 451 | * @param boolean $in_the_loop Whether to apply the filter to the menu title and the meta tag <title> - outside the loop |
| 452 | 452 | * @param array $entry Current entry |
| 453 | 453 | */ |
| 454 | - $apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop' , in_the_loop(), $entry ); |
|
| 454 | + $apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop', in_the_loop(), $entry ); |
|
| 455 | 455 | |
| 456 | 456 | if ( ! $apply_outside_loop ) { |
| 457 | 457 | return $title; |
| 458 | 458 | } |
| 459 | 459 | |
| 460 | 460 | // User reported WooCommerce doesn't pass two args. |
| 461 | - if ( empty( $passed_post_id ) ) { |
|
| 461 | + if ( empty( $passed_post_id ) ) { |
|
| 462 | 462 | return $title; |
| 463 | 463 | } |
| 464 | 464 | |
| 465 | 465 | // Don't modify the title for anything other than the current view/post. |
| 466 | 466 | // This is true for embedded shortcodes and Views. |
| 467 | - if ( is_object( $post ) && (int) $post->ID !== (int) $passed_post_id ) { |
|
| 467 | + if ( is_object( $post ) && (int)$post->ID !== (int)$passed_post_id ) { |
|
| 468 | 468 | return $title; |
| 469 | 469 | } |
| 470 | 470 | |
@@ -487,7 +487,7 @@ discard block |
||
| 487 | 487 | } else { |
| 488 | 488 | if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) { |
| 489 | 489 | foreach ( gravityview()->views->all() as $_view ) { |
| 490 | - if ( intval( $_view->form->ID ) === intval( $entry['form_id'] ) ) { |
|
| 490 | + if ( intval( $_view->form->ID ) === intval( $entry[ 'form_id' ] ) ) { |
|
| 491 | 491 | $view = $_view; |
| 492 | 492 | break; |
| 493 | 493 | } |
@@ -499,7 +499,7 @@ discard block |
||
| 499 | 499 | } else { |
| 500 | 500 | /** Deprecated. Use gravityview()->views->all() or gravityview()->request->all() */ |
| 501 | 501 | foreach ( $this->getGvOutputData()->get_views() as $view_id => $view_data ) { |
| 502 | - if ( intval( $view_data['form_id'] ) === intval( $entry['form_id'] ) ) { |
|
| 502 | + if ( intval( $view_data[ 'form_id' ] ) === intval( $entry[ 'form_id' ] ) ) { |
|
| 503 | 503 | $view_meta = $view_data; |
| 504 | 504 | break; |
| 505 | 505 | } |
@@ -514,12 +514,12 @@ discard block |
||
| 514 | 514 | } |
| 515 | 515 | } else { |
| 516 | 516 | /** Deprecated stuff in the future. See the branch above. */ |
| 517 | - if ( ! empty( $view_meta['atts']['single_title'] ) ) { |
|
| 517 | + if ( ! empty( $view_meta[ 'atts' ][ 'single_title' ] ) ) { |
|
| 518 | 518 | |
| 519 | - $title = $view_meta['atts']['single_title']; |
|
| 519 | + $title = $view_meta[ 'atts' ][ 'single_title' ]; |
|
| 520 | 520 | |
| 521 | 521 | // We are allowing HTML in the fields, so no escaping the output |
| 522 | - $title = GravityView_API::replace_variables( $title, $view_meta['form'], $entry ); |
|
| 522 | + $title = GravityView_API::replace_variables( $title, $view_meta[ 'form' ], $entry ); |
|
| 523 | 523 | |
| 524 | 524 | $title = do_shortcode( $title ); |
| 525 | 525 | } |
@@ -557,7 +557,7 @@ discard block |
||
| 557 | 557 | } |
| 558 | 558 | |
| 559 | 559 | // Only render in the loop. Fixes issues with the_content filter being applied in places like the sidebar |
| 560 | - if( ! in_the_loop() ) { |
|
| 560 | + if ( ! in_the_loop() ) { |
|
| 561 | 561 | return $content; |
| 562 | 562 | } |
| 563 | 563 | |
@@ -632,7 +632,7 @@ discard block |
||
| 632 | 632 | |
| 633 | 633 | $context = GravityView_View::getInstance()->getContext(); |
| 634 | 634 | |
| 635 | - switch( $context ) { |
|
| 635 | + switch ( $context ) { |
|
| 636 | 636 | case 'directory': |
| 637 | 637 | $tab = __( 'Multiple Entries', 'gravityview' ); |
| 638 | 638 | break; |
@@ -646,9 +646,9 @@ discard block |
||
| 646 | 646 | } |
| 647 | 647 | |
| 648 | 648 | |
| 649 | - $title = sprintf( esc_html_x('The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview' ), $tab ); |
|
| 649 | + $title = sprintf( esc_html_x( 'The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview' ), $tab ); |
|
| 650 | 650 | $edit_link = admin_url( sprintf( 'post.php?post=%d&action=edit#%s-view', $view_id, $context ) ); |
| 651 | - $action_text = sprintf( esc_html__('Add fields to %s', 'gravityview' ), $tab ); |
|
| 651 | + $action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab ); |
|
| 652 | 652 | $message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' ); |
| 653 | 653 | |
| 654 | 654 | $output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message ); |
@@ -681,7 +681,7 @@ discard block |
||
| 681 | 681 | public function render_view( $passed_args ) { |
| 682 | 682 | |
| 683 | 683 | // validate attributes |
| 684 | - if ( empty( $passed_args['id'] ) ) { |
|
| 684 | + if ( empty( $passed_args[ 'id' ] ) ) { |
|
| 685 | 685 | do_action( 'gravityview_log_error', '[render_view] Returning; no ID defined.', $passed_args ); |
| 686 | 686 | return null; |
| 687 | 687 | } |
@@ -703,7 +703,7 @@ discard block |
||
| 703 | 703 | return null; |
| 704 | 704 | } |
| 705 | 705 | |
| 706 | - $view_id = $passed_args['id']; |
|
| 706 | + $view_id = $passed_args[ 'id' ]; |
|
| 707 | 707 | |
| 708 | 708 | if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) { |
| 709 | 709 | $view = gravityview()->views->get( $view_id ); |
@@ -728,7 +728,7 @@ discard block |
||
| 728 | 728 | $passed_args = array_filter( $passed_args, 'strlen' ); |
| 729 | 729 | |
| 730 | 730 | //Override shortcode args over View template settings |
| 731 | - $atts = wp_parse_args( $passed_args, $view_data['atts'] ); |
|
| 731 | + $atts = wp_parse_args( $passed_args, $view_data[ 'atts' ] ); |
|
| 732 | 732 | |
| 733 | 733 | do_action( 'gravityview_log_debug', '[render_view] Arguments after merging with View settings: ', $atts ); |
| 734 | 734 | } |
@@ -752,14 +752,14 @@ discard block |
||
| 752 | 752 | * @since 1.15 |
| 753 | 753 | * @since 1.17.2 Added check for if a user has no caps but is logged in (member of multisite, but not any site). Treat as if logged-out. |
| 754 | 754 | */ |
| 755 | - if( is_user_logged_in() && ! ( empty( wp_get_current_user()->caps ) && empty( wp_get_current_user()->roles ) ) && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) { |
|
| 755 | + if ( is_user_logged_in() && ! ( empty( wp_get_current_user()->caps ) && empty( wp_get_current_user()->roles ) ) && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) { |
|
| 756 | 756 | |
| 757 | 757 | do_action( 'gravityview_log_debug', sprintf( '%s Returning: View %d is not visible by current user.', __METHOD__, $view_id ) ); |
| 758 | 758 | |
| 759 | 759 | return null; |
| 760 | 760 | } |
| 761 | 761 | |
| 762 | - if( $this->isGravityviewPostType() ) { |
|
| 762 | + if ( $this->isGravityviewPostType() ) { |
|
| 763 | 763 | |
| 764 | 764 | /** |
| 765 | 765 | * @filter `gravityview_direct_access` Should Views be directly accessible, or only visible using the shortcode? |
@@ -775,10 +775,10 @@ discard block |
||
| 775 | 775 | $embed_only = $view->settings->get( 'embed_only' ); |
| 776 | 776 | } else { |
| 777 | 777 | /** Deprecated. View attributes moved to \GV\View::$settings. */ |
| 778 | - $embed_only = ! empty( $atts['embed_only'] ); |
|
| 778 | + $embed_only = ! empty( $atts[ 'embed_only' ] ); |
|
| 779 | 779 | } |
| 780 | 780 | |
| 781 | - if( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) { |
|
| 781 | + if ( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) { |
|
| 782 | 782 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
| 783 | 783 | } |
| 784 | 784 | } |
@@ -794,13 +794,13 @@ discard block |
||
| 794 | 794 | if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) { |
| 795 | 795 | $view_data = $view->as_data(); |
| 796 | 796 | $gravityview_view = new GravityView_View( $view_data ); |
| 797 | - $post_id = intval( $view->settings->get( 'post_id' ) ? : get_the_ID() ); |
|
| 797 | + $post_id = intval( $view->settings->get( 'post_id' ) ?: get_the_ID() ); |
|
| 798 | 798 | $template_id = $view->template ? $view->template->ID : null; |
| 799 | 799 | } else { |
| 800 | 800 | /** These constructs are deprecated. Use the new gravityview() wrapper. */ |
| 801 | 801 | $gravityview_view = new GravityView_View( $view_data ); |
| 802 | - $post_id = ! empty( $atts['post_id'] ) ? intval( $atts['post_id'] ) : get_the_ID(); |
|
| 803 | - $template_id = $view_data['template_id']; |
|
| 802 | + $post_id = ! empty( $atts[ 'post_id' ] ) ? intval( $atts[ 'post_id' ] ) : get_the_ID(); |
|
| 803 | + $template_id = $view_data[ 'template_id' ]; |
|
| 804 | 804 | } |
| 805 | 805 | |
| 806 | 806 | $gravityview_view->setPostId( $post_id ); |
@@ -811,20 +811,20 @@ discard block |
||
| 811 | 811 | do_action( 'gravityview_log_debug', '[render_view] Executing Directory View' ); |
| 812 | 812 | |
| 813 | 813 | //fetch template and slug |
| 814 | - $view_slug = apply_filters( 'gravityview_template_slug_'. $template_id, 'table', 'directory' ); |
|
| 814 | + $view_slug = apply_filters( 'gravityview_template_slug_' . $template_id, 'table', 'directory' ); |
|
| 815 | 815 | |
| 816 | 816 | do_action( 'gravityview_log_debug', '[render_view] View template slug: ', $view_slug ); |
| 817 | 817 | |
| 818 | 818 | /** |
| 819 | 819 | * Disable fetching initial entries for views that don't need it (DataTables) |
| 820 | 820 | */ |
| 821 | - $get_entries = apply_filters( 'gravityview_get_view_entries_'.$view_slug, true ); |
|
| 821 | + $get_entries = apply_filters( 'gravityview_get_view_entries_' . $view_slug, true ); |
|
| 822 | 822 | |
| 823 | 823 | if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) { |
| 824 | 824 | $hide_until_searched = $view->settings->get( 'hide_until_searched' ); |
| 825 | 825 | } else { |
| 826 | 826 | /** $atts is deprecated, use \GV\View:$settings */ |
| 827 | - $hide_until_searched = ! empty( $atts['hide_until_searched'] ); |
|
| 827 | + $hide_until_searched = ! empty( $atts[ 'hide_until_searched' ] ); |
|
| 828 | 828 | } |
| 829 | 829 | |
| 830 | 830 | /** |
@@ -842,12 +842,12 @@ discard block |
||
| 842 | 842 | $sort_columns = $view->settings->get( 'sort_columns' ); |
| 843 | 843 | } else { |
| 844 | 844 | /** $atts is deprecated, use \GV\View:$settings */ |
| 845 | - $sort_columns = ! empty( $atts['sort_columns'] ); |
|
| 845 | + $sort_columns = ! empty( $atts[ 'sort_columns' ] ); |
|
| 846 | 846 | } |
| 847 | 847 | |
| 848 | 848 | if ( $sort_columns ) { |
| 849 | 849 | // add filter to enable column sorting |
| 850 | - add_filter( 'gravityview/template/field_label', array( $this, 'add_columns_sort_links' ) , 100, 3 ); |
|
| 850 | + add_filter( 'gravityview/template/field_label', array( $this, 'add_columns_sort_links' ), 100, 3 ); |
|
| 851 | 851 | } |
| 852 | 852 | |
| 853 | 853 | if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) { |
@@ -855,19 +855,19 @@ discard block |
||
| 855 | 855 | } else { |
| 856 | 856 | /** $atts is deprecated, use \GV\View:$settings */ |
| 857 | 857 | /** $view_data is depreacted, use \GV\View properties */ |
| 858 | - $view_entries = self::get_view_entries( $atts, $view_data['form_id'] ); |
|
| 858 | + $view_entries = self::get_view_entries( $atts, $view_data[ 'form_id' ] ); |
|
| 859 | 859 | } |
| 860 | 860 | |
| 861 | - do_action( 'gravityview_log_debug', sprintf( '[render_view] Get Entries. Found %s entries total, showing %d entries', $view_entries['count'], sizeof( $view_entries['entries'] ) ) ); |
|
| 861 | + do_action( 'gravityview_log_debug', sprintf( '[render_view] Get Entries. Found %s entries total, showing %d entries', $view_entries[ 'count' ], sizeof( $view_entries[ 'entries' ] ) ) ); |
|
| 862 | 862 | |
| 863 | 863 | } else { |
| 864 | 864 | |
| 865 | 865 | $view_entries = array( 'count' => null, 'entries' => null, 'paging' => null ); |
| 866 | 866 | |
| 867 | - do_action( 'gravityview_log_debug', '[render_view] Not fetching entries because `gravityview_get_view_entries_'.$view_slug.'` is false' ); |
|
| 867 | + do_action( 'gravityview_log_debug', '[render_view] Not fetching entries because `gravityview_get_view_entries_' . $view_slug . '` is false' ); |
|
| 868 | 868 | } |
| 869 | 869 | |
| 870 | - $gravityview_view->setPaging( $view_entries['paging'] ); |
|
| 870 | + $gravityview_view->setPaging( $view_entries[ 'paging' ] ); |
|
| 871 | 871 | $gravityview_view->setContext( 'directory' ); |
| 872 | 872 | $sections = array( 'header', 'body', 'footer' ); |
| 873 | 873 | |
@@ -884,7 +884,7 @@ discard block |
||
| 884 | 884 | do_action( 'gravityview_render_entry_' . $view->ID ); |
| 885 | 885 | } else { |
| 886 | 886 | /** $view_data is depreacted, use \GV\View properties */ |
| 887 | - do_action( 'gravityview_render_entry_'.$view_data['id'] ); |
|
| 887 | + do_action( 'gravityview_render_entry_' . $view_data[ 'id' ] ); |
|
| 888 | 888 | } |
| 889 | 889 | |
| 890 | 890 | $entry = $this->getEntry(); |
@@ -895,7 +895,7 @@ discard block |
||
| 895 | 895 | do_action( 'gravityview_log_debug', '[render_view] Entry does not exist. This may be because of View filters limiting access.' ); |
| 896 | 896 | |
| 897 | 897 | // Only display warning once when multiple Views are embedded |
| 898 | - if( $view_id !== (int) GravityView_frontend::get_context_view_id() ) { |
|
| 898 | + if ( $view_id !== (int)GravityView_frontend::get_context_view_id() ) { |
|
| 899 | 899 | ob_end_clean(); |
| 900 | 900 | return null; |
| 901 | 901 | } |
@@ -920,7 +920,7 @@ discard block |
||
| 920 | 920 | // important: do not remove this as it prevents fake attempts of displaying entries from other views/forms |
| 921 | 921 | $multiple_views = defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ? gravityview()->views->count() > 1 : $this->getGvOutputData()->has_multiple_views(); |
| 922 | 922 | if ( $multiple_views && $view_id != $this->get_context_view_id() ) { |
| 923 | - do_action( 'gravityview_log_debug', '[render_view] In single entry view, but the entry does not belong to this View. Perhaps there are multiple views on the page. View ID: '. $view_id ); |
|
| 923 | + do_action( 'gravityview_log_debug', '[render_view] In single entry view, but the entry does not belong to this View. Perhaps there are multiple views on the page. View ID: ' . $view_id ); |
|
| 924 | 924 | ob_end_clean(); |
| 925 | 925 | return null; |
| 926 | 926 | } |
@@ -930,14 +930,14 @@ discard block |
||
| 930 | 930 | do_action( 'gravityview_log_debug', '[render_view] View single template slug: ', $view_slug ); |
| 931 | 931 | |
| 932 | 932 | //fetch entry detail |
| 933 | - $view_entries['count'] = 1; |
|
| 934 | - $view_entries['entries'][] = $entry; |
|
| 935 | - do_action( 'gravityview_log_debug', '[render_view] Get single entry: ', $view_entries['entries'] ); |
|
| 933 | + $view_entries[ 'count' ] = 1; |
|
| 934 | + $view_entries[ 'entries' ][ ] = $entry; |
|
| 935 | + do_action( 'gravityview_log_debug', '[render_view] Get single entry: ', $view_entries[ 'entries' ] ); |
|
| 936 | 936 | |
| 937 | 937 | if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) { |
| 938 | 938 | $back_link_label = $view->settings->get( 'back_link_label', null ); |
| 939 | 939 | } else { |
| 940 | - $back_link_label = isset( $atts['back_link_label'] ) ? $atts['back_link_label'] : null; |
|
| 940 | + $back_link_label = isset( $atts[ 'back_link_label' ] ) ? $atts[ 'back_link_label' ] : null; |
|
| 941 | 941 | } |
| 942 | 942 | |
| 943 | 943 | // set back link label |
@@ -951,8 +951,8 @@ discard block |
||
| 951 | 951 | self::add_style( $template_id ); |
| 952 | 952 | |
| 953 | 953 | // Prepare to render view and set vars |
| 954 | - $gravityview_view->setEntries( $view_entries['entries'] ); |
|
| 955 | - $gravityview_view->setTotalEntries( $view_entries['count'] ); |
|
| 954 | + $gravityview_view->setEntries( $view_entries[ 'entries' ] ); |
|
| 955 | + $gravityview_view->setTotalEntries( $view_entries[ 'count' ] ); |
|
| 956 | 956 | |
| 957 | 957 | // If Edit |
| 958 | 958 | if ( 'edit' === gravityview_get_context() ) { |
@@ -969,7 +969,7 @@ discard block |
||
| 969 | 969 | |
| 970 | 970 | do_action( 'gravityview_log_debug', '[render_view] Sections to render: ', $sections ); |
| 971 | 971 | foreach ( $sections as $section ) { |
| 972 | - do_action( 'gravityview_log_debug', '[render_view] Rendering '. $section . ' section.' ); |
|
| 972 | + do_action( 'gravityview_log_debug', '[render_view] Rendering ' . $section . ' section.' ); |
|
| 973 | 973 | $gravityview_view->render( $view_slug, $section, false ); |
| 974 | 974 | } |
| 975 | 975 | } |
@@ -1023,7 +1023,7 @@ discard block |
||
| 1023 | 1023 | $datetime_format = 'Y-m-d H:i:s'; |
| 1024 | 1024 | $search_is_outside_view_bounds = false; |
| 1025 | 1025 | |
| 1026 | - if( ! empty( $search_criteria[ $key ] ) ) { |
|
| 1026 | + if ( ! empty( $search_criteria[ $key ] ) ) { |
|
| 1027 | 1027 | |
| 1028 | 1028 | $search_date = strtotime( $search_criteria[ $key ] ); |
| 1029 | 1029 | |
@@ -1051,14 +1051,14 @@ discard block |
||
| 1051 | 1051 | if ( empty( $search_criteria[ $key ] ) || $search_is_outside_view_bounds ) { |
| 1052 | 1052 | |
| 1053 | 1053 | // Then we override the search and re-set the start date |
| 1054 | - $return_search_criteria[ $key ] = date_i18n( $datetime_format , $date, true ); |
|
| 1054 | + $return_search_criteria[ $key ] = date_i18n( $datetime_format, $date, true ); |
|
| 1055 | 1055 | } |
| 1056 | 1056 | } |
| 1057 | 1057 | } |
| 1058 | 1058 | |
| 1059 | - if( isset( $return_search_criteria['start_date'] ) && isset( $return_search_criteria['end_date'] ) ) { |
|
| 1059 | + if ( isset( $return_search_criteria[ 'start_date' ] ) && isset( $return_search_criteria[ 'end_date' ] ) ) { |
|
| 1060 | 1060 | // The start date is AFTER the end date. This will result in no results, but let's not force the issue. |
| 1061 | - if ( strtotime( $return_search_criteria['start_date'] ) > strtotime( $return_search_criteria['end_date'] ) ) { |
|
| 1061 | + if ( strtotime( $return_search_criteria[ 'start_date' ] ) > strtotime( $return_search_criteria[ 'end_date' ] ) ) { |
|
| 1062 | 1062 | do_action( 'gravityview_log_error', __METHOD__ . ' Invalid search: the start date is after the end date.', $return_search_criteria ); |
| 1063 | 1063 | } |
| 1064 | 1064 | } |
@@ -1077,19 +1077,19 @@ discard block |
||
| 1077 | 1077 | public static function process_search_only_approved( $args, $search_criteria ) { |
| 1078 | 1078 | |
| 1079 | 1079 | /** @since 1.19 */ |
| 1080 | - if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) { |
|
| 1080 | + if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) { |
|
| 1081 | 1081 | do_action( 'gravityview_log_debug', __METHOD__ . ': User can moderate entries; showing all approval statuses' ); |
| 1082 | 1082 | return $search_criteria; |
| 1083 | 1083 | } |
| 1084 | 1084 | |
| 1085 | - if ( ! empty( $args['show_only_approved'] ) ) { |
|
| 1085 | + if ( ! empty( $args[ 'show_only_approved' ] ) ) { |
|
| 1086 | 1086 | |
| 1087 | - $search_criteria['field_filters'][] = array( |
|
| 1087 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
| 1088 | 1088 | 'key' => GravityView_Entry_Approval::meta_key, |
| 1089 | 1089 | 'value' => GravityView_Entry_Approval_Status::APPROVED |
| 1090 | 1090 | ); |
| 1091 | 1091 | |
| 1092 | - $search_criteria['field_filters']['mode'] = 'all'; // force all the criterias to be met |
|
| 1092 | + $search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; // force all the criterias to be met |
|
| 1093 | 1093 | |
| 1094 | 1094 | do_action( 'gravityview_log_debug', '[process_search_only_approved] Search Criteria if show only approved: ', $search_criteria ); |
| 1095 | 1095 | } |
@@ -1116,18 +1116,18 @@ discard block |
||
| 1116 | 1116 | */ |
| 1117 | 1117 | public static function is_entry_approved( $entry, $args = array() ) { |
| 1118 | 1118 | |
| 1119 | - if ( empty( $entry['id'] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args['show_only_approved'] ) ) { |
|
| 1119 | + if ( empty( $entry[ 'id' ] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args[ 'show_only_approved' ] ) ) { |
|
| 1120 | 1120 | // is implicitly approved if entry is null or View settings doesn't require to check for approval |
| 1121 | 1121 | return true; |
| 1122 | 1122 | } |
| 1123 | 1123 | |
| 1124 | 1124 | /** @since 1.19 */ |
| 1125 | - if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) { |
|
| 1125 | + if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) { |
|
| 1126 | 1126 | do_action( 'gravityview_log_debug', __METHOD__ . ': User can moderate entries, so entry is approved for viewing' ); |
| 1127 | 1127 | return true; |
| 1128 | 1128 | } |
| 1129 | 1129 | |
| 1130 | - $is_approved = gform_get_meta( $entry['id'], GravityView_Entry_Approval::meta_key ); |
|
| 1130 | + $is_approved = gform_get_meta( $entry[ 'id' ], GravityView_Entry_Approval::meta_key ); |
|
| 1131 | 1131 | |
| 1132 | 1132 | return GravityView_Entry_Approval_Status::is_approved( $is_approved ); |
| 1133 | 1133 | } |
@@ -1161,26 +1161,26 @@ discard block |
||
| 1161 | 1161 | do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after hook gravityview_fe_search_criteria: ', $search_criteria ); |
| 1162 | 1162 | |
| 1163 | 1163 | // implicity search |
| 1164 | - if ( ! empty( $args['search_value'] ) ) { |
|
| 1164 | + if ( ! empty( $args[ 'search_value' ] ) ) { |
|
| 1165 | 1165 | |
| 1166 | 1166 | // Search operator options. Options: `is` or `contains` |
| 1167 | - $operator = ! empty( $args['search_operator'] ) && in_array( $args['search_operator'], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args['search_operator'] : 'contains'; |
|
| 1167 | + $operator = ! empty( $args[ 'search_operator' ] ) && in_array( $args[ 'search_operator' ], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args[ 'search_operator' ] : 'contains'; |
|
| 1168 | 1168 | |
| 1169 | - $search_criteria['field_filters'][] = array( |
|
| 1169 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
| 1170 | 1170 | 'key' => rgget( 'search_field', $args ), // The field ID to search |
| 1171 | - 'value' => _wp_specialchars( $args['search_value'] ), // The value to search. Encode ampersands but not quotes. |
|
| 1171 | + 'value' => _wp_specialchars( $args[ 'search_value' ] ), // The value to search. Encode ampersands but not quotes. |
|
| 1172 | 1172 | 'operator' => $operator, |
| 1173 | 1173 | ); |
| 1174 | 1174 | } |
| 1175 | 1175 | |
| 1176 | - if( $search_criteria !== $original_search_criteria ) { |
|
| 1176 | + if ( $search_criteria !== $original_search_criteria ) { |
|
| 1177 | 1177 | do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after implicity search: ', $search_criteria ); |
| 1178 | 1178 | } |
| 1179 | 1179 | |
| 1180 | 1180 | // Handle setting date range |
| 1181 | 1181 | $search_criteria = self::process_search_dates( $args, $search_criteria ); |
| 1182 | 1182 | |
| 1183 | - if( $search_criteria !== $original_search_criteria ) { |
|
| 1183 | + if ( $search_criteria !== $original_search_criteria ) { |
|
| 1184 | 1184 | do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after date params: ', $search_criteria ); |
| 1185 | 1185 | } |
| 1186 | 1186 | |
@@ -1191,7 +1191,7 @@ discard block |
||
| 1191 | 1191 | * @filter `gravityview_status` Modify entry status requirements to be included in search results. |
| 1192 | 1192 | * @param string $status Default: `active`. Accepts all Gravity Forms entry statuses, including `spam` and `trash` |
| 1193 | 1193 | */ |
| 1194 | - $search_criteria['status'] = apply_filters( 'gravityview_status', 'active', $args ); |
|
| 1194 | + $search_criteria[ 'status' ] = apply_filters( 'gravityview_status', 'active', $args ); |
|
| 1195 | 1195 | |
| 1196 | 1196 | return $search_criteria; |
| 1197 | 1197 | } |
@@ -1240,19 +1240,19 @@ discard block |
||
| 1240 | 1240 | $form = \GV\GF_Form::by_id( $form_id ); |
| 1241 | 1241 | |
| 1242 | 1242 | $entries = $form->entries |
| 1243 | - ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) ) |
|
| 1244 | - ->offset( $args['offset'] ) |
|
| 1245 | - ->limit( $parameters['paging']['page_size'] ) |
|
| 1246 | - ->page( ( ( $parameters['paging']['offset'] - $args['offset'] ) / $parameters['paging']['page_size'] ) + 1 ); |
|
| 1243 | + ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) ) |
|
| 1244 | + ->offset( $args[ 'offset' ] ) |
|
| 1245 | + ->limit( $parameters[ 'paging' ][ 'page_size' ] ) |
|
| 1246 | + ->page( ( ( $parameters[ 'paging' ][ 'offset' ] - $args[ 'offset' ] ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 ); |
|
| 1247 | 1247 | |
| 1248 | - if ( ! empty( $parameters['sorting'] ) ) { |
|
| 1248 | + if ( ! empty( $parameters[ 'sorting' ] ) ) { |
|
| 1249 | 1249 | $field = new \GV\Field(); |
| 1250 | - $field->ID = $parameters['sorting']['key']; |
|
| 1251 | - $direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; |
|
| 1250 | + $field->ID = $parameters[ 'sorting' ][ 'key' ]; |
|
| 1251 | + $direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; |
|
| 1252 | 1252 | $entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) ); |
| 1253 | 1253 | } |
| 1254 | 1254 | |
| 1255 | - $parameters['paging'] = array( |
|
| 1255 | + $parameters[ 'paging' ] = array( |
|
| 1256 | 1256 | 'offset' => ( $entries->current_page - 1 ) * $entries->limit, |
| 1257 | 1257 | 'page_size' => $entries->limit, |
| 1258 | 1258 | ); |
@@ -1332,7 +1332,7 @@ discard block |
||
| 1332 | 1332 | 'search_criteria' => $search_criteria, |
| 1333 | 1333 | 'sorting' => self::updateViewSorting( $args, $form_id ), |
| 1334 | 1334 | 'paging' => $paging, |
| 1335 | - 'cache' => isset( $args['cache'] ) ? $args['cache'] : true, |
|
| 1335 | + 'cache' => isset( $args[ 'cache' ] ) ? $args[ 'cache' ] : true, |
|
| 1336 | 1336 | ); |
| 1337 | 1337 | |
| 1338 | 1338 | /** |
@@ -1357,7 +1357,7 @@ discard block |
||
| 1357 | 1357 | * @param array $parameters Array with `search_criteria`, `sorting` and `paging` keys. |
| 1358 | 1358 | * @param array $args View configuration args. |
| 1359 | 1359 | */ |
| 1360 | - $parameters = apply_filters( 'gravityview_get_entries_'.$args['id'], $parameters, $args, $form_id ); |
|
| 1360 | + $parameters = apply_filters( 'gravityview_get_entries_' . $args[ 'id' ], $parameters, $args, $form_id ); |
|
| 1361 | 1361 | |
| 1362 | 1362 | do_action( 'gravityview_log_debug', __METHOD__ . ': $parameters passed to gravityview_get_entries(): ', $parameters ); |
| 1363 | 1363 | |
@@ -1382,17 +1382,17 @@ discard block |
||
| 1382 | 1382 | $default_page_size = apply_filters( 'gravityview_default_page_size', 25 ); |
| 1383 | 1383 | |
| 1384 | 1384 | // Paging & offset |
| 1385 | - $page_size = ! empty( $args['page_size'] ) ? intval( $args['page_size'] ) : $default_page_size; |
|
| 1385 | + $page_size = ! empty( $args[ 'page_size' ] ) ? intval( $args[ 'page_size' ] ) : $default_page_size; |
|
| 1386 | 1386 | |
| 1387 | 1387 | if ( -1 === $page_size ) { |
| 1388 | 1388 | $page_size = PHP_INT_MAX; |
| 1389 | 1389 | } |
| 1390 | 1390 | |
| 1391 | - $curr_page = empty( $_GET['pagenum'] ) ? 1 : intval( $_GET['pagenum'] ); |
|
| 1391 | + $curr_page = empty( $_GET[ 'pagenum' ] ) ? 1 : intval( $_GET[ 'pagenum' ] ); |
|
| 1392 | 1392 | $offset = ( $curr_page - 1 ) * $page_size; |
| 1393 | 1393 | |
| 1394 | - if ( ! empty( $args['offset'] ) ) { |
|
| 1395 | - $offset += intval( $args['offset'] ); |
|
| 1394 | + if ( ! empty( $args[ 'offset' ] ) ) { |
|
| 1395 | + $offset += intval( $args[ 'offset' ] ); |
|
| 1396 | 1396 | } |
| 1397 | 1397 | |
| 1398 | 1398 | $paging = array( |
@@ -1416,8 +1416,8 @@ discard block |
||
| 1416 | 1416 | */ |
| 1417 | 1417 | public static function updateViewSorting( $args, $form_id ) { |
| 1418 | 1418 | $sorting = array(); |
| 1419 | - $sort_field_id = isset( $_GET['sort'] ) ? $_GET['sort'] : rgar( $args, 'sort_field' ); |
|
| 1420 | - $sort_direction = isset( $_GET['dir'] ) ? $_GET['dir'] : rgar( $args, 'sort_direction' ); |
|
| 1419 | + $sort_field_id = isset( $_GET[ 'sort' ] ) ? $_GET[ 'sort' ] : rgar( $args, 'sort_field' ); |
|
| 1420 | + $sort_direction = isset( $_GET[ 'dir' ] ) ? $_GET[ 'dir' ] : rgar( $args, 'sort_direction' ); |
|
| 1421 | 1421 | |
| 1422 | 1422 | $sort_field_id = self::_override_sorting_id_by_field_type( $sort_field_id, $form_id ); |
| 1423 | 1423 | |
@@ -1457,11 +1457,11 @@ discard block |
||
| 1457 | 1457 | |
| 1458 | 1458 | $sort_field = GFFormsModel::get_field( $form, $sort_field_id ); |
| 1459 | 1459 | |
| 1460 | - if( ! $sort_field ) { |
|
| 1460 | + if ( ! $sort_field ) { |
|
| 1461 | 1461 | return $sort_field_id; |
| 1462 | 1462 | } |
| 1463 | 1463 | |
| 1464 | - switch ( $sort_field['type'] ) { |
|
| 1464 | + switch ( $sort_field[ 'type' ] ) { |
|
| 1465 | 1465 | |
| 1466 | 1466 | case 'address': |
| 1467 | 1467 | // Sorting by full address |
@@ -1478,7 +1478,7 @@ discard block |
||
| 1478 | 1478 | */ |
| 1479 | 1479 | $address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id ); |
| 1480 | 1480 | |
| 1481 | - switch( strtolower( $address_part ) ){ |
|
| 1481 | + switch ( strtolower( $address_part ) ) { |
|
| 1482 | 1482 | case 'street': |
| 1483 | 1483 | $sort_field_id .= '.1'; |
| 1484 | 1484 | break; |
@@ -1563,7 +1563,7 @@ discard block |
||
| 1563 | 1563 | */ |
| 1564 | 1564 | $single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry ); |
| 1565 | 1565 | |
| 1566 | - if ( empty( $single_entry ) ){ |
|
| 1566 | + if ( empty( $single_entry ) ) { |
|
| 1567 | 1567 | return false; |
| 1568 | 1568 | } else { |
| 1569 | 1569 | return $single_entry; |
@@ -1596,14 +1596,14 @@ discard block |
||
| 1596 | 1596 | $template_id = $view->template ? $view->template->ID : null; |
| 1597 | 1597 | $data = $view->as_data(); |
| 1598 | 1598 | } else { |
| 1599 | - $template_id = $data['template_id']; |
|
| 1599 | + $template_id = $data[ 'template_id' ]; |
|
| 1600 | 1600 | } |
| 1601 | 1601 | |
| 1602 | 1602 | /** |
| 1603 | 1603 | * Don't enqueue the scripts or styles if it's not going to be displayed. |
| 1604 | 1604 | * @since 1.15 |
| 1605 | 1605 | */ |
| 1606 | - if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) { |
|
| 1606 | + if ( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) { |
|
| 1607 | 1607 | continue; |
| 1608 | 1608 | } |
| 1609 | 1609 | |
@@ -1615,7 +1615,7 @@ discard block |
||
| 1615 | 1615 | $lightbox = $view->settings->get( 'lightbox' ); |
| 1616 | 1616 | } else { |
| 1617 | 1617 | /** View data attributes are now stored in \GV\View::$settings */ |
| 1618 | - $lightbox = ! empty( $data['atts']['lightbox'] ); |
|
| 1618 | + $lightbox = ! empty( $data[ 'atts' ][ 'lightbox' ] ); |
|
| 1619 | 1619 | } |
| 1620 | 1620 | |
| 1621 | 1621 | // If the thickbox is enqueued, add dependencies |
@@ -1625,13 +1625,13 @@ discard block |
||
| 1625 | 1625 | * @filter `gravity_view_lightbox_script` Override the lightbox script to enqueue. Default: `thickbox` |
| 1626 | 1626 | * @param string $script_slug If you want to use a different lightbox script, return the name of it here. |
| 1627 | 1627 | */ |
| 1628 | - $js_dependencies[] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' ); |
|
| 1628 | + $js_dependencies[ ] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' ); |
|
| 1629 | 1629 | |
| 1630 | 1630 | /** |
| 1631 | 1631 | * @filter `gravity_view_lightbox_style` Modify the lightbox CSS slug. Default: `thickbox` |
| 1632 | 1632 | * @param string $script_slug If you want to use a different lightbox script, return the name of its CSS file here. |
| 1633 | 1633 | */ |
| 1634 | - $css_dependencies[] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' ); |
|
| 1634 | + $css_dependencies[ ] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' ); |
|
| 1635 | 1635 | } |
| 1636 | 1636 | |
| 1637 | 1637 | /** |
@@ -1639,19 +1639,19 @@ discard block |
||
| 1639 | 1639 | * @see https://github.com/katzwebservices/GravityView/issues/536 |
| 1640 | 1640 | * @since 1.15 |
| 1641 | 1641 | */ |
| 1642 | - if( gravityview_view_has_single_checkbox_or_radio( $data['form'], $data['fields'] ) ) { |
|
| 1643 | - $css_dependencies[] = 'dashicons'; |
|
| 1642 | + if ( gravityview_view_has_single_checkbox_or_radio( $data[ 'form' ], $data[ 'fields' ] ) ) { |
|
| 1643 | + $css_dependencies[ ] = 'dashicons'; |
|
| 1644 | 1644 | } |
| 1645 | 1645 | |
| 1646 | 1646 | wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true ); |
| 1647 | 1647 | |
| 1648 | 1648 | $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; |
| 1649 | 1649 | |
| 1650 | - wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ) , GravityView_Plugin::version, true ); |
|
| 1650 | + wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ), GravityView_Plugin::version, true ); |
|
| 1651 | 1651 | |
| 1652 | 1652 | wp_enqueue_script( 'gravityview-fe-view' ); |
| 1653 | 1653 | |
| 1654 | - if ( ! empty( $data['atts']['sort_columns'] ) ) { |
|
| 1654 | + if ( ! empty( $data[ 'atts' ][ 'sort_columns' ] ) ) { |
|
| 1655 | 1655 | wp_enqueue_style( 'gravityview_font', plugins_url( 'assets/css/font.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' ); |
| 1656 | 1656 | } |
| 1657 | 1657 | |
@@ -1719,7 +1719,7 @@ discard block |
||
| 1719 | 1719 | } elseif ( empty( $template_id ) ) { |
| 1720 | 1720 | do_action( 'gravityview_log_error', '[add_style] Cannot add template style; template_id is empty' ); |
| 1721 | 1721 | } else { |
| 1722 | - do_action( 'gravityview_log_error', sprintf( '[add_style] Cannot add template style; %s is not registered', 'gravityview_style_'.$template_id ) ); |
|
| 1722 | + do_action( 'gravityview_log_error', sprintf( '[add_style] Cannot add template style; %s is not registered', 'gravityview_style_' . $template_id ) ); |
|
| 1723 | 1723 | } |
| 1724 | 1724 | |
| 1725 | 1725 | } |
@@ -1744,11 +1744,11 @@ discard block |
||
| 1744 | 1744 | * Not a table-based template; don't add sort icons |
| 1745 | 1745 | * @since 1.12 |
| 1746 | 1746 | */ |
| 1747 | - if( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) { |
|
| 1747 | + if ( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) { |
|
| 1748 | 1748 | return $label; |
| 1749 | 1749 | } |
| 1750 | 1750 | |
| 1751 | - if ( ! $this->is_field_sortable( $field['id'], $form ) ) { |
|
| 1751 | + if ( ! $this->is_field_sortable( $field[ 'id' ], $form ) ) { |
|
| 1752 | 1752 | return $label; |
| 1753 | 1753 | } |
| 1754 | 1754 | |
@@ -1756,29 +1756,29 @@ discard block |
||
| 1756 | 1756 | |
| 1757 | 1757 | $class = 'gv-sort'; |
| 1758 | 1758 | |
| 1759 | - $sort_field_id = self::_override_sorting_id_by_field_type( $field['id'], $form['id'] ); |
|
| 1759 | + $sort_field_id = self::_override_sorting_id_by_field_type( $field[ 'id' ], $form[ 'id' ] ); |
|
| 1760 | 1760 | |
| 1761 | 1761 | $sort_args = array( |
| 1762 | - 'sort' => $field['id'], |
|
| 1762 | + 'sort' => $field[ 'id' ], |
|
| 1763 | 1763 | 'dir' => 'asc', |
| 1764 | 1764 | ); |
| 1765 | 1765 | |
| 1766 | - if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) { |
|
| 1766 | + if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) { |
|
| 1767 | 1767 | //toggle sorting direction. |
| 1768 | - if ( 'asc' === $sorting['direction'] ) { |
|
| 1769 | - $sort_args['dir'] = 'desc'; |
|
| 1768 | + if ( 'asc' === $sorting[ 'direction' ] ) { |
|
| 1769 | + $sort_args[ 'dir' ] = 'desc'; |
|
| 1770 | 1770 | $class .= ' gv-icon-sort-desc'; |
| 1771 | 1771 | } else { |
| 1772 | - $sort_args['dir'] = 'asc'; |
|
| 1772 | + $sort_args[ 'dir' ] = 'asc'; |
|
| 1773 | 1773 | $class .= ' gv-icon-sort-asc'; |
| 1774 | 1774 | } |
| 1775 | 1775 | } else { |
| 1776 | 1776 | $class .= ' gv-icon-caret-up-down'; |
| 1777 | 1777 | } |
| 1778 | 1778 | |
| 1779 | - $url = add_query_arg( $sort_args, remove_query_arg( array('pagenum') ) ); |
|
| 1779 | + $url = add_query_arg( $sort_args, remove_query_arg( array( 'pagenum' ) ) ); |
|
| 1780 | 1780 | |
| 1781 | - return '<a href="'. esc_url_raw( $url ) .'" class="'. $class .'" ></a> '. $label; |
|
| 1781 | + return '<a href="' . esc_url_raw( $url ) . '" class="' . $class . '" ></a> ' . $label; |
|
| 1782 | 1782 | |
| 1783 | 1783 | } |
| 1784 | 1784 | |
@@ -1796,7 +1796,7 @@ discard block |
||
| 1796 | 1796 | |
| 1797 | 1797 | $field_type = $field_id; |
| 1798 | 1798 | |
| 1799 | - if( is_numeric( $field_id ) ) { |
|
| 1799 | + if ( is_numeric( $field_id ) ) { |
|
| 1800 | 1800 | $field = GFFormsModel::get_field( $form, $field_id ); |
| 1801 | 1801 | $field_type = $field->type; |
| 1802 | 1802 | } |
@@ -1819,7 +1819,7 @@ discard block |
||
| 1819 | 1819 | return false; |
| 1820 | 1820 | } |
| 1821 | 1821 | |
| 1822 | - return apply_filters( "gravityview/sortable/formfield_{$form['id']}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) ); |
|
| 1822 | + return apply_filters( "gravityview/sortable/formfield_{$form[ 'id' ]}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) ); |
|
| 1823 | 1823 | |
| 1824 | 1824 | } |
| 1825 | 1825 | |
@@ -129,12 +129,12 @@ |
||
| 129 | 129 | |
| 130 | 130 | /** Let's find us some [gravityview] shortcodes perhaps. */ |
| 131 | 131 | foreach ( Shortcode::parse( $content ) as $shortcode ) { |
| 132 | - if ( $shortcode->name != 'gravityview' || empty( $shortcode->atts['id'] ) ) { |
|
| 132 | + if ( $shortcode->name != 'gravityview' || empty( $shortcode->atts[ 'id' ] ) ) { |
|
| 133 | 133 | continue; |
| 134 | 134 | } |
| 135 | 135 | |
| 136 | - if ( is_numeric( $shortcode->atts['id'] ) ) { |
|
| 137 | - $view = View::by_id( $shortcode->atts['id'] ); |
|
| 136 | + if ( is_numeric( $shortcode->atts[ 'id' ] ) ) { |
|
| 137 | + $view = View::by_id( $shortcode->atts[ 'id' ] ); |
|
| 138 | 138 | if ( ! $view ) { |
| 139 | 139 | continue; |
| 140 | 140 | } |
@@ -103,11 +103,11 @@ discard block |
||
| 103 | 103 | |
| 104 | 104 | /** Call all lazy callbacks. */ |
| 105 | 105 | foreach ( $this->callbacks as $callback ) { |
| 106 | - if ( $callback[0] != 'count' ) { |
|
| 106 | + if ( $callback[ 0 ] != 'count' ) { |
|
| 107 | 107 | continue; |
| 108 | 108 | } |
| 109 | 109 | |
| 110 | - $total += $callback[1]( $this->filters ); |
|
| 110 | + $total += $callback[ 1 ]( $this->filters ); |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | return $total - $this->offset; |
@@ -161,11 +161,11 @@ discard block |
||
| 161 | 161 | |
| 162 | 162 | /** Call all lazy callbacks. */ |
| 163 | 163 | foreach ( $this->callbacks as $i => $callback ) { |
| 164 | - if ( $callback[0] != 'fetch' ) { |
|
| 164 | + if ( $callback[ 0 ] != 'fetch' ) { |
|
| 165 | 165 | continue; |
| 166 | 166 | } |
| 167 | 167 | |
| 168 | - $this->merge( $callback[1]( $this->filters, $this->sorts, $offset ) ); |
|
| 168 | + $this->merge( $callback[ 1 ]( $this->filters, $this->sorts, $offset ) ); |
|
| 169 | 169 | } |
| 170 | 170 | |
| 171 | 171 | $this->fetched = $this->count(); |
@@ -321,7 +321,7 @@ discard block |
||
| 321 | 321 | return; |
| 322 | 322 | } |
| 323 | 323 | |
| 324 | - $this->callbacks []= array( $type, $callback ); |
|
| 324 | + $this->callbacks [ ] = array( $type, $callback ); |
|
| 325 | 325 | } |
| 326 | 326 | |
| 327 | 327 | /** |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | * @return void |
| 26 | 26 | */ |
| 27 | 27 | public function add( $value ) { |
| 28 | - $this->storage []= $value; |
|
| 28 | + $this->storage [ ] = $value; |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | /** |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | * @return void |
| 50 | 50 | */ |
| 51 | 51 | public function merge( \GV\Collection $collection ) { |
| 52 | - array_map( array( $this, 'add'), $collection->all() ); |
|
| 52 | + array_map( array( $this, 'add' ), $collection->all() ); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | /** |
@@ -205,8 +205,8 @@ discard block |
||
| 205 | 205 | * @return string The version of PHP. |
| 206 | 206 | */ |
| 207 | 207 | private function get_php_version() { |
| 208 | - return !empty( $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] ) ? |
|
| 209 | - $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] : phpversion(); |
|
| 208 | + return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] ) ? |
|
| 209 | + $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] : phpversion(); |
|
| 210 | 210 | } |
| 211 | 211 | |
| 212 | 212 | /** |
@@ -217,8 +217,8 @@ discard block |
||
| 217 | 217 | * @return string The version of WordPress. |
| 218 | 218 | */ |
| 219 | 219 | private function get_wordpress_version() { |
| 220 | - return !empty( $GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] ) ? |
|
| 221 | - $GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] : $GLOBALS['wp_version']; |
|
| 220 | + return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] ) ? |
|
| 221 | + $GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] : $GLOBALS[ 'wp_version' ]; |
|
| 222 | 222 | } |
| 223 | 223 | |
| 224 | 224 | /** |
@@ -230,12 +230,12 @@ discard block |
||
| 230 | 230 | * @return string The version of Gravity Forms. |
| 231 | 231 | */ |
| 232 | 232 | private function get_gravityforms_version() { |
| 233 | - if ( !class_exists( '\GFCommon' ) || !empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE'] ) ) { |
|
| 233 | + if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE' ] ) ) { |
|
| 234 | 234 | throw new \ErrorException( 'Gravity Forms is inactive or not installed.' ); |
| 235 | 235 | } |
| 236 | 236 | |
| 237 | - return !empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] ) ? |
|
| 238 | - $GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] : \GFCommon::$version; |
|
| 237 | + return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] ) ? |
|
| 238 | + $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] : \GFCommon::$version; |
|
| 239 | 239 | } |
| 240 | 240 | |
| 241 | 241 | private function __clone() { } |