Inspection of "Fix search widget returning incorrect results when..." - gravityview/GravityView - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — develop (#1687)

unknown

created 2022-03-10 23:11 UTC

Status

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -53,7 +53,7 @@  discard block
 block discarded – undo
 		$signature_fields = GFAPI::get_fields_by_type( $form, 'signature' );
 
 		foreach ( $signature_fields as $field ) {
-			unset( $_POST["input_{$field->id}"] );
+			unset( $_POST[ "input_{$field->id}" ] );
 		}
 	}
 
@@ -72,19 +72,19 @@  discard block
 block discarded – undo
 	 */
 	function edit_entry_field_input( $field_content = '', $field = null, $value = '', $lead_id = 0, $form_id = 0 ) {
 
-		$context = function_exists('gravityview_get_context') ? gravityview_get_context() : '';
+		$context = function_exists( 'gravityview_get_context' ) ? gravityview_get_context() : '';
 
-		if( 'signature' !== $field->type || 'edit' !== $context ) {
+		if ( 'signature' !== $field->type || 'edit' !== $context ) {
 			return $field_content;
 		}
 
 		// We need to fetch a fresh version of the entry, since the saved entry hasn't refreshed in GV yet.
 		$entry = GravityView_View::getInstance()->getCurrentEntry();
-		$entry = GFAPI::get_entry( $entry['id'] );
+		$entry = GFAPI::get_entry( $entry[ 'id' ] );
 		$entry_value = \GV\Utils::get( $entry, $field->id );
 
-		$_POST["input_{$field->id}"] = $entry_value; // Used when Edit Entry form *is* submitted
-		$_POST["input_{$form_id}_{$field->id}_signature_filename"] = $entry_value; // Used when Edit Entry form *is not* submitted
+		$_POST[ "input_{$field->id}" ] = $entry_value; // Used when Edit Entry form *is* submitted
+		$_POST[ "input_{$form_id}_{$field->id}_signature_filename" ] = $entry_value; // Used when Edit Entry form *is not* submitted
 
 		return ''; // Return empty string to force using $_POST values instead
 	}

Please login to merge, or discard this patch.

includes/class-gravityview-change-entry-creator.php 1 patch

Spacing +16 added lines, -18 removed lines patch added patch discarded remove patch

@@ -83,7 +83,7 @@  discard block
 block discarded – undo
 			array(
 				'ajaxurl'  => admin_url( 'admin-ajax.php' ),
 				'action'   => 'entry_creator_get_users',
-				'gf25'    => (bool) gravityview()->plugin->is_GF_25(),
+				'gf25'    => (bool)gravityview()->plugin->is_GF_25(),
 				'language' => array(
 					'search_placeholder' => esc_html__( 'Search by ID, login, email, or name.', 'gravityview' ),
 				),
@@ -107,11 +107,11 @@  discard block
 block discarded – undo
 			)
 		);
 
-		if ( ! wp_verify_nonce( $post_var['gv_nonce'], 'gv_entry_creator' ) ) {
+		if ( ! wp_verify_nonce( $post_var[ 'gv_nonce' ], 'gv_entry_creator' ) ) {
 			die();
 		}
 
-		$search_string = $post_var['q'];
+		$search_string = $post_var[ 'q' ];
 
 		if ( is_numeric( $search_string ) ) {
 			$user_args = array(
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
 		}
 
 		// Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing
-		$result = RGFormsModel::update_entry_property( (int) $entry['id'], 'created_by', (int) $user_id, false, true );
+		$result = RGFormsModel::update_entry_property( (int)$entry[ 'id' ], 'created_by', (int)$user_id, false, true );
 
 		if ( false === $result ) {
 			$status = __( 'Error', 'gravityview' );
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
 			return;
 		}
 
-		GravityView_Entry_Notes::add_note( $entry['id'], - 1, 'GravityView', $note, 'gravityview' );
+		GravityView_Entry_Notes::add_note( $entry[ 'id' ], - 1, 'GravityView', $note, 'gravityview' );
 
 	}
 
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
 		}
 
 		// If screen mode isn't set, then we're in the wrong place.
-		if ( empty( $_REQUEST['screen_mode'] ) ) {
+		if ( empty( $_REQUEST[ 'screen_mode' ] ) ) {
 			return;
 		}
 
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
 
 		// If $_GET['screen_mode'] is set to edit, set $_POST value
 		if ( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
-			$_POST["screen_mode"] = 'edit';
+			$_POST[ "screen_mode" ] = 'edit';
 		}
 
 	}
@@ -283,16 +283,14 @@  discard block
 block discarded – undo
 				$originally_created_by_user_data = get_userdata( $originally_created_by );
 
 				$original_name = ! empty( $originally_created_by_user_data ) ?
-					sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID ) :
-					esc_attr_x( 'Deleted User', 'To show that the entry was created by a no longer existing user.', 'gravityview' );
+					sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID ) : esc_attr_x( 'Deleted User', 'To show that the entry was created by a no longer existing user.', 'gravityview' );
 			}
 
 			if ( ! empty( $created_by ) ) {
 				$created_by_user_data = get_userdata( $created_by );
 
 				$created_by_name = ! empty( $created_by_user_data ) ?
-					sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID ) :
-					esc_attr_x( 'Deleted User', 'To show that the entry was created by a no longer existing user.', 'gravityview' );
+					sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID ) : esc_attr_x( 'Deleted User', 'To show that the entry was created by a no longer existing user.', 'gravityview' );
 			}
 
 			GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __( 'Changed entry creator from %s to %s', 'gravityview' ), $original_name, $created_by_name ), 'note' );
@@ -322,7 +320,7 @@  discard block
 block discarded – undo
 		$entry_creator_user_id = \GV\Utils::get( $entry, 'created_by' );
 
 		$entry_creator_user = GVCommon::get_users( 'change_entry_creator', array( 'include' => $entry_creator_user_id ) );
-		$entry_creator_user = isset( $entry_creator_user[0] ) ? $entry_creator_user[0] : array();
+		$entry_creator_user = isset( $entry_creator_user[ 0 ] ) ? $entry_creator_user[ 0 ] : array();
 
 		$output .= '<option value="0" ' . selected( true, empty( $entry_creator_user_id ), false ) . '> &mdash; ' . esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview' ) . ' &mdash; </option>';
 
@@ -341,18 +339,18 @@  discard block
 block discarded – undo
 		}
 
 		$user_count      = count_users();
-		$user_count      = $user_count['total_users'];
+		$user_count      = $user_count[ 'total_users' ];
 		$users_displayed = self::DEFAULT_NUMBER_OF_USERS + ( ! empty( $entry_creator_user ) ? 1 : 0 );
 		if ( $user_count > $users_displayed ) {
 			$remaining_users = $user_count - $users_displayed;
-			$user_users = _n( esc_html__('user', 'gravityview' ), esc_html__('users', 'gravityview' ), $remaining_users );
+			$user_users = _n( esc_html__( 'user', 'gravityview' ), esc_html__( 'users', 'gravityview' ), $remaining_users );
 			$message = esc_html_x( 'Use the input above to search the remaining %d %s.', '%d is replaced with user count %s is replaced with "user" or "users"', 'gravityview' );
 			$message = sprintf( $message, $remaining_users, $user_users );
-			$output  .= '<option value="_user_count" disabled="disabled">' . esc_html( $message ) . '</option>';
+			$output .= '<option value="_user_count" disabled="disabled">' . esc_html( $message ) . '</option>';
 		}
 
 		$output .= '</select>';
-		$output .= '<input name="originally_created_by" value="' . esc_attr( $entry['created_by'] ) . '" type="hidden" />';
+		$output .= '<input name="originally_created_by" value="' . esc_attr( $entry[ 'created_by' ] ) . '" type="hidden" />';
 		$output .= wp_nonce_field( 'gv_entry_creator', 'gv_entry_creator_nonce', false, false );
 
 		echo $output;
@@ -366,8 +364,8 @@  discard block
 block discarded – undo
 	 * @return array
 	 */
 	function register_gform_noconflict( $assets ) {
-		$assets[] = 'gravityview_selectwoo';
-		$assets[] = 'gravityview_entry_creator';
+		$assets[ ] = 'gravityview_selectwoo';
+		$assets[ ] = 'gravityview_entry_creator';
 
 		return $assets;
 	}

Please login to merge, or discard this patch.

includes/fields/class-gravityview-field-approval.php 1 patch

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -26,7 +26,7 @@  discard block
 block discarded – undo
 
 		$this->label = esc_attr__( 'Approve Entries', 'gravityview' );
 
-		$this->description =  esc_attr__( 'Approve and reject entries from the View.', 'gravityview' );
+		$this->description = esc_attr__( 'Approve and reject entries from the View.', 'gravityview' );
 
 		$this->add_hooks();
 
@@ -48,11 +48,11 @@  discard block
 block discarded – undo
 	 */
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
 
-		unset( $field_options['only_loggedin'] );
+		unset( $field_options[ 'only_loggedin' ] );
 
-		unset( $field_options['new_window'] );
+		unset( $field_options[ 'new_window' ] );
 
-		unset( $field_options['show_as_link'] );
+		unset( $field_options[ 'show_as_link' ] );
 
 		return $field_options;
 	}
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
 
 		add_action( 'gravityview/field/approval/load_scripts', array( $this, 'enqueue_and_localize_script' ) );
 
-		add_action( 'gravityview_datatables_scripts_styles',  array( $this, 'enqueue_and_localize_script' ) );
+		add_action( 'gravityview_datatables_scripts_styles', array( $this, 'enqueue_and_localize_script' ) );
 
 		add_filter( 'gravityview_get_entries', array( $this, 'modify_search_parameters' ), 1000 );
 
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
 	public function maybe_prevent_field_render( $html, $args ) {
 
 		// If the field is `entry_approval` type but the user doesn't have the moderate entries cap, don't render.
-		if( $this->name === \GV\Utils::get( $args['field'], 'id' ) && ! GVCommon::has_cap('gravityview_moderate_entries') ) {
+		if ( $this->name === \GV\Utils::get( $args[ 'field' ], 'id' ) && ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
 			return '';
 		}
 
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
 	public function modify_search_parameters( $parameters ) {
 
 		if ( $this->name === \GV\Utils::get( $parameters, 'sorting/key' ) ) {
-			$parameters['sorting']['key'] = 'is_approved';
+			$parameters[ 'sorting' ][ 'key' ] = 'is_approved';
 		}
 
 		return $parameters;
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
 
 		$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
-		wp_register_script( 'gravityview-field-approval', GRAVITYVIEW_URL . 'assets/js/field-approval'.$script_debug.'.js', array( 'jquery' ), GravityView_Plugin::version, true );
+		wp_register_script( 'gravityview-field-approval', GRAVITYVIEW_URL . 'assets/js/field-approval' . $script_debug . '.js', array( 'jquery' ), GravityView_Plugin::version, true );
 
 		wp_register_script( 'gravityview-field-approval-popper', GRAVITYVIEW_URL . 'assets/lib/tippy/popper.min.js', array(), GravityView_Plugin::version, true );
 		wp_register_script( 'gravityview-field-approval-tippy', GRAVITYVIEW_URL . 'assets/lib/tippy/tippy.min.js', array(), GravityView_Plugin::version, true );
@@ -156,14 +156,14 @@  discard block
 block discarded – undo
 
 		$style_path = GRAVITYVIEW_DIR . 'templates/css/field-approval.css';
 
-		if( class_exists( 'GravityView_View' ) ) {
+		if ( class_exists( 'GravityView_View' ) ) {
 			/**
 			 * Override CSS file by placing in your theme's /gravityview/css/ sub-directory.
 			 */
 			$style_path = GravityView_View::getInstance()->locate_template( 'css/field-approval.css', false );
 		}
 
-		$style_url = plugins_url( 'css/field-approval.css', trailingslashit( dirname( $style_path ) )  );
+		$style_url = plugins_url( 'css/field-approval.css', trailingslashit( dirname( $style_path ) ) );
 
 		/**
 		 * @filter `gravityview/field/approval/css_url` URL to the Approval field CSS file.
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
 		 */
 		$style_url = apply_filters( 'gravityview/field/approval/css_url', $style_url );
 
-		if( ! empty( $style_url ) ) {
+		if ( ! empty( $style_url ) ) {
 			wp_register_style( 'gravityview-field-approval', $style_url, array( 'dashicons' ), GravityView_Plugin::version, 'screen' );
 		}
 
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
 	public function enqueue_and_localize_script() {
 
 		// The script is already registered and enqueued
-		if( wp_script_is( 'gravityview-field-approval', 'enqueued' ) ) {
+		if ( wp_script_is( 'gravityview-field-approval', 'enqueued' ) ) {
 			return;
 		}
 
@@ -200,11 +200,11 @@  discard block
 block discarded – undo
 
 		wp_localize_script( 'gravityview-field-approval', 'gvApproval', array(
 			'ajaxurl' => admin_url( 'admin-ajax.php' ),
-			'nonce' => wp_create_nonce('gravityview_entry_approval'),
+			'nonce' => wp_create_nonce( 'gravityview_entry_approval' ),
 			'status' => GravityView_Entry_Approval_Status::get_all(),
 			'status_popover_template' => GravityView_Entry_Approval::get_popover_template(),
 			'status_popover_placement' => GravityView_Entry_Approval::get_popover_placement(),
-		));
+		) );
 
 	}
 
@@ -221,8 +221,8 @@  discard block
 block discarded – undo
 	 */
 	public function filter_gravityview_entry_default_field( $entry_default_fields, $form, $context ) {
 
-		if ( ! isset( $entry_default_fields["{$this->name}"] ) && 'edit' !== $context ) {
-			$entry_default_fields["{$this->name}"] = array(
+		if ( ! isset( $entry_default_fields[ "{$this->name}" ] ) && 'edit' !== $context ) {
+			$entry_default_fields[ "{$this->name}" ] = array(
 				'label' => $this->label,
 				'desc'  => $this->description,
 				'type'  => $this->name,

Please login to merge, or discard this patch.

includes/fields/class-gravityview-field-address.php 1 patch

Spacing +27 added lines, -27 removed lines patch added patch discarded remove patch

@@ -74,8 +74,8 @@  discard block
 block discarded – undo
 				continue;
 			}
 
-			$field_id = intval( floor( $search_field['key'] ) );
-			$input_id = gravityview_get_input_id_from_id( $search_field['key'] );
+			$field_id = intval( floor( $search_field[ 'key' ] ) );
+			$input_id = gravityview_get_input_id_from_id( $search_field[ 'key' ] );
 			$form = GravityView_View::getInstance()->getForm();
 
 			/** @type GF_Field_Address $address_field */
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
 			$choices = array();
 
 			$method_name = 'get_choices_' . self::get_input_type_from_input_id( $input_id );
-			if( method_exists( $this, $method_name ) ) {
+			if ( method_exists( $this, $method_name ) ) {
 				/**
 				 * @uses GravityView_Field_Address::get_choices_country()
 				 * @uses GravityView_Field_Address::get_choices_state()
@@ -92,12 +92,12 @@  discard block
 block discarded – undo
 				$choices = $this->{$method_name}( $address_field, $form );
 			}
 
-			if( ! empty( $choices ) ) {
-				$search_field['choices'] = $choices;
-				$search_field['type'] = \GV\Utils::get( $search_field, 'input');
+			if ( ! empty( $choices ) ) {
+				$search_field[ 'choices' ] = $choices;
+				$search_field[ 'type' ] = \GV\Utils::get( $search_field, 'input' );
 			} else {
-				$search_field['type'] = 'text';
-				$search_field['input'] = 'input_text';
+				$search_field[ 'type' ] = 'text';
+				$search_field[ 'input' ] = 'input_text';
 			}
 		}
 
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
 		$country_choices = array();
 
 		foreach ( $countries as $key => $country ) {
-			$country_choices[] = array(
+			$country_choices[ ] = array(
 				'value' => $country,
 				'text' => $country,
 			);
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
 	 */
 	private function get_choices_state( $address_field, $form ) {
 
-		$address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form['id'] ) : $address_field->addressType;
+		$address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form[ 'id' ] ) : $address_field->addressType;
 
 		$state_choices = array();
 
@@ -159,8 +159,8 @@  discard block
 block discarded – undo
 				$states = GFCommon::get_canadian_provinces();
 				break;
 			default:
-				$address_types = $address_field->get_address_types( $form['id'] );
-				$states = empty( $address_types[ $address_type ]['states'] ) ? array() : $address_types[ $address_type ]['states'];
+				$address_types = $address_field->get_address_types( $form[ 'id' ] );
+				$states = empty( $address_types[ $address_type ][ 'states' ] ) ? array() : $address_types[ $address_type ][ 'states' ];
 				break;
 		}
 
@@ -169,19 +169,19 @@  discard block
 block discarded – undo
 				$state_subchoices = array();
 
 				foreach ( $state as $key => $substate ) {
-					$state_subchoices[] = array(
+					$state_subchoices[ ] = array(
 						'value' => is_numeric( $key ) ? $substate : $key,
 						'text' => $substate,
 					);
 				}
 
-				$state_choices[] = array(
+				$state_choices[ ] = array(
 					'text' => $key,
 					'value' => $state_subchoices,
 				);
 
 			} else {
-				$state_choices[] = array(
+				$state_choices[ ] = array(
 					'value' => is_numeric( $key ) ? $state : $key,
 					'text' => $state,
 				);
@@ -205,13 +205,13 @@  discard block
 block discarded – undo
 		// Use the same inputs as the "text" input type allows
 		$text_inputs = \GV\Utils::get( $input_types, 'text' );
 
-		$input_types['street'] = $text_inputs;
-		$input_types['street2'] = $text_inputs;
-		$input_types['city'] = $text_inputs;
+		$input_types[ 'street' ] = $text_inputs;
+		$input_types[ 'street2' ] = $text_inputs;
+		$input_types[ 'city' ] = $text_inputs;
 
-		$input_types['state'] = array( 'select', 'radio', 'link' ) + $text_inputs;
-		$input_types['zip'] = array( 'input_text' );
-		$input_types['country'] = array( 'select', 'radio', 'link' ) + $text_inputs;
+		$input_types[ 'state' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
+		$input_types[ 'zip' ] = array( 'input_text' );
+		$input_types[ 'country' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
 
 		return $input_types;
 	}
@@ -232,12 +232,12 @@  discard block
 block discarded – undo
 		// Is this search field for an input (eg: 4.2) or the whole address field (eg: 4)?
 		$input_id = gravityview_get_input_id_from_id( $field_id );
 
-		if( 'address' !== $field_type && $input_id ) {
+		if ( 'address' !== $field_type && $input_id ) {
 			return $input_type;
 		}
 
 		// If the input ID matches an expected address input, set to that. Otherwise, keep existing input type.
-		if( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
+		if ( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
 			$input_type = $address_field_name;
 		}
 
@@ -284,17 +284,17 @@  discard block
 block discarded – undo
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
 
 		// If this is NOT the full address field, return default options.
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
 			return $field_options;
 		}
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
 		$add_options = array();
 
-		$add_options['show_map_link'] = array(
+		$add_options[ 'show_map_link' ] = array(
 			'type'       => 'checkbox',
 			'label'      => __( 'Show Map Link:', 'gravityview' ),
 			'desc'       => __( 'Display a "Map It" link below the address', 'gravityview' ),
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
 			'priority'   => 98,
 		);
 
-		$add_options['show_map_link_new_window'] = array(
+		$add_options[ 'show_map_link_new_window' ] = array(
 			'type'       => 'checkbox',
 			'label'      => __( 'Open map link in a new tab or window?', 'gravityview' ),
 			'value'      => false,

Please login to merge, or discard this patch.

includes/fields/class-gravityview-field-checkbox.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -47,11 +47,11 @@  discard block
 block discarded – undo
 		$field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id );
 
 		// It's the parent field, not an input
-		if( floor( $field_id ) === floatval( $field_id ) ) {
+		if ( floor( $field_id ) === floatval( $field_id ) ) {
 			return $field_options;
 		}
 
-		if( $this->is_choice_value_enabled() ) {
+		if ( $this->is_choice_value_enabled() ) {
 
 			$desc = esc_html__( 'This input has a label and a value. What should be displayed?', 'gravityview' );
 			$default = 'value';
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
 			);
 		}
 
-		$field_options['choice_display'] = array(
+		$field_options[ 'choice_display' ] = array(
 			'type'    => 'radio',
 			'class'   => 'vertical',
 			'label'   => __( 'What should be displayed:', 'gravityview' ),

Please login to merge, or discard this patch.

trustedlogin/trustedlogin/client/src/SupportUser.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -129,7 +129,7 @@  discard block
 block discarded – undo
 
 		$user_ids = get_users( $args );
 
-		return empty( $user_ids ) ? false : (int) $user_ids[0];
+		return empty( $user_ids ) ? false : (int)$user_ids[ 0 ];
 	}
 
 	/**
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
 			return false;
 		}
 
-		if ( time() > (int) $expiration ) {
+		if ( time() > (int)$expiration ) {
 			return false;
 		}
 
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
 
 		$user = get_users( $args );
 
-		return empty( $user ) ? null : $user[0];
+		return empty( $user ) ? null : $user[ 0 ];
 	}
 
 	/**
@@ -437,7 +437,7 @@  discard block
 block discarded – undo
 		$support_users = $this->get_all();
 
 		if ( $support_users ) {
-			return $support_users[0];
+			return $support_users[ 0 ];
 		}
 
 		return null;
@@ -524,7 +524,7 @@  discard block
 block discarded – undo
 			'number'  => 1,
 		) );
 
-		$reassign_id = empty( $admins ) ? null : $admins[0]->ID;
+		$reassign_id = empty( $admins ) ? null : $admins[ 0 ]->ID;
 
 		$this->logging->log( 'Reassign user ID: ' . var_export( $reassign_id, true ), __METHOD__, 'info' );
 

Please login to merge, or discard this patch.

vendor/composer/autoload_classmap.php 2 patches

Indentation +128 added lines, -128 removed lines patch added patch discarded remove patch

@@ -6,132 +6,132 @@
 block discarded – undo
 $baseDir = dirname($vendorDir);
 
 return array(
-    'ComposerAutoloaderInitb5638313a52df4893eb45c04efdaa356' => $vendorDir . '/trustedlogin/client/vendor/composer/autoload_real.php',
-    'Composer\\Autoload\\ClassLoader' => $vendorDir . '/trustedlogin/client/vendor/composer/ClassLoader.php',
-    'Composer\\Autoload\\ComposerStaticInitb5638313a52df4893eb45c04efdaa356' => $vendorDir . '/trustedlogin/client/vendor/composer/autoload_static.php',
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
-    'Error' => $vendorDir . '/paragonie/random_compat/lib/error_polyfill.php',
-    'Katzgrau\\KLogger\\Logger' => $vendorDir . '/katzgrau/klogger/src/Logger.php',
-    'Katzgrau\\KLogger\\TrustedLogin_Logger' => $vendorDir . '/trustedlogin/client/vendor/TrustedLogin/katzgrau/klogger/src/Logger.php',
-    'LoggerTest' => $vendorDir . '/katzgrau/klogger/tests/LoggerTest.php',
-    'ParagonIE\\Sodium\\Compat' => $vendorDir . '/paragonie/sodium_compat/namespaced/Compat.php',
-    'ParagonIE\\Sodium\\Core\\BLAKE2b' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/BLAKE2b.php',
-    'ParagonIE\\Sodium\\Core\\ChaCha20' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/ChaCha20.php',
-    'ParagonIE\\Sodium\\Core\\ChaCha20\\Ctx' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/ChaCha20/Ctx.php',
-    'ParagonIE\\Sodium\\Core\\ChaCha20\\IetfCtx' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/ChaCha20/IetfCtx.php',
-    'ParagonIE\\Sodium\\Core\\Curve25519' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Curve25519.php',
-    'ParagonIE\\Sodium\\Core\\Curve25519\\Fe' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Curve25519/Fe.php',
-    'ParagonIE\\Sodium\\Core\\Curve25519\\Ge\\Cached' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/Cached.php',
-    'ParagonIE\\Sodium\\Core\\Curve25519\\Ge\\P1p1' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P1p1.php',
-    'ParagonIE\\Sodium\\Core\\Curve25519\\Ge\\P2' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P2.php',
-    'ParagonIE\\Sodium\\Core\\Curve25519\\Ge\\P3' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P3.php',
-    'ParagonIE\\Sodium\\Core\\Curve25519\\Ge\\Precomp' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/Precomp.php',
-    'ParagonIE\\Sodium\\Core\\Curve25519\\H' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Curve25519/H.php',
-    'ParagonIE\\Sodium\\Core\\Ed25519' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Ed25519.php',
-    'ParagonIE\\Sodium\\Core\\HChaCha20' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/HChaCha20.php',
-    'ParagonIE\\Sodium\\Core\\HSalsa20' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/HSalsa20.php',
-    'ParagonIE\\Sodium\\Core\\Poly1305' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Poly1305.php',
-    'ParagonIE\\Sodium\\Core\\Poly1305\\State' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Poly1305/State.php',
-    'ParagonIE\\Sodium\\Core\\Salsa20' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Salsa20.php',
-    'ParagonIE\\Sodium\\Core\\SipHash' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/SipHash.php',
-    'ParagonIE\\Sodium\\Core\\Util' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Util.php',
-    'ParagonIE\\Sodium\\Core\\X25519' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/X25519.php',
-    'ParagonIE\\Sodium\\Core\\XChaCha20' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/XChaCha20.php',
-    'ParagonIE\\Sodium\\Core\\Xsalsa20' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Xsalsa20.php',
-    'ParagonIE\\Sodium\\Crypto' => $vendorDir . '/paragonie/sodium_compat/namespaced/Crypto.php',
-    'ParagonIE\\Sodium\\File' => $vendorDir . '/paragonie/sodium_compat/namespaced/File.php',
-    'ParagonIE_Sodium_Compat' => $vendorDir . '/paragonie/sodium_compat/src/Compat.php',
-    'ParagonIE_Sodium_Core32_BLAKE2b' => $vendorDir . '/paragonie/sodium_compat/src/Core32/BLAKE2b.php',
-    'ParagonIE_Sodium_Core32_ChaCha20' => $vendorDir . '/paragonie/sodium_compat/src/Core32/ChaCha20.php',
-    'ParagonIE_Sodium_Core32_ChaCha20_Ctx' => $vendorDir . '/paragonie/sodium_compat/src/Core32/ChaCha20/Ctx.php',
-    'ParagonIE_Sodium_Core32_ChaCha20_IetfCtx' => $vendorDir . '/paragonie/sodium_compat/src/Core32/ChaCha20/IetfCtx.php',
-    'ParagonIE_Sodium_Core32_Curve25519' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Curve25519.php',
-    'ParagonIE_Sodium_Core32_Curve25519_Fe' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Curve25519/Fe.php',
-    'ParagonIE_Sodium_Core32_Curve25519_Ge_Cached' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Curve25519/Ge/Cached.php',
-    'ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P1p1.php',
-    'ParagonIE_Sodium_Core32_Curve25519_Ge_P2' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P2.php',
-    'ParagonIE_Sodium_Core32_Curve25519_Ge_P3' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P3.php',
-    'ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Curve25519/Ge/Precomp.php',
-    'ParagonIE_Sodium_Core32_Curve25519_H' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Curve25519/H.php',
-    'ParagonIE_Sodium_Core32_Ed25519' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Ed25519.php',
-    'ParagonIE_Sodium_Core32_HChaCha20' => $vendorDir . '/paragonie/sodium_compat/src/Core32/HChaCha20.php',
-    'ParagonIE_Sodium_Core32_HSalsa20' => $vendorDir . '/paragonie/sodium_compat/src/Core32/HSalsa20.php',
-    'ParagonIE_Sodium_Core32_Int32' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Int32.php',
-    'ParagonIE_Sodium_Core32_Int64' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Int64.php',
-    'ParagonIE_Sodium_Core32_Poly1305' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Poly1305.php',
-    'ParagonIE_Sodium_Core32_Poly1305_State' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Poly1305/State.php',
-    'ParagonIE_Sodium_Core32_Salsa20' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Salsa20.php',
-    'ParagonIE_Sodium_Core32_SecretStream_State' => $vendorDir . '/paragonie/sodium_compat/src/Core32/SecretStream/State.php',
-    'ParagonIE_Sodium_Core32_SipHash' => $vendorDir . '/paragonie/sodium_compat/src/Core32/SipHash.php',
-    'ParagonIE_Sodium_Core32_Util' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Util.php',
-    'ParagonIE_Sodium_Core32_X25519' => $vendorDir . '/paragonie/sodium_compat/src/Core32/X25519.php',
-    'ParagonIE_Sodium_Core32_XChaCha20' => $vendorDir . '/paragonie/sodium_compat/src/Core32/XChaCha20.php',
-    'ParagonIE_Sodium_Core32_XSalsa20' => $vendorDir . '/paragonie/sodium_compat/src/Core32/XSalsa20.php',
-    'ParagonIE_Sodium_Core_BLAKE2b' => $vendorDir . '/paragonie/sodium_compat/src/Core/BLAKE2b.php',
-    'ParagonIE_Sodium_Core_Base64_Common' => $vendorDir . '/paragonie/sodium_compat/src/Core/Base64/Common.php',
-    'ParagonIE_Sodium_Core_Base64_Original' => $vendorDir . '/paragonie/sodium_compat/src/Core/Base64/Original.php',
-    'ParagonIE_Sodium_Core_Base64_UrlSafe' => $vendorDir . '/paragonie/sodium_compat/src/Core/Base64/UrlSafe.php',
-    'ParagonIE_Sodium_Core_ChaCha20' => $vendorDir . '/paragonie/sodium_compat/src/Core/ChaCha20.php',
-    'ParagonIE_Sodium_Core_ChaCha20_Ctx' => $vendorDir . '/paragonie/sodium_compat/src/Core/ChaCha20/Ctx.php',
-    'ParagonIE_Sodium_Core_ChaCha20_IetfCtx' => $vendorDir . '/paragonie/sodium_compat/src/Core/ChaCha20/IetfCtx.php',
-    'ParagonIE_Sodium_Core_Curve25519' => $vendorDir . '/paragonie/sodium_compat/src/Core/Curve25519.php',
-    'ParagonIE_Sodium_Core_Curve25519_Fe' => $vendorDir . '/paragonie/sodium_compat/src/Core/Curve25519/Fe.php',
-    'ParagonIE_Sodium_Core_Curve25519_Ge_Cached' => $vendorDir . '/paragonie/sodium_compat/src/Core/Curve25519/Ge/Cached.php',
-    'ParagonIE_Sodium_Core_Curve25519_Ge_P1p1' => $vendorDir . '/paragonie/sodium_compat/src/Core/Curve25519/Ge/P1p1.php',
-    'ParagonIE_Sodium_Core_Curve25519_Ge_P2' => $vendorDir . '/paragonie/sodium_compat/src/Core/Curve25519/Ge/P2.php',
-    'ParagonIE_Sodium_Core_Curve25519_Ge_P3' => $vendorDir . '/paragonie/sodium_compat/src/Core/Curve25519/Ge/P3.php',
-    'ParagonIE_Sodium_Core_Curve25519_Ge_Precomp' => $vendorDir . '/paragonie/sodium_compat/src/Core/Curve25519/Ge/Precomp.php',
-    'ParagonIE_Sodium_Core_Curve25519_H' => $vendorDir . '/paragonie/sodium_compat/src/Core/Curve25519/H.php',
-    'ParagonIE_Sodium_Core_Ed25519' => $vendorDir . '/paragonie/sodium_compat/src/Core/Ed25519.php',
-    'ParagonIE_Sodium_Core_HChaCha20' => $vendorDir . '/paragonie/sodium_compat/src/Core/HChaCha20.php',
-    'ParagonIE_Sodium_Core_HSalsa20' => $vendorDir . '/paragonie/sodium_compat/src/Core/HSalsa20.php',
-    'ParagonIE_Sodium_Core_Poly1305' => $vendorDir . '/paragonie/sodium_compat/src/Core/Poly1305.php',
-    'ParagonIE_Sodium_Core_Poly1305_State' => $vendorDir . '/paragonie/sodium_compat/src/Core/Poly1305/State.php',
-    'ParagonIE_Sodium_Core_Ristretto255' => $vendorDir . '/paragonie/sodium_compat/src/Core/Ristretto255.php',
-    'ParagonIE_Sodium_Core_Salsa20' => $vendorDir . '/paragonie/sodium_compat/src/Core/Salsa20.php',
-    'ParagonIE_Sodium_Core_SecretStream_State' => $vendorDir . '/paragonie/sodium_compat/src/Core/SecretStream/State.php',
-    'ParagonIE_Sodium_Core_SipHash' => $vendorDir . '/paragonie/sodium_compat/src/Core/SipHash.php',
-    'ParagonIE_Sodium_Core_Util' => $vendorDir . '/paragonie/sodium_compat/src/Core/Util.php',
-    'ParagonIE_Sodium_Core_X25519' => $vendorDir . '/paragonie/sodium_compat/src/Core/X25519.php',
-    'ParagonIE_Sodium_Core_XChaCha20' => $vendorDir . '/paragonie/sodium_compat/src/Core/XChaCha20.php',
-    'ParagonIE_Sodium_Core_XSalsa20' => $vendorDir . '/paragonie/sodium_compat/src/Core/XSalsa20.php',
-    'ParagonIE_Sodium_Crypto' => $vendorDir . '/paragonie/sodium_compat/src/Crypto.php',
-    'ParagonIE_Sodium_Crypto32' => $vendorDir . '/paragonie/sodium_compat/src/Crypto32.php',
-    'ParagonIE_Sodium_File' => $vendorDir . '/paragonie/sodium_compat/src/File.php',
-    'Psr\\Log\\AbstractLogger' => $vendorDir . '/psr/log/Psr/Log/AbstractLogger.php',
-    'Psr\\Log\\InvalidArgumentException' => $vendorDir . '/psr/log/Psr/Log/InvalidArgumentException.php',
-    'Psr\\Log\\LogLevel' => $vendorDir . '/psr/log/Psr/Log/LogLevel.php',
-    'Psr\\Log\\LoggerAwareInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareInterface.php',
-    'Psr\\Log\\LoggerAwareTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareTrait.php',
-    'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php',
-    'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php',
-    'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
-    'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/DummyTest.php',
-    'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
-    'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php',
-    'SodiumException' => $vendorDir . '/paragonie/sodium_compat/src/SodiumException.php',
-    'SplFixedArray' => $vendorDir . '/paragonie/sodium_compat/src/PHP52/SplFixedArray.php',
-    'TrustedLoginAJAXTest' => $vendorDir . '/trustedlogin/client/tests/test-ajax.php',
-    'TrustedLoginConfigTest' => $vendorDir . '/trustedlogin/client/tests/test-config.php',
-    'TrustedLoginUsersTest' => $vendorDir . '/trustedlogin/client/tests/test-users.php',
-    'TrustedLogin\\Admin' => $vendorDir . '/trustedlogin/client/src/Admin.php',
-    'TrustedLogin\\Ajax' => $vendorDir . '/trustedlogin/client/src/Ajax.php',
-    'TrustedLogin\\Client' => $vendorDir . '/trustedlogin/client/src/Client.php',
-    'TrustedLogin\\Config' => $vendorDir . '/trustedlogin/client/src/Config.php',
-    'TrustedLogin\\Cron' => $vendorDir . '/trustedlogin/client/src/Cron.php',
-    'TrustedLogin\\Encryption' => $vendorDir . '/trustedlogin/client/src/Encryption.php',
-    'TrustedLogin\\Endpoint' => $vendorDir . '/trustedlogin/client/src/Endpoint.php',
-    'TrustedLogin\\Envelope' => $vendorDir . '/trustedlogin/client/src/Envelope.php',
-    'TrustedLogin\\Logging' => $vendorDir . '/trustedlogin/client/src/Logging.php',
-    'TrustedLogin\\Remote' => $vendorDir . '/trustedlogin/client/src/Remote.php',
-    'TrustedLogin\\SecurityChecks' => $vendorDir . '/trustedlogin/client/src/SecurityChecks.php',
-    'TrustedLogin\\SiteAccess' => $vendorDir . '/trustedlogin/client/src/SiteAccess.php',
-    'TrustedLogin\\SupportRole' => $vendorDir . '/trustedlogin/client/src/SupportRole.php',
-    'TrustedLogin\\SupportUser' => $vendorDir . '/trustedlogin/client/src/SupportUser.php',
-    'TrustedLogin\\TrustedLoginClientTest' => $vendorDir . '/trustedlogin/client/tests/test-client.php',
-    'TrustedLogin\\TrustedLoginEncryptionTest' => $vendorDir . '/trustedlogin/client/tests/test-encryption.php',
-    'TrustedLogin\\TrustedLoginLoggingTest' => $vendorDir . '/trustedlogin/client/tests/test-logging.php',
-    'TrustedLogin\\TrustedLoginRemoteTest' => $vendorDir . '/trustedlogin/client/tests/test-remote.php',
-    'TrustedLogin\\TrustedLoginSiteAccessTest' => $vendorDir . '/trustedlogin/client/tests/test-siteaccess.php',
-    'TypeError' => $vendorDir . '/paragonie/random_compat/lib/error_polyfill.php',
+	'ComposerAutoloaderInitb5638313a52df4893eb45c04efdaa356' => $vendorDir . '/trustedlogin/client/vendor/composer/autoload_real.php',
+	'Composer\\Autoload\\ClassLoader' => $vendorDir . '/trustedlogin/client/vendor/composer/ClassLoader.php',
+	'Composer\\Autoload\\ComposerStaticInitb5638313a52df4893eb45c04efdaa356' => $vendorDir . '/trustedlogin/client/vendor/composer/autoload_static.php',
+	'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
+	'Error' => $vendorDir . '/paragonie/random_compat/lib/error_polyfill.php',
+	'Katzgrau\\KLogger\\Logger' => $vendorDir . '/katzgrau/klogger/src/Logger.php',
+	'Katzgrau\\KLogger\\TrustedLogin_Logger' => $vendorDir . '/trustedlogin/client/vendor/TrustedLogin/katzgrau/klogger/src/Logger.php',
+	'LoggerTest' => $vendorDir . '/katzgrau/klogger/tests/LoggerTest.php',
+	'ParagonIE\\Sodium\\Compat' => $vendorDir . '/paragonie/sodium_compat/namespaced/Compat.php',
+	'ParagonIE\\Sodium\\Core\\BLAKE2b' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/BLAKE2b.php',
+	'ParagonIE\\Sodium\\Core\\ChaCha20' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/ChaCha20.php',
+	'ParagonIE\\Sodium\\Core\\ChaCha20\\Ctx' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/ChaCha20/Ctx.php',
+	'ParagonIE\\Sodium\\Core\\ChaCha20\\IetfCtx' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/ChaCha20/IetfCtx.php',
+	'ParagonIE\\Sodium\\Core\\Curve25519' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Curve25519.php',
+	'ParagonIE\\Sodium\\Core\\Curve25519\\Fe' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Curve25519/Fe.php',
+	'ParagonIE\\Sodium\\Core\\Curve25519\\Ge\\Cached' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/Cached.php',
+	'ParagonIE\\Sodium\\Core\\Curve25519\\Ge\\P1p1' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P1p1.php',
+	'ParagonIE\\Sodium\\Core\\Curve25519\\Ge\\P2' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P2.php',
+	'ParagonIE\\Sodium\\Core\\Curve25519\\Ge\\P3' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P3.php',
+	'ParagonIE\\Sodium\\Core\\Curve25519\\Ge\\Precomp' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/Precomp.php',
+	'ParagonIE\\Sodium\\Core\\Curve25519\\H' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Curve25519/H.php',
+	'ParagonIE\\Sodium\\Core\\Ed25519' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Ed25519.php',
+	'ParagonIE\\Sodium\\Core\\HChaCha20' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/HChaCha20.php',
+	'ParagonIE\\Sodium\\Core\\HSalsa20' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/HSalsa20.php',
+	'ParagonIE\\Sodium\\Core\\Poly1305' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Poly1305.php',
+	'ParagonIE\\Sodium\\Core\\Poly1305\\State' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Poly1305/State.php',
+	'ParagonIE\\Sodium\\Core\\Salsa20' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Salsa20.php',
+	'ParagonIE\\Sodium\\Core\\SipHash' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/SipHash.php',
+	'ParagonIE\\Sodium\\Core\\Util' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Util.php',
+	'ParagonIE\\Sodium\\Core\\X25519' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/X25519.php',
+	'ParagonIE\\Sodium\\Core\\XChaCha20' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/XChaCha20.php',
+	'ParagonIE\\Sodium\\Core\\Xsalsa20' => $vendorDir . '/paragonie/sodium_compat/namespaced/Core/Xsalsa20.php',
+	'ParagonIE\\Sodium\\Crypto' => $vendorDir . '/paragonie/sodium_compat/namespaced/Crypto.php',
+	'ParagonIE\\Sodium\\File' => $vendorDir . '/paragonie/sodium_compat/namespaced/File.php',
+	'ParagonIE_Sodium_Compat' => $vendorDir . '/paragonie/sodium_compat/src/Compat.php',
+	'ParagonIE_Sodium_Core32_BLAKE2b' => $vendorDir . '/paragonie/sodium_compat/src/Core32/BLAKE2b.php',
+	'ParagonIE_Sodium_Core32_ChaCha20' => $vendorDir . '/paragonie/sodium_compat/src/Core32/ChaCha20.php',
+	'ParagonIE_Sodium_Core32_ChaCha20_Ctx' => $vendorDir . '/paragonie/sodium_compat/src/Core32/ChaCha20/Ctx.php',
+	'ParagonIE_Sodium_Core32_ChaCha20_IetfCtx' => $vendorDir . '/paragonie/sodium_compat/src/Core32/ChaCha20/IetfCtx.php',
+	'ParagonIE_Sodium_Core32_Curve25519' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Curve25519.php',
+	'ParagonIE_Sodium_Core32_Curve25519_Fe' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Curve25519/Fe.php',
+	'ParagonIE_Sodium_Core32_Curve25519_Ge_Cached' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Curve25519/Ge/Cached.php',
+	'ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P1p1.php',
+	'ParagonIE_Sodium_Core32_Curve25519_Ge_P2' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P2.php',
+	'ParagonIE_Sodium_Core32_Curve25519_Ge_P3' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P3.php',
+	'ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Curve25519/Ge/Precomp.php',
+	'ParagonIE_Sodium_Core32_Curve25519_H' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Curve25519/H.php',
+	'ParagonIE_Sodium_Core32_Ed25519' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Ed25519.php',
+	'ParagonIE_Sodium_Core32_HChaCha20' => $vendorDir . '/paragonie/sodium_compat/src/Core32/HChaCha20.php',
+	'ParagonIE_Sodium_Core32_HSalsa20' => $vendorDir . '/paragonie/sodium_compat/src/Core32/HSalsa20.php',
+	'ParagonIE_Sodium_Core32_Int32' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Int32.php',
+	'ParagonIE_Sodium_Core32_Int64' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Int64.php',
+	'ParagonIE_Sodium_Core32_Poly1305' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Poly1305.php',
+	'ParagonIE_Sodium_Core32_Poly1305_State' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Poly1305/State.php',
+	'ParagonIE_Sodium_Core32_Salsa20' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Salsa20.php',
+	'ParagonIE_Sodium_Core32_SecretStream_State' => $vendorDir . '/paragonie/sodium_compat/src/Core32/SecretStream/State.php',
+	'ParagonIE_Sodium_Core32_SipHash' => $vendorDir . '/paragonie/sodium_compat/src/Core32/SipHash.php',
+	'ParagonIE_Sodium_Core32_Util' => $vendorDir . '/paragonie/sodium_compat/src/Core32/Util.php',
+	'ParagonIE_Sodium_Core32_X25519' => $vendorDir . '/paragonie/sodium_compat/src/Core32/X25519.php',
+	'ParagonIE_Sodium_Core32_XChaCha20' => $vendorDir . '/paragonie/sodium_compat/src/Core32/XChaCha20.php',
+	'ParagonIE_Sodium_Core32_XSalsa20' => $vendorDir . '/paragonie/sodium_compat/src/Core32/XSalsa20.php',
+	'ParagonIE_Sodium_Core_BLAKE2b' => $vendorDir . '/paragonie/sodium_compat/src/Core/BLAKE2b.php',
+	'ParagonIE_Sodium_Core_Base64_Common' => $vendorDir . '/paragonie/sodium_compat/src/Core/Base64/Common.php',
+	'ParagonIE_Sodium_Core_Base64_Original' => $vendorDir . '/paragonie/sodium_compat/src/Core/Base64/Original.php',
+	'ParagonIE_Sodium_Core_Base64_UrlSafe' => $vendorDir . '/paragonie/sodium_compat/src/Core/Base64/UrlSafe.php',
+	'ParagonIE_Sodium_Core_ChaCha20' => $vendorDir . '/paragonie/sodium_compat/src/Core/ChaCha20.php',
+	'ParagonIE_Sodium_Core_ChaCha20_Ctx' => $vendorDir . '/paragonie/sodium_compat/src/Core/ChaCha20/Ctx.php',
+	'ParagonIE_Sodium_Core_ChaCha20_IetfCtx' => $vendorDir . '/paragonie/sodium_compat/src/Core/ChaCha20/IetfCtx.php',
+	'ParagonIE_Sodium_Core_Curve25519' => $vendorDir . '/paragonie/sodium_compat/src/Core/Curve25519.php',
+	'ParagonIE_Sodium_Core_Curve25519_Fe' => $vendorDir . '/paragonie/sodium_compat/src/Core/Curve25519/Fe.php',
+	'ParagonIE_Sodium_Core_Curve25519_Ge_Cached' => $vendorDir . '/paragonie/sodium_compat/src/Core/Curve25519/Ge/Cached.php',
+	'ParagonIE_Sodium_Core_Curve25519_Ge_P1p1' => $vendorDir . '/paragonie/sodium_compat/src/Core/Curve25519/Ge/P1p1.php',
+	'ParagonIE_Sodium_Core_Curve25519_Ge_P2' => $vendorDir . '/paragonie/sodium_compat/src/Core/Curve25519/Ge/P2.php',
+	'ParagonIE_Sodium_Core_Curve25519_Ge_P3' => $vendorDir . '/paragonie/sodium_compat/src/Core/Curve25519/Ge/P3.php',
+	'ParagonIE_Sodium_Core_Curve25519_Ge_Precomp' => $vendorDir . '/paragonie/sodium_compat/src/Core/Curve25519/Ge/Precomp.php',
+	'ParagonIE_Sodium_Core_Curve25519_H' => $vendorDir . '/paragonie/sodium_compat/src/Core/Curve25519/H.php',
+	'ParagonIE_Sodium_Core_Ed25519' => $vendorDir . '/paragonie/sodium_compat/src/Core/Ed25519.php',
+	'ParagonIE_Sodium_Core_HChaCha20' => $vendorDir . '/paragonie/sodium_compat/src/Core/HChaCha20.php',
+	'ParagonIE_Sodium_Core_HSalsa20' => $vendorDir . '/paragonie/sodium_compat/src/Core/HSalsa20.php',
+	'ParagonIE_Sodium_Core_Poly1305' => $vendorDir . '/paragonie/sodium_compat/src/Core/Poly1305.php',
+	'ParagonIE_Sodium_Core_Poly1305_State' => $vendorDir . '/paragonie/sodium_compat/src/Core/Poly1305/State.php',
+	'ParagonIE_Sodium_Core_Ristretto255' => $vendorDir . '/paragonie/sodium_compat/src/Core/Ristretto255.php',
+	'ParagonIE_Sodium_Core_Salsa20' => $vendorDir . '/paragonie/sodium_compat/src/Core/Salsa20.php',
+	'ParagonIE_Sodium_Core_SecretStream_State' => $vendorDir . '/paragonie/sodium_compat/src/Core/SecretStream/State.php',
+	'ParagonIE_Sodium_Core_SipHash' => $vendorDir . '/paragonie/sodium_compat/src/Core/SipHash.php',
+	'ParagonIE_Sodium_Core_Util' => $vendorDir . '/paragonie/sodium_compat/src/Core/Util.php',
+	'ParagonIE_Sodium_Core_X25519' => $vendorDir . '/paragonie/sodium_compat/src/Core/X25519.php',
+	'ParagonIE_Sodium_Core_XChaCha20' => $vendorDir . '/paragonie/sodium_compat/src/Core/XChaCha20.php',
+	'ParagonIE_Sodium_Core_XSalsa20' => $vendorDir . '/paragonie/sodium_compat/src/Core/XSalsa20.php',
+	'ParagonIE_Sodium_Crypto' => $vendorDir . '/paragonie/sodium_compat/src/Crypto.php',
+	'ParagonIE_Sodium_Crypto32' => $vendorDir . '/paragonie/sodium_compat/src/Crypto32.php',
+	'ParagonIE_Sodium_File' => $vendorDir . '/paragonie/sodium_compat/src/File.php',
+	'Psr\\Log\\AbstractLogger' => $vendorDir . '/psr/log/Psr/Log/AbstractLogger.php',
+	'Psr\\Log\\InvalidArgumentException' => $vendorDir . '/psr/log/Psr/Log/InvalidArgumentException.php',
+	'Psr\\Log\\LogLevel' => $vendorDir . '/psr/log/Psr/Log/LogLevel.php',
+	'Psr\\Log\\LoggerAwareInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareInterface.php',
+	'Psr\\Log\\LoggerAwareTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareTrait.php',
+	'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php',
+	'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php',
+	'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
+	'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/DummyTest.php',
+	'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
+	'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php',
+	'SodiumException' => $vendorDir . '/paragonie/sodium_compat/src/SodiumException.php',
+	'SplFixedArray' => $vendorDir . '/paragonie/sodium_compat/src/PHP52/SplFixedArray.php',
+	'TrustedLoginAJAXTest' => $vendorDir . '/trustedlogin/client/tests/test-ajax.php',
+	'TrustedLoginConfigTest' => $vendorDir . '/trustedlogin/client/tests/test-config.php',
+	'TrustedLoginUsersTest' => $vendorDir . '/trustedlogin/client/tests/test-users.php',
+	'TrustedLogin\\Admin' => $vendorDir . '/trustedlogin/client/src/Admin.php',
+	'TrustedLogin\\Ajax' => $vendorDir . '/trustedlogin/client/src/Ajax.php',
+	'TrustedLogin\\Client' => $vendorDir . '/trustedlogin/client/src/Client.php',
+	'TrustedLogin\\Config' => $vendorDir . '/trustedlogin/client/src/Config.php',
+	'TrustedLogin\\Cron' => $vendorDir . '/trustedlogin/client/src/Cron.php',
+	'TrustedLogin\\Encryption' => $vendorDir . '/trustedlogin/client/src/Encryption.php',
+	'TrustedLogin\\Endpoint' => $vendorDir . '/trustedlogin/client/src/Endpoint.php',
+	'TrustedLogin\\Envelope' => $vendorDir . '/trustedlogin/client/src/Envelope.php',
+	'TrustedLogin\\Logging' => $vendorDir . '/trustedlogin/client/src/Logging.php',
+	'TrustedLogin\\Remote' => $vendorDir . '/trustedlogin/client/src/Remote.php',
+	'TrustedLogin\\SecurityChecks' => $vendorDir . '/trustedlogin/client/src/SecurityChecks.php',
+	'TrustedLogin\\SiteAccess' => $vendorDir . '/trustedlogin/client/src/SiteAccess.php',
+	'TrustedLogin\\SupportRole' => $vendorDir . '/trustedlogin/client/src/SupportRole.php',
+	'TrustedLogin\\SupportUser' => $vendorDir . '/trustedlogin/client/src/SupportUser.php',
+	'TrustedLogin\\TrustedLoginClientTest' => $vendorDir . '/trustedlogin/client/tests/test-client.php',
+	'TrustedLogin\\TrustedLoginEncryptionTest' => $vendorDir . '/trustedlogin/client/tests/test-encryption.php',
+	'TrustedLogin\\TrustedLoginLoggingTest' => $vendorDir . '/trustedlogin/client/tests/test-logging.php',
+	'TrustedLogin\\TrustedLoginRemoteTest' => $vendorDir . '/trustedlogin/client/tests/test-remote.php',
+	'TrustedLogin\\TrustedLoginSiteAccessTest' => $vendorDir . '/trustedlogin/client/tests/test-siteaccess.php',
+	'TypeError' => $vendorDir . '/paragonie/random_compat/lib/error_polyfill.php',
 );

Please login to merge, or discard this patch.

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -2,8 +2,8 @@
 block discarded – undo
 
 // autoload_classmap.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
+$vendorDir = dirname( dirname( __FILE__ ) );
+$baseDir = dirname( $vendorDir );
 
 return array(
     'ComposerAutoloaderInitb5638313a52df4893eb45c04efdaa356' => $vendorDir . '/trustedlogin/client/vendor/composer/autoload_real.php',

Please login to merge, or discard this patch.

vendor/composer/autoload_psr4.php 2 patches

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -6,8 +6,8 @@
 block discarded – undo
 $baseDir = dirname($vendorDir);
 
 return array(
-    'TrustedLogin\\' => array($baseDir . '/src', $vendorDir . '/trustedlogin/client/src'),
-    'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
-    'Katzgrau\\KLogger\\' => array($vendorDir . '/katzgrau/klogger/src'),
-    'KatzGrau\\KLogger\\' => array($baseDir . '/src'),
+	'TrustedLogin\\' => array($baseDir . '/src', $vendorDir . '/trustedlogin/client/src'),
+	'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
+	'Katzgrau\\KLogger\\' => array($vendorDir . '/katzgrau/klogger/src'),
+	'KatzGrau\\KLogger\\' => array($baseDir . '/src'),
 );

Please login to merge, or discard this patch.

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -2,12 +2,12 @@
 block discarded – undo
 
 // autoload_psr4.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
+$vendorDir = dirname( dirname( __FILE__ ) );
+$baseDir = dirname( $vendorDir );
 
 return array(
-    'TrustedLogin\\' => array($baseDir . '/src', $vendorDir . '/trustedlogin/client/src'),
-    'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
-    'Katzgrau\\KLogger\\' => array($vendorDir . '/katzgrau/klogger/src'),
-    'KatzGrau\\KLogger\\' => array($baseDir . '/src'),
+    'TrustedLogin\\' => array( $baseDir . '/src', $vendorDir . '/trustedlogin/client/src' ),
+    'Psr\\Log\\' => array( $vendorDir . '/psr/log/Psr/Log' ),
+    'Katzgrau\\KLogger\\' => array( $vendorDir . '/katzgrau/klogger/src' ),
+    'KatzGrau\\KLogger\\' => array( $baseDir . '/src' ),
 );

Please login to merge, or discard this patch.

vendor/composer/autoload_files.php 2 patches

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -6,6 +6,6 @@
 block discarded – undo
 $baseDir = dirname($vendorDir);
 
 return array(
-    '5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php',
-    '3109cb1a231dcd04bee1f9f620d46975' => $vendorDir . '/paragonie/sodium_compat/autoload.php',
+	'5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php',
+	'3109cb1a231dcd04bee1f9f620d46975' => $vendorDir . '/paragonie/sodium_compat/autoload.php',
 );

Please login to merge, or discard this patch.

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -2,8 +2,8 @@
 block discarded – undo
 
 // autoload_files.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
+$vendorDir = dirname( dirname( __FILE__ ) );
+$baseDir = dirname( $vendorDir );
 
 return array(
     '5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php',

Please login to merge, or discard this patch.

		@@ -83,7 +83,7 @@ discard block
		block discarded – undo
83	83	array(
84	84	'ajaxurl' => admin_url( 'admin-ajax.php' ),
85	85	'action' => 'entry_creator_get_users',
86		- 'gf25' => (bool) gravityview()->plugin->is_GF_25(),
	86	+ 'gf25' => (bool)gravityview()->plugin->is_GF_25(),
87	87	'language' => array(
88	88	'search_placeholder' => esc_html__( 'Search by ID, login, email, or name.', 'gravityview' ),
89	89	),
		@@ -107,11 +107,11 @@ discard block
		block discarded – undo
107	107	)
108	108	);
109	109
110		- if ( ! wp_verify_nonce( $post_var['gv_nonce'], 'gv_entry_creator' ) ) {
	110	+ if ( ! wp_verify_nonce( $post_var[ 'gv_nonce' ], 'gv_entry_creator' ) ) {
111	111	die();
112	112	}
113	113
114		- $search_string = $post_var['q'];
	114	+ $search_string = $post_var[ 'q' ];
115	115
116	116	if ( is_numeric( $search_string ) ) {
117	117	$user_args = array(
		@@ -158,7 +158,7 @@ discard block
		block discarded – undo
158	158	}
159	159
160	160	// Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing
161		- $result = RGFormsModel::update_entry_property( (int) $entry['id'], 'created_by', (int) $user_id, false, true );
	161	+ $result = RGFormsModel::update_entry_property( (int)$entry[ 'id' ], 'created_by', (int)$user_id, false, true );
162	162
163	163	if ( false === $result ) {
164	164	$status = __( 'Error', 'gravityview' );
		@@ -180,7 +180,7 @@ discard block
		block discarded – undo
180	180	return;
181	181	}
182	182
183		- GravityView_Entry_Notes::add_note( $entry['id'], - 1, 'GravityView', $note, 'gravityview' );
	183	+ GravityView_Entry_Notes::add_note( $entry[ 'id' ], - 1, 'GravityView', $note, 'gravityview' );
184	184
185	185	}
186	186
		@@ -215,7 +215,7 @@ discard block
		block discarded – undo
215	215	}
216	216
217	217	// If screen mode isn't set, then we're in the wrong place.
218		- if ( empty( $_REQUEST['screen_mode'] ) ) {
	218	+ if ( empty( $_REQUEST[ 'screen_mode' ] ) ) {
219	219	return;
220	220	}
221	221
		@@ -241,7 +241,7 @@ discard block
		block discarded – undo
241	241
242	242	// If $_GET['screen_mode'] is set to edit, set $_POST value
243	243	if ( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
244		- $_POST["screen_mode"] = 'edit';
	244	+ $_POST[ "screen_mode" ] = 'edit';
245	245	}
246	246
247	247	}
		@@ -283,16 +283,14 @@ discard block
		block discarded – undo
283	283	$originally_created_by_user_data = get_userdata( $originally_created_by );
284	284
285	285	$original_name = ! empty( $originally_created_by_user_data ) ?
286		- sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID ) :
287		- esc_attr_x( 'Deleted User', 'To show that the entry was created by a no longer existing user.', 'gravityview' );
	286	+ sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID ) : esc_attr_x( 'Deleted User', 'To show that the entry was created by a no longer existing user.', 'gravityview' );
288	287	}
289	288
290	289	if ( ! empty( $created_by ) ) {
291	290	$created_by_user_data = get_userdata( $created_by );
292	291
293	292	$created_by_name = ! empty( $created_by_user_data ) ?
294		- sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID ) :
295		- esc_attr_x( 'Deleted User', 'To show that the entry was created by a no longer existing user.', 'gravityview' );
	293	+ sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID ) : esc_attr_x( 'Deleted User', 'To show that the entry was created by a no longer existing user.', 'gravityview' );
296	294	}
297	295
298	296	GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __( 'Changed entry creator from %s to %s', 'gravityview' ), $original_name, $created_by_name ), 'note' );
		@@ -322,7 +320,7 @@ discard block
		block discarded – undo
322	320	$entry_creator_user_id = \GV\Utils::get( $entry, 'created_by' );
323	321
324	322	$entry_creator_user = GVCommon::get_users( 'change_entry_creator', array( 'include' => $entry_creator_user_id ) );
325		- $entry_creator_user = isset( $entry_creator_user[0] ) ? $entry_creator_user[0] : array();
	323	+ $entry_creator_user = isset( $entry_creator_user[ 0 ] ) ? $entry_creator_user[ 0 ] : array();
326	324
327	325	$output .= '<option value="0" ' . selected( true, empty( $entry_creator_user_id ), false ) . '> — ' . esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview' ) . ' — </option>';
328	326
		@@ -341,18 +339,18 @@ discard block
		block discarded – undo
341	339	}
342	340
343	341	$user_count = count_users();
344		- $user_count = $user_count['total_users'];
	342	+ $user_count = $user_count[ 'total_users' ];
345	343	$users_displayed = self::DEFAULT_NUMBER_OF_USERS + ( ! empty( $entry_creator_user ) ? 1 : 0 );
346	344	if ( $user_count > $users_displayed ) {
347	345	$remaining_users = $user_count - $users_displayed;
348		- $user_users = _n( esc_html__('user', 'gravityview' ), esc_html__('users', 'gravityview' ), $remaining_users );
	346	+ $user_users = _n( esc_html__( 'user', 'gravityview' ), esc_html__( 'users', 'gravityview' ), $remaining_users );
349	347	$message = esc_html_x( 'Use the input above to search the remaining %d %s.', '%d is replaced with user count %s is replaced with "user" or "users"', 'gravityview' );
350	348	$message = sprintf( $message, $remaining_users, $user_users );
351		- $output .= '<option value="_user_count" disabled="disabled">' . esc_html( $message ) . '</option>';
	349	+ $output .= '<option value="_user_count" disabled="disabled">' . esc_html( $message ) . '</option>';
352	350	}
353	351
354	352	$output .= '</select>';
355		- $output .= '<input name="originally_created_by" value="' . esc_attr( $entry['created_by'] ) . '" type="hidden" />';
	353	+ $output .= '<input name="originally_created_by" value="' . esc_attr( $entry[ 'created_by' ] ) . '" type="hidden" />';
356	354	$output .= wp_nonce_field( 'gv_entry_creator', 'gv_entry_creator_nonce', false, false );
357	355
358	356	echo $output;
		@@ -366,8 +364,8 @@ discard block
		block discarded – undo
366	364	* @return array
367	365	*/
368	366	function register_gform_noconflict( $assets ) {
369		- $assets[] = 'gravityview_selectwoo';
370		- $assets[] = 'gravityview_entry_creator';
	367	+ $assets[ ] = 'gravityview_selectwoo';
	368	+ $assets[ ] = 'gravityview_entry_creator';
371	369
372	370	return $assets;
373	371	}

		@@ -53,7 +53,7 @@ discard block
		block discarded – undo
53	53	$signature_fields = GFAPI::get_fields_by_type( $form, 'signature' );
54	54
55	55	foreach ( $signature_fields as $field ) {
56		- unset( $_POST["input_{$field->id}"] );
	56	+ unset( $_POST[ "input_{$field->id}" ] );
57	57	}
58	58	}
59	59
		@@ -72,19 +72,19 @@ discard block
		block discarded – undo
72	72	*/
73	73	function edit_entry_field_input( $field_content = '', $field = null, $value = '', $lead_id = 0, $form_id = 0 ) {
74	74
75		- $context = function_exists('gravityview_get_context') ? gravityview_get_context() : '';
	75	+ $context = function_exists( 'gravityview_get_context' ) ? gravityview_get_context() : '';
76	76
77		- if( 'signature' !== $field->type \|\| 'edit' !== $context ) {
	77	+ if ( 'signature' !== $field->type \|\| 'edit' !== $context ) {
78	78	return $field_content;
79	79	}
80	80
81	81	// We need to fetch a fresh version of the entry, since the saved entry hasn't refreshed in GV yet.
82	82	$entry = GravityView_View::getInstance()->getCurrentEntry();
83		- $entry = GFAPI::get_entry( $entry['id'] );
	83	+ $entry = GFAPI::get_entry( $entry[ 'id' ] );
84	84	$entry_value = \GV\Utils::get( $entry, $field->id );
85	85
86		- $_POST["input_{$field->id}"] = $entry_value; // Used when Edit Entry form is submitted
87		- $_POST["input_{$form_id}_{$field->id}_signature_filename"] = $entry_value; // Used when Edit Entry form is not submitted
	86	+ $_POST[ "input_{$field->id}" ] = $entry_value; // Used when Edit Entry form is submitted
	87	+ $_POST[ "input_{$form_id}_{$field->id}_signature_filename" ] = $entry_value; // Used when Edit Entry form is not submitted
88	88
89	89	return ''; // Return empty string to force using $_POST values instead
90	90	}

		@@ -26,7 +26,7 @@ discard block
		block discarded – undo
26	26
27	27	$this->label = esc_attr__( 'Approve Entries', 'gravityview' );
28	28
29		- $this->description = esc_attr__( 'Approve and reject entries from the View.', 'gravityview' );
	29	+ $this->description = esc_attr__( 'Approve and reject entries from the View.', 'gravityview' );
30	30
31	31	$this->add_hooks();
32	32
		@@ -48,11 +48,11 @@ discard block
		block discarded – undo
48	48	*/
49	49	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
50	50
51		- unset( $field_options['only_loggedin'] );
	51	+ unset( $field_options[ 'only_loggedin' ] );
52	52
53		- unset( $field_options['new_window'] );
	53	+ unset( $field_options[ 'new_window' ] );
54	54
55		- unset( $field_options['show_as_link'] );
	55	+ unset( $field_options[ 'show_as_link' ] );
56	56
57	57	return $field_options;
58	58	}
		@@ -75,7 +75,7 @@ discard block
		block discarded – undo
75	75
76	76	add_action( 'gravityview/field/approval/load_scripts', array( $this, 'enqueue_and_localize_script' ) );
77	77
78		- add_action( 'gravityview_datatables_scripts_styles', array( $this, 'enqueue_and_localize_script' ) );
	78	+ add_action( 'gravityview_datatables_scripts_styles', array( $this, 'enqueue_and_localize_script' ) );
79	79
80	80	add_filter( 'gravityview_get_entries', array( $this, 'modify_search_parameters' ), 1000 );
81	81
		@@ -97,7 +97,7 @@ discard block
		block discarded – undo
97	97	public function maybe_prevent_field_render( $html, $args ) {
98	98
99	99	// If the field is `entry_approval` type but the user doesn't have the moderate entries cap, don't render.
100		- if( $this->name === \GV\Utils::get( $args['field'], 'id' ) && ! GVCommon::has_cap('gravityview_moderate_entries') ) {
	100	+ if ( $this->name === \GV\Utils::get( $args[ 'field' ], 'id' ) && ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
101	101	return '';
102	102	}
103	103
		@@ -127,7 +127,7 @@ discard block
		block discarded – undo
127	127	public function modify_search_parameters( $parameters ) {
128	128
129	129	if ( $this->name === \GV\Utils::get( $parameters, 'sorting/key' ) ) {
130		- $parameters['sorting']['key'] = 'is_approved';
	130	+ $parameters[ 'sorting' ][ 'key' ] = 'is_approved';
131	131	}
132	132
133	133	return $parameters;
		@@ -148,7 +148,7 @@ discard block
		block discarded – undo
148	148
149	149	$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
150	150
151		- wp_register_script( 'gravityview-field-approval', GRAVITYVIEW_URL . 'assets/js/field-approval'.$script_debug.'.js', array( 'jquery' ), GravityView_Plugin::version, true );
	151	+ wp_register_script( 'gravityview-field-approval', GRAVITYVIEW_URL . 'assets/js/field-approval' . $script_debug . '.js', array( 'jquery' ), GravityView_Plugin::version, true );
152	152
153	153	wp_register_script( 'gravityview-field-approval-popper', GRAVITYVIEW_URL . 'assets/lib/tippy/popper.min.js', array(), GravityView_Plugin::version, true );
154	154	wp_register_script( 'gravityview-field-approval-tippy', GRAVITYVIEW_URL . 'assets/lib/tippy/tippy.min.js', array(), GravityView_Plugin::version, true );
		@@ -156,14 +156,14 @@ discard block
		block discarded – undo
156	156
157	157	$style_path = GRAVITYVIEW_DIR . 'templates/css/field-approval.css';
158	158
159		- if( class_exists( 'GravityView_View' ) ) {
	159	+ if ( class_exists( 'GravityView_View' ) ) {
160	160	/**
161	161	* Override CSS file by placing in your theme's /gravityview/css/ sub-directory.
162	162	*/
163	163	$style_path = GravityView_View::getInstance()->locate_template( 'css/field-approval.css', false );
164	164	}
165	165
166		- $style_url = plugins_url( 'css/field-approval.css', trailingslashit( dirname( $style_path ) ) );
	166	+ $style_url = plugins_url( 'css/field-approval.css', trailingslashit( dirname( $style_path ) ) );
167	167
168	168	/**
169	169	* @filter `gravityview/field/approval/css_url` URL to the Approval field CSS file.
		@@ -172,7 +172,7 @@ discard block
		block discarded – undo
172	172	*/
173	173	$style_url = apply_filters( 'gravityview/field/approval/css_url', $style_url );
174	174
175		- if( ! empty( $style_url ) ) {
	175	+ if ( ! empty( $style_url ) ) {
176	176	wp_register_style( 'gravityview-field-approval', $style_url, array( 'dashicons' ), GravityView_Plugin::version, 'screen' );
177	177	}
178	178
		@@ -187,7 +187,7 @@ discard block
		block discarded – undo
187	187	public function enqueue_and_localize_script() {
188	188
189	189	// The script is already registered and enqueued
190		- if( wp_script_is( 'gravityview-field-approval', 'enqueued' ) ) {
	190	+ if ( wp_script_is( 'gravityview-field-approval', 'enqueued' ) ) {
191	191	return;
192	192	}
193	193
		@@ -200,11 +200,11 @@ discard block
		block discarded – undo
200	200
201	201	wp_localize_script( 'gravityview-field-approval', 'gvApproval', array(
202	202	'ajaxurl' => admin_url( 'admin-ajax.php' ),
203		- 'nonce' => wp_create_nonce('gravityview_entry_approval'),
	203	+ 'nonce' => wp_create_nonce( 'gravityview_entry_approval' ),
204	204	'status' => GravityView_Entry_Approval_Status::get_all(),
205	205	'status_popover_template' => GravityView_Entry_Approval::get_popover_template(),
206	206	'status_popover_placement' => GravityView_Entry_Approval::get_popover_placement(),
207		- ));
	207	+ ) );
208	208
209	209	}
210	210
		@@ -221,8 +221,8 @@ discard block
		block discarded – undo
221	221	*/
222	222	public function filter_gravityview_entry_default_field( $entry_default_fields, $form, $context ) {
223	223
224		- if ( ! isset( $entry_default_fields["{$this->name}"] ) && 'edit' !== $context ) {
225		- $entry_default_fields["{$this->name}"] = array(
	224	+ if ( ! isset( $entry_default_fields[ "{$this->name}" ] ) && 'edit' !== $context ) {
	225	+ $entry_default_fields[ "{$this->name}" ] = array(
226	226	'label' => $this->label,
227	227	'desc' => $this->description,
228	228	'type' => $this->name,

		@@ -74,8 +74,8 @@ discard block
		block discarded – undo
74	74	continue;
75	75	}
76	76
77		- $field_id = intval( floor( $search_field['key'] ) );
78		- $input_id = gravityview_get_input_id_from_id( $search_field['key'] );
	77	+ $field_id = intval( floor( $search_field[ 'key' ] ) );
	78	+ $input_id = gravityview_get_input_id_from_id( $search_field[ 'key' ] );
79	79	$form = GravityView_View::getInstance()->getForm();
80	80
81	81	/** @type GF_Field_Address $address_field */
		@@ -84,7 +84,7 @@ discard block
		block discarded – undo
84	84	$choices = array();
85	85
86	86	$method_name = 'get_choices_' . self::get_input_type_from_input_id( $input_id );
87		- if( method_exists( $this, $method_name ) ) {
	87	+ if ( method_exists( $this, $method_name ) ) {
88	88	/**
89	89	* @uses GravityView_Field_Address::get_choices_country()
90	90	* @uses GravityView_Field_Address::get_choices_state()
		@@ -92,12 +92,12 @@ discard block
		block discarded – undo
92	92	$choices = $this->{$method_name}( $address_field, $form );
93	93	}
94	94
95		- if( ! empty( $choices ) ) {
96		- $search_field['choices'] = $choices;
97		- $search_field['type'] = \GV\Utils::get( $search_field, 'input');
	95	+ if ( ! empty( $choices ) ) {
	96	+ $search_field[ 'choices' ] = $choices;
	97	+ $search_field[ 'type' ] = \GV\Utils::get( $search_field, 'input' );
98	98	} else {
99		- $search_field['type'] = 'text';
100		- $search_field['input'] = 'input_text';
	99	+ $search_field[ 'type' ] = 'text';
	100	+ $search_field[ 'input' ] = 'input_text';
101	101	}
102	102	}
103	103
		@@ -122,7 +122,7 @@ discard block
		block discarded – undo
122	122	$country_choices = array();
123	123
124	124	foreach ( $countries as $key => $country ) {
125		- $country_choices[] = array(
	125	+ $country_choices[ ] = array(
126	126	'value' => $country,
127	127	'text' => $country,
128	128	);
		@@ -147,7 +147,7 @@ discard block
		block discarded – undo
147	147	*/
148	148	private function get_choices_state( $address_field, $form ) {
149	149
150		- $address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form['id'] ) : $address_field->addressType;
	150	+ $address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form[ 'id' ] ) : $address_field->addressType;
151	151
152	152	$state_choices = array();
153	153
		@@ -159,8 +159,8 @@ discard block
		block discarded – undo
159	159	$states = GFCommon::get_canadian_provinces();
160	160	break;
161	161	default:
162		- $address_types = $address_field->get_address_types( $form['id'] );
163		- $states = empty( $address_types[ $address_type ]['states'] ) ? array() : $address_types[ $address_type ]['states'];
	162	+ $address_types = $address_field->get_address_types( $form[ 'id' ] );
	163	+ $states = empty( $address_types[ $address_type ][ 'states' ] ) ? array() : $address_types[ $address_type ][ 'states' ];
164	164	break;
165	165	}
166	166
		@@ -169,19 +169,19 @@ discard block
		block discarded – undo
169	169	$state_subchoices = array();
170	170
171	171	foreach ( $state as $key => $substate ) {
172		- $state_subchoices[] = array(
	172	+ $state_subchoices[ ] = array(
173	173	'value' => is_numeric( $key ) ? $substate : $key,
174	174	'text' => $substate,
175	175	);
176	176	}
177	177
178		- $state_choices[] = array(
	178	+ $state_choices[ ] = array(
179	179	'text' => $key,
180	180	'value' => $state_subchoices,
181	181	);
182	182
183	183	} else {
184		- $state_choices[] = array(
	184	+ $state_choices[ ] = array(
185	185	'value' => is_numeric( $key ) ? $state : $key,
186	186	'text' => $state,
187	187	);
		@@ -205,13 +205,13 @@ discard block
		block discarded – undo
205	205	// Use the same inputs as the "text" input type allows
206	206	$text_inputs = \GV\Utils::get( $input_types, 'text' );
207	207
208		- $input_types['street'] = $text_inputs;
209		- $input_types['street2'] = $text_inputs;
210		- $input_types['city'] = $text_inputs;
	208	+ $input_types[ 'street' ] = $text_inputs;
	209	+ $input_types[ 'street2' ] = $text_inputs;
	210	+ $input_types[ 'city' ] = $text_inputs;
211	211
212		- $input_types['state'] = array( 'select', 'radio', 'link' ) + $text_inputs;
213		- $input_types['zip'] = array( 'input_text' );
214		- $input_types['country'] = array( 'select', 'radio', 'link' ) + $text_inputs;
	212	+ $input_types[ 'state' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
	213	+ $input_types[ 'zip' ] = array( 'input_text' );
	214	+ $input_types[ 'country' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
215	215
216	216	return $input_types;
217	217	}
		@@ -232,12 +232,12 @@ discard block
		block discarded – undo
232	232	// Is this search field for an input (eg: 4.2) or the whole address field (eg: 4)?
233	233	$input_id = gravityview_get_input_id_from_id( $field_id );
234	234
235		- if( 'address' !== $field_type && $input_id ) {
	235	+ if ( 'address' !== $field_type && $input_id ) {
236	236	return $input_type;
237	237	}
238	238
239	239	// If the input ID matches an expected address input, set to that. Otherwise, keep existing input type.
240		- if( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
	240	+ if ( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
241	241	$input_type = $address_field_name;
242	242	}
243	243
		@@ -284,17 +284,17 @@ discard block
		block discarded – undo
284	284	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
285	285
286	286	// If this is NOT the full address field, return default options.
287		- if( floor( $field_id ) !== floatval( $field_id ) ) {
	287	+ if ( floor( $field_id ) !== floatval( $field_id ) ) {
288	288	return $field_options;
289	289	}
290	290
291		- if( 'edit' === $context ) {
	291	+ if ( 'edit' === $context ) {
292	292	return $field_options;
293	293	}
294	294
295	295	$add_options = array();
296	296
297		- $add_options['show_map_link'] = array(
	297	+ $add_options[ 'show_map_link' ] = array(
298	298	'type' => 'checkbox',
299	299	'label' => __( 'Show Map Link:', 'gravityview' ),
300	300	'desc' => __( 'Display a "Map It" link below the address', 'gravityview' ),
		@@ -304,7 +304,7 @@ discard block
		block discarded – undo
304	304	'priority' => 98,
305	305	);
306	306
307		- $add_options['show_map_link_new_window'] = array(
	307	+ $add_options[ 'show_map_link_new_window' ] = array(
308	308	'type' => 'checkbox',
309	309	'label' => __( 'Open map link in a new tab or window?', 'gravityview' ),
310	310	'value' => false,

		@@ -47,11 +47,11 @@ discard block
		block discarded – undo
47	47	$field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id );
48	48
49	49	// It's the parent field, not an input
50		- if( floor( $field_id ) === floatval( $field_id ) ) {
	50	+ if ( floor( $field_id ) === floatval( $field_id ) ) {
51	51	return $field_options;
52	52	}
53	53
54		- if( $this->is_choice_value_enabled() ) {
	54	+ if ( $this->is_choice_value_enabled() ) {
55	55
56	56	$desc = esc_html__( 'This input has a label and a value. What should be displayed?', 'gravityview' );
57	57	$default = 'value';
		@@ -69,7 +69,7 @@ discard block
		block discarded – undo
69	69	);
70	70	}
71	71
72		- $field_options['choice_display'] = array(
	72	+ $field_options[ 'choice_display' ] = array(
73	73	'type' => 'radio',
74	74	'class' => 'vertical',
75	75	'label' => __( 'What should be displayed:', 'gravityview' ),

		@@ -129,7 +129,7 @@ discard block
		block discarded – undo
129	129
130	130	$user_ids = get_users( $args );
131	131
132		- return empty( $user_ids ) ? false : (int) $user_ids[0];
	132	+ return empty( $user_ids ) ? false : (int)$user_ids[ 0 ];
133	133	}
134	134
135	135	/**
		@@ -153,7 +153,7 @@ discard block
		block discarded – undo
153	153	return false;
154	154	}
155	155
156		- if ( time() > (int) $expiration ) {
	156	+ if ( time() > (int)$expiration ) {
157	157	return false;
158	158	}
159	159
		@@ -379,7 +379,7 @@ discard block
		block discarded – undo
379	379
380	380	$user = get_users( $args );
381	381
382		- return empty( $user ) ? null : $user[0];
	382	+ return empty( $user ) ? null : $user[ 0 ];
383	383	}
384	384
385	385	/**
		@@ -437,7 +437,7 @@ discard block
		block discarded – undo
437	437	$support_users = $this->get_all();
438	438
439	439	if ( $support_users ) {
440		- return $support_users[0];
	440	+ return $support_users[ 0 ];
441	441	}
442	442
443	443	return null;
		@@ -524,7 +524,7 @@ discard block
		block discarded – undo
524	524	'number' => 1,
525	525	) );
526	526
527		- $reassign_id = empty( $admins ) ? null : $admins[0]->ID;
	527	+ $reassign_id = empty( $admins ) ? null : $admins[ 0 ]->ID;
528	528
529	529	$this->logging->log( 'Reassign user ID: ' . var_export( $reassign_id, true ), __METHOD__, 'info' );
530	530

		@@ -2,8 +2,8 @@
		block discarded – undo
2	2
3	3	// autoload_classmap.php @generated by Composer
4	4
5		-$vendorDir = dirname(dirname(__FILE__));
6		-$baseDir = dirname($vendorDir);
	5	+$vendorDir = dirname( dirname( __FILE__ ) );
	6	+$baseDir = dirname( $vendorDir );
7	7
8	8	return array(
9	9	'ComposerAutoloaderInitb5638313a52df4893eb45c04efdaa356' => $vendorDir . '/trustedlogin/client/vendor/composer/autoload_real.php',

		@@ -6,8 +6,8 @@
		block discarded – undo
6	6	$baseDir = dirname($vendorDir);
7	7
8	8	return array(
9		- 'TrustedLogin\\' => array($baseDir . '/src', $vendorDir . '/trustedlogin/client/src'),
10		- 'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
11		- 'Katzgrau\\KLogger\\' => array($vendorDir . '/katzgrau/klogger/src'),
12		- 'KatzGrau\\KLogger\\' => array($baseDir . '/src'),
	9	+ 'TrustedLogin\\' => array($baseDir . '/src', $vendorDir . '/trustedlogin/client/src'),
	10	+ 'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
	11	+ 'Katzgrau\\KLogger\\' => array($vendorDir . '/katzgrau/klogger/src'),
	12	+ 'KatzGrau\\KLogger\\' => array($baseDir . '/src'),
13	13	);

		@@ -2,12 +2,12 @@
		block discarded – undo
2	2
3	3	// autoload_psr4.php @generated by Composer
4	4
5		-$vendorDir = dirname(dirname(__FILE__));
6		-$baseDir = dirname($vendorDir);
	5	+$vendorDir = dirname( dirname( __FILE__ ) );
	6	+$baseDir = dirname( $vendorDir );
7	7
8	8	return array(
9		- 'TrustedLogin\\' => array($baseDir . '/src', $vendorDir . '/trustedlogin/client/src'),
10		- 'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
11		- 'Katzgrau\\KLogger\\' => array($vendorDir . '/katzgrau/klogger/src'),
12		- 'KatzGrau\\KLogger\\' => array($baseDir . '/src'),
	9	+ 'TrustedLogin\\' => array( $baseDir . '/src', $vendorDir . '/trustedlogin/client/src' ),
	10	+ 'Psr\\Log\\' => array( $vendorDir . '/psr/log/Psr/Log' ),
	11	+ 'Katzgrau\\KLogger\\' => array( $vendorDir . '/katzgrau/klogger/src' ),
	12	+ 'KatzGrau\\KLogger\\' => array( $baseDir . '/src' ),
13	13	);

		@@ -6,6 +6,6 @@
		block discarded – undo
6	6	$baseDir = dirname($vendorDir);
7	7
8	8	return array(
9		- '5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php',
10		- '3109cb1a231dcd04bee1f9f620d46975' => $vendorDir . '/paragonie/sodium_compat/autoload.php',
	9	+ '5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php',
	10	+ '3109cb1a231dcd04bee1f9f620d46975' => $vendorDir . '/paragonie/sodium_compat/autoload.php',
11	11	);

		@@ -2,8 +2,8 @@
		block discarded – undo
2	2
3	3	// autoload_files.php @generated by Composer
4	4
5		-$vendorDir = dirname(dirname(__FILE__));
6		-$baseDir = dirname($vendorDir);
	5	+$vendorDir = dirname( dirname( __FILE__ ) );
	6	+$baseDir = dirname( $vendorDir );
7	7
8	8	return array(
9	9	'5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php',

gravityview / GravityView

Pull Request — develop (#1687)

Status

Category

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +16 added lines, -18 removed lines patch added patch discarded remove patch

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

Spacing +27 added lines, -27 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Indentation +128 added lines, -128 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch