Completed
Push — develop ( 09e5ca...cd22f6 )
by Zack
10:31
created
includes/admin/field-types/type_multiselect.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 		?>
14 14
 		<label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php
15 15
 
16
-			echo '<span class="gv-label">'.$this->get_field_label().'</span>';
16
+			echo '<span class="gv-label">' . $this->get_field_label() . '</span>';
17 17
 
18 18
 			echo $this->get_tooltip() . $this->get_field_desc();
19 19
 
@@ -26,14 +26,14 @@  discard block
 block discarded – undo
26 26
 
27 27
 	function render_input( $override_input = null ) {
28 28
 
29
-		if( isset( $override_input ) ) {
29
+		if ( isset( $override_input ) ) {
30 30
 			echo $override_input;
31 31
 			return;
32 32
 		}
33 33
 
34 34
 		?>
35 35
 		<select name="<?php echo esc_attr( $this->name ); ?>[]" id="<?php echo $this->get_field_id(); ?>" multiple="multiple">
36
-			<?php foreach( $this->field['options'] as $value => $label ) : ?>
36
+			<?php foreach ( $this->field[ 'options' ] as $value => $label ) : ?>
37 37
 				<option value="<?php echo esc_attr( $value ); ?>" <?php selected( in_array( $value, (array)$this->value ), true, true ); ?>><?php echo esc_html( $label ); ?></option>
38 38
 			<?php endforeach; ?>
39 39
 		</select>
Please login to merge, or discard this patch.
includes/wordpress-widgets/class-gravityview-search-wp-widget.php 1 patch
Spacing   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 
12 12
 		$widget_ops = array(
13 13
 			'classname' => 'widget_gravityview_search',
14
-			'description' => __( 'A search form for a specific GravityView.', 'gravityview')
14
+			'description' => __( 'A search form for a specific GravityView.', 'gravityview' )
15 15
 		);
16 16
 
17 17
 		$widget_display = array(
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 	}
35 35
 
36 36
 	private function load_required_files() {
37
-		if( !class_exists( 'GravityView_Widget_Search' ) ) {
37
+		if ( ! class_exists( 'GravityView_Widget_Search' ) ) {
38 38
 			gravityview_register_gravityview_widgets();
39 39
 		}
40 40
 	}
@@ -53,30 +53,30 @@  discard block
 block discarded – undo
53 53
 	public function widget( $args, $instance ) {
54 54
 
55 55
 		// Don't show unless a View ID has been set.
56
-		if( empty( $instance['view_id'] ) ) {
56
+		if ( empty( $instance[ 'view_id' ] ) ) {
57 57
 
58
-			do_action('gravityview_log_debug', sprintf( '%s[widget]: No View ID has been defined. Not showing the widget.', get_class($this)), $instance );
58
+			do_action( 'gravityview_log_debug', sprintf( '%s[widget]: No View ID has been defined. Not showing the widget.', get_class( $this ) ), $instance );
59 59
 
60 60
 			return;
61 61
 		}
62 62
 
63 63
 		/** This filter is documented in wp-includes/default-widgets.php */
64
-		$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
64
+		$title = apply_filters( 'widget_title', empty( $instance[ 'title' ] ) ? '' : $instance[ 'title' ], $instance, $this->id_base );
65 65
 
66
-		echo $args['before_widget'];
66
+		echo $args[ 'before_widget' ];
67 67
 
68 68
 		if ( $title ) {
69
-			echo $args['before_title'] . $title . $args['after_title'];
69
+			echo $args[ 'before_title' ] . $title . $args[ 'after_title' ];
70 70
 		}
71 71
 
72 72
 		// @todo Add to the widget configuration form
73
-		$instance['search_layout'] = apply_filters( 'gravityview/widget/search/layout', 'vertical', $instance );
73
+		$instance[ 'search_layout' ] = apply_filters( 'gravityview/widget/search/layout', 'vertical', $instance );
74 74
 
75
-		$instance['context'] = 'wp_widget';
75
+		$instance[ 'context' ] = 'wp_widget';
76 76
 
77 77
 		// form
78
-		$instance['form_id'] = GVCommon::get_meta_form_id( $instance['view_id'] );
79
-		$instance['form'] = GVCommon::get_form( $instance['form_id'] );
78
+		$instance[ 'form_id' ] = GVCommon::get_meta_form_id( $instance[ 'view_id' ] );
79
+		$instance[ 'form' ] = GVCommon::get_form( $instance[ 'form_id' ] );
80 80
 
81 81
 		// We don't want to overwrite existing context, etc.
82 82
 		$previous_view = GravityView_View::getInstance();
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 		 */
93 93
 		new GravityView_View( $previous_view );
94 94
 
95
-		echo $args['after_widget'];
95
+		echo $args[ 'after_widget' ];
96 96
 	}
97 97
 
98 98
 	/**
@@ -102,27 +102,27 @@  discard block
 block discarded – undo
102 102
 
103 103
 		$instance = $old_instance;
104 104
 
105
-		if( $this->is_preview() ) {
105
+		if ( $this->is_preview() ) {
106 106
 			//Oh! Sorry but still not fully compatible with customizer
107 107
 			return $instance;
108 108
 		}
109 109
 
110
-		$new_instance = wp_parse_args( (array) $new_instance, self::get_defaults() );
110
+		$new_instance = wp_parse_args( (array)$new_instance, self::get_defaults() );
111 111
 
112
-		$instance['title'] = strip_tags( $new_instance['title'] );
113
-		$instance['view_id'] = absint( $new_instance['view_id'] );
114
-		$instance['search_fields'] = $new_instance['search_fields'];
115
-		$instance['post_id'] = $new_instance['post_id'];
116
-		$instance['search_clear'] = $new_instance['search_clear'];
117
-		$instance['search_mode'] = $new_instance['search_mode'];
112
+		$instance[ 'title' ] = strip_tags( $new_instance[ 'title' ] );
113
+		$instance[ 'view_id' ] = absint( $new_instance[ 'view_id' ] );
114
+		$instance[ 'search_fields' ] = $new_instance[ 'search_fields' ];
115
+		$instance[ 'post_id' ] = $new_instance[ 'post_id' ];
116
+		$instance[ 'search_clear' ] = $new_instance[ 'search_clear' ];
117
+		$instance[ 'search_mode' ] = $new_instance[ 'search_mode' ];
118 118
 
119
-		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $new_instance['post_id'], $instance['view_id'] );
119
+		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $new_instance[ 'post_id' ], $instance[ 'view_id' ] );
120 120
 
121 121
 		//check if post_id is a valid post with embedded View
122
-		$instance['error_post_id'] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL;
122
+		$instance[ 'error_post_id' ] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL;
123 123
 
124 124
 		// Share that the widget isn't brand new
125
-		$instance['updated']  = 1;
125
+		$instance[ 'updated' ] = 1;
126 126
 
127 127
 		return $instance;
128 128
 	}
@@ -133,28 +133,28 @@  discard block
 block discarded – undo
133 133
 	public function form( $instance ) {
134 134
 
135 135
 		// @todo Make compatible with Customizer
136
-		if( $this->is_preview() ) {
136
+		if ( $this->is_preview() ) {
137 137
 
138
-			$warning = sprintf( esc_html__( 'This widget is not configurable from this screen. Please configure it on the %sWidgets page%s.', 'gravityview' ), '<a href="'.admin_url('widgets.php').'">', '</a>' );
138
+			$warning = sprintf( esc_html__( 'This widget is not configurable from this screen. Please configure it on the %sWidgets page%s.', 'gravityview' ), '<a href="' . admin_url( 'widgets.php' ) . '">', '</a>' );
139 139
 
140 140
 			echo wpautop( GravityView_Admin::get_floaty() . $warning );
141 141
 
142 142
 			return;
143 143
 		}
144 144
 
145
-		$instance = wp_parse_args( (array) $instance, self::get_defaults() );
145
+		$instance = wp_parse_args( (array)$instance, self::get_defaults() );
146 146
 
147
-		$title    = $instance['title'];
148
-		$view_id  = $instance['view_id'];
149
-		$post_id  = $instance['post_id'];
150
-		$search_fields = $instance['search_fields'];
151
-		$search_clear = $instance['search_clear'];
152
-		$search_mode = $instance['search_mode'];
147
+		$title    = $instance[ 'title' ];
148
+		$view_id  = $instance[ 'view_id' ];
149
+		$post_id  = $instance[ 'post_id' ];
150
+		$search_fields = $instance[ 'search_fields' ];
151
+		$search_clear = $instance[ 'search_clear' ];
152
+		$search_mode = $instance[ 'search_mode' ];
153 153
 
154 154
 		$views = GVCommon::get_all_views();
155 155
 
156 156
 		// If there are no views set up yet, we get outta here.
157
-		if( empty( $views ) ) { ?>
157
+		if ( empty( $views ) ) { ?>
158 158
 			<div id="select_gravityview_view">
159 159
 				<div class="wrap"><?php echo GravityView_Admin::no_views_text(); ?></div>
160 160
 			</div>
@@ -162,17 +162,17 @@  discard block
 block discarded – undo
162 162
 		}
163 163
 		?>
164 164
 
165
-		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'gravityview'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></label></p>
165
+		<p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', 'gravityview' ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></label></p>
166 166
 
167 167
 		<?php
168 168
 		/**
169 169
 		 * Display errors generated for invalid embed IDs
170 170
 		 * @see GravityView_View_Data::is_valid_embed_id
171 171
 		 */
172
-		if( isset( $instance['updated'] ) && empty( $instance['view_id'] ) ) {
172
+		if ( isset( $instance[ 'updated' ] ) && empty( $instance[ 'view_id' ] ) ) {
173 173
 			?>
174 174
 			<div class="error inline hide-on-view-change">
175
-				<p><?php esc_html_e('Please select a View to search.', 'gravityview'); ?></p>
175
+				<p><?php esc_html_e( 'Please select a View to search.', 'gravityview' ); ?></p>
176 176
 			</div>
177 177
 			<?php
178 178
 			unset ( $error );
@@ -181,12 +181,12 @@  discard block
 block discarded – undo
181 181
 
182 182
 		<p>
183 183
 			<label for="gravityview_view_id"><?php _e( 'View:', 'gravityview' ); ?></label>
184
-			<select id="gravityview_view_id" name="<?php echo $this->get_field_name('view_id'); ?>" class="widefat">
184
+			<select id="gravityview_view_id" name="<?php echo $this->get_field_name( 'view_id' ); ?>" class="widefat">
185 185
 				<option value=""><?php esc_html_e( '&mdash; Select a View &mdash;', 'gravityview' ); ?></option>
186 186
 				<?php
187
-				foreach( $views as $view_option ) {
188
-					$title = empty( $view_option->post_title ) ? __('(no title)', 'gravityview') : $view_option->post_title;
189
-					echo '<option value="'. $view_option->ID .'" ' . selected( esc_attr( $view_id ), $view_option->ID, false ) . '>'. esc_html( sprintf('%s #%d', $title, $view_option->ID ) ) .'</option>';
187
+				foreach ( $views as $view_option ) {
188
+					$title = empty( $view_option->post_title ) ? __( '(no title)', 'gravityview' ) : $view_option->post_title;
189
+					echo '<option value="' . $view_option->ID . '" ' . selected( esc_attr( $view_id ), $view_option->ID, false ) . '>' . esc_html( sprintf( '%s #%d', $title, $view_option->ID ) ) . '</option>';
190 190
 				}
191 191
 				?>
192 192
 			</select>
@@ -198,10 +198,10 @@  discard block
 block discarded – undo
198 198
 		 * Display errors generated for invalid embed IDs
199 199
 		 * @see GravityView_View_Data::is_valid_embed_id
200 200
 		 */
201
-		if( !empty( $instance['error_post_id'] ) ) {
201
+		if ( ! empty( $instance[ 'error_post_id' ] ) ) {
202 202
 			?>
203 203
 			<div class="error inline">
204
-				<p><?php echo $instance['error_post_id']; ?></p>
204
+				<p><?php echo $instance[ 'error_post_id' ]; ?></p>
205 205
 			</div>
206 206
 			<?php
207 207
 			unset ( $error );
@@ -209,40 +209,40 @@  discard block
 block discarded – undo
209 209
 		?>
210 210
 
211 211
 		<p>
212
-			<label for="<?php echo $this->get_field_id('post_id'); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label>
213
-			<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( $post_id ); ?>" />
212
+			<label for="<?php echo $this->get_field_id( 'post_id' ); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label>
213
+			<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( $post_id ); ?>" />
214 214
 			<span class="howto"><?php
215
-				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' );
216
-				echo ' '.gravityview_get_link('http://docs.gravityview.co/article/222-the-search-widget', __('Learn more&hellip;', 'gravityview' ), 'target=_blank' );
215
+				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' );
216
+				echo ' ' . gravityview_get_link( 'http://docs.gravityview.co/article/222-the-search-widget', __( 'Learn more&hellip;', 'gravityview' ), 'target=_blank' );
217 217
 				?></span>
218 218
 		</p>
219 219
 
220 220
 		<p>
221
-			<label for="<?php echo $this->get_field_id('search_clear'); ?>"><?php esc_html_e( 'Show Clear button', 'gravityview' ); ?>:</label>
222
-			<input name="<?php echo $this->get_field_name('search_clear'); ?>" type="hidden" value="0">
223
-			<input id="<?php echo $this->get_field_id('search_clear'); ?>" name="<?php echo $this->get_field_name('search_clear'); ?>" type="checkbox" class="checkbox" value="1" <?php checked( $search_clear, 1, true ); ?>>
221
+			<label for="<?php echo $this->get_field_id( 'search_clear' ); ?>"><?php esc_html_e( 'Show Clear button', 'gravityview' ); ?>:</label>
222
+			<input name="<?php echo $this->get_field_name( 'search_clear' ); ?>" type="hidden" value="0">
223
+			<input id="<?php echo $this->get_field_id( 'search_clear' ); ?>" name="<?php echo $this->get_field_name( 'search_clear' ); ?>" type="checkbox" class="checkbox" value="1" <?php checked( $search_clear, 1, true ); ?>>
224 224
 		</p>
225 225
 
226 226
 		<p>
227 227
 			<label><?php esc_html_e( 'Search Mode', 'gravityview' ); ?>:</label>
228
-			<label for="<?php echo $this->get_field_id('search_mode'); ?>_any">
229
-				<input id="<?php echo $this->get_field_id('search_mode'); ?>_any" name="<?php echo $this->get_field_name('search_mode'); ?>" type="radio" class="radio" value="any" <?php checked( $search_mode, 'any', true ); ?>>
228
+			<label for="<?php echo $this->get_field_id( 'search_mode' ); ?>_any">
229
+				<input id="<?php echo $this->get_field_id( 'search_mode' ); ?>_any" name="<?php echo $this->get_field_name( 'search_mode' ); ?>" type="radio" class="radio" value="any" <?php checked( $search_mode, 'any', true ); ?>>
230 230
 				<?php esc_html_e( 'Match Any Fields', 'gravityview' ); ?>
231 231
 			</label>
232
-			<label for="<?php echo $this->get_field_id('search_mode'); ?>_all">
233
-				<input id="<?php echo $this->get_field_id('search_mode'); ?>_all" name="<?php echo $this->get_field_name('search_mode'); ?>" type="radio" class="radio" value="all" <?php checked( $search_mode, 'all', true ); ?>>
232
+			<label for="<?php echo $this->get_field_id( 'search_mode' ); ?>_all">
233
+				<input id="<?php echo $this->get_field_id( 'search_mode' ); ?>_all" name="<?php echo $this->get_field_name( 'search_mode' ); ?>" type="radio" class="radio" value="all" <?php checked( $search_mode, 'all', true ); ?>>
234 234
 				<?php esc_html_e( 'Match All Fields', 'gravityview' ); ?>
235 235
 			</label>
236
-			<span class="howto"><?php esc_html_e('Should search results match all search fields, or any?', 'gravityview' ); ?></span
236
+			<span class="howto"><?php esc_html_e( 'Should search results match all search fields, or any?', 'gravityview' ); ?></span
237 237
 		</p>
238 238
 
239 239
 		<hr />
240 240
 
241 241
 		<?php // @todo: move style to CSS ?>
242 242
 		<div style="margin-bottom: 1em;">
243
-			<label class="screen-reader-text" for="<?php echo $this->get_field_id('search_fields'); ?>"><?php _e( 'Searchable fields:', 'gravityview' ); ?></label>
244
-			<div class="gv-widget-search-fields" title="<?php esc_html_e('Search Fields', 'gravityview'); ?>">
245
-				<input id="<?php echo $this->get_field_id('search_fields'); ?>" name="<?php echo $this->get_field_name('search_fields'); ?>" type="hidden" value="<?php echo esc_attr( $search_fields ); ?>" class="gv-search-fields-value">
243
+			<label class="screen-reader-text" for="<?php echo $this->get_field_id( 'search_fields' ); ?>"><?php _e( 'Searchable fields:', 'gravityview' ); ?></label>
244
+			<div class="gv-widget-search-fields" title="<?php esc_html_e( 'Search Fields', 'gravityview' ); ?>">
245
+				<input id="<?php echo $this->get_field_id( 'search_fields' ); ?>" name="<?php echo $this->get_field_name( 'search_fields' ); ?>" type="hidden" value="<?php echo esc_attr( $search_fields ); ?>" class="gv-search-fields-value">
246 246
 			</div>
247 247
 
248 248
 		</div>
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -134,17 +134,17 @@  discard block
 block discarded – undo
134 134
 
135 135
 		add_filter( 'gravityview/sortable/field_blacklist', array( $this, '_filter_sortable_fields' ), 1 );
136 136
 
137
-		if( $this->entry_meta_key ) {
137
+		if ( $this->entry_meta_key ) {
138 138
 			add_filter( 'gform_entry_meta', array( $this, 'add_entry_meta' ) );
139 139
 			add_filter( 'gravityview/common/sortable_fields', array( $this, 'add_sortable_field' ), 10, 2 );
140 140
 		}
141 141
 
142
-		if( $this->_custom_merge_tag ) {
142
+		if ( $this->_custom_merge_tag ) {
143 143
 			add_filter( 'gform_custom_merge_tags', array( $this, '_filter_gform_custom_merge_tags' ), 10, 4 );
144 144
 			add_filter( 'gform_replace_merge_tags', array( $this, '_filter_gform_replace_merge_tags' ), 10, 7 );
145 145
 		}
146 146
 
147
-		if( 'meta' === $this->group || '' !== $this->default_search_label ) {
147
+		if ( 'meta' === $this->group || '' !== $this->default_search_label ) {
148 148
 			add_filter( 'gravityview_search_field_label', array( $this, 'set_default_search_label' ), 10, 3 );
149 149
 		}
150 150
 
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 		 * Auto-assign label from Gravity Forms label, if exists
153 153
 		 * @since 1.20
154 154
 		 */
155
-		if( empty( $this->label ) && ! empty( $this->_gf_field_class_name ) && class_exists( $this->_gf_field_class_name ) ) {
155
+		if ( empty( $this->label ) && ! empty( $this->_gf_field_class_name ) && class_exists( $this->_gf_field_class_name ) ) {
156 156
 			$this->label = ucfirst( GF_Fields::get( $this->name )->get_form_editor_field_title() );
157 157
 		}
158 158
 
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 			'type'  => $this->name
176 176
 		);
177 177
 
178
-		$fields["{$this->entry_meta_key}"] = $added_field;
178
+		$fields[ "{$this->entry_meta_key}" ] = $added_field;
179 179
 
180 180
 		return $fields;
181 181
 	}
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
 	 */
196 196
 	function set_default_search_label( $label = '', $gf_field = null, $field = array() ) {
197 197
 
198
-		if( $this->name === $field['field'] && '' === $label ) {
198
+		if ( $this->name === $field[ 'field' ] && '' === $label ) {
199 199
 			$label = esc_html( $this->default_search_label );
200 200
 		}
201 201
 
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 	 *
217 217
 	 * @return string Original text if {_custom_merge_tag} isn't found. Otherwise, replaced text.
218 218
 	 */
219
-	public function _filter_gform_replace_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false  ) {
219
+	public function _filter_gform_replace_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
220 220
 
221 221
 		// Is there is field merge tag? Strip whitespace off the ned, too.
222 222
 		preg_match_all( '/{' . preg_quote( $this->_custom_merge_tag ) . ':?(.*?)(?:\s)?}/ism', $text, $matches, PREG_SET_ORDER );
@@ -247,19 +247,19 @@  discard block
 block discarded – undo
247 247
 	 */
248 248
 	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
249 249
 
250
-		foreach( $matches as $match ) {
250
+		foreach ( $matches as $match ) {
251 251
 
252
-			$full_tag = $match[0];
252
+			$full_tag = $match[ 0 ];
253 253
 
254 254
 			// Strip the Merge Tags
255
-			$tag = str_replace( array( '{', '}'), '', $full_tag );
255
+			$tag = str_replace( array( '{', '}' ), '', $full_tag );
256 256
 
257 257
 			// Replace the value from the entry, if exists
258
-			if( isset( $entry[ $tag ] ) ) {
258
+			if ( isset( $entry[ $tag ] ) ) {
259 259
 
260 260
 				$value = $entry[ $tag ];
261 261
 
262
-				if( is_callable( array( $this, 'get_content') ) ) {
262
+				if ( is_callable( array( $this, 'get_content' ) ) ) {
263 263
 					$value = $this->get_content( $value );
264 264
 				}
265 265
 
@@ -332,8 +332,8 @@  discard block
 block discarded – undo
332 332
 	 */
333 333
 	public function _filter_sortable_fields( $not_sortable ) {
334 334
 
335
-		if( ! $this->is_sortable ) {
336
-			$not_sortable[] = $this->name;
335
+		if ( ! $this->is_sortable ) {
336
+			$not_sortable[ ] = $this->name;
337 337
 		}
338 338
 
339 339
 		return $not_sortable;
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
350 350
 	 */
351 351
 	function add_entry_meta( $entry_meta ) {
352 352
 
353
-		if( ! isset( $entry_meta["{$this->entry_meta_key}"] ) ) {
353
+		if ( ! isset( $entry_meta[ "{$this->entry_meta_key}" ] ) ) {
354 354
 
355 355
 			$added_meta = array(
356 356
 				'label'             => $this->label,
@@ -359,13 +359,13 @@  discard block
 block discarded – undo
359 359
 			);
360 360
 
361 361
 			if ( $this->entry_meta_update_callback && is_callable( $this->entry_meta_update_callback ) ) {
362
-				$added_meta['update_entry_meta_callback'] = $this->entry_meta_update_callback;
362
+				$added_meta[ 'update_entry_meta_callback' ] = $this->entry_meta_update_callback;
363 363
 			}
364 364
 
365
-			$entry_meta["{$this->entry_meta_key}"] = $added_meta;
365
+			$entry_meta[ "{$this->entry_meta_key}" ] = $added_meta;
366 366
 
367 367
 		} else {
368
-			do_action( 'gravityview_log_error', __METHOD__ . ' Entry meta already set: ' . $this->entry_meta_key, $entry_meta["{$this->entry_meta_key}"] );
368
+			do_action( 'gravityview_log_error', __METHOD__ . ' Entry meta already set: ' . $this->entry_meta_key, $entry_meta[ "{$this->entry_meta_key}" ] );
369 369
 		}
370 370
 
371 371
 		return $entry_meta;
@@ -394,7 +394,7 @@  discard block
 block discarded – undo
394 394
 			'date_display' => array(
395 395
 				'type' => 'text',
396 396
 				'label' => __( 'Override Date Format', 'gravityview' ),
397
-				'desc' => sprintf( __( 'Define how the date is displayed (using %sthe PHP date format%s)', 'gravityview'), '<a href="https://codex.wordpress.org/Formatting_Date_and_Time">', '</a>' ),
397
+				'desc' => sprintf( __( 'Define how the date is displayed (using %sthe PHP date format%s)', 'gravityview' ), '<a href="https://codex.wordpress.org/Formatting_Date_and_Time">', '</a>' ),
398 398
 				/**
399 399
 				 * @filter `gravityview_date_format` Override the date format with a [PHP date format](https://codex.wordpress.org/Formatting_Date_and_Time)
400 400
 				 * @param[in,out] null|string $date_format Date Format (default: null)
@@ -419,7 +419,7 @@  discard block
 block discarded – undo
419 419
 
420 420
 		$options = $this->field_support_options();
421 421
 
422
-		if( isset( $options[ $key ] ) ) {
422
+		if ( isset( $options[ $key ] ) ) {
423 423
 			$field_options[ $key ] = $options[ $key ];
424 424
 		}
425 425
 
@@ -483,11 +483,11 @@  discard block
 block discarded – undo
483 483
 		$connected_form = rgpost( 'form_id' );
484 484
 
485 485
 		// Otherwise, get the Form ID from the Post page
486
-		if( empty( $connected_form ) ) {
486
+		if ( empty( $connected_form ) ) {
487 487
 			$connected_form = gravityview_get_form_id( get_the_ID() );
488 488
 		}
489 489
 
490
-		if( empty( $connected_form ) ) {
490
+		if ( empty( $connected_form ) ) {
491 491
 			do_action( 'gravityview_log_error', sprintf( '%s: Form not found for form ID "%s"', __METHOD__, $connected_form ) );
492 492
 			return false;
493 493
 		}
Please login to merge, or discard this patch.
includes/plugin-and-theme-hooks/class-gravityview-theme-hooks-wpml.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 
63 63
 		add_filter( 'icl_ls_languages', array( $this, 'wpml_ls_filter' ) );
64 64
 
65
-		add_filter( 'gravityview_directory_link', array( $this, 'filter_gravityview_back_link') );
65
+		add_filter( 'gravityview_directory_link', array( $this, 'filter_gravityview_back_link' ) );
66 66
 	}
67 67
 
68 68
 	/**
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 	function filter_gravityview_back_link( $link ) {
83 83
 		global $wpml_url_filters;
84 84
 
85
-		if( $wpml_url_filters ) {
85
+		if ( $wpml_url_filters ) {
86 86
 			$link = $wpml_url_filters->permalink_filter( $link, GravityView_frontend::getInstance()->getPostId() );
87 87
 		}
88 88
 
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 	private function remove_url_hooks() {
100 100
 		global $wpml_url_filters;
101 101
 
102
-		if( ! $wpml_url_filters ) {
102
+		if ( ! $wpml_url_filters ) {
103 103
 			return;
104 104
 		}
105 105
 
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 	private function add_url_hooks() {
123 123
 		global $wpml_url_filters;
124 124
 
125
-		if( ! $wpml_url_filters ) {
125
+		if ( ! $wpml_url_filters ) {
126 126
 			return;
127 127
 		}
128 128
 
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
 
162 162
 			$this->remove_url_hooks();
163 163
 
164
-			if( $translations ) {
164
+			if ( $translations ) {
165 165
 				foreach ( $languages as $lang_code => $language ) {
166 166
 
167 167
 					$lang_post_id = $translations[ $lang_code ]->element_id;
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 							break;
195 195
 					}
196 196
 
197
-					$languages[ $lang_code ]['url'] = $entry_link;
197
+					$languages[ $lang_code ][ 'url' ] = $entry_link;
198 198
 				}
199 199
 			}
200 200
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-total.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -50,13 +50,13 @@  discard block
 block discarded – undo
50 50
 	 *
51 51
 	 * @return array Blacklist, with "total" added. If not edit context, original field blacklist. Otherwise, blacklist including total.
52 52
 	 */
53
-	public function add_to_blacklist( $blacklist = array(), $context = NULL  ){
53
+	public function add_to_blacklist( $blacklist = array(), $context = NULL ) {
54 54
 
55
-		if( empty( $context ) || $context !== 'edit' ) {
55
+		if ( empty( $context ) || $context !== 'edit' ) {
56 56
 			return $blacklist;
57 57
 		}
58 58
 
59
-		$blacklist[] = 'total';
59
+		$blacklist[ ] = 'total';
60 60
 
61 61
 		return $blacklist;
62 62
 	}
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 	 */
75 75
 	function edit_entry_recalculate_totals( $form = array(), $entry_id = 0, $Edit_Entry_Render = null ) {
76 76
 
77
-		$original_form = GFAPI::get_form( $form['id'] );
77
+		$original_form = GFAPI::get_form( $form[ 'id' ] );
78 78
 
79 79
 		$total_fields = GFCommon::get_fields_by_type( $original_form, 'total' );
80 80
 
@@ -85,12 +85,12 @@  discard block
 block discarded – undo
85 85
 
86 86
 			/** @var GF_Field_Total $total_field */
87 87
 			foreach ( $total_fields as $total_field ) {
88
-				$entry["{$total_field->id}"] = GFCommon::get_order_total( $original_form, $entry );
88
+				$entry[ "{$total_field->id}" ] = GFCommon::get_order_total( $original_form, $entry );
89 89
 			}
90 90
 
91 91
 			$return_entry = GFAPI::update_entry( $entry );
92 92
 
93
-			if( is_wp_error( $return_entry ) ) {
93
+			if ( is_wp_error( $return_entry ) ) {
94 94
 				do_action( 'gravityview_log_error', __METHOD__ . ': Updating the entry total fields failed', $return_entry );
95 95
 			} else {
96 96
 				do_action( 'gravityview_log_debug', __METHOD__ . ': Updating the entry total fields succeeded' );
Please login to merge, or discard this patch.
includes/class-admin-approve-entries.php 1 patch
Spacing   +63 added lines, -63 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 		/** gf_entries page - entries table screen */
45 45
 
46 46
 		// capture bulk actions
47
-		add_action( 'gform_loaded', array( $this, 'process_bulk_action') );
47
+		add_action( 'gform_loaded', array( $this, 'process_bulk_action' ) );
48 48
 
49 49
 		// add hidden field with approve status
50 50
 		add_action( 'gform_entries_first_column_actions', array( $this, 'add_entry_approved_hidden_input' ), 1, 5 );
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 		add_filter( 'gravityview_tooltips', array( $this, 'tooltips' ) );
53 53
 
54 54
 		// adding styles and scripts
55
-		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles') );
55
+		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ) );
56 56
 		// bypass Gravity Forms no-conflict mode
57 57
 		add_filter( 'gform_noconflict_scripts', array( $this, 'register_gform_noconflict_script' ) );
58 58
 		add_filter( 'gform_noconflict_styles', array( $this, 'register_gform_noconflict_style' ) );
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 		 * @param bool $show_filter_links True: show the "approved"/"disapproved" filter links. False: hide them.
82 82
 		 * @param array $form GF Form object of current form
83 83
 		 */
84
-		if( false === apply_filters( 'gravityview/approve_entries/show_filter_links_entry_list', true, $form ) ) {
84
+		if ( false === apply_filters( 'gravityview/approve_entries/show_filter_links_entry_list', true, $form ) ) {
85 85
 			return $filter_links;
86 86
 		}
87 87
 
@@ -102,19 +102,19 @@  discard block
 block discarded – undo
102 102
 		$approved_count = $disapproved_count = 0;
103 103
 
104 104
 		// Only count if necessary
105
-		if( $include_counts ) {
106
-			$approved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_approved ) ) );
107
-			$disapproved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_disapproved ) ) );
105
+		if ( $include_counts ) {
106
+			$approved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_approved ) ) );
107
+			$disapproved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_disapproved ) ) );
108 108
 		}
109 109
 
110
-		$filter_links[] = array(
110
+		$filter_links[ ] = array(
111 111
 			'id'            => 'gv_approved',
112 112
 			'field_filters' => $field_filters_approved,
113 113
 			'count'         => $approved_count,
114 114
 			'label'         => GravityView_Entry_Approval_Status::get_label( GravityView_Entry_Approval_Status::APPROVED ),
115 115
 		);
116 116
 
117
-		$filter_links[] = array(
117
+		$filter_links[ ] = array(
118 118
 			'id'            => 'gv_disapproved',
119 119
 			'field_filters' => $field_filters_disapproved,
120 120
 			'count'         => $disapproved_count,
@@ -133,9 +133,9 @@  discard block
 block discarded – undo
133 133
 	 */
134 134
 	function tooltips( $tooltips ) {
135 135
 
136
-		$tooltips['form_gravityview_fields'] = array(
137
-			'title' => __('GravityView Fields', 'gravityview'),
138
-			'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview'),
136
+		$tooltips[ 'form_gravityview_fields' ] = array(
137
+			'title' => __( 'GravityView Fields', 'gravityview' ),
138
+			'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview' ),
139 139
 		);
140 140
 
141 141
 		return $tooltips;
@@ -246,15 +246,15 @@  discard block
 block discarded – undo
246 246
 
247 247
 		$gv_bulk_action = false;
248 248
 
249
-		if( version_compare( GFForms::$version, '2.0', '>=' ) ) {
250
-			$bulk_action = ( '-1' !== rgpost('action') ) ? rgpost('action') : rgpost('action2');
249
+		if ( version_compare( GFForms::$version, '2.0', '>=' ) ) {
250
+			$bulk_action = ( '-1' !== rgpost( 'action' ) ) ? rgpost( 'action' ) : rgpost( 'action2' );
251 251
 		} else {
252 252
 			// GF 1.9.x - Bulk action 2 is the bottom bulk action select form.
253
-			$bulk_action = rgpost('bulk_action') ? rgpost('bulk_action') : rgpost('bulk_action2');
253
+			$bulk_action = rgpost( 'bulk_action' ) ? rgpost( 'bulk_action' ) : rgpost( 'bulk_action2' );
254 254
 		}
255 255
 
256 256
 		// Check the $bulk_action value against GV actions, see if they're the same. I hate strpos().
257
-		if( ! empty( $bulk_action ) && preg_match( '/^('. implode( '|', $this->bulk_action_prefixes ) .')/ism', $bulk_action ) ) {
257
+		if ( ! empty( $bulk_action ) && preg_match( '/^(' . implode( '|', $this->bulk_action_prefixes ) . ')/ism', $bulk_action ) ) {
258 258
 			$gv_bulk_action = $bulk_action;
259 259
 		}
260 260
 
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
 		
280 280
 		// gforms_entry_list is the nonce that confirms we're on the right page
281 281
 		// gforms_update_note is sent when bulk editing entry notes. We don't want to process then.
282
-		if ( $bulk_action && rgpost('gforms_entry_list') && empty( $_POST['gforms_update_note'] ) ) {
282
+		if ( $bulk_action && rgpost( 'gforms_entry_list' ) && empty( $_POST[ 'gforms_update_note' ] ) ) {
283 283
 
284 284
 			check_admin_referer( 'gforms_entry_list', 'gforms_entry_list' );
285 285
 
@@ -297,13 +297,13 @@  discard block
 block discarded – undo
297 297
 			}
298 298
 
299 299
 			// All entries are set to be updated, not just the visible ones
300
-			if ( ! empty( $_POST['all_entries'] ) ) {
300
+			if ( ! empty( $_POST[ 'all_entries' ] ) ) {
301 301
 
302 302
 				// Convert the current entry search into GF-formatted search criteria
303 303
 				$search = array(
304
-					'search_field' => isset( $_POST['f'] ) ? $_POST['f'][0] : 0,
305
-					'search_value' => isset( $_POST['v'][0] ) ? $_POST['v'][0] : '',
306
-					'search_operator' => isset( $_POST['o'][0] ) ? $_POST['o'][0] : 'contains',
304
+					'search_field' => isset( $_POST[ 'f' ] ) ? $_POST[ 'f' ][ 0 ] : 0,
305
+					'search_value' => isset( $_POST[ 'v' ][ 0 ] ) ? $_POST[ 'v' ][ 0 ] : '',
306
+					'search_operator' => isset( $_POST[ 'o' ][ 0 ] ) ? $_POST[ 'o' ][ 0 ] : 'contains',
307 307
 				);
308 308
 
309 309
 				$search_criteria = GravityView_frontend::get_search_criteria( $search, $form_id );
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
 			} else {
315 315
 
316 316
 				// Changed from 'lead' to 'entry' in 2.0
317
-				$entries = isset( $_POST['lead'] ) ? $_POST['lead'] : $_POST['entry'];
317
+				$entries = isset( $_POST[ 'lead' ] ) ? $_POST[ 'lead' ] : $_POST[ 'entry' ];
318 318
 
319 319
 			}
320 320
 
@@ -326,15 +326,15 @@  discard block
 block discarded – undo
326 326
 			$entry_count = count( $entries ) > 1 ? sprintf( __( '%d entries', 'gravityview' ), count( $entries ) ) : __( '1 entry', 'gravityview' );
327 327
 
328 328
 			switch ( $approved_status ) {
329
-				case $this->bulk_action_prefixes['approve']:
329
+				case $this->bulk_action_prefixes[ 'approve' ]:
330 330
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::APPROVED, $form_id );
331 331
 					$this->bulk_update_message = sprintf( __( '%s approved.', 'gravityview' ), $entry_count );
332 332
 					break;
333
-				case $this->bulk_action_prefixes['unapprove']:
333
+				case $this->bulk_action_prefixes[ 'unapprove' ]:
334 334
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::UNAPPROVED, $form_id );
335 335
 					$this->bulk_update_message = sprintf( __( '%s unapproved.', 'gravityview' ), $entry_count );
336 336
 					break;
337
-				case $this->bulk_action_prefixes['disapprove']:
337
+				case $this->bulk_action_prefixes[ 'disapprove' ]:
338 338
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::DISAPPROVED, $form_id );
339 339
 					$this->bulk_update_message = sprintf( __( '%s disapproved.', 'gravityview' ), $entry_count );
340 340
 					break;
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
      *
357 357
 	 * @return boolean True: It worked; False: it failed
358 358
 	 */
359
-	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) {
359
+	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0 ) {
360 360
 		return GravityView_Entry_Approval::update_approved( $entry_id, $approved, $form_id, $approvedcolumn );
361 361
 	}
362 362
 
@@ -386,20 +386,20 @@  discard block
 block discarded – undo
386 386
 	 *
387 387
 	 * @return void
388 388
 	 */
389
-	static public function add_entry_approved_hidden_input(  $form_id, $field_id, $value, $entry, $query_string ) {
389
+	static public function add_entry_approved_hidden_input( $form_id, $field_id, $value, $entry, $query_string ) {
390 390
 
391
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry['id'] ) ) {
391
+		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry[ 'id' ] ) ) {
392 392
 			return;
393 393
 		}
394 394
 
395
-		if( empty( $entry['id'] ) ) {
395
+		if ( empty( $entry[ 'id' ] ) ) {
396 396
 			return;
397 397
 		}
398 398
 
399 399
 		$status_value = GravityView_Entry_Approval::get_entry_status( $entry, 'value' );
400 400
 
401
-		if( $status_value ) {
402
-			echo '<input type="hidden" class="entry_approval" id="entry_approved_'. $entry['id'] .'" value="' . esc_attr( $status_value ) . '" />';
401
+		if ( $status_value ) {
402
+			echo '<input type="hidden" class="entry_approval" id="entry_approved_' . $entry[ 'id' ] . '" value="' . esc_attr( $status_value ) . '" />';
403 403
 		}
404 404
 	}
405 405
 
@@ -412,10 +412,10 @@  discard block
 block discarded – undo
412 412
 	 */
413 413
 	private function get_form_id() {
414 414
 
415
-		$form_id = GFForms::get('id');
415
+		$form_id = GFForms::get( 'id' );
416 416
 
417 417
 		// If there are no forms identified, use the first form. That's how GF does it.
418
-		if( empty( $form_id ) && class_exists('RGFormsModel') ) {
418
+		if ( empty( $form_id ) && class_exists( 'RGFormsModel' ) ) {
419 419
 			$form_id = $this->get_first_form_id();
420 420
 		}
421 421
 
@@ -435,14 +435,14 @@  discard block
 block discarded – undo
435 435
 
436 436
 		$forms = RGFormsModel::get_forms( null, 'title' );
437 437
 
438
-		if( ! isset( $forms[0] ) ) {
438
+		if ( ! isset( $forms[ 0 ] ) ) {
439 439
 			do_action( 'gravityview_log_error', __METHOD__ . ': No forms were found' );
440 440
 			return 0;
441 441
 		}
442 442
 
443
-		$first_form = $forms[0];
443
+		$first_form = $forms[ 0 ];
444 444
 
445
-		$form_id = is_object( $forms[0] ) ? $first_form->id : $first_form['id'];
445
+		$form_id = is_object( $forms[ 0 ] ) ? $first_form->id : $first_form[ 'id' ];
446 446
 
447 447
 		return intval( $form_id );
448 448
 	}
@@ -450,7 +450,7 @@  discard block
 block discarded – undo
450 450
 
451 451
 	function add_scripts_and_styles( $hook ) {
452 452
 
453
-		if( ! class_exists( 'GFForms' ) ) {
453
+		if ( ! class_exists( 'GFForms' ) ) {
454 454
 
455 455
 			do_action( 'gravityview_log_error', 'GravityView_Admin_ApproveEntries[add_scripts_and_styles] GFForms does not exist.' );
456 456
 
@@ -459,26 +459,26 @@  discard block
 block discarded – undo
459 459
 
460 460
 		// enqueue styles & scripts gf_entries
461 461
 		// But only if we're on the main Entries page, not on reports pages
462
-		if( GFForms::get_page() !== 'entry_list' ) {
462
+		if ( GFForms::get_page() !== 'entry_list' ) {
463 463
 			return;
464 464
 		}
465 465
 
466 466
 		$form_id = $this->get_form_id();
467 467
 
468 468
 		// Things are broken; no forms were found
469
-		if( empty( $form_id ) ) {
469
+		if ( empty( $form_id ) ) {
470 470
 			return;
471 471
 		}
472 472
 
473
-		wp_enqueue_style( 'gravityview_entries_list', plugins_url('assets/css/admin-entries-list.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
473
+		wp_enqueue_style( 'gravityview_entries_list', plugins_url( 'assets/css/admin-entries-list.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
474 474
 
475
-		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
475
+		$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
476 476
 
477
-		wp_enqueue_script( 'gravityview_gf_entries_scripts', plugins_url('assets/js/admin-entries-list'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery' ), GravityView_Plugin::version );
477
+		wp_enqueue_script( 'gravityview_gf_entries_scripts', plugins_url( 'assets/js/admin-entries-list' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version );
478 478
 
479 479
 		wp_localize_script( 'gravityview_gf_entries_scripts', 'gvGlobals', array(
480
-			'nonce' => wp_create_nonce( 'gravityview_entry_approval'),
481
-			'admin_nonce' => wp_create_nonce( 'gravityview_admin_entry_approval'),
480
+			'nonce' => wp_create_nonce( 'gravityview_entry_approval' ),
481
+			'admin_nonce' => wp_create_nonce( 'gravityview_admin_entry_approval' ),
482 482
 			'form_id' => $form_id,
483 483
 			'show_column' => (int)$this->show_approve_entry_column( $form_id ),
484 484
 			'add_bulk_action' => (int)GVCommon::has_cap( 'gravityview_moderate_entries' ),
@@ -487,10 +487,10 @@  discard block
 block discarded – undo
487 487
 			'status_unapproved' => GravityView_Entry_Approval_Status::UNAPPROVED,
488 488
 			'bulk_actions' => $this->get_bulk_actions( $form_id ),
489 489
 			'bulk_message' => $this->bulk_update_message,
490
-			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('unapproved'),
491
-            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
492
-			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('approved'),
493
-			'column_title' => __( 'Show entry in directory view?', 'gravityview'),
490
+			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr( 'unapproved' ),
491
+            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr( 'disapproved' ),
492
+			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr( 'approved' ),
493
+			'column_title' => __( 'Show entry in directory view?', 'gravityview' ),
494 494
 			'column_link' => esc_url( $this->get_sort_link( $form_id ) ),
495 495
 		) );
496 496
 
@@ -510,11 +510,11 @@  discard block
 block discarded – undo
510 510
 
511 511
 		$approved_column_id = self::get_approved_column( $form_id );
512 512
 
513
-		if( ! $approved_column_id ) {
513
+		if ( ! $approved_column_id ) {
514 514
 		    return '';
515 515
         }
516 516
 
517
-	    $order = ( 'desc' === rgget('order') ) ? 'asc' : 'desc';
517
+	    $order = ( 'desc' === rgget( 'order' ) ) ? 'asc' : 'desc';
518 518
 
519 519
 	    $args = array(
520 520
 		    'orderby' => $approved_column_id,
@@ -540,16 +540,16 @@  discard block
 block discarded – undo
540 540
 		$bulk_actions = array(
541 541
 			'GravityView' => array(
542 542
 				array(
543
-					'label' => GravityView_Entry_Approval_Status::get_string('approved', 'action'),
544
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['approve'], $form_id ),
543
+					'label' => GravityView_Entry_Approval_Status::get_string( 'approved', 'action' ),
544
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'approve' ], $form_id ),
545 545
 				),
546 546
 				array(
547
-					'label' => GravityView_Entry_Approval_Status::get_string('disapproved', 'action'),
548
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['disapprove'], $form_id ),
547
+					'label' => GravityView_Entry_Approval_Status::get_string( 'disapproved', 'action' ),
548
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'disapprove' ], $form_id ),
549 549
 				),
550 550
 				array(
551
-					'label' => GravityView_Entry_Approval_Status::get_string('unapproved', 'action'),
552
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['unapprove'], $form_id ),
551
+					'label' => GravityView_Entry_Approval_Status::get_string( 'unapproved', 'action' ),
552
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'unapprove' ], $form_id ),
553 553
 				),
554 554
 			),
555 555
 		);
@@ -566,8 +566,8 @@  discard block
 block discarded – undo
566 566
 		// Sanitize the values, just to be sure.
567 567
 		foreach ( $bulk_actions as $key => $group ) {
568 568
 			foreach ( $group as $i => $action ) {
569
-				$bulk_actions[ $key ][ $i ]['label'] = esc_html( $bulk_actions[ $key ][ $i ]['label'] );
570
-				$bulk_actions[ $key ][ $i ]['value'] = esc_attr( $bulk_actions[ $key ][ $i ]['value'] );
569
+				$bulk_actions[ $key ][ $i ][ 'label' ] = esc_html( $bulk_actions[ $key ][ $i ][ 'label' ] );
570
+				$bulk_actions[ $key ][ $i ][ 'value' ] = esc_attr( $bulk_actions[ $key ][ $i ][ 'value' ] );
571 571
 			}
572 572
 		}
573 573
 
@@ -592,13 +592,13 @@  discard block
 block discarded – undo
592 592
 		 * @since 1.7.2
593 593
 		 * @param boolean $hide_if_no_connections
594 594
 		 */
595
-		$hide_if_no_connections = apply_filters('gravityview/approve_entries/hide-if-no-connections', false );
595
+		$hide_if_no_connections = apply_filters( 'gravityview/approve_entries/hide-if-no-connections', false );
596 596
 
597
-		if( $hide_if_no_connections ) {
597
+		if ( $hide_if_no_connections ) {
598 598
 
599 599
 			$connected_views = gravityview_get_connected_views( $form_id );
600 600
 
601
-			if( empty( $connected_views ) ) {
601
+			if ( empty( $connected_views ) ) {
602 602
 				$show_approve_column = false;
603 603
 			}
604 604
 		}
@@ -608,18 +608,18 @@  discard block
 block discarded – undo
608 608
 		 * @param boolean $show_approve_column Whether the column will be shown
609 609
 		 * @param int $form_id The ID of the Gravity Forms form for which entries are being shown
610 610
 		 */
611
-		$show_approve_column = apply_filters('gravityview/approve_entries/show-column', $show_approve_column, $form_id );
611
+		$show_approve_column = apply_filters( 'gravityview/approve_entries/show-column', $show_approve_column, $form_id );
612 612
 
613 613
 		return $show_approve_column;
614 614
 	}
615 615
 
616 616
 	function register_gform_noconflict_script( $scripts ) {
617
-		$scripts[] = 'gravityview_gf_entries_scripts';
617
+		$scripts[ ] = 'gravityview_gf_entries_scripts';
618 618
 		return $scripts;
619 619
 	}
620 620
 
621 621
 	function register_gform_noconflict_style( $styles ) {
622
-		$styles[] = 'gravityview_entries_list';
622
+		$styles[ ] = 'gravityview_entries_list';
623 623
 		return $styles;
624 624
 	}
625 625
 
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 
37 37
         self::$file = plugin_dir_path( __FILE__ );
38 38
 
39
-        if( is_admin() ) {
39
+        if ( is_admin() ) {
40 40
             $this->load_components( 'admin' );
41 41
         }
42 42
 
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 
56 56
     static function getInstance() {
57 57
 
58
-        if( empty( self::$instance ) ) {
58
+        if ( empty( self::$instance ) ) {
59 59
             self::$instance = new GravityView_Edit_Entry;
60 60
         }
61 61
 
@@ -81,10 +81,10 @@  discard block
 block discarded – undo
81 81
     private function add_hooks() {
82 82
 
83 83
         // Add front-end access to Gravity Forms delete file action
84
-        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file') );
84
+        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file' ) );
85 85
 
86 86
         // Make sure this hook is run for non-admins
87
-        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file') );
87
+        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file' ) );
88 88
 
89 89
         add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
90 90
 
@@ -99,8 +99,8 @@  discard block
 block discarded – undo
99 99
 	 */
100 100
 	private function addon_specific_hooks() {
101 101
 
102
-		if( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
103
-			add_filter('gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script'));
102
+		if ( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
103
+			add_filter( 'gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script' ) );
104 104
 		}
105 105
 
106 106
 	}
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
      */
147 147
     public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
148 148
 
149
-        $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
149
+        $nonce_key = self::get_nonce_key( $view_id, $entry[ 'form_id' ], $entry[ 'id' ] );
150 150
 
151 151
         $base = gv_entry_link( $entry, $post_id );
152 152
 
@@ -158,9 +158,9 @@  discard block
 block discarded – undo
158 158
 	     * Allow passing params to dynamically populate entry with values
159 159
 	     * @since 1.9.2
160 160
 	     */
161
-	    if( !empty( $field_values ) ) {
161
+	    if ( ! empty( $field_values ) ) {
162 162
 
163
-		    if( is_array( $field_values ) ) {
163
+		    if ( is_array( $field_values ) ) {
164 164
 			    // If already an array, no parse_str() needed
165 165
 			    $params = $field_values;
166 166
 		    } else {
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
 	 */
182 182
 	public function modify_field_blacklist( $fields = array(), $context = NULL ) {
183 183
 
184
-		if( empty( $context ) || $context !== 'edit' ) {
184
+		if ( empty( $context ) || $context !== 'edit' ) {
185 185
 			return $fields;
186 186
 		}
187 187
 
@@ -242,24 +242,24 @@  discard block
 block discarded – undo
242 242
         // If they can edit any entries (as defined in Gravity Forms)
243 243
         // Or if they can edit other people's entries
244 244
         // Then we're good.
245
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
245
+        if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry[ 'id' ] ) ) {
246 246
 
247
-            do_action('gravityview_log_debug', __METHOD__ . ' - User has ability to edit all entries.');
247
+            do_action( 'gravityview_log_debug', __METHOD__ . ' - User has ability to edit all entries.' );
248 248
 
249 249
             $user_can_edit = true;
250 250
 
251
-        } else if( !isset( $entry['created_by'] ) ) {
251
+        } else if ( ! isset( $entry[ 'created_by' ] ) ) {
252 252
 
253
-            do_action('gravityview_log_error', 'GravityView_Edit_Entry[check_user_cap_edit_entry] Entry `created_by` doesn\'t exist.');
253
+            do_action( 'gravityview_log_error', 'GravityView_Edit_Entry[check_user_cap_edit_entry] Entry `created_by` doesn\'t exist.' );
254 254
 
255 255
             $user_can_edit = false;
256 256
 
257 257
         } else {
258 258
 
259 259
             // get user_edit setting
260
-            if( empty( $view_id ) || $view_id == GravityView_View::getInstance()->getViewId() ) {
260
+            if ( empty( $view_id ) || $view_id == GravityView_View::getInstance()->getViewId() ) {
261 261
                 // if View ID not specified or is the current view
262
-                $user_edit = GravityView_View::getInstance()->getAtts('user_edit');
262
+                $user_edit = GravityView_View::getInstance()->getAtts( 'user_edit' );
263 263
             } else {
264 264
                 // in case is specified and not the current view
265 265
                 $user_edit = GVCommon::get_template_setting( $view_id, 'user_edit' );
@@ -268,21 +268,21 @@  discard block
 block discarded – undo
268 268
             $current_user = wp_get_current_user();
269 269
 
270 270
             // User edit is disabled
271
-            if( empty( $user_edit ) ) {
271
+            if ( empty( $user_edit ) ) {
272 272
 
273
-                do_action('gravityview_log_debug', 'GravityView_Edit_Entry[check_user_cap_edit_entry] User Edit is disabled. Returning false.' );
273
+                do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[check_user_cap_edit_entry] User Edit is disabled. Returning false.' );
274 274
 
275 275
                 $user_can_edit = false;
276 276
             }
277 277
 
278 278
             // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
279
-            else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
279
+            else if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
280 280
 
281
-                do_action('gravityview_log_debug', sprintf( 'GravityView_Edit_Entry[check_user_cap_edit_entry] User %s created the entry.', $current_user->ID ) );
281
+                do_action( 'gravityview_log_debug', sprintf( 'GravityView_Edit_Entry[check_user_cap_edit_entry] User %s created the entry.', $current_user->ID ) );
282 282
 
283 283
                 $user_can_edit = true;
284 284
 
285
-            } else if( ! is_user_logged_in() ) {
285
+            } else if ( ! is_user_logged_in() ) {
286 286
 
287 287
                 do_action( 'gravityview_log_debug', __METHOD__ . ' No user defined; edit entry requires logged in user' );
288 288
             }
Please login to merge, or discard this patch.
includes/class-gravityview-admin-bar.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 		/** @var WP_Admin_Bar $wp_admin_bar */
39 39
 		global $wp_admin_bar;
40 40
 
41
-		if( is_admin() || ! GVCommon::has_cap( array( 'edit_gravityviews', 'gravityview_edit_entry', 'gravityforms_edit_forms' ) ) ) {
41
+		if ( is_admin() || ! GVCommon::has_cap( array( 'edit_gravityviews', 'gravityview_edit_entry', 'gravityforms_edit_forms' ) ) ) {
42 42
 			return;
43 43
 		}
44 44
 
@@ -110,9 +110,9 @@  discard block
 block discarded – undo
110 110
 				'parent' => 'gravityview',
111 111
 				'title' => __( 'Edit Entry', 'gravityview' ),
112 112
 				'meta' => array(
113
-					'title' => sprintf( __( 'Edit Entry %s', 'gravityview' ), GravityView_API::get_entry_slug( $entry['id'], $entry ) ),
113
+					'title' => sprintf( __( 'Edit Entry %s', 'gravityview' ), GravityView_API::get_entry_slug( $entry[ 'id' ], $entry ) ),
114 114
 				),
115
-				'href' => esc_url_raw( admin_url( sprintf( 'admin.php?page=gf_entries&amp;screen_mode=edit&amp;view=entry&amp;id=%d&lid=%d', $entry['form_id'], $entry['id'] ) ) ),
115
+				'href' => esc_url_raw( admin_url( sprintf( 'admin.php?page=gf_entries&amp;screen_mode=edit&amp;view=entry&amp;id=%d&lid=%d', $entry[ 'form_id' ], $entry[ 'id' ] ) ) ),
116 116
 			) );
117 117
 
118 118
 		}
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 		/** @var WP_Admin_Bar $wp_admin_bar */
129 129
 		global $wp_admin_bar;
130 130
 
131
-		if( GVCommon::has_cap( array( 'edit_gravityviews', 'edit_gravityview', 'gravityforms_edit_forms' ) ) ) {
131
+		if ( GVCommon::has_cap( array( 'edit_gravityviews', 'edit_gravityview', 'gravityforms_edit_forms' ) ) ) {
132 132
 
133 133
 			if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) {
134 134
 				$views = gravityview()->views->all();
@@ -152,21 +152,21 @@  discard block
 block discarded – undo
152 152
 						$form_id = $view->form ? $view->form->ID : null;
153 153
 					} else {
154 154
 						/** Deprecated. */
155
-						$view_id = $view['id'];
156
-						$form_id = $view['form_id'];
155
+						$view_id = $view[ 'id' ];
156
+						$form_id = $view[ 'form_id' ];
157 157
 					}
158 158
 
159 159
 					$edit_view_title = __( 'Edit View', 'gravityview' );
160 160
 					$edit_form_title = __( 'Edit Form', 'gravityview' );
161 161
 
162
-					if( sizeof( $views ) > 1 ) {
162
+					if ( sizeof( $views ) > 1 ) {
163 163
 						$edit_view_title = sprintf( _x( 'Edit View #%d', 'Edit View with the ID of %d', 'gravityview' ), $view_id );
164 164
 						$edit_form_title = sprintf( __( 'Edit Form #%d', 'Edit Form with the ID of %d', 'gravityview' ), $form_id );
165 165
 					}
166 166
 
167
-					if( GVCommon::has_cap( 'edit_gravityview', $view_id ) && ! in_array( $view_id, $added_views ) ) {
167
+					if ( GVCommon::has_cap( 'edit_gravityview', $view_id ) && ! in_array( $view_id, $added_views ) ) {
168 168
 
169
-						$added_views[] = $view_id;
169
+						$added_views[ ] = $view_id;
170 170
 
171 171
 						$wp_admin_bar->add_menu( array(
172 172
 							'id'    => 'edit-view-' . $view_id,
@@ -176,9 +176,9 @@  discard block
 block discarded – undo
176 176
 						) );
177 177
 					}
178 178
 
179
-					if ( ! empty( $form_id ) && GVCommon::has_cap( array( 'gravityforms_edit_forms' ), $form_id ) && ! in_array( $form_id, $added_forms )  ) {
179
+					if ( ! empty( $form_id ) && GVCommon::has_cap( array( 'gravityforms_edit_forms' ), $form_id ) && ! in_array( $form_id, $added_forms ) ) {
180 180
 
181
-						$added_forms[] = $form_id;
181
+						$added_forms[ ] = $form_id;
182 182
 
183 183
 						$wp_admin_bar->add_menu( array(
184 184
 							'id'    => 'edit-form-' . $form_id,
Please login to merge, or discard this patch.
future/includes/class-gv-collection-view.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -129,12 +129,12 @@
 block discarded – undo
129 129
 
130 130
 		/** Let's find us some [gravityview] shortcodes perhaps. */
131 131
 		foreach ( Shortcode::parse( $content ) as $shortcode ) {
132
-			if ( $shortcode->name != 'gravityview' || empty( $shortcode->atts['id'] ) ) {
132
+			if ( $shortcode->name != 'gravityview' || empty( $shortcode->atts[ 'id' ] ) ) {
133 133
 				continue;
134 134
 			}
135 135
 
136
-			if ( is_numeric( $shortcode->atts['id'] ) ) {
137
-				$view = View::by_id( $shortcode->atts['id'] );
136
+			if ( is_numeric( $shortcode->atts[ 'id' ] ) ) {
137
+				$view = View::by_id( $shortcode->atts[ 'id' ] );
138 138
 				if ( ! $view ) {
139 139
 					continue;
140 140
 				}
Please login to merge, or discard this patch.