Completed
Pull Request — develop (#1347)
by Zack
19:48
created
includes/fields/class-gravityview-field-unsubscribe.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 
19 19
 	public function __construct() {
20 20
 		$this->label = esc_html__( 'Unsubscribe', 'gravityview' );
21
-		$this->description =  esc_attr__( 'Unsubscribe from a Payment-based entry.', 'gravityview' );
21
+		$this->description = esc_attr__( 'Unsubscribe from a Payment-based entry.', 'gravityview' );
22 22
 
23 23
 		$this->add_hooks();
24 24
 
@@ -57,13 +57,13 @@  discard block
 block discarded – undo
57 57
 	 */
58 58
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
59 59
 
60
-		unset( $field_options['only_loggedin'] );
60
+		unset( $field_options[ 'only_loggedin' ] );
61 61
 
62
-		unset( $field_options['new_window'] );
62
+		unset( $field_options[ 'new_window' ] );
63 63
 
64
-		unset( $field_options['show_as_link'] );
64
+		unset( $field_options[ 'show_as_link' ] );
65 65
 
66
-		$add_options['unsub_all'] = array(
66
+		$add_options[ 'unsub_all' ] = array(
67 67
 			'type'       => 'checkbox',
68 68
 			'label'      => __( 'Allow admins to unsubscribe', 'gravityview' ),
69 69
 			'desc'       => __( 'Allow users with `gravityforms_edit_entries` to cancel subscriptions', 'gravityview' ),
@@ -130,9 +130,9 @@  discard block
 block discarded – undo
130 130
 		}
131 131
 
132 132
 		foreach ( $feeds as $feed ) {
133
-			if ( isset( $subscription_addons[ $feed['addon_slug'] ] ) && 'subscription' === \GV\Utils::get( $feed, 'meta/transactionType' ) ) {
134
-				if ( ! isset( $entry_default_fields["{$this->name}"] ) && 'edit' !== $context ) {
135
-					$entry_default_fields["{$this->name}"] = array(
133
+			if ( isset( $subscription_addons[ $feed[ 'addon_slug' ] ] ) && 'subscription' === \GV\Utils::get( $feed, 'meta/transactionType' ) ) {
134
+				if ( ! isset( $entry_default_fields[ "{$this->name}" ] ) && 'edit' !== $context ) {
135
+					$entry_default_fields[ "{$this->name}" ] = array(
136 136
 						'label' => $this->label,
137 137
 						'desc'  => $this->description,
138 138
 						'type'  => $this->name,
@@ -163,10 +163,10 @@  discard block
 block discarded – undo
163 163
 			return $output;
164 164
 		}
165 165
 
166
-		$can_current_user_edit = is_numeric( $entry['created_by'] ) && ( wp_get_current_user()->ID === intval( $entry['created_by'] ) );
166
+		$can_current_user_edit = is_numeric( $entry[ 'created_by' ] ) && ( wp_get_current_user()->ID === intval( $entry[ 'created_by' ] ) );
167 167
 
168 168
 		if ( ! $can_current_user_edit ) {
169
-			if ( empty( $field_settings['unsub_all'] ) || ! \GVCommon::has_cap( 'gravityforms_edit_entries', $entry['id'] ) ) {
169
+			if ( empty( $field_settings[ 'unsub_all' ] ) || ! \GVCommon::has_cap( 'gravityforms_edit_entries', $entry[ 'id' ] ) ) {
170 170
 				return $output;
171 171
 			}
172 172
 		}
@@ -179,21 +179,21 @@  discard block
 block discarded – undo
179 179
 		// @todo Also make sure we check caps if moved from here
180 180
 		// @todo Also make sure test_GravityView_Field_Unsubscribe_unsubscribe_permissions is rewritten
181 181
 		if ( $entry = $this->maybe_unsubscribe( $entry ) ) {
182
-			if ( $entry['payment_status'] !== $status ) {
182
+			if ( $entry[ 'payment_status' ] !== $status ) {
183 183
 				// @todo Probably __( 'Unsubscribed', 'gravityview' );
184
-				return $entry['payment_status'];
184
+				return $entry[ 'payment_status' ];
185 185
 			}
186 186
 		}
187 187
 
188
-		if ( 'active' !== mb_strtolower( $entry['payment_status'] ) ) {
188
+		if ( 'active' !== mb_strtolower( $entry[ 'payment_status' ] ) ) {
189 189
 			return $output;
190 190
 		}
191 191
 
192 192
 		global $wp;
193 193
 		$current_url = add_query_arg( $wp->query_string, '', home_url( $wp->request ) );
194 194
 
195
-		$link = add_query_arg( 'unsubscribe', wp_create_nonce( 'unsubscribe_' . $entry['id'] ), $current_url );
196
-		$link = add_query_arg( 'uid', $entry['id'], $link );
195
+		$link = add_query_arg( 'unsubscribe', wp_create_nonce( 'unsubscribe_' . $entry[ 'id' ] ), $current_url );
196
+		$link = add_query_arg( 'uid', $entry[ 'id' ], $link );
197 197
 
198 198
 		return sprintf( '<a href="%s">%s</a>', esc_url( $link ), esc_html__( 'Unsubscribe', 'gravityview' ) );
199 199
 	}
@@ -213,11 +213,11 @@  discard block
 block discarded – undo
213 213
 	 */
214 214
 	private function maybe_unsubscribe( $entry ) {
215 215
 
216
-		if ( ! wp_verify_nonce( \GV\Utils::_REQUEST( 'unsubscribe' ), 'unsubscribe_' . $entry['id'] ) ) {
216
+		if ( ! wp_verify_nonce( \GV\Utils::_REQUEST( 'unsubscribe' ), 'unsubscribe_' . $entry[ 'id' ] ) ) {
217 217
 			return $entry;
218 218
 		}
219 219
 
220
-		if ( ( ! $uid = \GV\Utils::_REQUEST( 'uid' ) ) || ! is_numeric( $uid ) || ( intval( $uid ) !== intval( $entry['id'] ) ) ) {
220
+		if ( ( ! $uid = \GV\Utils::_REQUEST( 'uid' ) ) || ! is_numeric( $uid ) || ( intval( $uid ) !== intval( $entry[ 'id' ] ) ) ) {
221 221
 			return $entry;
222 222
 		}
223 223
 
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
 
260 260
 						$subscription_addons[ $slug ]->cancel_subscription( $entry, $feed );
261 261
 
262
-						return \GFAPI::get_entry( $entry['id'] );
262
+						return \GFAPI::get_entry( $entry[ 'id' ] );
263 263
 					}
264 264
 				}
265 265
 			}
Please login to merge, or discard this patch.