gravityview / GravityView

future/includes/class-gv-settings-addon.php

Spacing +50 added lines, -50 removed lines

@@ -118,7 +118,7 @@ 
 		$setting_tabs = parent::get_app_settings_tabs();
 
 		foreach ( $setting_tabs as &$tab ) {
-			if ( 'uninstall' !== $tab['name'] ) {
+			if ( 'uninstall' !== $tab[ 'name' ] ) {
 				continue;
 			}
 
@@ -129,7 +129,7 @@ 
 			}
 
 			// Add trash can icon to resemble the look and feel of the GF Settings page
-			$tab['icon'] = 'dashicons-trash';
+			$tab[ 'icon' ] = 'dashicons-trash';
 		}
 
 		return array_filter( $setting_tabs );
@@ -144,8 +144,8 @@ 
 	 */
 	public function register_no_conflict( $items ) {
 
-		$items[] = 'gform_settings';
-		$items[] = 'gv-admin-edd-license';
+		$items[ ] = 'gform_settings';
+		$items[ ] = 'gv-admin-edd-license';
 
 		return $items;
 	}
@@ -196,7 +196,7 @@ 
 
 		$href = add_query_arg( array( 'post_type' => 'gravityview', 'page' => 'gravityview_settings', 'view' => 'uninstall' ), admin_url( 'edit.php' ) );
 
-		$uninstall_button = '<a href="' . esc_url( $href ) . '" class="' . gravityview_sanitize_html_class( $html_class ). '">' . esc_html__( 'Uninstall GravityView', 'gravityview' ) . '</a>';
+		$uninstall_button = '<a href="' . esc_url( $href ) . '" class="' . gravityview_sanitize_html_class( $html_class ) . '">' . esc_html__( 'Uninstall GravityView', 'gravityview' ) . '</a>';
 
 		$html .= $uninstall_button;
 
@@ -215,10 +215,10 @@ 
 	 */
 	public function settings_save( $field, $echo = true ) {
 
-		$field['type']  = 'submit';
-		$field['name']  = 'gform-settings-save';
-		$field['class'] = 'button button-primary primary button-hero';
-		$field['value'] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
+		$field[ 'type' ]  = 'submit';
+		$field[ 'name' ]  = 'gform-settings-save';
+		$field[ 'class' ] = 'button button-primary primary button-hero';
+		$field[ 'value' ] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
 
 		$html = $this->as_html( $field, false );
 
@@ -240,8 +240,8 @@ 
 	 */
 	public function modify_app_settings_menu_title( $setting_tabs ) {
 
-		$setting_tabs[0]['label'] = __( 'GravityView Settings', 'gravityview' );
-		$setting_tabs[0]['icon']  = 'dashicons-admin-settings';
+		$setting_tabs[ 0 ][ 'label' ] = __( 'GravityView Settings', 'gravityview' );
+		$setting_tabs[ 0 ][ 'icon' ]  = 'dashicons-admin-settings';
 
 		return $setting_tabs;
 	}
@@ -489,7 +489,7 @@ 
 					$i = 0;
 					while ( $i < 11 ) {
 						echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_' . $i . '" value="' . $i . '" type="radio"> ' . $i . '</label></li>';
-						$i ++;
+						$i++;
 					}
 					?>
 				</ul>
@@ -695,14 +695,14 @@ 
 	 */
 	public function as_html( $field, $echo = true ) {
 
-		$field['type'] = ( isset( $field['type'] ) && in_array( $field['type'], array( 'submit', 'reset', 'button' ) ) ) ? $field['type'] : 'submit';
+		$field[ 'type' ] = ( isset( $field[ 'type' ] ) && in_array( $field[ 'type' ], array( 'submit', 'reset', 'button' ) ) ) ? $field[ 'type' ] : 'submit';
 
 		$attributes    = $this->get_field_attributes( $field );
 		$default_value = Utils::get( $field, 'value', Utils::get( $field, 'default_value' ) );
-		$value         = $this->get( $field['name'], $default_value );
+		$value         = $this->get( $field[ 'name' ], $default_value );
 
-		$attributes['class'] = isset( $attributes['class'] ) ? esc_attr( $attributes['class'] ) : 'button-primary primary gfbutton';
-		$name                = ( $field['name'] === 'gform-settings-save' ) ? $field['name'] : '_gaddon_setting_' . $field['name'];
+		$attributes[ 'class' ] = isset( $attributes[ 'class' ] ) ? esc_attr( $attributes[ 'class' ] ) : 'button-primary primary gfbutton';
+		$name                = ( $field[ 'name' ] === 'gform-settings-save' ) ? $field[ 'name' ] : '_gaddon_setting_' . $field[ 'name' ];
 
 		if ( empty( $value ) ) {
 			$value = __( 'Update Settings', 'gravityview' );
@@ -711,7 +711,7 @@ 
 		$attributes = $this->get_field_attributes( $field );
 
 		$html = '<input
-                    type="' . $field['type'] . '"
+                    type="' . $field[ 'type' ] . '"
                     name="' . esc_attr( $name ) . '"
                     value="' . $value . '" ' .
 				implode( ' ', $attributes ) .
@@ -745,7 +745,7 @@ 
 	 */
 	public function is_save_postback() {
 
-		return isset( $_POST['gform-settings-save'] ) && isset( $_POST['_gravityview_save_settings_nonce'] );
+		return isset( $_POST[ 'gform-settings-save' ] ) && isset( $_POST[ '_gravityview_save_settings_nonce' ] );
 	}
 
 	/**
@@ -862,7 +862,7 @@ 
 
 		$scripts = parent::scripts();
 
-		$scripts[] = array(
+		$scripts[ ] = array(
 				'handle'  => 'gform_tooltip_init',
 				'enqueue' => array(
 						array(
@@ -890,11 +890,11 @@ 
 		);
 
 		// This file was removed from 2.5
-		if( ! gravityview()->plugin->is_GF_25() ) {
-			$deps[] = 'gform_tooltip';
+		if ( ! gravityview()->plugin->is_GF_25() ) {
+			$deps[ ] = 'gform_tooltip';
 		}
 
-		$styles[] = array(
+		$styles[ ] = array(
 			'handle'  => 'gravityview_settings',
 			'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
 			'version' => Plugin::$version,
@@ -981,7 +981,7 @@ 
 						'name'          => 'support-email',
 						'type'          => 'text',
 						'validate'      => 'email',
-						'default_value' => $default_settings['support-email'],
+						'default_value' => $default_settings[ 'support-email' ],
 						'label'         => __( 'Support Email', 'gravityview' ),
 						'description'   => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ),
 						'class'         => 'code regular-text',
@@ -993,7 +993,7 @@ 
 						'name'          => 'support_port',
 						'type'          => 'radio',
 						'label'         => __( 'Show Support Port?', 'gravityview' ),
-						'default_value' => $default_settings['support_port'],
+						'default_value' => $default_settings[ 'support_port' ],
 						'horizontal'    => 1,
 						'choices'       => array(
 								array(
@@ -1012,7 +1012,7 @@ 
 						'name'          => 'no-conflict-mode',
 						'type'          => 'radio',
 						'label'         => __( 'No-Conflict Mode', 'gravityview' ),
-						'default_value' => $default_settings['no-conflict-mode'],
+						'default_value' => $default_settings[ 'no-conflict-mode' ],
 						'horizontal'    => 1,
 						'choices'       => array(
 								array(
@@ -1030,7 +1030,7 @@ 
 						'name'          => 'public-approval-link',
 						'type'          => 'radio',
 						'label'         => __( 'Public Approval Link', 'gravityview' ),
-						'default_value' => $default_settings['public-approval-link'],
+						'default_value' => $default_settings[ 'public-approval-link' ],
 						'horizontal'    => 1,
 						'choices'       => array(
 								array(
@@ -1052,7 +1052,7 @@ 
 								'name'          => 'rest_api',
 								'type'          => 'radio',
 								'label'         => __( 'REST API', 'gravityview' ),
-								'default_value' => $default_settings['rest_api'],
+								'default_value' => $default_settings[ 'rest_api' ],
 								'horizontal'    => 1,
 								'choices'       => array(
 										array(
@@ -1071,7 +1071,7 @@ 
 					'name' => 'powered_by',
 					'type' => 'checkbox',
 					'label' => __( 'Display "Powered By" Link', 'gravityview' ),
-					'default_value' => $default_settings['powered_by'],
+					'default_value' => $default_settings[ 'powered_by' ],
 					'choices' => array(
 						array(
 							'label' => esc_html__( 'Display a "Powered by GravityView" link', 'gravityview' ),
@@ -1096,7 +1096,7 @@ 
 						'name'          => 'beta',
 						'type'          => 'checkbox',
 						'label'         => __( 'Become a Beta Tester', 'gravityview' ),
-						'default_value' => $default_settings['beta'],
+						'default_value' => $default_settings[ 'beta' ],
 						'horizontal'    => 1,
 						'choices'       => array(
 								array(
@@ -1130,17 +1130,17 @@ 
 		 * @since 1.7.4
 		 */
 		foreach ( $fields as &$field ) {
-			$field['name']          = isset( $field['name'] ) ? $field['name'] : Utils::get( $field, 'id' );
-			$field['label']         = isset( $field['label'] ) ? $field['label'] : Utils::get( $field, 'title' );
-			$field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : Utils::get( $field, 'default' );
-			$field['description']   = isset( $field['description'] ) ? $field['description'] : Utils::get( $field, 'subtitle' );
+			$field[ 'name' ]          = isset( $field[ 'name' ] ) ? $field[ 'name' ] : Utils::get( $field, 'id' );
+			$field[ 'label' ]         = isset( $field[ 'label' ] ) ? $field[ 'label' ] : Utils::get( $field, 'title' );
+			$field[ 'default_value' ] = isset( $field[ 'default_value' ] ) ? $field[ 'default_value' ] : Utils::get( $field, 'default' );
+			$field[ 'description' ]   = isset( $field[ 'description' ] ) ? $field[ 'description' ] : Utils::get( $field, 'subtitle' );
 
 			if ( $disabled_attribute ) {
-				$field['disabled'] = $disabled_attribute;
+				$field[ 'disabled' ] = $disabled_attribute;
 			}
 
-			if ( empty( $field['disabled'] ) ) {
-				unset( $field['disabled'] );
+			if ( empty( $field[ 'disabled' ] ) ) {
+				unset( $field[ 'disabled' ] );
 			}
 		}
 
@@ -1152,23 +1152,23 @@ 
 					'description' => __( 'Enter the license key that was sent to you on purchase. This enables plugin updates &amp; support.', 'gravityview' ),
 					'type' => 'edd_license',
 					'data-pending-text' => __( 'Verifying license&hellip;', 'gravityview' ),
-					'default_value' => $default_settings['license_key'],
+					'default_value' => $default_settings[ 'license_key' ],
 					'class' => ( '' == $this->get( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key',
 			),
 			array(
 					'name' => 'license_key_response',
-					'default_value' => $default_settings['license_key_response'],
+					'default_value' => $default_settings[ 'license_key_response' ],
 					'type' => 'hidden',
 			),
 			array(
 					'name' => 'license_key_status',
-					'default_value' => $default_settings['license_key_status'],
+					'default_value' => $default_settings[ 'license_key_status' ],
 					'type' => 'hidden',
 			),
 		);
 
 		if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
-			$license_fields[0] = array_merge( $license_fields[0], array(
+			$license_fields[ 0 ] = array_merge( $license_fields[ 0 ], array(
 				'disabled' => true,
 				'title'    => __( 'The license key is defined by your site\'s configuration file.', 'gravityview' ),
 			) );
@@ -1179,7 +1179,7 @@ 
 
 		if ( \gravityview()->plugin->is_GF_25() ) {
 
-			$sections[] = array(
+			$sections[ ] = array(
 					'title'       => __( 'GravityView License', 'gravityview' ),
 					'class'       => 'gform-settings-panel--full gv-settings-panel--license',
 					'description' => $version_info,
@@ -1197,7 +1197,7 @@ 
 			) );
 		}
 
-		$sections[] = array(
+		$sections[ ] = array(
 			'title' => ( gravityview()->plugin->is_GF_25() ? __( 'GravityView Settings', 'gravityview' ) : null ),
 			'class' => 'gform-settings-panel--full gv-settings-panel--core',
 			'fields'      => $fields,
@@ -1221,8 +1221,8 @@ 
 
 			if ( $disabled_attribute ) {
 				foreach ( $extension_sections as &$section ) {
-					foreach ( $section['fields'] as &$field ) {
-						$field['disabled'] = $disabled_attribute;
+					foreach ( $section[ 'fields' ] as &$field ) {
+						$field[ 'disabled' ] = $disabled_attribute;
 					}
 				}
 			}
@@ -1288,7 +1288,7 @@ 
 	public function settings_edd_license( $field, $echo = true ) {
 
 		if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
-			$field['input_type'] = 'password';
+			$field[ 'input_type' ] = 'password';
 		}
 
 		$text = $this->settings_text( $field, false );
@@ -1340,7 +1340,7 @@ 
 
 		?>
 
-		<tr id="gaddon-setting-row-<?php echo esc_attr( $field['name'] ); ?>">
+		<tr id="gaddon-setting-row-<?php echo esc_attr( $field[ 'name' ] ); ?>">
 			<td colspan="2">
 				<?php $this->single_setting( $field ); ?>
 			</td>
@@ -1366,8 +1366,8 @@ 
 	 */
 	public function single_setting_row( $field ) {
 
-		$field['gv_description'] = Utils::get( $field, 'description' );
-		$field['description']    = Utils::get( $field, 'subtitle' );
+		$field[ 'gv_description' ] = Utils::get( $field, 'description' );
+		$field[ 'description' ]    = Utils::get( $field, 'subtitle' );
 		parent::single_setting_row( $field );
 	}
 
@@ -1428,8 +1428,8 @@ 
 		// then we assume it's changed. If it's changed, unset the status and the previous response.
 		if ( ! $added_message && ( $local_key !== $response_key ) ) {
 
-			unset( $posted_settings['license_key_response'] );
-			unset( $posted_settings['license_key_status'] );
+			unset( $posted_settings[ 'license_key_response' ] );
+			unset( $posted_settings[ 'license_key_status' ] );
 
 			\GFCommon::add_error_message( __( 'The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
 

includes/class-gravityview-entry-approval-link.php

Spacing +28 added lines, -28 removed lines

@@ -102,7 +102,7 @@ 
 	 *
 	 * @return string Original text if {_custom_merge_tag} isn't found. Otherwise, replaced text.
 	 */
-	public function _filter_gform_replace_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false  ) {
+	public function _filter_gform_replace_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
 
 		$matches = array();
 		preg_match_all( '/{gv_(.+)_entry:?([0-9]+)?:?(.+)?}/', $text, $matches, PREG_SET_ORDER );
@@ -131,11 +131,11 @@ 
 	 */
 	protected function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
 
-		foreach( $matches as $match ) {
+		foreach ( $matches as $match ) {
 
 			list( $full_tag, $action, $expiration_hours, $privacy ) = $match;
 
-			if ( false === (bool) gravityview()->plugin->settings->get( 'public-approval-link' ) ) {
+			if ( false === (bool)gravityview()->plugin->settings->get( 'public-approval-link' ) ) {
 				$privacy = 'private';
 			}
 
@@ -148,7 +148,7 @@ 
 			$link_url = $this->get_link_url( $token, $privacy );
 
 
-			if ( 24 > (int) $expiration_hours ) {
+			if ( 24 > (int)$expiration_hours ) {
 				$link_url = add_query_arg( array( 'nonce' => wp_create_nonce( 'gv_token' ) ), $link_url );
 			}
 
@@ -174,7 +174,7 @@ 
 	 */
 	protected function get_token( $action = false, $expiration_hours = 24, $privacy = 'private', $entry = array() ) {
 
-		if ( ! $action || ! $entry['id'] ) {
+		if ( ! $action || ! $entry[ 'id' ] ) {
 			return false;
 		}
 
@@ -193,14 +193,14 @@ 
 		}
 
 		$scopes = array(
-			'entry_id'         => $entry['id'],
+			'entry_id'         => $entry[ 'id' ],
 			'approval_status'  => $approval_status,
 			'expiration_hours' => $expiration_hours,
 			'privacy'          => $privacy,
 		);
 
 		$jti                  = uniqid();
-		$expiration_timestamp = strtotime( '+' . (int) $expiration_hours . ' hours' );
+		$expiration_timestamp = strtotime( '+' . (int)$expiration_hours . ' hours' );
 
 		$token_array = array(
 			'iat'    => time(),
@@ -264,7 +264,7 @@ 
 		}
 
 		if ( ! empty( $token ) ) {
-			$query_args['gv_token'] = $token;
+			$query_args[ 'gv_token' ] = $token;
 		}
 
 		$url = add_query_arg( $query_args, $base_url );
@@ -292,27 +292,27 @@ 
 			$token_array = $this->decode_token( GV\Utils::_GET( 'gv_token' ) );
 
 			if ( is_wp_error( $token_array ) ) {
-				GVCommon::generate_notice( $token_array->get_error_messages() , 'gv-error' );
+				GVCommon::generate_notice( $token_array->get_error_messages(), 'gv-error' );
 
 				return;
 			}
 
 			if ( empty( $token_array ) ) {
-				GVCommon::generate_notice( __( 'Invalid request.', 'gravityview' ) , 'gv-error' );
+				GVCommon::generate_notice( __( 'Invalid request.', 'gravityview' ), 'gv-error' );
 
 				return false;
 			}
 
-			$scopes = $token_array['scopes'];
+			$scopes = $token_array[ 'scopes' ];
 
-			if ( empty( $scopes['entry_id'] ) || empty( $scopes['approval_status'] ) || empty( $scopes['privacy'] ) ) {
-				GVCommon::generate_notice( __( 'Invalid request.', 'gravityview' ) , 'gv-error' );
+			if ( empty( $scopes[ 'entry_id' ] ) || empty( $scopes[ 'approval_status' ] ) || empty( $scopes[ 'privacy' ] ) ) {
+				GVCommon::generate_notice( __( 'Invalid request.', 'gravityview' ), 'gv-error' );
 
 				return false;
 			}
 
-			if ( 'private' === $scopes['privacy'] && ! is_user_logged_in() ) {
-				GVCommon::generate_notice( __( 'You are not allowed to perform this operation.', 'gravityview' ) , 'gv-error' );
+			if ( 'private' === $scopes[ 'privacy' ] && ! is_user_logged_in() ) {
+				GVCommon::generate_notice( __( 'You are not allowed to perform this operation.', 'gravityview' ), 'gv-error' );
 
 				return false;
 			}
@@ -360,7 +360,7 @@ 
 			return false;
 		}
 
-		$body_64 = $parts[0];
+		$body_64 = $parts[ 0 ];
 
 		$body_json = base64_decode( $body_64 );
 		if ( empty( $body_json ) ) {
@@ -423,29 +423,29 @@ 
 
 		$token = json_decode( $body_json, true );
 
-		if ( ! isset( $token['jti'] ) ) {
+		if ( ! isset( $token[ 'jti' ] ) ) {
 			return false;
 		}
 
-		if ( ! isset( $token['exp'] ) || $token['exp'] < time() ) {
+		if ( ! isset( $token[ 'exp' ] ) || $token[ 'exp' ] < time() ) {
 			return false;
 		}
 
-		if ( ! isset( $token['scopes'] ) ) {
+		if ( ! isset( $token[ 'scopes' ] ) ) {
 			return false;
 		}
 
-		if ( ! isset( $token['scopes']['expiration_hours'] ) ) {
+		if ( ! isset( $token[ 'scopes' ][ 'expiration_hours' ] ) ) {
 			return false;
 		}
 
-		if ( 24 > $token['scopes']['expiration_hours'] ) {
+		if ( 24 > $token[ 'scopes' ][ 'expiration_hours' ] ) {
 
-			if ( ! isset( $_GET['nonce'] ) ) {
+			if ( ! isset( $_GET[ 'nonce' ] ) ) {
 				return false;
 			}
 
-			if ( ! wp_verify_nonce( $_GET['nonce'], 'gv_token' ) ) {
+			if ( ! wp_verify_nonce( $_GET[ 'nonce' ], 'gv_token' ) ) {
 				return false;
 			}
 		}
@@ -468,11 +468,11 @@ 
 			return false;
 		}
 
-		$entry_id        = $scopes['entry_id'];
-		$approval_status = $scopes['approval_status'];
+		$entry_id        = $scopes[ 'entry_id' ];
+		$approval_status = $scopes[ 'approval_status' ];
 
 		$entry   = GFAPI::get_entry( $entry_id );
-		$form_id = $entry['form_id'];
+		$form_id = $entry[ 'form_id' ];
 
 		// Valid status
 		if ( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
@@ -493,11 +493,11 @@ 
 		}
 
 		// Has capability
-		elseif ( 'private' === $scopes['privacy'] && ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry_id ) ) {
+		elseif ( 'private' === $scopes[ 'privacy' ] && ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry_id ) ) {
 
 			gravityview()->log->error( 'User does not have the `gravityview_moderate_entries` capability.' );
 
-			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview') );
+			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview' ) );
 
 		}
 

Braces +2 added lines, -6 removed lines

@@ -325,9 +325,7 @@ 
 
 			if ( 'success' === $result ) {
 				GVCommon::generate_notice( __( 'Entry approval updated!', 'gravityview' ), 'gv-success' );
-			}
-
-			elseif ( 'error' === $result ) {
+			} elseif ( 'error' === $result ) {
 				GVCommon::generate_notice( __( 'Error updating approval.', 'gravityview' ), 'gv-error' );
 			}
 		}
@@ -499,9 +497,7 @@ 
 
 			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview') );
 
-		}
-
-		else {
+		} else {
 
 			$result = GravityView_Entry_Approval::update_approved( $entry_id, $approval_status, $form_id );