Completed
Push — develop ( 1b0bc5...954aba )
by
unknown
20:01 queued 12s
created
includes/fields/class-gravityview-field-radio.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 
12 12
 	var $is_searchable = true;
13 13
 
14
-	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains');
14
+	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' );
15 15
 
16 16
 	var $_gf_field_class_name = 'GF_Field_Radio';
17 17
 
@@ -40,8 +40,8 @@  discard block
 block discarded – undo
40 40
 		// Set the $_field_id var
41 41
 		$field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id );
42 42
 		
43
-		if( $this->is_choice_value_enabled() ) {
44
-			$field_options['choice_display'] = array(
43
+		if ( $this->is_choice_value_enabled() ) {
44
+			$field_options[ 'choice_display' ] = array(
45 45
 				'type'    => 'radio',
46 46
 				'value'   => 'value',
47 47
 				'label'   => __( 'What should be displayed:', 'gravityview' ),
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-select.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -44,8 +44,8 @@
 block discarded – undo
44 44
 		// Set the $_field_id var
45 45
 		$field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id );
46 46
 
47
-		if( $this->is_choice_value_enabled() ) {
48
-			$field_options['choice_display'] = array(
47
+		if ( $this->is_choice_value_enabled() ) {
48
+			$field_options[ 'choice_display' ] = array(
49 49
 				'type'    => 'radio',
50 50
 				'value'   => 'value',
51 51
 				'label'   => __( 'What should be displayed:', 'gravityview' ),
Please login to merge, or discard this patch.
future/includes/class-gv-shortcode-gventry.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -47,16 +47,16 @@  discard block
 block discarded – undo
47 47
 		 */
48 48
 		$atts = apply_filters( 'gravityview/shortcodes/gventry/atts', $atts );
49 49
 
50
-		$view = \GV\View::by_id( $atts['view_id'] );
50
+		$view = \GV\View::by_id( $atts[ 'view_id' ] );
51 51
 
52 52
 		if ( ! $view ) {
53
-			gravityview()->log->error( 'View does not exist #{view_id}', array( 'view_id' => $atts['view_id'] ) );
53
+			gravityview()->log->error( 'View does not exist #{view_id}', array( 'view_id' => $atts[ 'view_id' ] ) );
54 54
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', null, null, $atts );
55 55
 		}
56 56
 
57
-		$entry_id = ! empty( $atts['entry_id'] ) ? $atts['entry_id'] : $atts['id'];
57
+		$entry_id = ! empty( $atts[ 'entry_id' ] ) ? $atts[ 'entry_id' ] : $atts[ 'id' ];
58 58
 
59
-		switch( $entry_id ):
59
+		switch ( $entry_id ):
60 60
 			case 'last':
61 61
 				if ( class_exists( '\GF_Query' ) ) {
62 62
 					/**
@@ -65,17 +65,17 @@  discard block
 block discarded – undo
65 65
 					 * Since we're using \GF_Query shorthand initialization we have to reverse the order parameters here.
66 66
 					 */
67 67
 					add_filter( 'gravityview_get_entries', $filter = function( $parameters, $args, $form_id ) {
68
-						if ( ! empty( $parameters['sorting'] ) ) {
68
+						if ( ! empty( $parameters[ 'sorting' ] ) ) {
69 69
 							/**
70 70
 							 * Reverse existing sorts.
71 71
 							 */
72
-							$sort = &$parameters['sorting'];
73
-							$sort['direction'] = $sort['direction'] == 'RAND' ? : ( $sort['direction'] == 'ASC' ? 'DESC' : 'ASC' );
72
+							$sort = &$parameters[ 'sorting' ];
73
+							$sort[ 'direction' ] = $sort[ 'direction' ] == 'RAND' ?: ( $sort[ 'direction' ] == 'ASC' ? 'DESC' : 'ASC' );
74 74
 						} else {
75 75
 							/**
76 76
 							 * Otherwise, sort by date_created.
77 77
 							 */
78
-							$parameters['sorting'] = array(
78
+							$parameters[ 'sorting' ] = array(
79 79
 								'key' => 'id',
80 80
 								'direction' => 'ASC',
81 81
 								'is_numeric' => true
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 
91 91
 					/** If a sort already exists, reverse it. */
92 92
 					if ( $sort = end( $entries->sorts ) ) {
93
-						$entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ? : ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode );
93
+						$entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ?: ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode );
94 94
 					} else {
95 95
 						/** Otherwise, sort by date_created */
96 96
 						$entries = $entries->sort( new \GV\Entry_Sort( \GV\Internal_Field::by_id( 'id' ), \GV\Entry_Sort::ASC ), \GV\Entry_Sort::NUMERIC );
@@ -108,12 +108,12 @@  discard block
 block discarded – undo
108 108
 				break;
109 109
 			default:
110 110
 				if ( ! $entry = \GV\GF_Entry::by_id( $entry_id ) ) {
111
-					gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts['view_id'] ) );
111
+					gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts[ 'view_id' ] ) );
112 112
 					return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, null, $atts );
113 113
 				}
114 114
 		endswitch;
115 115
 
116
-		if ( $view->form->ID != $entry['form_id'] ) {
116
+		if ( $view->form->ID != $entry[ 'form_id' ] ) {
117 117
 			gravityview()->log->error( 'Entry does not belong to view (form mismatch)' );
118 118
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
119 119
 		}
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 			return apply_filters( 'gravityview/shortcodes/gventry/output', get_the_password_form( $view->ID ), $view, $entry, $atts );
124 124
 		}
125 125
 
126
-		if ( ! $view->form  ) {
126
+		if ( ! $view->form ) {
127 127
 			gravityview()->log->notice( 'View #{id} has no form attached to it.', array( 'id' => $view->ID ) );
128 128
 
129 129
 			/**
@@ -146,43 +146,43 @@  discard block
 block discarded – undo
146 146
 		}
147 147
 
148 148
 		/** Unapproved entries. */
149
-		if ( $entry['status'] != 'active' ) {
149
+		if ( $entry[ 'status' ] != 'active' ) {
150 150
 			gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
151 151
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
152 152
 		}
153 153
 
154
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
154
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
155 155
 
156 156
 		if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
157
-			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
157
+			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
158 158
 				gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
159 159
 				return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
160 160
 			}
161 161
 		}
162 162
 
163
-		if ( $atts['edit'] ) {
163
+		if ( $atts[ 'edit' ] ) {
164 164
 			/**
165 165
 			 * Based on code in our unit-tests.
166 166
 			 * Mocks old context, etc.
167 167
 			 */
168 168
 			$loader = \GravityView_Edit_Entry::getInstance();
169
-			$render = $loader->instances['render'];
169
+			$render = $loader->instances[ 'render' ];
170 170
 
171 171
 			add_filter( 'gravityview/is_single_entry', '__return_true' );
172 172
 
173
-			$form = \GFAPI::get_form( $entry['form_id'] );
173
+			$form = \GFAPI::get_form( $entry[ 'form_id' ] );
174 174
 
175 175
 			$data = \GravityView_View_Data::getInstance( $view );
176 176
 			$template = \GravityView_View::getInstance( array(
177 177
 				'form' => $form,
178
-				'form_id' => $form['id'],
178
+				'form_id' => $form[ 'id' ],
179 179
 				'view_id' => $view->ID,
180 180
 				'entries' => array( $entry ),
181 181
 				'atts' => \GVCommon::get_template_settings( $view->ID ),
182 182
 			) );
183 183
 
184
-			$_GET['edit'] = wp_create_nonce(
185
-				\GravityView_Edit_Entry::get_nonce_key( $view->ID, $form['id'], $entry['id'] )
184
+			$_GET[ 'edit' ] = wp_create_nonce(
185
+				\GravityView_Edit_Entry::get_nonce_key( $view->ID, $form[ 'id' ], $entry[ 'id' ] )
186 186
 			);
187 187
 
188 188
 			add_filter( 'gravityview/edit_entry/success', $callback = function( $message ) use ( $view, $entry, $atts ) {
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 				return apply_filters( 'gravityview/shortcodes/gventry/edit/success', $message, $view, $entry, $atts );
200 200
 			} );
201 201
 
202
-			ob_start() && $render->init( $data, \GV\Entry::by_id( $entry['id'] ), $view );
202
+			ob_start() && $render->init( $data, \GV\Entry::by_id( $entry[ 'id' ] ), $view );
203 203
 			$output = ob_get_clean(); // Render :)
204 204
 
205 205
 			remove_filter( 'gravityview/is_single_entry', '__return_true' );
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 			$renderer = new \GV\Entry_Renderer();
212 212
 
213 213
 			$request = new \GV\Mock_Request();
214
-			$request->returns['is_entry'] = $entry;
214
+			$request->returns[ 'is_entry' ] = $entry;
215 215
 
216 216
 			$output = $renderer->render( $entry, $view, $request );
217 217
 
Please login to merge, or discard this patch.
plugin-and-theme-hooks/class-gravityview-plugin-hooks-pageviews.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 
43 43
 		parent::add_hooks();
44 44
 
45
-		add_shortcode( 'gv_pageviews', array( $this, 'pageviews') );
45
+		add_shortcode( 'gv_pageviews', array( $this, 'pageviews' ) );
46 46
 
47 47
 		add_filter( 'gravityview/fields/custom/decode_shortcodes', array( $this, 'inject_entry_id' ), 10, 3 );
48 48
 
@@ -68,8 +68,8 @@  discard block
 block discarded – undo
68 68
 	 * Used as sort of an action via the gravityview/fields/custom/decode_shortcodes filter.
69 69
 	 */
70 70
 	public function inject_entry_id( $r, $content, $context ) {
71
-		if ( ! empty( $context->entry['id'] ) ) {
72
-			$this->next_id = $context->entry['id'];
71
+		if ( ! empty( $context->entry[ 'id' ] ) ) {
72
+			$this->next_id = $context->entry[ 'id' ];
73 73
 		} else {
74 74
 			$this->next_id = false; // Nothing to look at, move along
75 75
 		}
@@ -97,13 +97,13 @@  discard block
 block discarded – undo
97 97
 			'id'        => $this->next_id,
98 98
 		), $atts );
99 99
 
100
-		if ( ! $this->atts['id'] ) {
100
+		if ( ! $this->atts[ 'id' ] ) {
101 101
 			return; // The ID was not set
102 102
 		}
103 103
 
104 104
 		add_filter( 'pageviews_placeholder_preload', array( $this, 'preload_callback' ) );
105 105
 
106
-		$output = Pageviews::placeholder( 'GV' . $this->atts['id'] ); // Prefix the ID to avoid collissions with default post IDs
106
+		$output = Pageviews::placeholder( 'GV' . $this->atts[ 'id' ] ); // Prefix the ID to avoid collissions with default post IDs
107 107
 
108 108
 		remove_filter( 'pageviews_placeholder_preload', array( $this, 'preload_callback' ) );
109 109
 
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 	 * Set the preload text.
115 115
 	 */
116 116
 	public function preload_callback( $preload ) {
117
-		return $this->atts['preload'];
117
+		return $this->atts[ 'preload' ];
118 118
 	}
119 119
 
120 120
 	/**
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 	 */
123 123
 	public function increment_callback() {
124 124
 		if ( $entry = gravityview()->request->is_entry() ) {
125
-			$increment = 'GV' . $entry['id'];
125
+			$increment = 'GV' . $entry[ 'id' ];
126 126
 			?>
127 127
 				_pv_config.incr = <?php echo json_encode( $increment ); ?>;
128 128
 			<?php
Please login to merge, or discard this patch.
includes/class-gvlogic-shortcode.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
 		return self::$instance;
18 18
 	}
19 19
 
20
-	public function shortcode( $atts, $content = '', $tag = '') {
20
+	public function shortcode( $atts, $content = '', $tag = '' ) {
21 21
 		$shortcode = new \GV\Shortcodes\gvlogic();
22 22
 		return $shortcode->callback( $atts, $content, $tag );
23 23
 	}
Please login to merge, or discard this patch.
future/includes/class-gv-template-field.php 1 patch
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	}
93 93
 
94 94
 	public function __destruct() {
95
-		remove_filter( $this->filter_prefix . '_get_template_part', $this->_add_id_specific_templates_callback );;
95
+		remove_filter( $this->filter_prefix . '_get_template_part', $this->_add_id_specific_templates_callback ); ;
96 96
 	}
97 97
 
98 98
 	/**
@@ -175,59 +175,59 @@  discard block
 block discarded – undo
175 175
 
176 176
 			if ( $is_view && $post ) {
177 177
 				if ( $field_type ) {
178
-					$specifics []= sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $field_type, $slug_name );
179
-					$inputType && $specifics []= sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $inputType, $slug_name );
180
-					$specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $field_type );
181
-					$inputType && $specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $inputType );
182
-					$specifics []= sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $field_type, $slug_name );
183
-					$inputType && $specifics []= sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $inputType, $slug_name );
184
-					$specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $field_type );
185
-					$inputType &&  $specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $inputType );
178
+					$specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $field_type, $slug_name );
179
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $inputType, $slug_name );
180
+					$specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $field_type );
181
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $inputType );
182
+					$specifics [ ] = sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $field_type, $slug_name );
183
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $inputType, $slug_name );
184
+					$specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $field_type );
185
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $inputType );
186 186
 				}
187 187
 
188
-				$specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $slug_name );
189
-				$specifics []= sprintf( '%spost-%d-view-%d-field.php', $slug_dir, $post->ID, $view_id );
190
-				$specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $slug_name );
191
-				$specifics []= sprintf( '%spost-%d-field.php', $slug_dir, $post->ID );
188
+				$specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $slug_name );
189
+				$specifics [ ] = sprintf( '%spost-%d-view-%d-field.php', $slug_dir, $post->ID, $view_id );
190
+				$specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $slug_name );
191
+				$specifics [ ] = sprintf( '%spost-%d-field.php', $slug_dir, $post->ID );
192 192
 			}
193 193
 			
194 194
 			/** Field-specific */
195 195
 			if ( $field_id && $form_id ) {
196 196
 
197 197
 				if ( $field_id ) {
198
-					$specifics []= sprintf( '%sform-%d-field-%d-%s.php', $slug_dir, $form_id, $field_id, $slug_name );
199
-					$specifics []= sprintf( '%sform-%d-field-%d.php', $slug_dir, $form_id, $field_id );
198
+					$specifics [ ] = sprintf( '%sform-%d-field-%d-%s.php', $slug_dir, $form_id, $field_id, $slug_name );
199
+					$specifics [ ] = sprintf( '%sform-%d-field-%d.php', $slug_dir, $form_id, $field_id );
200 200
 
201 201
 					if ( $view_id ) {
202
-						$specifics []= sprintf( '%sview-%d-field-%d.php', $slug_dir, $view_id, $field_id );
202
+						$specifics [ ] = sprintf( '%sview-%d-field-%d.php', $slug_dir, $view_id, $field_id );
203 203
 					}
204 204
 				}
205 205
 
206 206
 				if ( $field_type ) {
207
-					$specifics []= sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $field_type, $slug_name );
208
-					$inputType && $specifics []= sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $inputType, $slug_name );
209
-					$specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $field_type );
210
-					$inputType && $specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $inputType );
211
-
212
-					$specifics []= sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $field_type, $slug_name );
213
-					$inputType && $specifics []= sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $inputType, $slug_name );
214
-					$specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $field_type );
215
-					$inputType && $specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $inputType );
216
-
217
-					$specifics []= sprintf( '%sfield-%s-%s.php', $slug_dir, $field_type, $slug_name );
218
-					$inputType && $specifics []= sprintf( '%sfield-%s-%s.php', $slug_dir, $inputType, $slug_name );
219
-					$specifics []= sprintf( '%sfield-%s.php', $slug_dir, $field_type );
220
-					$inputType && $specifics []= sprintf( '%sfield-%s.php', $slug_dir, $inputType );
207
+					$specifics [ ] = sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $field_type, $slug_name );
208
+					$inputType && $specifics [ ] = sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $inputType, $slug_name );
209
+					$specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $field_type );
210
+					$inputType && $specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $inputType );
211
+
212
+					$specifics [ ] = sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $field_type, $slug_name );
213
+					$inputType && $specifics [ ] = sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $inputType, $slug_name );
214
+					$specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $field_type );
215
+					$inputType && $specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $inputType );
216
+
217
+					$specifics [ ] = sprintf( '%sfield-%s-%s.php', $slug_dir, $field_type, $slug_name );
218
+					$inputType && $specifics [ ] = sprintf( '%sfield-%s-%s.php', $slug_dir, $inputType, $slug_name );
219
+					$specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $field_type );
220
+					$inputType && $specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $inputType );
221 221
 				}
222 222
 			}
223 223
 
224 224
 			if ( $form_id ) {
225 225
 				/** Generic field templates */
226
-				$specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $slug_name );
227
-				$specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $slug_name );
226
+				$specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $slug_name );
227
+				$specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $slug_name );
228 228
 
229
-				$specifics []= sprintf( '%sview-%d-field.php', $slug_dir, $view_id );
230
-				$specifics []= sprintf( '%sform-%d-field.php', $slug_dir, $form_id );
229
+				$specifics [ ] = sprintf( '%sview-%d-field.php', $slug_dir, $view_id );
230
+				$specifics [ ] = sprintf( '%sform-%d-field.php', $slug_dir, $form_id );
231 231
 			}
232 232
 
233 233
 			/**
@@ -235,12 +235,12 @@  discard block
 block discarded – undo
235 235
 			 * Ignore some types that conflict.
236 236
 			 */
237 237
 			if ( ! in_array( $field_type, array( 'notes' ) ) ) {
238
-				$specifics []= sprintf( '%s.php', $field_type );
239
-				$specifics []= sprintf( 'fields/%s.php', $field_type );
238
+				$specifics [ ] = sprintf( '%s.php', $field_type );
239
+				$specifics [ ] = sprintf( 'fields/%s.php', $field_type );
240 240
 			}
241 241
 
242
-			$specifics []= sprintf( '%sfield-%s.php', $slug_dir, $slug_name );
243
-			$specifics []= sprintf( '%sfield.php', $slug_dir );
242
+			$specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $slug_name );
243
+			$specifics [ ] = sprintf( '%sfield.php', $slug_dir );
244 244
 
245 245
 			return array_merge( $specifics, $templates );
246 246
 		};
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
 			/** Prevent any PHP warnings that may be generated. */
275 275
 			ob_start();
276 276
 
277
-			$display_value = \GFCommon::get_lead_field_display( $this->field->field, $value, $entry['currency'], false, 'html' );
277
+			$display_value = \GFCommon::get_lead_field_display( $this->field->field, $value, $entry[ 'currency' ], false, 'html' );
278 278
 
279 279
 			if ( $errors = ob_get_clean() ) {
280 280
 				gravityview()->log->error( 'Errors when calling GFCommon::get_lead_field_display()', array( 'data' => $errors ) );
Please login to merge, or discard this patch.
future/includes/rest/class-gv-rest-views-route.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 			'total' => wp_count_posts( 'gravityview' )->publish,
64 64
 		);
65 65
 		foreach ( $items as $item ) {
66
-			$data['views'][] = $this->prepare_view_for_response( $item, $request );
66
+			$data[ 'views' ][ ] = $this->prepare_view_for_response( $item, $request );
67 67
 		}
68 68
 
69 69
 		return new \WP_REST_Response( $data, 200 );
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 
83 83
 		$url = $request->get_url_params();
84 84
 
85
-		$view_id = intval( $url['id'] );
85
+		$view_id = intval( $url[ 'id' ] );
86 86
 
87 87
 		$item = get_post( $view_id );
88 88
 
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 		// Only output the fields that should be displayed.
115 115
 		$allowed = array();
116 116
 		foreach ( $view->fields->by_position( "{$context}_*" )->by_visible( $view )->all() as $field ) {
117
-			$allowed[] = $field;
117
+			$allowed[ ] = $field;
118 118
 		}
119 119
 
120 120
 		/**
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 
134 134
 		// Tack on additional fields if needed
135 135
 		foreach ( array_diff( $allowed_field_ids, wp_list_pluck( $allowed, 'ID' ) ) as $field_id ) {
136
-			$allowed[] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );
136
+			$allowed[ ] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );
137 137
 		}
138 138
 
139 139
 		$r = new Request( $request );
@@ -211,10 +211,10 @@  discard block
 block discarded – undo
211 211
 	public function get_sub_items( $request ) {
212 212
 
213 213
 		$url     = $request->get_url_params();
214
-		$view_id = intval( $url['id'] );
214
+		$view_id = intval( $url[ 'id' ] );
215 215
 		$format  = \GV\Utils::get( $url, 'format', 'json' );
216 216
 
217
-		if( $post_id = $request->get_param('post_id') ) {
217
+		if ( $post_id = $request->get_param( 'post_id' ) ) {
218 218
 			global $post;
219 219
 
220 220
 			$post = get_post( $post_id );
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
 
320 320
 		$data = array( 'entries' => $entries->all(), 'total' => $entries->total() );
321 321
 
322
-		foreach ( $data['entries'] as &$entry ) {
322
+		foreach ( $data[ 'entries' ] as &$entry ) {
323 323
 			$entry = $this->prepare_entry_for_response( $view, $entry, $request, 'directory' );
324 324
 		}
325 325
 
@@ -338,8 +338,8 @@  discard block
 block discarded – undo
338 338
 	 */
339 339
 	public function get_sub_item( $request ) {
340 340
 		$url      = $request->get_url_params();
341
-		$view_id  = intval( $url['id'] );
342
-		$entry_id = intval( $url['s_id'] );
341
+		$view_id  = intval( $url[ 'id' ] );
342
+		$entry_id = intval( $url[ 's_id' ] );
343 343
 		$format   = \GV\Utils::get( $url, 'format', 'json' );
344 344
 
345 345
 		$view  = \GV\View::by_id( $view_id );
@@ -374,32 +374,32 @@  discard block
 block discarded – undo
374 374
 		// Add all the WP_Post data
375 375
 		$view_post = $view_post->to_array();
376 376
 
377
-		unset( $view_post['to_ping'], $view_post['ping_status'], $view_post['pinged'], $view_post['post_type'], $view_post['filter'], $view_post['post_category'], $view_post['tags_input'], $view_post['post_content'], $view_post['post_content_filtered'] );
377
+		unset( $view_post[ 'to_ping' ], $view_post[ 'ping_status' ], $view_post[ 'pinged' ], $view_post[ 'post_type' ], $view_post[ 'filter' ], $view_post[ 'post_category' ], $view_post[ 'tags_input' ], $view_post[ 'post_content' ], $view_post[ 'post_content_filtered' ] );
378 378
 
379 379
 		$return = wp_parse_args( $item, $view_post );
380 380
 
381
-		$return['title'] = $return['post_title'];
381
+		$return[ 'title' ] = $return[ 'post_title' ];
382 382
 
383
-		$return['settings'] = isset( $return['atts'] ) ? $return['atts'] : array();
384
-		unset( $return['atts'], $return['view_id'] );
383
+		$return[ 'settings' ] = isset( $return[ 'atts' ] ) ? $return[ 'atts' ] : array();
384
+		unset( $return[ 'atts' ], $return[ 'view_id' ] );
385 385
 
386
-		$return['search_criteria'] = array(
386
+		$return[ 'search_criteria' ] = array(
387 387
 			'page_size' => rgars( $return, 'settings/page_size' ),
388 388
 			'sort_field' => rgars( $return, 'settings/sort_field' ),
389 389
 			'sort_direction' => rgars( $return, 'settings/sort_direction' ),
390 390
 			'offset' => rgars( $return, 'settings/offset' ),
391 391
 		);
392 392
 
393
-		unset( $return['settings']['page_size'], $return['settings']['sort_field'], $return['settings']['sort_direction'] );
393
+		unset( $return[ 'settings' ][ 'page_size' ], $return[ 'settings' ][ 'sort_field' ], $return[ 'settings' ][ 'sort_direction' ] );
394 394
 
395 395
 		// Redact for non-logged ins
396 396
 		if ( ! \GVCommon::has_cap( 'edit_others_gravityviews' ) ) {
397
-			unset( $return['settings'] );
398
-			unset( $return['search_criteria'] );
397
+			unset( $return[ 'settings' ] );
398
+			unset( $return[ 'search_criteria' ] );
399 399
 		}
400 400
 		
401 401
 		if ( ! \GFCommon::current_user_can_any( 'gravityforms_edit_forms' ) ) {
402
-			unset( $return['form'] );
402
+			unset( $return[ 'form' ] );
403 403
 		}
404 404
 
405 405
 		return $return;
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
 			$view_id = func_get_arg( 1 ); // $view_id override
416 416
 		} else {
417 417
 			$url     = $request->get_url_params();
418
-			$view_id = intval( $url['id'] );
418
+			$view_id = intval( $url[ 'id' ] );
419 419
 		}
420 420
 
421 421
 		if ( ! $view = \GV\View::by_id( $view_id ) ) {
@@ -461,8 +461,8 @@  discard block
 block discarded – undo
461 461
 		}
462 462
 
463 463
 		$url     = $request->get_url_params();
464
-		$view_id = intval( $url['id'] );
465
-		$entry_id = intval( $url['s_id'] );
464
+		$view_id = intval( $url[ 'id' ] );
465
+		$entry_id = intval( $url[ 's_id' ] );
466 466
 
467 467
 		$view = \GV\View::by_id( $view_id );
468 468
 
@@ -470,11 +470,11 @@  discard block
 block discarded – undo
470 470
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
471 471
 		}
472 472
 
473
-		if ( $entry['form_id'] != $view->form->ID ) {
473
+		if ( $entry[ 'form_id' ] != $view->form->ID ) {
474 474
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
475 475
 		}
476 476
 
477
-		if ( $entry['status'] != 'active' ) {
477
+		if ( $entry[ 'status' ] != 'active' ) {
478 478
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
479 479
 		}
480 480
 
@@ -482,10 +482,10 @@  discard block
 block discarded – undo
482 482
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
483 483
 		}
484 484
 
485
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
485
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
486 486
 
487 487
 		if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
488
-			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
488
+			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
489 489
 				return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
490 490
 			}
491 491
 		}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-unsubscribe.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 
19 19
 	public function __construct() {
20 20
 		$this->label = esc_html__( 'Unsubscribe', 'gravityview' );
21
-		$this->description =  esc_attr__( 'Unsubscribe from a Payment-based entry.', 'gravityview' );
21
+		$this->description = esc_attr__( 'Unsubscribe from a Payment-based entry.', 'gravityview' );
22 22
 
23 23
 		$this->add_hooks();
24 24
 
@@ -57,13 +57,13 @@  discard block
 block discarded – undo
57 57
 	 */
58 58
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
59 59
 
60
-		unset( $field_options['only_loggedin'] );
60
+		unset( $field_options[ 'only_loggedin' ] );
61 61
 
62
-		unset( $field_options['new_window'] );
62
+		unset( $field_options[ 'new_window' ] );
63 63
 
64
-		unset( $field_options['show_as_link'] );
64
+		unset( $field_options[ 'show_as_link' ] );
65 65
 
66
-		$add_options['unsub_all'] = array(
66
+		$add_options[ 'unsub_all' ] = array(
67 67
 			'type'       => 'checkbox',
68 68
 			'label'      => __( 'Allow admins to unsubscribe', 'gravityview' ),
69 69
 			'desc'       => __( 'Allow users with `gravityforms_edit_entries` to cancel subscriptions', 'gravityview' ),
@@ -130,9 +130,9 @@  discard block
 block discarded – undo
130 130
 		}
131 131
 
132 132
 		foreach ( $feeds as $feed ) {
133
-			if ( isset( $subscription_addons[ $feed['addon_slug'] ] ) && 'subscription' === \GV\Utils::get( $feed, 'meta/transactionType' ) ) {
134
-				if ( ! isset( $entry_default_fields["{$this->name}"] ) && 'edit' !== $context ) {
135
-					$entry_default_fields["{$this->name}"] = array(
133
+			if ( isset( $subscription_addons[ $feed[ 'addon_slug' ] ] ) && 'subscription' === \GV\Utils::get( $feed, 'meta/transactionType' ) ) {
134
+				if ( ! isset( $entry_default_fields[ "{$this->name}" ] ) && 'edit' !== $context ) {
135
+					$entry_default_fields[ "{$this->name}" ] = array(
136 136
 						'label' => $this->label,
137 137
 						'desc'  => $this->description,
138 138
 						'type'  => $this->name,
@@ -163,10 +163,10 @@  discard block
 block discarded – undo
163 163
 			return $output;
164 164
 		}
165 165
 
166
-		$can_current_user_edit = is_numeric( $entry['created_by'] ) && ( wp_get_current_user()->ID === intval( $entry['created_by'] ) );
166
+		$can_current_user_edit = is_numeric( $entry[ 'created_by' ] ) && ( wp_get_current_user()->ID === intval( $entry[ 'created_by' ] ) );
167 167
 
168 168
 		if ( ! $can_current_user_edit ) {
169
-			if ( empty( $field_settings['unsub_all'] ) || ! \GVCommon::has_cap( 'gravityforms_edit_entries', $entry['id'] ) ) {
169
+			if ( empty( $field_settings[ 'unsub_all' ] ) || ! \GVCommon::has_cap( 'gravityforms_edit_entries', $entry[ 'id' ] ) ) {
170 170
 				return $output;
171 171
 			}
172 172
 		}
@@ -179,21 +179,21 @@  discard block
 block discarded – undo
179 179
 		// @todo Also make sure we check caps if moved from here
180 180
 		// @todo Also make sure test_GravityView_Field_Unsubscribe_unsubscribe_permissions is rewritten
181 181
 		if ( $entry = $this->maybe_unsubscribe( $entry ) ) {
182
-			if ( $entry['payment_status'] !== $status ) {
182
+			if ( $entry[ 'payment_status' ] !== $status ) {
183 183
 				// @todo Probably __( 'Unsubscribed', 'gravityview' );
184
-				return $entry['payment_status'];
184
+				return $entry[ 'payment_status' ];
185 185
 			}
186 186
 		}
187 187
 
188
-		if ( 'active' !== mb_strtolower( $entry['payment_status'] ) ) {
188
+		if ( 'active' !== mb_strtolower( $entry[ 'payment_status' ] ) ) {
189 189
 			return $output;
190 190
 		}
191 191
 
192 192
 		global $wp;
193 193
 		$current_url = add_query_arg( $wp->query_string, '', home_url( $wp->request ) );
194 194
 
195
-		$link = add_query_arg( 'unsubscribe', wp_create_nonce( 'unsubscribe_' . $entry['id'] ), $current_url );
196
-		$link = add_query_arg( 'uid', $entry['id'], $link );
195
+		$link = add_query_arg( 'unsubscribe', wp_create_nonce( 'unsubscribe_' . $entry[ 'id' ] ), $current_url );
196
+		$link = add_query_arg( 'uid', $entry[ 'id' ], $link );
197 197
 
198 198
 		return sprintf( '<a href="%s">%s</a>', esc_url( $link ), esc_html__( 'Unsubscribe', 'gravityview' ) );
199 199
 	}
@@ -213,11 +213,11 @@  discard block
 block discarded – undo
213 213
 	 */
214 214
 	private function maybe_unsubscribe( $entry ) {
215 215
 
216
-		if ( ! wp_verify_nonce( \GV\Utils::_REQUEST( 'unsubscribe' ), 'unsubscribe_' . $entry['id'] ) ) {
216
+		if ( ! wp_verify_nonce( \GV\Utils::_REQUEST( 'unsubscribe' ), 'unsubscribe_' . $entry[ 'id' ] ) ) {
217 217
 			return $entry;
218 218
 		}
219 219
 
220
-		if ( ( ! $uid = \GV\Utils::_REQUEST( 'uid' ) ) || ! is_numeric( $uid ) || ( intval( $uid ) !== intval( $entry['id'] ) ) ) {
220
+		if ( ( ! $uid = \GV\Utils::_REQUEST( 'uid' ) ) || ! is_numeric( $uid ) || ( intval( $uid ) !== intval( $entry[ 'id' ] ) ) ) {
221 221
 			return $entry;
222 222
 		}
223 223
 
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
 
260 260
 						$subscription_addons[ $slug ]->cancel_subscription( $entry, $feed );
261 261
 
262
-						return \GFAPI::get_entry( $entry['id'] );
262
+						return \GFAPI::get_entry( $entry[ 'id' ] );
263 263
 					}
264 264
 				}
265 265
 			}
Please login to merge, or discard this patch.
includes/extensions/entry-notes/fields/notes.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -9,9 +9,9 @@  discard block
 block discarded – undo
9 9
 $gravityview_view = GravityView_View::getInstance();
10 10
 
11 11
 $visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' );
12
-$show_notes_logged_out = ( ! empty( $visibility_settings['view'] ) && ! empty( $visibility_settings['view_loggedout'] ) );
12
+$show_notes_logged_out = ( ! empty( $visibility_settings[ 'view' ] ) && ! empty( $visibility_settings[ 'view_loggedout' ] ) );
13 13
 
14
-if(	! GVCommon::has_cap( array( 'gravityview_view_entry_notes', 'gravityview_add_entry_notes', 'gravityview_delete_entry_notes' ) ) && ! $show_notes_logged_out ) {
14
+if ( ! GVCommon::has_cap( array( 'gravityview_view_entry_notes', 'gravityview_add_entry_notes', 'gravityview_delete_entry_notes' ) ) && ! $show_notes_logged_out ) {
15 15
 	return;
16 16
 }
17 17
 
@@ -25,20 +25,20 @@  discard block
 block discarded – undo
25 25
 do_action( 'gravityview/field/notes/scripts' );
26 26
 
27 27
 $entry      = $gravityview_view->getCurrentEntry();
28
-$notes      = (array) GravityView_Entry_Notes::get_notes( $entry['id'] );
28
+$notes      = (array)GravityView_Entry_Notes::get_notes( $entry[ 'id' ] );
29 29
 $strings    = GravityView_Field_Notes::strings();
30
-$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
30
+$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
31 31
 
32
-$show_add = ! empty( $visibility_settings['add'] );
33
-$show_delete = ( ! empty( $visibility_settings['delete'] ) && GVCommon::has_cap( 'gravityview_delete_entry_notes' ) );
34
-$show_notes = $show_notes_logged_out || ( ! empty( $visibility_settings['view'] ) && GVCommon::has_cap( 'gravityview_view_entry_notes' ) );
32
+$show_add = ! empty( $visibility_settings[ 'add' ] );
33
+$show_delete = ( ! empty( $visibility_settings[ 'delete' ] ) && GVCommon::has_cap( 'gravityview_delete_entry_notes' ) );
34
+$show_notes = $show_notes_logged_out || ( ! empty( $visibility_settings[ 'view' ] ) && GVCommon::has_cap( 'gravityview_view_entry_notes' ) );
35 35
 
36 36
 $container_class = ( sizeof( $notes ) > 0 ? 'gv-has-notes' : 'gv-no-notes' );
37 37
 $container_class .= $show_notes ? ' gv-show-notes' : ' gv-hide-notes';
38 38
 ?>
39 39
 <div class="gv-notes <?php echo $container_class; ?>">
40 40
 <?php
41
-	if( $show_notes ) {
41
+	if ( $show_notes ) {
42 42
 ?>
43 43
 	<form method="post" class="gv-notes-list">
44 44
 		<?php if ( $show_delete ) { wp_nonce_field( 'gv_delete_notes_' . $entry_slug, 'gv_delete_notes' ); } ?>
@@ -46,21 +46,21 @@  discard block
 block discarded – undo
46 46
 			<input type="hidden" name="action" value="gv_delete_notes" />
47 47
 			<input type="hidden" name="entry-slug" value="<?php echo esc_attr( $entry_slug ); ?>" />
48 48
 			<table>
49
-				<caption><?php echo $strings['caption']; ?></caption>
49
+				<caption><?php echo $strings[ 'caption' ]; ?></caption>
50 50
 				<?php
51 51
 				if ( $show_delete ) {
52 52
 				?>
53 53
 				<thead>
54 54
 					<tr>
55 55
 						<th colspan="2">
56
-							<label><input type="checkbox" value="" class="gv-notes-toggle" title="<?php echo $strings['toggle-notes']; ?>"><span class="screen-reader-text"><?php echo $strings['toggle-notes']; ?></span></label>
57
-							<button type="submit" class="button button-small gv-notes-delete"><?php echo $strings['delete']; ?></button>
56
+							<label><input type="checkbox" value="" class="gv-notes-toggle" title="<?php echo $strings[ 'toggle-notes' ]; ?>"><span class="screen-reader-text"><?php echo $strings[ 'toggle-notes' ]; ?></span></label>
57
+							<button type="submit" class="button button-small gv-notes-delete"><?php echo $strings[ 'delete' ]; ?></button>
58 58
 						</th>
59 59
 					</tr>
60 60
 				</thead>
61 61
 				<?php } ?>
62 62
 				<tbody>
63
-					<tr class="gv-notes-no-notes"><td colspan="2"><?php echo $strings['no-notes']; ?></td></tr>
63
+					<tr class="gv-notes-no-notes"><td colspan="2"><?php echo $strings[ 'no-notes' ]; ?></td></tr>
64 64
 					<?php
65 65
 						foreach ( $notes as $note ) {
66 66
 							echo GravityView_Field_Notes::display_note( $note, $show_delete );
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 <?php
74 74
 	} // End if can view notes
75 75
 
76
-	if( $show_add ) {
76
+	if ( $show_add ) {
77 77
 		echo do_shortcode( '[gv_note_add]' );
78 78
 	}
79 79
 ?>
Please login to merge, or discard this patch.