Completed
Pull Request — develop (#1487)
by Zack
14:14 queued 02:44
created
includes/admin/metaboxes/views/view-configuration.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -15,32 +15,32 @@  discard block
 block discarded – undo
15 15
 
16 16
 		<div id="directory-fields" class="gv-section">
17 17
 
18
-			<h4><?php esc_html_e( 'Above Entries Widgets', 'gravityview'); ?> <span><?php esc_html_e( 'These widgets will be shown above entries.', 'gravityview'); ?></span></h4>
18
+			<h4><?php esc_html_e( 'Above Entries Widgets', 'gravityview' ); ?> <span><?php esc_html_e( 'These widgets will be shown above entries.', 'gravityview' ); ?></span></h4>
19 19
 
20
-			<?php do_action('gravityview_render_widgets_active_areas', $curr_template, 'header', $post->ID ); ?>
20
+			<?php do_action( 'gravityview_render_widgets_active_areas', $curr_template, 'header', $post->ID ); ?>
21 21
 
22
-			<h4><?php esc_html_e( 'Entries Fields', 'gravityview'); ?> <span><?php esc_html_e( 'These fields will be shown for each entry.', 'gravityview'); ?></span></h4>
22
+			<h4><?php esc_html_e( 'Entries Fields', 'gravityview' ); ?> <span><?php esc_html_e( 'These fields will be shown for each entry.', 'gravityview' ); ?></span></h4>
23 23
 
24 24
 			<div id="directory-active-fields" class="gv-grid">
25
-				<?php if(!empty( $curr_template ) ) {
26
-					do_action('gravityview_render_directory_active_areas', $curr_template, 'directory', $post->ID, true );
25
+				<?php if ( ! empty( $curr_template ) ) {
26
+					do_action( 'gravityview_render_directory_active_areas', $curr_template, 'directory', $post->ID, true );
27 27
 				} ?>
28 28
 			</div>
29 29
 
30
-			<h4><?php esc_html_e( 'Below Entries Widgets', 'gravityview'); ?> <span><?php esc_html_e( 'These widgets will be shown below entries.', 'gravityview'); ?></span></h4>
30
+			<h4><?php esc_html_e( 'Below Entries Widgets', 'gravityview' ); ?> <span><?php esc_html_e( 'These widgets will be shown below entries.', 'gravityview' ); ?></span></h4>
31 31
 
32 32
 			<?php
33 33
 
34
-                do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
34
+                do_action( 'gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
35 35
 
36
-    			do_action('gravityview_render_field_pickers', 'directory' );
36
+    			do_action( 'gravityview_render_field_pickers', 'directory' );
37 37
 
38 38
             ?>
39 39
 
40 40
 			<?php // list of available widgets to be shown in the popup ?>
41 41
             <div id="directory-available-widgets" class="hide-if-js gv-tooltip">
42 42
                 <span class="close" role="button" aria-label="<?php esc_html_e( 'Close', 'gravityview' ); ?>"><i class="dashicons dashicons-dismiss"></i></span>
43
-				<?php do_action('gravityview_render_available_widgets' ); ?>
43
+				<?php do_action( 'gravityview_render_available_widgets' ); ?>
44 44
             </div>
45 45
 
46 46
 		</div>
@@ -56,17 +56,17 @@  discard block
 block discarded – undo
56 56
 
57 57
 		<div id="single-fields" class="gv-section">
58 58
 
59
-			<h4><?php esc_html_e( 'These fields will be shown in Single Entry view.', 'gravityview'); ?></h4>
59
+			<h4><?php esc_html_e( 'These fields will be shown in Single Entry view.', 'gravityview' ); ?></h4>
60 60
 
61 61
 			<div id="single-active-fields" class="gv-grid">
62 62
 				<?php
63
-                if(!empty( $curr_template ) ) {
64
-				    do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
63
+                if ( ! empty( $curr_template ) ) {
64
+				    do_action( 'gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
65 65
                 }
66 66
 			    ?>
67 67
 			</div>
68 68
             <?php
69
-                do_action('gravityview_render_field_pickers', 'single' );
69
+                do_action( 'gravityview_render_field_pickers', 'single' );
70 70
 			?>
71 71
 		</div>
72 72
 
@@ -76,16 +76,16 @@  discard block
 block discarded – undo
76 76
 
77 77
 		<div id="edit-fields" class="gv-section">
78 78
 
79
-			<h4><?php esc_html_e( 'Fields shown when editing an entry.', 'gravityview'); ?> <span><?php esc_html_e('If not configured, all form fields will be displayed.', 'gravityview'); ?></span></h4>
79
+			<h4><?php esc_html_e( 'Fields shown when editing an entry.', 'gravityview' ); ?> <span><?php esc_html_e( 'If not configured, all form fields will be displayed.', 'gravityview' ); ?></span></h4>
80 80
 
81 81
 			<div id="edit-active-fields" class="gv-grid">
82 82
 				<?php
83
-				do_action('gravityview_render_directory_active_areas', apply_filters( 'gravityview/template/edit', 'default_table_edit' ), 'edit', $post->ID, true );
83
+				do_action( 'gravityview_render_directory_active_areas', apply_filters( 'gravityview/template/edit', 'default_table_edit' ), 'edit', $post->ID, true );
84 84
 				?>
85 85
 			</div>
86 86
 
87 87
 			<?php
88
-			    do_action('gravityview_render_field_pickers', 'edit' );
88
+			    do_action( 'gravityview_render_field_pickers', 'edit' );
89 89
 			?>
90 90
 
91 91
 		</div>
Please login to merge, or discard this patch.
includes/admin/metaboxes/views/select-template.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -22,27 +22,27 @@
 block discarded – undo
22 22
 
23 23
 <?php // list all the available templates (type= fresh or custom ) ?>
24 24
 <div class="gv-grid">
25
-	<?php foreach( $templates as $id => $template ) {
25
+	<?php foreach ( $templates as $id => $template ) {
26 26
 		$selected = ( $id == $current_template ) ? ' gv-selected' : ''; ?>
27 27
 
28 28
 		<div class="gv-grid-col-1-3">
29
-			<div class="gv-view-types-module<?php echo $selected; ?>" data-filter="<?php echo esc_attr( $template['type'] ); ?>">
29
+			<div class="gv-view-types-module<?php echo $selected; ?>" data-filter="<?php echo esc_attr( $template[ 'type' ] ); ?>">
30 30
 				<div class="gv-view-types-hover">
31 31
 					<div>
32
-						<?php if( !empty( $template['buy_source'] ) ) { ?>
33
-							<p><a href="<?php echo esc_url( $template['buy_source'] ); ?>" class="button-primary button-buy-now"><?php esc_html_e( 'Buy Now', 'gravityview'); ?></a></p>
32
+						<?php if ( ! empty( $template[ 'buy_source' ] ) ) { ?>
33
+							<p><a href="<?php echo esc_url( $template[ 'buy_source' ] ); ?>" class="button-primary button-buy-now"><?php esc_html_e( 'Buy Now', 'gravityview' ); ?></a></p>
34 34
 						<?php } else { ?>
35
-							<p><button href="#gv_select_template" class="gv_select_template button button-hero button-primary" data-templateid="<?php echo esc_attr( $id ); ?>"><?php esc_html_e( 'Select', 'gravityview'); ?></button></p>
36
-							<?php if( !empty( $template['preview'] ) ) { ?>
37
-								<a href="<?php echo esc_url( $template['preview'] ); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-admin-links" title="<?php esc_html_e( 'View a live demo of this preset', 'gravityview'); ?>"></i></a>
35
+							<p><button href="#gv_select_template" class="gv_select_template button button-hero button-primary" data-templateid="<?php echo esc_attr( $id ); ?>"><?php esc_html_e( 'Select', 'gravityview' ); ?></button></p>
36
+							<?php if ( ! empty( $template[ 'preview' ] ) ) { ?>
37
+								<a href="<?php echo esc_url( $template[ 'preview' ] ); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-admin-links" title="<?php esc_html_e( 'View a live demo of this preset', 'gravityview' ); ?>"></i></a>
38 38
 							<?php } ?>
39 39
 						<?php } ?>
40 40
 					</div>
41 41
 				</div>
42 42
 				<div class="gv-view-types-normal">
43
-					<img src="<?php echo esc_url( $template['logo'] ); ?>" alt="<?php echo esc_attr( $template['label'] ); ?>">
44
-					<h5><?php echo esc_html( $template['label'] ); ?></h5>
45
-					<p class="description"><?php echo esc_html( $template['description'] ); ?></p>
43
+					<img src="<?php echo esc_url( $template[ 'logo' ] ); ?>" alt="<?php echo esc_attr( $template[ 'label' ] ); ?>">
44
+					<h5><?php echo esc_html( $template[ 'label' ] ); ?></h5>
45
+					<p class="description"><?php echo esc_html( $template[ 'description' ] ); ?></p>
46 46
 				</div>
47 47
 			</div>
48 48
 		</div>
Please login to merge, or discard this patch.
future/includes/class-gv-oembed.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 		wp_embed_register_handler( 'gravityview_entry', self::get_entry_regex(), array( __CLASS__, 'render' ), 20000 );
27 27
 		wp_oembed_add_provider( self::get_entry_regex(), self::$provider_url, true );
28 28
 
29
-		if ( ! empty( $_GET['gv_oembed_provider'] ) && ! empty( $_GET['url'] ) ) {
29
+		if ( ! empty( $_GET[ 'gv_oembed_provider' ] ) && ! empty( $_GET[ 'url' ] ) ) {
30 30
 			add_action( 'template_redirect', array( __CLASS__, 'render_provider_request' ) );
31 31
 		}
32 32
 
@@ -43,8 +43,8 @@  discard block
 block discarded – undo
43 43
 	 * @return void
44 44
 	 */
45 45
 	public static function render_provider_request() {
46
-		if ( ! empty( $_GET['url'] ) ) {
47
-			$url = $_GET['url'];
46
+		if ( ! empty( $_GET[ 'url' ] ) ) {
47
+			$url = $_GET[ 'url' ];
48 48
 		} else {
49 49
 			header( 'HTTP/1.0 404 Not Found' );
50 50
 			exit;
@@ -111,18 +111,18 @@  discard block
 block discarded – undo
111 111
 	 */
112 112
 	private static function parse_matches( $matches, $url ) {
113 113
 		// If not using permalinks, re-assign values for matching groups
114
-		if ( ! empty( $matches['entry_slug2'] ) ) {
115
-			$matches['is_cpt'] = $matches['is_cpt2'];
116
-			$matches['slug'] = $matches['slug2'];
117
-			$matches['entry_slug'] = $matches['entry_slug2'];
118
-			unset( $matches['is_cpt2'], $matches['slug2'], $matches['entry_slug2'] );
114
+		if ( ! empty( $matches[ 'entry_slug2' ] ) ) {
115
+			$matches[ 'is_cpt' ] = $matches[ 'is_cpt2' ];
116
+			$matches[ 'slug' ] = $matches[ 'slug2' ];
117
+			$matches[ 'entry_slug' ] = $matches[ 'entry_slug2' ];
118
+			unset( $matches[ 'is_cpt2' ], $matches[ 'slug2' ], $matches[ 'entry_slug2' ] );
119 119
 		}
120 120
 
121
-		if ( empty( $matches['entry_slug'] ) ) {
121
+		if ( empty( $matches[ 'entry_slug' ] ) ) {
122 122
 			gravityview()->log->error( 'Entry slug not parsed by regex.', array( 'data' => $matches ) );
123 123
 			return null;
124 124
 		} else {
125
-			$entry_id = $matches['entry_slug'];
125
+			$entry_id = $matches[ 'entry_slug' ];
126 126
 		}
127 127
 
128 128
 		if ( ! $entry = \GV\GF_Entry::by_id( $entry_id ) ) {
@@ -140,12 +140,12 @@  discard block
 block discarded – undo
140 140
 		if ( ! $view ) {
141 141
 
142 142
 			// If the slug doesn't work, maybe using Plain permalinks and not the slug, only ID
143
-			if( is_numeric( $matches['slug'] ) ) {
144
-				$view = \GV\View::by_id( $matches['slug'] );
143
+			if ( is_numeric( $matches[ 'slug' ] ) ) {
144
+				$view = \GV\View::by_id( $matches[ 'slug' ] );
145 145
 			}
146 146
 
147
-			if( ! $view ) {
148
-				$view = \GV\View::from_post( get_page_by_path( $matches['slug'], OBJECT, 'gravityview' ) );
147
+			if ( ! $view ) {
148
+				$view = \GV\View::from_post( get_page_by_path( $matches[ 'slug' ], OBJECT, 'gravityview' ) );
149 149
 			}
150 150
 		}
151 151
 
@@ -176,9 +176,9 @@  discard block
 block discarded – undo
176 176
 
177 177
 		return '
178 178
 		<div class="loading-placeholder" style="background-color:#e6f0f5;">
179
-			<h3 style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">'.$image.$embed_heading.'</h3>
179
+			<h3 style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">'.$image . $embed_heading . '</h3>
180 180
 			<p style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">
181
-				'.$embed_text.'
181
+				'.$embed_text . '
182 182
 			</p>
183 183
 			<br style="clear: both;">
184 184
 		</div>';
@@ -192,8 +192,8 @@  discard block
 block discarded – undo
192 192
 	private static function render_preview_notice() {
193 193
 		$floaty = \GravityView_Admin::get_floaty();
194 194
 		$title = esc_html__( 'This will look better when it is embedded.', 'gravityview' );
195
-		$message = esc_html__( 'Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview');
196
-		return '<div class="updated notice">'.$floaty.'<h3>'.$title.'</h3><p>'.$message.'</p><br style="clear:both;" /></div>';
195
+		$message = esc_html__( 'Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview' );
196
+		return '<div class="updated notice">' . $floaty . '<h3>' . $title . '</h3><p>' . $message . '</p><br style="clear:both;" /></div>';
197 197
 	}
198 198
 
199 199
 	/**
@@ -212,13 +212,13 @@  discard block
 block discarded – undo
212 212
 			return __( 'You are not allowed to view this content.', 'gravityview' );
213 213
 		}
214 214
 
215
-		if ( $entry && 'active' !== $entry['status'] ) {
215
+		if ( $entry && 'active' !== $entry[ 'status' ] ) {
216 216
 			gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
217 217
 			return __( 'You are not allowed to view this content.', 'gravityview' );
218 218
 		}
219 219
 
220 220
 		if ( $view->settings->get( 'show_only_approved' ) ) {
221
-			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
221
+			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
222 222
 				gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
223 223
 				return __( 'You are not allowed to view this content.', 'gravityview' );
224 224
 			}
@@ -249,9 +249,9 @@  discard block
 block discarded – undo
249 249
 			 * Mocks old context, etc.
250 250
 			 */
251 251
 			$loader = \GravityView_Edit_Entry::getInstance();
252
-			$render = $loader->instances['render'];
252
+			$render = $loader->instances[ 'render' ];
253 253
 
254
-			$form = \GFAPI::get_form( $entry['form_id'] );
254
+			$form = \GFAPI::get_form( $entry[ 'form_id' ] );
255 255
 
256 256
 			// @todo We really need to rewrite Edit Entry soon
257 257
 			\GravityView_View::$instance = null;
@@ -260,13 +260,13 @@  discard block
 block discarded – undo
260 260
 			$data = \GravityView_View_Data::getInstance( get_post( $view->ID ) );
261 261
 			$template = \GravityView_View::getInstance( array(
262 262
 				'form' => $form,
263
-				'form_id' => $form['id'],
263
+				'form_id' => $form[ 'id' ],
264 264
 				'view_id' => $view->ID,
265 265
 				'entries' => array( $entry->as_entry() ),
266 266
 				'atts' => \GVCommon::get_template_settings( $view->ID ),
267 267
 			) );
268 268
 
269
-			ob_start() && $render->init( $data, \GV\Entry::by_id( $entry['id'] ), $view );
269
+			ob_start() && $render->init( $data, \GV\Entry::by_id( $entry[ 'id' ] ), $view );
270 270
 			$output = ob_get_clean(); // Render :)
271 271
 		} else {
272 272
 			/** Remove the back link. */
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
 		// Catch either
311 311
 		$match_regex = "(?:{$using_permalinks}|{$not_using_permalinks})";
312 312
 
313
-		return '#'.$match_regex.'#i';
313
+		return '#' . $match_regex . '#i';
314 314
 	}
315 315
 
316 316
 	/**
Please login to merge, or discard this patch.
includes/class-ajax.php 1 patch
Spacing   +68 added lines, -68 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 		 * Don't exit if we're running test suite.
37 37
 		 * @since 1.15
38 38
 		 */
39
-		if( defined( 'DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) {
39
+		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) {
40 40
 			return $mixed;
41 41
 		}
42 42
 
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 	 * @return void
51 51
 	 */
52 52
 	function check_ajax_nonce() {
53
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxviews' ) ) {
53
+		if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxviews' ) ) {
54 54
 			$this->_exit( false );
55 55
 		}
56 56
 	}
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 		$context = rgpost( 'context' );
70 70
 
71 71
 		// Return markup for a single or multiple contexts
72
-		if( $context ) {
72
+		if ( $context ) {
73 73
 			$data = array(
74 74
 				esc_attr( $context ) => ''
75 75
 			);
@@ -113,17 +113,17 @@  discard block
 block discarded – undo
113 113
 	function get_active_areas() {
114 114
 		$this->check_ajax_nonce();
115 115
 
116
-		if( empty( $_POST['template_id'] ) ) {
116
+		if ( empty( $_POST[ 'template_id' ] ) ) {
117 117
 			$this->_exit( false );
118 118
 		}
119 119
 
120 120
 		ob_start();
121
-		do_action( 'gravityview_render_directory_active_areas', $_POST['template_id'], 'directory', '', true );
122
-		$response['directory'] = ob_get_clean();
121
+		do_action( 'gravityview_render_directory_active_areas', $_POST[ 'template_id' ], 'directory', '', true );
122
+		$response[ 'directory' ] = ob_get_clean();
123 123
 
124 124
 		ob_start();
125
-		do_action( 'gravityview_render_directory_active_areas',  $_POST['template_id'], 'single', '', true );
126
-		$response['single'] = ob_get_clean();
125
+		do_action( 'gravityview_render_directory_active_areas', $_POST[ 'template_id' ], 'single', '', true );
126
+		$response[ 'single' ] = ob_get_clean();
127 127
 
128 128
 		$response = array_map( 'gravityview_strip_whitespace', $response );
129 129
 
@@ -138,20 +138,20 @@  discard block
 block discarded – undo
138 138
 
139 139
 		$this->check_ajax_nonce();
140 140
 
141
-		if( empty( $_POST['template_id'] ) ) {
141
+		if ( empty( $_POST[ 'template_id' ] ) ) {
142 142
 			$this->_exit( false );
143 143
 		}
144 144
 
145 145
 		// get the fields xml config file for this specific preset
146
-		$preset_fields_path = apply_filters( 'gravityview_template_fieldsxml', array(), $_POST['template_id'] );
146
+		$preset_fields_path = apply_filters( 'gravityview_template_fieldsxml', array(), $_POST[ 'template_id' ] );
147 147
 		// import fields
148
-		if( !empty( $preset_fields_path ) ) {
148
+		if ( ! empty( $preset_fields_path ) ) {
149 149
 			$presets = $this->import_fields( $preset_fields_path );
150 150
 		} else {
151 151
 			$presets = array( 'widgets' => array(), 'fields' => array() );
152 152
 		}
153 153
 
154
-		$template_id = esc_attr( $_POST['template_id'] );
154
+		$template_id = esc_attr( $_POST[ 'template_id' ] );
155 155
 
156 156
 		// template areas
157 157
 		$template_areas_directory = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'directory' );
@@ -161,20 +161,20 @@  discard block
 block discarded – undo
161 161
 		$default_widget_areas = \GV\Widget::get_default_widget_areas();
162 162
 
163 163
 		ob_start();
164
-		do_action('gravityview_render_active_areas', $template_id, 'widget', 'header', $default_widget_areas, $presets['widgets'] );
165
-		$response['header'] = ob_get_clean();
164
+		do_action( 'gravityview_render_active_areas', $template_id, 'widget', 'header', $default_widget_areas, $presets[ 'widgets' ] );
165
+		$response[ 'header' ] = ob_get_clean();
166 166
 
167 167
 		ob_start();
168
-		do_action('gravityview_render_active_areas', $template_id, 'widget', 'footer', $default_widget_areas, $presets['widgets'] );
169
-		$response['footer'] = ob_get_clean();
168
+		do_action( 'gravityview_render_active_areas', $template_id, 'widget', 'footer', $default_widget_areas, $presets[ 'widgets' ] );
169
+		$response[ 'footer' ] = ob_get_clean();
170 170
 
171 171
 		ob_start();
172
-		do_action('gravityview_render_active_areas', $template_id, 'field', 'directory', $template_areas_directory, $presets['fields'] );
173
-		$response['directory'] = ob_get_clean();
172
+		do_action( 'gravityview_render_active_areas', $template_id, 'field', 'directory', $template_areas_directory, $presets[ 'fields' ] );
173
+		$response[ 'directory' ] = ob_get_clean();
174 174
 
175 175
 		ob_start();
176
-		do_action('gravityview_render_active_areas', $template_id, 'field', 'single', $template_areas_single, $presets['fields'] );
177
-		$response['single'] = ob_get_clean();
176
+		do_action( 'gravityview_render_active_areas', $template_id, 'field', 'single', $template_areas_single, $presets[ 'fields' ] );
177
+		$response[ 'single' ] = ob_get_clean();
178 178
 
179 179
 		$response = array_map( 'gravityview_strip_whitespace', $response );
180 180
 
@@ -192,26 +192,26 @@  discard block
 block discarded – undo
192 192
 
193 193
 		$this->check_ajax_nonce();
194 194
 
195
-		if( empty( $_POST['template_id'] ) ) {
195
+		if ( empty( $_POST[ 'template_id' ] ) ) {
196 196
 			gravityview()->log->error( 'Cannot create preset form; the template_id is empty.' );
197 197
 			$this->_exit( false );
198 198
 		}
199 199
 
200 200
 		// get the xml for this specific template_id
201
-		$preset_form_xml_path = apply_filters( 'gravityview_template_formxml', '', $_POST['template_id'] );
201
+		$preset_form_xml_path = apply_filters( 'gravityview_template_formxml', '', $_POST[ 'template_id' ] );
202 202
 
203 203
 		// import form
204 204
 		$form = $this->import_form( $preset_form_xml_path );
205 205
 
206 206
 		// get the form ID
207
-		if( false === $form ) {
207
+		if ( false === $form ) {
208 208
 			// send error to user
209
-			gravityview()->log->error( 'Error importing form for template id: {template_id}', array( 'template_id' => (int) $_POST['template_id'] ) );
209
+			gravityview()->log->error( 'Error importing form for template id: {template_id}', array( 'template_id' => (int)$_POST[ 'template_id' ] ) );
210 210
 
211 211
 			$this->_exit( false );
212 212
 		}
213 213
 
214
-		$this->_exit( '<option value="'.esc_attr( $form['id'] ).'" selected="selected">'.esc_html( $form['title'] ).'</option>' );
214
+		$this->_exit( '<option value="' . esc_attr( $form[ 'id' ] ) . '" selected="selected">' . esc_html( $form[ 'title' ] ) . '</option>' );
215 215
 
216 216
 	}
217 217
 
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 
226 226
 		gravityview()->log->debug( '[import_form] Import Preset Form. (File) {path}', array( 'path' => $xml_or_json_path ) );
227 227
 
228
-		if( empty( $xml_or_json_path ) || !class_exists('GFExport') || !file_exists( $xml_or_json_path ) ) {
228
+		if ( empty( $xml_or_json_path ) || ! class_exists( 'GFExport' ) || ! file_exists( $xml_or_json_path ) ) {
229 229
 			gravityview()->log->error( 'Class GFExport or file not found. file: {path}', array( 'path' => $xml_or_json_path ) );
230 230
 			return false;
231 231
 		}
@@ -237,13 +237,13 @@  discard block
 block discarded – undo
237 237
 		gravityview()->log->debug( '[import_form] Importing form (Result) {count}', array( 'count' => $count ) );
238 238
 		gravityview()->log->debug( '[import_form] Importing form (Form) ', array( 'data' => $forms ) );
239 239
 
240
-		if( $count != 1 || empty( $forms[0]['id'] ) ) {
240
+		if ( $count != 1 || empty( $forms[ 0 ][ 'id' ] ) ) {
241 241
 			gravityview()->log->error( 'Form Import Failed!' );
242 242
 			return false;
243 243
 		}
244 244
 
245 245
 		// import success - return form id
246
-		return $forms[0];
246
+		return $forms[ 0 ];
247 247
 	}
248 248
 
249 249
 
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
 	function get_field_options() {
258 258
 		$this->check_ajax_nonce();
259 259
 
260
-		if( empty( $_POST['template'] ) || empty( $_POST['area'] ) || empty( $_POST['field_id'] ) || empty( $_POST['field_type'] ) ) {
260
+		if ( empty( $_POST[ 'template' ] ) || empty( $_POST[ 'area' ] ) || empty( $_POST[ 'field_id' ] ) || empty( $_POST[ 'field_type' ] ) ) {
261 261
 			gravityview()->log->error( 'Required fields were not set in the $_POST request. ' );
262 262
 			$this->_exit( false );
263 263
 		}
@@ -269,11 +269,11 @@  discard block
 block discarded – undo
269 269
 		$_post = array_map( 'esc_attr', $_post );
270 270
 
271 271
 		// The GF type of field: `product`, `name`, `creditcard`, `id`, `text`
272
-		$input_type = isset($_post['input_type']) ? esc_attr( $_post['input_type'] ) : NULL;
273
-		$context = isset($_post['context']) ? esc_attr( $_post['context'] ) : NULL;
272
+		$input_type = isset( $_post[ 'input_type' ] ) ? esc_attr( $_post[ 'input_type' ] ) : NULL;
273
+		$context = isset( $_post[ 'context' ] ) ? esc_attr( $_post[ 'context' ] ) : NULL;
274 274
 
275
-		$form_id = empty( $_post['form_id'] ) ? null : $_post['form_id'];
276
-		$response = GravityView_Render_Settings::render_field_options( $form_id, $_post['field_type'], $_post['template'], $_post['field_id'], $_post['field_label'], $_post['area'], $input_type, '', '', $context  );
275
+		$form_id = empty( $_post[ 'form_id' ] ) ? null : $_post[ 'form_id' ];
276
+		$response = GravityView_Render_Settings::render_field_options( $form_id, $_post[ 'field_type' ], $_post[ 'template' ], $_post[ 'field_id' ], $_post[ 'field_label' ], $_post[ 'area' ], $input_type, '', '', $context );
277 277
 
278 278
 		$response = gravityview_strip_whitespace( $response );
279 279
 
@@ -294,15 +294,15 @@  discard block
 block discarded – undo
294 294
 		$form = '';
295 295
 
296 296
 		// if form id is set, use it, else, get form from preset
297
-		if( !empty( $_POST['form_id'] ) ) {
297
+		if ( ! empty( $_POST[ 'form_id' ] ) ) {
298 298
 
299
-			$form = (int) $_POST['form_id'];
299
+			$form = (int)$_POST[ 'form_id' ];
300 300
 
301 301
 		}
302 302
 		// get form from preset
303
-		elseif( !empty( $_POST['template_id'] ) ) {
303
+		elseif ( ! empty( $_POST[ 'template_id' ] ) ) {
304 304
 
305
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
305
+			$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
306 306
 
307 307
 		}
308 308
 
@@ -318,27 +318,27 @@  discard block
 block discarded – undo
318 318
 	 * @param  string $template_id Preset template
319 319
 	 *
320 320
 	 */
321
-	static function pre_get_form_fields( $template_id = '') {
321
+	static function pre_get_form_fields( $template_id = '' ) {
322 322
 
323
-		if( empty( $template_id ) ) {
323
+		if ( empty( $template_id ) ) {
324 324
 			gravityview()->log->error( 'Template ID not set.' );
325 325
 			return false;
326 326
 		} else {
327 327
 			$form_file = apply_filters( 'gravityview_template_formxml', '', $template_id );
328
-			if( !file_exists( $form_file )  ) {
328
+			if ( ! file_exists( $form_file ) ) {
329 329
 				gravityview()->log->error( 'Importing Form Fields for preset [{template_id}]. File not found. file: {path}', array( 'template_id' => $template_id, 'path' => $form_file ) );
330 330
 				return false;
331 331
 			}
332 332
 		}
333 333
 
334 334
 		// Load xml parser (from GravityForms)
335
-		if( class_exists( 'GFCommon' ) ) {
335
+		if ( class_exists( 'GFCommon' ) ) {
336 336
 			$xml_parser = GFCommon::get_base_path() . '/xml.php';
337 337
 		} else {
338 338
 			$xml_parser = trailingslashit( WP_PLUGIN_DIR ) . 'gravityforms/xml.php';
339 339
 		}
340 340
 
341
-		if( file_exists( $xml_parser ) ) {
341
+		if ( file_exists( $xml_parser ) ) {
342 342
 			require_once( $xml_parser );
343 343
 		} else {
344 344
 			gravityview()->log->debug( ' - Gravity Forms XML Parser not found {path}.', array( 'path' => $xml_parser ) );
@@ -349,32 +349,32 @@  discard block
 block discarded – undo
349 349
 		$xmlstr = file_get_contents( $form_file );
350 350
 
351 351
         $options = array(
352
-            "page" => array("unserialize_as_array" => true),
353
-            "form"=> array("unserialize_as_array" => true),
354
-            "field"=> array("unserialize_as_array" => true),
355
-            "rule"=> array("unserialize_as_array" => true),
356
-            "choice"=> array("unserialize_as_array" => true),
357
-            "input"=> array("unserialize_as_array" => true),
358
-            "routing_item"=> array("unserialize_as_array" => true),
359
-            "creditCard"=> array("unserialize_as_array" => true),
360
-            "routin"=> array("unserialize_as_array" => true),
361
-            "confirmation" => array("unserialize_as_array" => true),
362
-            "notification" => array("unserialize_as_array" => true)
352
+            "page" => array( "unserialize_as_array" => true ),
353
+            "form"=> array( "unserialize_as_array" => true ),
354
+            "field"=> array( "unserialize_as_array" => true ),
355
+            "rule"=> array( "unserialize_as_array" => true ),
356
+            "choice"=> array( "unserialize_as_array" => true ),
357
+            "input"=> array( "unserialize_as_array" => true ),
358
+            "routing_item"=> array( "unserialize_as_array" => true ),
359
+            "creditCard"=> array( "unserialize_as_array" => true ),
360
+            "routin"=> array( "unserialize_as_array" => true ),
361
+            "confirmation" => array( "unserialize_as_array" => true ),
362
+            "notification" => array( "unserialize_as_array" => true )
363 363
         );
364 364
 
365
-		$xml = new RGXML($options);
366
-        $forms = $xml->unserialize($xmlstr);
365
+		$xml = new RGXML( $options );
366
+        $forms = $xml->unserialize( $xmlstr );
367 367
 
368
-        if( !$forms ) {
368
+        if ( ! $forms ) {
369 369
         	gravityview()->log->error( 'Importing Form Fields for preset [{template_id}]. Error importing file. (File) {path}', array( 'template_id' => $template_id, 'path' => $form_file ) );
370 370
         	return false;
371 371
         }
372 372
 
373
-        if( !empty( $forms[0] ) && is_array( $forms[0] ) ) {
374
-        	$form = $forms[0];
373
+        if ( ! empty( $forms[ 0 ] ) && is_array( $forms[ 0 ] ) ) {
374
+        	$form = $forms[ 0 ];
375 375
         }
376 376
 
377
-        if( empty( $form ) ) {
377
+        if ( empty( $form ) ) {
378 378
         	gravityview()->log->error( '$form not set.', array( 'data' => $forms ) );
379 379
         	return false;
380 380
         }
@@ -393,38 +393,38 @@  discard block
 block discarded – undo
393 393
 	 */
394 394
 	function import_fields( $file ) {
395 395
 
396
-		if( empty( $file ) || !file_exists(  $file ) ) {
396
+		if ( empty( $file ) || ! file_exists( $file ) ) {
397 397
 			gravityview()->log->error( 'Importing Preset Fields. File not found. (File) {path}', array( 'path' => $file ) );
398 398
 			return false;
399 399
 		}
400 400
 
401
-		if( !class_exists('WXR_Parser') ) {
401
+		if ( ! class_exists( 'WXR_Parser' ) ) {
402 402
 			include_once GRAVITYVIEW_DIR . 'includes/lib/xml-parsers/parsers.php';
403 403
 		}
404 404
 
405 405
 		$parser = new WXR_Parser();
406 406
 		$presets = $parser->parse( $file );
407 407
 
408
-		if(is_wp_error( $presets )) {
408
+		if ( is_wp_error( $presets ) ) {
409 409
 			gravityview()->log->error( 'Importing Preset Fields failed. Threw WP_Error.', array( 'data' => $presets ) );
410 410
 			return false;
411 411
 		}
412 412
 
413
-		if( empty( $presets['posts'][0]['postmeta'] ) && !is_array( $presets['posts'][0]['postmeta'] ) ) {
413
+		if ( empty( $presets[ 'posts' ][ 0 ][ 'postmeta' ] ) && ! is_array( $presets[ 'posts' ][ 0 ][ 'postmeta' ] ) ) {
414 414
 			gravityview()->log->error( 'Importing Preset Fields failed. Meta not found in file. {path}', array( 'path' => $file ) );
415 415
 			return false;
416 416
 		}
417 417
 
418
-		gravityview()->log->debug( '[import_fields] postmeta', array( 'data' => $presets['posts'][0]['postmeta'] ) );
418
+		gravityview()->log->debug( '[import_fields] postmeta', array( 'data' => $presets[ 'posts' ][ 0 ][ 'postmeta' ] ) );
419 419
 
420 420
 		$fields = $widgets = array();
421
-		foreach( $presets['posts'][0]['postmeta'] as $meta ) {
422
-			switch ($meta['key']) {
421
+		foreach ( $presets[ 'posts' ][ 0 ][ 'postmeta' ] as $meta ) {
422
+			switch ( $meta[ 'key' ] ) {
423 423
 				case '_gravityview_directory_fields':
424
-					$fields = maybe_unserialize( $meta['value'] );
424
+					$fields = maybe_unserialize( $meta[ 'value' ] );
425 425
 					break;
426 426
 				case '_gravityview_directory_widgets':
427
-					$widgets = maybe_unserialize( $meta['value'] );
427
+					$widgets = maybe_unserialize( $meta[ 'value' ] );
428 428
 					break;
429 429
 			}
430 430
 		}
Please login to merge, or discard this patch.
includes/extensions/entry-notes/class-gravityview-field-notes.php 1 patch
Spacing   +80 added lines, -80 removed lines patch added patch discarded remove patch
@@ -63,19 +63,19 @@  discard block
 block discarded – undo
63 63
 
64 64
 		add_shortcode( 'gv_note_add', array( 'GravityView_Field_Notes', 'get_add_note_part' ) );
65 65
 
66
-		add_action( 'wp', array( $this, 'maybe_delete_notes'), 1000 );
67
-		add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes') );
68
-		add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes') );
66
+		add_action( 'wp', array( $this, 'maybe_delete_notes' ), 1000 );
67
+		add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes' ) );
68
+		add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes' ) );
69 69
 
70
-		add_action( 'wp', array( $this, 'maybe_add_note'), 1000 );
71
-		add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note') );
72
-		add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note') );
70
+		add_action( 'wp', array( $this, 'maybe_add_note' ), 1000 );
71
+		add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note' ) );
72
+		add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note' ) );
73 73
 
74 74
 		// add template path to check for field
75 75
 		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
76 76
 		add_filter( 'gravityview/template/fields_template_paths', array( $this, 'add_template_path' ) );
77 77
 
78
-		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') );
78
+		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) );
79 79
 		add_action( 'gravityview/field/notes/scripts', array( $this, 'enqueue_scripts' ) );
80 80
 
81 81
 		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_entry_default_field' ), 10, 3 );
@@ -97,8 +97,8 @@  discard block
 block discarded – undo
97 97
 	 */
98 98
 	public function add_entry_default_field( $entry_default_fields, $form, $zone ) {
99 99
 
100
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
101
-			$entry_default_fields['notes'] = array(
100
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
101
+			$entry_default_fields[ 'notes' ] = array(
102 102
 				'label' => __( 'Entry Notes', 'gravityview' ),
103 103
 				'type'  => 'notes',
104 104
 				'desc'  => __( 'Display, add, and delete notes for an entry.', 'gravityview' ),
@@ -131,23 +131,23 @@  discard block
 block discarded – undo
131 131
 	public function enqueue_scripts() {
132 132
 		global $wp_actions;
133 133
 
134
-		if( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) {
134
+		if ( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) {
135 135
 			wp_enqueue_style( 'gravityview-notes' );
136 136
 			wp_enqueue_script( 'gravityview-notes' );
137 137
 		}
138 138
 
139
-		if( ! wp_script_is( 'gravityview-notes', 'done' ) ) {
139
+		if ( ! wp_script_is( 'gravityview-notes', 'done' ) ) {
140 140
 
141 141
 			$strings = self::strings();
142 142
 
143 143
 			wp_localize_script( 'gravityview-notes', 'GVNotes', array(
144 144
 				'ajaxurl' => admin_url( 'admin-ajax.php' ),
145 145
 				'text' => array(
146
-					'processing' => $strings['processing'],
147
-					'delete_confirm' => $strings['delete-confirm'],
148
-					'note_added' => $strings['added-note'],
149
-					'error_invalid' => $strings['error-invalid'],
150
-					'error_empty_note' => $strings['error-empty-note'],
146
+					'processing' => $strings[ 'processing' ],
147
+					'delete_confirm' => $strings[ 'delete-confirm' ],
148
+					'note_added' => $strings[ 'added-note' ],
149
+					'error_invalid' => $strings[ 'error-invalid' ],
150
+					'error_empty_note' => $strings[ 'error-empty-note' ],
151 151
 				),
152 152
 			) );
153 153
 		}
@@ -164,31 +164,31 @@  discard block
 block discarded – undo
164 164
 	 */
165 165
 	function maybe_add_note() {
166 166
 
167
-		if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
167
+		if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
168 168
 			gravityview()->log->error( 'The user isnt allowed to add entry notes.' );
169 169
 			return;
170 170
 		}
171 171
 
172
-		if( ! isset( $_POST['action'] ) ) {
172
+		if ( ! isset( $_POST[ 'action' ] ) ) {
173 173
 			return;
174 174
 		}
175 175
 
176
-		if( 'gv_note_add' === $_POST['action'] ) {
176
+		if ( 'gv_note_add' === $_POST[ 'action' ] ) {
177 177
 
178
-            if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
178
+            if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
179 179
                 do_action( 'gravityview_log_error', __METHOD__ . ': The user isnt allowed to add entry notes.' );
180 180
                 return;
181 181
             }
182 182
 
183 183
 			$post = wp_unslash( $_POST );
184 184
 
185
-			if( $this->doing_ajax ) {
186
-				parse_str( $post['data'], $data );
185
+			if ( $this->doing_ajax ) {
186
+				parse_str( $post[ 'data' ], $data );
187 187
 			} else {
188 188
 				$data = $post;
189 189
 			}
190 190
 
191
-			$this->process_add_note( (array) $data );
191
+			$this->process_add_note( (array)$data );
192 192
 		}
193 193
 	}
194 194
 
@@ -215,23 +215,23 @@  discard block
 block discarded – undo
215 215
 		$error = false;
216 216
 		$success = false;
217 217
 
218
-		if( empty( $data['entry-slug'] ) ) {
218
+		if ( empty( $data[ 'entry-slug' ] ) ) {
219 219
 
220
-			$error = self::strings('error-invalid');
220
+			$error = self::strings( 'error-invalid' );
221 221
 			gravityview()->log->error( 'The note is missing an Entry ID.' );
222 222
 
223 223
 		} else {
224 224
 
225
-			$valid = wp_verify_nonce( $data['gv_note_add'], 'gv_note_add_' . $data['entry-slug'] );
225
+			$valid = wp_verify_nonce( $data[ 'gv_note_add' ], 'gv_note_add_' . $data[ 'entry-slug' ] );
226 226
 
227 227
 			$has_cap = GVCommon::has_cap( 'gravityview_add_entry_notes' );
228 228
 
229
-			if( ! $has_cap ) {
229
+			if ( ! $has_cap ) {
230 230
 				$error = self::strings( 'error-cap-add' );
231 231
 				gravityview()->log->error( 'Adding a note failed: the user does not have the "gravityview_add_entry_notes" capability.' );
232 232
 			} elseif ( $valid ) {
233 233
 
234
-				$entry = gravityview_get_entry( $data['entry-slug'], true, false );
234
+				$entry = gravityview_get_entry( $data[ 'entry-slug' ], true, false );
235 235
 
236 236
 				$added = $this->add_note( $entry, $data );
237 237
 
@@ -249,22 +249,22 @@  discard block
 block discarded – undo
249 249
 					$this->maybe_send_entry_notes( $note, $entry, $data );
250 250
 
251 251
 					if ( $note ) {
252
-						$success = self::display_note( $note, ! empty( $data['show-delete'] ) );
252
+						$success = self::display_note( $note, ! empty( $data[ 'show-delete' ] ) );
253 253
 						gravityview()->log->debug( 'The note was successfully created', array( 'data' => compact( 'note', 'data' ) ) );
254 254
 					} else {
255
-						$error = self::strings('error-add-note');
255
+						$error = self::strings( 'error-add-note' );
256 256
 						gravityview()->log->error( 'The note was not successfully created', array( 'data' => compact( 'note', 'data' ) ) );
257 257
 					}
258 258
 				}
259 259
 			} else {
260
-				$error = self::strings('error-invalid');
260
+				$error = self::strings( 'error-invalid' );
261 261
 				gravityview()->log->error( 'Nonce validation failed; the note was not created' );
262 262
 			}
263 263
 		}
264 264
 
265 265
 
266
-		if( $this->doing_ajax ) {
267
-			if( $success ) {
266
+		if ( $this->doing_ajax ) {
267
+			if ( $success ) {
268 268
 				wp_send_json_success( array( 'html' => $success ) );
269 269
 			} else {
270 270
 				$error = $error ? $error : self::strings( 'error-invalid' );
@@ -290,11 +290,11 @@  discard block
 block discarded – undo
290 290
 			return;
291 291
 		}
292 292
 
293
-		if ( isset( $_POST['action'] ) && 'gv_delete_notes' === $_POST['action'] ) {
293
+		if ( isset( $_POST[ 'action' ] ) && 'gv_delete_notes' === $_POST[ 'action' ] ) {
294 294
 
295 295
 			$post = wp_unslash( $_POST );
296 296
 			if ( $this->doing_ajax ) {
297
-				parse_str( $post['data'], $data );
297
+				parse_str( $post[ 'data' ], $data );
298 298
 			} else {
299 299
 				$data = $post;
300 300
 			}
@@ -325,18 +325,18 @@  discard block
 block discarded – undo
325 325
 	 */
326 326
 	function process_delete_notes( $data ) {
327 327
 
328
-		$valid = wp_verify_nonce( $data['gv_delete_notes'], 'gv_delete_notes_' . $data['entry-slug'] );
328
+		$valid = wp_verify_nonce( $data[ 'gv_delete_notes' ], 'gv_delete_notes_' . $data[ 'entry-slug' ] );
329 329
 		$has_cap = GVCommon::has_cap( 'gravityview_delete_entry_notes' );
330 330
 		$success = false;
331 331
 
332 332
 		if ( $valid && $has_cap ) {
333
-			GravityView_Entry_Notes::delete_notes( $data['note'] );
333
+			GravityView_Entry_Notes::delete_notes( $data[ 'note' ] );
334 334
 			$success = true;
335 335
 		}
336 336
 
337
-		if( $this->doing_ajax ) {
337
+		if ( $this->doing_ajax ) {
338 338
 
339
-			if( $success ) {
339
+			if ( $success ) {
340 340
 				wp_send_json_success();
341 341
 			} else {
342 342
 				if ( ! $valid ) {
@@ -369,13 +369,13 @@  discard block
 block discarded – undo
369 369
 
370 370
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
371 371
 
372
-		unset( $field_options['show_as_link'] );
372
+		unset( $field_options[ 'show_as_link' ] );
373 373
 
374 374
 		$notes_options = array(
375 375
 			'notes' => array(
376 376
 				'type' => 'checkboxes',
377
-				'label' => __('Note Settings', 'gravityview'),
378
-				'desc' => sprintf( _x('Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ),
377
+				'label' => __( 'Note Settings', 'gravityview' ),
378
+				'desc' => sprintf( _x( 'Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ),
379 379
 				'options' => array(
380 380
 					'view' => array(
381 381
 						'label' => __( 'Display notes?', 'gravityview' ),
@@ -427,7 +427,7 @@  discard block
 block discarded – undo
427 427
 			'processing' => __( 'Processing&hellip;', 'gravityview' ),
428 428
 			'other-email' => __( 'Other email address', 'gravityview' ),
429 429
 			'email-label' => __( 'Email address', 'gravityview' ),
430
-			'email-placeholder' => _x('[email protected]', 'Example email address used as a placeholder', 'gravityview'),
430
+			'email-placeholder' => _x( '[email protected]', 'Example email address used as a placeholder', 'gravityview' ),
431 431
 			'subject-label' => __( 'Subject', 'gravityview' ),
432 432
 			'subject' => __( 'Email subject', 'gravityview' ),
433 433
 			'default-email-subject' => __( 'New entry note', 'gravityview' ),
@@ -447,7 +447,7 @@  discard block
 block discarded – undo
447 447
 		 */
448 448
 		$strings = gv_map_deep( apply_filters( 'gravityview/field/notes/strings', $strings ), 'esc_html' );
449 449
 
450
-		if( $key ) {
450
+		if ( $key ) {
451 451
 			return isset( $strings[ $key ] ) ? $strings[ $key ] : '';
452 452
 		}
453 453
 
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
 	 */
470 470
 	static public function display_note( $note, $show_delete = false, $context = null ) {
471 471
 
472
-		if( ! is_object( $note ) ) {
472
+		if ( ! is_object( $note ) ) {
473 473
 			return '';
474 474
 		}
475 475
 
@@ -524,7 +524,7 @@  discard block
 block discarded – undo
524 524
 		}
525 525
 
526 526
 		$replacements = array(
527
-			'{note_id}' => $note_content['note_id'],
527
+			'{note_id}' => $note_content[ 'note_id' ],
528 528
 			'{row_class}' => 'gv-note',
529 529
 			'{note_detail}' => $note_detail_html
530 530
 		);
@@ -556,13 +556,13 @@  discard block
 block discarded – undo
556 556
 
557 557
 		$user_data = get_userdata( $current_user->ID );
558 558
 
559
-		$note_content = trim( $data['gv-note-content'] );
559
+		$note_content = trim( $data[ 'gv-note-content' ] );
560 560
 
561
-		if( empty( $note_content ) ) {
561
+		if ( empty( $note_content ) ) {
562 562
 			return new WP_Error( 'gv-add-note-empty', __( 'The note is empty.', 'gravityview' ) );
563 563
 		}
564 564
 
565
-		$return = GravityView_Entry_Notes::add_note( $entry['id'], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
565
+		$return = GravityView_Entry_Notes::add_note( $entry[ 'id' ], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
566 566
 
567 567
 		return $return;
568 568
 	}
@@ -582,7 +582,7 @@  discard block
 block discarded – undo
582 582
 
583 583
 		$atts = shortcode_atts( array( 'entry' => null ), $atts );
584 584
 
585
-		if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
585
+		if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
586 586
 			gravityview()->log->error( 'User does not have permission to add entry notes ("gravityview_add_entry_notes").' );
587 587
 			return '';
588 588
 		}
@@ -604,8 +604,8 @@  discard block
 block discarded – undo
604 604
 
605 605
 			$visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' );
606 606
 
607
-			if ( $atts['entry'] ) {
608
-				$entry = GFAPI::get_entry( $atts['entry'] );
607
+			if ( $atts[ 'entry' ] ) {
608
+				$entry = GFAPI::get_entry( $atts[ 'entry' ] );
609 609
 			}
610 610
 
611 611
 			if ( ! isset( $entry ) || ! $entry ) {
@@ -623,14 +623,14 @@  discard block
 block discarded – undo
623 623
 
624 624
 		// Only generate the dropdown if the field settings allow it
625 625
 		$email_fields = '';
626
-		if( ! empty( $visibility_settings['email'] ) ) {
626
+		if ( ! empty( $visibility_settings[ 'email' ] ) ) {
627 627
 			$email_fields = self::get_note_email_fields( $entry_slug );
628 628
 		}
629 629
 
630 630
 		$add_note_html = str_replace( '{entry_slug}', $entry_slug, $add_note_html );
631 631
 		$add_note_html = str_replace( '{nonce_field}', $nonce_field, $add_note_html );
632
-		$add_note_html = str_replace( '{show_delete}', intval( empty( $visibility_settings['delete'] ) ? 0 : $visibility_settings['delete'] ), $add_note_html );
633
-		$add_note_html   = str_replace( '{email_fields}', $email_fields, $add_note_html );
632
+		$add_note_html = str_replace( '{show_delete}', intval( empty( $visibility_settings[ 'delete' ] ) ? 0 : $visibility_settings[ 'delete' ] ), $add_note_html );
633
+		$add_note_html = str_replace( '{email_fields}', $email_fields, $add_note_html );
634 634
 		$add_note_html = str_replace( '{url}', esc_url_raw( add_query_arg( array() ) ), $add_note_html );
635 635
 
636 636
 		return $add_note_html;
@@ -655,8 +655,8 @@  discard block
 block discarded – undo
655 655
 		$note_emails = array();
656 656
 
657 657
 		foreach ( $email_fields as $email_field ) {
658
-			if ( ! empty( $entry["{$email_field->id}"] ) && is_email( $entry["{$email_field->id}"] ) ) {
659
-				$note_emails[] = $entry["{$email_field->id}"];
658
+			if ( ! empty( $entry[ "{$email_field->id}" ] ) && is_email( $entry[ "{$email_field->id}" ] ) ) {
659
+				$note_emails[ ] = $entry[ "{$email_field->id}" ];
660 660
 			}
661 661
 		}
662 662
 
@@ -668,7 +668,7 @@  discard block
 block discarded – undo
668 668
 		 */
669 669
 		$note_emails = apply_filters( 'gravityview/field/notes/emails', $note_emails, $entry );
670 670
 
671
-		return (array) $note_emails;
671
+		return (array)$note_emails;
672 672
 	}
673 673
 
674 674
 	/**
@@ -684,7 +684,7 @@  discard block
 block discarded – undo
684 684
 	 */
685 685
 	private static function get_note_email_fields( $entry_slug = '' ) {
686 686
 
687
-		if( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
687
+		if ( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
688 688
 			gravityview()->log->error( 'User does not have permission to email entry notes ("gravityview_email_entry_notes").' );
689 689
 			return '';
690 690
 		}
@@ -706,27 +706,27 @@  discard block
 block discarded – undo
706 706
 
707 707
 		if ( ! empty( $note_emails ) || $include_custom ) { ?>
708 708
 			<div class="gv-note-email-container">
709
-				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings['also-email'];  ?></label>
709
+				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings[ 'also-email' ]; ?></label>
710 710
 				<select class="gv-note-email-to" name="gv-note-to" id="gv-note-email-to-<?php echo $entry_slug_esc; ?>">
711
-					<option value=""><?php echo $strings['also-email'];  ?></option>
711
+					<option value=""><?php echo $strings[ 'also-email' ]; ?></option>
712 712
 					<?php foreach ( $note_emails as  $email ) {
713 713
 						?>
714 714
 						<option value="<?php echo esc_attr( $email ); ?>"><?php echo esc_html( $email ); ?></option>
715 715
 					<?php }
716
-					if( $include_custom ) { ?>
717
-					<option value="custom"><?php echo self::strings('other-email'); ?></option>
716
+					if ( $include_custom ) { ?>
717
+					<option value="custom"><?php echo self::strings( 'other-email' ); ?></option>
718 718
 					<?php } ?>
719 719
 				</select>
720 720
 				<fieldset class="gv-note-to-container">
721
-					<?php if( $include_custom ) { ?>
721
+					<?php if ( $include_custom ) { ?>
722 722
 					<div class='gv-note-to-custom-container'>
723
-						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings['email-label']; ?></label>
724
-						<input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings['email-placeholder']; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" />
723
+						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'email-label' ]; ?></label>
724
+						<input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings[ 'email-placeholder' ]; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" />
725 725
 					</div>
726 726
 					<?php } ?>
727 727
 		            <div class='gv-note-subject-container'>
728
-		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings['subject-label']; ?></label>
729
-		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings['subject']; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
728
+		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'subject-label' ]; ?></label>
729
+		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings[ 'subject' ]; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
730 730
 		            </div>
731 731
 				</fieldset>
732 732
 			</div>
@@ -749,7 +749,7 @@  discard block
 block discarded – undo
749 749
 	 */
750 750
 	private function maybe_send_entry_notes( $note = false, $entry, $data ) {
751 751
 
752
-		if( ! $note || ! GVCommon::has_cap('gravityview_email_entry_notes') ) {
752
+		if ( ! $note || ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
753 753
 			gravityview()->log->debug( 'User doesn\'t have "gravityview_email_entry_notes" cap, or $note is empty', array( 'data' => $note ) );
754 754
 			return;
755 755
 		}
@@ -757,7 +757,7 @@  discard block
 block discarded – undo
757 757
 		gravityview()->log->debug( '$data', array( 'data' => $data ) );
758 758
 
759 759
 		//emailing notes if configured
760
-		if ( ! empty( $data['gv-note-to'] ) ) {
760
+		if ( ! empty( $data[ 'gv-note-to' ] ) ) {
761 761
 
762 762
 			$default_data = array(
763 763
 				'gv-note-to' => '',
@@ -767,11 +767,11 @@  discard block
 block discarded – undo
767 767
                 'current-url' => '',
768 768
 			);
769 769
 
770
-			$current_user  = wp_get_current_user();
770
+			$current_user = wp_get_current_user();
771 771
 			$email_data = wp_parse_args( $data, $default_data );
772 772
 
773
-			$from    = $current_user->user_email;
774
-			$to = $email_data['gv-note-to'];
773
+			$from = $current_user->user_email;
774
+			$to = $email_data[ 'gv-note-to' ];
775 775
 
776 776
 			/**
777 777
 			 * Documented in get_note_email_fields
@@ -779,8 +779,8 @@  discard block
 block discarded – undo
779 779
 			 */
780 780
 			$include_custom = apply_filters( 'gravityview/field/notes/custom-email', true );
781 781
 
782
-			if( 'custom' === $to && $include_custom ) {
783
-				$to = $email_data['gv-note-to-custom'];
782
+			if ( 'custom' === $to && $include_custom ) {
783
+				$to = $email_data[ 'gv-note-to-custom' ];
784 784
 				gravityview()->log->debug( 'Sending note to a custom email address: {to}' . array( 'to' => $to ) );
785 785
 			}
786 786
 
@@ -791,13 +791,13 @@  discard block
 block discarded – undo
791 791
 
792 792
 			$bcc = false;
793 793
 			$reply_to = $from;
794
-			$subject = trim( $email_data['gv-note-subject'] );
794
+			$subject = trim( $email_data[ 'gv-note-subject' ] );
795 795
 
796 796
 			// We use empty() here because GF uses empty to check against, too. `0` isn't a valid subject to GF
797 797
 			$subject = empty( $subject ) ? self::strings( 'default-email-subject' ) : $subject;
798
-			$message = $email_data['gv-note-content'];
798
+			$message = $email_data[ 'gv-note-content' ];
799 799
 			$email_footer = self::strings( 'email-footer' );
800
-			$from_name     = $current_user->display_name;
800
+			$from_name = $current_user->display_name;
801 801
 			$message_format = 'html';
802 802
 
803 803
 			/**
@@ -828,7 +828,7 @@  discard block
 block discarded – undo
828 828
 
829 829
 			GVCommon::send_email( $from, $to, $bcc, $reply_to, $subject, $message, $from_name, $message_format, '', $entry, false );
830 830
 
831
-			$form  = isset( $entry['form_id'] ) ? GFAPI::get_form( $entry['form_id'] ) : array();
831
+			$form = isset( $entry[ 'form_id' ] ) ? GFAPI::get_form( $entry[ 'form_id' ] ) : array();
832 832
 
833 833
 			/**
834 834
 			 * @see https://www.gravityhelp.com/documentation/article/10146-2/ It's here for compatibility with Gravity Forms
@@ -854,7 +854,7 @@  discard block
 block discarded – undo
854 854
 
855 855
 	    $output = '';
856 856
 
857
-		if( ! empty( $email_footer ) ) {
857
+		if ( ! empty( $email_footer ) ) {
858 858
 		    $url = \GV\Utils::get( $email_data, 'current-url' );
859 859
 			$url = html_entity_decode( $url );
860 860
 			$url = site_url( $url );
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry-locking.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -67,20 +67,20 @@  discard block
 block discarded – undo
67 67
 		$result = array();
68 68
 		if ( ! $lock_holder_user_id ) {
69 69
 			$this->set_lock( $object_id );
70
-			$result['html']   = __( 'You now have control', 'gravityview' );
71
-			$result['status'] = 'lock_obtained';
70
+			$result[ 'html' ]   = __( 'You now have control', 'gravityview' );
71
+			$result[ 'status' ] = 'lock_obtained';
72 72
 		} else {
73 73
 
74
-			if( GVCommon::has_cap( 'gravityforms_edit_entries' ) ) {
74
+			if ( GVCommon::has_cap( 'gravityforms_edit_entries' ) ) {
75 75
 				$user = get_userdata( $lock_holder_user_id );
76
-				$result['html']   = sprintf( __( 'Your request has been sent to %s.', 'gravityview' ), $user->display_name );
76
+				$result[ 'html' ]   = sprintf( __( 'Your request has been sent to %s.', 'gravityview' ), $user->display_name );
77 77
 			} else {
78
-				$result['html']   = __( 'Your request has been sent.', 'gravityview' );
78
+				$result[ 'html' ]   = __( 'Your request has been sent.', 'gravityview' );
79 79
 			}
80 80
 
81 81
 			$this->update_lock_request_meta( $object_id, $user_id );
82 82
 
83
-			$result['status'] = 'lock_requested';
83
+			$result[ 'status' ] = 'lock_requested';
84 84
 		}
85 85
 
86 86
 		return $result;
@@ -122,19 +122,19 @@  discard block
 block discarded – undo
122 122
 		$continue_enqueuing = false;
123 123
 
124 124
 		// If any Views being loaded have entry locking, enqueue the scripts
125
-		foreach( $views->all() as $view ) {
125
+		foreach ( $views->all() as $view ) {
126 126
 
127 127
 			// Make sure the View has edit locking enabled
128
-			if( ! $view->settings->get( 'edit_locking' ) ) {
128
+			if ( ! $view->settings->get( 'edit_locking' ) ) {
129 129
 				continue;
130 130
 			}
131 131
 
132 132
 			// Make sure that the entry belongs to one of the forms connected to one of the Views in this request
133 133
 			$joined_forms = $view::get_joined_forms( $view->ID );
134 134
 
135
-			$entry_form_id = $entry_array['form_id'];
135
+			$entry_form_id = $entry_array[ 'form_id' ];
136 136
 
137
-			if( ! isset( $joined_forms[ $entry_form_id ] ) ) {
137
+			if ( ! isset( $joined_forms[ $entry_form_id ] ) ) {
138 138
 				continue;
139 139
 			}
140 140
 
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 			break;
144 144
 		}
145 145
 
146
-		if( ! $continue_enqueuing ) {
146
+		if ( ! $continue_enqueuing ) {
147 147
 			return;
148 148
 		}
149 149
 
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 	 */
164 164
 	protected function enqueue_scripts( $entry ) {
165 165
 
166
-		$min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG || isset( $_GET['gform_debug'] ) ? '' : '.min';
166
+		$min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG || isset( $_GET[ 'gform_debug' ] ) ? '' : '.min';
167 167
 		$locking_path = GFCommon::get_base_url() . '/includes/locking/';
168 168
 
169 169
 		wp_enqueue_script( 'gforms_locking', $locking_path . "js/locking{$min}.js", array( 'jquery', 'heartbeat' ), GFCommon::$version );
@@ -172,20 +172,20 @@  discard block
 block discarded – undo
172 172
 		$translations = array_map( 'wp_strip_all_tags', $this->get_strings() );
173 173
 
174 174
 		$strings = array(
175
-			'noResponse'    => $translations['no_response'],
176
-			'requestAgain'  => $translations['request_again'],
177
-			'requestError'  => $translations['request_error'],
178
-			'gainedControl' => $translations['gained_control'],
179
-			'rejected'      => $translations['request_rejected'],
180
-			'pending'       => $translations['request_pending'],
175
+			'noResponse'    => $translations[ 'no_response' ],
176
+			'requestAgain'  => $translations[ 'request_again' ],
177
+			'requestError'  => $translations[ 'request_error' ],
178
+			'gainedControl' => $translations[ 'gained_control' ],
179
+			'rejected'      => $translations[ 'request_rejected' ],
180
+			'pending'       => $translations[ 'request_pending' ],
181 181
 		);
182 182
 
183
-		$lock_user_id = $this->check_lock( $entry['id'] );
183
+		$lock_user_id = $this->check_lock( $entry[ 'id' ] );
184 184
 
185 185
 		$vars = array(
186 186
 			'hasLock'    => ! $lock_user_id ? 1 : 0,
187 187
 			'lockUI'     => $this->get_lock_ui( $lock_user_id ),
188
-			'objectID'   => $entry['id'],
188
+			'objectID'   => $entry[ 'id' ],
189 189
 			'objectType' => 'entry',
190 190
 			'strings'    => $strings,
191 191
 		);
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 		$hidden = $locked ? '' : ' hidden';
216 216
 		if ( $locked ) {
217 217
 
218
-			if( GVCommon::has_cap( 'gravityforms_edit_entries' ) ) {
218
+			if ( GVCommon::has_cap( 'gravityforms_edit_entries' ) ) {
219 219
 				$avatar = get_avatar( $user->ID, 64 );
220 220
 				$person_editing_text = $user->display_name;
221 221
 			} else {
@@ -322,11 +322,11 @@  discard block
 block discarded – undo
322 322
 
323 323
 		$current_url = add_query_arg( $wp->query_string, '', home_url( $wp->request ) );
324 324
 
325
-		if ( isset( $_GET['get-edit-lock'] ) ) {
325
+		if ( isset( $_GET[ 'get-edit-lock' ] ) ) {
326 326
 			$this->set_lock( $entry_id );
327 327
 			echo '<script>window.location = ' . json_encode( remove_query_arg( 'get-edit-lock', $current_url ) ) . ';</script>';
328 328
 			exit();
329
-		} else if ( isset( $_GET['release-edit-lock'] ) ) {
329
+		} else if ( isset( $_GET[ 'release-edit-lock' ] ) ) {
330 330
 			$this->delete_lock_meta( $entry_id );
331 331
 			$current_url = remove_query_arg( 'edit', $current_url );
332 332
 			echo '<script>window.location = ' . json_encode( remove_query_arg( 'release-edit-lock', $current_url ) ) . ';</script>';
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-fileupload.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -24,21 +24,21 @@  discard block
 block discarded – undo
24 24
 
25 25
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
26 26
 
27
-		unset( $field_options['search_filter'] );
27
+		unset( $field_options[ 'search_filter' ] );
28 28
 
29
-		if( 'edit' === $context ) {
29
+		if ( 'edit' === $context ) {
30 30
 			return $field_options;
31 31
 		}
32 32
 
33
-		$add_options['link_to_file'] = array(
33
+		$add_options[ 'link_to_file' ] = array(
34 34
 			'type' => 'checkbox',
35 35
 			'label' => __( 'Display as a Link:', 'gravityview' ),
36
-			'desc' => __('Display the uploaded files as links, rather than embedded content.', 'gravityview'),
36
+			'desc' => __( 'Display the uploaded files as links, rather than embedded content.', 'gravityview' ),
37 37
 			'value' => false,
38 38
 			'merge_tags' => false,
39 39
 		);
40 40
 
41
-		$add_options['image_width'] = array(
41
+		$add_options[ 'image_width' ] = array(
42 42
 			'type' => 'text',
43 43
 			'label' => __( 'Custom Width:', 'gravityview' ),
44 44
 			'desc' => __( 'Override the default image width (250).', 'gravityview' ),
@@ -127,14 +127,14 @@  discard block
 block discarded – undo
127 127
 			$base_id = null;
128 128
 
129 129
 			$is_single = gravityview_get_context() === 'single';
130
-			$lightbox = ! empty( $gravityview_view->atts['lightbox'] );
130
+			$lightbox = ! empty( $gravityview_view->atts[ 'lightbox' ] );
131 131
 			$field_compat = $gravityview_view->getCurrentField();
132 132
 		}
133 133
 
134 134
 		$output_arr = array();
135 135
 
136 136
 		// Get an array of file paths for the field.
137
-		$file_paths = \GV\Utils::get( $field , 'multipleFiles' ) ? json_decode( $value ) : array( $value );
137
+		$file_paths = \GV\Utils::get( $field, 'multipleFiles' ) ? json_decode( $value ) : array( $value );
138 138
 
139 139
 		// The $value JSON was probably truncated; let's check lead_detail_long.
140 140
 		if ( ! is_array( $file_paths ) ) {
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 			$rendered = null;
154 154
 
155 155
 			// If the site is HTTPS, use HTTPS
156
-			if ( function_exists('set_url_scheme') ) {
156
+			if ( function_exists( 'set_url_scheme' ) ) {
157 157
 				$file_path = set_url_scheme( $file_path );
158 158
 			}
159 159
 
@@ -164,8 +164,8 @@  discard block
 block discarded – undo
164 164
 			$file_path_info = pathinfo( $file_path );
165 165
 
166 166
 			// If pathinfo() gave us the extension of the file, run the switch statement using that.
167
-			$extension = empty( $file_path_info['extension'] ) ? NULL : strtolower( $file_path_info['extension'] );
168
-			$basename = $file_path_info['basename'];
167
+			$extension = empty( $file_path_info[ 'extension' ] ) ? NULL : strtolower( $file_path_info[ 'extension' ] );
168
+			$basename = $file_path_info[ 'basename' ];
169 169
 
170 170
 			// Get the secure download URL
171 171
 			$is_secure = false;
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 					 */
203 203
 					$audio_settings = apply_filters( 'gravityview_audio_settings', array(
204 204
 						'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension
205
-						'class' => 'wp-audio-shortcode gv-audio gv-field-id-'.$field_settings['id']
205
+						'class' => 'wp-audio-shortcode gv-audio gv-field-id-' . $field_settings[ 'id' ]
206 206
 					), $context );
207 207
 
208 208
 					/**
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
 					 */
239 239
 					$video_settings = apply_filters( 'gravityview_video_settings', array(
240 240
 						'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension
241
-						'class' => 'wp-video-shortcode gv-video gv-field-id-'.$field_settings['id']
241
+						'class' => 'wp-video-shortcode gv-video gv-field-id-' . $field_settings[ 'id' ]
242 242
 					), $context );
243 243
 
244 244
 					/**
@@ -271,13 +271,13 @@  discard block
 block discarded – undo
271 271
 				$width = \GV\Utils::get( $field_settings, 'image_width', 250 );
272 272
 				$image_atts = array(
273 273
 					'src'   => $file_path,
274
-					'class' => 'gv-image gv-field-id-' . $field_settings['id'],
275
-					'alt'   => $field_settings['label'],
276
-					'width' => ( $is_single ? null : ( $width ? $width: 250 ) )
274
+					'class' => 'gv-image gv-field-id-' . $field_settings[ 'id' ],
275
+					'alt'   => $field_settings[ 'label' ],
276
+					'width' => ( $is_single ? null : ( $width ? $width : 250 ) )
277 277
 				);
278 278
 
279 279
 				if ( $is_secure ) {
280
-					$image_atts['validate_src'] = false;
280
+					$image_atts[ 'validate_src' ] = false;
281 281
 				}
282 282
 
283 283
 				/**
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
 				 */
308 308
 				$override_security = apply_filters( 'gravityview/fields/fileupload/allow_insecure_lightbox', false, $file_path, $field_settings, $context );
309 309
 
310
-				if ( $lightbox && empty( $field_settings['show_as_link'] ) && ( ! $is_secure || $override_security ) ) {
310
+				if ( $lightbox && empty( $field_settings[ 'show_as_link' ] ) && ( ! $is_secure || $override_security ) ) {
311 311
 					$lightbox_link_atts = array(
312 312
 						'rel'   => sprintf( "%s-%s", $gv_class, $entry_slug ),
313 313
 						'class' => 'thickbox',
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
 					$lightbox_link_atts = apply_filters( 'gravityview/fields/fileupload/link_atts', $lightbox_link_atts, $field_compat, $context );
317 317
 
318 318
 					if ( $override_security ) {
319
-						$image_atts['src'] = $insecure_file_path;
319
+						$image_atts[ 'src' ] = $insecure_file_path;
320 320
 						$image = new GravityView_Image( $image_atts );
321 321
 						$file_path = $insecure_file_path;
322 322
 						// :( a kitten died somewhere
@@ -328,7 +328,7 @@  discard block
 block discarded – undo
328 328
 				}
329 329
 
330 330
 				// Show as link should render the image regardless.
331
-				if ( ! empty( $field_settings['show_as_link'] ) ) {
331
+				if ( ! empty( $field_settings[ 'show_as_link' ] ) ) {
332 332
 					$text = $rendered;
333 333
 				}
334 334
 			}
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
 			$disable_wrapped_link = apply_filters( 'gravityview/fields/fileupload/disable_link', false, $field_compat, $context );
346 346
 
347 347
 			// Output textualized content where
348
-			if ( ! $disable_wrapped_link && ( ! empty( $field_settings['link_to_file'] ) || ! empty( $field_settings['show_as_link'] ) ) ) {
348
+			if ( ! $disable_wrapped_link && ( ! empty( $field_settings[ 'link_to_file' ] ) || ! empty( $field_settings[ 'show_as_link' ] ) ) ) {
349 349
 				/**
350 350
 				 * Modify the link text (defaults to the file name)
351 351
 				 *
@@ -358,7 +358,7 @@  discard block
 block discarded – undo
358 358
 				 */
359 359
 				$content = apply_filters( 'gravityview/fields/fileupload/link_content', $text, $field_compat, $context );
360 360
 
361
-				if ( empty( $field_settings['show_as_link'] ) ) {
361
+				if ( empty( $field_settings[ 'show_as_link' ] ) ) {
362 362
 					/**
363 363
 					 * @filter `gravityview/fields/fileupload/link_atts` Modify the link attributes for a file upload field
364 364
 					 * @param array|string $link_atts Array or attributes string
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
 				$content = empty( $rendered ) ? $text : $rendered;
375 375
 			}
376 376
 
377
-			$output_arr[] = array(
377
+			$output_arr[ ] = array(
378 378
 				'file_path' => $file_path,
379 379
 				'content' => $content
380 380
 			);
Please login to merge, or discard this patch.
includes/class-gravityview-admin-bar.php 1 patch
Spacing   +9 added lines, -9 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
 
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 				'meta' => array(
104 104
 					'title' => sprintf( __( 'Edit Entry %s', 'gravityview' ), $entry->get_slug() ),
105 105
 				),
106
-				'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'] ) ) ),
106
+				'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' ] ) ) ),
107 107
 			) );
108 108
 
109 109
 		}
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 		/** @var WP_Admin_Bar $wp_admin_bar */
120 120
 		global $wp_admin_bar;
121 121
 
122
-		if( GVCommon::has_cap( array( 'edit_gravityviews', 'edit_gravityview', 'gravityforms_edit_forms' ) ) ) {
122
+		if ( GVCommon::has_cap( array( 'edit_gravityviews', 'edit_gravityview', 'gravityforms_edit_forms' ) ) ) {
123 123
 
124 124
 			$view_data = GravityView_View_Data::getInstance();
125 125
 			$views = $view_data->get_views();
@@ -131,21 +131,21 @@  discard block
 block discarded – undo
131 131
 				$added_views = array();
132 132
 
133 133
 				foreach ( $views as $view ) {
134
-					$view = \GV\View::by_id( $view['id'] );
134
+					$view = \GV\View::by_id( $view[ 'id' ] );
135 135
 					$view_id = $view->ID;
136 136
 					$form_id = $view->form ? $view->form->ID : null;
137 137
 
138 138
 					$edit_view_title = __( 'Edit View', 'gravityview' );
139 139
 					$edit_form_title = __( 'Edit Form', 'gravityview' );
140 140
 
141
-					if( sizeof( $views ) > 1 ) {
141
+					if ( sizeof( $views ) > 1 ) {
142 142
 						$edit_view_title = sprintf( _x( 'Edit View #%d', 'Edit View with the ID of %d', 'gravityview' ), $view_id );
143 143
 						$edit_form_title = sprintf( __( 'Edit Form #%d', 'Edit Form with the ID of %d', 'gravityview' ), $form_id );
144 144
 					}
145 145
 
146
-					if( GVCommon::has_cap( 'edit_gravityview', $view_id ) && ! in_array( $view_id, $added_views ) ) {
146
+					if ( GVCommon::has_cap( 'edit_gravityview', $view_id ) && ! in_array( $view_id, $added_views ) ) {
147 147
 
148
-						$added_views[] = $view_id;
148
+						$added_views[ ] = $view_id;
149 149
 
150 150
 						$wp_admin_bar->add_menu( array(
151 151
 							'id'    => 'edit-view-' . $view_id,
@@ -155,9 +155,9 @@  discard block
 block discarded – undo
155 155
 						) );
156 156
 					}
157 157
 
158
-					if ( ! empty( $form_id ) && GVCommon::has_cap( array( 'gravityforms_edit_forms' ), $form_id ) && ! in_array( $form_id, $added_forms )  ) {
158
+					if ( ! empty( $form_id ) && GVCommon::has_cap( array( 'gravityforms_edit_forms' ), $form_id ) && ! in_array( $form_id, $added_forms ) ) {
159 159
 
160
-						$added_forms[] = $form_id;
160
+						$added_forms[ ] = $form_id;
161 161
 
162 162
 						$wp_admin_bar->add_menu( array(
163 163
 							'id'    => 'edit-form-' . $form_id,
Please login to merge, or discard this patch.
future/includes/class-gv-entry.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 
114 114
 		$args = array();
115 115
 
116
-		$view_id = is_null ( $view ) ? null : $view->ID;
116
+		$view_id = is_null( $view ) ? null : $view->ID;
117 117
 
118 118
 		$permalink = null;
119 119
 
@@ -126,8 +126,8 @@  discard block
 block discarded – undo
126 126
 
127 127
 				$view_collection = View_Collection::from_post( $post );
128 128
 
129
-				if( 1 < $view_collection->count() ) {
130
-					$args['gvid'] = $view_id;
129
+				if ( 1 < $view_collection->count() ) {
130
+					$args[ 'gvid' ] = $view_id;
131 131
 				}
132 132
 			}
133 133
 		}
@@ -157,21 +157,21 @@  discard block
 block discarded – undo
157 157
 			 */
158 158
 			$link_parts = explode( '?', $permalink );
159 159
 
160
-			$query = ! empty( $link_parts[1] ) ? '?' . $link_parts[1] : '';
160
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
161 161
 
162
-			$permalink = trailingslashit( $link_parts[0] ) . $entry_endpoint_name . '/'. $entry_slug .'/' . $query;
162
+			$permalink = trailingslashit( $link_parts[ 0 ] ) . $entry_endpoint_name . '/' . $entry_slug . '/' . $query;
163 163
 		} else {
164 164
 			$args[ $entry_endpoint_name ] = $entry_slug;
165 165
 		}
166 166
 
167 167
 		if ( $track_directory ) {
168
-			if ( ! empty( $_GET['pagenum'] ) ) {
169
-				$args['pagenum'] = intval( $_GET['pagenum'] );
168
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
169
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
170 170
 			}
171 171
 
172 172
 			if ( $sort = Utils::_GET( 'sort' ) ) {
173
-				$args['sort'] = $sort;
174
-				$args['dir'] = Utils::_GET( 'dir' );
173
+				$args[ 'sort' ] = $sort;
174
+				$args[ 'dir' ] = Utils::_GET( 'dir' );
175 175
 			}
176 176
 		}
177 177
 
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
 
210 210
 		$entry_slug = \GravityView_API::get_entry_slug( $this->ID, $this->as_entry() );
211 211
 
212
-		if( ! $apply_filter ) {
212
+		if ( ! $apply_filter ) {
213 213
 			return $entry_slug;
214 214
 		}
215 215
 
Please login to merge, or discard this patch.