gravityview / GravityView

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

Spacing +12 added lines, -12 removed lines

@@ -30,13 +30,13 @@ 
 	 *
 	 * @var array
 	 */
-	private $_plugin_settings = [];
+	private $_plugin_settings = [ ];
 
 	public function __construct() {
 		// GravityKitFoundation may not yet be available when this class is instantiated, so let's temporarily use the Settings framework from Foundation that's included with GravityView and then possibly replace it with the latest version.
 		$this->_foundation_settings = SettingsFramework::get_instance();
 
-		add_action( 'gk/foundation/initialized', function () {
+		add_action( 'gk/foundation/initialized', function() {
 			$this->_foundation_settings = GravityKitFoundation::settings();
 		} );
 
@@ -132,12 +132,12 @@ 
 		}
 
 		if ( empty( $legacy_settings ) ) {
-			return [];
+			return [ ];
 		}
 
 		// Migrate legacy GravityView settings that are still part of GravityView.
 		$plugin_settings = [
-			'rest_api' => (int) Arr::get( $legacy_settings, 'rest_api' ),
+			'rest_api' => (int)Arr::get( $legacy_settings, 'rest_api' ),
 		];
 
 		$this->_foundation_settings->save_plugin_settings( self::SETTINGS_PLUGIN_ID, $plugin_settings );
@@ -153,12 +153,12 @@ 
 			$gk_settings = [
 				'support_email'    => Arr::get( $legacy_settings, 'support-email' ),
 				'support_port'     => Arr::get( $legacy_settings, 'support_port' ),
-				'powered_by'       => (int) Arr::get( $legacy_settings, 'powered_by' ),
+				'powered_by'       => (int)Arr::get( $legacy_settings, 'powered_by' ),
 				'affiliate_id'     => Arr::get( $legacy_settings, 'affiliate_id' ),
-				'beta'             => (int) Arr::get( $legacy_settings, 'beta' ),
+				'beta'             => (int)Arr::get( $legacy_settings, 'beta' ),
 				'support_email'    => Arr::get( $legacy_settings, 'support-email' ),
-				'support_port'     => (int) Arr::get( $legacy_settings, 'support_port' ),
-				'no_conflict_mode' => (int) Arr::get( $legacy_settings, 'no-conflict-mode' ),
+				'support_port'     => (int)Arr::get( $legacy_settings, 'support_port' ),
+				'no_conflict_mode' => (int)Arr::get( $legacy_settings, 'no-conflict-mode' ),
 			];
 
 			$this->_foundation_settings->save_plugin_settings( $gk_settings_id, $gk_settings );
@@ -239,7 +239,7 @@ 
 							'type'        => 'checkbox',
 							'title'       => esc_html__( 'REST API', 'gk-gravityview' ),
 							'description' => esc_html__( 'Enable View and Entry access via the REST API? Regular per-View restrictions apply (private, password protected, etc.).', 'gk-gravityview' ) . ' ' . esc_html__( 'If you are unsure, disable this setting.', 'gk-gravityview' ),
-							'value'       => $this->get( 'rest_api', $default_settings['rest_api'] ),
+							'value'       => $this->get( 'rest_api', $default_settings[ 'rest_api' ] ),
 						],
 					],
 				],
@@ -251,14 +251,14 @@ 
 							'type'        => 'checkbox',
 							'title'       => esc_html__( 'Public Entry Moderation Merge Tags', 'gk-gravityview' ),
 							'description' => esc_html__( 'Allow entry moderation to be performed by anyone with the link, even if they are not logged in.', 'gk-gravityview' ) . ' ' . esc_html__( 'If you are unsure, disable this setting.', 'gk-gravityview' ),
-							'value'       => $this->get( 'public_entry_moderation', $default_settings['rest_api'] ),
+							'value'       => $this->get( 'public_entry_moderation', $default_settings[ 'rest_api' ] ),
 						],
 					],
 				],
 			],
 		];
 
-		return array_merge( (array) $plugins_data, [ self::SETTINGS_PLUGIN_ID => $settings ] );
+		return array_merge( (array)$plugins_data, [ self::SETTINGS_PLUGIN_ID => $settings ] );
 	}
 
 	/**
@@ -320,7 +320,7 @@ 
 	public function maybe_save_app_settings() {
 		if ( $this->is_save_postback() ) {
 			if ( ! \GVCommon::has_cap( 'gravityview_edit_settings' ) ) {
-				$_POST = []; // If you don't reset the $_POST array, it *looks* like the settings were changed, but they weren't
+				$_POST = [ ]; // If you don't reset the $_POST array, it *looks* like the settings were changed, but they weren't
 				\GFCommon::add_error_message( __( 'You don\'t have the ability to edit plugin settings.', 'gk-gravityview' ) );
 
 				return;

includes/class-gravityview-entry-approval-merge-tags.php

Spacing +24 added lines, -24 removed lines

@@ -82,7 +82,7 @@ 
 
 		$global_default = gravityview()->plugin->settings->get( 'public_entry_moderation', '0' );
 
-		$fields['restrictions']['fields'][] = array(
+		$fields[ 'restrictions' ][ 'fields' ][ ] = array(
 			'name'          => self::FORM_SETTINGS_KEY,
 			'type'          => 'radio',
 			'horizontal'    => true,
@@ -99,7 +99,7 @@ 
 					'value' => '0',
 				),
 			),
-			'default_value' => (string) $global_default,
+			'default_value' => (string)$global_default,
 		);
 
 		return $fields;
@@ -186,11 +186,11 @@ 
 
 		foreach ( $matches as $match ) {
 
-			$full_tag         = $match[0];
-			$action           = $match[1];
-			$expiration_value = ! empty( $match[2] ) ? (int) $match[2] : self::DEFAULT_EXPIRATION_VALUE;
-			$expiration_unit  = ! empty( $match[3] ) ? $match[3] : self::DEFAULT_EXPIRATION_UNIT;
-			$privacy          = isset( $match[4] ) ? $match[4] : self::DEFAULT_PRIVACY;
+			$full_tag         = $match[ 0 ];
+			$action           = $match[ 1 ];
+			$expiration_value = ! empty( $match[ 2 ] ) ? (int)$match[ 2 ] : self::DEFAULT_EXPIRATION_VALUE;
+			$expiration_unit  = ! empty( $match[ 3 ] ) ? $match[ 3 ] : self::DEFAULT_EXPIRATION_UNIT;
+			$privacy          = isset( $match[ 4 ] ) ? $match[ 4 ] : self::DEFAULT_PRIVACY;
 
 			switch ( $expiration_unit ) {
 				case 'd':
@@ -208,7 +208,7 @@ 
 					break;
 			}
 
-			if ( false === (bool) \GV\Utils::get( $form, self::FORM_SETTINGS_KEY, false ) ) {
+			if ( false === (bool)\GV\Utils::get( $form, self::FORM_SETTINGS_KEY, false ) ) {
 				$privacy = self::DEFAULT_PRIVACY;
 			}
 
@@ -247,7 +247,7 @@ 
 	 */
 	protected function get_token( $action = false, $expiration_timestamp = 0, $privacy = 'private', $entry = array() ) {
 
-		if ( ! $action || ! $entry['id'] ) {
+		if ( ! $action || ! $entry[ 'id' ] ) {
 			return false;
 		}
 
@@ -269,7 +269,7 @@ 
 		$expiration_seconds = time() - $expiration_timestamp;
 
 		$scopes = array(
-			'entry_id'           => $entry['id'],
+			'entry_id'           => $entry[ 'id' ],
 			'approval_status'    => $approval_status,
 			'expiration_seconds' => $expiration_seconds,
 			'privacy'            => $privacy,
@@ -342,8 +342,8 @@ 
 			$query_args[ self::TOKEN_URL_ARG ] = $token;
 		}
 
-		if ( DAY_IN_SECONDS >= (int) $expiration_seconds ) {
-			$query_args['nonce'] = wp_create_nonce( self::TOKEN_URL_ARG );
+		if ( DAY_IN_SECONDS >= (int)$expiration_seconds ) {
+			$query_args[ 'nonce' ] = wp_create_nonce( self::TOKEN_URL_ARG );
 		}
 
 		return add_query_arg( $query_args, $base_url );
@@ -399,10 +399,10 @@ 
 			wp_die( sprintf( __( 'Entry moderation failed: %s', 'gravityview' ), $is_request_valid->get_error_message() ) );
 		}
 
-		$scopes = $token['scopes'];
+		$scopes = $token[ 'scopes' ];
 
-		$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 );
 
@@ -412,9 +412,9 @@ 
 			wp_die( $entry->get_error_message() );
 		}
 
-		$form_id = $entry['form_id'];
+		$form_id = $entry[ 'form_id' ];
 
-		if ( self::DEFAULT_PRIVACY === $scopes['privacy'] ) {
+		if ( self::DEFAULT_PRIVACY === $scopes[ 'privacy' ] ) {
 			$return_url = admin_url( '/admin.php?page=gf_entries&s=' . $entry_id . '&field_id=entry_id&operator=is&id=' . $form_id );
 		} else {
 			$return_url = home_url( '/' );
@@ -439,7 +439,7 @@ 
 			exit;
 		}
 
-		if ( self::DEFAULT_PRIVACY === $scopes['privacy'] && ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry_id ) ) {
+		if ( self::DEFAULT_PRIVACY === $scopes[ 'privacy' ] && ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry_id ) ) {
 
 			gravityview()->log->error( 'User does not have the `gravityview_moderate_entries` capability.' );
 
@@ -462,20 +462,20 @@ 
 	 */
 	protected function is_request_valid( $token ) {
 
-		if ( self::DEFAULT_PRIVACY === $token['scopes']['privacy'] && ! is_user_logged_in() ) {
+		if ( self::DEFAULT_PRIVACY === $token[ 'scopes' ][ 'privacy' ] && ! is_user_logged_in() ) {
 			return new WP_Error( 'user_not_logged_in', __( 'You are not allowed to perform this operation.', 'gravityview' ) );
 		}
 
-		if ( $token['exp'] < time() ) {
+		if ( $token[ 'exp' ] < time() ) {
 			gravityview()->log->error( 'The entry moderation link expired.', array( 'data' => $is_valid_token ) );
 
 			return new WP_Error( 'link_expired', esc_html__( 'The link has expired.', 'gk-gravityview' ) );
 		}
 
 		// Since nonces are only valid for 24 hours, we only check the nonce if the token is valid for less than 24 hours.
-		if ( DAY_IN_SECONDS >= $token['scopes']['expiration_seconds'] ) {
+		if ( DAY_IN_SECONDS >= $token[ 'scopes' ][ 'expiration_seconds' ] ) {
 
-			if ( ! isset( $_REQUEST['nonce'] ) ) {
+			if ( ! isset( $_REQUEST[ 'nonce' ] ) ) {
 				gravityview()->log->error( 'Entry moderation failed: No nonce was set for entry approval.' );
 
 				return new WP_Error( 'missing_nonce', esc_html__( 'The link is invalid.', 'gk-gravityview' ) );
@@ -516,7 +516,7 @@ 
 			return;
 		}
 
-		$approval_label = GravityView_Entry_Approval_Status::get_label( (int) $approval_status );
+		$approval_label = GravityView_Entry_Approval_Status::get_label( (int)$approval_status );
 		$approval_label = mb_strtolower( $approval_label );
 
 		if ( 'success' === $result ) {
@@ -636,7 +636,7 @@ 
 		);
 
 		foreach ( $required_scopes as $required_scope ) {
-			if ( ! isset( $token['scopes'][ $required_scope ] ) ) {
+			if ( ! isset( $token[ 'scopes' ][ $required_scope ] ) ) {
 				return new WP_Error( 'approve_link_no_' . $required_scope . '_scope', esc_html__( 'The link is invalid.', 'gk-gravityview' ) );
 			}
 		}

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

Spacing +5 added lines, -5 removed lines

@@ -114,16 +114,16 @@ 
 		$new_value = $old_value;
 
 		// Meta value does not exist yet
-		if( false === $old_value ) {
+		if ( false === $old_value ) {
 			return self::UNAPPROVED;
 		}
 
 		// Meta value does not exist yet
-		if( true === $old_value ) {
+		if ( true === $old_value ) {
 			return self::APPROVED;
 		}
 
-		switch ( (string) $old_value ) {
+		switch ( (string)$old_value ) {
 
 			// Approved values
 			case 'Approved':
@@ -249,8 +249,8 @@ 
 		foreach ( $choices as $key => $choice ) {
 
 			// Is the passed status value the same as the choice value or key?
-			if ( $status === $choice['value'] || $status === $key ) {
-				if( 'key' === $attr_key ) {
+			if ( $status === $choice[ 'value' ] || $status === $key ) {
+				if ( 'key' === $attr_key ) {
 					return $key;
 				} else {
 					return \GV\Utils::get( $choice, $attr_key, false );