@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | */ |
91 | 91 | public static function getInstance() { |
92 | 92 | |
93 | - if( empty( self::$instance ) ) { |
|
93 | + if ( empty( self::$instance ) ) { |
|
94 | 94 | self::$instance = new self; |
95 | 95 | } |
96 | 96 | |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | |
102 | 102 | self::require_files(); |
103 | 103 | |
104 | - if( ! GravityView_Compatibility::is_valid() ) { |
|
104 | + if ( ! GravityView_Compatibility::is_valid() ) { |
|
105 | 105 | return; |
106 | 106 | } |
107 | 107 | |
@@ -116,15 +116,15 @@ discard block |
||
116 | 116 | */ |
117 | 117 | private static function require_files() { |
118 | 118 | require_once( GRAVITYVIEW_DIR . 'includes/helper-functions.php' ); |
119 | - require_once( GRAVITYVIEW_DIR . 'includes/class-common.php'); |
|
120 | - require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-html-elements.php'); |
|
121 | - require_once( GRAVITYVIEW_DIR . 'includes/connector-functions.php'); |
|
119 | + require_once( GRAVITYVIEW_DIR . 'includes/class-common.php' ); |
|
120 | + require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-html-elements.php' ); |
|
121 | + require_once( GRAVITYVIEW_DIR . 'includes/connector-functions.php' ); |
|
122 | 122 | require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-compatibility.php' ); |
123 | 123 | require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-roles-capabilities.php' ); |
124 | 124 | require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-admin-notices.php' ); |
125 | 125 | require_once( GRAVITYVIEW_DIR . 'includes/class-admin.php' ); |
126 | - require_once( GRAVITYVIEW_DIR . 'includes/class-post-types.php'); |
|
127 | - require_once( GRAVITYVIEW_DIR . 'includes/class-cache.php'); |
|
126 | + require_once( GRAVITYVIEW_DIR . 'includes/class-post-types.php' ); |
|
127 | + require_once( GRAVITYVIEW_DIR . 'includes/class-cache.php' ); |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | /** |
@@ -157,22 +157,22 @@ discard block |
||
157 | 157 | } |
158 | 158 | |
159 | 159 | include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-approval-status.php' ); |
160 | - include_once( GRAVITYVIEW_DIR .'includes/class-gravityview-entry-approval.php' ); |
|
160 | + include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-approval.php' ); |
|
161 | 161 | |
162 | - include_once( GRAVITYVIEW_DIR .'includes/class-gravityview-entry-notes.php' ); |
|
163 | - include_once( GRAVITYVIEW_DIR .'includes/load-plugin-and-theme-hooks.php' ); |
|
162 | + include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-notes.php' ); |
|
163 | + include_once( GRAVITYVIEW_DIR . 'includes/load-plugin-and-theme-hooks.php' ); |
|
164 | 164 | |
165 | 165 | // Load Extensions |
166 | 166 | // @todo: Convert to a scan of the directory or a method where this all lives |
167 | - include_once( GRAVITYVIEW_DIR .'includes/extensions/edit-entry/class-edit-entry.php' ); |
|
168 | - include_once( GRAVITYVIEW_DIR .'includes/extensions/delete-entry/class-delete-entry.php' ); |
|
169 | - include_once( GRAVITYVIEW_DIR .'includes/extensions/entry-notes/class-gravityview-field-notes.php' ); |
|
167 | + include_once( GRAVITYVIEW_DIR . 'includes/extensions/edit-entry/class-edit-entry.php' ); |
|
168 | + include_once( GRAVITYVIEW_DIR . 'includes/extensions/delete-entry/class-delete-entry.php' ); |
|
169 | + include_once( GRAVITYVIEW_DIR . 'includes/extensions/entry-notes/class-gravityview-field-notes.php' ); |
|
170 | 170 | |
171 | 171 | // Load WordPress Widgets |
172 | - include_once( GRAVITYVIEW_DIR .'includes/wordpress-widgets/register-wordpress-widgets.php' ); |
|
172 | + include_once( GRAVITYVIEW_DIR . 'includes/wordpress-widgets/register-wordpress-widgets.php' ); |
|
173 | 173 | |
174 | 174 | // Load GravityView Widgets |
175 | - include_once( GRAVITYVIEW_DIR .'includes/widgets/register-gravityview-widgets.php' ); |
|
175 | + include_once( GRAVITYVIEW_DIR . 'includes/widgets/register-gravityview-widgets.php' ); |
|
176 | 176 | |
177 | 177 | // Add oEmbed |
178 | 178 | include_once( GRAVITYVIEW_DIR . 'includes/class-oembed.php' ); |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | include_once( GRAVITYVIEW_DIR . 'includes/class-frontend-views.php' ); |
186 | 186 | include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-admin-bar.php' ); |
187 | 187 | include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-list.php' ); |
188 | - include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-merge-tags.php'); /** @since 1.8.4 */ |
|
188 | + include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-merge-tags.php' ); /** @since 1.8.4 */ |
|
189 | 189 | include_once( GRAVITYVIEW_DIR . 'includes/class-data.php' ); |
190 | 190 | include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-shortcode.php' ); |
191 | 191 | include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-link-shortcode.php' ); |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | * @return bool |
201 | 201 | */ |
202 | 202 | public static function is_network_activated() { |
203 | - return is_multisite() && ( function_exists('is_plugin_active_for_network') && is_plugin_active_for_network( 'gravityview/gravityview.php' ) ); |
|
203 | + return is_multisite() && ( function_exists( 'is_plugin_active_for_network' ) && is_plugin_active_for_network( 'gravityview/gravityview.php' ) ); |
|
204 | 204 | } |
205 | 205 | |
206 | 206 | |
@@ -221,12 +221,12 @@ discard block |
||
221 | 221 | |
222 | 222 | if ( php_sapi_name() == 'cli' ) { |
223 | 223 | printf( __( "GravityView requires PHP Version %s or newer. You're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), |
224 | - GV_FUTURE_MIN_PHP_VERSION , phpversion() ); |
|
224 | + GV_FUTURE_MIN_PHP_VERSION, phpversion() ); |
|
225 | 225 | } else { |
226 | 226 | printf( '<body style="padding: 0; margin: 0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">' ); |
227 | 227 | printf( '<img src="' . plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) . '" alt="The GravityView Astronaut Says:" style="float: left; height: 60px; margin-right : 10px;" />' ); |
228 | 228 | printf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), |
229 | - '<h3 style="font-size:16px; margin: 0 0 8px 0;">', GV_FUTURE_MIN_PHP_VERSION , "</h3>\n\n", $version ); |
|
229 | + '<h3 style="font-size:16px; margin: 0 0 8px 0;">', GV_FUTURE_MIN_PHP_VERSION, "</h3>\n\n", $version ); |
|
230 | 230 | printf( '</body>' ); |
231 | 231 | } |
232 | 232 | |
@@ -296,7 +296,7 @@ discard block |
||
296 | 296 | * @since 1.7.5.1 |
297 | 297 | */ |
298 | 298 | public static function include_widget_class() { |
299 | - include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' ); |
|
299 | + include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget.php' ); |
|
300 | 300 | } |
301 | 301 | |
302 | 302 | |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | } |
319 | 319 | if ( ! $loaded ) { |
320 | 320 | $locale = apply_filters( 'plugin_locale', get_locale(), 'gravityview' ); |
321 | - $mofile = dirname( __FILE__ ) . '/languages/gravityview-'. $locale .'.mo'; |
|
321 | + $mofile = dirname( __FILE__ ) . '/languages/gravityview-' . $locale . '.mo'; |
|
322 | 322 | load_textdomain( 'gravityview', $mofile ); |
323 | 323 | } |
324 | 324 | |
@@ -355,12 +355,12 @@ discard block |
||
355 | 355 | */ |
356 | 356 | public function frontend_actions( $force = false ) { |
357 | 357 | |
358 | - if( self::is_admin() && ! $force ) { return; } |
|
358 | + if ( self::is_admin() && ! $force ) { return; } |
|
359 | 359 | |
360 | 360 | include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-image.php' ); |
361 | - include_once( GRAVITYVIEW_DIR .'includes/class-template.php' ); |
|
362 | - include_once( GRAVITYVIEW_DIR .'includes/class-api.php' ); |
|
363 | - include_once( GRAVITYVIEW_DIR .'includes/class-frontend-views.php' ); |
|
361 | + include_once( GRAVITYVIEW_DIR . 'includes/class-template.php' ); |
|
362 | + include_once( GRAVITYVIEW_DIR . 'includes/class-api.php' ); |
|
363 | + include_once( GRAVITYVIEW_DIR . 'includes/class-frontend-views.php' ); |
|
364 | 364 | include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-change-entry-creator.php' ); |
365 | 365 | |
366 | 366 | |
@@ -385,8 +385,8 @@ discard block |
||
385 | 385 | */ |
386 | 386 | public static function get_default_widget_areas() { |
387 | 387 | $default_areas = array( |
388 | - array( '1-1' => array( array( 'areaid' => 'top', 'title' => __('Top', 'gravityview' ) , 'subtitle' => '' ) ) ), |
|
389 | - array( '1-2' => array( array( 'areaid' => 'left', 'title' => __('Left', 'gravityview') , 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __('Right', 'gravityview') , 'subtitle' => '' ) ) ), |
|
388 | + array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ), 'subtitle' => '' ) ) ), |
|
389 | + array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ), 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ), 'subtitle' => '' ) ) ), |
|
390 | 390 | ); |
391 | 391 | |
392 | 392 | /** |
@@ -404,7 +404,7 @@ discard block |
||
404 | 404 | * @param mixed $data Additional data to display |
405 | 405 | * @return void |
406 | 406 | */ |
407 | - public static function log_debug( $message, $data = null ){ |
|
407 | + public static function log_debug( $message, $data = null ) { |
|
408 | 408 | /** |
409 | 409 | * @action `gravityview_log_debug` Log a debug message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output |
410 | 410 | * @param string $message Message to display |
@@ -418,7 +418,7 @@ discard block |
||
418 | 418 | * @param string $message log message |
419 | 419 | * @return void |
420 | 420 | */ |
421 | - public static function log_error( $message, $data = null ){ |
|
421 | + public static function log_error( $message, $data = null ) { |
|
422 | 422 | /** |
423 | 423 | * @action `gravityview_log_error` Log an error message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output |
424 | 424 | * @param string $message Error message to display |
@@ -429,4 +429,4 @@ discard block |
||
429 | 429 | |
430 | 430 | } // end class GravityView_Plugin |
431 | 431 | |
432 | -add_action('plugins_loaded', array('GravityView_Plugin', 'getInstance'), 1); |
|
432 | +add_action( 'plugins_loaded', array( 'GravityView_Plugin', 'getInstance' ), 1 ); |
@@ -42,16 +42,16 @@ discard block |
||
42 | 42 | |
43 | 43 | $args = wp_parse_args( $args, $defaults ); |
44 | 44 | |
45 | - $forms = gravityview_get_forms( (bool) $args['active'], (bool) $args['trash'] ); |
|
45 | + $forms = gravityview_get_forms( (bool)$args[ 'active' ], (bool)$args[ 'trash' ] ); |
|
46 | 46 | |
47 | - if( array() === $args['options'] ) { |
|
47 | + if ( array() === $args[ 'options' ] ) { |
|
48 | 48 | foreach ( $forms as $form ) { |
49 | 49 | |
50 | - if ( in_array( $form['id'], $args['exclude'] ) ) { |
|
50 | + if ( in_array( $form[ 'id' ], $args[ 'exclude' ] ) ) { |
|
51 | 51 | continue; |
52 | 52 | } |
53 | 53 | |
54 | - $args['options'][ $form['id'] ] = esc_html( $form['title'] ); |
|
54 | + $args[ 'options' ][ $form[ 'id' ] ] = esc_html( $form[ 'title' ] ); |
|
55 | 55 | } |
56 | 56 | } |
57 | 57 | |
@@ -83,15 +83,15 @@ discard block |
||
83 | 83 | |
84 | 84 | $args = wp_parse_args( $args, $defaults ); |
85 | 85 | |
86 | - if( empty( $args['form_id'] ) ) { |
|
86 | + if ( empty( $args[ 'form_id' ] ) ) { |
|
87 | 87 | return ''; |
88 | 88 | } |
89 | 89 | |
90 | - $fields = GVCommon::get_sortable_fields_array( $args['form_id'] ); |
|
90 | + $fields = GVCommon::get_sortable_fields_array( $args[ 'form_id' ] ); |
|
91 | 91 | |
92 | - if( array() === $args['options'] ) { |
|
92 | + if ( array() === $args[ 'options' ] ) { |
|
93 | 93 | foreach ( $fields as $field_id => $field ) { |
94 | - $args['options'][ $field_id ] = esc_html( $field['label'] ); |
|
94 | + $args[ 'options' ][ $field_id ] = esc_html( $field[ 'label' ] ); |
|
95 | 95 | } |
96 | 96 | } |
97 | 97 | |
@@ -127,43 +127,43 @@ discard block |
||
127 | 127 | $args = wp_parse_args( $args, $defaults ); |
128 | 128 | |
129 | 129 | $data_elements = ''; |
130 | - foreach ( $args['data'] as $key => $value ) { |
|
130 | + foreach ( $args[ 'data' ] as $key => $value ) { |
|
131 | 131 | $data_elements .= ' data-' . esc_attr( $key ) . '="' . esc_attr( $value ) . '"'; |
132 | 132 | } |
133 | 133 | |
134 | - if( $args['multiple'] ) { |
|
134 | + if ( $args[ 'multiple' ] ) { |
|
135 | 135 | $multiple = ' MULTIPLE'; |
136 | 136 | } else { |
137 | 137 | $multiple = ''; |
138 | 138 | } |
139 | 139 | |
140 | - if( $args['placeholder'] ) { |
|
141 | - $placeholder = $args['placeholder']; |
|
140 | + if ( $args[ 'placeholder' ] ) { |
|
141 | + $placeholder = $args[ 'placeholder' ]; |
|
142 | 142 | } else { |
143 | 143 | $placeholder = ''; |
144 | 144 | } |
145 | 145 | |
146 | - $disabled = $args['disabled'] ? ' disabled="disabled"' : ''; |
|
147 | - $class = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) ); |
|
148 | - $output = '<select name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( str_replace( '-', '_', $args['id'] ) ) . '" class="gravityview-select ' . $class . '"' . $multiple . $disabled . ' data-placeholder="' . $placeholder . '"'. $data_elements . '>'; |
|
146 | + $disabled = $args[ 'disabled' ] ? ' disabled="disabled"' : ''; |
|
147 | + $class = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args[ 'class' ] ) ) ); |
|
148 | + $output = '<select name="' . esc_attr( $args[ 'name' ] ) . '" id="' . esc_attr( str_replace( '-', '_', $args[ 'id' ] ) ) . '" class="gravityview-select ' . $class . '"' . $multiple . $disabled . ' data-placeholder="' . $placeholder . '"' . $data_elements . '>'; |
|
149 | 149 | |
150 | - if ( ! empty( $args['options'] ) ) { |
|
150 | + if ( ! empty( $args[ 'options' ] ) ) { |
|
151 | 151 | |
152 | - if ( $args['show_option_none'] ) { |
|
153 | - if( $args['multiple'] ) { |
|
154 | - $selected = selected( true, in_array( -1, $args['selected'] ), false ); |
|
152 | + if ( $args[ 'show_option_none' ] ) { |
|
153 | + if ( $args[ 'multiple' ] ) { |
|
154 | + $selected = selected( true, in_array( -1, $args[ 'selected' ] ), false ); |
|
155 | 155 | } else { |
156 | - $selected = selected( $args['selected'], -1, false ); |
|
156 | + $selected = selected( $args[ 'selected' ], -1, false ); |
|
157 | 157 | } |
158 | - $output .= '<option value="-1"' . $selected . '>' . esc_html( $args['show_option_none'] ) . '</option>'; |
|
158 | + $output .= '<option value="-1"' . $selected . '>' . esc_html( $args[ 'show_option_none' ] ) . '</option>'; |
|
159 | 159 | } |
160 | 160 | |
161 | - foreach( $args['options'] as $key => $option ) { |
|
161 | + foreach ( $args[ 'options' ] as $key => $option ) { |
|
162 | 162 | |
163 | - if( $args['multiple'] && is_array( $args['selected'] ) ) { |
|
164 | - $selected = selected( true, in_array( $key, $args['selected'], true ), false ); |
|
163 | + if ( $args[ 'multiple' ] && is_array( $args[ 'selected' ] ) ) { |
|
164 | + $selected = selected( true, in_array( $key, $args[ 'selected' ], true ), false ); |
|
165 | 165 | } else { |
166 | - $selected = selected( $args['selected'], $key, false ); |
|
166 | + $selected = selected( $args[ 'selected' ], $key, false ); |
|
167 | 167 | } |
168 | 168 | |
169 | 169 | $output .= '<option value="' . esc_attr( $key ) . '"' . $selected . '>' . esc_html( $option ) . '</option>'; |
@@ -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 | } |
@@ -72,9 +72,9 @@ discard block |
||
72 | 72 | */ |
73 | 73 | public function maybe_get_view_id( $passed_post ) { |
74 | 74 | $ids = array(); |
75 | - if( ! empty( $passed_post ) ) { |
|
75 | + if ( ! empty( $passed_post ) ) { |
|
76 | 76 | |
77 | - if( is_numeric( $passed_post ) ) { |
|
77 | + if ( is_numeric( $passed_post ) ) { |
|
78 | 78 | $passed_post = get_post( $passed_post ); |
79 | 79 | } |
80 | 80 | |
@@ -83,14 +83,14 @@ discard block |
||
83 | 83 | $passed_post = array( $passed_post ); |
84 | 84 | } |
85 | 85 | |
86 | - if( is_array( $passed_post ) ) { |
|
86 | + if ( is_array( $passed_post ) ) { |
|
87 | 87 | |
88 | - foreach ( $passed_post as &$post) { |
|
88 | + foreach ( $passed_post as &$post ) { |
|
89 | 89 | if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) && is_object( $post ) && property_exists( $post, 'ID' ) ) { |
90 | 90 | $post = get_post( $post ); // Convert into real WP_Post, thanks globals |
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 | } |
@@ -717,7 +717,7 @@ discard block |
||
717 | 717 | |
718 | 718 | $default_settings = array( |
719 | 719 | 'id' => array( |
720 | - 'label' => __('View ID', 'gravityview'), |
|
720 | + 'label' => __( 'View ID', 'gravityview' ), |
|
721 | 721 | 'type' => 'number', |
722 | 722 | 'group' => 'default', |
723 | 723 | 'value' => NULL, |
@@ -725,7 +725,7 @@ discard block |
||
725 | 725 | 'show_in_shortcode' => false, |
726 | 726 | ), |
727 | 727 | 'page_size' => array( |
728 | - 'label' => __('Number of entries per page', 'gravityview'), |
|
728 | + 'label' => __( 'Number of entries per page', 'gravityview' ), |
|
729 | 729 | 'type' => 'number', |
730 | 730 | 'class' => 'small-text', |
731 | 731 | 'group' => 'default', |
@@ -733,7 +733,7 @@ discard block |
||
733 | 733 | 'show_in_shortcode' => true, |
734 | 734 | ), |
735 | 735 | 'offset' => array( |
736 | - 'label' => __('Offset entries starting from', 'gravityview'), |
|
736 | + 'label' => __( 'Offset entries starting from', 'gravityview' ), |
|
737 | 737 | 'type' => 'number', |
738 | 738 | 'class' => 'small-text', |
739 | 739 | 'group' => 'default', |
@@ -757,8 +757,8 @@ discard block |
||
757 | 757 | ), |
758 | 758 | 'admin_show_all_statuses' => array( |
759 | 759 | 'label' => __( 'Show all entries to administrators', 'gravityview' ), |
760 | - 'desc' => __('Administrators will be able to see entries with any approval status.', 'gravityview'), |
|
761 | - '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'), |
|
760 | + 'desc' => __( 'Administrators will be able to see entries with any approval status.', 'gravityview' ), |
|
761 | + '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' ), |
|
762 | 762 | 'requires' => 'show_only_approved', |
763 | 763 | 'type' => 'checkbox', |
764 | 764 | 'group' => 'default', |
@@ -783,40 +783,40 @@ discard block |
||
783 | 783 | 'user_edit' => array( |
784 | 784 | 'label' => __( 'Allow User Edit', 'gravityview' ), |
785 | 785 | 'group' => 'default', |
786 | - 'desc' => __('Allow logged-in users to edit entries they created.', 'gravityview'), |
|
786 | + 'desc' => __( 'Allow logged-in users to edit entries they created.', 'gravityview' ), |
|
787 | 787 | 'value' => 0, |
788 | - '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'), |
|
788 | + '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' ), |
|
789 | 789 | 'type' => 'checkbox', |
790 | 790 | 'show_in_shortcode' => true, |
791 | 791 | ), |
792 | 792 | 'user_delete' => array( |
793 | 793 | 'label' => __( 'Allow User Delete', 'gravityview' ), |
794 | 794 | 'group' => 'default', |
795 | - 'desc' => __('Allow logged-in users to delete entries they created.', 'gravityview'), |
|
795 | + 'desc' => __( 'Allow logged-in users to delete entries they created.', 'gravityview' ), |
|
796 | 796 | 'value' => 0, |
797 | - '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'), |
|
797 | + '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' ), |
|
798 | 798 | 'type' => 'checkbox', |
799 | 799 | 'show_in_shortcode' => true, |
800 | 800 | ), |
801 | 801 | 'sort_field' => array( |
802 | - 'label' => __('Sort by field', 'gravityview'), |
|
802 | + 'label' => __( 'Sort by field', 'gravityview' ), |
|
803 | 803 | 'type' => 'select', |
804 | 804 | 'value' => '', |
805 | 805 | 'group' => 'sort', |
806 | 806 | 'options' => array( |
807 | - '' => __( 'Default', 'gravityview'), |
|
808 | - 'date_created' => __( 'Date Created', 'gravityview'), |
|
807 | + '' => __( 'Default', 'gravityview' ), |
|
808 | + 'date_created' => __( 'Date Created', 'gravityview' ), |
|
809 | 809 | ), |
810 | 810 | 'show_in_shortcode' => true, |
811 | 811 | ), |
812 | 812 | 'sort_direction' => array( |
813 | - 'label' => __('Sort direction', 'gravityview'), |
|
813 | + 'label' => __( 'Sort direction', 'gravityview' ), |
|
814 | 814 | 'type' => 'select', |
815 | 815 | 'value' => 'ASC', |
816 | 816 | 'group' => 'sort', |
817 | 817 | 'options' => array( |
818 | - 'ASC' => __('ASC', 'gravityview'), |
|
819 | - 'DESC' => __('DESC', 'gravityview'), |
|
818 | + 'ASC' => __( 'ASC', 'gravityview' ), |
|
819 | + 'DESC' => __( 'DESC', 'gravityview' ), |
|
820 | 820 | ), |
821 | 821 | 'show_in_shortcode' => true, |
822 | 822 | ), |
@@ -831,69 +831,69 @@ discard block |
||
831 | 831 | 'show_in_template' => array( 'default_table', 'preset_business_data', 'preset_issue_tracker', 'preset_resume_board', 'preset_job_board' ), |
832 | 832 | ), |
833 | 833 | 'start_date' => array( |
834 | - 'label' => __('Filter by Start Date', 'gravityview'), |
|
834 | + 'label' => __( 'Filter by Start Date', 'gravityview' ), |
|
835 | 835 | 'class' => 'gv-datepicker', |
836 | - 'desc' => __('Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ), |
|
836 | + 'desc' => __( 'Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ), |
|
837 | 837 | 'type' => 'text', |
838 | 838 | 'value' => '', |
839 | 839 | 'group' => 'filter', |
840 | 840 | 'show_in_shortcode' => true, |
841 | 841 | ), |
842 | 842 | 'end_date' => array( |
843 | - 'label' => __('Filter by End Date', 'gravityview'), |
|
843 | + 'label' => __( 'Filter by End Date', 'gravityview' ), |
|
844 | 844 | 'class' => 'gv-datepicker', |
845 | - 'desc' => __('Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ), |
|
845 | + 'desc' => __( 'Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ), |
|
846 | 846 | 'type' => 'text', |
847 | 847 | 'value' => '', |
848 | 848 | 'group' => 'filter', |
849 | 849 | 'show_in_shortcode' => true, |
850 | 850 | ), |
851 | 851 | 'class' => array( |
852 | - 'label' => __('CSS Class', 'gravityview'), |
|
853 | - 'desc' => __('CSS class to add to the wrapping HTML container.', 'gravityview'), |
|
852 | + 'label' => __( 'CSS Class', 'gravityview' ), |
|
853 | + 'desc' => __( 'CSS class to add to the wrapping HTML container.', 'gravityview' ), |
|
854 | 854 | 'group' => 'default', |
855 | 855 | 'type' => 'text', |
856 | 856 | 'value' => '', |
857 | 857 | 'show_in_shortcode' => false, |
858 | 858 | ), |
859 | 859 | 'search_value' => array( |
860 | - 'label' => __('Search Value', 'gravityview'), |
|
861 | - 'desc' => __('Define a default search value for the View', 'gravityview'), |
|
860 | + 'label' => __( 'Search Value', 'gravityview' ), |
|
861 | + 'desc' => __( 'Define a default search value for the View', 'gravityview' ), |
|
862 | 862 | 'type' => 'text', |
863 | 863 | 'value' => '', |
864 | 864 | 'group' => 'filter', |
865 | 865 | 'show_in_shortcode' => false, |
866 | 866 | ), |
867 | 867 | 'search_field' => array( |
868 | - 'label' => __('Search Field', 'gravityview'), |
|
869 | - 'desc' => __('If Search Value is set, you can define a specific field to search in. Otherwise, all fields will be searched.', 'gravityview'), |
|
868 | + 'label' => __( 'Search Field', 'gravityview' ), |
|
869 | + 'desc' => __( 'If Search Value is set, you can define a specific field to search in. Otherwise, all fields will be searched.', 'gravityview' ), |
|
870 | 870 | 'type' => 'number', |
871 | 871 | 'value' => '', |
872 | 872 | 'group' => 'filter', |
873 | 873 | 'show_in_shortcode' => false, |
874 | 874 | ), |
875 | 875 | 'single_title' => array( |
876 | - 'label' => __('Single Entry Title', 'gravityview'), |
|
876 | + 'label' => __( 'Single Entry Title', 'gravityview' ), |
|
877 | 877 | 'type' => 'text', |
878 | - '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'), |
|
878 | + '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' ), |
|
879 | 879 | 'group' => 'default', |
880 | 880 | 'value' => '', |
881 | 881 | 'show_in_shortcode' => false, |
882 | 882 | 'full_width' => true, |
883 | 883 | ), |
884 | 884 | 'back_link_label' => array( |
885 | - 'label' => __('Back Link Label', 'gravityview'), |
|
885 | + 'label' => __( 'Back Link Label', 'gravityview' ), |
|
886 | 886 | 'group' => 'default', |
887 | - 'desc' => __('The text of the link that returns to the multiple entries view.', 'gravityview'), |
|
887 | + 'desc' => __( 'The text of the link that returns to the multiple entries view.', 'gravityview' ), |
|
888 | 888 | 'type' => 'text', |
889 | 889 | 'value' => '', |
890 | 890 | 'show_in_shortcode' => false, |
891 | 891 | 'full_width' => true, |
892 | 892 | ), |
893 | 893 | 'embed_only' => array( |
894 | - 'label' => __('Prevent Direct Access', 'gravityview'), |
|
894 | + 'label' => __( 'Prevent Direct Access', 'gravityview' ), |
|
895 | 895 | 'group' => 'default', |
896 | - 'desc' => __('Only allow access to this View when embedded using the shortcode.', 'gravityview'), |
|
896 | + 'desc' => __( 'Only allow access to this View when embedded using the shortcode.', 'gravityview' ), |
|
897 | 897 | 'type' => 'checkbox', |
898 | 898 | 'value' => '', |
899 | 899 | 'tooltip' => false, |
@@ -908,7 +908,7 @@ discard block |
||
908 | 908 | ); |
909 | 909 | |
910 | 910 | if ( version_compare( \GFFormsModel::get_database_version(), '2.3', '>=' ) ) { |
911 | - $default_settings['sort_direction']['options']['RAND'] = __( 'Random', 'gravityview' ); |
|
911 | + $default_settings[ 'sort_direction' ][ 'options' ][ 'RAND' ] = __( 'Random', 'gravityview' ); |
|
912 | 912 | } |
913 | 913 | |
914 | 914 | /** |
@@ -920,12 +920,12 @@ discard block |
||
920 | 920 | $default_settings = apply_filters( 'gravityview_default_args', $default_settings ); |
921 | 921 | |
922 | 922 | // By default, we only want the key => value pairing, not the whole array. |
923 | - if( empty( $with_details ) ) { |
|
923 | + if ( empty( $with_details ) ) { |
|
924 | 924 | |
925 | 925 | $defaults = array(); |
926 | 926 | |
927 | - foreach( $default_settings as $key => $value ) { |
|
928 | - $defaults[ $key ] = $value['value']; |
|
927 | + foreach ( $default_settings as $key => $value ) { |
|
928 | + $defaults[ $key ] = $value[ 'value' ]; |
|
929 | 929 | } |
930 | 930 | |
931 | 931 | return $defaults; |
@@ -934,12 +934,12 @@ discard block |
||
934 | 934 | // But sometimes, we want all the details. |
935 | 935 | else { |
936 | 936 | |
937 | - foreach ($default_settings as $key => $value) { |
|
937 | + foreach ( $default_settings as $key => $value ) { |
|
938 | 938 | |
939 | 939 | // If the $group argument is set for the method, |
940 | 940 | // ignore any settings that aren't in that group. |
941 | - if( !empty( $group ) && is_string( $group ) ) { |
|
942 | - if( empty( $value['group'] ) || $value['group'] !== $group ) { |
|
941 | + if ( ! empty( $group ) && is_string( $group ) ) { |
|
942 | + if ( empty( $value[ 'group' ] ) || $value[ 'group' ] !== $group ) { |
|
943 | 943 | unset( $default_settings[ $key ] ); |
944 | 944 | } |
945 | 945 | } |