@@ -169,7 +169,6 @@ |
||
169 | 169 | * |
170 | 170 | * @since 1.15.2 |
171 | 171 | * |
172 | - * @param array $handles Array of meta keys to check for existence of shortcodes |
|
173 | 172 | * @param int $post_id The ID being checked by GravityView |
174 | 173 | * |
175 | 174 | * @return array Meta key array, merged with existing meta keys |
@@ -91,9 +91,9 @@ discard block |
||
91 | 91 | private function maybe_add_hooks() { |
92 | 92 | $class_exists = $this->class_name && class_exists( $this->class_name ); |
93 | 93 | $function_exists = $this->function_name && function_exists( $this->function_name ); |
94 | - $constant_defined = $this->constant_name && defined("{$this->constant_name}"); |
|
94 | + $constant_defined = $this->constant_name && defined( "{$this->constant_name}" ); |
|
95 | 95 | |
96 | - if( $class_exists || $function_exists || $constant_defined ) { |
|
96 | + if ( $class_exists || $function_exists || $constant_defined ) { |
|
97 | 97 | $this->add_hooks(); |
98 | 98 | } |
99 | 99 | } |
@@ -104,19 +104,19 @@ discard block |
||
104 | 104 | * @return void |
105 | 105 | */ |
106 | 106 | protected function add_hooks() { |
107 | - if( $this->content_meta_keys ) { |
|
107 | + if ( $this->content_meta_keys ) { |
|
108 | 108 | add_filter( 'gravityview/data/parse/meta_keys', array( $this, 'merge_content_meta_keys' ), 10, 2 ); |
109 | 109 | } |
110 | 110 | |
111 | - if( $this->script_handles ) { |
|
111 | + if ( $this->script_handles ) { |
|
112 | 112 | add_filter( 'gravityview_noconflict_scripts', array( $this, 'merge_noconflict_scripts' ) ); |
113 | 113 | } |
114 | 114 | |
115 | - if( $this->style_handles ) { |
|
115 | + if ( $this->style_handles ) { |
|
116 | 116 | add_filter( 'gravityview_noconflict_styles', array( $this, 'merge_noconflict_styles' ) ); |
117 | 117 | } |
118 | 118 | |
119 | - if( $this->post_type_support ) { |
|
119 | + if ( $this->post_type_support ) { |
|
120 | 120 | add_filter( 'gravityview_post_type_support', array( $this, 'merge_post_type_support' ), 10, 2 ); |
121 | 121 | } |
122 | 122 | } |
@@ -15,7 +15,7 @@ |
||
15 | 15 | return; |
16 | 16 | } |
17 | 17 | |
18 | - $class = !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat'; |
|
18 | + $class = !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat'; |
|
19 | 19 | |
20 | 20 | ?> |
21 | 21 | <input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="hidden" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>" /> |
@@ -10,12 +10,12 @@ |
||
10 | 10 | |
11 | 11 | function render_input( $override_input = null ) { |
12 | 12 | |
13 | - if( isset( $override_input ) ) { |
|
13 | + if ( isset( $override_input ) ) { |
|
14 | 14 | echo $override_input; |
15 | 15 | return; |
16 | 16 | } |
17 | 17 | |
18 | - $class = !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat'; |
|
18 | + $class = ! empty( $this->field[ 'class' ] ) ? $this->field[ 'class' ] : 'widefat'; |
|
19 | 19 | |
20 | 20 | ?> |
21 | 21 | <input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="hidden" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>" /> |
@@ -18,10 +18,10 @@ |
||
18 | 18 | |
19 | 19 | $show_mt = $this->show_merge_tags(); |
20 | 20 | |
21 | - if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) { |
|
22 | - $class = 'merge-tag-support mt-position-right mt-hide_all_fields '; |
|
23 | - } |
|
24 | - $class .= !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat'; |
|
21 | + if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) { |
|
22 | + $class = 'merge-tag-support mt-position-right mt-hide_all_fields '; |
|
23 | + } |
|
24 | + $class .= !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat'; |
|
25 | 25 | |
26 | 26 | ?> |
27 | 27 | <input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="number" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>"> |
@@ -3,13 +3,13 @@ discard block |
||
3 | 3 | * number input type |
4 | 4 | */ |
5 | 5 | |
6 | -if( !class_exists('GravityView_FieldType_text') ) { |
|
6 | +if ( ! class_exists( 'GravityView_FieldType_text' ) ) { |
|
7 | 7 | include_once( GRAVITYVIEW_DIR . 'includes/admin/field-types/type_text.php' ); |
8 | 8 | } |
9 | 9 | class GravityView_FieldType_number extends GravityView_FieldType_text { |
10 | 10 | |
11 | 11 | function render_input( $override_input = null ) { |
12 | - if( isset( $override_input ) ) { |
|
12 | + if ( isset( $override_input ) ) { |
|
13 | 13 | echo $override_input; |
14 | 14 | return; |
15 | 15 | } |
@@ -18,10 +18,10 @@ discard block |
||
18 | 18 | |
19 | 19 | $show_mt = $this->show_merge_tags(); |
20 | 20 | |
21 | - if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) { |
|
21 | + if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) { |
|
22 | 22 | $class = 'merge-tag-support mt-position-right mt-hide_all_fields '; |
23 | 23 | } |
24 | - $class .= !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat'; |
|
24 | + $class .= ! empty( $this->field[ 'class' ] ) ? $this->field[ 'class' ] : 'widefat'; |
|
25 | 25 | |
26 | 26 | ?> |
27 | 27 | <input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="number" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>"> |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | |
15 | 15 | if( !GravityView_Compatibility::is_valid() ) { return; } |
16 | 16 | |
17 | - self::$metaboxes_dir = GRAVITYVIEW_DIR . 'includes/admin/metaboxes/'; |
|
17 | + self::$metaboxes_dir = GRAVITYVIEW_DIR . 'includes/admin/metaboxes/'; |
|
18 | 18 | |
19 | 19 | include_once self::$metaboxes_dir . 'class-gravityview-metabox-tab.php'; |
20 | 20 | |
@@ -228,13 +228,13 @@ discard block |
||
228 | 228 | $get_id_backup = isset($_GET['id']) ? $_GET['id'] : NULL; |
229 | 229 | |
230 | 230 | if( isset( $form['id'] ) ) { |
231 | - $form_script = 'var form = ' . GFCommon::json_encode($form) . ';'; |
|
231 | + $form_script = 'var form = ' . GFCommon::json_encode($form) . ';'; |
|
232 | 232 | |
233 | - // The `gf_vars()` method needs a $_GET[id] variable set with the form ID. |
|
234 | - $_GET['id'] = $form['id']; |
|
233 | + // The `gf_vars()` method needs a $_GET[id] variable set with the form ID. |
|
234 | + $_GET['id'] = $form['id']; |
|
235 | 235 | |
236 | 236 | } else { |
237 | - $form_script = 'var form = new Form();'; |
|
237 | + $form_script = 'var form = new Form();'; |
|
238 | 238 | } |
239 | 239 | |
240 | 240 | $output = '<script type="text/javascript" data-gv-merge-tags="1">' . $form_script . "\n" . GFCommon::gf_vars(false) . '</script>'; |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | */ |
18 | 18 | function __construct() { |
19 | 19 | |
20 | - if( !GravityView_Compatibility::is_valid() ) { return; } |
|
20 | + if ( ! GravityView_Compatibility::is_valid() ) { return; } |
|
21 | 21 | |
22 | 22 | self::$metaboxes_dir = GRAVITYVIEW_DIR . 'includes/admin/metaboxes/'; |
23 | 23 | |
@@ -35,9 +35,9 @@ discard block |
||
35 | 35 | */ |
36 | 36 | function initialize() { |
37 | 37 | |
38 | - add_action( 'add_meta_boxes', array( $this, 'register_metaboxes' )); |
|
38 | + add_action( 'add_meta_boxes', array( $this, 'register_metaboxes' ) ); |
|
39 | 39 | |
40 | - add_action( 'add_meta_boxes_gravityview' , array( $this, 'update_priority' ) ); |
|
40 | + add_action( 'add_meta_boxes_gravityview', array( $this, 'update_priority' ) ); |
|
41 | 41 | |
42 | 42 | // information box |
43 | 43 | add_action( 'post_submitbox_misc_actions', array( $this, 'render_shortcode_hint' ) ); |
@@ -51,13 +51,13 @@ discard block |
||
51 | 51 | function update_priority() { |
52 | 52 | global $wp_meta_boxes; |
53 | 53 | |
54 | - if( ! empty( $wp_meta_boxes['gravityview'] ) ) { |
|
55 | - foreach( array( 'high', 'core', 'low' ) as $position ) { |
|
56 | - if( isset( $wp_meta_boxes['gravityview']['normal'][ $position ] ) ) { |
|
57 | - foreach( $wp_meta_boxes['gravityview']['normal'][ $position ] as $key => $meta_box ) { |
|
58 | - if( ! preg_match( '/^gravityview_/ism', $key ) ) { |
|
59 | - $wp_meta_boxes['gravityview']['advanced'][ $position ][ $key ] = $meta_box; |
|
60 | - unset( $wp_meta_boxes['gravityview']['normal'][ $position ][ $key ] ); |
|
54 | + if ( ! empty( $wp_meta_boxes[ 'gravityview' ] ) ) { |
|
55 | + foreach ( array( 'high', 'core', 'low' ) as $position ) { |
|
56 | + if ( isset( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ] ) ) { |
|
57 | + foreach ( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ] as $key => $meta_box ) { |
|
58 | + if ( ! preg_match( '/^gravityview_/ism', $key ) ) { |
|
59 | + $wp_meta_boxes[ 'gravityview' ][ 'advanced' ][ $position ][ $key ] = $meta_box; |
|
60 | + unset( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ][ $key ] ); |
|
61 | 61 | } |
62 | 62 | } |
63 | 63 | } |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | global $post; |
70 | 70 | |
71 | 71 | // On Comment Edit, for example, $post isn't set. |
72 | - if( empty( $post ) || !is_object( $post ) || !isset( $post->ID ) ) { |
|
72 | + if ( empty( $post ) || ! is_object( $post ) || ! isset( $post->ID ) ) { |
|
73 | 73 | return; |
74 | 74 | } |
75 | 75 | |
@@ -152,9 +152,9 @@ discard block |
||
152 | 152 | */ |
153 | 153 | $metaboxes = apply_filters( 'gravityview/metaboxes/default', $metaboxes ); |
154 | 154 | |
155 | - foreach( $metaboxes as $m ) { |
|
155 | + foreach ( $metaboxes as $m ) { |
|
156 | 156 | |
157 | - $tab = new GravityView_Metabox_Tab( $m['id'], $m['title'], $m['file'], $m['icon-class'], $m['callback'], $m['callback_args'] ); |
|
157 | + $tab = new GravityView_Metabox_Tab( $m[ 'id' ], $m[ 'title' ], $m[ 'file' ], $m[ 'icon-class' ], $m[ 'callback' ], $m[ 'callback_args' ] ); |
|
158 | 158 | |
159 | 159 | GravityView_Metabox_Tabs::add( $tab ); |
160 | 160 | |
@@ -180,8 +180,8 @@ discard block |
||
180 | 180 | |
181 | 181 | $links = GravityView_Admin_Views::get_connected_form_links( $current_form, false ); |
182 | 182 | |
183 | - if( !empty( $links ) ) { |
|
184 | - $links = '<span class="alignright gv-form-links">'. $links .'</span>'; |
|
183 | + if ( ! empty( $links ) ) { |
|
184 | + $links = '<span class="alignright gv-form-links">' . $links . '</span>'; |
|
185 | 185 | } |
186 | 186 | |
187 | 187 | return __( 'Data Source', 'gravityview' ) . $links; |
@@ -220,28 +220,28 @@ discard block |
||
220 | 220 | */ |
221 | 221 | public static function render_merge_tags_scripts( $curr_form ) { |
222 | 222 | |
223 | - if( empty( $curr_form )) { |
|
223 | + if ( empty( $curr_form ) ) { |
|
224 | 224 | return NULL; |
225 | 225 | } |
226 | 226 | |
227 | 227 | $form = gravityview_get_form( $curr_form ); |
228 | 228 | |
229 | - $get_id_backup = isset($_GET['id']) ? $_GET['id'] : NULL; |
|
229 | + $get_id_backup = isset( $_GET[ 'id' ] ) ? $_GET[ 'id' ] : NULL; |
|
230 | 230 | |
231 | - if( isset( $form['id'] ) ) { |
|
232 | - $form_script = 'var form = ' . GFCommon::json_encode($form) . ';'; |
|
231 | + if ( isset( $form[ 'id' ] ) ) { |
|
232 | + $form_script = 'var form = ' . GFCommon::json_encode( $form ) . ';'; |
|
233 | 233 | |
234 | 234 | // The `gf_vars()` method needs a $_GET[id] variable set with the form ID. |
235 | - $_GET['id'] = $form['id']; |
|
235 | + $_GET[ 'id' ] = $form[ 'id' ]; |
|
236 | 236 | |
237 | 237 | } else { |
238 | 238 | $form_script = 'var form = new Form();'; |
239 | 239 | } |
240 | 240 | |
241 | - $output = '<script type="text/javascript" data-gv-merge-tags="1">' . $form_script . "\n" . GFCommon::gf_vars(false) . '</script>'; |
|
241 | + $output = '<script type="text/javascript" data-gv-merge-tags="1">' . $form_script . "\n" . GFCommon::gf_vars( false ) . '</script>'; |
|
242 | 242 | |
243 | 243 | // Restore previous $_GET setting |
244 | - $_GET['id'] = $get_id_backup; |
|
244 | + $_GET[ 'id' ] = $get_id_backup; |
|
245 | 245 | |
246 | 246 | return $output; |
247 | 247 | } |
@@ -297,12 +297,12 @@ discard block |
||
297 | 297 | global $post; |
298 | 298 | |
299 | 299 | // Only show this on GravityView post types. |
300 | - if( false === gravityview_is_admin_page() ) { |
|
300 | + if ( false === gravityview_is_admin_page() ) { |
|
301 | 301 | return; |
302 | 302 | } |
303 | 303 | |
304 | 304 | // If the View hasn't been configured yet, don't show embed shortcode |
305 | - if( ! gravityview_get_directory_fields( $post->ID ) && ! gravityview_get_directory_widgets( $post->ID ) ) { |
|
305 | + if ( ! gravityview_get_directory_fields( $post->ID ) && ! gravityview_get_directory_widgets( $post->ID ) ) { |
|
306 | 306 | return; |
307 | 307 | } |
308 | 308 |
@@ -12,7 +12,9 @@ |
||
12 | 12 | */ |
13 | 13 | |
14 | 14 | // Exit if accessed directly |
15 | -if ( ! defined( 'ABSPATH' ) ) exit; |
|
15 | +if ( ! defined( 'ABSPATH' ) ) { |
|
16 | + exit; |
|
17 | +} |
|
16 | 18 | |
17 | 19 | /** |
18 | 20 | * GravityView_Welcome Class |
@@ -34,10 +34,10 @@ discard block |
||
34 | 34 | * @since 1.0 |
35 | 35 | */ |
36 | 36 | public function __construct() { |
37 | - add_action( 'admin_menu', array( $this, 'admin_menus'), 200 ); |
|
37 | + add_action( 'admin_menu', array( $this, 'admin_menus' ), 200 ); |
|
38 | 38 | add_action( 'admin_head', array( $this, 'admin_head' ) ); |
39 | - add_action( 'admin_init', array( $this, 'welcome' ) ); |
|
40 | - add_filter( 'gravityview_is_admin_page', array( $this, 'is_dashboard_page'), 10, 2 ); |
|
39 | + add_action( 'admin_init', array( $this, 'welcome' ) ); |
|
40 | + add_filter( 'gravityview_is_admin_page', array( $this, 'is_dashboard_page' ), 10, 2 ); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | /** |
@@ -53,8 +53,8 @@ discard block |
||
53 | 53 | // Add help page to GravityView menu |
54 | 54 | add_submenu_page( |
55 | 55 | 'edit.php?post_type=gravityview', |
56 | - __('GravityView: Getting Started', 'gravityview'), |
|
57 | - __('Getting Started', 'gravityview'), |
|
56 | + __( 'GravityView: Getting Started', 'gravityview' ), |
|
57 | + __( 'Getting Started', 'gravityview' ), |
|
58 | 58 | $this->minimum_capability, |
59 | 59 | 'gv-getting-started', |
60 | 60 | array( $this, 'getting_started_screen' ) |
@@ -87,10 +87,10 @@ discard block |
||
87 | 87 | * |
88 | 88 | * @return boolean $is_page True: yep; false: nope |
89 | 89 | */ |
90 | - public function is_dashboard_page($is_page = false, $hook = NULL) { |
|
90 | + public function is_dashboard_page( $is_page = false, $hook = NULL ) { |
|
91 | 91 | global $plugin_page; |
92 | 92 | |
93 | - if($is_page) { return $is_page; } |
|
93 | + if ( $is_page ) { return $is_page; } |
|
94 | 94 | |
95 | 95 | return in_array( $plugin_page, array( 'gv-about', 'gv-credits', 'gv-getting-started' ) ); |
96 | 96 | } |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-credits' ); |
109 | 109 | remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-changelog' ); |
110 | 110 | |
111 | - if( !$this->is_dashboard_page() ) { return; } |
|
111 | + if ( ! $this->is_dashboard_page() ) { return; } |
|
112 | 112 | |
113 | 113 | ?> |
114 | 114 | <style type="text/css" media="screen" xmlns="http://www.w3.org/1999/html"> |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | // Don't fetch -beta, etc. |
133 | 133 | list( $display_version ) = explode( '-', GravityView_Plugin::version ); |
134 | 134 | |
135 | - $selected = !empty( $plugin_page ) ? $plugin_page : 'gv-getting-started'; |
|
135 | + $selected = ! empty( $plugin_page ) ? $plugin_page : 'gv-getting-started'; |
|
136 | 136 | |
137 | 137 | echo gravityview_get_floaty( 132 ); |
138 | 138 | ?> |
@@ -141,13 +141,13 @@ discard block |
||
141 | 141 | <div class="about-text"><?php esc_html_e( 'Thank you for installing GravityView. Beautifully display your Gravity Forms entries.', 'gravityview' ); ?></div> |
142 | 142 | |
143 | 143 | <h2 class="nav-tab-wrapper clear"> |
144 | - <a class="nav-tab <?php echo $selected == 'gv-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-getting-started', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>"> |
|
144 | + <a class="nav-tab <?php echo $selected == 'gv-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-getting-started', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>"> |
|
145 | 145 | <?php _e( "Getting Started", 'gravityview' ); ?> |
146 | 146 | </a> |
147 | - <a class="nav-tab <?php echo $selected == 'gv-changelog' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-changelog', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>"> |
|
147 | + <a class="nav-tab <?php echo $selected == 'gv-changelog' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-changelog', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>"> |
|
148 | 148 | <?php _e( "List of Changes", 'gravityview' ); ?> |
149 | 149 | </a> |
150 | - <a class="nav-tab <?php echo $selected == 'gv-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-credits', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>"> |
|
150 | + <a class="nav-tab <?php echo $selected == 'gv-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-credits', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>"> |
|
151 | 151 | <?php _e( 'Credits', 'gravityview' ); ?> |
152 | 152 | </a> |
153 | 153 | </h2> |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | <h3>Create a View</h3> |
183 | 183 | |
184 | 184 | <ol class="ol-decimal"> |
185 | - <li>Go to <a href="<?php echo admin_url('post-new.php?post_type=gravityview'); ?>">Views > New View</a></li> |
|
185 | + <li>Go to <a href="<?php echo admin_url( 'post-new.php?post_type=gravityview' ); ?>">Views > New View</a></li> |
|
186 | 186 | <li>If you want to <strong>create a new form</strong>, click the "Use a Form Preset" button</li> |
187 | 187 | <li>If you want to <strong>use an existing form’s entries</strong>, select from the dropdown.</li> |
188 | 188 | <li>Select the type of View you would like to create. There are two core types of Views: <strong>Table</strong> and <strong>Listing</strong>. |
@@ -464,7 +464,7 @@ discard block |
||
464 | 464 | </ul> |
465 | 465 | |
466 | 466 | <h4><?php esc_attr_e( 'Want to contribute?', 'gravityview' ); ?></h4> |
467 | - <p><?php echo sprintf( esc_attr__( 'If you want to contribute to the code, %syou can on Github%s. If your contributions are accepted, you will be thanked here.', 'gravityview'), '<a href="https://github.com/katzwebservices/GravityView">', '</a>' ); ?></p> |
|
467 | + <p><?php echo sprintf( esc_attr__( 'If you want to contribute to the code, %syou can on Github%s. If your contributions are accepted, you will be thanked here.', 'gravityview' ), '<a href="https://github.com/katzwebservices/GravityView">', '</a>' ); ?></p> |
|
468 | 468 | </div> |
469 | 469 | </div> |
470 | 470 | |
@@ -507,7 +507,7 @@ discard block |
||
507 | 507 | global $plugin_page; |
508 | 508 | |
509 | 509 | // Bail if we're just editing the plugin |
510 | - if( $plugin_page === 'plugin-editor.php' ) { return; } |
|
510 | + if ( $plugin_page === 'plugin-editor.php' ) { return; } |
|
511 | 511 | |
512 | 512 | // Bail if no activation redirect |
513 | 513 | if ( ! get_transient( '_gv_activation_redirect' ) ) { return; } |
@@ -518,7 +518,7 @@ discard block |
||
518 | 518 | $upgrade = get_option( 'gv_version_upgraded_from' ); |
519 | 519 | |
520 | 520 | // Don't do anything if they've already seen the new version info |
521 | - if( $upgrade === GravityView_Plugin::version ) { |
|
521 | + if ( $upgrade === GravityView_Plugin::version ) { |
|
522 | 522 | return; |
523 | 523 | } |
524 | 524 | |
@@ -526,10 +526,10 @@ discard block |
||
526 | 526 | update_option( 'gv_version_upgraded_from', GravityView_Plugin::version ); |
527 | 527 | |
528 | 528 | // Bail if activating from network, or bulk |
529 | - if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) { return; } |
|
529 | + if ( is_network_admin() || isset( $_GET[ 'activate-multi' ] ) ) { return; } |
|
530 | 530 | |
531 | 531 | // First time install |
532 | - if( ! $upgrade ) { |
|
532 | + if ( ! $upgrade ) { |
|
533 | 533 | wp_safe_redirect( admin_url( 'edit.php?post_type=gravityview&page=gv-getting-started' ) ); exit; |
534 | 534 | } |
535 | 535 | // Update |
@@ -23,7 +23,7 @@ |
||
23 | 23 | var $style = NULL; |
24 | 24 | |
25 | 25 | /** |
26 | - * String representing size of image - Choose from "full", "medium", "thumb", "tiny" |
|
26 | + * String representing size of image - Choose from "full", "medium", "thumb", "tiny" |
|
27 | 27 | * @var string |
28 | 28 | */ |
29 | 29 | var $size = NULL; |
@@ -65,11 +65,11 @@ discard block |
||
65 | 65 | |
66 | 66 | $atts = wp_parse_args( $atts, $defaults ); |
67 | 67 | |
68 | - foreach( $atts as $key => $val ) { |
|
68 | + foreach ( $atts as $key => $val ) { |
|
69 | 69 | $this->{$key} = $val; |
70 | 70 | } |
71 | 71 | |
72 | - $this->class = !empty( $this->class ) ? esc_attr( implode( ' ', (array)$this->class ) ) : $this->class; |
|
72 | + $this->class = ! empty( $this->class ) ? esc_attr( implode( ' ', (array)$this->class ) ) : $this->class; |
|
73 | 73 | |
74 | 74 | $this->set_image_size(); |
75 | 75 | |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | */ |
86 | 86 | function validate_image_src() { |
87 | 87 | |
88 | - if ( !$this->validate_src ) { return true; } |
|
88 | + if ( ! $this->validate_src ) { return true; } |
|
89 | 89 | |
90 | 90 | $info = pathinfo( $this->src ); |
91 | 91 | |
@@ -93,9 +93,9 @@ discard block |
||
93 | 93 | * @filter `gravityview_image_extensions` Extensions that GravityView recognizes as valid images to be shown in an `img` tag |
94 | 94 | * @param array $image_exts Default: `['jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico']` |
95 | 95 | */ |
96 | - $image_exts = apply_filters( 'gravityview_image_extensions', array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico' )); |
|
96 | + $image_exts = apply_filters( 'gravityview_image_extensions', array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico' ) ); |
|
97 | 97 | |
98 | - return isset( $info['extension'] ) && in_array( strtolower( $info['extension'] ), $image_exts); |
|
98 | + return isset( $info[ 'extension' ] ) && in_array( strtolower( $info[ 'extension' ] ), $image_exts ); |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | /** |
@@ -111,16 +111,16 @@ discard block |
||
111 | 111 | |
112 | 112 | // And there is no string size passed |
113 | 113 | // And we want to get the image size using PHP |
114 | - if ( empty( $string ) && !empty( $this->getimagesize ) ) { |
|
114 | + if ( empty( $string ) && ! empty( $this->getimagesize ) ) { |
|
115 | 115 | |
116 | 116 | $image_size = @getimagesize( $this->src ); |
117 | 117 | |
118 | 118 | // If it didn't return a response, it may be a HTTPS/SSL error |
119 | - if ( empty( $image_size[0] ) ) { |
|
119 | + if ( empty( $image_size[ 0 ] ) ) { |
|
120 | 120 | $image_size = @getimagesize( set_url_scheme( $this->src, 'http' ) ); |
121 | 121 | } |
122 | 122 | |
123 | - if ( !empty( $image_size ) ) { |
|
123 | + if ( ! empty( $image_size ) ) { |
|
124 | 124 | list( $width, $height ) = $image_size; |
125 | 125 | } |
126 | 126 | |
@@ -133,33 +133,33 @@ discard block |
||
133 | 133 | * @param array $image_sizes Array of image sizes with the key being the size slug, and the value being an array with `width` and `height` defined, in pixels |
134 | 134 | */ |
135 | 135 | $image_sizes = apply_filters( 'gravityview_image_sizes', array( |
136 | - 'tiny' => array('width' => 40, 'height' => 30), |
|
137 | - 'small' => array('width' => 100, 'height' => 75), |
|
138 | - 'medium' => array('width' => 250, 'height' => 188), |
|
139 | - 'large' => array('width' => 448, 'height' => 336), |
|
136 | + 'tiny' => array( 'width' => 40, 'height' => 30 ), |
|
137 | + 'small' => array( 'width' => 100, 'height' => 75 ), |
|
138 | + 'medium' => array( 'width' => 250, 'height' => 188 ), |
|
139 | + 'large' => array( 'width' => 448, 'height' => 336 ), |
|
140 | 140 | ) ); |
141 | 141 | |
142 | - switch( $this->size ) { |
|
142 | + switch ( $this->size ) { |
|
143 | 143 | case 'tiny': |
144 | - extract($image_sizes['tiny']); |
|
144 | + extract( $image_sizes[ 'tiny' ] ); |
|
145 | 145 | break; |
146 | 146 | case 'small': |
147 | 147 | case 's': |
148 | 148 | case 'thumb': |
149 | - extract($image_sizes['small']); |
|
149 | + extract( $image_sizes[ 'small' ] ); |
|
150 | 150 | break; |
151 | 151 | case 'm': |
152 | 152 | case 'medium': |
153 | - extract($image_sizes['medium']); |
|
153 | + extract( $image_sizes[ 'medium' ] ); |
|
154 | 154 | break; |
155 | 155 | case 'large': |
156 | 156 | case 'l': |
157 | - extract($image_sizes['large']); |
|
157 | + extract( $image_sizes[ 'large' ] ); |
|
158 | 158 | break; |
159 | 159 | default: |
160 | 160 | // Verify that the passed sizes are integers. |
161 | - $width = !empty( $width ) ? intval( $width ) : intval( $this->width ); |
|
162 | - $height = !empty( $height ) ? intval( $height ) : intval( $this->height ); |
|
161 | + $width = ! empty( $width ) ? intval( $width ) : intval( $this->width ); |
|
162 | + $height = ! empty( $height ) ? intval( $height ) : intval( $this->height ); |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | } |
@@ -180,8 +180,8 @@ |
||
180 | 180 | |
181 | 181 | // check widget settings: |
182 | 182 | // [search_free] => 1 |
183 | - // [search_date] => 1 |
|
184 | - $search_generic = array(); |
|
183 | + // [search_date] => 1 |
|
184 | + $search_generic = array(); |
|
185 | 185 | if( !empty( $widget['search_free'] ) ) { |
186 | 186 | $search_generic[] = array( 'field' => 'search_all', 'input' => 'input_text' ); |
187 | 187 | } |
@@ -66,7 +66,7 @@ |
||
66 | 66 | $table_name = GFFormsModel::get_lead_meta_table_name(); |
67 | 67 | } |
68 | 68 | |
69 | - $sql = "UPDATE {$table_name} SET `meta_value` = %s WHERE `meta_key` = 'is_approved' AND `meta_value` = %s"; |
|
69 | + $sql = "update {$table_name} SET `meta_value` = %s WHERE `meta_key` = 'is_approved' AND `meta_value` = %s"; |
|
70 | 70 | |
71 | 71 | $approved_result = $wpdb->query( $wpdb->prepare( $sql, GravityView_Entry_Approval_Status::APPROVED, 'Approved' ) ); |
72 | 72 |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | |
73 | 73 | $disapproved_result = $wpdb->query( $wpdb->prepare( $sql, GravityView_Entry_Approval_Status::DISAPPROVED, '0' ) ); |
74 | 74 | |
75 | - if( false === $approved_result || false === $disapproved_result ) { |
|
75 | + if ( false === $approved_result || false === $disapproved_result ) { |
|
76 | 76 | gravityview()->log->error( 'There was an error processing the query. {error}', array( 'error' => $wpdb->last_error ) ); |
77 | 77 | } else { |
78 | 78 | // All done: Meta values are migrated |
@@ -105,11 +105,11 @@ discard block |
||
105 | 105 | $redux_settings = $this->get_redux_settings(); |
106 | 106 | |
107 | 107 | // No need to process |
108 | - if( false === $redux_settings ) { |
|
108 | + if ( false === $redux_settings ) { |
|
109 | 109 | return; |
110 | 110 | } |
111 | 111 | |
112 | - if( empty( $redux_settings['license_key_status'] ) ) { |
|
112 | + if ( empty( $redux_settings[ 'license_key_status' ] ) ) { |
|
113 | 113 | $redux_settings = $this->get_redux_license_status( $redux_settings ); |
114 | 114 | } |
115 | 115 | |
@@ -123,8 +123,8 @@ discard block |
||
123 | 123 | gravityview()->settings->update( $updated_settings ); |
124 | 124 | |
125 | 125 | // And now remove the previous option, so this is a one-time thing. |
126 | - delete_option('gravityview_settings'); |
|
127 | - delete_option('gravityview_settings-transients'); |
|
126 | + delete_option( 'gravityview_settings' ); |
|
127 | + delete_option( 'gravityview_settings-transients' ); |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | /** |
@@ -147,9 +147,9 @@ discard block |
||
147 | 147 | |
148 | 148 | $license_call = \GV\License_Handler::get()->license_call( $data ); |
149 | 149 | |
150 | - if( is_object( $license_call ) && isset( $license_call->license ) ) { |
|
151 | - $redux_settings['license_key_status'] = $license_call->license; |
|
152 | - $redux_settings['license_key_response'] = json_encode( $license_call ); |
|
150 | + if ( is_object( $license_call ) && isset( $license_call->license ) ) { |
|
151 | + $redux_settings[ 'license_key_status' ] = $license_call->license; |
|
152 | + $redux_settings[ 'license_key_response' ] = json_encode( $license_call ); |
|
153 | 153 | } |
154 | 154 | |
155 | 155 | return $redux_settings; |
@@ -163,10 +163,10 @@ discard block |
||
163 | 163 | function get_redux_settings() { |
164 | 164 | |
165 | 165 | // Previous settings set by Redux |
166 | - $redux_option = get_option('gravityview_settings'); |
|
166 | + $redux_option = get_option( 'gravityview_settings' ); |
|
167 | 167 | |
168 | 168 | // No Redux settings? Don't proceed. |
169 | - if( false === $redux_option ) { |
|
169 | + if ( false === $redux_option ) { |
|
170 | 170 | return false; |
171 | 171 | } |
172 | 172 | |
@@ -178,19 +178,19 @@ discard block |
||
178 | 178 | |
179 | 179 | if ( $license_array = \GV\Utils::get( $redux_option, 'license' ) ) { |
180 | 180 | |
181 | - $redux_settings['license_key'] = $license_key = \GV\Utils::get( $license_array, 'license' ); |
|
181 | + $redux_settings[ 'license_key' ] = $license_key = \GV\Utils::get( $license_array, 'license' ); |
|
182 | 182 | |
183 | - $redux_last_changed_values = get_option('gravityview_settings-transients'); |
|
183 | + $redux_last_changed_values = get_option( 'gravityview_settings-transients' ); |
|
184 | 184 | |
185 | 185 | // This contains the last response for license validation |
186 | - if( !empty( $redux_last_changed_values ) && $saved_values = \GV\Utils::get( $redux_last_changed_values, 'changed_values' ) ) { |
|
186 | + if ( ! empty( $redux_last_changed_values ) && $saved_values = \GV\Utils::get( $redux_last_changed_values, 'changed_values' ) ) { |
|
187 | 187 | |
188 | 188 | $saved_license = \GV\Utils::get( $saved_values, 'license' ); |
189 | 189 | |
190 | 190 | // Only use the last-saved values if they are for the same license |
191 | - if( $saved_license && \GV\Utils::get( $saved_license, 'license' ) === $license_key ) { |
|
192 | - $redux_settings['license_key_status'] = \GV\Utils::get( $saved_license, 'status' ); |
|
193 | - $redux_settings['license_key_response'] = \GV\Utils::get( $saved_license, 'response' ); |
|
191 | + if ( $saved_license && \GV\Utils::get( $saved_license, 'license' ) === $license_key ) { |
|
192 | + $redux_settings[ 'license_key_status' ] = \GV\Utils::get( $saved_license, 'status' ); |
|
193 | + $redux_settings[ 'license_key_response' ] = \GV\Utils::get( $saved_license, 'response' ); |
|
194 | 194 | } |
195 | 195 | } |
196 | 196 | } |
@@ -202,8 +202,8 @@ discard block |
||
202 | 202 | /** ---- Migrate from old search widget to new search widget ---- */ |
203 | 203 | function update_search_on_views() { |
204 | 204 | |
205 | - if( !class_exists('GravityView_Widget_Search') ) { |
|
206 | - include_once( GRAVITYVIEW_DIR .'includes/extensions/search-widget/class-search-widget.php' ); |
|
205 | + if ( ! class_exists( 'GravityView_Widget_Search' ) ) { |
|
206 | + include_once( GRAVITYVIEW_DIR . 'includes/extensions/search-widget/class-search-widget.php' ); |
|
207 | 207 | } |
208 | 208 | |
209 | 209 | // Loop through all the views |
@@ -215,20 +215,20 @@ discard block |
||
215 | 215 | |
216 | 216 | $views = get_posts( $query_args ); |
217 | 217 | |
218 | - foreach( $views as $view ) { |
|
218 | + foreach ( $views as $view ) { |
|
219 | 219 | |
220 | 220 | $widgets = gravityview_get_directory_widgets( $view->ID ); |
221 | 221 | $search_fields = null; |
222 | 222 | |
223 | - if( empty( $widgets ) || !is_array( $widgets ) ) { continue; } |
|
223 | + if ( empty( $widgets ) || ! is_array( $widgets ) ) { continue; } |
|
224 | 224 | |
225 | 225 | gravityview()->log->debug( '[GravityView_Migrate/update_search_on_views] Loading View ID: {view_id}', array( 'view_id' => $view->ID ) ); |
226 | 226 | |
227 | - foreach( $widgets as $area => $ws ) { |
|
228 | - foreach( $ws as $k => $widget ) { |
|
229 | - if( $widget['id'] !== 'search_bar' ) { continue; } |
|
227 | + foreach ( $widgets as $area => $ws ) { |
|
228 | + foreach ( $ws as $k => $widget ) { |
|
229 | + if ( $widget[ 'id' ] !== 'search_bar' ) { continue; } |
|
230 | 230 | |
231 | - if( is_null( $search_fields ) ) { |
|
231 | + if ( is_null( $search_fields ) ) { |
|
232 | 232 | $search_fields = $this->get_search_fields( $view->ID ); |
233 | 233 | } |
234 | 234 | |
@@ -236,24 +236,24 @@ discard block |
||
236 | 236 | // [search_free] => 1 |
237 | 237 | // [search_date] => 1 |
238 | 238 | $search_generic = array(); |
239 | - if( !empty( $widget['search_free'] ) ) { |
|
240 | - $search_generic[] = array( 'field' => 'search_all', 'input' => 'input_text' ); |
|
239 | + if ( ! empty( $widget[ 'search_free' ] ) ) { |
|
240 | + $search_generic[ ] = array( 'field' => 'search_all', 'input' => 'input_text' ); |
|
241 | 241 | } |
242 | - if( !empty( $widget['search_date'] ) ) { |
|
243 | - $search_generic[] = array( 'field' => 'entry_date', 'input' => 'date' ); |
|
242 | + if ( ! empty( $widget[ 'search_date' ] ) ) { |
|
243 | + $search_generic[ ] = array( 'field' => 'entry_date', 'input' => 'date' ); |
|
244 | 244 | } |
245 | 245 | |
246 | 246 | $search_config = array_merge( $search_generic, $search_fields ); |
247 | 247 | |
248 | 248 | // don't throw '[]' when json_encode an empty array |
249 | - if( empty( $search_config ) ) { |
|
249 | + if ( empty( $search_config ) ) { |
|
250 | 250 | $search_config = ''; |
251 | 251 | } else { |
252 | 252 | $search_config = json_encode( $search_config ); |
253 | 253 | } |
254 | 254 | |
255 | - $widgets[ $area ][ $k ]['search_fields'] = $search_config; |
|
256 | - $widgets[ $area ][ $k ]['search_layout'] = 'horizontal'; |
|
255 | + $widgets[ $area ][ $k ][ 'search_fields' ] = $search_config; |
|
256 | + $widgets[ $area ][ $k ][ 'search_layout' ] = 'horizontal'; |
|
257 | 257 | |
258 | 258 | gravityview()->log->debug( '[GravityView_Migrate/update_search_on_views] Updated Widget: ', array( 'data' => $widgets[ $area ][ $k ] ) ); |
259 | 259 | } |
@@ -281,26 +281,26 @@ discard block |
||
281 | 281 | // check view fields' settings |
282 | 282 | $fields = gravityview_get_directory_fields( $view_id, false ); |
283 | 283 | |
284 | - if( !empty( $fields ) && is_array( $fields ) ) { |
|
284 | + if ( ! empty( $fields ) && is_array( $fields ) ) { |
|
285 | 285 | |
286 | - foreach( $fields as $t => $fs ) { |
|
286 | + foreach ( $fields as $t => $fs ) { |
|
287 | 287 | |
288 | - foreach( $fs as $k => $field ) { |
|
288 | + foreach ( $fs as $k => $field ) { |
|
289 | 289 | // is field a search_filter ? |
290 | - if( empty( $field['search_filter'] ) ) { continue; } |
|
290 | + if ( empty( $field[ 'search_filter' ] ) ) { continue; } |
|
291 | 291 | |
292 | 292 | // get field type & calculate the input type (by default) |
293 | - $form_field = gravityview_get_field( $form, $field['id'] ); |
|
293 | + $form_field = gravityview_get_field( $form, $field[ 'id' ] ); |
|
294 | 294 | |
295 | - if( empty( $form_field['type'] ) ) { |
|
295 | + if ( empty( $form_field[ 'type' ] ) ) { |
|
296 | 296 | continue; |
297 | 297 | } |
298 | 298 | |
299 | 299 | // depending on the field type assign a group of possible search field types |
300 | - $type = GravityView_Widget_Search::get_search_input_types( $field['id'], $form_field['type'] ); |
|
300 | + $type = GravityView_Widget_Search::get_search_input_types( $field[ 'id' ], $form_field[ 'type' ] ); |
|
301 | 301 | |
302 | 302 | // add field to config |
303 | - $search_fields[] = array( 'field' => $field['id'], 'input' => $type ); |
|
303 | + $search_fields[ ] = array( 'field' => $field[ 'id' ], 'input' => $type ); |
|
304 | 304 | |
305 | 305 | } |
306 | 306 | } |
@@ -7,15 +7,15 @@ |
||
7 | 7 | <div id="publishing-action"> |
8 | 8 | <?php |
9 | 9 | |
10 | - /** |
|
11 | - * @filter `gravityview/edit_entry/cancel_link` Modify the cancel button link URL |
|
12 | - * @since 1.11.1 |
|
13 | - * @param string $back_link Existing URL of the Cancel link |
|
14 | - * @param array $form The Gravity Forms form |
|
15 | - * @param array $entry The Gravity Forms entry |
|
16 | - * @param int $view_id The current View ID |
|
17 | - */ |
|
18 | - $back_link = apply_filters( 'gravityview/edit_entry/cancel_link', remove_query_arg( array( 'page', 'view', 'edit' ) ), $object->form, $object->entry, $object->view_id ); |
|
10 | + /** |
|
11 | + * @filter `gravityview/edit_entry/cancel_link` Modify the cancel button link URL |
|
12 | + * @since 1.11.1 |
|
13 | + * @param string $back_link Existing URL of the Cancel link |
|
14 | + * @param array $form The Gravity Forms form |
|
15 | + * @param array $entry The Gravity Forms entry |
|
16 | + * @param int $view_id The current View ID |
|
17 | + */ |
|
18 | + $back_link = apply_filters( 'gravityview/edit_entry/cancel_link', remove_query_arg( array( 'page', 'view', 'edit' ) ), $object->form, $object->entry, $object->view_id ); |
|
19 | 19 | |
20 | 20 | /** |
21 | 21 | * @action `gravityview/edit-entry/publishing-action/before` Triggered before the submit buttons in the Edit Entry screen, inside the `<div id="publishing-action">` container. |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | |
30 | 30 | $labels = array( |
31 | 31 | 'cancel' => __( 'Cancel', 'gravityview' ), |
32 | - 'submit' => __( 'Update', 'gravityview') |
|
32 | + 'submit' => __( 'Update', 'gravityview' ) |
|
33 | 33 | ); |
34 | 34 | |
35 | 35 | /** |
@@ -45,9 +45,9 @@ discard block |
||
45 | 45 | $update_tabindex = GFCommon::get_tabindex(); |
46 | 46 | $cancel_tabindex = GFCommon::get_tabindex(); |
47 | 47 | ?> |
48 | - <input id="gform_submit_button_<?php echo esc_attr( $object->form['id'] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-update" type="submit" <?php echo $update_tabindex; ?> value="<?php echo esc_attr( $labels['submit'] ); ?>" name="save" /> |
|
48 | + <input id="gform_submit_button_<?php echo esc_attr( $object->form[ 'id' ] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-update" type="submit" <?php echo $update_tabindex; ?> value="<?php echo esc_attr( $labels[ 'submit' ] ); ?>" name="save" /> |
|
49 | 49 | |
50 | - <a class="btn btn-sm button button-small gv-button-cancel" <?php echo $cancel_tabindex; ?> href="<?php echo esc_url( $back_link ); ?>"><?php echo esc_attr( $labels['cancel'] ); ?></a> |
|
50 | + <a class="btn btn-sm button button-small gv-button-cancel" <?php echo $cancel_tabindex; ?> href="<?php echo esc_url( $back_link ); ?>"><?php echo esc_attr( $labels[ 'cancel' ] ); ?></a> |
|
51 | 51 | <?php |
52 | 52 | |
53 | 53 | /** |
@@ -61,5 +61,5 @@ discard block |
||
61 | 61 | |
62 | 62 | ?> |
63 | 63 | <input type="hidden" name="action" value="update" /> |
64 | - <input type="hidden" name="lid" value="<?php echo esc_attr( $object->entry['id'] ); ?>" /> |
|
64 | + <input type="hidden" name="lid" value="<?php echo esc_attr( $object->entry[ 'id' ] ); ?>" /> |
|
65 | 65 | </div> |
@@ -307,7 +307,7 @@ |
||
307 | 307 | ! isset( $value ) // If it's not set, it's empty! |
308 | 308 | || false === $value |
309 | 309 | || null === $value |
310 | - || '' === $value // Empty string |
|
310 | + || '' === $value // Empty string |
|
311 | 311 | || array() === $value // Empty array |
312 | 312 | || ( is_object( $value ) && ! get_object_vars( $value ) ) // Empty object |
313 | 313 | ) { |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | * |
29 | 29 | * We could do this in a cleaner fashion, but this prevents a lot of code duplication, checking for URL structure, etc. |
30 | 30 | * |
31 | - * @param int|WP_Post $id Optional. Post ID or post object. Default current post. |
|
31 | + * @param integer $id Optional. Post ID or post object. Default current post. |
|
32 | 32 | * |
33 | 33 | * @return array URL args, if exists. Empty array if not. |
34 | 34 | */ |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | * @since 1.15 Added $object param |
136 | 136 | * |
137 | 137 | * @param string $file_path Full path to a file |
138 | - * @param mixed $object Pass pseudo-global to the included file |
|
138 | + * @param GravityView_Edit_Entry_Render $object Pass pseudo-global to the included file |
|
139 | 139 | * @return string Included file contents |
140 | 140 | */ |
141 | 141 | function gravityview_ob_include( $file_path, $object = NULL ) { |
@@ -310,7 +310,6 @@ discard block |
||
310 | 310 | * Do a _very_ basic match for second-level TLD domains, like `.co.uk` |
311 | 311 | * |
312 | 312 | * Ideally, we'd use https://github.com/jeremykendall/php-domain-parser to check for this, but it's too much work for such a basic functionality. Maybe if it's needed more in the future. So instead, we use [Basic matching regex](http://stackoverflow.com/a/12372310). |
313 | - * @param string $domain Domain to check if it's a TLD or subdomain |
|
314 | 313 | * @return string Extracted domain if it has a subdomain |
315 | 314 | */ |
316 | 315 | function _gravityview_strip_subdomain( $string_maybe_has_subdomain ) { |
@@ -32,19 +32,19 @@ discard block |
||
32 | 32 | // If there's an overriding CSS file in the current template folder, use it. |
33 | 33 | $template_css_path = trailingslashit( get_stylesheet_directory() ) . 'gravityview/css/' . $css_file; |
34 | 34 | |
35 | - if( file_exists( $template_css_path ) ) { |
|
35 | + if ( file_exists( $template_css_path ) ) { |
|
36 | 36 | $path = trailingslashit( get_stylesheet_directory_uri() ) . 'gravityview/css/' . $css_file; |
37 | 37 | gravityview()->log->debug( 'Stylesheet override ({css_file})', array( 'css_file' => esc_attr( $css_file ) ) ); |
38 | 38 | } else { |
39 | 39 | // Default: use GravityView CSS file |
40 | 40 | |
41 | 41 | // If no path is provided, assume default plugin templates CSS folder |
42 | - if( '' === $dir_path ) { |
|
42 | + if ( '' === $dir_path ) { |
|
43 | 43 | $dir_path = GRAVITYVIEW_DIR . 'templates/css/'; |
44 | 44 | } |
45 | 45 | |
46 | 46 | // plugins_url() expects a path to a file, not directory. We append a file to be stripped. |
47 | - $path = plugins_url( $css_file, trailingslashit( $dir_path ) . 'stripped-by-plugin_basename.php' ); |
|
47 | + $path = plugins_url( $css_file, trailingslashit( $dir_path ) . 'stripped-by-plugin_basename.php' ); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | return $path; |
@@ -82,9 +82,9 @@ discard block |
||
82 | 82 | |
83 | 83 | $parsed_permalink = parse_url( get_permalink( $id ) ); |
84 | 84 | |
85 | - $permalink_args = isset( $parsed_permalink['query'] ) ? $parsed_permalink['query'] : false; |
|
85 | + $permalink_args = isset( $parsed_permalink[ 'query' ] ) ? $parsed_permalink[ 'query' ] : false; |
|
86 | 86 | |
87 | - if( empty( $permalink_args ) ) { |
|
87 | + if ( empty( $permalink_args ) ) { |
|
88 | 88 | return array(); |
89 | 89 | } |
90 | 90 | |
@@ -109,15 +109,15 @@ discard block |
||
109 | 109 | function gv_selected( $value, $current, $echo = true, $type = 'selected' ) { |
110 | 110 | |
111 | 111 | $output = ''; |
112 | - if( is_array( $current ) ) { |
|
113 | - if( in_array( $value, $current ) ) { |
|
112 | + if ( is_array( $current ) ) { |
|
113 | + if ( in_array( $value, $current ) ) { |
|
114 | 114 | $output = __checked_selected_helper( true, true, false, $type ); |
115 | 115 | } |
116 | 116 | } else { |
117 | 117 | $output = __checked_selected_helper( $value, $current, false, $type ); |
118 | 118 | } |
119 | 119 | |
120 | - if( $echo ) { |
|
120 | + if ( $echo ) { |
|
121 | 121 | echo $output; |
122 | 122 | } |
123 | 123 | |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | } |
126 | 126 | |
127 | 127 | |
128 | -if( ! function_exists( 'gravityview_sanitize_html_class' ) ) { |
|
128 | +if ( ! function_exists( 'gravityview_sanitize_html_class' ) ) { |
|
129 | 129 | |
130 | 130 | /** |
131 | 131 | * sanitize_html_class doesn't handle spaces (multiple classes). We remedy that. |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | */ |
172 | 172 | function gravityview_strip_whitespace( $string ) { |
173 | 173 | $string = normalize_whitespace( $string ); |
174 | - return preg_replace('/[\r\n\t ]+/', ' ', $string ); |
|
174 | + return preg_replace( '/[\r\n\t ]+/', ' ', $string ); |
|
175 | 175 | } |
176 | 176 | |
177 | 177 | /** |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | * @return string Included file contents |
186 | 186 | */ |
187 | 187 | function gravityview_ob_include( $file_path, $object = NULL ) { |
188 | - if( ! file_exists( $file_path ) ) { |
|
188 | + if ( ! file_exists( $file_path ) ) { |
|
189 | 189 | gravityview()->log->error( 'File path does not exist. {path}', array( 'path' => $file_path ) ); |
190 | 190 | return ''; |
191 | 191 | } |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | |
204 | 204 | $width = $height * 0.7586206897; |
205 | 205 | |
206 | - if( function_exists('is_rtl') && is_rtl() ) { |
|
206 | + if ( function_exists( 'is_rtl' ) && is_rtl() ) { |
|
207 | 207 | $style = 'margin:10px 10px 10px 0;'; |
208 | 208 | $class = 'alignright'; |
209 | 209 | } else { |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | $class = 'alignleft'; |
212 | 212 | } |
213 | 213 | |
214 | - return '<img src="'.plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ).'" class="'.$class.'" height="'.intval( $height ).'" width="'.round( $width, 2 ).'" alt="The GravityView Astronaut Says:" style="'.$style.'" />'; |
|
214 | + return '<img src="' . plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) . '" class="' . $class . '" height="' . intval( $height ) . '" width="' . round( $width, 2 ) . '" alt="The GravityView Astronaut Says:" style="' . $style . '" />'; |
|
215 | 215 | } |
216 | 216 | |
217 | 217 | /** |
@@ -234,9 +234,9 @@ discard block |
||
234 | 234 | function gravityview_number_format( $number, $decimals = '' ) { |
235 | 235 | global $wp_locale; |
236 | 236 | |
237 | - if( '' === $decimals ) { |
|
237 | + if ( '' === $decimals ) { |
|
238 | 238 | |
239 | - $decimal_point = isset( $wp_locale ) ? $wp_locale->number_format['decimal_point'] : '.'; |
|
239 | + $decimal_point = isset( $wp_locale ) ? $wp_locale->number_format[ 'decimal_point' ] : '.'; |
|
240 | 240 | |
241 | 241 | /** |
242 | 242 | * Calculate the position of the decimal point in the number |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | $parts = parse_url( $value ); |
266 | 266 | |
267 | 267 | // No domain? Strange...show the original text. |
268 | - if( empty( $parts['host'] ) ) { |
|
268 | + if ( empty( $parts[ 'host' ] ) ) { |
|
269 | 269 | return $value; |
270 | 270 | } |
271 | 271 | |
@@ -278,16 +278,16 @@ discard block |
||
278 | 278 | * @param boolean $enable Whether to strip the scheme. Return false to show scheme. (default: true)\n |
279 | 279 | * If true: `http://example.com => example.com` |
280 | 280 | */ |
281 | - if( false === apply_filters('gravityview_anchor_text_striphttp', true) ) { |
|
281 | + if ( false === apply_filters( 'gravityview_anchor_text_striphttp', true ) ) { |
|
282 | 282 | |
283 | - if( isset( $parts['scheme'] ) ) { |
|
284 | - $return .= $parts['scheme']; |
|
283 | + if ( isset( $parts[ 'scheme' ] ) ) { |
|
284 | + $return .= $parts[ 'scheme' ]; |
|
285 | 285 | } |
286 | 286 | |
287 | 287 | } |
288 | 288 | |
289 | 289 | // The domain, which may contain a subdomain |
290 | - $domain = $parts['host']; |
|
290 | + $domain = $parts[ 'host' ]; |
|
291 | 291 | |
292 | 292 | /** |
293 | 293 | * @filter `gravityview_anchor_text_stripwww` Strip www from the domain? |
@@ -295,10 +295,10 @@ discard block |
||
295 | 295 | * @param boolean $enable Whether to strip www. Return false to show www. (default: true)\n |
296 | 296 | * If true: `www.example.com => example.com` |
297 | 297 | */ |
298 | - $strip_www = apply_filters('gravityview_anchor_text_stripwww', true ); |
|
298 | + $strip_www = apply_filters( 'gravityview_anchor_text_stripwww', true ); |
|
299 | 299 | |
300 | - if( $strip_www ) { |
|
301 | - $domain = str_replace('www.', '', $domain ); |
|
300 | + if ( $strip_www ) { |
|
301 | + $domain = str_replace( 'www.', '', $domain ); |
|
302 | 302 | } |
303 | 303 | |
304 | 304 | /** |
@@ -308,11 +308,11 @@ discard block |
||
308 | 308 | * If true: `http://demo.example.com => example.com` \n |
309 | 309 | * If false: `http://demo.example.com => demo.example.com` |
310 | 310 | */ |
311 | - $strip_subdomains = apply_filters('gravityview_anchor_text_nosubdomain', true); |
|
311 | + $strip_subdomains = apply_filters( 'gravityview_anchor_text_nosubdomain', true ); |
|
312 | 312 | |
313 | - if( $strip_subdomains ) { |
|
313 | + if ( $strip_subdomains ) { |
|
314 | 314 | |
315 | - $domain = _gravityview_strip_subdomain( $parts['host'] ); |
|
315 | + $domain = _gravityview_strip_subdomain( $parts[ 'host' ] ); |
|
316 | 316 | |
317 | 317 | } |
318 | 318 | |
@@ -326,12 +326,12 @@ discard block |
||
326 | 326 | * If true: `http://example.com/sub/directory/page.html => example.com` \n |
327 | 327 | * If false: `http://example.com/sub/directory/page.html => example.com/sub/directory/page.html` |
328 | 328 | */ |
329 | - $root_only = apply_filters('gravityview_anchor_text_rootonly', true); |
|
329 | + $root_only = apply_filters( 'gravityview_anchor_text_rootonly', true ); |
|
330 | 330 | |
331 | - if( empty( $root_only ) ) { |
|
331 | + if ( empty( $root_only ) ) { |
|
332 | 332 | |
333 | - if( isset( $parts['path'] ) ) { |
|
334 | - $return .= $parts['path']; |
|
333 | + if ( isset( $parts[ 'path' ] ) ) { |
|
334 | + $return .= $parts[ 'path' ]; |
|
335 | 335 | } |
336 | 336 | } |
337 | 337 | |
@@ -341,12 +341,12 @@ discard block |
||
341 | 341 | * @param boolean $enable Whether to enable "root only". Return false to show full path. (default: true)\n |
342 | 342 | * If true: `http://example.com/?query=example => example.com` |
343 | 343 | */ |
344 | - $strip_query_string = apply_filters('gravityview_anchor_text_noquerystring', true ); |
|
344 | + $strip_query_string = apply_filters( 'gravityview_anchor_text_noquerystring', true ); |
|
345 | 345 | |
346 | - if( empty( $strip_query_string ) ) { |
|
346 | + if ( empty( $strip_query_string ) ) { |
|
347 | 347 | |
348 | - if( isset( $parts['query'] ) ) { |
|
349 | - $return .= '?'.$parts['query']; |
|
348 | + if ( isset( $parts[ 'query' ] ) ) { |
|
349 | + $return .= '?' . $parts[ 'query' ]; |
|
350 | 350 | } |
351 | 351 | |
352 | 352 | } |
@@ -363,8 +363,8 @@ discard block |
||
363 | 363 | */ |
364 | 364 | function _gravityview_strip_subdomain( $string_maybe_has_subdomain ) { |
365 | 365 | |
366 | - if( preg_match("/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) { |
|
367 | - return $matches['domain']; |
|
366 | + if ( preg_match( "/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) { |
|
367 | + return $matches[ 'domain' ]; |
|
368 | 368 | } else { |
369 | 369 | return $string_maybe_has_subdomain; |
370 | 370 | } |
@@ -433,7 +433,7 @@ discard block |
||
433 | 433 | |
434 | 434 | if ( in_array( $value, array( 'yes', 'true' ), true ) ) { |
435 | 435 | $value = true; |
436 | - } else if( in_array( $value, array( 'no', 'false' ), true ) ) { |
|
436 | + } else if ( in_array( $value, array( 'no', 'false' ), true ) ) { |
|
437 | 437 | $value = false; |
438 | 438 | } |
439 | 439 | } |
@@ -462,19 +462,19 @@ discard block |
||
462 | 462 | */ |
463 | 463 | function gv_maybe_json_decode( $value, $assoc = false, $depth = 512, $options = 0 ) { |
464 | 464 | |
465 | - if( ! is_string( $value ) ) { |
|
465 | + if ( ! is_string( $value ) ) { |
|
466 | 466 | return $value; |
467 | 467 | } |
468 | 468 | |
469 | 469 | $decoded = json_decode( $value ); |
470 | 470 | |
471 | 471 | // There was a JSON error (PHP 5.3+) |
472 | - if( function_exists('json_last_error') && JSON_ERROR_NONE !== json_last_error() ) { |
|
472 | + if ( function_exists( 'json_last_error' ) && JSON_ERROR_NONE !== json_last_error() ) { |
|
473 | 473 | return $value; |
474 | 474 | } |
475 | 475 | |
476 | 476 | // It wasn't JSON (PHP < 5.3 fallback) |
477 | - if( is_null( $decoded ) ) { |
|
477 | + if ( is_null( $decoded ) ) { |
|
478 | 478 | return $value; |
479 | 479 | } |
480 | 480 | |
@@ -497,7 +497,7 @@ discard block |
||
497 | 497 | |
498 | 498 | // Use the original function, if exists. |
499 | 499 | // Requires WP 4.4+ |
500 | - if( function_exists( 'map_deep') ) { |
|
500 | + if ( function_exists( 'map_deep' ) ) { |
|
501 | 501 | return map_deep( $value, $callback ); |
502 | 502 | } |
503 | 503 | |
@@ -562,7 +562,7 @@ discard block |
||
562 | 562 | |
563 | 563 | $exploded = explode( '.', "{$field_id}" ); |
564 | 564 | |
565 | - return isset( $exploded[1] ) ? intval( $exploded[1] ) : false; |
|
565 | + return isset( $exploded[ 1 ] ) ? intval( $exploded[ 1 ] ) : false; |
|
566 | 566 | } |
567 | 567 | |
568 | 568 | /** |
@@ -603,13 +603,13 @@ discard block |
||
603 | 603 | */ |
604 | 604 | $args = apply_filters( 'gravityview_get_terms_choices_args', $args ); |
605 | 605 | |
606 | - $terms = get_terms( $args['taxonomy'], $args ); |
|
606 | + $terms = get_terms( $args[ 'taxonomy' ], $args ); |
|
607 | 607 | |
608 | 608 | $choices = array(); |
609 | 609 | |
610 | 610 | if ( is_array( $terms ) ) { |
611 | 611 | foreach ( $terms as $term_id => $term_name ) { |
612 | - $choices[] = array( |
|
612 | + $choices[ ] = array( |
|
613 | 613 | 'text' => $term_name, |
614 | 614 | 'value' => $term_id |
615 | 615 | ); |
@@ -633,21 +633,21 @@ discard block |
||
633 | 633 | function _gravityview_process_posted_fields() { |
634 | 634 | $fields = array(); |
635 | 635 | |
636 | - if( !empty( $_POST['gv_fields'] ) ) { |
|
637 | - if ( ! is_array( $_POST['gv_fields'] ) ) { |
|
636 | + if ( ! empty( $_POST[ 'gv_fields' ] ) ) { |
|
637 | + if ( ! is_array( $_POST[ 'gv_fields' ] ) ) { |
|
638 | 638 | |
639 | 639 | // We are not using parse_str() due to max_input_vars limitation with large View configurations |
640 | 640 | $fields_holder = array(); |
641 | - GVCommon::gv_parse_str( $_POST['gv_fields'], $fields_holder ); |
|
641 | + GVCommon::gv_parse_str( $_POST[ 'gv_fields' ], $fields_holder ); |
|
642 | 642 | |
643 | - if ( isset( $fields_holder['fields'] ) ) { |
|
644 | - $fields = $fields_holder['fields']; |
|
643 | + if ( isset( $fields_holder[ 'fields' ] ) ) { |
|
644 | + $fields = $fields_holder[ 'fields' ]; |
|
645 | 645 | } else { |
646 | 646 | gravityview()->log->error( 'No `fields` key was found after parsing $fields string', array( 'data' => $fields_holder ) ); |
647 | 647 | } |
648 | 648 | |
649 | 649 | } else { |
650 | - $fields = $_POST['gv_fields']; |
|
650 | + $fields = $_POST[ 'gv_fields' ]; |
|
651 | 651 | } |
652 | 652 | } |
653 | 653 |