Completed
Pull Request — master (#1011)
by Zack
56:17 queued 51:19
created
includes/admin/class-gravityview-support-port.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -108,9 +108,9 @@  discard block
 block discarded – undo
108 108
 		) );
109 109
 
110 110
 		// This is just HTML we don't need.
111
-		unset( $response['message'] );
111
+		unset( $response[ 'message' ] );
112 112
 
113
-		switch ( intval( $response['price_id'] ) ) {
113
+		switch ( intval( $response[ 'price_id' ] ) ) {
114 114
 			default:
115 115
 			case 1:
116 116
 				$package = 'Sol';
@@ -128,19 +128,19 @@  discard block
 block discarded – undo
128 128
 
129 129
 		$data = array(
130 130
 			'email'                 => gravityview()->plugin->settings->get( 'support-email' ),
131
-			'name'                  => $response['customer_name'],
132
-			'Valid License?'        => ucwords( $response['license'] ),
133
-			'License Key'           => $response['license_key'],
131
+			'name'                  => $response[ 'customer_name' ],
132
+			'Valid License?'        => ucwords( $response[ 'license' ] ),
133
+			'License Key'           => $response[ 'license_key' ],
134 134
 			'License Level'         => $package,
135 135
 			'Site Admin Email'      => get_bloginfo( 'admin_email' ),
136 136
 			'Support Email'         => gravityview()->plugin->settings->get( 'support-email' ),
137
-			'License Limit'         => $response['license_limit'],
138
-			'Site Count'            => $response['site_count'],
139
-			'License Expires'       => $response['expires'],
140
-			'Activations Left'      => $response['activations_left'],
141
-			'Payment ID'            => $response['payment_id'],
142
-			'Payment Name'          => $response['customer_name'],
143
-			'Payment Email'         => $response['customer_email'],
137
+			'License Limit'         => $response[ 'license_limit' ],
138
+			'Site Count'            => $response[ 'site_count' ],
139
+			'License Expires'       => $response[ 'expires' ],
140
+			'Activations Left'      => $response[ 'activations_left' ],
141
+			'Payment ID'            => $response[ 'payment_id' ],
142
+			'Payment Name'          => $response[ 'customer_name' ],
143
+			'Payment Email'         => $response[ 'customer_email' ],
144 144
 			'WordPress Version'     => get_bloginfo( 'version', 'display' ),
145 145
 			'PHP Version'           => phpversion(),
146 146
 			'GravityView Version'   => \GV\Plugin::$version,
Please login to merge, or discard this patch.
includes/admin/field-types/type_textarea.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 		?>
10 10
 		<label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php
11 11
 
12
-			echo '<span class="gv-label">'.$this->get_field_label().'</span>';
12
+			echo '<span class="gv-label">' . $this->get_field_label() . '</span>';
13 13
 			echo $this->get_tooltip() . $this->get_field_desc();
14 14
 		?><div>
15 15
 				<?php $this->render_input(); ?>
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 	}
20 20
 
21 21
 	function render_input( $override_input = null ) {
22
-		if( isset( $override_input ) ) {
22
+		if ( isset( $override_input ) ) {
23 23
 			echo $override_input;
24 24
 			return;
25 25
 		}
@@ -28,10 +28,10 @@  discard block
 block discarded – undo
28 28
 
29 29
 		$show_mt = $this->show_merge_tags();
30 30
 
31
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
31
+        if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) {
32 32
             $class .= ' merge-tag-support mt-position-right ';
33 33
 
34
-            if( empty( $this->field['show_all_fields'] ) ) {
34
+            if ( empty( $this->field[ 'show_all_fields' ] ) ) {
35 35
             	$class .= ' mt-hide_all_fields ';
36 36
             }
37 37
         }
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 		$placeholder = \GV\Utils::get( $this->field, 'placeholder' );
40 40
 		$rows = \GV\Utils::get( $this->field, 'rows', 5 );
41 41
 		?>
42
-		<textarea name="<?php echo esc_attr( $this->name ); ?>" placeholder="<?php echo esc_attr( $placeholder ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo gravityview_sanitize_html_class( $class ); ?>" rows="<?php echo intval( $rows ); ?>"><?php echo esc_textarea(  $this->value ); ?></textarea>
42
+		<textarea name="<?php echo esc_attr( $this->name ); ?>" placeholder="<?php echo esc_attr( $placeholder ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo gravityview_sanitize_html_class( $class ); ?>" rows="<?php echo intval( $rows ); ?>"><?php echo esc_textarea( $this->value ); ?></textarea>
43 43
        	<?php
44 44
 	}
45 45
 
Please login to merge, or discard this patch.
includes/admin/field-types/type_text.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 		?>
9 9
 		<label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php
10 10
 
11
-			echo '<span class="gv-label">'.$this->get_field_label().'</span>';
11
+			echo '<span class="gv-label">' . $this->get_field_label() . '</span>';
12 12
 			echo $this->get_tooltip() . $this->get_field_desc();
13 13
 		?><div>
14 14
 				<?php $this->render_input(); ?>
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 
20 20
 	function render_input( $override_input = null ) {
21 21
 
22
-		if( isset( $override_input ) ) {
22
+		if ( isset( $override_input ) ) {
23 23
 			echo $override_input;
24 24
 			return;
25 25
 		}
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 
29 29
 		$show_mt = $this->show_merge_tags();
30 30
 
31
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
31
+        if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) {
32 32
             $class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
33 33
         }
34 34
         $class .= \GV\Utils::get( $this->field, 'class', 'widefat' );
Please login to merge, or discard this patch.
includes/admin/class-gravityview-admin-no-conflict.php 1 patch
Spacing   +22 added lines, -22 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
 
21
-		if( ! is_admin() ) { return; }
21
+		if ( ! is_admin() ) { return; }
22 22
 		
23 23
 		$this->add_hooks();
24 24
 	}
@@ -32,13 +32,13 @@  discard block
 block discarded – undo
32 32
 	 */
33 33
 	private function add_hooks() {
34 34
 		//Hooks for no-conflict functionality
35
-		add_action( 'wp_print_scripts', array( $this, 'no_conflict_scripts' ), 1000);
36
-		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_scripts' ), 9);
35
+		add_action( 'wp_print_scripts', array( $this, 'no_conflict_scripts' ), 1000 );
36
+		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_scripts' ), 9 );
37 37
 
38
-		add_action( 'wp_print_styles', array( $this, 'no_conflict_styles' ), 1000);
39
-		add_action( 'admin_print_styles', array( $this, 'no_conflict_styles' ), 11);
40
-		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_styles' ), 1);
41
-		add_action( 'admin_footer', array( $this, 'no_conflict_styles' ), 1);
38
+		add_action( 'wp_print_styles', array( $this, 'no_conflict_styles' ), 1000 );
39
+		add_action( 'admin_print_styles', array( $this, 'no_conflict_styles' ), 11 );
40
+		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_styles' ), 1 );
41
+		add_action( 'admin_footer', array( $this, 'no_conflict_styles' ), 1 );
42 42
 	}
43 43
 
44 44
 	/**
@@ -51,13 +51,13 @@  discard block
 block discarded – undo
51 51
 	function no_conflict_scripts() {
52 52
 		global $wp_scripts;
53 53
 
54
-		if( ! gravityview_is_admin_page() ) {
54
+		if ( ! gravityview_is_admin_page() ) {
55 55
 			return;
56 56
 		}
57 57
 
58 58
 		$no_conflict_mode = gravityview()->plugin->settings->get( 'no-conflict-mode' );
59 59
 
60
-		if( empty( $no_conflict_mode ) ) {
60
+		if ( empty( $no_conflict_mode ) ) {
61 61
 			return;
62 62
 		}
63 63
 
@@ -110,15 +110,15 @@  discard block
 block discarded – undo
110 110
 	function no_conflict_styles() {
111 111
 		global $wp_styles;
112 112
 
113
-		if( ! gravityview_is_admin_page() ) {
113
+		if ( ! gravityview_is_admin_page() ) {
114 114
 			return;
115 115
 		}
116 116
 
117 117
 		// Dequeue other jQuery styles even if no-conflict is off.
118 118
 		// Terrible-looking tabs help no one.
119
-		if( !empty( $wp_styles->registered ) )  {
120
-			foreach ($wp_styles->registered as $key => $style) {
121
-				if( preg_match( '/^(?:wp\-)?jquery/ism', $key ) ) {
119
+		if ( ! empty( $wp_styles->registered ) ) {
120
+			foreach ( $wp_styles->registered as $key => $style ) {
121
+				if ( preg_match( '/^(?:wp\-)?jquery/ism', $key ) ) {
122 122
 					wp_dequeue_style( $key );
123 123
 				}
124 124
 			}
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 		$no_conflict_mode = gravityview()->plugin->settings->get( 'no-conflict-mode' );
128 128
 
129 129
 		// If no conflict is off, jQuery will suffice.
130
-		if( empty( $no_conflict_mode ) ) {
130
+		if ( empty( $no_conflict_mode ) ) {
131 131
 			return;
132 132
 		}
133 133
 
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 		/**
155 155
 		 * @action `gravityview_remove_conflicts_after` Runs after no-conflict styles are removed. You can re-add styles here.
156 156
 		 */
157
-		do_action('gravityview_remove_conflicts_after');
157
+		do_action( 'gravityview_remove_conflicts_after' );
158 158
 	}
159 159
 
160 160
 	/**
@@ -178,9 +178,9 @@  discard block
 block discarded – undo
178 178
 
179 179
 		//reset queue
180 180
 		$queue = array();
181
-		foreach( $wp_objects->queue as $object ) {
182
-			if( in_array( $object, $required_objects ) || preg_match('/gravityview|gf_|gravityforms/ism', $object ) ) {
183
-				$queue[] = $object;
181
+		foreach ( $wp_objects->queue as $object ) {
182
+			if ( in_array( $object, $required_objects ) || preg_match( '/gravityview|gf_|gravityforms/ism', $object ) ) {
183
+				$queue[ ] = $object;
184 184
 			}
185 185
 		}
186 186
 		$wp_objects->queue = $queue;
@@ -189,8 +189,8 @@  discard block
 block discarded – undo
189 189
 
190 190
 		//unregistering scripts
191 191
 		$registered = array();
192
-		foreach( $wp_objects->registered as $handle => $script_registration ){
193
-			if( in_array( $handle, $required_objects ) ){
192
+		foreach ( $wp_objects->registered as $handle => $script_registration ) {
193
+			if ( in_array( $handle, $required_objects ) ) {
194 194
 				$registered[ $handle ] = $script_registration;
195 195
 			}
196 196
 		}
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
 	 * @param array $registered [description]
206 206
 	 * @param array $scripts    [description]
207 207
 	 */
208
-	private function add_script_dependencies($registered, $scripts) {
208
+	private function add_script_dependencies( $registered, $scripts ) {
209 209
 
210 210
 		//gets all dependent scripts linked to the $scripts array passed
211 211
 		do {
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 				$deps = isset( $registered[ $script ] ) && is_array( $registered[ $script ]->deps ) ? $registered[ $script ]->deps : array();
215 215
 				foreach ( $deps as $dep ) {
216 216
 					if ( ! in_array( $dep, $scripts ) && ! in_array( $dep, $dependents ) ) {
217
-						$dependents[] = $dep;
217
+						$dependents[ ] = $dep;
218 218
 					}
219 219
 				}
220 220
 			}
Please login to merge, or discard this patch.
includes/admin/class.render.settings.php 1 patch
Spacing   +72 added lines, -72 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 
28 28
 		$field_options = array();
29 29
 
30
-		if( 'field' === $field_type ) {
30
+		if ( 'field' === $field_type ) {
31 31
 
32 32
 			// Default options - fields
33 33
 			$field_options = array(
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 				'custom_class' => array(
46 46
 					'type' => 'text',
47 47
 					'label' => __( 'Custom CSS Class:', 'gravityview' ),
48
-					'desc' => __( 'This class will be added to the field container', 'gravityview'),
48
+					'desc' => __( 'This class will be added to the field container', 'gravityview' ),
49 49
 					'value' => '',
50 50
 					'merge_tags' => true,
51 51
 					'tooltip' => 'gv_css_merge_tags',
@@ -65,11 +65,11 @@  discard block
 block discarded – undo
65 65
 			);
66 66
 
67 67
 			// Match Table as well as DataTables
68
-			if( preg_match( '/table/ism', $template_id ) && 'directory' === $context ) {
69
-				$field_options['width'] = array(
68
+			if ( preg_match( '/table/ism', $template_id ) && 'directory' === $context ) {
69
+				$field_options[ 'width' ] = array(
70 70
 					'type' => 'number',
71
-					'label' => __('Percent Width', 'gravityview'),
72
-					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview'),
71
+					'label' => __( 'Percent Width', 'gravityview' ),
72
+					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview' ),
73 73
 					'class' => 'code widefat',
74 74
 					'value' => '',
75 75
 				);
@@ -122,8 +122,8 @@  discard block
 block discarded – undo
122 122
 			'manage_options' => __( 'Administrator', 'gravityview' ),
123 123
 		);
124 124
 
125
-		if( is_multisite() ) {
126
-			$select_cap_choices['manage_network'] = __('Multisite Super Admin', 'gravityview' );
125
+		if ( is_multisite() ) {
126
+			$select_cap_choices[ 'manage_network' ] = __( 'Multisite Super Admin', 'gravityview' );
127 127
 		}
128 128
 
129 129
 		/**
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 		 * @param  string $context     Optional. What context are we in? Example: `single` or `directory`
137 137
 		 * @param  string $input_type  Optional. (textarea, list, select, etc.)
138 138
 		 */
139
-		$select_cap_choices = apply_filters('gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
139
+		$select_cap_choices = apply_filters( 'gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
140 140
 
141 141
 		return $select_cap_choices;
142 142
 	}
@@ -164,27 +164,27 @@  discard block
 block discarded – undo
164 164
 	 */
165 165
 	public static function render_field_options( $form_id, $field_type, $template_id, $field_id, $field_label, $area, $input_type = NULL, $uniqid = '', $current = '', $context = 'single', $item = array() ) {
166 166
 
167
-		if( empty( $uniqid ) ) {
167
+		if ( empty( $uniqid ) ) {
168 168
 			//generate a unique field id
169
-			$uniqid = uniqid('', false);
169
+			$uniqid = uniqid( '', false );
170 170
 		}
171 171
 
172 172
 		// get field/widget options
173 173
 		$options = self::get_default_field_options( $field_type, $template_id, $field_id, $context, $input_type );
174 174
 
175 175
 		// two different post arrays, depending of the field type
176
-		$name_prefix = $field_type .'s' .'['. $area .']['. $uniqid .']';
176
+		$name_prefix = $field_type . 's' . '[' . $area . '][' . $uniqid . ']';
177 177
 
178 178
 		// build output
179 179
 		$output = '';
180
-		$output .= '<input type="hidden" class="field-key" name="'. $name_prefix .'[id]" value="'. esc_attr( $field_id ) .'">';
181
-		$output .= '<input type="hidden" class="field-label" name="'. $name_prefix .'[label]" value="'. esc_attr( $field_label ) .'">';
180
+		$output .= '<input type="hidden" class="field-key" name="' . $name_prefix . '[id]" value="' . esc_attr( $field_id ) . '">';
181
+		$output .= '<input type="hidden" class="field-label" name="' . $name_prefix . '[label]" value="' . esc_attr( $field_label ) . '">';
182 182
 		if ( $form_id ) {
183
-			$output .= '<input type="hidden" class="field-form-id" name="'. $name_prefix .'[form_id]" value="'. esc_attr( $form_id ) .'">';
183
+			$output .= '<input type="hidden" class="field-form-id" name="' . $name_prefix . '[form_id]" value="' . esc_attr( $form_id ) . '">';
184 184
 		}
185 185
 
186 186
 		// If there are no options, return what we got.
187
-		if(empty($options)) {
187
+		if ( empty( $options ) ) {
188 188
 
189 189
 			// This is here for checking if the output is empty in render_label()
190 190
 			$output .= '<!-- No Options -->';
@@ -192,33 +192,33 @@  discard block
 block discarded – undo
192 192
 			return $output;
193 193
 		}
194 194
 
195
-		$output .= '<div class="gv-dialog-options" title="'. esc_attr( sprintf( __( 'Options: %s', 'gravityview' ) , strip_tags( html_entity_decode( $field_label ) ) ) ) .'">';
195
+		$output .= '<div class="gv-dialog-options" title="' . esc_attr( sprintf( __( 'Options: %s', 'gravityview' ), strip_tags( html_entity_decode( $field_label ) ) ) ) . '">';
196 196
 
197 197
 		/**
198 198
 		 * @since 1.8
199 199
 		 */
200
-		if( !empty( $item['subtitle'] ) ) {
201
-			$output .= '<div class="subtitle">' . $item['subtitle'] . '</div>';
200
+		if ( ! empty( $item[ 'subtitle' ] ) ) {
201
+			$output .= '<div class="subtitle">' . $item[ 'subtitle' ] . '</div>';
202 202
 		}
203 203
 
204
-		foreach( $options as $key => $option ) {
204
+		foreach ( $options as $key => $option ) {
205 205
 
206 206
 			$value = isset( $current[ $key ] ) ? $current[ $key ] : NULL;
207 207
 
208
-			$field_output = self::render_field_option( $name_prefix . '['. $key .']' , $option, $value);
208
+			$field_output = self::render_field_option( $name_prefix . '[' . $key . ']', $option, $value );
209 209
 
210 210
 			// The setting is empty
211
-			if( empty( $field_output ) ) {
211
+			if ( empty( $field_output ) ) {
212 212
 				continue;
213 213
 			}
214 214
 
215
-			switch( $option['type'] ) {
215
+			switch ( $option[ 'type' ] ) {
216 216
 				// Hide hidden fields
217 217
 				case 'hidden':
218
-					$output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . ' screen-reader-text">'. $field_output . '</div>';
218
+					$output .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . ' screen-reader-text">' . $field_output . '</div>';
219 219
 					break;
220 220
 				default:
221
-					$output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . '">'. $field_output .'</div>';
221
+					$output .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . '">' . $field_output . '</div>';
222 222
 			}
223 223
 		}
224 224
 
@@ -247,17 +247,17 @@  discard block
 block discarded – undo
247 247
 		 * @deprecated setting index 'default' was replaced by 'value'
248 248
 		 * @see GravityView_FieldType::get_field_defaults
249 249
 		 */
250
-		if( !empty( $option['default'] ) && empty( $option['value'] ) ) {
251
-			$option['value'] = $option['default'];
252
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting '. $name .' details' );
250
+		if ( ! empty( $option[ 'default' ] ) && empty( $option[ 'value' ] ) ) {
251
+			$option[ 'value' ] = $option[ 'default' ];
252
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting ' . $name . ' details' );
253 253
 		}
254 254
 
255 255
 		// prepare to render option field type
256
-		if( isset( $option['type'] ) ) {
256
+		if ( isset( $option[ 'type' ] ) ) {
257 257
 
258 258
 			$type_class = self::load_type_class( $option );
259 259
 
260
-			if( class_exists( $type_class ) ) {
260
+			if ( class_exists( $type_class ) ) {
261 261
 
262 262
 				/** @var GravityView_FieldType $render_type */
263 263
 				$render_type = new $type_class( $name, $option, $curr_value );
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
 				 * @param[in,out] string $output field class name
275 275
 				 * @param[in] array $option  option field data
276 276
 				 */
277
-				$output = apply_filters( "gravityview/option/output/{$option['type']}" , $output, $option );
277
+				$output = apply_filters( "gravityview/option/output/{$option[ 'type' ]}", $output, $option );
278 278
 			}
279 279
 
280 280
 		} // isset option[type]
@@ -309,27 +309,27 @@  discard block
 block discarded – undo
309 309
 		 * @deprecated setting index 'name' was replaced by 'label'
310 310
 		 * @see GravityView_FieldType::get_field_defaults
311 311
 		 */
312
-		if( isset( $setting['name'] ) && empty( $setting['label'] ) ) {
313
-			$setting['label'] = $setting['name'];
314
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting '. $key .' details' );
312
+		if ( isset( $setting[ 'name' ] ) && empty( $setting[ 'label' ] ) ) {
313
+			$setting[ 'label' ] = $setting[ 'name' ];
314
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting ' . $key . ' details' );
315 315
 		}
316 316
 
317 317
 		$name = esc_attr( sprintf( $name, $key ) );
318
-		$setting['id'] = esc_attr( sprintf( $id, $key ) );
319
-		$setting['tooltip'] = 'gv_' . $key;
318
+		$setting[ 'id' ] = esc_attr( sprintf( $id, $key ) );
319
+		$setting[ 'tooltip' ] = 'gv_' . $key;
320 320
 
321 321
 		// Use default if current setting isn't set.
322
-		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting['value'];
322
+		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting[ 'value' ];
323 323
 
324 324
 		// default setting type = text
325
-		$setting['type'] = empty( $setting['type'] ) ? 'text' : $setting['type'];
325
+		$setting[ 'type' ] = empty( $setting[ 'type' ] ) ? 'text' : $setting[ 'type' ];
326 326
 
327 327
 		// merge tags
328
-		if( !isset( $setting['merge_tags'] ) ) {
329
-			if( $setting['type'] === 'text' ) {
330
-				$setting['merge_tags'] = true;
328
+		if ( ! isset( $setting[ 'merge_tags' ] ) ) {
329
+			if ( $setting[ 'type' ] === 'text' ) {
330
+				$setting[ 'merge_tags' ] = true;
331 331
 			} else {
332
-				$setting['merge_tags'] = false;
332
+				$setting[ 'merge_tags' ] = false;
333 333
 			}
334 334
 		}
335 335
 
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
 
338 338
 		// render the setting
339 339
 		$type_class = self::load_type_class( $setting );
340
-		if( class_exists( $type_class ) ) {
340
+		if ( class_exists( $type_class ) ) {
341 341
 			/** @var GravityView_FieldType $render_type */
342 342
 			$render_type = new $type_class( $name, $setting, $curr_value );
343 343
 			ob_start();
@@ -346,21 +346,21 @@  discard block
 block discarded – undo
346 346
 		}
347 347
 
348 348
 		// Check if setting is specific for a template
349
-		if( !empty( $setting['show_in_template'] ) ) {
350
-			if( !is_array( $setting['show_in_template'] ) ) {
351
-				$setting['show_in_template'] = array( $setting['show_in_template'] );
349
+		if ( ! empty( $setting[ 'show_in_template' ] ) ) {
350
+			if ( ! is_array( $setting[ 'show_in_template' ] ) ) {
351
+				$setting[ 'show_in_template' ] = array( $setting[ 'show_in_template' ] );
352 352
 			}
353
-			$show_if = ' data-show-if="'. implode( ' ', $setting['show_in_template'] ).'"';
353
+			$show_if = ' data-show-if="' . implode( ' ', $setting[ 'show_in_template' ] ) . '"';
354 354
 		} else {
355 355
 			$show_if = '';
356 356
 		}
357 357
 
358
-		if( ! empty( $setting['requires'] ) ) {
359
-			$show_if .= sprintf( ' data-requires="%s"', $setting['requires'] );
358
+		if ( ! empty( $setting[ 'requires' ] ) ) {
359
+			$show_if .= sprintf( ' data-requires="%s"', $setting[ 'requires' ] );
360 360
 		}
361 361
 
362 362
 		// output
363
-		echo '<tr valign="top" '. $show_if .'>' . $output . '</tr>';
363
+		echo '<tr valign="top" ' . $show_if . '>' . $output . '</tr>';
364 364
 
365 365
 	}
366 366
 
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
 	 */
373 373
 	public static function load_type_class( $field = NULL ) {
374 374
 
375
-		if( empty( $field['type'] ) ) {
375
+		if ( empty( $field[ 'type' ] ) ) {
376 376
 			return NULL;
377 377
 		}
378 378
 
@@ -381,19 +381,19 @@  discard block
 block discarded – undo
381 381
 		 * @param string $class_suffix  field class suffix; `GravityView_FieldType_{$class_suffix}`
382 382
 		 * @param array $field   field data
383 383
 		 */
384
-		$type_class = apply_filters( "gravityview/setting/class/{$field['type']}", 'GravityView_FieldType_' . $field['type'], $field );
384
+		$type_class = apply_filters( "gravityview/setting/class/{$field[ 'type' ]}", 'GravityView_FieldType_' . $field[ 'type' ], $field );
385 385
 
386
-		if( !class_exists( $type_class ) ) {
386
+		if ( ! class_exists( $type_class ) ) {
387 387
 
388 388
 			/**
389 389
 			 * @filter `gravityview/setting/class_file/{field_type}`
390 390
 			 * @param string  $field_type_include_path field class file path
391 391
 			 * @param array $field  field data
392 392
 			 */
393
-			$class_file = apply_filters( "gravityview/setting/class_file/{$field['type']}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field['type']}.php", $field );
393
+			$class_file = apply_filters( "gravityview/setting/class_file/{$field[ 'type' ]}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field[ 'type' ]}.php", $field );
394 394
 
395
-			if( $class_file ) {
396
-				if( file_exists( $class_file ) ) {
395
+			if ( $class_file ) {
396
+				if ( file_exists( $class_file ) ) {
397 397
 					require_once( $class_file );
398 398
 				}
399 399
 			}
@@ -418,8 +418,8 @@  discard block
 block discarded – undo
418 418
 
419 419
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_checkbox::render_input' );
420 420
 
421
-		$output  = '<input name="'. esc_attr( $name ) .'" type="hidden" value="0">';
422
-		$output .= '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="checkbox" value="1" '. checked( $current, '1', false ) .' >';
421
+		$output  = '<input name="' . esc_attr( $name ) . '" type="hidden" value="0">';
422
+		$output .= '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="checkbox" value="1" ' . checked( $current, '1', false ) . ' >';
423 423
 
424 424
 		return $output;
425 425
 	}
@@ -439,22 +439,22 @@  discard block
 block discarded – undo
439 439
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_text::render_input' );
440 440
 
441 441
 		// Show the merge tags if the field is a list view
442
-		$is_list = ( preg_match( '/_list-/ism', $name ));
442
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
443 443
 
444 444
 		// Or is a single entry view
445
-		$is_single = ( preg_match( '/single_/ism', $name ));
445
+		$is_single = ( preg_match( '/single_/ism', $name ) );
446 446
 		$show = ( $is_single || $is_list );
447 447
 
448 448
 		$class = '';
449 449
 		// and $add_merge_tags is not false
450
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
450
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
451 451
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
452 452
 		}
453 453
 
454
-		$class .= !empty( $args['class'] ) ? $args['class'] : 'widefat';
455
-		$type = !empty( $args['type'] ) ? $args['type'] : 'text';
454
+		$class .= ! empty( $args[ 'class' ] ) ? $args[ 'class' ] : 'widefat';
455
+		$type = ! empty( $args[ 'type' ] ) ? $args[ 'type' ] : 'text';
456 456
 
457
-		return '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="'.esc_attr($type).'" value="'. esc_attr( $current ) .'" class="'.esc_attr( $class ).'">';
457
+		return '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="' . esc_attr( $type ) . '" value="' . esc_attr( $current ) . '" class="' . esc_attr( $class ) . '">';
458 458
 	}
459 459
 
460 460
 	/**
@@ -471,21 +471,21 @@  discard block
 block discarded – undo
471 471
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_textarea::render_input' );
472 472
 
473 473
 		// Show the merge tags if the field is a list view
474
-		$is_list = ( preg_match( '/_list-/ism', $name ));
474
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
475 475
 
476 476
 		// Or is a single entry view
477
-		$is_single = ( preg_match( '/single_/ism', $name ));
477
+		$is_single = ( preg_match( '/single_/ism', $name ) );
478 478
 		$show = ( $is_single || $is_list );
479 479
 
480 480
 		$class = '';
481 481
 		// and $add_merge_tags is not false
482
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
482
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
483 483
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
484 484
 		}
485 485
 
486
-		$class .= !empty( $args['class'] ) ? 'widefat '.$args['class'] : 'widefat';
486
+		$class .= ! empty( $args[ 'class' ] ) ? 'widefat ' . $args[ 'class' ] : 'widefat';
487 487
 
488
-		return '<textarea name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" class="'.esc_attr( $class ).'">'. esc_textarea( $current ) .'</textarea>';
488
+		return '<textarea name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" class="' . esc_attr( $class ) . '">' . esc_textarea( $current ) . '</textarea>';
489 489
 	}
490 490
 
491 491
 	/**
@@ -501,9 +501,9 @@  discard block
 block discarded – undo
501 501
 
502 502
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_select::render_input' );
503 503
 
504
-		$output = '<select name="'. $name .'" id="'. $id .'">';
505
-		foreach( $choices as $value => $label ) {
506
-			$output .= '<option value="'. esc_attr( $value ) .'" '. selected( $value, $current, false ) .'>'. esc_html( $label ) .'</option>';
504
+		$output = '<select name="' . $name . '" id="' . $id . '">';
505
+		foreach ( $choices as $value => $label ) {
506
+			$output .= '<option value="' . esc_attr( $value ) . '" ' . selected( $value, $current, false ) . '>' . esc_html( $label ) . '</option>';
507 507
 		}
508 508
 		$output .= '</select>';
509 509
 
Please login to merge, or discard this patch.
includes/admin/metaboxes/class-gravityview-metabox-tab.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -97,9 +97,9 @@  discard block
 block discarded – undo
97 97
 	 * @param array $callback_args Arguments passed to the callback
98 98
 	 * @return void
99 99
 	 */
100
-	function __construct( $id, $title = '', $file = '', $icon_class_name = '', $callback = '', $callback_args = array()  ) {
100
+	function __construct( $id, $title = '', $file = '', $icon_class_name = '', $callback = '', $callback_args = array() ) {
101 101
 
102
-		$this->id = $this->prefix.$id;
102
+		$this->id = $this->prefix . $id;
103 103
 		$this->title = $title;
104 104
 		$this->render_template_file = $file;
105 105
 		$this->callback = $callback;
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 	 */
119 119
 	function parse_icon_class_name( $icon_class_name = '' ) {
120 120
 
121
-		if( preg_match( '/dashicon/i', $icon_class_name ) ) {
121
+		if ( preg_match( '/dashicon/i', $icon_class_name ) ) {
122 122
 			$icon_class_name = 'dashicons ' . $icon_class_name;
123 123
 		}
124 124
 
@@ -142,29 +142,29 @@  discard block
 block discarded – undo
142 142
 	 */
143 143
 	function render( $post ) {
144 144
 
145
-		if( !empty( $this->render_template_file ) ) {
145
+		if ( ! empty( $this->render_template_file ) ) {
146 146
 
147 147
 			$file = $this->render_template_file;
148 148
 
149 149
 			// If the full path exists, use it
150
-			if( file_exists( $file ) ) {
150
+			if ( file_exists( $file ) ) {
151 151
 				$path = $file;
152 152
 			} else {
153
-				$path = GRAVITYVIEW_DIR .'includes/admin/metaboxes/views/'.$file;
153
+				$path = GRAVITYVIEW_DIR . 'includes/admin/metaboxes/views/' . $file;
154 154
 			}
155 155
 
156
-			if( file_exists( $path ) ) {
156
+			if ( file_exists( $path ) ) {
157 157
 				include $path;
158 158
 			} else {
159 159
 				gravityview()->log->error( 'Metabox template file not found', array( 'data' => $this ) );
160 160
 			}
161 161
 
162
-		} else if( !empty( $this->callback ) ) {
162
+		} else if ( ! empty( $this->callback ) ) {
163 163
 
164
-			if( is_callable( $this->callback ) ) {
164
+			if ( is_callable( $this->callback ) ) {
165 165
 
166 166
 				/** @see do_accordion_sections() */
167
-				call_user_func( $this->callback, $post, (array) $this );
167
+				call_user_func( $this->callback, $post, (array)$this );
168 168
 
169 169
 			} else {
170 170
 				gravityview()->log->error( 'Metabox callback was not callable', array( 'data' => $this ) );
Please login to merge, or discard this patch.
includes/admin/metaboxes/views/data-source.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -10,13 +10,13 @@  discard block
 block discarded – undo
10 10
 wp_nonce_field( 'gravityview_select_form', 'gravityview_select_form_nonce' );
11 11
 
12 12
 //current value
13
-$current_form = (int) \GV\Utils::_GET( 'form_id', gravityview_get_form_id( $post->ID ) );
13
+$current_form = (int)\GV\Utils::_GET( 'form_id', gravityview_get_form_id( $post->ID ) );
14 14
 
15 15
 // If form is in trash or not existing, show error
16 16
 GravityView_Admin::connected_form_warning( $current_form );
17 17
 
18 18
 // check for available gravity forms
19
-$forms = gravityview_get_forms('any');
19
+$forms = gravityview_get_forms( 'any' );
20 20
 
21 21
 /**
22 22
  * @param int $current_form Form currently selected in the View (0 if none selected)
@@ -35,24 +35,24 @@  discard block
 block discarded – undo
35 35
 		?>
36 36
 		<a class="button button-primary" href="#gv_start_fresh" title="<?php esc_attr_e( 'Use a Form Preset', 'gravityview' ); ?>"><?php esc_html_e( 'Use a Form Preset', 'gravityview' ); ?></a>
37 37
 
38
-		<?php if( !empty( $forms ) ) { ?>
38
+		<?php if ( ! empty( $forms ) ) { ?>
39 39
 			<span>&nbsp;<?php esc_html_e( 'or use an existing form', 'gravityview' ); ?>&nbsp;</span>
40 40
 		<?php }
41 41
 	}
42 42
 
43 43
 	// If there are no forms to select, show no forms.
44
-	if( !empty( $forms ) ) { ?>
44
+	if ( ! empty( $forms ) ) { ?>
45 45
 		<select name="gravityview_form_id" id="gravityview_form_id">
46 46
 			<option value="" <?php selected( '', $current_form, true ); ?>>&mdash; <?php esc_html_e( 'list of forms', 'gravityview' ); ?> &mdash;</option>
47
-			<?php foreach( $forms as $form ) { ?>
48
-				<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
47
+			<?php foreach ( $forms as $form ) { ?>
48
+				<option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
49 49
 			<?php } ?>
50 50
 		</select>
51 51
 	<?php } else { ?>
52 52
 		<select name="gravityview_form_id" id="gravityview_form_id" class="hidden"><option selected="selected" value=""></option></select>
53 53
 	<?php } ?>
54 54
 
55
-	&nbsp;<a class="button button-primary" <?php if( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" href="#gv_switch_view" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></a>
55
+	&nbsp;<a class="button button-primary" <?php if ( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" href="#gv_switch_view" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></a>
56 56
 </p>
57 57
 
58 58
 <?php // confirm dialog box ?>
Please login to merge, or discard this patch.
includes/extensions/delete-entry/class-delete-entry.php 1 patch
Spacing   +74 added lines, -74 removed lines patch added patch discarded remove patch
@@ -42,12 +42,12 @@  discard block
 block discarded – undo
42 42
 
43 43
 		add_action( 'wp', array( $this, 'process_delete' ), 10000 );
44 44
 
45
-		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field'), 10, 3 );
45
+		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 );
46 46
 
47 47
 		add_action( 'gravityview_before', array( $this, 'display_message' ) );
48 48
 
49 49
 		// For the Delete Entry Link, you don't want visible to all users.
50
-		add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps'), 10, 5 );
50
+		add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 );
51 51
 
52 52
 		// Modify the field options based on the name of the field type
53 53
 		add_filter( 'gravityview_template_delete_link_options', array( $this, 'delete_link_field_options' ), 10, 5 );
@@ -55,10 +55,10 @@  discard block
 block discarded – undo
55 55
 		// add template path to check for field
56 56
 		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
57 57
 
58
-		add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button'), 10, 3 );
58
+		add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button' ), 10, 3 );
59 59
 
60
-		add_action ( 'gravityview/delete-entry/deleted', array( $this, 'process_connected_posts' ), 10, 2 );
61
-		add_action ( 'gravityview/delete-entry/trashed', array( $this, 'process_connected_posts' ), 10, 2 );
60
+		add_action( 'gravityview/delete-entry/deleted', array( $this, 'process_connected_posts' ), 10, 2 );
61
+		add_action( 'gravityview/delete-entry/trashed', array( $this, 'process_connected_posts' ), 10, 2 );
62 62
 	}
63 63
 
64 64
 	/**
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 	 */
70 70
 	static function getInstance() {
71 71
 
72
-		if( empty( self::$instance ) ) {
72
+		if ( empty( self::$instance ) ) {
73 73
 			self::$instance = new self;
74 74
 		}
75 75
 
@@ -105,20 +105,20 @@  discard block
 block discarded – undo
105 105
 	function delete_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
106 106
 
107 107
 		// Always a link, never a filter
108
-		unset( $field_options['show_as_link'], $field_options['search_filter'] );
108
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
109 109
 
110 110
 		// Delete Entry link should only appear to visitors capable of editing entries
111
-		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
111
+		unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
112 112
 
113
-		$add_option['delete_link'] = array(
113
+		$add_option[ 'delete_link' ] = array(
114 114
 			'type' => 'text',
115 115
 			'label' => __( 'Delete Link Text', 'gravityview' ),
116 116
 			'desc' => NULL,
117
-			'value' => __('Delete Entry', 'gravityview'),
117
+			'value' => __( 'Delete Entry', 'gravityview' ),
118 118
 			'merge_tags' => true,
119 119
 		);
120 120
 
121
-		$field_options['allow_edit_cap'] = array(
121
+		$field_options[ 'allow_edit_cap' ] = array(
122 122
 			'type' => 'select',
123 123
 			'label' => __( 'Allow the following users to delete the entry:', 'gravityview' ),
124 124
 			'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
@@ -142,8 +142,8 @@  discard block
 block discarded – undo
142 142
 	 */
143 143
 	function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
144 144
 
145
-		if( 'edit' !== $zone ) {
146
-			$entry_default_fields['delete_link'] = array(
145
+		if ( 'edit' !== $zone ) {
146
+			$entry_default_fields[ 'delete_link' ] = array(
147 147
 				'label' => __( 'Delete Entry', 'gravityview' ),
148 148
 				'type'  => 'delete_link',
149 149
 				'desc'  => __( 'A link to delete the entry. Respects the Delete Entry permissions.', 'gravityview' ),
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
 	 */
161 161
 	function add_available_field( $available_fields = array() ) {
162 162
 
163
-		$available_fields['delete_link'] = array(
163
+		$available_fields[ 'delete_link' ] = array(
164 164
 			'label_text' => __( 'Delete Entry', 'gravityview' ),
165 165
 			'field_id' => 'delete_link',
166 166
 			'label_type' => 'field',
@@ -188,12 +188,12 @@  discard block
 block discarded – undo
188 188
 		$caps = $visibility_caps;
189 189
 
190 190
 		// If we're configuring fields in the edit context, we want a limited selection
191
-		if( $field_id === 'delete_link' ) {
191
+		if ( $field_id === 'delete_link' ) {
192 192
 
193 193
 			// Remove other built-in caps.
194
-			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
194
+			unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] );
195 195
 
196
-			$caps['read'] = _x('Entry Creator', 'User capability', 'gravityview');
196
+			$caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
197 197
 		}
198 198
 
199 199
 		return $caps;
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
 	 * @param [type] $entry [description]
207 207
 	 */
208 208
 	function set_entry( $entry = null ) {
209
-		$this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[0] : $entry;
209
+		$this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[ 0 ] : $entry;
210 210
 	}
211 211
 
212 212
 	/**
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 
240 240
 		self::getInstance()->set_entry( $entry );
241 241
 
242
-        $base = GravityView_API::directory_link( $post_id ? : $view_id, true );
242
+        $base = GravityView_API::directory_link( $post_id ?: $view_id, true );
243 243
 
244 244
 		if ( empty( $base ) ) {
245 245
 			gravityview()->log->error( 'Post ID does not exist: {post_id}', array( 'post_id' => $post_id ) );
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
 		}
248 248
 
249 249
 		// Use the slug instead of the ID for consistent security
250
-		$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
250
+		$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
251 251
 
252 252
 		$actionurl = add_query_arg( array(
253 253
 			'action'	=> 'delete',
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
             'view_id' => $view_id,
257 257
 		), $base );
258 258
 
259
-		$url = wp_nonce_url( $actionurl, 'delete_'.$entry_slug, 'delete' );
259
+		$url = wp_nonce_url( $actionurl, 'delete_' . $entry_slug, 'delete' );
260 260
 
261 261
 		return $url;
262 262
 	}
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
 	function add_delete_button( $form = array(), $entry = array(), $view_id = NULL ) {
274 274
 
275 275
 		// Only show the link to those who are allowed to see it.
276
-		if( !self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) {
276
+		if ( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) {
277 277
 			return;
278 278
 		}
279 279
 
@@ -284,13 +284,13 @@  discard block
 block discarded – undo
284 284
 		$show_delete_button = apply_filters( 'gravityview/delete-entry/show-delete-button', true );
285 285
 
286 286
 		// If the button is hidden by the filter, don't show.
287
-		if( !$show_delete_button ) {
287
+		if ( ! $show_delete_button ) {
288 288
 			return;
289 289
 		}
290 290
 
291 291
 		$attributes = array(
292 292
 			'class' => 'btn btn-sm button button-small alignright pull-right btn-danger gv-button-delete',
293
-			'tabindex' => ( GFCommon::$tab_index ++ ),
293
+			'tabindex' => ( GFCommon::$tab_index++ ),
294 294
 			'onclick' => self::get_confirm_dialog(),
295 295
 		);
296 296
 
@@ -314,27 +314,27 @@  discard block
 block discarded – undo
314 314
 	function process_delete() {
315 315
 
316 316
 		// If the form is submitted
317
-		if( isset( $_GET['action'] ) && 'delete' === $_GET['action'] && isset( $_GET['entry_id'] ) ) {
317
+		if ( isset( $_GET[ 'action' ] ) && 'delete' === $_GET[ 'action' ] && isset( $_GET[ 'entry_id' ] ) ) {
318 318
 
319 319
 			// Make sure it's a GravityView request
320
-			$valid_nonce_key = wp_verify_nonce( $_GET['delete'], self::get_nonce_key( $_GET['entry_id'] ) );
320
+			$valid_nonce_key = wp_verify_nonce( $_GET[ 'delete' ], self::get_nonce_key( $_GET[ 'entry_id' ] ) );
321 321
 
322
-			if( ! $valid_nonce_key ) {
322
+			if ( ! $valid_nonce_key ) {
323 323
 				gravityview()->log->debug( 'Delete entry not processed: nonce validation failed.' );
324 324
 				return;
325 325
 			}
326 326
 
327 327
 			// Get the entry slug
328
-			$entry_slug = esc_attr( $_GET['entry_id'] );
328
+			$entry_slug = esc_attr( $_GET[ 'entry_id' ] );
329 329
 
330 330
 			// See if there's an entry there
331 331
 			$entry = gravityview_get_entry( $entry_slug, true, false );
332 332
 
333
-			if( $entry ) {
333
+			if ( $entry ) {
334 334
 
335 335
 				$has_permission = $this->user_can_delete_entry( $entry );
336 336
 
337
-				if( is_wp_error( $has_permission ) ) {
337
+				if ( is_wp_error( $has_permission ) ) {
338 338
 
339 339
 					$messages = array(
340 340
 						'message' => urlencode( $has_permission->get_error_message() ),
@@ -346,7 +346,7 @@  discard block
 block discarded – undo
346 346
 					// Delete the entry
347 347
 					$delete_response = $this->delete_or_trash_entry( $entry );
348 348
 
349
-					if( is_wp_error( $delete_response ) ) {
349
+					if ( is_wp_error( $delete_response ) ) {
350 350
 
351 351
 						$messages = array(
352 352
 							'message' => urlencode( $delete_response->get_error_message() ),
@@ -368,7 +368,7 @@  discard block
 block discarded – undo
368 368
 				gravityview()->log->debug( 'Delete entry failed: there was no entry with the entry slug {entry_slug}', array( 'entry_slug' => $entry_slug ) );
369 369
 
370 370
 				$messages = array(
371
-					'message' => urlencode( __('The entry does not exist.', 'gravityview') ),
371
+					'message' => urlencode( __( 'The entry does not exist.', 'gravityview' ) ),
372 372
 					'status' => 'error',
373 373
 				);
374 374
 			}
@@ -408,18 +408,18 @@  discard block
 block discarded – undo
408 408
 	 */
409 409
 	private function delete_or_trash_entry( $entry ) {
410 410
 
411
-		$entry_id = $entry['id'];
411
+		$entry_id = $entry[ 'id' ];
412 412
 		
413 413
 		$mode = $this->get_delete_mode();
414 414
 
415
-		if( 'delete' === $mode ) {
415
+		if ( 'delete' === $mode ) {
416 416
 
417 417
 			gravityview()->log->debug( 'Starting delete entry: {entry_id}', array( 'entry_id' => $entry_id ) );
418 418
 
419 419
 			// Delete the entry
420 420
 			$delete_response = GFAPI::delete_entry( $entry_id );
421 421
 
422
-			if( ! is_wp_error( $delete_response ) ) {
422
+			if ( ! is_wp_error( $delete_response ) ) {
423 423
 				$delete_response = 'deleted';
424 424
 
425 425
 				/**
@@ -440,8 +440,8 @@  discard block
 block discarded – undo
440 440
 			$trashed = GFAPI::update_entry_property( $entry_id, 'status', 'trash' );
441 441
 			new GravityView_Cache;
442 442
 
443
-			if( ! $trashed ) {
444
-				$delete_response = new WP_Error( 'trash_entry_failed', __('Moving the entry to the trash failed.', 'gravityview' ) );
443
+			if ( ! $trashed ) {
444
+				$delete_response = new WP_Error( 'trash_entry_failed', __( 'Moving the entry to the trash failed.', 'gravityview' ) );
445 445
 			} else {
446 446
 
447 447
 				/**
@@ -472,7 +472,7 @@  discard block
 block discarded – undo
472 472
 	public function process_connected_posts( $entry_id = 0, $entry = array() ) {
473 473
 
474 474
 		// The entry had no connected post
475
-		if( empty( $entry['post_id'] ) ) {
475
+		if ( empty( $entry[ 'post_id' ] ) ) {
476 476
 			return;
477 477
 		}
478 478
 
@@ -483,19 +483,19 @@  discard block
 block discarded – undo
483 483
 		 */
484 484
 		$delete_post = apply_filters( 'gravityview/delete-entry/delete-connected-post', true );
485 485
 		
486
-		if( false === $delete_post ) {
486
+		if ( false === $delete_post ) {
487 487
 			return;
488 488
 		}
489 489
 
490 490
 		$action = current_action();
491 491
 
492
-		if( 'gravityview/delete-entry/deleted' === $action ) {
493
-			$result = wp_delete_post( $entry['post_id'], true );
492
+		if ( 'gravityview/delete-entry/deleted' === $action ) {
493
+			$result = wp_delete_post( $entry[ 'post_id' ], true );
494 494
 		} else {
495
-			$result = wp_trash_post( $entry['post_id'] );
495
+			$result = wp_trash_post( $entry[ 'post_id' ] );
496 496
 		}
497 497
 
498
-		if( false === $result ) {
498
+		if ( false === $result ) {
499 499
 			gravityview()->log->error( '(called by {action}): Error processing the Post connected to the entry.', array( 'action' => $action, 'data' => $entry ) );
500 500
 		} else {
501 501
 			gravityview()->log->debug( '(called by {action}): Successfully processed Post connected to the entry.', array( 'action' => $action, 'data' => $entry ) );
@@ -511,13 +511,13 @@  discard block
 block discarded – undo
511 511
 	public function verify_nonce() {
512 512
 
513 513
 		// No delete entry request was made
514
-		if( empty( $_GET['entry_id'] ) || empty( $_GET['delete'] ) ) {
514
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'delete' ] ) ) {
515 515
 			return false;
516 516
 		}
517 517
 
518
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
518
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
519 519
 
520
-		$valid = wp_verify_nonce( $_GET['delete'], $nonce_key );
520
+		$valid = wp_verify_nonce( $_GET[ 'delete' ], $nonce_key );
521 521
 
522 522
 		/**
523 523
 		 * @filter `gravityview/delete-entry/verify_nonce` Override Delete Entry nonce validation. Return true to declare nonce valid.
@@ -539,7 +539,7 @@  discard block
 block discarded – undo
539 539
 	 */
540 540
 	public static function get_confirm_dialog() {
541 541
 
542
-		$confirm = __('Are you sure you want to delete this entry? This cannot be undone.', 'gravityview');
542
+		$confirm = __( 'Are you sure you want to delete this entry? This cannot be undone.', 'gravityview' );
543 543
 
544 544
 		/**
545 545
 		 * @filter `gravityview/delete-entry/confirm-text` Modify the Delete Entry Javascript confirmation text
@@ -547,7 +547,7 @@  discard block
 block discarded – undo
547 547
 		 */
548 548
 		$confirm = apply_filters( 'gravityview/delete-entry/confirm-text', $confirm );
549 549
 
550
-		return 'return window.confirm(\''. esc_js( $confirm ) .'\');';
550
+		return 'return window.confirm(\'' . esc_js( $confirm ) . '\');';
551 551
 	}
552 552
 
553 553
 	/**
@@ -565,16 +565,16 @@  discard block
 block discarded – undo
565 565
 
566 566
 		$error = NULL;
567 567
 
568
-		if( ! $this->verify_nonce() ) {
569
-			$error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview');
568
+		if ( ! $this->verify_nonce() ) {
569
+			$error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview' );
570 570
 		}
571 571
 
572
-		if( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) {
573
-			$error = __( 'You do not have permission to delete this entry.', 'gravityview');
572
+		if ( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) {
573
+			$error = __( 'You do not have permission to delete this entry.', 'gravityview' );
574 574
 		}
575 575
 
576
-		if( $entry['status'] === 'trash' ) {
577
-			if( 'trash' === $this->get_delete_mode() ) {
576
+		if ( $entry[ 'status' ] === 'trash' ) {
577
+			if ( 'trash' === $this->get_delete_mode() ) {
578 578
 				$error = __( 'The entry is already in the trash.', 'gravityview' );
579 579
 			} else {
580 580
 				$error = __( 'You cannot delete the entry; it is already in the trash.', 'gravityview' );
@@ -582,7 +582,7 @@  discard block
 block discarded – undo
582 582
 		}
583 583
 
584 584
 		// No errors; everything's fine here!
585
-		if( empty( $error ) ) {
585
+		if ( empty( $error ) ) {
586 586
 			return true;
587 587
 		}
588 588
 
@@ -611,10 +611,10 @@  discard block
 block discarded – undo
611 611
 
612 612
 		$current_user = wp_get_current_user();
613 613
 
614
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : NULL;
614
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : NULL;
615 615
 
616 616
 		// Or if they can delete any entries (as defined in Gravity Forms), we're good.
617
-		if( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
617
+		if ( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
618 618
 
619 619
 			gravityview()->log->debug( 'Current user has `gravityforms_delete_entries` or `gravityview_delete_others_entries` capability.' );
620 620
 
@@ -623,20 +623,20 @@  discard block
 block discarded – undo
623 623
 
624 624
 
625 625
 		// If field options are passed, check if current user can view the link
626
-		if( !empty( $field ) ) {
626
+		if ( ! empty( $field ) ) {
627 627
 
628 628
 			// If capability is not defined, something is not right!
629
-			if( empty( $field['allow_edit_cap'] ) ) {
629
+			if ( empty( $field[ 'allow_edit_cap' ] ) ) {
630 630
 
631 631
 				gravityview()->log->error( 'Cannot read delete entry field caps', array( 'data' => $field ) );
632 632
 
633 633
 				return false;
634 634
 			}
635 635
 
636
-			if( GVCommon::has_cap( $field['allow_edit_cap'] ) ) {
636
+			if ( GVCommon::has_cap( $field[ 'allow_edit_cap' ] ) ) {
637 637
 
638 638
 				// Do not return true if cap is read, as we need to check if the current user created the entry
639
-				if( $field['allow_edit_cap'] !== 'read' ) {
639
+				if ( $field[ 'allow_edit_cap' ] !== 'read' ) {
640 640
 					return true;
641 641
 				}
642 642
 
@@ -649,21 +649,21 @@  discard block
 block discarded – undo
649 649
 
650 650
 		}
651 651
 
652
-		if( !isset( $entry['created_by'] ) ) {
652
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
653 653
 
654
-			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
654
+			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' );
655 655
 
656 656
 			return false;
657 657
 		}
658 658
 
659 659
 		// Only checks user_delete view option if view is already set
660
-		if( $view_id ) {
660
+		if ( $view_id ) {
661 661
 
662 662
 			$current_view = gravityview_get_current_view_data( $view_id );
663 663
 
664
-			$user_delete = isset( $current_view['atts']['user_delete'] ) ? $current_view['atts']['user_delete'] : false;
664
+			$user_delete = isset( $current_view[ 'atts' ][ 'user_delete' ] ) ? $current_view[ 'atts' ][ 'user_delete' ] : false;
665 665
 
666
-			if( empty( $user_delete ) ) {
666
+			if ( empty( $user_delete ) ) {
667 667
 
668 668
 				gravityview()->log->debug( 'User Delete is disabled. Returning false.' );
669 669
 
@@ -672,7 +672,7 @@  discard block
 block discarded – undo
672 672
 		}
673 673
 
674 674
 		// If the logged-in user is the same as the user who created the entry, we're good.
675
-		if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
675
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
676 676
 
677 677
 			gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) );
678 678
 
@@ -697,16 +697,16 @@  discard block
 block discarded – undo
697 697
 	 */
698 698
 	public function display_message( $current_view_id = 0 ) {
699 699
 
700
-		if( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
700
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
701 701
 			return;
702 702
 		}
703 703
 
704 704
 		// Entry wasn't deleted from current View
705
-		if( isset( $_GET['view_id'] ) && intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) {
705
+		if ( isset( $_GET[ 'view_id' ] ) && intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) {
706 706
 			return;
707 707
 		}
708 708
 
709
-		$status = esc_attr( $_GET['status'] );
709
+		$status = esc_attr( $_GET[ 'status' ] );
710 710
 		$message_from_url = \GV\Utils::_GET( 'message' );
711 711
 		$message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) );
712 712
 		$class = '';
@@ -714,14 +714,14 @@  discard block
 block discarded – undo
714 714
 		switch ( $status ) {
715 715
 			case 'error':
716 716
 				$class = ' gv-error error';
717
-				$error_message = __('There was an error deleting the entry: %s', 'gravityview');
717
+				$error_message = __( 'There was an error deleting the entry: %s', 'gravityview' );
718 718
 				$message = sprintf( $error_message, $message_from_url );
719 719
 				break;
720 720
 			case 'trashed':
721
-				$message = __('The entry was successfully moved to the trash.', 'gravityview');
721
+				$message = __( 'The entry was successfully moved to the trash.', 'gravityview' );
722 722
 				break;
723 723
 			default:
724
-				$message = __('The entry was successfully deleted.', 'gravityview');
724
+				$message = __( 'The entry was successfully deleted.', 'gravityview' );
725 725
 				break;
726 726
 		}
727 727
 
@@ -735,7 +735,7 @@  discard block
 block discarded – undo
735 735
 		$message = apply_filters( 'gravityview/delete-entry/message', esc_attr( $message ), $status, $message_from_url );
736 736
 
737 737
 		// DISPLAY ERROR/SUCCESS MESSAGE
738
-		echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>';
738
+		echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>';
739 739
 	}
740 740
 
741 741
 
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 ) {
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
 
@@ -518,7 +518,7 @@  discard block
 block discarded – undo
518 518
 		}
519 519
 
520 520
 		$replacements = array(
521
-			'{note_id}' => $note_content['note_id'],
521
+			'{note_id}' => $note_content[ 'note_id' ],
522 522
 			'{row_class}' => 'gv-note',
523 523
 			'{note_detail}' => $note_detail_html
524 524
 		);
@@ -550,13 +550,13 @@  discard block
 block discarded – undo
550 550
 
551 551
 		$user_data = get_userdata( $current_user->ID );
552 552
 
553
-		$note_content = trim( $data['gv-note-content'] );
553
+		$note_content = trim( $data[ 'gv-note-content' ] );
554 554
 
555
-		if( empty( $note_content ) ) {
555
+		if ( empty( $note_content ) ) {
556 556
 			return new WP_Error( 'gv-add-note-empty', __( 'The note is empty.', 'gravityview' ) );
557 557
 		}
558 558
 
559
-		$return = GravityView_Entry_Notes::add_note( $entry['id'], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
559
+		$return = GravityView_Entry_Notes::add_note( $entry[ 'id' ], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
560 560
 
561 561
 		return $return;
562 562
 	}
@@ -576,7 +576,7 @@  discard block
 block discarded – undo
576 576
 
577 577
 		$atts = shortcode_atts( array( 'entry' => null ), $atts );
578 578
 
579
-		if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
579
+		if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
580 580
 			gravityview()->log->error( 'User does not have permission to add entry notes ("gravityview_add_entry_notes").' );
581 581
 			return '';
582 582
 		}
@@ -594,7 +594,7 @@  discard block
 block discarded – undo
594 594
 
595 595
 			$visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' );
596 596
 
597
-			if ( $atts['entry'] ) {
597
+			if ( $atts[ 'entry' ] ) {
598 598
 				$entry = GFAPI::get_entry( $entry_id );
599 599
 			}
600 600
 
@@ -605,19 +605,19 @@  discard block
 block discarded – undo
605 605
 
606 606
 		// Strip extra whitespace in template
607 607
 		$add_note_html = gravityview_strip_whitespace( $add_note_html );
608
-		$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
608
+		$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
609 609
 		$nonce_field = wp_nonce_field( 'gv_note_add_' . $entry_slug, 'gv_note_add', false, false );
610 610
 
611 611
 		// Only generate the dropdown if the field settings allow it
612 612
 		$email_fields = '';
613
-		if( ! empty( $visibility_settings['email'] ) ) {
613
+		if ( ! empty( $visibility_settings[ 'email' ] ) ) {
614 614
 			$email_fields = self::get_note_email_fields( $entry_slug );
615 615
 		}
616 616
 
617 617
 		$add_note_html = str_replace( '{entry_slug}', $entry_slug, $add_note_html );
618 618
 		$add_note_html = str_replace( '{nonce_field}', $nonce_field, $add_note_html );
619
-		$add_note_html = str_replace( '{show_delete}', intval( empty( $visibility_settings['delete'] ) ? 0 : $visibility_settings['delete'] ), $add_note_html );
620
-		$add_note_html   = str_replace( '{email_fields}', $email_fields, $add_note_html );
619
+		$add_note_html = str_replace( '{show_delete}', intval( empty( $visibility_settings[ 'delete' ] ) ? 0 : $visibility_settings[ 'delete' ] ), $add_note_html );
620
+		$add_note_html = str_replace( '{email_fields}', $email_fields, $add_note_html );
621 621
 		$add_note_html = str_replace( '{url}', esc_url_raw( add_query_arg( array() ) ), $add_note_html );
622 622
 
623 623
 		return $add_note_html;
@@ -642,8 +642,8 @@  discard block
 block discarded – undo
642 642
 		$note_emails = array();
643 643
 
644 644
 		foreach ( $email_fields as $email_field ) {
645
-			if ( ! empty( $entry["{$email_field->id}"] ) && is_email( $entry["{$email_field->id}"] ) ) {
646
-				$note_emails[] = $entry["{$email_field->id}"];
645
+			if ( ! empty( $entry[ "{$email_field->id}" ] ) && is_email( $entry[ "{$email_field->id}" ] ) ) {
646
+				$note_emails[ ] = $entry[ "{$email_field->id}" ];
647 647
 			}
648 648
 		}
649 649
 
@@ -655,7 +655,7 @@  discard block
 block discarded – undo
655 655
 		 */
656 656
 		$note_emails = apply_filters( 'gravityview/field/notes/emails', $note_emails, $entry );
657 657
 
658
-		return (array) $note_emails;
658
+		return (array)$note_emails;
659 659
 	}
660 660
 
661 661
 	/**
@@ -671,7 +671,7 @@  discard block
 block discarded – undo
671 671
 	 */
672 672
 	private static function get_note_email_fields( $entry_slug = '' ) {
673 673
 
674
-		if( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
674
+		if ( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
675 675
 			gravityview()->log->error( 'User does not have permission to email entry notes ("gravityview_email_entry_notes").' );
676 676
 			return '';
677 677
 		}
@@ -693,27 +693,27 @@  discard block
 block discarded – undo
693 693
 
694 694
 		if ( ! empty( $note_emails ) || $include_custom ) { ?>
695 695
 			<div class="gv-note-email-container">
696
-				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings['also-email'];  ?></label>
696
+				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings[ 'also-email' ]; ?></label>
697 697
 				<select class="gv-note-email-to" name="gv-note-to" id="gv-note-email-to-<?php echo $entry_slug_esc; ?>">
698
-					<option value=""><?php echo $strings['also-email'];  ?></option>
698
+					<option value=""><?php echo $strings[ 'also-email' ]; ?></option>
699 699
 					<?php foreach ( $note_emails as  $email ) {
700 700
 						?>
701 701
 						<option value="<?php echo esc_attr( $email ); ?>"><?php echo esc_html( $email ); ?></option>
702 702
 					<?php }
703
-					if( $include_custom ) { ?>
704
-					<option value="custom"><?php echo self::strings('other-email'); ?></option>
703
+					if ( $include_custom ) { ?>
704
+					<option value="custom"><?php echo self::strings( 'other-email' ); ?></option>
705 705
 					<?php } ?>
706 706
 				</select>
707 707
 				<fieldset class="gv-note-to-container">
708
-					<?php if( $include_custom ) { ?>
708
+					<?php if ( $include_custom ) { ?>
709 709
 					<div class='gv-note-to-custom-container'>
710
-						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings['email-label']; ?></label>
711
-						<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="" />
710
+						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'email-label' ]; ?></label>
711
+						<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="" />
712 712
 					</div>
713 713
 					<?php } ?>
714 714
 		            <div class='gv-note-subject-container'>
715
-		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings['subject-label']; ?></label>
716
-		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings['subject']; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
715
+		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'subject-label' ]; ?></label>
716
+		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings[ 'subject' ]; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
717 717
 		            </div>
718 718
 				</fieldset>
719 719
 			</div>
@@ -736,7 +736,7 @@  discard block
 block discarded – undo
736 736
 	 */
737 737
 	private function maybe_send_entry_notes( $note = false, $entry, $data ) {
738 738
 
739
-		if( ! $note || ! GVCommon::has_cap('gravityview_email_entry_notes') ) {
739
+		if ( ! $note || ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
740 740
 			gravityview()->log->debug( 'User doesn\'t have "gravityview_email_entry_notes" cap, or $note is empty', array( 'data' => $note ) );
741 741
 			return;
742 742
 		}
@@ -744,7 +744,7 @@  discard block
 block discarded – undo
744 744
 		gravityview()->log->debug( '$data', array( 'data' => $data ) );
745 745
 
746 746
 		//emailing notes if configured
747
-		if ( ! empty( $data['gv-note-to'] ) ) {
747
+		if ( ! empty( $data[ 'gv-note-to' ] ) ) {
748 748
 
749 749
 			$default_data = array(
750 750
 				'gv-note-to' => '',
@@ -754,11 +754,11 @@  discard block
 block discarded – undo
754 754
                 'current-url' => '',
755 755
 			);
756 756
 
757
-			$current_user  = wp_get_current_user();
757
+			$current_user = wp_get_current_user();
758 758
 			$email_data = wp_parse_args( $data, $default_data );
759 759
 
760
-			$from    = $current_user->user_email;
761
-			$to = $email_data['gv-note-to'];
760
+			$from = $current_user->user_email;
761
+			$to = $email_data[ 'gv-note-to' ];
762 762
 
763 763
 			/**
764 764
 			 * Documented in get_note_email_fields
@@ -766,8 +766,8 @@  discard block
 block discarded – undo
766 766
 			 */
767 767
 			$include_custom = apply_filters( 'gravityview/field/notes/custom-email', true );
768 768
 
769
-			if( 'custom' === $to && $include_custom ) {
770
-				$to = $email_data['gv-note-to-custom'];
769
+			if ( 'custom' === $to && $include_custom ) {
770
+				$to = $email_data[ 'gv-note-to-custom' ];
771 771
 				gravityview()->log->debug( 'Sending note to a custom email address: {to}' . array( 'to' => $to ) );
772 772
 			}
773 773
 
@@ -778,13 +778,13 @@  discard block
 block discarded – undo
778 778
 
779 779
 			$bcc = false;
780 780
 			$reply_to = $from;
781
-			$subject = trim( $email_data['gv-note-subject'] );
781
+			$subject = trim( $email_data[ 'gv-note-subject' ] );
782 782
 
783 783
 			// We use empty() here because GF uses empty to check against, too. `0` isn't a valid subject to GF
784 784
 			$subject = empty( $subject ) ? self::strings( 'default-email-subject' ) : $subject;
785
-			$message = $email_data['gv-note-content'];
785
+			$message = $email_data[ 'gv-note-content' ];
786 786
 			$email_footer = self::strings( 'email-footer' );
787
-			$from_name     = $current_user->display_name;
787
+			$from_name = $current_user->display_name;
788 788
 			$message_format = 'html';
789 789
 
790 790
 			/**
@@ -815,7 +815,7 @@  discard block
 block discarded – undo
815 815
 
816 816
 			GVCommon::send_email( $from, $to, $bcc, $reply_to, $subject, $message, $from_name, $message_format, '', $entry, false );
817 817
 
818
-			$form  = isset( $entry['form_id'] ) ? GFAPI::get_form( $entry['form_id'] ) : array();
818
+			$form = isset( $entry[ 'form_id' ] ) ? GFAPI::get_form( $entry[ 'form_id' ] ) : array();
819 819
 
820 820
 			/**
821 821
 			 * @see https://www.gravityhelp.com/documentation/article/10146-2/ It's here for compatibility with Gravity Forms
@@ -841,7 +841,7 @@  discard block
 block discarded – undo
841 841
 
842 842
 	    $output = '';
843 843
 
844
-		if( ! empty( $email_footer ) ) {
844
+		if ( ! empty( $email_footer ) ) {
845 845
 		    $url = \GV\Utils::get( $email_data, 'current-url' );
846 846
 			$url = html_entity_decode( $url );
847 847
 			$url = site_url( $url );
Please login to merge, or discard this patch.