Completed
Pull Request — develop (#843)
by Zack
05:39
created
gravityview.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	 */
73 73
 	public static function getInstance() {
74 74
 
75
-		if( empty( self::$instance ) ) {
75
+		if ( empty( self::$instance ) ) {
76 76
 			self::$instance = new self;
77 77
 		}
78 78
 
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 
84 84
 		self::require_files();
85 85
 
86
-		if( ! GravityView_Compatibility::is_valid() ) {
86
+		if ( ! GravityView_Compatibility::is_valid() ) {
87 87
 			return;
88 88
 		}
89 89
 
@@ -98,14 +98,14 @@  discard block
 block discarded – undo
98 98
 	 */
99 99
 	private static function require_files() {
100 100
 		require_once( GRAVITYVIEW_DIR . 'includes/helper-functions.php' );
101
-		require_once( GRAVITYVIEW_DIR . 'includes/class-common.php');
102
-		require_once( GRAVITYVIEW_DIR . 'includes/connector-functions.php');
101
+		require_once( GRAVITYVIEW_DIR . 'includes/class-common.php' );
102
+		require_once( GRAVITYVIEW_DIR . 'includes/connector-functions.php' );
103 103
 		require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-compatibility.php' );
104 104
 		require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-roles-capabilities.php' );
105 105
 		require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-admin-notices.php' );
106
-		require_once( GRAVITYVIEW_DIR .'includes/class-admin.php' );
107
-		require_once( GRAVITYVIEW_DIR . 'includes/class-post-types.php');
108
-		require_once( GRAVITYVIEW_DIR . 'includes/class-cache.php');
106
+		require_once( GRAVITYVIEW_DIR . 'includes/class-admin.php' );
107
+		require_once( GRAVITYVIEW_DIR . 'includes/class-post-types.php' );
108
+		require_once( GRAVITYVIEW_DIR . 'includes/class-cache.php' );
109 109
 	}
110 110
 
111 111
 	/**
@@ -138,22 +138,22 @@  discard block
 block discarded – undo
138 138
 		}
139 139
 
140 140
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-approval-status.php' );
141
-		include_once( GRAVITYVIEW_DIR .'includes/class-gravityview-entry-approval.php' );
141
+		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-approval.php' );
142 142
 
143
-		include_once( GRAVITYVIEW_DIR .'includes/class-gravityview-entry-notes.php' );
144
-		include_once( GRAVITYVIEW_DIR .'includes/load-plugin-and-theme-hooks.php' );
143
+		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-notes.php' );
144
+		include_once( GRAVITYVIEW_DIR . 'includes/load-plugin-and-theme-hooks.php' );
145 145
 
146 146
 		// Load Extensions
147 147
 		// @todo: Convert to a scan of the directory or a method where this all lives
148
-		include_once( GRAVITYVIEW_DIR .'includes/extensions/edit-entry/class-edit-entry.php' );
149
-		include_once( GRAVITYVIEW_DIR .'includes/extensions/delete-entry/class-delete-entry.php' );
150
-		include_once( GRAVITYVIEW_DIR .'includes/extensions/entry-notes/class-gravityview-field-notes.php' );
148
+		include_once( GRAVITYVIEW_DIR . 'includes/extensions/edit-entry/class-edit-entry.php' );
149
+		include_once( GRAVITYVIEW_DIR . 'includes/extensions/delete-entry/class-delete-entry.php' );
150
+		include_once( GRAVITYVIEW_DIR . 'includes/extensions/entry-notes/class-gravityview-field-notes.php' );
151 151
 
152 152
 		// Load WordPress Widgets
153
-		include_once( GRAVITYVIEW_DIR .'includes/wordpress-widgets/register-wordpress-widgets.php' );
153
+		include_once( GRAVITYVIEW_DIR . 'includes/wordpress-widgets/register-wordpress-widgets.php' );
154 154
 
155 155
 		// Load GravityView Widgets
156
-		include_once( GRAVITYVIEW_DIR .'includes/widgets/register-gravityview-widgets.php' );
156
+		include_once( GRAVITYVIEW_DIR . 'includes/widgets/register-gravityview-widgets.php' );
157 157
 
158 158
 		// Add oEmbed
159 159
 		include_once( GRAVITYVIEW_DIR . 'includes/class-oembed.php' );
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 		include_once( GRAVITYVIEW_DIR . 'includes/class-frontend-views.php' );
167 167
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-admin-bar.php' );
168 168
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-list.php' );
169
-		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-merge-tags.php'); /** @since 1.8.4 */
169
+		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-merge-tags.php' ); /** @since 1.8.4 */
170 170
 		include_once( GRAVITYVIEW_DIR . 'includes/class-data.php' );
171 171
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-shortcode.php' );
172 172
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-link-shortcode.php' );
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
 	 * @return bool
182 182
 	 */
183 183
 	public static function is_network_activated() {
184
-		return is_multisite() && ( function_exists('is_plugin_active_for_network') && is_plugin_active_for_network( 'gravityview/gravityview.php' ) );
184
+		return is_multisite() && ( function_exists( 'is_plugin_active_for_network' ) && is_plugin_active_for_network( 'gravityview/gravityview.php' ) );
185 185
 	}
186 186
 
187 187
 
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
 	 * @since 1.7.5.1
247 247
 	 */
248 248
 	public static function include_widget_class() {
249
-		include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' );
249
+		include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget.php' );
250 250
 	}
251 251
 
252 252
 
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
 		}
269 269
 		if ( ! $loaded ) {
270 270
 			$locale = apply_filters( 'plugin_locale', get_locale(), 'gravityview' );
271
-			$mofile = dirname( __FILE__ ) . '/languages/gravityview-'. $locale .'.mo';
271
+			$mofile = dirname( __FILE__ ) . '/languages/gravityview-' . $locale . '.mo';
272 272
 			load_textdomain( 'gravityview', $mofile );
273 273
 		}
274 274
 
@@ -299,12 +299,12 @@  discard block
 block discarded – undo
299 299
 	 */
300 300
 	public function frontend_actions( $force = false ) {
301 301
 
302
-		if( self::is_admin() && ! $force ) { return; }
302
+		if ( self::is_admin() && ! $force ) { return; }
303 303
 
304 304
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-image.php' );
305
-		include_once( GRAVITYVIEW_DIR .'includes/class-template.php' );
306
-		include_once( GRAVITYVIEW_DIR .'includes/class-api.php' );
307
-		include_once( GRAVITYVIEW_DIR .'includes/class-frontend-views.php' );
305
+		include_once( GRAVITYVIEW_DIR . 'includes/class-template.php' );
306
+		include_once( GRAVITYVIEW_DIR . 'includes/class-api.php' );
307
+		include_once( GRAVITYVIEW_DIR . 'includes/class-frontend-views.php' );
308 308
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-change-entry-creator.php' );
309 309
 
310 310
 
@@ -329,8 +329,8 @@  discard block
 block discarded – undo
329 329
 	 */
330 330
 	public static function get_default_widget_areas() {
331 331
 		$default_areas = array(
332
-			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __('Top', 'gravityview' ) , 'subtitle' => '' ) ) ),
333
-			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __('Left', 'gravityview') , 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __('Right', 'gravityview') , 'subtitle' => '' ) ) ),
332
+			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ), 'subtitle' => '' ) ) ),
333
+			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ), 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ), 'subtitle' => '' ) ) ),
334 334
 		);
335 335
 
336 336
 		/**
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
      * @param mixed $data Additional data to display
349 349
      * @return void
350 350
      */
351
-    public static function log_debug( $message, $data = null ){
351
+    public static function log_debug( $message, $data = null ) {
352 352
 	    /**
353 353
 	     * @action `gravityview_log_debug` Log a debug message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
354 354
 	     * @param string $message Message to display
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
362 362
      * @param  string $message log message
363 363
      * @return void
364 364
      */
365
-    public static function log_error( $message, $data = null ){
365
+    public static function log_error( $message, $data = null ) {
366 366
 	    /**
367 367
 	     * @action `gravityview_log_error` Log an error message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
368 368
 	     * @param string $message Error message to display
@@ -373,4 +373,4 @@  discard block
 block discarded – undo
373 373
 
374 374
 } // end class GravityView_Plugin
375 375
 
376
-add_action('plugins_loaded', array('GravityView_Plugin', 'getInstance'), 1);
376
+add_action( 'plugins_loaded', array( 'GravityView_Plugin', 'getInstance' ), 1 );
Please login to merge, or discard this patch.
includes/class-admin-add-shortcode.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -20,12 +20,12 @@  discard block
 block discarded – undo
20 20
 
21 21
 	function __construct() {
22 22
 
23
-			add_action( 'media_buttons', array( $this, 'add_shortcode_button'), 30);
23
+			add_action( 'media_buttons', array( $this, 'add_shortcode_button' ), 30 );
24 24
 
25
-			add_action( 'admin_footer',	array( $this, 'add_shortcode_popup') );
25
+			add_action( 'admin_footer', array( $this, 'add_shortcode_popup' ) );
26 26
 
27 27
 			// adding styles and scripts
28
-			add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles') );
28
+			add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ) );
29 29
 
30 30
 			// ajax - populate sort fields based on the selected view
31 31
 			add_action( 'wp_ajax_gv_sortable_fields', array( $this, 'get_sortable_fields' ) );
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	 */
41 41
 	function is_post_editor_screen() {
42 42
 		global $current_screen, $pagenow;
43
-		return !empty( $current_screen->post_type ) && 'gravityview' != $current_screen->post_type && in_array( $pagenow , array( 'post.php' , 'post-new.php' ) );
43
+		return ! empty( $current_screen->post_type ) && 'gravityview' != $current_screen->post_type && in_array( $pagenow, array( 'post.php', 'post-new.php' ) );
44 44
 	}
45 45
 
46 46
 
@@ -55,15 +55,15 @@  discard block
 block discarded – undo
55 55
 		/**
56 56
 		 * @since 1.15.3
57 57
 		 */
58
-		if( ! GVCommon::has_cap( array( 'publish_gravityviews' ) ) ) {
58
+		if ( ! GVCommon::has_cap( array( 'publish_gravityviews' ) ) ) {
59 59
 			return;
60 60
 		}
61 61
 
62
-		if( !$this->is_post_editor_screen() ) {
62
+		if ( ! $this->is_post_editor_screen() ) {
63 63
 			return;
64 64
 		}
65 65
 		?>
66
-		<a href="#TB_inline?width=600&amp;height=800&amp;inlineId=select_gravityview_view" class="thickbox hide-if-no-js button gform_media_link" id="add_gravityview" title="<?php esc_attr_e("Insert View", 'gravityview'); ?>"><span class="icon gv-icon-astronaut-head"></span><?php esc_html_e( 'Add View', 'gravityview' ); ?></a>
66
+		<a href="#TB_inline?width=600&amp;height=800&amp;inlineId=select_gravityview_view" class="thickbox hide-if-no-js button gform_media_link" id="add_gravityview" title="<?php esc_attr_e( "Insert View", 'gravityview' ); ?>"><span class="icon gv-icon-astronaut-head"></span><?php esc_html_e( 'Add View', 'gravityview' ); ?></a>
67 67
 		<?php
68 68
 
69 69
 	}
@@ -79,16 +79,16 @@  discard block
 block discarded – undo
79 79
 	function add_shortcode_popup() {
80 80
 		global $post;
81 81
 
82
-		if( !$this->is_post_editor_screen() ) {
82
+		if ( ! $this->is_post_editor_screen() ) {
83 83
 			return;
84 84
 		}
85 85
 
86
-		$post_type = get_post_type_object($post->post_type);
86
+		$post_type = get_post_type_object( $post->post_type );
87 87
 
88
-		$views = get_posts( array('post_type' => 'gravityview', 'posts_per_page' => -1 ) );
88
+		$views = get_posts( array( 'post_type' => 'gravityview', 'posts_per_page' => -1 ) );
89 89
 
90 90
 		// If there are no views set up yet, we get outta here.
91
-		if( empty( $views ) ) {
91
+		if ( empty( $views ) ) {
92 92
 			echo '<div id="select_gravityview_view"><div class="wrap">' . GravityView_Admin::no_views_text() . '</div></div>';
93 93
 			return;
94 94
 		}
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 				<div class="wrap">
100 100
 
101 101
 					<h2 class=""><?php esc_html_e( 'Embed a View', 'gravityview' ); ?></h2>
102
-					<p class="subtitle"><?php printf( esc_attr ( __( 'Use this form to embed a View into this %s. %sLearn more about using shortcodes.%s', 'gravityview') ), $post_type->labels->singular_name, '<a href="http://docs.gravityview.co/article/73-using-the-shortcode" target="_blank" rel="noopener noreferrer">', '</a>' ); ?></p>
102
+					<p class="subtitle"><?php printf( esc_attr( __( 'Use this form to embed a View into this %s. %sLearn more about using shortcodes.%s', 'gravityview' ) ), $post_type->labels->singular_name, '<a href="http://docs.gravityview.co/article/73-using-the-shortcode" target="_blank" rel="noopener noreferrer">', '</a>' ); ?></p>
103 103
 
104 104
 					<div>
105 105
 						<h3><label for="gravityview_id"><?php esc_html_e( 'Select a View', 'gravityview' ); ?></label></h3>
@@ -107,9 +107,9 @@  discard block
 block discarded – undo
107 107
 						<select name="gravityview_id" id="gravityview_id">
108 108
 							<option value=""><?php esc_html_e( '&mdash; Select a View to Insert &mdash;', 'gravityview' ); ?></option>
109 109
 							<?php
110
-							foreach( $views as $view ) {
111
-								$title = empty( $view->post_title ) ? __('(no title)', 'gravityview') : $view->post_title;
112
-								echo '<option value="'. $view->ID .'">'. esc_html( sprintf('%s #%d', $title, $view->ID ) ) .'</option>';
110
+							foreach ( $views as $view ) {
111
+								$title = empty( $view->post_title ) ? __( '(no title)', 'gravityview' ) : $view->post_title;
112
+								echo '<option value="' . $view->ID . '">' . esc_html( sprintf( '%s #%d', $title, $view->ID ) ) . '</option>';
113 113
 							}
114 114
 							?>
115 115
 						</select>
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 
126 126
 						foreach ( $settings as $key => $setting ) {
127 127
 
128
-							if( empty( $setting['show_in_shortcode'] ) ) { continue; }
128
+							if ( empty( $setting[ 'show_in_shortcode' ] ) ) { continue; }
129 129
 
130 130
 							GravityView_Render_Settings::render_setting_row( $key, array(), NULL, 'gravityview_%s', 'gravityview_%s' );
131 131
 						}
@@ -134,8 +134,8 @@  discard block
 block discarded – undo
134 134
 					</table>
135 135
 
136 136
 					<div class="submit">
137
-						<input type="submit" class="button button-primary button-large alignleft hide-if-js" value="<?php esc_attr_e('Insert View', 'gravityview' ); ?>" id="insert_gravityview_view" />
138
-						<input class="button button-secondary alignright" type="submit" onclick="tb_remove(); return false;" value="<?php esc_attr_e("Cancel", 'gravityview'); ?>" />
137
+						<input type="submit" class="button button-primary button-large alignleft hide-if-js" value="<?php esc_attr_e( 'Insert View', 'gravityview' ); ?>" id="insert_gravityview_view" />
138
+						<input class="button button-secondary alignright" type="submit" onclick="tb_remove(); return false;" value="<?php esc_attr_e( "Cancel", 'gravityview' ); ?>" />
139 139
 					</div>
140 140
 
141 141
 				</div>
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 	 */
157 157
 	function add_scripts_and_styles() {
158 158
 
159
-		if( ! $this->is_post_editor_screen() ) {
159
+		if ( ! $this->is_post_editor_screen() ) {
160 160
 			return;
161 161
 		}
162 162
 
@@ -167,22 +167,22 @@  discard block
 block discarded – undo
167 167
 
168 168
 		$protocol = is_ssl() ? 'https://' : 'http://';
169 169
 
170
-		wp_enqueue_style( 'jquery-ui-datepicker', $protocol.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css', array(), GravityView_Plugin::version );
170
+		wp_enqueue_style( 'jquery-ui-datepicker', $protocol . 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css', array(), GravityView_Plugin::version );
171 171
 
172 172
 		//enqueue styles
173
-		wp_register_style( 'gravityview_postedit_styles', plugins_url('assets/css/admin-post-edit.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
173
+		wp_register_style( 'gravityview_postedit_styles', plugins_url( 'assets/css/admin-post-edit.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
174 174
 		wp_enqueue_style( 'gravityview_postedit_styles' );
175 175
 
176
-		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
176
+		$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
177 177
 
178 178
 		// custom js
179
-		wp_register_script( 'gravityview_postedit_scripts',  plugins_url('assets/js/admin-post-edit'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery', 'jquery-ui-datepicker' ), GravityView_Plugin::version );
179
+		wp_register_script( 'gravityview_postedit_scripts', plugins_url( 'assets/js/admin-post-edit' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery', 'jquery-ui-datepicker' ), GravityView_Plugin::version );
180 180
 		wp_enqueue_script( 'gravityview_postedit_scripts' );
181
-		wp_localize_script('gravityview_postedit_scripts', 'gvGlobals', array(
182
-			'nonce' => wp_create_nonce( 'gravityview_ajaxaddshortcode'),
181
+		wp_localize_script( 'gravityview_postedit_scripts', 'gvGlobals', array(
182
+			'nonce' => wp_create_nonce( 'gravityview_ajaxaddshortcode' ),
183 183
 			'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
184
-			'alert_1' => esc_html__( 'Please select a View', 'gravityview'),
185
-		));
184
+			'alert_1' => esc_html__( 'Please select a View', 'gravityview' ),
185
+		) );
186 186
 
187 187
 	}
188 188
 
@@ -198,16 +198,16 @@  discard block
 block discarded – undo
198 198
 	function get_sortable_fields() {
199 199
 
200 200
 		// Not properly formatted request
201
-		if ( empty( $_POST['viewid'] ) || !is_numeric( $_POST['viewid'] ) ) {
201
+		if ( empty( $_POST[ 'viewid' ] ) || ! is_numeric( $_POST[ 'viewid' ] ) ) {
202 202
 			exit( false );
203 203
 		}
204 204
 
205 205
 		// Not valid request
206
-		if( empty( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxaddshortcode' ) ) {
206
+		if ( empty( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxaddshortcode' ) ) {
207 207
 			exit( false );
208 208
 		}
209 209
 
210
-		$viewid = (int)$_POST['viewid'];
210
+		$viewid = (int)$_POST[ 'viewid' ];
211 211
 
212 212
 		// fetch form id assigned to the view
213 213
 		$formid = gravityview_get_form_id( $viewid );
Please login to merge, or discard this patch.
includes/wordpress-widgets/class-gravityview-recent-entries-widget.php 1 patch
Spacing   +64 added lines, -64 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 
13 13
 	function __construct( ) {
14 14
 
15
-		$name = __('GravityView Recent Entries', 'gravityview');
15
+		$name = __( 'GravityView Recent Entries', 'gravityview' );
16 16
 
17 17
 		$widget_options = array(
18 18
 			'description' => __( 'Display the most recent entries for a View', 'gravityview' ),
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 
26 26
 	private function initialize() {
27 27
 
28
-		add_action('admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts') );
28
+		add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) );
29 29
 
30 30
 		add_action( 'wp_ajax_gv_get_view_merge_tag_data', array( $this, 'ajax_get_view_merge_tag_data' ) );
31 31
 
@@ -38,21 +38,21 @@  discard block
 block discarded – undo
38 38
 	 */
39 39
 	function ajax_get_view_merge_tag_data() {
40 40
 
41
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajax_widget' ) ) {
41
+		if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajax_widget' ) ) {
42 42
 			exit( false );
43 43
 		}
44 44
 
45
-		$form_id  = gravityview_get_form_id( $_POST['view_id'] );
45
+		$form_id = gravityview_get_form_id( $_POST[ 'view_id' ] );
46 46
 
47 47
 		$form = RGFormsModel::get_form_meta( $form_id );
48 48
 
49 49
 		$output = array(
50 50
 			'form' => array(
51
-				'id' => $form['id'],
52
-				'title' => $form['title'],
53
-				'fields' => $form['fields'],
51
+				'id' => $form[ 'id' ],
52
+				'title' => $form[ 'title' ],
53
+				'fields' => $form[ 'fields' ],
54 54
 			),
55
-			'mergeTags' => GFCommon::get_merge_tags( $form['fields'], '', false ),
55
+			'mergeTags' => GFCommon::get_merge_tags( $form[ 'fields' ], '', false ),
56 56
 		);
57 57
 
58 58
 		echo json_encode( $output );
@@ -68,19 +68,19 @@  discard block
 block discarded – undo
68 68
 	function admin_enqueue_scripts() {
69 69
 		global $pagenow;
70 70
 
71
-		if( $pagenow === 'widgets.php' ) {
71
+		if ( $pagenow === 'widgets.php' ) {
72 72
 
73
-			$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
73
+			$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
74 74
 
75 75
 			GravityView_Admin_Views::enqueue_gravity_forms_scripts();
76 76
 
77
-			wp_enqueue_script( 'gravityview_widgets', plugins_url('assets/js/admin-widgets'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery', 'gform_gravityforms' ), GravityView_Plugin::version );
77
+			wp_enqueue_script( 'gravityview_widgets', plugins_url( 'assets/js/admin-widgets' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery', 'gform_gravityforms' ), GravityView_Plugin::version );
78 78
 
79 79
 			wp_localize_script( 'gravityview_widgets', 'GVWidgets', array(
80 80
 				'nonce' => wp_create_nonce( 'gravityview_ajax_widget' )
81
-			));
81
+			) );
82 82
 
83
-			wp_enqueue_style( 'gravityview_views_styles', plugins_url('assets/css/admin-views.css', GRAVITYVIEW_FILE), array('dashicons' ), GravityView_Plugin::version );
83
+			wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons' ), GravityView_Plugin::version );
84 84
 		}
85 85
 
86 86
 	}
@@ -95,19 +95,19 @@  discard block
 block discarded – undo
95 95
 	function widget( $args, $instance ) {
96 96
 
97 97
 		// Don't have the Customizer render too soon.
98
-		if( empty( $instance['view_id'] ) ) {
98
+		if ( empty( $instance[ 'view_id' ] ) ) {
99 99
 			return;
100 100
 		}
101 101
 
102
-		$args['id']        = ( isset( $args['id'] ) ) ? $args['id'] : 'gv_recent_entries';
103
-		$instance['title'] = ( isset( $instance['title'] ) ) ? $instance['title'] : '';
102
+		$args[ 'id' ]        = ( isset( $args[ 'id' ] ) ) ? $args[ 'id' ] : 'gv_recent_entries';
103
+		$instance[ 'title' ] = ( isset( $instance[ 'title' ] ) ) ? $instance[ 'title' ] : '';
104 104
 
105
-		$title = apply_filters( 'widget_title', $instance[ 'title' ], $instance, $args['id'] );
105
+		$title = apply_filters( 'widget_title', $instance[ 'title' ], $instance, $args[ 'id' ] );
106 106
 
107
-		echo $args['before_widget'];
107
+		echo $args[ 'before_widget' ];
108 108
 
109
-		if ( !empty( $title ) ) {
110
-			echo $args['before_title'] . $title . $args['after_title'];
109
+		if ( ! empty( $title ) ) {
110
+			echo $args[ 'before_title' ] . $title . $args[ 'after_title' ];
111 111
 		}
112 112
 
113 113
 		/**
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 		 */
128 128
 		do_action( 'gravityview/widget/recent-entries/after_widget', $args, $instance );
129 129
 
130
-		echo $args['after_widget'];
130
+		echo $args[ 'after_widget' ];
131 131
 	}
132 132
 
133 133
 	/**
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 	 */
142 142
 	private function get_output( $instance ) {
143 143
 
144
-		$form_id = gravityview_get_form_id( $instance['view_id'] );
144
+		$form_id = gravityview_get_form_id( $instance[ 'view_id' ] );
145 145
 
146 146
 		$form = gravityview_get_form( $form_id );
147 147
 
@@ -151,13 +151,13 @@  discard block
 block discarded – undo
151 151
 		 * @since 1.6.1
152 152
 		 * @var int $entry_link_post_id The ID to use as the parent post for the entry
153 153
 		 */
154
-		$entry_link_post_id = ( empty( $instance['error_post_id'] ) && !empty( $instance['post_id'] ) ) ? $instance['post_id'] : $instance['view_id'];
154
+		$entry_link_post_id = ( empty( $instance[ 'error_post_id' ] ) && ! empty( $instance[ 'post_id' ] ) ) ? $instance[ 'post_id' ] : $instance[ 'view_id' ];
155 155
 
156 156
 		/**
157 157
 		 * Generate list output
158 158
 		 * @since 1.7.2
159 159
 		 */
160
-		$List = new GravityView_Entry_List( $entries, $entry_link_post_id, $form, $instance['link_format'], $instance['after_link'], 'recent-entries-widget' );
160
+		$List = new GravityView_Entry_List( $entries, $entry_link_post_id, $form, $instance[ 'link_format' ], $instance[ 'after_link' ], 'recent-entries-widget' );
161 161
 
162 162
 		$output = $List->get_output();
163 163
 
@@ -182,30 +182,30 @@  discard block
 block discarded – undo
182 182
 	private function get_entries( $instance, $form_id ) {
183 183
 
184 184
 		// Get the settings for the View ID
185
-		$view_settings = gravityview_get_template_settings( $instance['view_id'] );
185
+		$view_settings = gravityview_get_template_settings( $instance[ 'view_id' ] );
186 186
 
187 187
         // Set the context view ID to avoid conflicts with the Advanced Filter extension.
188
-        $criteria['context_view_id'] = $instance['view_id'];
188
+        $criteria[ 'context_view_id' ] = $instance[ 'view_id' ];
189 189
 
190
-		$instance['limit'] = isset( $instance['limit'] ) ? $instance['limit'] : 10;
191
-		$view_settings['id'] = $instance['view_id'];
192
-		$view_settings['page_size'] = $instance['limit'];
190
+		$instance[ 'limit' ] = isset( $instance[ 'limit' ] ) ? $instance[ 'limit' ] : 10;
191
+		$view_settings[ 'id' ] = $instance[ 'view_id' ];
192
+		$view_settings[ 'page_size' ] = $instance[ 'limit' ];
193 193
 
194 194
 		// Prepare paging criteria
195
-		$criteria['paging'] = array(
195
+		$criteria[ 'paging' ] = array(
196 196
 			'offset' => 0,
197
-			'page_size' => $instance['limit']
197
+			'page_size' => $instance[ 'limit' ]
198 198
 		);
199 199
 
200 200
 		// Prepare Search Criteria
201
-		$criteria['search_criteria'] = array( 'field_filters' => array() );
202
-		$criteria['search_criteria'] = GravityView_frontend::process_search_only_approved( $view_settings, $criteria['search_criteria']);
203
-		$criteria['search_criteria']['status'] = apply_filters( 'gravityview_status', 'active', $view_settings );
201
+		$criteria[ 'search_criteria' ] = array( 'field_filters' => array() );
202
+		$criteria[ 'search_criteria' ] = GravityView_frontend::process_search_only_approved( $view_settings, $criteria[ 'search_criteria' ] );
203
+		$criteria[ 'search_criteria' ][ 'status' ] = apply_filters( 'gravityview_status', 'active', $view_settings );
204 204
 
205 205
 		/**
206 206
 		 * Modify the search parameters before the entries are fetched
207 207
 		 */
208
-		$criteria = apply_filters('gravityview/widget/recent-entries/criteria', $criteria, $instance, $form_id );
208
+		$criteria = apply_filters( 'gravityview/widget/recent-entries/criteria', $criteria, $instance, $form_id );
209 209
 
210 210
 		$results = GVCommon::get_entries( $form_id, $criteria );
211 211
 
@@ -226,23 +226,23 @@  discard block
 block discarded – undo
226 226
 		$instance = $new_instance;
227 227
 
228 228
 		// Force positive number
229
-		$instance['limit'] = empty( $instance['limit'] ) ? 10 : absint( $instance['limit'] );
229
+		$instance[ 'limit' ] = empty( $instance[ 'limit' ] ) ? 10 : absint( $instance[ 'limit' ] );
230 230
 
231
-		$instance['view_id'] = intval( $instance['view_id'] );
231
+		$instance[ 'view_id' ] = intval( $instance[ 'view_id' ] );
232 232
 
233
-		$instance['link_format'] = trim( rtrim( $instance['link_format'] ) );
233
+		$instance[ 'link_format' ] = trim( rtrim( $instance[ 'link_format' ] ) );
234 234
 
235
-		$instance['link_format'] = empty( $instance['link_format'] ) ? $old_instance['link_format'] : $instance['link_format'];
235
+		$instance[ 'link_format' ] = empty( $instance[ 'link_format' ] ) ? $old_instance[ 'link_format' ] : $instance[ 'link_format' ];
236 236
 
237
-		$instance['post_id'] = empty( $instance['post_id'] ) ? '' : intval( $instance['post_id'] );
237
+		$instance[ 'post_id' ] = empty( $instance[ 'post_id' ] ) ? '' : intval( $instance[ 'post_id' ] );
238 238
 
239
-		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $instance['post_id'], $instance['view_id'] );
239
+		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $instance[ 'post_id' ], $instance[ 'view_id' ] );
240 240
 
241 241
 		//check if post_id is a valid post with embedded View
242
-		$instance['error_post_id'] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL;
242
+		$instance[ 'error_post_id' ] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL;
243 243
 
244 244
 		// Share that the widget isn't brand new
245
-		$instance['updated']  = 1;
245
+		$instance[ 'updated' ] = 1;
246 246
 
247 247
 		/**
248 248
 		 * Modify the updated instance. This will allow for validating any added instance settings externally.
@@ -264,22 +264,22 @@  discard block
 block discarded – undo
264 264
 
265 265
 		// Set up some default widget settings.
266 266
 		$defaults = array(
267
-			'title' 			=> __('Recent Entries', 'gravityview'),
267
+			'title' 			=> __( 'Recent Entries', 'gravityview' ),
268 268
 			'view_id'           => NULL,
269 269
 			'post_id'           => NULL,
270 270
 			'limit'            => 10,
271
-			'link_format'       => __('Entry #{entry_id}', 'gravityview'),
271
+			'link_format'       => __( 'Entry #{entry_id}', 'gravityview' ),
272 272
 			'after_link'        => ''
273 273
 		);
274 274
 
275
-		$instance = wp_parse_args( (array) $instance, $defaults );
275
+		$instance = wp_parse_args( (array)$instance, $defaults );
276 276
 
277 277
 		?>
278 278
 
279 279
 		<!-- Title -->
280 280
 		<p>
281 281
 			<label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title:', 'gravityview' ) ?></label>
282
-			<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $instance['title'] ); ?>" />
282
+			<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $instance[ 'title' ] ); ?>" />
283 283
 		</p>
284 284
 
285 285
 		<!-- Download -->
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
 		$views = get_posts( $args );
293 293
 
294 294
 		// If there are no views set up yet, we get outta here.
295
-		if( empty( $views ) ) {
295
+		if ( empty( $views ) ) {
296 296
 			echo '<div id="select_gravityview_view"><div class="wrap">' . GravityView_Admin::no_views_text() . '</div></div>';
297 297
 			return;
298 298
 		}
@@ -304,10 +304,10 @@  discard block
 block discarded – undo
304 304
 		 * Display errors generated for invalid embed IDs
305 305
 		 * @see GravityView_View_Data::is_valid_embed_id
306 306
 		 */
307
-		if( isset( $instance['updated'] ) && empty( $instance['view_id'] ) ) {
307
+		if ( isset( $instance[ 'updated' ] ) && empty( $instance[ 'view_id' ] ) ) {
308 308
 			?>
309 309
 			<div class="error inline hide-on-view-change">
310
-				<p><?php esc_html_e('Please select a View to search.', 'gravityview'); ?></p>
310
+				<p><?php esc_html_e( 'Please select a View to search.', 'gravityview' ); ?></p>
311 311
 			</div>
312 312
 			<?php
313 313
 			unset ( $error );
@@ -315,14 +315,14 @@  discard block
 block discarded – undo
315 315
 		?>
316 316
 
317 317
 		<p>
318
-			<label for="<?php echo esc_attr( $this->get_field_id( 'view_id' ) ); ?>"><?php esc_html_e('Select a View', 'gravityview'); ?></label>
318
+			<label for="<?php echo esc_attr( $this->get_field_id( 'view_id' ) ); ?>"><?php esc_html_e( 'Select a View', 'gravityview' ); ?></label>
319 319
 			<select class="widefat gv-recent-entries-select-view" name="<?php echo esc_attr( $this->get_field_name( 'view_id' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'view_id' ) ); ?>">
320 320
 				<option value=""><?php esc_html_e( '&mdash; Select a View as Entries Source &mdash;', 'gravityview' ); ?></option>
321 321
 				<?php
322 322
 
323
-				foreach( $views as $view ) {
324
-					$title = empty( $view->post_title ) ? __('(no title)', 'gravityview') : $view->post_title;
325
-					echo '<option value="'. $view->ID .'"'.selected( absint( $instance['view_id'] ), $view->ID ).'>'. esc_html( sprintf('%s #%d', $title, $view->ID ) ) .'</option>';
323
+				foreach ( $views as $view ) {
324
+					$title = empty( $view->post_title ) ? __( '(no title)', 'gravityview' ) : $view->post_title;
325
+					echo '<option value="' . $view->ID . '"' . selected( absint( $instance[ 'view_id' ] ), $view->ID ) . '>' . esc_html( sprintf( '%s #%d', $title, $view->ID ) ) . '</option>';
326 326
 				}
327 327
 
328 328
 				?>
@@ -334,10 +334,10 @@  discard block
 block discarded – undo
334 334
 		 * Display errors generated for invalid embed IDs
335 335
 		 * @see GravityView_View_Data::is_valid_embed_id
336 336
 		 */
337
-		if( !empty( $instance['error_post_id'] ) ) {
337
+		if ( ! empty( $instance[ 'error_post_id' ] ) ) {
338 338
 			?>
339 339
 			<div class="error inline">
340
-				<p><?php echo $instance['error_post_id']; ?></p>
340
+				<p><?php echo $instance[ 'error_post_id' ]; ?></p>
341 341
 			</div>
342 342
 			<?php
343 343
 			unset ( $error );
@@ -345,11 +345,11 @@  discard block
 block discarded – undo
345 345
 		?>
346 346
 
347 347
 		<p>
348
-			<label for="<?php echo $this->get_field_id('post_id'); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label>
349
-			<input class="code" size="3" id="<?php echo $this->get_field_id('post_id'); ?>" name="<?php echo $this->get_field_name('post_id'); ?>" type="text" value="<?php echo esc_attr( $instance['post_id'] ); ?>" />
348
+			<label for="<?php echo $this->get_field_id( 'post_id' ); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label>
349
+			<input class="code" size="3" id="<?php echo $this->get_field_id( 'post_id' ); ?>" name="<?php echo $this->get_field_name( 'post_id' ); ?>" type="text" value="<?php echo esc_attr( $instance[ 'post_id' ] ); ?>" />
350 350
 			<span class="howto"><?php
351
-				esc_html_e('To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview' );
352
-				echo ' '.gravityview_get_link('http://docs.gravityview.co/article/222-the-search-widget', __('Learn more&hellip;', 'gravityview' ), 'target=_blank' );
351
+				esc_html_e( 'To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview' );
352
+				echo ' ' . gravityview_get_link( 'http://docs.gravityview.co/article/222-the-search-widget', __( 'Learn more&hellip;', 'gravityview' ), 'target=_blank' );
353 353
 				?></span>
354 354
 		</p>
355 355
 
@@ -357,21 +357,21 @@  discard block
 block discarded – undo
357 357
 			<label for="<?php echo $this->get_field_id( 'limit' ); ?>">
358 358
 				<span><?php _e( 'Number of entries to show:', 'gravityview' ); ?></span>
359 359
 			</label>
360
-			<input class="code" id="<?php echo $this->get_field_id( 'limit' ); ?>" name="<?php echo $this->get_field_name( 'limit' ); ?>" type="number" value="<?php echo intval( $instance['limit'] ); ?>" size="3" />
360
+			<input class="code" id="<?php echo $this->get_field_id( 'limit' ); ?>" name="<?php echo $this->get_field_name( 'limit' ); ?>" type="number" value="<?php echo intval( $instance[ 'limit' ] ); ?>" size="3" />
361 361
 		</p>
362 362
 
363 363
 		<p>
364 364
 			<label for="<?php echo $this->get_field_id( 'link_format' ); ?>">
365 365
 				<span><?php _e( 'Entry link text (required)', 'gravityview' ); ?></span>
366 366
 			</label>
367
-			<input id="<?php echo $this->get_field_id( 'link_format' ); ?>" name="<?php echo $this->get_field_name( 'link_format' ); ?>" type="text" value="<?php echo esc_attr( $instance['link_format'] ); ?>" class="widefat merge-tag-support mt-position-right mt-hide_all_fields" />
367
+			<input id="<?php echo $this->get_field_id( 'link_format' ); ?>" name="<?php echo $this->get_field_name( 'link_format' ); ?>" type="text" value="<?php echo esc_attr( $instance[ 'link_format' ] ); ?>" class="widefat merge-tag-support mt-position-right mt-hide_all_fields" />
368 368
 		</p>
369 369
 
370 370
 		<p>
371 371
 			<label for="<?php echo $this->get_field_id( 'after_link' ); ?>">
372 372
 				<span><?php _e( 'Text or HTML to display after the link (optional)', 'gravityview' ); ?></span>
373 373
 			</label>
374
-			<textarea id="<?php echo $this->get_field_id( 'after_link' ); ?>" name="<?php echo $this->get_field_name( 'after_link' ); ?>" rows="5" class="widefat code merge-tag-support mt-position-right mt-hide_all_fields"><?php echo esc_textarea( $instance['after_link'] ); ?></textarea>
374
+			<textarea id="<?php echo $this->get_field_id( 'after_link' ); ?>" name="<?php echo $this->get_field_name( 'after_link' ); ?>" rows="5" class="widefat code merge-tag-support mt-position-right mt-hide_all_fields"><?php echo esc_textarea( $instance[ 'after_link' ] ); ?></textarea>
375 375
 		</p>
376 376
 
377 377
 		<?php
@@ -381,7 +381,7 @@  discard block
 block discarded – undo
381 381
 		 * @param GravityView_Recent_Entries_Widget $this WP_Widget object
382 382
 		 * @param array $instance Current widget instance
383 383
 		 */
384
-		do_action( 'gravityview_recent_entries_widget_form' , $this, $instance );
384
+		do_action( 'gravityview_recent_entries_widget_form', $this, $instance );
385 385
 
386 386
 		?>
387 387
 
Please login to merge, or discard this patch.
includes/class-gravityview-entry-approval-status.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -113,16 +113,16 @@  discard block
 block discarded – undo
113 113
 		$new_value = $old_value;
114 114
 
115 115
 		// Meta value does not exist yet
116
-		if( false === $old_value ) {
116
+		if ( false === $old_value ) {
117 117
 			return self::UNAPPROVED;
118 118
 		}
119 119
 
120 120
 		// Meta value does not exist yet
121
-		if( true === $old_value ) {
121
+		if ( true === $old_value ) {
122 122
 			return self::APPROVED;
123 123
 		}
124 124
 
125
-		switch ( (string) $old_value ) {
125
+		switch ( (string)$old_value ) {
126 126
 
127 127
 			// Approved values
128 128
 			case 'Approved':
@@ -247,9 +247,9 @@  discard block
 block discarded – undo
247 247
 		foreach ( $choices as $key => $choice ) {
248 248
 
249 249
 			// Is the passed status value the same as the choice value or key?
250
-			if ( $status === $choice['value'] || $status === $key ) {
250
+			if ( $status === $choice[ 'value' ] || $status === $key ) {
251 251
 
252
-				if( 'key' === $attr_key ) {
252
+				if ( 'key' === $attr_key ) {
253 253
 					return $key;
254 254
 				} else {
255 255
 					return rgar( $choice, $attr_key, false );
Please login to merge, or discard this patch.
includes/class-post-types.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 		// Load even when invalid to allow for export
20 20
 		add_action( 'init', array( 'GravityView_Post_Types', 'init_post_types' ) );
21 21
 
22
-		if( GravityView_Compatibility::is_valid() ) {
22
+		if ( GravityView_Compatibility::is_valid() ) {
23 23
 			add_action( 'init', array( 'GravityView_Post_Types', 'init_rewrite' ) );
24 24
 		}
25 25
 	}
@@ -43,8 +43,8 @@  discard block
 block discarded – undo
43 43
 
44 44
 		$supports = array( 'title', 'revisions' );
45 45
 
46
-		if( $is_hierarchical ) {
47
-			$supports[] = 'page-attributes';
46
+		if ( $is_hierarchical ) {
47
+			$supports[ ] = 'page-attributes';
48 48
 		}
49 49
 
50 50
 		/**
Please login to merge, or discard this patch.
includes/extensions/entry-notes/class-gravityview-field-notes.php 1 patch
Spacing   +79 added lines, -79 removed lines patch added patch discarded remove patch
@@ -63,18 +63,18 @@  discard block
 block discarded – undo
63 63
 
64 64
 		add_shortcode( 'gv_note_add', array( 'GravityView_Field_Notes', 'get_add_note_part' ) );
65 65
 
66
-		add_action( 'wp', array( $this, 'maybe_delete_notes'), 1000 );
67
-		add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes') );
68
-		add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes') );
66
+		add_action( 'wp', array( $this, 'maybe_delete_notes' ), 1000 );
67
+		add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes' ) );
68
+		add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes' ) );
69 69
 
70
-		add_action( 'wp', array( $this, 'maybe_add_note'), 1000 );
71
-		add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note') );
72
-		add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note') );
70
+		add_action( 'wp', array( $this, 'maybe_add_note' ), 1000 );
71
+		add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note' ) );
72
+		add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note' ) );
73 73
 
74 74
 		// add template path to check for field
75 75
 		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
76 76
 
77
-		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') );
77
+		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) );
78 78
 		add_action( 'gravityview/field/notes/scripts', array( $this, 'enqueue_scripts' ) );
79 79
 		
80 80
 		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_entry_default_field' ), 10, 3 );
@@ -96,8 +96,8 @@  discard block
 block discarded – undo
96 96
 	 */
97 97
 	public function add_entry_default_field( $entry_default_fields, $form, $zone ) {
98 98
 
99
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
100
-			$entry_default_fields['notes'] = array(
99
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
100
+			$entry_default_fields[ 'notes' ] = array(
101 101
 				'label' => __( 'Entry Notes', 'gravityview' ),
102 102
 				'type'  => 'notes',
103 103
 				'desc'  => __( 'Display, add, and delete notes for an entry.', 'gravityview' ),
@@ -130,23 +130,23 @@  discard block
 block discarded – undo
130 130
 	public function enqueue_scripts() {
131 131
 		global $wp_actions;
132 132
 
133
-		if( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) {
133
+		if ( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) {
134 134
 			wp_enqueue_style( 'gravityview-notes' );
135 135
 			wp_enqueue_script( 'gravityview-notes' );
136 136
 		}
137 137
 
138
-		if( ! wp_script_is( 'gravityview-notes', 'done' ) ) {
138
+		if ( ! wp_script_is( 'gravityview-notes', 'done' ) ) {
139 139
 
140 140
 			$strings = self::strings();
141 141
 
142 142
 			wp_localize_script( 'gravityview-notes', 'GVNotes', array(
143 143
 				'ajaxurl' => admin_url( 'admin-ajax.php' ),
144 144
 				'text' => array(
145
-					'processing' => $strings['processing'],
146
-					'delete_confirm' => $strings['delete-confirm'],
147
-					'note_added' => $strings['added-note'],
148
-					'error_invalid' => $strings['error-invalid'],
149
-					'error_empty_note' => $strings['error-empty-note'],
145
+					'processing' => $strings[ 'processing' ],
146
+					'delete_confirm' => $strings[ 'delete-confirm' ],
147
+					'note_added' => $strings[ 'added-note' ],
148
+					'error_invalid' => $strings[ 'error-invalid' ],
149
+					'error_empty_note' => $strings[ 'error-empty-note' ],
150 150
 				),
151 151
 			) );
152 152
 		}
@@ -163,22 +163,22 @@  discard block
 block discarded – undo
163 163
 	 */
164 164
 	function maybe_add_note() {
165 165
 
166
-		if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
166
+		if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
167 167
 			do_action( 'gravityview_log_error', __METHOD__ . ': The user isnt allowed to add entry notes.' );
168 168
 			return;
169 169
 		}
170 170
 
171
-		if( 'gv_note_add' === rgpost('action') ) {
171
+		if ( 'gv_note_add' === rgpost( 'action' ) ) {
172 172
 
173 173
 			$post = wp_unslash( $_POST );
174 174
 
175
-			if( $this->doing_ajax ) {
176
-				parse_str( $post['data'], $data );
175
+			if ( $this->doing_ajax ) {
176
+				parse_str( $post[ 'data' ], $data );
177 177
 			} else {
178 178
 				$data = $post;
179 179
 			}
180 180
 
181
-			$this->process_add_note( (array) $data );
181
+			$this->process_add_note( (array)$data );
182 182
 		}
183 183
 	}
184 184
 
@@ -205,23 +205,23 @@  discard block
 block discarded – undo
205 205
 		$error = false;
206 206
 		$success = false;
207 207
 
208
-		if( empty( $data['entry-slug'] ) ) {
208
+		if ( empty( $data[ 'entry-slug' ] ) ) {
209 209
 
210
-			$error = self::strings('error-invalid');
210
+			$error = self::strings( 'error-invalid' );
211 211
 			do_action( 'gravityview_log_error', __METHOD__ . ': The note is missing an Entry ID.' );
212 212
 
213 213
 		} else {
214 214
 
215
-			$valid = wp_verify_nonce( $data['gv_note_add'], 'gv_note_add_' . $data['entry-slug'] );
215
+			$valid = wp_verify_nonce( $data[ 'gv_note_add' ], 'gv_note_add_' . $data[ 'entry-slug' ] );
216 216
 			
217 217
 			$has_cap = GVCommon::has_cap( 'gravityview_add_entry_notes' );
218 218
 
219
-			if( ! $has_cap ) {
219
+			if ( ! $has_cap ) {
220 220
 				$error = self::strings( 'error-cap-add' );
221 221
 				do_action( 'gravityview_log_error', __METHOD__ . ': Adding a note failed: the user does not have the "gravityview_add_entry_notes" capability.' );
222 222
 			} elseif ( $valid ) {
223 223
 
224
-				$entry = gravityview_get_entry( $data['entry-slug'], true, false );
224
+				$entry = gravityview_get_entry( $data[ 'entry-slug' ], true, false );
225 225
 
226 226
 				$added = $this->add_note( $entry, $data );
227 227
 
@@ -239,22 +239,22 @@  discard block
 block discarded – undo
239 239
 					$this->maybe_send_entry_notes( $note, $entry, $data );
240 240
 
241 241
 					if ( $note ) {
242
-						$success = self::display_note( $note, ! empty( $data['show-delete'] ) );
243
-						do_action( 'gravityview_log_debug', __METHOD__ . ': The note was successfully created', compact('note', 'data') );
242
+						$success = self::display_note( $note, ! empty( $data[ 'show-delete' ] ) );
243
+						do_action( 'gravityview_log_debug', __METHOD__ . ': The note was successfully created', compact( 'note', 'data' ) );
244 244
 					} else {
245
-						$error = self::strings('error-add-note');
246
-						do_action( 'gravityview_log_error', __METHOD__ . ': The note was not successfully created', compact('note', 'data') );
245
+						$error = self::strings( 'error-add-note' );
246
+						do_action( 'gravityview_log_error', __METHOD__ . ': The note was not successfully created', compact( 'note', 'data' ) );
247 247
 					}
248 248
 				}
249 249
 			} else {
250
-				$error = self::strings('error-invalid');
250
+				$error = self::strings( 'error-invalid' );
251 251
 				do_action( 'gravityview_log_error', __METHOD__ . ': Nonce validation failed; the note was not created' );
252 252
 			}
253 253
 		}
254 254
 
255 255
 
256
-		if( $this->doing_ajax ) {
257
-			if( $success ) {
256
+		if ( $this->doing_ajax ) {
257
+			if ( $success ) {
258 258
 				wp_send_json_success( array( 'html' => $success ) );
259 259
 			} else {
260 260
 				$error = $error ? $error : self::strings( 'error-invalid' );
@@ -280,11 +280,11 @@  discard block
 block discarded – undo
280 280
 			return;
281 281
 		}
282 282
 
283
-		if ( isset( $_POST['action'] ) && 'gv_delete_notes' === $_POST['action'] ) {
283
+		if ( isset( $_POST[ 'action' ] ) && 'gv_delete_notes' === $_POST[ 'action' ] ) {
284 284
 
285 285
 			$post = wp_unslash( $_POST );
286 286
 			if ( $this->doing_ajax ) {
287
-				parse_str( $post['data'], $data );
287
+				parse_str( $post[ 'data' ], $data );
288 288
 			} else {
289 289
 				$data = $post;
290 290
 			}
@@ -315,18 +315,18 @@  discard block
 block discarded – undo
315 315
 	 */
316 316
 	function process_delete_notes( $data ) {
317 317
 
318
-		$valid = wp_verify_nonce( $data['gv_delete_notes'], 'gv_delete_notes_' . $data['entry-slug'] );
318
+		$valid = wp_verify_nonce( $data[ 'gv_delete_notes' ], 'gv_delete_notes_' . $data[ 'entry-slug' ] );
319 319
 		$has_cap = GVCommon::has_cap( 'gravityview_delete_entry_notes' );
320 320
 		$success = false;
321 321
 
322 322
 		if ( $valid && $has_cap ) {
323
-			GravityView_Entry_Notes::delete_notes( $data['note'] );
323
+			GravityView_Entry_Notes::delete_notes( $data[ 'note' ] );
324 324
 			$success = true;
325 325
 		}
326 326
 
327
-		if( $this->doing_ajax ) {
327
+		if ( $this->doing_ajax ) {
328 328
 
329
-			if( $success ) {
329
+			if ( $success ) {
330 330
 				wp_send_json_success();
331 331
 			} else {
332 332
 				if ( ! $valid ) {
@@ -359,13 +359,13 @@  discard block
 block discarded – undo
359 359
 
360 360
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
361 361
 
362
-		unset( $field_options['show_as_link'] );
362
+		unset( $field_options[ 'show_as_link' ] );
363 363
 
364 364
 		$notes_options = array(
365 365
 			'notes' => array(
366 366
 				'type' => 'checkboxes',
367
-				'label' => __('Note Settings', 'gravityview'),
368
-				'desc' => sprintf( _x('Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ),
367
+				'label' => __( 'Note Settings', 'gravityview' ),
368
+				'desc' => sprintf( _x( 'Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ),
369 369
 				'options' => array(
370 370
 					'view' => array(
371 371
 						'label' => __( 'Display notes?', 'gravityview' ),
@@ -417,7 +417,7 @@  discard block
 block discarded – undo
417 417
 			'processing' => __( 'Processing&hellip;', 'gravityview' ),
418 418
 			'other-email' => __( 'Other email address', 'gravityview' ),
419 419
 			'email-label' => __( 'Email address', 'gravityview' ),
420
-			'email-placeholder' => _x('[email protected]', 'Example email address used as a placeholder', 'gravityview'),
420
+			'email-placeholder' => _x( '[email protected]', 'Example email address used as a placeholder', 'gravityview' ),
421 421
 			'subject-label' => __( 'Subject', 'gravityview' ),
422 422
 			'subject' => __( 'Email subject', 'gravityview' ),
423 423
 			'default-email-subject' => __( 'New entry note', 'gravityview' ),
@@ -437,7 +437,7 @@  discard block
 block discarded – undo
437 437
 		 */
438 438
 		$strings = gv_map_deep( apply_filters( 'gravityview/field/notes/strings', $strings ), 'esc_html' );
439 439
 
440
-		if( $key ) {
440
+		if ( $key ) {
441 441
 			return isset( $strings[ $key ] ) ? $strings[ $key ] : '';
442 442
 		}
443 443
 
@@ -456,7 +456,7 @@  discard block
 block discarded – undo
456 456
 	 */
457 457
 	static public function display_note( $note, $show_delete = false ) {
458 458
 
459
-		if( ! is_object( $note ) ) {
459
+		if ( ! is_object( $note ) ) {
460 460
 			return '';
461 461
 		}
462 462
 
@@ -497,7 +497,7 @@  discard block
 block discarded – undo
497 497
 		$note_row = ob_get_clean();
498 498
 
499 499
 		$replacements = array(
500
-			'{note_id}' => $note_content['note_id'],
500
+			'{note_id}' => $note_content[ 'note_id' ],
501 501
 			'{row_class}' => 'gv-note',
502 502
 			'{note_detail}' => $note_detail_html
503 503
 		);
@@ -529,13 +529,13 @@  discard block
 block discarded – undo
529 529
 
530 530
 		$user_data = get_userdata( $current_user->ID );
531 531
 
532
-		$note_content = trim( $data['gv-note-content'] );
532
+		$note_content = trim( $data[ 'gv-note-content' ] );
533 533
 
534
-		if( empty( $note_content ) ) {
534
+		if ( empty( $note_content ) ) {
535 535
 			return new WP_Error( 'gv-add-note-empty', __( 'The note is empty.', 'gravityview' ) );
536 536
 		}
537 537
 
538
-		$return = GravityView_Entry_Notes::add_note( $entry['id'], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
538
+		$return = GravityView_Entry_Notes::add_note( $entry[ 'id' ], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
539 539
 
540 540
 		return $return;
541 541
 	}
@@ -551,7 +551,7 @@  discard block
 block discarded – undo
551 551
 	 */
552 552
 	public static function get_add_note_part() {
553 553
 
554
-		if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
554
+		if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
555 555
 			do_action( 'gravityview_log_error', __METHOD__ . ': User does not have permission to add entry notes ("gravityview_add_entry_notes").' );
556 556
 			return '';
557 557
 		}
@@ -564,19 +564,19 @@  discard block
 block discarded – undo
564 564
 
565 565
 		$visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' );
566 566
 		$entry = $gravityview_view->getCurrentEntry();
567
-		$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
567
+		$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
568 568
 		$nonce_field = wp_nonce_field( 'gv_note_add_' . $entry_slug, 'gv_note_add', false, false );
569 569
 
570 570
 		// Only generate the dropdown if the field settings allow it
571 571
 		$email_fields = '';
572
-		if( ! empty( $visibility_settings['email'] ) ) {
572
+		if ( ! empty( $visibility_settings[ 'email' ] ) ) {
573 573
 			$email_fields = self::get_note_email_fields( $entry_slug );
574 574
 		}
575 575
 
576 576
 		$add_note_html = str_replace( '{entry_slug}', $entry_slug, $add_note_html );
577 577
 		$add_note_html = str_replace( '{nonce_field}', $nonce_field, $add_note_html );
578
-		$add_note_html = str_replace( '{show_delete}', intval( $visibility_settings['delete'] ), $add_note_html );
579
-		$add_note_html   = str_replace( '{email_fields}', $email_fields, $add_note_html );
578
+		$add_note_html = str_replace( '{show_delete}', intval( $visibility_settings[ 'delete' ] ), $add_note_html );
579
+		$add_note_html = str_replace( '{email_fields}', $email_fields, $add_note_html );
580 580
 		$add_note_html = str_replace( '{url}', esc_url_raw( add_query_arg( array() ) ), $add_note_html );
581 581
 
582 582
 		return $add_note_html;
@@ -601,8 +601,8 @@  discard block
 block discarded – undo
601 601
 		$note_emails = array();
602 602
 
603 603
 		foreach ( $email_fields as $email_field ) {
604
-			if ( ! empty( $entry["{$email_field->id}"] ) && is_email( $entry["{$email_field->id}"] ) ) {
605
-				$note_emails[] = $entry["{$email_field->id}"];
604
+			if ( ! empty( $entry[ "{$email_field->id}" ] ) && is_email( $entry[ "{$email_field->id}" ] ) ) {
605
+				$note_emails[ ] = $entry[ "{$email_field->id}" ];
606 606
 			}
607 607
 		}
608 608
 
@@ -614,7 +614,7 @@  discard block
 block discarded – undo
614 614
 		 */
615 615
 		$note_emails = apply_filters( 'gravityview/field/notes/emails', $note_emails, $entry );
616 616
 
617
-		return (array) $note_emails;
617
+		return (array)$note_emails;
618 618
 	}
619 619
 
620 620
 	/**
@@ -630,7 +630,7 @@  discard block
 block discarded – undo
630 630
 	 */
631 631
 	private static function get_note_email_fields( $entry_slug = '' ) {
632 632
 
633
-		if( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
633
+		if ( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
634 634
 			do_action( 'gravityview_log_error', __METHOD__ . ': User does not have permission to email entry notes ("gravityview_email_entry_notes").' );
635 635
 			return '';
636 636
 		}
@@ -652,27 +652,27 @@  discard block
 block discarded – undo
652 652
 
653 653
 		if ( ! empty( $note_emails ) || $include_custom ) { ?>
654 654
 			<div class="gv-note-email-container">
655
-				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings['also-email'];  ?></label>
655
+				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings[ 'also-email' ]; ?></label>
656 656
 				<select class="gv-note-email-to" name="gv-note-to" id="gv-note-email-to-<?php echo $entry_slug_esc; ?>">
657
-					<option value=""><?php echo $strings['also-email'];  ?></option>
657
+					<option value=""><?php echo $strings[ 'also-email' ]; ?></option>
658 658
 					<?php foreach ( $note_emails as  $email ) {
659 659
 						?>
660 660
 						<option value="<?php echo esc_attr( $email ); ?>"><?php echo esc_html( $email ); ?></option>
661 661
 					<?php }
662
-					if( $include_custom ) { ?>
663
-					<option value="custom"><?php echo self::strings('other-email'); ?></option>
662
+					if ( $include_custom ) { ?>
663
+					<option value="custom"><?php echo self::strings( 'other-email' ); ?></option>
664 664
 					<?php } ?>
665 665
 				</select>
666 666
 				<fieldset class="gv-note-to-container">
667
-					<?php if( $include_custom ) { ?>
667
+					<?php if ( $include_custom ) { ?>
668 668
 					<div class='gv-note-to-custom-container'>
669
-						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings['email-label']; ?></label>
670
-						<input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings['email-placeholder']; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" />
669
+						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'email-label' ]; ?></label>
670
+						<input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings[ 'email-placeholder' ]; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" />
671 671
 					</div>
672 672
 					<?php } ?>
673 673
 		            <div class='gv-note-subject-container'>
674
-		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings['subject-label']; ?></label>
675
-		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings['subject']; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
674
+		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'subject-label' ]; ?></label>
675
+		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings[ 'subject' ]; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
676 676
 		            </div>
677 677
 				</fieldset>
678 678
 			</div>
@@ -695,7 +695,7 @@  discard block
 block discarded – undo
695 695
 	 */
696 696
 	private function maybe_send_entry_notes( $note = false, $entry, $data ) {
697 697
 
698
-		if( ! $note || ! GVCommon::has_cap('gravityview_email_entry_notes') ) {
698
+		if ( ! $note || ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
699 699
 			do_action( 'gravityview_log_debug', __METHOD__ . ': User doesnt have "gravityview_email_entry_notes" cap, or $note is empty', $note );
700 700
 			return;
701 701
 		}
@@ -703,7 +703,7 @@  discard block
 block discarded – undo
703 703
 		do_action( 'gravityview_log_debug', __METHOD__ . ': $data', $data );
704 704
 
705 705
 		//emailing notes if configured
706
-		if ( ! empty( $data['gv-note-to'] ) ) {
706
+		if ( ! empty( $data[ 'gv-note-to' ] ) ) {
707 707
 
708 708
 			$default_data = array(
709 709
 				'gv-note-to' => '',
@@ -713,11 +713,11 @@  discard block
 block discarded – undo
713 713
                 'current-url' => '',
714 714
 			);
715 715
 
716
-			$current_user  = wp_get_current_user();
716
+			$current_user = wp_get_current_user();
717 717
 			$email_data = wp_parse_args( $data, $default_data );
718 718
 
719
-			$from    = $current_user->user_email;
720
-			$to = $email_data['gv-note-to'];
719
+			$from = $current_user->user_email;
720
+			$to = $email_data[ 'gv-note-to' ];
721 721
 
722 722
 			/**
723 723
 			 * Documented in get_note_email_fields
@@ -725,8 +725,8 @@  discard block
 block discarded – undo
725 725
 			 */
726 726
 			$include_custom = apply_filters( 'gravityview/field/notes/custom-email', true );
727 727
 
728
-			if( 'custom' === $to && $include_custom ) {
729
-				$to = $email_data['gv-note-to-custom'];
728
+			if ( 'custom' === $to && $include_custom ) {
729
+				$to = $email_data[ 'gv-note-to-custom' ];
730 730
 				do_action( 'gravityview_log_debug', __METHOD__ . ': Sending note to a custom email address: ' . $to );
731 731
 			}
732 732
 
@@ -737,13 +737,13 @@  discard block
 block discarded – undo
737 737
 
738 738
 			$bcc = false;
739 739
 			$reply_to = $from;
740
-			$subject = trim( $email_data['gv-note-subject'] );
740
+			$subject = trim( $email_data[ 'gv-note-subject' ] );
741 741
 
742 742
 			// We use empty() here because GF uses empty to check against, too. `0` isn't a valid subject to GF
743 743
 			$subject = empty( $subject ) ? self::strings( 'default-email-subject' ) : $subject;
744
-			$message = $email_data['gv-note-content'];
744
+			$message = $email_data[ 'gv-note-content' ];
745 745
 			$email_footer = self::strings( 'email-footer' );
746
-			$from_name     = $current_user->display_name;
746
+			$from_name = $current_user->display_name;
747 747
 			$message_format = 'html';
748 748
 
749 749
 			/**
@@ -774,7 +774,7 @@  discard block
 block discarded – undo
774 774
 
775 775
 			GVCommon::send_email( $from, $to, $bcc, $reply_to, $subject, $message, $from_name, $message_format, '', $entry, false );
776 776
 
777
-			$form  = isset( $entry['form_id'] ) ? GFAPI::get_form( $entry['form_id'] ) : array();
777
+			$form = isset( $entry[ 'form_id' ] ) ? GFAPI::get_form( $entry[ 'form_id' ] ) : array();
778 778
 
779 779
 			/**
780 780
 			 * @see https://www.gravityhelp.com/documentation/article/10146-2/ It's here for compatibility with Gravity Forms
@@ -800,7 +800,7 @@  discard block
 block discarded – undo
800 800
 
801 801
 	    $output = '';
802 802
 
803
-		if( ! empty( $email_footer ) ) {
803
+		if ( ! empty( $email_footer ) ) {
804 804
 		    $url = rgar( $email_data, 'current-url' );
805 805
 			$url = html_entity_decode( $url );
806 806
 			$url = site_url( $url );
Please login to merge, or discard this patch.
includes/class-cache.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 		/**
80 80
 		 * @see RGFormsModel::update_lead_property() Trigger when any entry property changes
81 81
 		 */
82
-		foreach( $this->lead_db_columns as $column ) {
82
+		foreach ( $this->lead_db_columns as $column ) {
83 83
 			add_action( 'gform_update_' . $column, array( $this, 'entry_status_changed' ), 10, 3 );
84 84
 		}
85 85
 
@@ -112,9 +112,9 @@  discard block
 block discarded – undo
112 112
 			return;
113 113
 		}
114 114
 
115
-		do_action( 'gravityview_log_debug', __METHOD__ . ' adding form ' . $entry['form_id'] . ' to blacklist because entry #' . $lead_id . ' was deleted', array( 'value' => $property_value, 'previous' => $previous_value ) );
115
+		do_action( 'gravityview_log_debug', __METHOD__ . ' adding form ' . $entry[ 'form_id' ] . ' to blacklist because entry #' . $lead_id . ' was deleted', array( 'value' => $property_value, 'previous' => $previous_value ) );
116 116
 		
117
-		$this->blacklist_add( $entry['form_id'] );
117
+		$this->blacklist_add( $entry[ 'form_id' ] );
118 118
 	}
119 119
 
120 120
 	/**
@@ -127,9 +127,9 @@  discard block
 block discarded – undo
127 127
 	 */
128 128
 	public function entry_updated( $form, $lead_id ) {
129 129
 
130
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_updated] adding form ' . $form['id'] . ' to blacklist because entry #' . $lead_id . ' was updated' );
130
+		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_updated] adding form ' . $form[ 'id' ] . ' to blacklist because entry #' . $lead_id . ' was updated' );
131 131
 
132
-		$this->blacklist_add( $form['id'] );
132
+		$this->blacklist_add( $form[ 'id' ] );
133 133
 	}
134 134
 
135 135
 	/**
@@ -144,9 +144,9 @@  discard block
 block discarded – undo
144 144
 	 */
145 145
 	public function entry_created( $entry, $form ) {
146 146
 
147
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_created] adding form ' . $form['id'] . ' to blacklist because entry #' . $entry['id'] . ' was created' );
147
+		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_created] adding form ' . $form[ 'id' ] . ' to blacklist because entry #' . $entry[ 'id' ] . ' was created' );
148 148
 
149
-		$this->blacklist_add( $form['id'] );
149
+		$this->blacklist_add( $form[ 'id' ] );
150 150
 	}
151 151
 
152 152
 	/**
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 		// Normally just one form, but supports multiple forms
166 166
 		//
167 167
 		// Array of IDs 12, 5, 14 would result in `f-12f-5f-14`
168
-		$forms = 'f:' . implode( '&f:', (array) $form_ids );
168
+		$forms = 'f:' . implode( '&f:', (array)$form_ids );
169 169
 
170 170
 		// Prefix for transient keys
171 171
 		// Now the prefix would be: `gv-cache-f-12f-5f-14`
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 		) );
223 223
 
224 224
 		// Add the passed form IDs
225
-		$blacklist = array_merge( (array) $blacklist, $form_ids );
225
+		$blacklist = array_merge( (array)$blacklist, $form_ids );
226 226
 
227 227
 		// Don't duplicate
228 228
 		$blacklist = array_unique( $blacklist );
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 
243 243
 		$blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() );
244 244
 
245
-		$updated_list = array_diff( $blacklist, (array) $form_ids );
245
+		$updated_list = array_diff( $blacklist, (array)$form_ids );
246 246
 
247 247
 		do_action( 'gravityview_log_debug', 'GravityView_Cache[blacklist_remove] Removing form IDs from cache blacklist', array(
248 248
 			'$form_ids'     => $form_ids,
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
 			return false;
276 276
 		}
277 277
 
278
-		foreach ( (array) $form_ids as $form_id ) {
278
+		foreach ( (array)$form_ids as $form_id ) {
279 279
 
280 280
 			if ( in_array( $form_id, $blacklist ) ) {
281 281
 
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
 			 * @filter `gravityview_cache_time_{$filter_name}` Modify the cache time for a type of cache
348 348
 			 * @param int $time_in_seconds Default: `DAY_IN_SECONDS`
349 349
 			 */
350
-			$cache_time = (int) apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
350
+			$cache_time = (int)apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
351 351
 
352 352
 			do_action( 'gravityview_log_debug', 'GravityView_Cache[set] Setting cache with transient key ' . $this->key . ' for ' . $cache_time . ' seconds' );
353 353
 
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
 			return;
384 384
 		}
385 385
 
386
-		foreach ( (array) $form_ids as $form_id ) {
386
+		foreach ( (array)$form_ids as $form_id ) {
387 387
 
388 388
 			$key = $this->get_cache_key_prefix( $form_id );
389 389
 
@@ -497,7 +497,7 @@  discard block
 block discarded – undo
497 497
 
498 498
 		if ( GVCommon::has_cap( 'edit_gravityviews' ) ) {
499 499
 
500
-			if ( isset( $_GET['cache'] ) || isset( $_GET['nocache'] ) ) {
500
+			if ( isset( $_GET[ 'cache' ] ) || isset( $_GET[ 'nocache' ] ) ) {
501 501
 
502 502
 				do_action( 'gravityview_log_debug', 'GravityView_Cache[use_cache] Not using cache: ?cache or ?nocache is in the URL' );
503 503
 
@@ -526,7 +526,7 @@  discard block
 block discarded – undo
526 526
 		 */
527 527
 		$use_cache = apply_filters( 'gravityview_use_cache', $use_cache, $this );
528 528
 
529
-		return (boolean) $use_cache;
529
+		return (boolean)$use_cache;
530 530
 	}
531 531
 
532 532
 }
Please login to merge, or discard this patch.
includes/class-gravityview-shortcode.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -49,8 +49,8 @@  discard block
 block discarded – undo
49 49
 		do_action( 'gravityview_log_debug', __FUNCTION__ . ' $passed_atts: ', $passed_atts );
50 50
 
51 51
 		// Get details about the current View
52
-		if( !empty( $passed_atts['detail'] ) ) {
53
-			return $this->get_view_detail( $passed_atts['detail'] );
52
+		if ( ! empty( $passed_atts[ 'detail' ] ) ) {
53
+			return $this->get_view_detail( $passed_atts[ 'detail' ] );
54 54
 		}
55 55
 
56 56
 		$atts = $this->parse_and_sanitize_atts( $passed_atts );
@@ -86,16 +86,16 @@  discard block
 block discarded – undo
86 86
 		$filtered_atts = shortcode_atts( $supported_atts, $passed_atts, 'gravityview' );
87 87
 
88 88
 		// Only keep the passed attributes after making sure that they're valid pairs
89
-		$filtered_atts = function_exists( 'array_intersect_key' ) ? array_intersect_key( (array) $passed_atts, $filtered_atts ) : $filtered_atts;
89
+		$filtered_atts = function_exists( 'array_intersect_key' ) ? array_intersect_key( (array)$passed_atts, $filtered_atts ) : $filtered_atts;
90 90
 
91 91
 		$atts = array();
92 92
 
93
-		foreach( $filtered_atts as $key => $passed_value ) {
93
+		foreach ( $filtered_atts as $key => $passed_value ) {
94 94
 
95 95
 			// Allow using GravityView merge tags in shortcode attributes, like {get} and {created_by}
96 96
 			$passed_value = GravityView_Merge_Tags::replace_variables( $passed_value );
97 97
 
98
-			switch( $defaults[ $key ]['type'] ) {
98
+			switch ( $defaults[ $key ][ 'type' ] ) {
99 99
 
100 100
 				/**
101 101
 				 * Make sure number fields are numeric.
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 				 * @see http://php.net/manual/en/function.is-numeric.php#107326
104 104
 				 */
105 105
 				case 'number':
106
-					if( is_numeric( $passed_value ) ) {
106
+					if ( is_numeric( $passed_value ) ) {
107 107
 						$atts[ $key ] = ( $passed_value + 0 );
108 108
 					}
109 109
 					break;
@@ -118,8 +118,8 @@  discard block
 block discarded – undo
118 118
 				 */
119 119
 				case 'select':
120 120
 				case 'radio':
121
-					$options = isset( $defaults[ $key ]['choices'] ) ? $defaults[ $key ]['choices'] : $defaults[ $key ]['options'];
122
-					if( in_array( $passed_value, array_keys( $options ) ) ) {
121
+					$options = isset( $defaults[ $key ][ 'choices' ] ) ? $defaults[ $key ][ 'choices' ] : $defaults[ $key ][ 'options' ];
122
+					if ( in_array( $passed_value, array_keys( $options ) ) ) {
123 123
 						$atts[ $key ] = $passed_value;
124 124
 					}
125 125
 					break;
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 		$gravityview_view = GravityView_View::getInstance();
149 149
 		$return = '';
150 150
 
151
-		switch( $detail ) {
151
+		switch ( $detail ) {
152 152
 			case 'total_entries':
153 153
 				$return = number_format_i18n( $gravityview_view->getTotalEntries() );
154 154
 				break;
Please login to merge, or discard this patch.
includes/admin/field-types/type_textarea.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 		?>
10 10
 		<label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php
11 11
 
12
-			echo '<span class="gv-label">'.$this->get_field_label().'</span>';
12
+			echo '<span class="gv-label">' . $this->get_field_label() . '</span>';
13 13
 			echo $this->get_tooltip() . $this->get_field_desc();
14 14
 		?><div>
15 15
 				<?php $this->render_input(); ?>
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 	}
20 20
 
21 21
 	function render_input( $override_input = null ) {
22
-		if( isset( $override_input ) ) {
22
+		if ( isset( $override_input ) ) {
23 23
 			echo $override_input;
24 24
 			return;
25 25
 		}
@@ -28,17 +28,17 @@  discard block
 block discarded – undo
28 28
 
29 29
 		$show_mt = $this->show_merge_tags();
30 30
 
31
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
31
+        if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) {
32 32
             $class .= ' merge-tag-support mt-position-right ';
33 33
 
34
-            if( empty( $this->field['show_all_fields'] ) ) {
34
+            if ( empty( $this->field[ 'show_all_fields' ] ) ) {
35 35
             	$class .= ' mt-hide_all_fields ';
36 36
             }
37 37
         }
38 38
 		$class .= rgar( $this->field, 'class' );
39 39
 		$placeholder = rgar( $this->field, 'placeholder' );
40 40
 		?>
41
-		<textarea name="<?php echo esc_attr( $this->name ); ?>" placeholder="<?php echo esc_attr( $placeholder ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo gravityview_sanitize_html_class( $class ); ?>" rows="5"><?php echo esc_textarea(  $this->value ); ?></textarea>
41
+		<textarea name="<?php echo esc_attr( $this->name ); ?>" placeholder="<?php echo esc_attr( $placeholder ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo gravityview_sanitize_html_class( $class ); ?>" rows="5"><?php echo esc_textarea( $this->value ); ?></textarea>
42 42
        	<?php
43 43
 	}
44 44
 
Please login to merge, or discard this patch.