Completed
Push — develop ( 40c91a...f78234 )
by Zack
17:38
created
includes/widgets/search-widget/templates/search-field-select.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -10,14 +10,14 @@  discard block
 block discarded – undo
10 10
 $search_field = $gravityview_view->search_field;
11 11
 
12 12
 // Make sure that there are choices to display
13
-if( empty( $search_field['choices'] ) ) {
13
+if ( empty( $search_field[ 'choices' ] ) ) {
14 14
 	gravityview()->log->debug( 'search-field-select.php - No choices for field' );
15 15
 	return;
16 16
 }
17 17
 
18
-if( is_array( $search_field['value'] ) ) {
18
+if ( is_array( $search_field[ 'value' ] ) ) {
19 19
     gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' );
20
-	$search_field['value'] = reset( $search_field['value'] );
20
+	$search_field[ 'value' ] = reset( $search_field[ 'value' ] );
21 21
 }
22 22
 
23 23
 /**
@@ -26,26 +26,26 @@  discard block
 block discarded – undo
26 26
  * @param string $default_option Default: `—` (—)
27 27
  * @param string $field_type Field type: "select" or "multiselect"
28 28
  */
29
-$default_option = apply_filters('gravityview/extension/search/select_default', '—', 'select' );
29
+$default_option = apply_filters( 'gravityview/extension/search/select_default', '—', 'select' );
30 30
 
31 31
 ?>
32 32
 <div class="gv-search-box gv-search-field-select">
33
-	<?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?>
34
-		<label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label>
33
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?>
34
+		<label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
35 35
 	<?php } ?>
36 36
 	<p>
37
-		<select name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>">
38
-			<option value="" <?php gv_selected( '', $search_field['value'], true ); ?>><?php echo esc_html( $default_option ); ?></option>
37
+		<select name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>">
38
+			<option value="" <?php gv_selected( '', $search_field[ 'value' ], true ); ?>><?php echo esc_html( $default_option ); ?></option>
39 39
 			<?php
40
-			foreach( $search_field['choices'] as $choice ) { ?>
41
-				<?php if ( is_array( $choice['value'] ) ) { ?>
42
-					<optgroup label="<?php echo esc_attr( $choice['text'] ); ?>">
43
-						<?php foreach ( $choice['value'] as $subchoice ): ?>
44
-							<option value="<?php echo esc_attr( $subchoice['value'] ); ?>"><?php echo esc_html( $subchoice['text'] ); ?></option>
40
+			foreach ( $search_field[ 'choices' ] as $choice ) { ?>
41
+				<?php if ( is_array( $choice[ 'value' ] ) ) { ?>
42
+					<optgroup label="<?php echo esc_attr( $choice[ 'text' ] ); ?>">
43
+						<?php foreach ( $choice[ 'value' ] as $subchoice ): ?>
44
+							<option value="<?php echo esc_attr( $subchoice[ 'value' ] ); ?>"><?php echo esc_html( $subchoice[ 'text' ] ); ?></option>
45 45
 						<?php endforeach; ?>
46 46
 					</optgroup>
47 47
 				<?php } else { ?>
48
-					<option value="<?php echo esc_attr( $choice['value'] ); ?>" <?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $search_field['value'] ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option>
48
+					<option value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" <?php gv_selected( esc_attr( $choice[ 'value' ] ), esc_attr( $search_field[ 'value' ] ), true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option>
49 49
 				<?php } ?>
50 50
 			<?php } ?>
51 51
 		</select>
Please login to merge, or discard this patch.
includes/admin/class-gravityview-support-port.php 2 patches
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 
14 14
 	/**
15 15
 	 * @var string The hash key used to generate secure message history
16
-     * @since 2.2.5
16
+	 * @since 2.2.5
17 17
 	 */
18 18
 	const beacon_key = 'lCXlwbQR707kipR+J0MCqcxrhGOHjGF0ldD6yNbGM0w=';
19 19
 
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 			'payment_id'       => '',
111 111
 			'customer_name'    => '',
112 112
 			'customer_email'   => '',
113
-            'price_id'         => '0',
113
+			'price_id'         => '0',
114 114
 		) );
115 115
 
116 116
 		// This is just HTML we don't need.
@@ -127,9 +127,9 @@  discard block
 block discarded – undo
127 127
 			case 3:
128 128
 				$package = 'All Access';
129 129
 				break;
130
-            case 4:
131
-                $package = 'Lifetime';
132
-                break;
130
+			case 4:
131
+				$package = 'Lifetime';
132
+				break;
133 133
 		}
134 134
 
135 135
 		$current_user = wp_get_current_user();
@@ -159,27 +159,27 @@  discard block
 block discarded – undo
159 159
 		// Help Scout length limit is 200 characters
160 160
 		foreach( $data as $key => $value ) {
161 161
 			if ( ! is_string( $value ) ) {
162
-                continue;
162
+				continue;
163 163
 			}
164
-		    $data[ $key ] = mb_substr( $value, 0, 200 );
165
-        }
164
+			$data[ $key ] = mb_substr( $value, 0, 200 );
165
+		}
166 166
 
167 167
 		$localization_data = array(
168 168
 			'contactEnabled' => (int)GVCommon::has_cap( 'gravityview_contact_support' ),
169 169
 			'data' => $data,
170 170
 			'translation' => $translation,
171
-            'suggest' => array(),
171
+			'suggest' => array(),
172 172
 		);
173 173
 
174 174
 		/**
175
-         * @filter `gravityview/support_port/localization_data` Filter data passed to the Support Port, before localize_script is run
175
+		 * @filter `gravityview/support_port/localization_data` Filter data passed to the Support Port, before localize_script is run
176 176
 		 * @since 2.0
177
-         * @param array $localization_data {
178
-         *   @type int $contactEnabled Can the user contact support?
179
-         *   @type array $data Support/license info
180
-         *   @type array $translation i18n strings
181
-         *   @type array $suggest Article IDs to recommend to the user (per page in the admin
182
-         * }
177
+		 * @param array $localization_data {
178
+		 *   @type int $contactEnabled Can the user contact support?
179
+		 *   @type array $data Support/license info
180
+		 *   @type array $translation i18n strings
181
+		 *   @type array $suggest Article IDs to recommend to the user (per page in the admin
182
+		 * }
183 183
 		 */
184 184
 		$localization_data = apply_filters( 'gravityview/support_port/localization_data', $localization_data );
185 185
 
@@ -193,11 +193,11 @@  discard block
 block discarded – undo
193 193
 	 *
194 194
 	 * If the user doesn't have the `gravityview_support_port` capability, returns false; then
195 195
 	 * If global setting is "hide", returns false; then
196
-     * If user preference is not set, return global setting; then
197
-     * If user preference is set, return that setting.
196
+	 * If user preference is not set, return global setting; then
197
+	 * If user preference is set, return that setting.
198 198
 	 *
199 199
 	 * @since 1.15
200
-     * @since 1.17.5 Changed behavior to respect global setting
200
+	 * @since 1.17.5 Changed behavior to respect global setting
201 201
 	 *
202 202
 	 * @param int $user Optional. ID of the user to check, defaults to 0 for current user.
203 203
 	 *
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 		$global_setting = gravityview()->plugin->settings->get( 'support_port' );
213 213
 
214 214
 		if ( empty( $global_setting ) ) {
215
-            return false;
215
+			return false;
216 216
 		}
217 217
 
218 218
 		// Get the per-user Support Port setting
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
 	 * Modifies the output of profile.php to add GravityView Support preference
249 249
 	 *
250 250
 	 * @since 1.15
251
-     * @since 1.17.5 Only show if global setting is active
251
+	 * @since 1.17.5 Only show if global setting is active
252 252
 	 *
253 253
 	 * @param WP_User $user Current user info
254 254
 	 *
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
 		$global_setting = gravityview()->plugin->settings->get( 'support_port' );
260 260
 
261 261
 		if ( empty( $global_setting ) ) {
262
-            return;
262
+			return;
263 263
 		}
264 264
 
265 265
 		/**
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -114,9 +114,9 @@  discard block
 block discarded – undo
114 114
 		) );
115 115
 
116 116
 		// This is just HTML we don't need.
117
-		unset( $response['message'] );
117
+		unset( $response[ 'message' ] );
118 118
 
119
-		switch ( intval( $response['price_id'] ) ) {
119
+		switch ( intval( $response[ 'price_id' ] ) ) {
120 120
 			default:
121 121
 			case 1:
122 122
 				$package = 'Core';
@@ -142,12 +142,12 @@  discard block
 block discarded – undo
142 142
 			'email'                 => $current_user->user_email,
143 143
 			'name'                  => mb_substr( $current_user->display_name, 0, 80 ),
144 144
 			'signature'             => hash_hmac( 'sha256', $current_user->user_email, self::beacon_key ),
145
-			'License Key'           => $response['license_key'] . ' (' . ucwords( $response['license'] ) . ')',
145
+			'License Key'           => $response[ 'license_key' ] . ' (' . ucwords( $response[ 'license' ] ) . ')',
146 146
 			'License Level'         => $package,
147 147
 			'Alt Emails'            => sprintf( "Admin: %s, GV Support: %s", get_bloginfo( 'admin_email' ), gravityview()->plugin->settings->get( 'support-email' ) ),
148
-			'Payment Details'       => $response['customer_name'] . ' ' . $response['customer_email'],
148
+			'Payment Details'       => $response[ 'customer_name' ] . ' ' . $response[ 'customer_email' ],
149 149
 			'WordPress Version'     => get_bloginfo( 'version', 'display' ),
150
-			'PHP Version'           => phpversion() . ' on ' . esc_html( $_SERVER['SERVER_SOFTWARE'] ),
150
+			'PHP Version'           => phpversion() . ' on ' . esc_html( $_SERVER[ 'SERVER_SOFTWARE' ] ),
151 151
 			'No-Conflict Mode'      => empty( $no_conflict_mode ) ? 'Disabled' : 'Enabled',
152 152
 			'GravityView Version'   => \GV\Plugin::$version,
153 153
 			'Gravity Forms Version' => GFForms::$version,
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 		ob_get_clean();
158 158
 
159 159
 		// Help Scout length limit is 200 characters
160
-		foreach( $data as $key => $value ) {
160
+		foreach ( $data as $key => $value ) {
161 161
 			if ( ! is_string( $value ) ) {
162 162
                 continue;
163 163
 			}
Please login to merge, or discard this patch.