Completed
Pull Request — master (#1161)
by Zack
21:32 queued 16:50
created
includes/widgets/register-gravityview-widgets.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -20,16 +20,16 @@
 block discarded – undo
20 20
  */
21 21
 function gravityview_register_gravityview_widgets() {
22 22
 
23
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' );
23
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget.php' );
24 24
 
25
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-pagination-info.php' );
26
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-page-links.php' );
27
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-page-size.php' );
28
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-custom-content.php' );
29
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/search-widget/class-search-widget.php' );
25
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-pagination-info.php' );
26
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-page-links.php' );
27
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-page-size.php' );
28
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-custom-content.php' );
29
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/search-widget/class-search-widget.php' );
30 30
 
31
-	if( class_exists('GFPolls') ) {
32
-		include_once( GRAVITYVIEW_DIR .'includes/widgets/poll/class-gravityview-widget-poll.php' );
31
+	if ( class_exists( 'GFPolls' ) ) {
32
+		include_once( GRAVITYVIEW_DIR . 'includes/widgets/poll/class-gravityview-widget-poll.php' );
33 33
 	}
34 34
 
35 35
 }
Please login to merge, or discard this patch.
includes/widgets/class-gravityview-widget-page-size.php 2 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 
75 75
 	/**
76 76
 	 * Render the page size widget
77
-     *
77
+	 *
78 78
 	 * @param array $widget_args The Widget shortcode args.
79 79
 	 * @param string $content The content.
80 80
 	 * @param string|\GV\Template_Context $context The context, if available.
@@ -115,14 +115,14 @@  discard block
 block discarded – undo
115 115
 						<?php } ?>
116 116
                     </select>
117 117
                     <input type="submit" value="Submit" style="visibility: hidden; position: absolute;" /><?php
118
-                    if( ! empty( $_GET ) ) {
119
-                        $get = $_GET;
120
-                        unset( $get['page_size'] );
121
-	                    foreach ( $get as $key => $value ) {
122
-		                    printf( '<input type="hidden" name="%s" value="%s" />', esc_attr( $key ), esc_attr( $value ) );
123
-	                    }
124
-                    }
125
-                    ?>
118
+					if( ! empty( $_GET ) ) {
119
+						$get = $_GET;
120
+						unset( $get['page_size'] );
121
+						foreach ( $get as $key => $value ) {
122
+							printf( '<input type="hidden" name="%s" value="%s" />', esc_attr( $key ), esc_attr( $value ) );
123
+						}
124
+					}
125
+					?>
126 126
                 </div>
127 127
             </form>
128 128
         </div>
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 		$default_size = 25;
46 46
 
47 47
 		if ( $context instanceof \GV\Template_Context ) {
48
-			$default_size = (int) $context->view->settings->get( 'page_size' );
48
+			$default_size = (int)$context->view->settings->get( 'page_size' );
49 49
 		}
50 50
 
51 51
 		$sizes = array( 10, 25, $default_size, 50, 100 );
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 
57 57
 		$page_sizes = array();
58 58
 		foreach ( $sizes as $size ) {
59
-			$page_sizes [] = array(
59
+			$page_sizes [ ] = array(
60 60
 				'value' => $size,
61 61
 				'text'  => $size
62 62
 			);
@@ -81,11 +81,11 @@  discard block
 block discarded – undo
81 81
 	 */
82 82
 	public function render_frontend( $widget_args, $content = '', $context = null ) {
83 83
 
84
-		if( ! $this->pre_render_frontend() ) {
84
+		if ( ! $this->pre_render_frontend() ) {
85 85
 			return;
86 86
 		}
87 87
 
88
-		$page_size = (int) \GV\Utils::_GET( 'page_size', $context->view->settings->get( 'page_size' ) );
88
+		$page_size = (int)\GV\Utils::_GET( 'page_size', $context->view->settings->get( 'page_size' ) );
89 89
 
90 90
 		$settings = shortcode_atts( array(
91 91
 			'label'   => __( 'Page Size', 'gravityview' ),
@@ -104,20 +104,20 @@  discard block
 block discarded – undo
104 104
         <div class="gv-widget-page-size">
105 105
             <form method="get" action="<?php echo esc_url( add_query_arg( array() ) ); ?>" onchange="this.submit();">
106 106
                 <div>
107
-                    <?php if( ! empty( $settings['label'] ) ) { ?>
108
-                    <label for="gv-page_size"><?php echo esc_html( $settings['label'] ); ?></label>
107
+                    <?php if ( ! empty( $settings[ 'label' ] ) ) { ?>
108
+                    <label for="gv-page_size"><?php echo esc_html( $settings[ 'label' ] ); ?></label>
109 109
                     <?php } ?>
110 110
                     <select name="page_size" id="gv-page_size">
111
-                        <option value=""><?php echo esc_html( $settings['default_choice_text'] ); ?></option>
111
+                        <option value=""><?php echo esc_html( $settings[ 'default_choice_text' ] ); ?></option>
112 112
 						<?php
113
-						foreach ( $settings['choices'] as $choice ) { ?>
114
-                            <option value='<?php echo esc_attr( $choice['value'] ); ?>'<?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $page_size ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option>
113
+						foreach ( $settings[ 'choices' ] as $choice ) { ?>
114
+                            <option value='<?php echo esc_attr( $choice[ 'value' ] ); ?>'<?php gv_selected( esc_attr( $choice[ 'value' ] ), esc_attr( $page_size ), true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option>
115 115
 						<?php } ?>
116 116
                     </select>
117 117
                     <input type="submit" value="Submit" style="visibility: hidden; position: absolute;" /><?php
118
-                    if( ! empty( $_GET ) ) {
118
+                    if ( ! empty( $_GET ) ) {
119 119
                         $get = $_GET;
120
-                        unset( $get['page_size'] );
120
+                        unset( $get[ 'page_size' ] );
121 121
 	                    foreach ( $get as $key => $value ) {
122 122
 		                    printf( '<input type="hidden" name="%s" value="%s" />', esc_attr( $key ), esc_attr( $value ) );
123 123
 	                    }
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 		}
151 151
 
152 152
 		// Already overridden
153
-		if ( (int) $page_size === (int) $view->settings->get( 'page_size' ) ) {
153
+		if ( (int)$page_size === (int)$view->settings->get( 'page_size' ) ) {
154 154
 			return;
155 155
 		}
156 156
 
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 			'view' => $view,
159 159
 		) );
160 160
 
161
-		if ( ! in_array( (int) $page_size, wp_list_pluck( self::get_page_sizes( $context ), 'value' ), true ) ) {
161
+		if ( ! in_array( (int)$page_size, wp_list_pluck( self::get_page_sizes( $context ), 'value' ), true ) ) {
162 162
 			gravityview()->log->warning( 'The passed page size is not allowed: {page_size}. Not modifying result.', array( 'page_size' => $page_size ) );
163 163
 			return;
164 164
 		}
Please login to merge, or discard this patch.
includes/admin/class-gravityview-support-port.php 2 patches
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 			'payment_id'       => '',
105 105
 			'customer_name'    => '',
106 106
 			'customer_email'   => '',
107
-            'price_id'         => '0',
107
+			'price_id'         => '0',
108 108
 		) );
109 109
 
110 110
 		// This is just HTML we don't need.
@@ -121,9 +121,9 @@  discard block
 block discarded – undo
121 121
 			case 3:
122 122
 				$package = 'All Access';
123 123
 				break;
124
-            case 4:
125
-                $package = 'Lifetime';
126
-                break;
124
+			case 4:
125
+				$package = 'Lifetime';
126
+				break;
127 127
 		}
128 128
 
129 129
 		$data = array(
@@ -152,18 +152,18 @@  discard block
 block discarded – undo
152 152
 			'contactEnabled' => (int)GVCommon::has_cap( 'gravityview_contact_support' ),
153 153
 			'data' => $data,
154 154
 			'translation' => $translation,
155
-            'suggest' => array(),
155
+			'suggest' => array(),
156 156
 		);
157 157
 
158 158
 		/**
159
-         * @filter `gravityview/support_port/localization_data` Filter data passed to the Support Port, before localize_script is run
159
+		 * @filter `gravityview/support_port/localization_data` Filter data passed to the Support Port, before localize_script is run
160 160
 		 * @since 2.0
161
-         * @param array $localization_data {
162
-         *   @type int $contactEnabled Can the user contact support?
163
-         *   @type array $data Support/license info
164
-         *   @type array $translation i18n strings
165
-         *   @type array $suggest Article IDs to recommend to the user (per page in the admin
166
-         * }
161
+		 * @param array $localization_data {
162
+		 *   @type int $contactEnabled Can the user contact support?
163
+		 *   @type array $data Support/license info
164
+		 *   @type array $translation i18n strings
165
+		 *   @type array $suggest Article IDs to recommend to the user (per page in the admin
166
+		 * }
167 167
 		 */
168 168
 		$localization_data = apply_filters( 'gravityview/support_port/localization_data', $localization_data );
169 169
 
@@ -177,11 +177,11 @@  discard block
 block discarded – undo
177 177
 	 *
178 178
 	 * If the user doesn't have the `gravityview_support_port` capability, returns false; then
179 179
 	 * If global setting is "hide", returns false; then
180
-     * If user preference is not set, return global setting; then
181
-     * If user preference is set, return that setting.
180
+	 * If user preference is not set, return global setting; then
181
+	 * If user preference is set, return that setting.
182 182
 	 *
183 183
 	 * @since 1.15
184
-     * @since 1.17.5 Changed behavior to respect global setting
184
+	 * @since 1.17.5 Changed behavior to respect global setting
185 185
 	 *
186 186
 	 * @param int $user Optional. ID of the user to check, defaults to 0 for current user.
187 187
 	 *
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 		$global_setting = gravityview()->plugin->settings->get( 'support_port' );
197 197
 
198 198
 		if ( empty( $global_setting ) ) {
199
-            return false;
199
+			return false;
200 200
 		}
201 201
 
202 202
 		// Get the per-user Support Port setting
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
 	 * Modifies the output of profile.php to add GravityView Support preference
233 233
 	 *
234 234
 	 * @since 1.15
235
-     * @since 1.17.5 Only show if global setting is active
235
+	 * @since 1.17.5 Only show if global setting is active
236 236
 	 *
237 237
 	 * @param WP_User $user Current user info
238 238
 	 *
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
 		$global_setting = gravityview()->plugin->settings->get( 'support_port' );
244 244
 
245 245
 		if ( empty( $global_setting ) ) {
246
-            return;
246
+			return;
247 247
 		}
248 248
 
249 249
 		/**
Please login to merge, or discard this 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 = 'Core';
@@ -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.
future/includes/class-gv-request-admin.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 		 */
39 39
 		$is_page = false;
40 40
 
41
-		if( function_exists( '\get_current_screen' ) ) {
41
+		if ( function_exists( '\get_current_screen' ) ) {
42 42
 			$current_screen = \get_current_screen();
43 43
 		} else {
44 44
 			$current_screen = false;
@@ -51,13 +51,13 @@  discard block
 block discarded – undo
51 51
 				$is_page = 'single';
52 52
 			} elseif ( $is_gv_settings = 'gravityview_page_gravityview_settings' === $current_screen->id ) {
53 53
 				$is_page = 'settings';
54
-			} elseif( $is_extensions = 'gravityview_page_gv-admin-installer' === $current_screen->id ) {
54
+			} elseif ( $is_extensions = 'gravityview_page_gv-admin-installer' === $current_screen->id ) {
55 55
 				$is_page = 'downloads';
56
-			} elseif( $is_changelog = 'gravityview_page_gv-changelog' === $current_screen->id ) {
56
+			} elseif ( $is_changelog = 'gravityview_page_gv-changelog' === $current_screen->id ) {
57 57
 				$is_page = 'changelog';
58
-			} elseif( $is_getting_started = 'gravityview_page_gv-getting-started' === $current_screen->id ) {
58
+			} elseif ( $is_getting_started = 'gravityview_page_gv-getting-started' === $current_screen->id ) {
59 59
 				$is_page = 'getting-started';
60
-			} elseif( $is_credits = 'gravityview_page_gv-credits' === $current_screen->id ) {
60
+			} elseif ( $is_credits = 'gravityview_page_gv-credits' === $current_screen->id ) {
61 61
 				$is_page = 'credits';
62 62
 			}
63 63
 		}
Please login to merge, or discard this patch.