Completed
Pull Request — develop (#1491)
by Zack
07:40
created
includes/fields/class-gravityview-field-gravatar.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 	static public function get_email( $field_settings, $entry ) {
72 72
 
73 73
 		// There was no logged in user.
74
-		switch ( $field_settings['email_field'] ) {
74
+		switch ( $field_settings[ 'email_field' ] ) {
75 75
 			case 'created_by_email':
76 76
 
77 77
 				$created_by = \GV\Utils::get( $entry, 'created_by', null );
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 			return $field_options;
103 103
 		}
104 104
 
105
-		$field_options['email_field'] = array(
105
+		$field_options[ 'email_field' ] = array(
106 106
 			'type'    => 'select',
107 107
 			'label'   => __( 'Email to Use', 'gravityview' ),
108 108
 			'value'   => 'created_by_email',
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 			'choices' => $this->_get_email_field_choices( $form_id ),
111 111
 		);
112 112
 
113
-		$field_options['default'] = array(
113
+		$field_options[ 'default' ] = array(
114 114
 			'type'    => 'select',
115 115
 			'label'   => __( 'Default Image', 'gravityview' ),
116 116
 			'desc'    => __( 'Choose the default image to be shown when an email has no Gravatar.', 'gravityview' ) . ' <a href="https://en.gravatar.com/site/implement/images/">' . esc_html( sprintf( __( 'Read more about %s', 'gravityview' ), __( 'Default Image', 'gravityview' ) ) ) . '</a>',
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 			),
127 127
 		);
128 128
 
129
-		$field_options['size'] = array(
129
+		$field_options[ 'size' ] = array(
130 130
 			'type'  => 'number',
131 131
 			'label' => __( 'Size in Pixels', 'gravityview' ),
132 132
 			'value' => 80,
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
 		$email_fields = GFAPI::get_fields_by_type( $form, array( 'email' ) );
160 160
 
161 161
 		foreach ( $email_fields as $email_field ) {
162
-			$email_field_id                   = $email_field['id'];
162
+			$email_field_id                   = $email_field[ 'id' ];
163 163
 			$email_field_label                = GVCommon::get_field_label( $form, $email_field_id );
164 164
 			$email_field_label                = sprintf( __( 'Field: %s', 'gravityview' ), $email_field_label );
165 165
 			$field_choices[ $email_field_id ] = esc_html( $email_field_label );
Please login to merge, or discard this patch.
includes/class-gravityview-entry-list.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -87,13 +87,13 @@
 block discarded – undo
87 87
 	 * @since 2.0 Added $template_context parameter
88 88
 	 * @since 2.7.2 Added $view_id parameter
89 89
 	 *
90
-	 * @param array|GV\Entry[] $entries
90
+	 * @param GV\Entry[] $entries
91 91
 	 * @param int $post_id
92 92
 	 * @param array $form
93 93
 	 * @param string $link_format
94 94
 	 * @param string $after_link
95 95
 	 * @param \GV\Template_Context $template_context The context
96
-	 * @param int|null $view_id View to link to when displaying on a page with multiple Views
96
+	 * @param integer $view_id View to link to when displaying on a page with multiple Views
97 97
 	 */
98 98
 	function __construct( $entries = array(), $post_id = 0, $form = array(), $link_format = '', $after_link = '', $context = '', $template_context = null, $view_id = 0 ) {
99 99
 		$this->entries = $entries;
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -190,8 +190,8 @@  discard block
 block discarded – undo
190 190
 	public function get_output() {
191 191
 
192 192
 		// No Entries
193
-		if( empty( $this->entries ) ) {
194
-			return '<div class="gv-no-results">'.$this->empty_message.'</div>';
193
+		if ( empty( $this->entries ) ) {
194
+			return '<div class="gv-no-results">' . $this->empty_message . '</div>';
195 195
 		}
196 196
 
197 197
 		$output = '';
@@ -202,22 +202,22 @@  discard block
 block discarded – undo
202 202
 			$current_entry = GravityView_View::getInstance()->getCurrentEntry();
203 203
 		}
204 204
 
205
-		$output .= '<'. $this->wrapper_tag .'>';
205
+		$output .= '<' . $this->wrapper_tag . '>';
206 206
 
207
-		foreach( $this->entries as $entry ) {
207
+		foreach ( $this->entries as $entry ) {
208 208
 
209 209
 			if ( $entry instanceof \GV\Entry ) {
210 210
 				$entry = $entry->as_entry();
211 211
 			}
212 212
 
213
-			if( $this->skip_entry( $entry, $current_entry ) ) {
213
+			if ( $this->skip_entry( $entry, $current_entry ) ) {
214 214
 				continue;
215 215
 			}
216 216
 
217 217
 			$output .= $this->get_item_output( $entry );
218 218
 		}
219 219
 
220
-		$output .= '</'. $this->wrapper_tag .'>';
220
+		$output .= '</' . $this->wrapper_tag . '>';
221 221
 
222 222
 		/**
223 223
 		 * @filter `gravityview/widget/recent-entries/output` Modify the HTML of the Recent Entries widget output
@@ -240,15 +240,15 @@  discard block
 block discarded – undo
240 240
 	private function skip_entry( $entry, $current_entry ) {
241 241
 
242 242
 		// If skip entry is off, or there's no current entry, return false
243
-		if( empty( $this->skip_current_entry ) || empty( $current_entry ) ) {
243
+		if ( empty( $this->skip_current_entry ) || empty( $current_entry ) ) {
244 244
 			return false;
245 245
 		}
246 246
 
247 247
 		// If in Single or Edit mode, $current_entry will be an array.
248
-		$current_entry_id = is_array( $current_entry ) ? $current_entry['id'] : $current_entry;
248
+		$current_entry_id = is_array( $current_entry ) ? $current_entry[ 'id' ] : $current_entry;
249 249
 
250 250
 		// If the entry ID matches the current entry, yes: skip
251
-		if( $entry['id'] === $current_entry_id ) {
251
+		if ( $entry[ 'id' ] === $current_entry_id ) {
252 252
 			return true;
253 253
 		}
254 254
 
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
 
284 284
 		$item_output = gravityview_get_link( $link, $this->link_format );
285 285
 
286
-		if( !empty( $this->after_link ) ) {
286
+		if ( ! empty( $this->after_link ) ) {
287 287
 
288 288
 			/**
289 289
 			 * @filter `gravityview/entry-list/after-link` Modify the content displayed after the entry link in an entry list
@@ -292,14 +292,14 @@  discard block
 block discarded – undo
292 292
 			 * @param array $entry Gravity Forms entry array
293 293
 			 * @param GravityView_Entry_List $this The current class instance
294 294
 			 */
295
-			$after_link = apply_filters( 'gravityview/entry-list/after-link', '<div>'.$this->after_link.'</div>', $entry, $this );
295
+			$after_link = apply_filters( 'gravityview/entry-list/after-link', '<div>' . $this->after_link . '</div>', $entry, $this );
296 296
 
297 297
 			$item_output .= $after_link;
298 298
 		}
299 299
 
300 300
 		$item_output = GravityView_API::replace_variables( $item_output, $this->form, $entry );
301 301
 
302
-		$item_output = '<'. $this->item_tag .'>'. $item_output .'</'. $this->item_tag .'>';
302
+		$item_output = '<' . $this->item_tag . '>' . $item_output . '</' . $this->item_tag . '>';
303 303
 
304 304
 		/**
305 305
 		 * @filter `gravityview/entry-list/item` Modify each item's output in an entry list
Please login to merge, or discard this patch.
includes/wordpress-widgets/class-gravityview-recent-entries-widget.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -176,7 +176,7 @@
 block discarded – undo
176 176
 	 * @param  array $instance Settings for the current widget
177 177
 	 * @param  string $form_id Form ID int, as string
178 178
 	 *
179
-	 * @return array|GV\Entry[] $entries Multidimensional array of Gravity Forms entries or GravityView Entry objects
179
+	 * @return GV\Entry[] $entries Multidimensional array of Gravity Forms entries or GravityView Entry objects
180 180
 	 */
181 181
 	private function get_entries( $instance, $form_id ) {
182 182
 
Please login to merge, or discard this patch.
Spacing   +55 added lines, -55 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,17 +68,17 @@  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
-			wp_enqueue_script( 'gravityview_widgets', plugins_url('assets/js/admin-widgets'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery', 'gform_gravityforms' ), GravityView_Plugin::version );
75
+			wp_enqueue_script( 'gravityview_widgets', plugins_url( 'assets/js/admin-widgets' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery', 'gform_gravityforms' ), GravityView_Plugin::version );
76 76
 
77 77
 			wp_localize_script( 'gravityview_widgets', 'GVWidgets', array(
78 78
 				'nonce' => wp_create_nonce( 'gravityview_ajax_widget' )
79
-			));
79
+			) );
80 80
 
81
-			wp_enqueue_style( 'gravityview_views_styles', plugins_url('assets/css/admin-views.css', GRAVITYVIEW_FILE), array('dashicons' ), GravityView_Plugin::version );
81
+			wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons' ), GravityView_Plugin::version );
82 82
 		}
83 83
 
84 84
 	}
@@ -93,19 +93,19 @@  discard block
 block discarded – undo
93 93
 	function widget( $args, $instance ) {
94 94
 
95 95
 		// Don't have the Customizer render too soon.
96
-		if( empty( $instance['view_id'] ) ) {
96
+		if ( empty( $instance[ 'view_id' ] ) ) {
97 97
 			return;
98 98
 		}
99 99
 
100
-		$args['id']        = ( isset( $args['id'] ) ) ? $args['id'] : 'gv_recent_entries';
101
-		$instance['title'] = ( isset( $instance['title'] ) ) ? $instance['title'] : '';
100
+		$args[ 'id' ]        = ( isset( $args[ 'id' ] ) ) ? $args[ 'id' ] : 'gv_recent_entries';
101
+		$instance[ 'title' ] = ( isset( $instance[ 'title' ] ) ) ? $instance[ 'title' ] : '';
102 102
 
103
-		$title = apply_filters( 'widget_title', $instance[ 'title' ], $instance, $args['id'] );
103
+		$title = apply_filters( 'widget_title', $instance[ 'title' ], $instance, $args[ 'id' ] );
104 104
 
105
-		echo $args['before_widget'];
105
+		echo $args[ 'before_widget' ];
106 106
 
107
-		if ( !empty( $title ) ) {
108
-			echo $args['before_title'] . $title . $args['after_title'];
107
+		if ( ! empty( $title ) ) {
108
+			echo $args[ 'before_title' ] . $title . $args[ 'after_title' ];
109 109
 		}
110 110
 
111 111
 		/**
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 		 */
126 126
 		do_action( 'gravityview/widget/recent-entries/after_widget', $args, $instance );
127 127
 
128
-		echo $args['after_widget'];
128
+		echo $args[ 'after_widget' ];
129 129
 	}
130 130
 
131 131
 	/**
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 	 */
140 140
 	private function get_output( $instance ) {
141 141
 
142
-		$form_id = gravityview_get_form_id( $instance['view_id'] );
142
+		$form_id = gravityview_get_form_id( $instance[ 'view_id' ] );
143 143
 
144 144
 		$form = gravityview_get_form( $form_id );
145 145
 
@@ -149,13 +149,13 @@  discard block
 block discarded – undo
149 149
 		 * @since 1.6.1
150 150
 		 * @var int $entry_link_post_id The ID to use as the parent post for the entry
151 151
 		 */
152
-		$entry_link_post_id = ( empty( $instance['error_post_id'] ) && !empty( $instance['post_id'] ) ) ? $instance['post_id'] : $instance['view_id'];
152
+		$entry_link_post_id = ( empty( $instance[ 'error_post_id' ] ) && ! empty( $instance[ 'post_id' ] ) ) ? $instance[ 'post_id' ] : $instance[ 'view_id' ];
153 153
 
154 154
 		/**
155 155
 		 * Generate list output
156 156
 		 * @since 1.7.2
157 157
 		 */
158
-		$List = new GravityView_Entry_List( $entries, $entry_link_post_id, $form, $instance['link_format'], $instance['after_link'], 'recent-entries-widget', null, $instance['view_id'] );
158
+		$List = new GravityView_Entry_List( $entries, $entry_link_post_id, $form, $instance[ 'link_format' ], $instance[ 'after_link' ], 'recent-entries-widget', null, $instance[ 'view_id' ] );
159 159
 
160 160
 		$output = $List->get_output();
161 161
 
@@ -180,9 +180,9 @@  discard block
 block discarded – undo
180 180
 	 */
181 181
 	private function get_entries( $instance, $form_id ) {
182 182
 
183
-		$view = \GV\View::by_id( $instance['view_id'] );
183
+		$view = \GV\View::by_id( $instance[ 'view_id' ] );
184 184
 
185
-		$limit = isset( $instance['limit'] ) ? $instance['limit'] : 10;
185
+		$limit = isset( $instance[ 'limit' ] ) ? $instance[ 'limit' ] : 10;
186 186
 
187 187
 		$view->settings->set( 'page_size', $limit );
188 188
 
@@ -205,23 +205,23 @@  discard block
 block discarded – undo
205 205
 		$instance = $new_instance;
206 206
 
207 207
 		// Force positive number
208
-		$instance['limit'] = empty( $instance['limit'] ) ? 10 : absint( $instance['limit'] );
208
+		$instance[ 'limit' ] = empty( $instance[ 'limit' ] ) ? 10 : absint( $instance[ 'limit' ] );
209 209
 
210
-		$instance['view_id'] = intval( $instance['view_id'] );
210
+		$instance[ 'view_id' ] = intval( $instance[ 'view_id' ] );
211 211
 
212
-		$instance['link_format'] = trim( rtrim( $instance['link_format'] ) );
212
+		$instance[ 'link_format' ] = trim( rtrim( $instance[ 'link_format' ] ) );
213 213
 
214
-		$instance['link_format'] = empty( $instance['link_format'] ) ? $old_instance['link_format'] : $instance['link_format'];
214
+		$instance[ 'link_format' ] = empty( $instance[ 'link_format' ] ) ? $old_instance[ 'link_format' ] : $instance[ 'link_format' ];
215 215
 
216
-		$instance['post_id'] = empty( $instance['post_id'] ) ? '' : intval( $instance['post_id'] );
216
+		$instance[ 'post_id' ] = empty( $instance[ 'post_id' ] ) ? '' : intval( $instance[ 'post_id' ] );
217 217
 
218
-		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $instance['post_id'], $instance['view_id'] );
218
+		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $instance[ 'post_id' ], $instance[ 'view_id' ] );
219 219
 
220 220
 		//check if post_id is a valid post with embedded View
221
-		$instance['error_post_id'] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL;
221
+		$instance[ 'error_post_id' ] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL;
222 222
 
223 223
 		// Share that the widget isn't brand new
224
-		$instance['updated']  = 1;
224
+		$instance[ 'updated' ] = 1;
225 225
 
226 226
 		/**
227 227
 		 * Modify the updated instance. This will allow for validating any added instance settings externally.
@@ -243,22 +243,22 @@  discard block
 block discarded – undo
243 243
 
244 244
 		// Set up some default widget settings.
245 245
 		$defaults = array(
246
-			'title' 			=> __('Recent Entries', 'gravityview'),
246
+			'title' 			=> __( 'Recent Entries', 'gravityview' ),
247 247
 			'view_id'           => NULL,
248 248
 			'post_id'           => NULL,
249 249
 			'limit'            => 10,
250
-			'link_format'       => __('Entry #{entry_id}', 'gravityview'),
250
+			'link_format'       => __( 'Entry #{entry_id}', 'gravityview' ),
251 251
 			'after_link'        => ''
252 252
 		);
253 253
 
254
-		$instance = wp_parse_args( (array) $instance, $defaults );
254
+		$instance = wp_parse_args( (array)$instance, $defaults );
255 255
 
256 256
 		?>
257 257
 
258 258
 		<!-- Title -->
259 259
 		<p>
260 260
 			<label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title:', 'gravityview' ) ?></label>
261
-			<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'] ); ?>" />
261
+			<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' ] ); ?>" />
262 262
 		</p>
263 263
 
264 264
 		<!-- Download -->
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
 		$views = get_posts( $args );
272 272
 
273 273
 		// If there are no views set up yet, we get outta here.
274
-		if( empty( $views ) ) {
274
+		if ( empty( $views ) ) {
275 275
 			echo '<div id="select_gravityview_view"><div class="wrap">' . GravityView_Admin::no_views_text() . '</div></div>';
276 276
 			return;
277 277
 		}
@@ -283,10 +283,10 @@  discard block
 block discarded – undo
283 283
 		 * Display errors generated for invalid embed IDs
284 284
 		 * @see GravityView_View_Data::is_valid_embed_id
285 285
 		 */
286
-		if( isset( $instance['updated'] ) && empty( $instance['view_id'] ) ) {
286
+		if ( isset( $instance[ 'updated' ] ) && empty( $instance[ 'view_id' ] ) ) {
287 287
 			?>
288 288
 			<div class="error inline hide-on-view-change">
289
-				<p><?php esc_html_e('Please select a View to search.', 'gravityview'); ?></p>
289
+				<p><?php esc_html_e( 'Please select a View to search.', 'gravityview' ); ?></p>
290 290
 			</div>
291 291
 			<?php
292 292
 			unset ( $error );
@@ -294,14 +294,14 @@  discard block
 block discarded – undo
294 294
 		?>
295 295
 
296 296
 		<p>
297
-			<label for="<?php echo esc_attr( $this->get_field_id( 'view_id' ) ); ?>"><?php esc_html_e('Select a View', 'gravityview'); ?></label>
297
+			<label for="<?php echo esc_attr( $this->get_field_id( 'view_id' ) ); ?>"><?php esc_html_e( 'Select a View', 'gravityview' ); ?></label>
298 298
 			<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' ) ); ?>">
299 299
 				<option value=""><?php esc_html_e( '&mdash; Select a View as Entries Source &mdash;', 'gravityview' ); ?></option>
300 300
 				<?php
301 301
 
302
-				foreach( $views as $view ) {
303
-					$title = empty( $view->post_title ) ? __('(no title)', 'gravityview') : $view->post_title;
304
-					echo '<option value="'. $view->ID .'"'.selected( absint( $instance['view_id'] ), $view->ID ).'>'. esc_html( sprintf('%s #%d', $title, $view->ID ) ) .'</option>';
302
+				foreach ( $views as $view ) {
303
+					$title = empty( $view->post_title ) ? __( '(no title)', 'gravityview' ) : $view->post_title;
304
+					echo '<option value="' . $view->ID . '"' . selected( absint( $instance[ 'view_id' ] ), $view->ID ) . '>' . esc_html( sprintf( '%s #%d', $title, $view->ID ) ) . '</option>';
305 305
 				}
306 306
 
307 307
 				?>
@@ -313,10 +313,10 @@  discard block
 block discarded – undo
313 313
 		 * Display errors generated for invalid embed IDs
314 314
 		 * @see GravityView_View_Data::is_valid_embed_id
315 315
 		 */
316
-		if( !empty( $instance['error_post_id'] ) ) {
316
+		if ( ! empty( $instance[ 'error_post_id' ] ) ) {
317 317
 			?>
318 318
 			<div class="error inline">
319
-				<p><?php echo $instance['error_post_id']; ?></p>
319
+				<p><?php echo $instance[ 'error_post_id' ]; ?></p>
320 320
 			</div>
321 321
 			<?php
322 322
 			unset ( $error );
@@ -324,11 +324,11 @@  discard block
 block discarded – undo
324 324
 		?>
325 325
 
326 326
 		<p>
327
-			<label for="<?php echo $this->get_field_id('post_id'); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label>
328
-			<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'] ); ?>" />
327
+			<label for="<?php echo $this->get_field_id( 'post_id' ); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label>
328
+			<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' ] ); ?>" />
329 329
 			<span class="howto"><?php
330
-				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' );
331
-				echo ' '.gravityview_get_link('https://docs.gravityview.co/article/222-the-search-widget', __('Learn more&hellip;', 'gravityview' ), 'target=_blank' );
330
+				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' );
331
+				echo ' ' . gravityview_get_link( 'https://docs.gravityview.co/article/222-the-search-widget', __( 'Learn more&hellip;', 'gravityview' ), 'target=_blank' );
332 332
 				?></span>
333 333
 		</p>
334 334
 
@@ -336,21 +336,21 @@  discard block
 block discarded – undo
336 336
 			<label for="<?php echo $this->get_field_id( 'limit' ); ?>">
337 337
 				<span><?php _e( 'Number of entries to show:', 'gravityview' ); ?></span>
338 338
 			</label>
339
-			<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" />
339
+			<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" />
340 340
 		</p>
341 341
 
342 342
 		<p>
343 343
 			<label for="<?php echo $this->get_field_id( 'link_format' ); ?>">
344 344
 				<span><?php _e( 'Entry link text (required)', 'gravityview' ); ?></span>
345 345
 			</label>
346
-			<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" />
346
+			<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" />
347 347
 		</p>
348 348
 
349 349
 		<p>
350 350
 			<label for="<?php echo $this->get_field_id( 'after_link' ); ?>">
351 351
 				<span><?php _e( 'Text or HTML to display after the link (optional)', 'gravityview' ); ?></span>
352 352
 			</label>
353
-			<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>
353
+			<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>
354 354
 		</p>
355 355
 
356 356
 		<?php
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
 		 * @param GravityView_Recent_Entries_Widget $this WP_Widget object
361 361
 		 * @param array $instance Current widget instance
362 362
 		 */
363
-		do_action( 'gravityview_recent_entries_widget_form' , $this, $instance );
363
+		do_action( 'gravityview_recent_entries_widget_form', $this, $instance );
364 364
 
365 365
 		?>
366 366
 
Please login to merge, or discard this patch.
future/includes/rest/class-gv-rest-route.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 
133 133
 		$format = '(?:\.(?P<format>html|json))?';
134 134
 
135
-		register_rest_route( $namespace, sprintf( '/%s/(?P<id>[\d]+)/%s/(?P<s_id>[\w-]+)%s', $base, $sub_type, $format ) , array(
135
+		register_rest_route( $namespace, sprintf( '/%s/(?P<id>[\d]+)/%s/(?P<s_id>[\w-]+)%s', $base, $sub_type, $format ), array(
136 136
 			array(
137 137
 				'methods'         => \WP_REST_Server::READABLE,
138 138
 				'callback'        => array( $this, 'get_sub_item' ),
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
 	 * @return \WP_REST_Response
383 383
 	 */
384 384
 	protected function not_implemented() {
385
-		$error = new \WP_Error( 'not-implemented-yet', __( 'Endpoint Not Yet Implemented.', 'gravityview' )  );
385
+		$error = new \WP_Error( 'not-implemented-yet', __( 'Endpoint Not Yet Implemented.', 'gravityview' ) );
386 386
 		return new \WP_REST_Response( $error, 501 );
387 387
 	}
388 388
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-textarea.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -39,13 +39,13 @@
 block discarded – undo
39 39
 			'tooltip' => __( 'Enter the number of words to be shown. If specified it truncates the text. Leave it blank if you want to show the full text.', 'gravityview' ),
40 40
 		);
41 41
 
42
-        $field_options['make_clickable'] = array(
43
-            'type' => 'checkbox',
44
-            'merge_tags' => false,
45
-            'value' => 0,
46
-            'label' => __( 'Convert text URLs to HTML links', 'gravityview' ),
47
-            'tooltip' => __( 'Converts URI, www, FTP, and email addresses in HTML links', 'gravityview' ),
48
-        );
42
+		$field_options['make_clickable'] = array(
43
+			'type' => 'checkbox',
44
+			'merge_tags' => false,
45
+			'value' => 0,
46
+			'label' => __( 'Convert text URLs to HTML links', 'gravityview' ),
47
+			'tooltip' => __( 'Converts URI, www, FTP, and email addresses in HTML links', 'gravityview' ),
48
+		);
49 49
 
50 50
 		$field_options['allow_html'] = array(
51 51
 			'type' => 'checkbox',
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -27,11 +27,11 @@  discard block
 block discarded – undo
27 27
 
28 28
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
29 29
 
30
-		if( 'edit' === $context ) {
30
+		if ( 'edit' === $context ) {
31 31
 			return $field_options;
32 32
 		}
33 33
 
34
-		$field_options['trim_words'] = array(
34
+		$field_options[ 'trim_words' ] = array(
35 35
 			'type' => 'number',
36 36
 			'merge_tags' => false,
37 37
 			'value' => null,
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 			'tooltip' => __( 'Enter the number of words to be shown. If specified it truncates the text. Leave it blank if you want to show the full text.', 'gravityview' ),
40 40
 		);
41 41
 
42
-        $field_options['make_clickable'] = array(
42
+        $field_options[ 'make_clickable' ] = array(
43 43
             'type' => 'checkbox',
44 44
             'merge_tags' => false,
45 45
             'value' => 0,
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
             'tooltip' => __( 'Converts URI, www, FTP, and email addresses in HTML links', 'gravityview' ),
48 48
         );
49 49
 
50
-		$field_options['allow_html'] = array(
50
+		$field_options[ 'allow_html' ] = array(
51 51
 			'type' => 'checkbox',
52 52
 			'merge_tags' => false,
53 53
 			'value' => 1,
Please login to merge, or discard this patch.
includes/admin/field-types/type_number.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
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
 
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 
21 21
 		$show_mt = $this->show_merge_tags();
22 22
 
23
-		if ( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
23
+		if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) {
24 24
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
25 25
 		}
26 26
 
@@ -31,9 +31,9 @@  discard block
 block discarded – undo
31 31
 		$step = \GV\Utils::get( $this->field, 'step', null );
32 32
 
33 33
 		$atts = '';
34
-		$atts .= $max ? ' max="' . (int) $max . '"' : '';
35
-		$atts .= $min ? ' min="' . (int) $min . '"' : '';
36
-		$atts .= $step ? ' step="' . (int) $step . '"' : '';
34
+		$atts .= $max ? ' max="' . (int)$max . '"' : '';
35
+		$atts .= $min ? ' min="' . (int)$min . '"' : '';
36
+		$atts .= $step ? ' step="' . (int)$step . '"' : '';
37 37
 		?>
38 38
 		<input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="number"
39 39
 		       value="<?php echo esc_attr( $this->value ); ?>"
Please login to merge, or discard this patch.
class-gravityview-plugin-hooks-gravityformspartialentries.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 
54 54
 		$partial_entries_addon = GF_Partial_Entries::get_instance();
55 55
 
56
-		$feed_settings = $partial_entries_addon->get_feed_settings( $form['id'] );
56
+		$feed_settings = $partial_entries_addon->get_feed_settings( $form[ 'id' ] );
57 57
 
58 58
 		$is_enabled = \GV\Utils::get( $feed_settings, 'enable', 0 );
59 59
 
@@ -66,14 +66,14 @@  discard block
 block discarded – undo
66 66
 		$partial_entry_id = \GV\Utils::get( $entry, 'partial_entry_id' );
67 67
 
68 68
 		// Set the expected $_POST key for the Add-On to use
69
-		$_POST['partial_entry_id'] = $partial_entry_id;
69
+		$_POST[ 'partial_entry_id' ] = $partial_entry_id;
70 70
 
71 71
 		gravityview()->log->debug( 'Saving partial entry (ID #{partial_entry_id}) for Entry #{entry_id}', array(
72 72
 			'partial_entry_id' => $partial_entry_id,
73 73
 			'entry_id'         => $entry_id
74 74
 		) );
75 75
 
76
-		$partial_entries_addon->maybe_save_partial_entry( $form['id'] );
76
+		$partial_entries_addon->maybe_save_partial_entry( $form[ 'id' ] );
77 77
 	}
78 78
 }
79 79
 
Please login to merge, or discard this patch.
includes/presets/default-table/class-gravityview-default-template-table.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -88,15 +88,15 @@
 block discarded – undo
88 88
 	 */
89 89
 	public function maybe_modify_button_label( $label = '', $atts = array() ) {
90 90
 
91
-		if( $this->template_id !== \GV\Utils::get( $atts, 'template_id' ) ) {
91
+		if ( $this->template_id !== \GV\Utils::get( $atts, 'template_id' ) ) {
92 92
 			return $label;
93 93
 		}
94 94
 
95
-		if( 'field' !== \GV\Utils::get( $atts, 'type' ) ) {
95
+		if ( 'field' !== \GV\Utils::get( $atts, 'type' ) ) {
96 96
 			return $label;
97 97
 		}
98 98
 
99
-		if( 'edit' === \GV\Utils::get( $atts, 'zone' ) ) {
99
+		if ( 'edit' === \GV\Utils::get( $atts, 'zone' ) ) {
100 100
 			return $label;
101 101
 		}
102 102
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-address.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -62,8 +62,8 @@  discard block
 block discarded – undo
62 62
 				continue;
63 63
 			}
64 64
 
65
-			$field_id = intval( floor( $search_field['key'] ) );
66
-			$input_id = gravityview_get_input_id_from_id( $search_field['key'] );
65
+			$field_id = intval( floor( $search_field[ 'key' ] ) );
66
+			$input_id = gravityview_get_input_id_from_id( $search_field[ 'key' ] );
67 67
 			$form = GravityView_View::getInstance()->getForm();
68 68
 
69 69
 			/** @var GF_Field_Address $address_field */
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 			$choices = array();
73 73
 
74 74
 			$method_name = 'get_choices_' . self::get_input_type_from_input_id( $input_id );
75
-			if( method_exists( $this, $method_name ) ) {
75
+			if ( method_exists( $this, $method_name ) ) {
76 76
 				/**
77 77
 				 * @uses GravityView_Field_Address::get_choices_country()
78 78
 				 * @uses GravityView_Field_Address::get_choices_state()
@@ -80,12 +80,12 @@  discard block
 block discarded – undo
80 80
 				$choices = $this->{$method_name}( $address_field, $form );
81 81
 			}
82 82
 
83
-			if( ! empty( $choices ) ) {
84
-				$search_field['choices'] = $choices;
85
-				$search_field['type'] = \GV\Utils::get( $search_field, 'input');
83
+			if ( ! empty( $choices ) ) {
84
+				$search_field[ 'choices' ] = $choices;
85
+				$search_field[ 'type' ] = \GV\Utils::get( $search_field, 'input' );
86 86
 			} else {
87
-				$search_field['type'] = 'text';
88
-				$search_field['input'] = 'input_text';
87
+				$search_field[ 'type' ] = 'text';
88
+				$search_field[ 'input' ] = 'input_text';
89 89
 			}
90 90
 		}
91 91
 
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 		$country_choices = array();
111 111
 
112 112
 		foreach ( $countries as $key => $country ) {
113
-			$country_choices[] = array(
113
+			$country_choices[ ] = array(
114 114
 				'value' => $country,
115 115
 				'text' => $country,
116 116
 			);
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 	 */
136 136
 	private function get_choices_state( $address_field, $form ) {
137 137
 
138
-		$address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form['id'] ) : $address_field->addressType;
138
+		$address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form[ 'id' ] ) : $address_field->addressType;
139 139
 
140 140
 		$state_choices = array();
141 141
 
@@ -147,8 +147,8 @@  discard block
 block discarded – undo
147 147
 				$states = GFCommon::get_canadian_provinces();
148 148
 				break;
149 149
 			default:
150
-				$address_types = $address_field->get_address_types( $form['id'] );
151
-				$states = empty( $address_types[ $address_type ]['states'] ) ? array() : $address_types[ $address_type ]['states'];
150
+				$address_types = $address_field->get_address_types( $form[ 'id' ] );
151
+				$states = empty( $address_types[ $address_type ][ 'states' ] ) ? array() : $address_types[ $address_type ][ 'states' ];
152 152
 				break;
153 153
 		}
154 154
 
@@ -157,19 +157,19 @@  discard block
 block discarded – undo
157 157
 				$state_subchoices = array();
158 158
 
159 159
 				foreach ( $state as $key => $substate ) {
160
-					$state_subchoices[] = array(
160
+					$state_subchoices[ ] = array(
161 161
 						'value' => is_numeric( $key ) ? $substate : $key,
162 162
 						'text' => $substate,
163 163
 					);
164 164
 				}
165 165
 
166
-				$state_choices[] = array(
166
+				$state_choices[ ] = array(
167 167
 					'text' => $key,
168 168
 					'value' => $state_subchoices,
169 169
 				);
170 170
 
171 171
 			} else {
172
-				$state_choices[] = array(
172
+				$state_choices[ ] = array(
173 173
 					'value' => is_numeric( $key ) ? $state : $key,
174 174
 					'text' => $state,
175 175
 				);
@@ -193,13 +193,13 @@  discard block
 block discarded – undo
193 193
 		// Use the same inputs as the "text" input type allows
194 194
 		$text_inputs = \GV\Utils::get( $input_types, 'text' );
195 195
 
196
-		$input_types['street'] = $text_inputs;
197
-		$input_types['street2'] = $text_inputs;
198
-		$input_types['city'] = $text_inputs;
196
+		$input_types[ 'street' ] = $text_inputs;
197
+		$input_types[ 'street2' ] = $text_inputs;
198
+		$input_types[ 'city' ] = $text_inputs;
199 199
 
200
-		$input_types['state'] = array( 'select', 'radio', 'link' ) + $text_inputs;
201
-		$input_types['zip'] = array( 'input_text' );
202
-		$input_types['country'] = array( 'select', 'radio', 'link' ) + $text_inputs;
200
+		$input_types[ 'state' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
201
+		$input_types[ 'zip' ] = array( 'input_text' );
202
+		$input_types[ 'country' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
203 203
 
204 204
 		return $input_types;
205 205
 	}
@@ -220,12 +220,12 @@  discard block
 block discarded – undo
220 220
 		// Is this search field for an input (eg: 4.2) or the whole address field (eg: 4)?
221 221
 		$input_id = gravityview_get_input_id_from_id( $field_id );
222 222
 
223
-		if( 'address' !== $field_type && $input_id ) {
223
+		if ( 'address' !== $field_type && $input_id ) {
224 224
 			return $input_type;
225 225
 		}
226 226
 
227 227
 		// If the input ID matches an expected address input, set to that. Otherwise, keep existing input type.
228
-		if( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
228
+		if ( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
229 229
 			$input_type = $address_field_name;
230 230
 		}
231 231
 
@@ -273,20 +273,20 @@  discard block
 block discarded – undo
273 273
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
274 274
 
275 275
 		// If this is NOT the full address field, return default options.
276
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
276
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
277 277
 			return $field_options;
278 278
 		}
279 279
 
280
-		if( 'edit' === $context ) {
280
+		if ( 'edit' === $context ) {
281 281
 			return $field_options;
282 282
 		}
283 283
 
284 284
 		$add_options = array();
285 285
 
286
-		$add_options['show_map_link'] = array(
286
+		$add_options[ 'show_map_link' ] = array(
287 287
 			'type' => 'checkbox',
288 288
 			'label' => __( 'Show Map Link:', 'gravityview' ),
289
-			'desc' => __('Display a "Map It" link below the address', 'gravityview'),
289
+			'desc' => __( 'Display a "Map It" link below the address', 'gravityview' ),
290 290
 			'value' => true,
291 291
 			'merge_tags' => false,
292 292
 		);
Please login to merge, or discard this patch.