@@ -86,8 +86,8 @@ |
||
86 | 86 | */ |
87 | 87 | $context->view = Utils::get( $template, 'view' ); |
88 | 88 | $context->source = Utils::get( $template, 'source' ); |
89 | - $context->field = Utils::get( $template, 'field' ) ? : Utils::get( $data, 'field' ); |
|
90 | - $context->entry = Utils::get( $template, 'entry' ) ? : Utils::get( $data, 'entry' ); |
|
89 | + $context->field = Utils::get( $template, 'field' ) ?: Utils::get( $data, 'field' ); |
|
90 | + $context->entry = Utils::get( $template, 'entry' ) ?: Utils::get( $data, 'entry' ); |
|
91 | 91 | $context->request = Utils::get( $template, 'request' ); |
92 | 92 | |
93 | 93 | $context->entries = Utils::get( $template, 'entries' ) ? $template->entries : null; |
@@ -27,12 +27,12 @@ discard block |
||
27 | 27 | */ |
28 | 28 | protected function log( $level, $message, $context ) { |
29 | 29 | |
30 | - $php_version = ( ! empty( $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] ) ) ? |
|
31 | - $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] : phpversion(); |
|
30 | + $php_version = ( ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] ) ) ? |
|
31 | + $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] : phpversion(); |
|
32 | 32 | |
33 | 33 | if ( version_compare( $php_version, '5.4', '>=' ) ) { |
34 | 34 | $backtrace = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS, 3 ); |
35 | - $location = $this->interpolate( "{class}{type}{function}", $backtrace[2] ); |
|
35 | + $location = $this->interpolate( "{class}{type}{function}", $backtrace[ 2 ] ); |
|
36 | 36 | $message = $this->interpolate( "[$level, $location] $message", $context ); |
37 | 37 | } else { |
38 | 38 | $message = "[$level] $message"; |
@@ -58,14 +58,14 @@ discard block |
||
58 | 58 | do_action( |
59 | 59 | sprintf( 'gravityview_log_%s_test', $action ), |
60 | 60 | $this->interpolate( $message, $context ), |
61 | - empty( $context['data'] ) ? array() : $context['data'] |
|
61 | + empty( $context[ 'data' ] ) ? array() : $context[ 'data' ] |
|
62 | 62 | ); |
63 | 63 | } |
64 | 64 | |
65 | 65 | do_action( |
66 | 66 | sprintf( 'gravityview_log_%s', $action ), |
67 | 67 | $this->interpolate( $message, $context ), |
68 | - empty( $context['data'] ) ? array() : $context['data'] |
|
68 | + empty( $context[ 'data' ] ) ? array() : $context[ 'data' ] |
|
69 | 69 | ); |
70 | 70 | } |
71 | 71 | } |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | * @deprecated use gravityview()->log |
245 | 245 | * @return void |
246 | 246 | */ |
247 | - public static function log_debug( $message, $data = null ){ |
|
247 | + public static function log_debug( $message, $data = null ) { |
|
248 | 248 | gravityview()->log->notice( '\GravityView_Plugin is deprecated. Use \GV\Plugin instead.' ); |
249 | 249 | gravityview()->log->debug( $message, $data ); |
250 | 250 | } |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | * @deprecated use gravityview()->log |
256 | 256 | * @return void |
257 | 257 | */ |
258 | - public static function log_error( $message, $data = null ){ |
|
258 | + public static function log_error( $message, $data = null ) { |
|
259 | 259 | gravityview()->log->notice( '\GravityView_Plugin is deprecated. Use \GV\Plugin instead.' ); |
260 | 260 | gravityview()->log->error( $message, $data ); |
261 | 261 | } |
@@ -67,10 +67,10 @@ discard block |
||
67 | 67 | // Make sure the keys are all set |
68 | 68 | $note = wp_parse_args( $note, $default_note ); |
69 | 69 | |
70 | - GFFormsModel::add_note( intval( $note['lead_id'] ), intval( $note['user_id'] ), esc_attr( $note['user_name'] ), $note['note'], esc_attr( $note['note_type'] ) ); |
|
70 | + GFFormsModel::add_note( intval( $note[ 'lead_id' ] ), intval( $note[ 'user_id' ] ), esc_attr( $note[ 'user_name' ] ), $note[ 'note' ], esc_attr( $note[ 'note_type' ] ) ); |
|
71 | 71 | |
72 | 72 | // If last_error is empty string, there was no error. |
73 | - if( empty( $wpdb->last_error ) ) { |
|
73 | + if ( empty( $wpdb->last_error ) ) { |
|
74 | 74 | $return = $wpdb->insert_id; |
75 | 75 | } else { |
76 | 76 | $return = new WP_Error( 'gravityview-add-note', $wpdb->last_error ); |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | */ |
97 | 97 | public static function delete_notes( $note_ids = array() ) { |
98 | 98 | |
99 | - if( !is_array( $note_ids ) ) { |
|
99 | + if ( ! is_array( $note_ids ) ) { |
|
100 | 100 | |
101 | 101 | gravityview()->log->error( 'Note IDs not an array. Not processing delete request.', array( 'data' => $note_ids ) ); |
102 | 102 | |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | ) |
157 | 157 | ); |
158 | 158 | |
159 | - return $results ? $results[0] : false; |
|
159 | + return $results ? $results[ 0 ] : false; |
|
160 | 160 | } |
161 | 161 | |
162 | 162 | /** |
@@ -169,8 +169,8 @@ discard block |
||
169 | 169 | */ |
170 | 170 | public static function filter_avatar( $avatar = '', $note ) { |
171 | 171 | |
172 | - if( 'gravityview' === $note->note_type && -1 === (int)$note->user_id ) { |
|
173 | - $avatar = sprintf( '<img src="%s" width="48" height="48" alt="GravityView" class="avatar avatar-48 gravityview-avatar" />', esc_url_raw( plugins_url( 'assets/images/floaty-avatar.png', GRAVITYVIEW_FILE ) ) ); |
|
172 | + if ( 'gravityview' === $note->note_type && -1 === (int)$note->user_id ) { |
|
173 | + $avatar = sprintf( '<img src="%s" width="48" height="48" alt="GravityView" class="avatar avatar-48 gravityview-avatar" />', esc_url_raw( plugins_url( 'assets/images/floaty-avatar.png', GRAVITYVIEW_FILE ) ) ); |
|
174 | 174 | } |
175 | 175 | |
176 | 176 | return $avatar; |
@@ -15,12 +15,12 @@ discard block |
||
15 | 15 | function __construct() { |
16 | 16 | |
17 | 17 | // Only run on Admin |
18 | - if ( !is_admin() ) { |
|
18 | + if ( ! is_admin() ) { |
|
19 | 19 | return; |
20 | 20 | } |
21 | 21 | |
22 | 22 | // If the Duplicate Post plugin is active, don't run. |
23 | - if( defined('DUPLICATE_POST_CURRENT_VERSION') ) { |
|
23 | + if ( defined( 'DUPLICATE_POST_CURRENT_VERSION' ) ) { |
|
24 | 24 | return; |
25 | 25 | } |
26 | 26 | |
@@ -60,10 +60,10 @@ discard block |
||
60 | 60 | global $post; |
61 | 61 | |
62 | 62 | // We only want to add Clone links to the Edit View metabox |
63 | - if( !$this->is_all_views_page() ) { |
|
63 | + if ( ! $this->is_all_views_page() ) { |
|
64 | 64 | |
65 | - if( $duplicate_links = $this->make_duplicate_link_row( array(), $post ) ) { |
|
66 | - $links[] = '<span>' . $duplicate_links['edit_as_new_draft'] . '</span>'; |
|
65 | + if ( $duplicate_links = $this->make_duplicate_link_row( array(), $post ) ) { |
|
66 | + $links[ ] = '<span>' . $duplicate_links[ 'edit_as_new_draft' ] . '</span>'; |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | } |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | * @param string|null If string, the status to set for the new View. If empty, use existing View status. |
124 | 124 | * @param WP_Post $post View being cloned |
125 | 125 | */ |
126 | - $new_view_status = apply_filters('gravityview/duplicate-view/status', $status, $post ); |
|
126 | + $new_view_status = apply_filters( 'gravityview/duplicate-view/status', $status, $post ); |
|
127 | 127 | |
128 | 128 | $new_view = array( |
129 | 129 | 'menu_order' => $post->menu_order, |
@@ -146,11 +146,11 @@ discard block |
||
146 | 146 | * @param boolean $copy_date Whether the copy the date from the existing View. Default: `false` |
147 | 147 | * @param WP_Post $post View being cloned |
148 | 148 | */ |
149 | - $copy_date = apply_filters('gravityview/duplicate-view/copy-date', false, $post ); |
|
149 | + $copy_date = apply_filters( 'gravityview/duplicate-view/copy-date', false, $post ); |
|
150 | 150 | |
151 | 151 | if ( $copy_date ) { |
152 | - $new_view['post_date'] = $new_post_date = $post->post_date; |
|
153 | - $new_view['post_date_gmt'] = get_gmt_from_date( $new_post_date ); |
|
152 | + $new_view[ 'post_date' ] = $new_post_date = $post->post_date; |
|
153 | + $new_view[ 'post_date_gmt' ] = get_gmt_from_date( $new_post_date ); |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | /** |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | * @param array $new_view Array of settings to be passed to wp_insert_post() |
160 | 160 | * @param WP_Post $post View being cloned |
161 | 161 | */ |
162 | - $new_view = apply_filters('gravityview/duplicate-view/new-view', $new_view, $post ); |
|
162 | + $new_view = apply_filters( 'gravityview/duplicate-view/new-view', $new_view, $post ); |
|
163 | 163 | |
164 | 164 | // Magic happens here. |
165 | 165 | $new_view_id = wp_insert_post( $new_view ); |
@@ -241,13 +241,13 @@ discard block |
||
241 | 241 | $clone_text = __( 'Clone', 'gravityview' ); |
242 | 242 | $clone_title = __( 'Clone this View', 'gravityview' ); |
243 | 243 | |
244 | - $actions['clone'] = gravityview_get_link( $clone_link, $clone_text, 'title='.$clone_title ); |
|
244 | + $actions[ 'clone' ] = gravityview_get_link( $clone_link, $clone_text, 'title=' . $clone_title ); |
|
245 | 245 | |
246 | 246 | $clone_draft_link = $this->get_clone_view_link( $post->ID ); |
247 | 247 | $clone_draft_text = $this->is_all_views_page() ? __( 'New Draft', 'gravityview' ) : __( 'Clone View', 'gravityview' ); |
248 | 248 | $clone_draft_title = __( 'Copy as a new draft View', 'gravityview' ); |
249 | 249 | |
250 | - $actions['edit_as_new_draft'] = gravityview_get_link( $clone_draft_link, esc_html( $clone_draft_text ), 'title='.$clone_draft_title ); |
|
250 | + $actions[ 'edit_as_new_draft' ] = gravityview_get_link( $clone_draft_link, esc_html( $clone_draft_text ), 'title=' . $clone_draft_title ); |
|
251 | 251 | } |
252 | 252 | |
253 | 253 | return $actions; |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | } |
272 | 272 | |
273 | 273 | // Verify the View exists |
274 | - if ( !$view = get_post( $id ) ) { |
|
274 | + if ( ! $view = get_post( $id ) ) { |
|
275 | 275 | return ''; |
276 | 276 | } |
277 | 277 | |
@@ -286,7 +286,7 @@ discard block |
||
286 | 286 | $post_type_object = get_post_type_object( $view->post_type ); |
287 | 287 | |
288 | 288 | /** If there's no gravityview post type for some reason, abort! */ |
289 | - if ( !$post_type_object ) { |
|
289 | + if ( ! $post_type_object ) { |
|
290 | 290 | gravityview()->log->error( 'No gravityview post type exists when trying to clone the View.', array( 'data' => $view ) ); |
291 | 291 | return ''; |
292 | 292 | } |
@@ -298,7 +298,7 @@ discard block |
||
298 | 298 | * @param int $view_id View ID |
299 | 299 | * @param string $context How to display the link. If "display", the URL is run through esc_html(). Default: `display` |
300 | 300 | */ |
301 | - $clone_view_link = apply_filters( 'gravityview/duplicate-view/get_clone_view_link', admin_url( "admin.php". $action ), $view->ID, $context ); |
|
301 | + $clone_view_link = apply_filters( 'gravityview/duplicate-view/get_clone_view_link', admin_url( "admin.php" . $action ), $view->ID, $context ); |
|
302 | 302 | |
303 | 303 | return $clone_view_link; |
304 | 304 | } |
@@ -325,14 +325,14 @@ discard block |
||
325 | 325 | */ |
326 | 326 | public function save_as_new_view( $status = '' ) { |
327 | 327 | |
328 | - if ( ! ( isset( $_GET['post'] ) || isset( $_POST['post'] ) ) ) { |
|
328 | + if ( ! ( isset( $_GET[ 'post' ] ) || isset( $_POST[ 'post' ] ) ) ) { |
|
329 | 329 | wp_die( __( 'No post to duplicate has been supplied!', 'gravityview' ) ); |
330 | 330 | } |
331 | 331 | |
332 | 332 | // Get the original post |
333 | - $id = ( isset( $_GET['post'] ) ? $_GET['post'] : $_POST['post'] ); |
|
333 | + $id = ( isset( $_GET[ 'post' ] ) ? $_GET[ 'post' ] : $_POST[ 'post' ] ); |
|
334 | 334 | |
335 | - if( ! $this->current_user_can_copy( $id ) ) { |
|
335 | + if ( ! $this->current_user_can_copy( $id ) ) { |
|
336 | 336 | wp_die( __( 'You don\'t have permission to copy this View.', 'gravityview' ) ); |
337 | 337 | } |
338 | 338 |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | |
46 | 46 | $return = $input_type; |
47 | 47 | |
48 | - if( 'survey' === $field_type ) { |
|
48 | + if ( 'survey' === $field_type ) { |
|
49 | 49 | $return = 'select'; |
50 | 50 | } |
51 | 51 | |
@@ -65,8 +65,8 @@ discard block |
||
65 | 65 | public function fix_survey_fields( $fields ) { |
66 | 66 | |
67 | 67 | /** @var GF_Field $field */ |
68 | - foreach( $fields as &$field ) { |
|
69 | - if( 'survey' === $field->type ) { |
|
68 | + foreach ( $fields as &$field ) { |
|
69 | + if ( 'survey' === $field->type ) { |
|
70 | 70 | $field->allowsPrepopulate = true; |
71 | 71 | } |
72 | 72 | } |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | * @return void |
83 | 83 | */ |
84 | 84 | function add_render_hooks() { |
85 | - add_filter( 'gform_field_value', array( $this, 'fix_survey_field_value'), 10, 3 ); |
|
85 | + add_filter( 'gform_field_value', array( $this, 'fix_survey_field_value' ), 10, 3 ); |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | /** |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | * @return void |
96 | 96 | */ |
97 | 97 | function remove_render_hooks() { |
98 | - remove_filter( 'gform_field_value', array( $this, 'fix_survey_field_value'), 10 ); |
|
98 | + remove_filter( 'gform_field_value', array( $this, 'fix_survey_field_value' ), 10 ); |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | /** |
@@ -113,9 +113,9 @@ discard block |
||
113 | 113 | */ |
114 | 114 | public function fix_survey_field_value( $value, $field, $name ) { |
115 | 115 | |
116 | - if( 'survey' === $field->type ) { |
|
116 | + if ( 'survey' === $field->type ) { |
|
117 | 117 | |
118 | - $entry = GravityView_Edit_Entry::getInstance()->instances['render']->get_entry(); |
|
118 | + $entry = GravityView_Edit_Entry::getInstance()->instances[ 'render' ]->get_entry(); |
|
119 | 119 | |
120 | 120 | // We need to run through each survey row until we find a match for expected values |
121 | 121 | foreach ( $entry as $field_id => $field_value ) { |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | list( $row_val, $col_val ) = explode( ':', $field_value, 2 ); |
129 | 129 | |
130 | 130 | // If the $name matches the $row_val, we are processing the correct row |
131 | - if( $row_val === $name ) { |
|
131 | + if ( $row_val === $name ) { |
|
132 | 132 | $value = $field_value; |
133 | 133 | break; |
134 | 134 | } |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | |
34 | 34 | parent::add_hooks(); |
35 | 35 | |
36 | - add_filter( 'gravityview/search/searchable_fields', array( $this, 'modify_search_bar_fields_dropdown'), 10, 2 ); |
|
36 | + add_filter( 'gravityview/search/searchable_fields', array( $this, 'modify_search_bar_fields_dropdown' ), 10, 2 ); |
|
37 | 37 | |
38 | 38 | } |
39 | 39 | |
@@ -52,13 +52,13 @@ discard block |
||
52 | 52 | */ |
53 | 53 | public static function get_status_options( $form_id = 0, $status_key = 'workflow_final_status' ) { |
54 | 54 | |
55 | - if( empty( $form_id ) ) { |
|
55 | + if ( empty( $form_id ) ) { |
|
56 | 56 | $form_id = GravityView_View::getInstance()->getFormId(); |
57 | 57 | } |
58 | 58 | |
59 | 59 | $entry_meta = gravity_flow()->get_entry_meta( array(), $form_id ); |
60 | 60 | |
61 | - return (array) \GV\Utils::get( $entry_meta, $status_key . '/filter/choices' ); |
|
61 | + return (array)\GV\Utils::get( $entry_meta, $status_key . '/filter/choices' ); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | |
81 | 81 | $workflow_steps = $GFlow->get_steps(); |
82 | 82 | |
83 | - if( $workflow_steps ) { |
|
83 | + if ( $workflow_steps ) { |
|
84 | 84 | |
85 | 85 | foreach ( $workflow_steps as $step ) { |
86 | 86 | |
@@ -92,12 +92,12 @@ discard block |
||
92 | 92 | ); |
93 | 93 | } |
94 | 94 | |
95 | - $fields['workflow_step'] = array( |
|
95 | + $fields[ 'workflow_step' ] = array( |
|
96 | 96 | 'label' => esc_html__( 'Workflow Step', 'gravityview' ), |
97 | 97 | 'type' => 'select', |
98 | 98 | ); |
99 | 99 | |
100 | - $fields['workflow_final_status'] = array( |
|
100 | + $fields[ 'workflow_final_status' ] = array( |
|
101 | 101 | 'label' => esc_html__( 'Workflow Status', 'gravityview' ), |
102 | 102 | 'type' => 'select', |
103 | 103 | ); |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | $signature_fields = GFAPI::get_fields_by_type( $form, 'signature' ); |
54 | 54 | |
55 | 55 | foreach ( $signature_fields as $field ) { |
56 | - unset( $_POST["input_{$field->id}"] ); |
|
56 | + unset( $_POST[ "input_{$field->id}" ] ); |
|
57 | 57 | } |
58 | 58 | } |
59 | 59 | |
@@ -72,19 +72,19 @@ discard block |
||
72 | 72 | */ |
73 | 73 | function edit_entry_field_input( $field_content = '', $field, $value = '', $lead_id = 0, $form_id = 0 ) { |
74 | 74 | |
75 | - $context = function_exists('gravityview_get_context') ? gravityview_get_context() : ''; |
|
75 | + $context = function_exists( 'gravityview_get_context' ) ? gravityview_get_context() : ''; |
|
76 | 76 | |
77 | - if( 'signature' !== $field->type || 'edit' !== $context ) { |
|
77 | + if ( 'signature' !== $field->type || 'edit' !== $context ) { |
|
78 | 78 | return $field_content; |
79 | 79 | } |
80 | 80 | |
81 | 81 | // We need to fetch a fresh version of the entry, since the saved entry hasn't refreshed in GV yet. |
82 | 82 | $entry = GravityView_View::getInstance()->getCurrentEntry(); |
83 | - $entry = GFAPI::get_entry( $entry['id'] ); |
|
83 | + $entry = GFAPI::get_entry( $entry[ 'id' ] ); |
|
84 | 84 | $entry_value = \GV\Utils::get( $entry, $field->id ); |
85 | 85 | |
86 | - $_POST["input_{$field->id}"] = $entry_value; // Used when Edit Entry form *is* submitted |
|
87 | - $_POST["input_{$form_id}_{$field->id}_signature_filename"] = $entry_value; // Used when Edit Entry form *is not* submitted |
|
86 | + $_POST[ "input_{$field->id}" ] = $entry_value; // Used when Edit Entry form *is* submitted |
|
87 | + $_POST[ "input_{$form_id}_{$field->id}_signature_filename" ] = $entry_value; // Used when Edit Entry form *is not* submitted |
|
88 | 88 | |
89 | 89 | return ''; // Return empty string to force using $_POST values instead |
90 | 90 | } |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | |
21 | 21 | if ( ! empty( $passed_post ) ) { |
22 | 22 | $id_or_id_array = $this->maybe_get_view_id( $passed_post ); |
23 | - foreach( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) { |
|
23 | + foreach ( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) { |
|
24 | 24 | if ( \GV\View::exists( $view_id ) && ! $this->views->contains( $view_id ) ) { |
25 | 25 | $this->views->add( \GV\View::by_id( $view_id ) ); |
26 | 26 | } |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | foreach ( $passed_post as &$post ) { |
76 | 76 | $views = \GV\View_Collection::from_post( $post ); |
77 | 77 | foreach ( $views->all() as $view ) { |
78 | - $ids []= $view->ID; |
|
78 | + $ids [ ] = $view->ID; |
|
79 | 79 | |
80 | 80 | /** And as a side-effect... add each view to the global scope. */ |
81 | 81 | if ( ! $this->views->contains( $view->ID ) ) { |
@@ -89,29 +89,29 @@ discard block |
||
89 | 89 | if ( is_string( $passed_post ) ) { |
90 | 90 | $shortcodes = \GV\Shortcode::parse( $passed_post ); |
91 | 91 | foreach ( $shortcodes as $shortcode ) { |
92 | - if ( $shortcode->name == 'gravityview' && !empty( $shortcode->atts['id'] ) ) { |
|
93 | - $ids []= $shortcode->atts['id']; |
|
92 | + if ( $shortcode->name == 'gravityview' && ! empty( $shortcode->atts[ 'id' ] ) ) { |
|
93 | + $ids [ ] = $shortcode->atts[ 'id' ]; |
|
94 | 94 | |
95 | 95 | /** And as a side-effect... add each view to the global scope. */ |
96 | - if ( ! $this->views->contains( $shortcode->atts['id'] ) && \GV\View::exists( $shortcode->atts['id'] ) ) { |
|
97 | - $this->views->add( $shortcode->atts['id'] ); |
|
96 | + if ( ! $this->views->contains( $shortcode->atts[ 'id' ] ) && \GV\View::exists( $shortcode->atts[ 'id' ] ) ) { |
|
97 | + $this->views->add( $shortcode->atts[ 'id' ] ); |
|
98 | 98 | } |
99 | 99 | } |
100 | 100 | } |
101 | 101 | } else { |
102 | 102 | $id = $this->get_id_from_atts( $passed_post ); |
103 | - $ids[] = intval( $id ); |
|
103 | + $ids[ ] = intval( $id ); |
|
104 | 104 | } |
105 | 105 | } |
106 | 106 | } |
107 | 107 | |
108 | - if( empty($ids) ) { |
|
108 | + if ( empty( $ids ) ) { |
|
109 | 109 | return NULL; |
110 | 110 | } |
111 | 111 | |
112 | 112 | // If it's just one ID, return that. |
113 | 113 | // Otherwise, return array of IDs |
114 | - return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids; |
|
114 | + return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids; |
|
115 | 115 | } |
116 | 116 | |
117 | 117 | /** |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | */ |
120 | 120 | public static function getInstance( $passed_post = NULL ) { |
121 | 121 | |
122 | - if( empty( self::$instance ) ) { |
|
122 | + if ( empty( self::$instance ) ) { |
|
123 | 123 | self::$instance = new GravityView_View_Data( $passed_post ); |
124 | 124 | } |
125 | 125 | |
@@ -135,8 +135,8 @@ discard block |
||
135 | 135 | return array(); |
136 | 136 | } |
137 | 137 | return array_combine( |
138 | - array_map( function ( $view ) { return $view->ID; }, $this->views->all() ), |
|
139 | - array_map( function ( $view ) { return $view->as_data(); }, $this->views->all() ) |
|
138 | + array_map( function( $view ) { return $view->ID; }, $this->views->all() ), |
|
139 | + array_map( function( $view ) { return $view->as_data(); }, $this->views->all() ) |
|
140 | 140 | ); |
141 | 141 | } |
142 | 142 | |
@@ -245,22 +245,22 @@ discard block |
||
245 | 245 | public function parse_post_content( $content ) { |
246 | 246 | $ids = array(); |
247 | 247 | foreach ( \GV\Shortcode::parse( $content ) as $shortcode ) { |
248 | - if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts['id'] ) ) { |
|
249 | - if ( \GV\View::exists( $shortcode->atts['id'] ) && ! $this->views->contains( $shortcode->atts['id'] ) ) { |
|
250 | - $this->views->add( \GV\View::by_id( $shortcode->atts['id'] ) ); |
|
248 | + if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts[ 'id' ] ) ) { |
|
249 | + if ( \GV\View::exists( $shortcode->atts[ 'id' ] ) && ! $this->views->contains( $shortcode->atts[ 'id' ] ) ) { |
|
250 | + $this->views->add( \GV\View::by_id( $shortcode->atts[ 'id' ] ) ); |
|
251 | 251 | } |
252 | 252 | /** |
253 | 253 | * The original function outputs the ID even though it wasn't added by ::add_view() |
254 | 254 | * Wether this is a bug or not remains a mystery. But we need to emulate this behavior |
255 | 255 | * until better times. |
256 | 256 | */ |
257 | - $ids []= $shortcode->atts['id']; |
|
257 | + $ids [ ] = $shortcode->atts[ 'id' ]; |
|
258 | 258 | } |
259 | 259 | } |
260 | 260 | if ( empty ( $ids ) ) { |
261 | 261 | return null; |
262 | 262 | } |
263 | - return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids; |
|
263 | + return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids; |
|
264 | 264 | } |
265 | 265 | |
266 | 266 | /** |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | // Not invalid if not set! |
284 | 284 | if ( empty( $post_id ) || empty( $view_id ) ) { |
285 | 285 | |
286 | - if( $empty_is_valid ) { |
|
286 | + if ( $empty_is_valid ) { |
|
287 | 287 | return true; |
288 | 288 | } |
289 | 289 | |
@@ -316,7 +316,7 @@ discard block |
||
316 | 316 | $view_ids_in_post = array_map( function( $view ) { return $view->ID; }, $views->all() ); |
317 | 317 | |
318 | 318 | // The post or page specified does not contain the shortcode. |
319 | - if ( false === in_array( $view_id, (array) $view_ids_in_post ) ) { |
|
319 | + if ( false === in_array( $view_id, (array)$view_ids_in_post ) ) { |
|
320 | 320 | $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>' ); |
321 | 321 | } |
322 | 322 | } |
@@ -324,7 +324,7 @@ discard block |
||
324 | 324 | if ( ! $message ) { |
325 | 325 | // It's a View |
326 | 326 | if ( \GV\View::exists( $post_id ) ) { |
327 | - $message = esc_html__( 'The ID is already a View.', 'gravityview' );; |
|
327 | + $message = esc_html__( 'The ID is already a View.', 'gravityview' ); ; |
|
328 | 328 | } |
329 | 329 | } |
330 | 330 |