Inspection of "Feature/1603 approve link mail" - gravityview/GravityView - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — develop (#1742)

unknown

created 2022-09-10 21:57 UTC

Status

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

@@ -13,12 +13,12 @@
 block discarded – undo
  */
 interface LoggerAwareInterface
 {
-    /**
-     * Sets a logger instance on the object.
-     *
-     * @param LoggerInterface $logger
-     *
-     * @return void
-     */
-    public function setLogger(LoggerInterface $logger);
+	/**
+	 * Sets a logger instance on the object.
+	 *
+	 * @param LoggerInterface $logger
+	 *
+	 * @return void
+	 */
+	public function setLogger(LoggerInterface $logger);
 }

Please login to merge, or discard this patch.

vendor/psr/log/Psr/Log/Test/TestLogger.php 1 patch

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

@@ -62,92 +62,92 @@
 block discarded – undo
  */
 class TestLogger extends AbstractLogger
 {
-    /**
-     * @var array
-     */
-    public $records = [];
+	/**
+	 * @var array
+	 */
+	public $records = [];
 
-    public $recordsByLevel = [];
+	public $recordsByLevel = [];
 
-    /**
-     * @inheritdoc
-     */
-    public function log($level, $message, array $context = [])
-    {
-        $record = [
-            'level' => $level,
-            'message' => $message,
-            'context' => $context,
-        ];
+	/**
+	 * @inheritdoc
+	 */
+	public function log($level, $message, array $context = [])
+	{
+		$record = [
+			'level' => $level,
+			'message' => $message,
+			'context' => $context,
+		];
 
-        $this->recordsByLevel[$record['level']][] = $record;
-        $this->records[] = $record;
-    }
+		$this->recordsByLevel[$record['level']][] = $record;
+		$this->records[] = $record;
+	}
 
-    public function hasRecords($level)
-    {
-        return isset($this->recordsByLevel[$level]);
-    }
+	public function hasRecords($level)
+	{
+		return isset($this->recordsByLevel[$level]);
+	}
 
-    public function hasRecord($record, $level)
-    {
-        if (is_string($record)) {
-            $record = ['message' => $record];
-        }
-        return $this->hasRecordThatPasses(function ($rec) use ($record) {
-            if ($rec['message'] !== $record['message']) {
-                return false;
-            }
-            if (isset($record['context']) && $rec['context'] !== $record['context']) {
-                return false;
-            }
-            return true;
-        }, $level);
-    }
+	public function hasRecord($record, $level)
+	{
+		if (is_string($record)) {
+			$record = ['message' => $record];
+		}
+		return $this->hasRecordThatPasses(function ($rec) use ($record) {
+			if ($rec['message'] !== $record['message']) {
+				return false;
+			}
+			if (isset($record['context']) && $rec['context'] !== $record['context']) {
+				return false;
+			}
+			return true;
+		}, $level);
+	}
 
-    public function hasRecordThatContains($message, $level)
-    {
-        return $this->hasRecordThatPasses(function ($rec) use ($message) {
-            return strpos($rec['message'], $message) !== false;
-        }, $level);
-    }
+	public function hasRecordThatContains($message, $level)
+	{
+		return $this->hasRecordThatPasses(function ($rec) use ($message) {
+			return strpos($rec['message'], $message) !== false;
+		}, $level);
+	}
 
-    public function hasRecordThatMatches($regex, $level)
-    {
-        return $this->hasRecordThatPasses(function ($rec) use ($regex) {
-            return preg_match($regex, $rec['message']) > 0;
-        }, $level);
-    }
+	public function hasRecordThatMatches($regex, $level)
+	{
+		return $this->hasRecordThatPasses(function ($rec) use ($regex) {
+			return preg_match($regex, $rec['message']) > 0;
+		}, $level);
+	}
 
-    public function hasRecordThatPasses(callable $predicate, $level)
-    {
-        if (!isset($this->recordsByLevel[$level])) {
-            return false;
-        }
-        foreach ($this->recordsByLevel[$level] as $i => $rec) {
-            if (call_user_func($predicate, $rec, $i)) {
-                return true;
-            }
-        }
-        return false;
-    }
+	public function hasRecordThatPasses(callable $predicate, $level)
+	{
+		if (!isset($this->recordsByLevel[$level])) {
+			return false;
+		}
+		foreach ($this->recordsByLevel[$level] as $i => $rec) {
+			if (call_user_func($predicate, $rec, $i)) {
+				return true;
+			}
+		}
+		return false;
+	}
 
-    public function __call($method, $args)
-    {
-        if (preg_match('/(.*)(Debug|Info|Notice|Warning|Error|Critical|Alert|Emergency)(.*)/', $method, $matches) > 0) {
-            $genericMethod = $matches[1] . ('Records' !== $matches[3] ? 'Record' : '') . $matches[3];
-            $level = strtolower($matches[2]);
-            if (method_exists($this, $genericMethod)) {
-                $args[] = $level;
-                return call_user_func_array([$this, $genericMethod], $args);
-            }
-        }
-        throw new \BadMethodCallException('Call to undefined method ' . get_class($this) . '::' . $method . '()');
-    }
+	public function __call($method, $args)
+	{
+		if (preg_match('/(.*)(Debug|Info|Notice|Warning|Error|Critical|Alert|Emergency)(.*)/', $method, $matches) > 0) {
+			$genericMethod = $matches[1] . ('Records' !== $matches[3] ? 'Record' : '') . $matches[3];
+			$level = strtolower($matches[2]);
+			if (method_exists($this, $genericMethod)) {
+				$args[] = $level;
+				return call_user_func_array([$this, $genericMethod], $args);
+			}
+		}
+		throw new \BadMethodCallException('Call to undefined method ' . get_class($this) . '::' . $method . '()');
+	}
 
-    public function reset()
-    {
-        $this->records = [];
-        $this->recordsByLevel = [];
-    }
+	public function reset()
+	{
+		$this->records = [];
+		$this->recordsByLevel = [];
+	}
 }

Please login to merge, or discard this patch.

vendor/psr/log/Psr/Log/Test/DummyTest.php 1 patch

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

@@ -17,8 +17,8 @@
 block discarded – undo
  */
 class DummyTest
 {
-    public function __toString()
-    {
-        return 'DummyTest';
-    }
+	public function __toString()
+	{
+		return 'DummyTest';
+	}
 }

Please login to merge, or discard this patch.

vendor/psr/log/Psr/Log/LogLevel.php 1 patch

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

@@ -13,12 +13,12 @@
 block discarded – undo
  */
 class LogLevel
 {
-    const EMERGENCY = 'emergency';
-    const ALERT     = 'alert';
-    const CRITICAL  = 'critical';
-    const ERROR     = 'error';
-    const WARNING   = 'warning';
-    const NOTICE    = 'notice';
-    const INFO      = 'info';
-    const DEBUG     = 'debug';
+	const EMERGENCY = 'emergency';
+	const ALERT     = 'alert';
+	const CRITICAL  = 'critical';
+	const ERROR     = 'error';
+	const WARNING   = 'warning';
+	const NOTICE    = 'notice';
+	const INFO      = 'info';
+	const DEBUG     = 'debug';
 }

Please login to merge, or discard this patch.

includes/class-admin-approve-entries.php 1 patch

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

@@ -250,14 +250,14 @@  discard block
 block discarded – undo
 	/**
 	 * update_approved function.
 	 *
-     * @since 1.18 Moved to GravityView_Entry_Approval::update_approved
+	 * @since 1.18 Moved to GravityView_Entry_Approval::update_approved
 	 * @see GravityView_Entry_Approval::update_approved
-     *
+	 *
 	 * @param int $entry_id (default: 0)
 	 * @param int $approved (default: 0)
 	 * @param int $form_id (default: 0)
 	 * @param int $approvedcolumn (default: 0)
-     *
+	 *
 	 * @return boolean True: It worked; False: it failed
 	 */
 	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) {
@@ -267,9 +267,9 @@  discard block
 block discarded – undo
 	/**
 	 * Calculate the approve field.input id
 	 *
-     * @since 1.18 Moved to GravityView_Entry_Approval::get_approved_column
-     * @see GravityView_Entry_Approval::get_approved_column
-     *
+	 * @since 1.18 Moved to GravityView_Entry_Approval::get_approved_column
+	 * @see GravityView_Entry_Approval::get_approved_column
+	 *
 	 * @param mixed $form GF Form or Form ID
 	 * @return false|null|string Returns the input ID of the approved field. Returns NULL if no approved fields were found. Returns false if $form_id wasn't set.
 	 */
@@ -394,37 +394,37 @@  discard block
 block discarded – undo
 			'bulk_actions' => GravityView_Bulk_Actions::get_bulk_actions( $form_id ),
 			'bulk_message' => $this->bulk_update_message,
 			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('unapproved'),
-            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
+			'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
 			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('approved'),
 			'column_title' => __( 'Show entry in directory view?', 'gravityview'),
 			'column_link' => esc_url( $this->get_sort_link() ),
-            'status_popover_template' => GravityView_Entry_Approval::get_popover_template(),
+			'status_popover_template' => GravityView_Entry_Approval::get_popover_template(),
 			'status_popover_placement' => GravityView_Entry_Approval::get_popover_placement(),
 		) );
 
 	}
 
 	/**
-     * Generate a link to sort by approval status
-     *
-     * Note: Sorting by approval will never be great because it's not possible currently to declare the sorting as
-     * numeric, but it does group the approved entries together.
-     *
-     * @since 2.0.14 Remove need for approval field for sorting by approval status
-     *
+	 * Generate a link to sort by approval status
+	 *
+	 * Note: Sorting by approval will never be great because it's not possible currently to declare the sorting as
+	 * numeric, but it does group the approved entries together.
+	 *
+	 * @since 2.0.14 Remove need for approval field for sorting by approval status
+	 *
 	 * @param int $form_id [NO LONGER USED]
 	 *
 	 * @return string Sorting link
 	 */
 	private function get_sort_link( $form_id = 0 ) {
 
-	    $args = array(
-		    'orderby' => 'is_approved',
-            'order' => ( 'desc' === \GV\Utils::_GET( 'order' ) ) ? 'asc' : 'desc',
-        );
+		$args = array(
+			'orderby' => 'is_approved',
+			'order' => ( 'desc' === \GV\Utils::_GET( 'order' ) ) ? 'asc' : 'desc',
+		);
 
 		return add_query_arg( $args );
-    }
+	}
 
 	/**
 	 * Should the Approve/Reject Entry column be shown in the GF Entries page?

Please login to merge, or discard this patch.

includes/class-admin-views.php 1 patch

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

@@ -62,28 +62,28 @@  discard block
 block discarded – undo
 	}
 
 	/**
-     * When on the Add/Edit View screen, suggest most popular articles related to that
-     *
+	 * When on the Add/Edit View screen, suggest most popular articles related to that
+	 *
 	 * @param array $localization_data Data to be passed to the Support Port JS
 	 *
 	 * @return array
 	 */
 	function suggest_support_articles( $localization_data = array() ) {
 
-	    if( ! gravityview()->request->is_view() ) {
-	        return $localization_data;
-        }
+		if( ! gravityview()->request->is_view() ) {
+			return $localization_data;
+		}
 
 		$localization_data['suggest'] = array(
-            '57ef23539033602e61d4a560',
-            '54c67bb9e4b0512429885513',
-            '54c67bb9e4b0512429885512',
-            '54c67bbbe4b07997ea3f3f6b',
-            '54d1a33ae4b086c0c0964ce9',
-            '57ef253c9033602e61d4a563',
-            '552355bfe4b0221aadf2572b',
-            '54c67bcde4b051242988553e',
-        );
+			'57ef23539033602e61d4a560',
+			'54c67bb9e4b0512429885513',
+			'54c67bb9e4b0512429885512',
+			'54c67bbbe4b07997ea3f3f6b',
+			'54d1a33ae4b086c0c0964ce9',
+			'57ef253c9033602e61d4a563',
+			'552355bfe4b0221aadf2572b',
+			'54c67bcde4b051242988553e',
+		);
 
 		return $localization_data;
 	}
@@ -229,11 +229,11 @@  discard block
 block discarded – undo
 
 		if( 'form_list' === GFForms::get_page() ) {
 			$priority = 790;
-        }
+		}
 
 		if( empty( $connected_views ) ) {
 
-		    $menu_items['gravityview'] = array(
+			$menu_items['gravityview'] = array(
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>', // Only appears in GF pre-2.5
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -265,13 +265,13 @@  discard block
 block discarded – undo
 		// If there were no items added, then let's create the parent menu
 		if( $sub_menu_items ) {
 
-		    $sub_menu_items[] = array(
-			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
-			    'icon' => '<span class="dashicons dashicons-plus"></span>',
-			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
-			    'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
-			    'capabilities'   => array( 'edit_gravityviews' ),
-            );
+			$sub_menu_items[] = array(
+				'label' => esc_attr__( 'Create a View', 'gravityview' ),
+				'icon' => '<span class="dashicons dashicons-plus"></span>',
+				'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
+				'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
+				'capabilities'   => array( 'edit_gravityviews' ),
+			);
 
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
 			$sub_menu_items[] = array(
@@ -668,16 +668,16 @@  discard block
 block discarded – undo
 	/**
 	 * Render html for displaying available fields based on a Form ID
 	 *
-     * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
+	 * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
 	 *
 	 * @param int $form Gravity Forms Form ID (default: '')
 	 * @param string $context (default: 'single')
-     *
+	 *
 	 * @return void
 	 */
 	function render_available_fields( $form = 0, $context = 'single' ) {
 
-	    // Determine if form is a preset and convert it to an array with fields
+		// Determine if form is a preset and convert it to an array with fields
 		$form = ( is_string( $form ) && preg_match( '/^preset_/', $form ) ) ? GravityView_Ajax::pre_get_form_fields( $form ) : $form;
 
 		/**
@@ -695,7 +695,7 @@  discard block
 block discarded – undo
 
 		if ( ! is_array( $blocklist_field_types ) ) {
 
-		    gravityview()->log->error( '$blocklist_field_types is not an array', array( 'data' => print_r( $blocklist_field_types, true ) ) );
+			gravityview()->log->error( '$blocklist_field_types is not an array', array( 'data' => print_r( $blocklist_field_types, true ) ) );
 
 			$blocklist_field_types = array();
 		}
@@ -953,9 +953,9 @@  discard block
 block discarded – undo
 
 				$joined_forms = gravityview_get_joined_forms( $post->ID );
 
-                foreach ( $joined_forms as $form ) {
-                    $available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
-                }
+				foreach ( $joined_forms as $form ) {
+					$available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
+				}
 			} else {
 				$available_items[ $form ] = \GV\Widget::registered();
 			}
@@ -994,9 +994,9 @@  discard block
 block discarded – undo
 
 										if ( $form_id ) {
 											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
-                                        } else {
+										} else {
 											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
-                                        }
+										}
 
 										if ( !$original_item ) {
 											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array(' data' => array('available_items' => $available_items, 'field' => $field ) ) );
@@ -1246,7 +1246,7 @@  discard block
 block discarded – undo
 		}
 
 		// Add the GV font (with the Astronaut)
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
+		wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
 
 		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
@@ -1254,46 +1254,46 @@  discard block
 block discarded – undo
 		if( GFForms::get_page() === 'form_list' ) {
 			wp_enqueue_style( 'gravityview_views_styles' );
 			return;
-        }
+		}
 
 		// Don't process any scripts below here if it's not a GravityView page.
 		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
-		    return;
+			return;
 		}
 
 		wp_enqueue_code_editor( array( 'type' => 'text/html' ) );
 
-        wp_enqueue_script( 'jquery-ui-datepicker' );
-
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
-
-        // Enqueue scripts
-        wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version );
-
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
-            'cookiepath' => COOKIEPATH,
-            'admin_cookiepath' => ADMIN_COOKIE_PATH,
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
-            'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
-            'label_viewname' => __( 'Enter View name here', 'gravityview' ),
-            'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
-            'label_add_search_field' => __( 'Add Search Field', 'gravityview' ),
-            'label_remove_search_field' => __( 'Remove Search Field', 'gravityview' ),
-            'label_close' => __( 'Close', 'gravityview' ),
-            'label_cancel' => __( 'Cancel', 'gravityview' ),
-            'label_continue' => __( 'Continue', 'gravityview' ),
-            'label_ok' => __( 'Ok', 'gravityview' ),
-            'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
-            'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
-            'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
-            'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
-            'remove_all_fields' => __( 'Would you like to remove all fields in this zone?', 'gravityview' ),
-        ));
+		wp_enqueue_script( 'jquery-ui-datepicker' );
+
+		wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
+
+		// Enqueue scripts
+		wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version );
+
+		wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
+			'cookiepath' => COOKIEPATH,
+			'admin_cookiepath' => ADMIN_COOKIE_PATH,
+			'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
+			'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
+			'label_viewname' => __( 'Enter View name here', 'gravityview' ),
+			'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
+			'label_add_search_field' => __( 'Add Search Field', 'gravityview' ),
+			'label_remove_search_field' => __( 'Remove Search Field', 'gravityview' ),
+			'label_close' => __( 'Close', 'gravityview' ),
+			'label_cancel' => __( 'Cancel', 'gravityview' ),
+			'label_continue' => __( 'Continue', 'gravityview' ),
+			'label_ok' => __( 'Ok', 'gravityview' ),
+			'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
+			'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
+			'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
+			'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
+			'remove_all_fields' => __( 'Would you like to remove all fields in this zone?', 'gravityview' ),
+		));
 
 		wp_enqueue_style( 'gravityview_views_styles' );
 
-        // Enqueue scripts needed for merge tags
-        self::enqueue_gravity_forms_scripts();
+		// Enqueue scripts needed for merge tags
+		self::enqueue_gravity_forms_scripts();
 
 		// 2.5 changed how Merge Tags are enqueued
 		if ( is_callable( array( 'GFCommon', 'output_hooks_javascript') ) ) {
@@ -1303,24 +1303,24 @@  discard block
 block discarded – undo
 
 	/**
 	 * Enqueue Gravity Forms scripts, needed for Merge Tags
-     *
-     * @since 1.0.5-beta
-     *
-     * @return void
+	 *
+	 * @since 1.0.5-beta
+	 *
+	 * @return void
 	 */
 	static function enqueue_gravity_forms_scripts() {
 		GFForms::register_scripts();
 
 		$scripts = array(
-		    'sack',
-		    'gform_gravityforms',
-		    'gform_forms',
-		    'gform_form_admin',
-		    'jquery-ui-autocomplete'
+			'sack',
+			'gform_gravityforms',
+			'gform_forms',
+			'gform_form_admin',
+			'jquery-ui-autocomplete'
 		);
 
 		if ( wp_is_mobile() ) {
-		    $scripts[] = 'jquery-touch-punch';
+			$scripts[] = 'jquery-touch-punch';
 		}
 
 		wp_enqueue_script( $scripts );

Please login to merge, or discard this patch.

includes/class-common.php 1 patch

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

@@ -316,12 +316,12 @@  discard block
 block discarded – undo
 						}
 
 						/**
-                         * @hack
-                         * In case of email/email confirmation, the input for email has the same id as the parent field
-                         */
+						 * @hack
+						 * In case of email/email confirmation, the input for email has the same id as the parent field
+						 */
 						if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) {
-                            continue;
-                        }
+							continue;
+						}
 						$fields["{$input['id']}"] = array(
 							'label' => \GV\Utils::get( $input, 'label' ),
 							'customLabel' => \GV\Utils::get( $input, 'customLabel' ),
@@ -1421,7 +1421,7 @@  discard block
 block discarded – undo
 			),
 		);
 
-        $fields = $date_created + $fields;
+		$fields = $date_created + $fields;
 
 		$blocklist_field_types = $blocklist;
 
@@ -1453,13 +1453,13 @@  discard block
 block discarded – undo
 
 		}
 
-        /**
-         * @filter `gravityview/common/sortable_fields` Filter the sortable fields
-         * @since 1.12
-         * @param array $fields Sub-set of GF form fields that are sortable
-         * @param int $formid The Gravity Forms form ID that the fields are from
-         */
-        $fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid );
+		/**
+		 * @filter `gravityview/common/sortable_fields` Filter the sortable fields
+		 * @since 1.12
+		 * @param array $fields Sub-set of GF form fields that are sortable
+		 * @param int $formid The Gravity Forms form ID that the fields are from
+		 */
+		$fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid );
 
 		return $fields;
 	}
@@ -1752,26 +1752,26 @@  discard block
 block discarded – undo
 	}
 
 
-    /**
-     * Display updated/error notice
-     *
-     * @since 1.19.2 Added $cap and $object_id parameters
-     *
-     * @param string $notice text/HTML of notice
-     * @param string $class CSS class for notice (`updated` or `error`)
-     * @param string $cap [Optional] Define a capability required to show a notice. If not set, displays to all caps.
-     *
-     * @return string
-     */
-    public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) {
-
-    	// If $cap is defined, only show notice if user has capability
-    	if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
-    		return '';
-	    }
-
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
-    }
+	/**
+	 * Display updated/error notice
+	 *
+	 * @since 1.19.2 Added $cap and $object_id parameters
+	 *
+	 * @param string $notice text/HTML of notice
+	 * @param string $class CSS class for notice (`updated` or `error`)
+	 * @param string $cap [Optional] Define a capability required to show a notice. If not set, displays to all caps.
+	 *
+	 * @return string
+	 */
+	public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) {
+
+		// If $cap is defined, only show notice if user has capability
+		if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
+			return '';
+		}
+
+		return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
+	}
 
 	/**
 	 * Inspired on \GFCommon::encode_shortcodes, reverse the encoding by replacing the ascii characters by the shortcode brackets

Please login to merge, or discard this patch.

vendor/composer/autoload_classmap.php 1 patch

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.

vendor/composer/autoload_psr4.php 1 patch

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.

		@@ -250,14 +250,14 @@ discard block
		block discarded – undo
250	250	/**
251	251	* update_approved function.
252	252	*
253		- * @since 1.18 Moved to GravityView_Entry_Approval::update_approved
	253	+ * @since 1.18 Moved to GravityView_Entry_Approval::update_approved
254	254	* @see GravityView_Entry_Approval::update_approved
255		- *
	255	+ *
256	256	* @param int $entry_id (default: 0)
257	257	* @param int $approved (default: 0)
258	258	* @param int $form_id (default: 0)
259	259	* @param int $approvedcolumn (default: 0)
260		- *
	260	+ *
261	261	* @return boolean True: It worked; False: it failed
262	262	*/
263	263	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) {
		@@ -267,9 +267,9 @@ discard block
		block discarded – undo
267	267	/**
268	268	* Calculate the approve field.input id
269	269	*
270		- * @since 1.18 Moved to GravityView_Entry_Approval::get_approved_column
271		- * @see GravityView_Entry_Approval::get_approved_column
272		- *
	270	+ * @since 1.18 Moved to GravityView_Entry_Approval::get_approved_column
	271	+ * @see GravityView_Entry_Approval::get_approved_column
	272	+ *
273	273	* @param mixed $form GF Form or Form ID
274	274	* @return false\|null\|string Returns the input ID of the approved field. Returns NULL if no approved fields were found. Returns false if $form_id wasn't set.
275	275	*/
		@@ -394,37 +394,37 @@ discard block
		block discarded – undo
394	394	'bulk_actions' => GravityView_Bulk_Actions::get_bulk_actions( $form_id ),
395	395	'bulk_message' => $this->bulk_update_message,
396	396	'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('unapproved'),
397		- 'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
	397	+ 'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
398	398	'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('approved'),
399	399	'column_title' => __( 'Show entry in directory view?', 'gravityview'),
400	400	'column_link' => esc_url( $this->get_sort_link() ),
401		- 'status_popover_template' => GravityView_Entry_Approval::get_popover_template(),
	401	+ 'status_popover_template' => GravityView_Entry_Approval::get_popover_template(),
402	402	'status_popover_placement' => GravityView_Entry_Approval::get_popover_placement(),
403	403	) );
404	404
405	405	}
406	406
407	407	/**
408		- * Generate a link to sort by approval status
409		- *
410		- * Note: Sorting by approval will never be great because it's not possible currently to declare the sorting as
411		- * numeric, but it does group the approved entries together.
412		- *
413		- * @since 2.0.14 Remove need for approval field for sorting by approval status
414		- *
	408	+ * Generate a link to sort by approval status
	409	+ *
	410	+ * Note: Sorting by approval will never be great because it's not possible currently to declare the sorting as
	411	+ * numeric, but it does group the approved entries together.
	412	+ *
	413	+ * @since 2.0.14 Remove need for approval field for sorting by approval status
	414	+ *
415	415	* @param int $form_id [NO LONGER USED]
416	416	*
417	417	* @return string Sorting link
418	418	*/
419	419	private function get_sort_link( $form_id = 0 ) {
420	420
421		- $args = array(
422		- 'orderby' => 'is_approved',
423		- 'order' => ( 'desc' === \GV\Utils::_GET( 'order' ) ) ? 'asc' : 'desc',
424		- );
	421	+ $args = array(
	422	+ 'orderby' => 'is_approved',
	423	+ 'order' => ( 'desc' === \GV\Utils::_GET( 'order' ) ) ? 'asc' : 'desc',
	424	+ );
425	425
426	426	return add_query_arg( $args );
427		- }
	427	+ }
428	428
429	429	/**
430	430	* Should the Approve/Reject Entry column be shown in the GF Entries page?

		@@ -316,12 +316,12 @@ discard block
		block discarded – undo
316	316	}
317	317
318	318	/**
319		- * @hack
320		- * In case of email/email confirmation, the input for email has the same id as the parent field
321		- */
	319	+ * @hack
	320	+ * In case of email/email confirmation, the input for email has the same id as the parent field
	321	+ */
322	322	if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) {
323		- continue;
324		- }
	323	+ continue;
	324	+ }
325	325	$fields["{$input['id']}"] = array(
326	326	'label' => \GV\Utils::get( $input, 'label' ),
327	327	'customLabel' => \GV\Utils::get( $input, 'customLabel' ),
		@@ -1421,7 +1421,7 @@ discard block
		block discarded – undo
1421	1421	),
1422	1422	);
1423	1423
1424		- $fields = $date_created + $fields;
	1424	+ $fields = $date_created + $fields;
1425	1425
1426	1426	$blocklist_field_types = $blocklist;
1427	1427
		@@ -1453,13 +1453,13 @@ discard block
		block discarded – undo
1453	1453
1454	1454	}
1455	1455
1456		- /**
1457		- * @filter `gravityview/common/sortable_fields` Filter the sortable fields
1458		- * @since 1.12
1459		- * @param array $fields Sub-set of GF form fields that are sortable
1460		- * @param int $formid The Gravity Forms form ID that the fields are from
1461		- */
1462		- $fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid );
	1456	+ /**
	1457	+ * @filter `gravityview/common/sortable_fields` Filter the sortable fields
	1458	+ * @since 1.12
	1459	+ * @param array $fields Sub-set of GF form fields that are sortable
	1460	+ * @param int $formid The Gravity Forms form ID that the fields are from
	1461	+ */
	1462	+ $fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid );
1463	1463
1464	1464	return $fields;
1465	1465	}
		@@ -1752,26 +1752,26 @@ discard block
		block discarded – undo
1752	1752	}
1753	1753
1754	1754
1755		- /**
1756		- * Display updated/error notice
1757		- *
1758		- * @since 1.19.2 Added $cap and $object_id parameters
1759		- *
1760		- * @param string $notice text/HTML of notice
1761		- * @param string $class CSS class for notice (`updated` or `error`)
1762		- * @param string $cap [Optional] Define a capability required to show a notice. If not set, displays to all caps.
1763		- *
1764		- * @return string
1765		- */
1766		- public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) {
1767		-
1768		- // If $cap is defined, only show notice if user has capability
1769		- if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
1770		- return '';
1771		- }
1772		-
1773		- return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
1774		- }
	1755	+ /**
	1756	+ * Display updated/error notice
	1757	+ *
	1758	+ * @since 1.19.2 Added $cap and $object_id parameters
	1759	+ *
	1760	+ * @param string $notice text/HTML of notice
	1761	+ * @param string $class CSS class for notice (`updated` or `error`)
	1762	+ * @param string $cap [Optional] Define a capability required to show a notice. If not set, displays to all caps.
	1763	+ *
	1764	+ * @return string
	1765	+ */
	1766	+ public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) {
	1767	+
	1768	+ // If $cap is defined, only show notice if user has capability
	1769	+ if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
	1770	+ return '';
	1771	+ }
	1772	+
	1773	+ return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
	1774	+ }
1775	1775
1776	1776	/**
1777	1777	* Inspired on \GFCommon::encode_shortcodes, reverse the encoding by replacing the ascii characters by the shortcode brackets

		@@ -13,12 +13,12 @@
		block discarded – undo
13	13	*/
14	14	interface LoggerAwareInterface
15	15	{
16		- /**
17		- * Sets a logger instance on the object.
18		- *
19		- * @param LoggerInterface $logger
20		- *
21		- * @return void
22		- */
23		- public function setLogger(LoggerInterface $logger);
	16	+ /**
	17	+ * Sets a logger instance on the object.
	18	+ *
	19	+ * @param LoggerInterface $logger
	20	+ *
	21	+ * @return void
	22	+ */
	23	+ public function setLogger(LoggerInterface $logger);
24	24	}

		@@ -62,92 +62,92 @@
		block discarded – undo
62	62	*/
63	63	class TestLogger extends AbstractLogger
64	64	{
65		- /**
66		- * @var array
67		- */
68		- public $records = [];
	65	+ /**
	66	+ * @var array
	67	+ */
	68	+ public $records = [];
69	69
70		- public $recordsByLevel = [];
	70	+ public $recordsByLevel = [];
71	71
72		- /**
73		- * @inheritdoc
74		- */
75		- public function log($level, $message, array $context = [])
76		- {
77		- $record = [
78		- 'level' => $level,
79		- 'message' => $message,
80		- 'context' => $context,
81		- ];
	72	+ /**
	73	+ * @inheritdoc
	74	+ */
	75	+ public function log($level, $message, array $context = [])
	76	+ {
	77	+ $record = [
	78	+ 'level' => $level,
	79	+ 'message' => $message,
	80	+ 'context' => $context,
	81	+ ];
82	82
83		- $this->recordsByLevel[$record['level']][] = $record;
84		- $this->records[] = $record;
85		- }
	83	+ $this->recordsByLevel[$record['level']][] = $record;
	84	+ $this->records[] = $record;
	85	+ }
86	86
87		- public function hasRecords($level)
88		- {
89		- return isset($this->recordsByLevel[$level]);
90		- }
	87	+ public function hasRecords($level)
	88	+ {
	89	+ return isset($this->recordsByLevel[$level]);
	90	+ }
91	91
92		- public function hasRecord($record, $level)
93		- {
94		- if (is_string($record)) {
95		- $record = ['message' => $record];
96		- }
97		- return $this->hasRecordThatPasses(function ($rec) use ($record) {
98		- if ($rec['message'] !== $record['message']) {
99		- return false;
100		- }
101		- if (isset($record['context']) && $rec['context'] !== $record['context']) {
102		- return false;
103		- }
104		- return true;
105		- }, $level);
106		- }
	92	+ public function hasRecord($record, $level)
	93	+ {
	94	+ if (is_string($record)) {
	95	+ $record = ['message' => $record];
	96	+ }
	97	+ return $this->hasRecordThatPasses(function ($rec) use ($record) {
	98	+ if ($rec['message'] !== $record['message']) {
	99	+ return false;
	100	+ }
	101	+ if (isset($record['context']) && $rec['context'] !== $record['context']) {
	102	+ return false;
	103	+ }
	104	+ return true;
	105	+ }, $level);
	106	+ }
107	107
108		- public function hasRecordThatContains($message, $level)
109		- {
110		- return $this->hasRecordThatPasses(function ($rec) use ($message) {
111		- return strpos($rec['message'], $message) !== false;
112		- }, $level);
113		- }
	108	+ public function hasRecordThatContains($message, $level)
	109	+ {
	110	+ return $this->hasRecordThatPasses(function ($rec) use ($message) {
	111	+ return strpos($rec['message'], $message) !== false;
	112	+ }, $level);
	113	+ }
114	114
115		- public function hasRecordThatMatches($regex, $level)
116		- {
117		- return $this->hasRecordThatPasses(function ($rec) use ($regex) {
118		- return preg_match($regex, $rec['message']) > 0;
119		- }, $level);
120		- }
	115	+ public function hasRecordThatMatches($regex, $level)
	116	+ {
	117	+ return $this->hasRecordThatPasses(function ($rec) use ($regex) {
	118	+ return preg_match($regex, $rec['message']) > 0;
	119	+ }, $level);
	120	+ }
121	121
122		- public function hasRecordThatPasses(callable $predicate, $level)
123		- {
124		- if (!isset($this->recordsByLevel[$level])) {
125		- return false;
126		- }
127		- foreach ($this->recordsByLevel[$level] as $i => $rec) {
128		- if (call_user_func($predicate, $rec, $i)) {
129		- return true;
130		- }
131		- }
132		- return false;
133		- }
	122	+ public function hasRecordThatPasses(callable $predicate, $level)
	123	+ {
	124	+ if (!isset($this->recordsByLevel[$level])) {
	125	+ return false;
	126	+ }
	127	+ foreach ($this->recordsByLevel[$level] as $i => $rec) {
	128	+ if (call_user_func($predicate, $rec, $i)) {
	129	+ return true;
	130	+ }
	131	+ }
	132	+ return false;
	133	+ }
134	134
135		- public function __call($method, $args)
136		- {
137		- if (preg_match('/(.)(Debug\|Info\|Notice\|Warning\|Error\|Critical\|Alert\|Emergency)(.)/', $method, $matches) > 0) {
138		- $genericMethod = $matches[1] . ('Records' !== $matches[3] ? 'Record' : '') . $matches[3];
139		- $level = strtolower($matches[2]);
140		- if (method_exists($this, $genericMethod)) {
141		- $args[] = $level;
142		- return call_user_func_array([$this, $genericMethod], $args);
143		- }
144		- }
145		- throw new \BadMethodCallException('Call to undefined method ' . get_class($this) . '::' . $method . '()');
146		- }
	135	+ public function __call($method, $args)
	136	+ {
	137	+ if (preg_match('/(.)(Debug\|Info\|Notice\|Warning\|Error\|Critical\|Alert\|Emergency)(.)/', $method, $matches) > 0) {
	138	+ $genericMethod = $matches[1] . ('Records' !== $matches[3] ? 'Record' : '') . $matches[3];
	139	+ $level = strtolower($matches[2]);
	140	+ if (method_exists($this, $genericMethod)) {
	141	+ $args[] = $level;
	142	+ return call_user_func_array([$this, $genericMethod], $args);
	143	+ }
	144	+ }
	145	+ throw new \BadMethodCallException('Call to undefined method ' . get_class($this) . '::' . $method . '()');
	146	+ }
147	147
148		- public function reset()
149		- {
150		- $this->records = [];
151		- $this->recordsByLevel = [];
152		- }
	148	+ public function reset()
	149	+ {
	150	+ $this->records = [];
	151	+ $this->recordsByLevel = [];
	152	+ }
153	153	}

		@@ -17,8 +17,8 @@
		block discarded – undo
17	17	*/
18	18	class DummyTest
19	19	{
20		- public function __toString()
21		- {
22		- return 'DummyTest';
23		- }
	20	+ public function __toString()
	21	+ {
	22	+ return 'DummyTest';
	23	+ }
24	24	}

		@@ -13,12 +13,12 @@
		block discarded – undo
13	13	*/
14	14	class LogLevel
15	15	{
16		- const EMERGENCY = 'emergency';
17		- const ALERT = 'alert';
18		- const CRITICAL = 'critical';
19		- const ERROR = 'error';
20		- const WARNING = 'warning';
21		- const NOTICE = 'notice';
22		- const INFO = 'info';
23		- const DEBUG = 'debug';
	16	+ const EMERGENCY = 'emergency';
	17	+ const ALERT = 'alert';
	18	+ const CRITICAL = 'critical';
	19	+ const ERROR = 'error';
	20	+ const WARNING = 'warning';
	21	+ const NOTICE = 'notice';
	22	+ const INFO = 'info';
	23	+ const DEBUG = 'debug';
24	24	}

		@@ -62,28 +62,28 @@ discard block
		block discarded – undo
62	62	}
63	63
64	64	/**
65		- * When on the Add/Edit View screen, suggest most popular articles related to that
66		- *
	65	+ * When on the Add/Edit View screen, suggest most popular articles related to that
	66	+ *
67	67	* @param array $localization_data Data to be passed to the Support Port JS
68	68	*
69	69	* @return array
70	70	*/
71	71	function suggest_support_articles( $localization_data = array() ) {
72	72
73		- if( ! gravityview()->request->is_view() ) {
74		- return $localization_data;
75		- }
	73	+ if( ! gravityview()->request->is_view() ) {
	74	+ return $localization_data;
	75	+ }
76	76
77	77	$localization_data['suggest'] = array(
78		- '57ef23539033602e61d4a560',
79		- '54c67bb9e4b0512429885513',
80		- '54c67bb9e4b0512429885512',
81		- '54c67bbbe4b07997ea3f3f6b',
82		- '54d1a33ae4b086c0c0964ce9',
83		- '57ef253c9033602e61d4a563',
84		- '552355bfe4b0221aadf2572b',
85		- '54c67bcde4b051242988553e',
86		- );
	78	+ '57ef23539033602e61d4a560',
	79	+ '54c67bb9e4b0512429885513',
	80	+ '54c67bb9e4b0512429885512',
	81	+ '54c67bbbe4b07997ea3f3f6b',
	82	+ '54d1a33ae4b086c0c0964ce9',
	83	+ '57ef253c9033602e61d4a563',
	84	+ '552355bfe4b0221aadf2572b',
	85	+ '54c67bcde4b051242988553e',
	86	+ );
87	87
88	88	return $localization_data;
89	89	}
		@@ -229,11 +229,11 @@ discard block
		block discarded – undo
229	229
230	230	if( 'form_list' === GFForms::get_page() ) {
231	231	$priority = 790;
232		- }
	232	+ }
233	233
234	234	if( empty( $connected_views ) ) {
235	235
236		- $menu_items['gravityview'] = array(
	236	+ $menu_items['gravityview'] = array(
237	237	'label' => esc_attr__( 'Create a View', 'gravityview' ),
238	238	'icon' => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>', // Only appears in GF pre-2.5
239	239	'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
		@@ -265,13 +265,13 @@ discard block
		block discarded – undo
265	265	// If there were no items added, then let's create the parent menu
266	266	if( $sub_menu_items ) {
267	267
268		- $sub_menu_items[] = array(
269		- 'label' => esc_attr__( 'Create a View', 'gravityview' ),
270		- 'icon' => '<span class="dashicons dashicons-plus"></span>',
271		- 'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
272		- 'url' => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
273		- 'capabilities' => array( 'edit_gravityviews' ),
274		- );
	268	+ $sub_menu_items[] = array(
	269	+ 'label' => esc_attr__( 'Create a View', 'gravityview' ),
	270	+ 'icon' => '<span class="dashicons dashicons-plus"></span>',
	271	+ 'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
	272	+ 'url' => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
	273	+ 'capabilities' => array( 'edit_gravityviews' ),
	274	+ );
275	275
276	276	// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
277	277	$sub_menu_items[] = array(
		@@ -668,16 +668,16 @@ discard block
		block discarded – undo
668	668	/**
669	669	* Render html for displaying available fields based on a Form ID
670	670	*
671		- * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
	671	+ * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
672	672	*
673	673	* @param int $form Gravity Forms Form ID (default: '')
674	674	* @param string $context (default: 'single')
675		- *
	675	+ *
676	676	* @return void
677	677	*/
678	678	function render_available_fields( $form = 0, $context = 'single' ) {
679	679
680		- // Determine if form is a preset and convert it to an array with fields
	680	+ // Determine if form is a preset and convert it to an array with fields
681	681	$form = ( is_string( $form ) && preg_match( '/^preset_/', $form ) ) ? GravityView_Ajax::pre_get_form_fields( $form ) : $form;
682	682
683	683	/**
		@@ -695,7 +695,7 @@ discard block
		block discarded – undo
695	695
696	696	if ( ! is_array( $blocklist_field_types ) ) {
697	697
698		- gravityview()->log->error( '$blocklist_field_types is not an array', array( 'data' => print_r( $blocklist_field_types, true ) ) );
	698	+ gravityview()->log->error( '$blocklist_field_types is not an array', array( 'data' => print_r( $blocklist_field_types, true ) ) );
699	699
700	700	$blocklist_field_types = array();
701	701	}
		@@ -953,9 +953,9 @@ discard block
		block discarded – undo
953	953
954	954	$joined_forms = gravityview_get_joined_forms( $post->ID );
955	955
956		- foreach ( $joined_forms as $form ) {
957		- $available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
958		- }
	956	+ foreach ( $joined_forms as $form ) {
	957	+ $available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
	958	+ }
959	959	} else {
960	960	$available_items[ $form ] = \GV\Widget::registered();
961	961	}
		@@ -994,9 +994,9 @@ discard block
		block discarded – undo
994	994
995	995	if ( $form_id ) {
996	996	$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
997		- } else {
	997	+ } else {
998	998	$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
999		- }
	999	+ }
1000	1000
1001	1001	if ( !$original_item ) {
1002	1002	gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array(' data' => array('available_items' => $available_items, 'field' => $field ) ) );
		@@ -1246,7 +1246,7 @@ discard block
		block discarded – undo
1246	1246	}
1247	1247
1248	1248	// Add the GV font (with the Astronaut)
1249		- wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
	1249	+ wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1250	1250	wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
1251	1251
1252	1252	wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
		@@ -1254,46 +1254,46 @@ discard block
		block discarded – undo
1254	1254	if( GFForms::get_page() === 'form_list' ) {
1255	1255	wp_enqueue_style( 'gravityview_views_styles' );
1256	1256	return;
1257		- }
	1257	+ }
1258	1258
1259	1259	// Don't process any scripts below here if it's not a GravityView page.
1260	1260	if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1261		- return;
	1261	+ return;
1262	1262	}
1263	1263
1264	1264	wp_enqueue_code_editor( array( 'type' => 'text/html' ) );
1265	1265
1266		- wp_enqueue_script( 'jquery-ui-datepicker' );
1267		-
1268		- wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1269		-
1270		- // Enqueue scripts
1271		- wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version );
1272		-
1273		- wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1274		- 'cookiepath' => COOKIEPATH,
1275		- 'admin_cookiepath' => ADMIN_COOKIE_PATH,
1276		- 'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1277		- 'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1278		- 'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1279		- 'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
1280		- 'label_add_search_field' => __( 'Add Search Field', 'gravityview' ),
1281		- 'label_remove_search_field' => __( 'Remove Search Field', 'gravityview' ),
1282		- 'label_close' => __( 'Close', 'gravityview' ),
1283		- 'label_cancel' => __( 'Cancel', 'gravityview' ),
1284		- 'label_continue' => __( 'Continue', 'gravityview' ),
1285		- 'label_ok' => __( 'Ok', 'gravityview' ),
1286		- 'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1287		- 'loading_text' => esc_html__( 'Loading…', 'gravityview' ),
1288		- 'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1289		- 'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1290		- 'remove_all_fields' => __( 'Would you like to remove all fields in this zone?', 'gravityview' ),
1291		- ));
	1266	+ wp_enqueue_script( 'jquery-ui-datepicker' );
	1267	+
	1268	+ wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
	1269	+
	1270	+ // Enqueue scripts
	1271	+ wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version );
	1272	+
	1273	+ wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
	1274	+ 'cookiepath' => COOKIEPATH,
	1275	+ 'admin_cookiepath' => ADMIN_COOKIE_PATH,
	1276	+ 'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
	1277	+ 'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
	1278	+ 'label_viewname' => __( 'Enter View name here', 'gravityview' ),
	1279	+ 'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
	1280	+ 'label_add_search_field' => __( 'Add Search Field', 'gravityview' ),
	1281	+ 'label_remove_search_field' => __( 'Remove Search Field', 'gravityview' ),
	1282	+ 'label_close' => __( 'Close', 'gravityview' ),
	1283	+ 'label_cancel' => __( 'Cancel', 'gravityview' ),
	1284	+ 'label_continue' => __( 'Continue', 'gravityview' ),
	1285	+ 'label_ok' => __( 'Ok', 'gravityview' ),
	1286	+ 'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
	1287	+ 'loading_text' => esc_html__( 'Loading…', 'gravityview' ),
	1288	+ 'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
	1289	+ 'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
	1290	+ 'remove_all_fields' => __( 'Would you like to remove all fields in this zone?', 'gravityview' ),
	1291	+ ));
1292	1292
1293	1293	wp_enqueue_style( 'gravityview_views_styles' );
1294	1294
1295		- // Enqueue scripts needed for merge tags
1296		- self::enqueue_gravity_forms_scripts();
	1295	+ // Enqueue scripts needed for merge tags
	1296	+ self::enqueue_gravity_forms_scripts();
1297	1297
1298	1298	// 2.5 changed how Merge Tags are enqueued
1299	1299	if ( is_callable( array( 'GFCommon', 'output_hooks_javascript') ) ) {
		@@ -1303,24 +1303,24 @@ discard block
		block discarded – undo
1303	1303
1304	1304	/**
1305	1305	* Enqueue Gravity Forms scripts, needed for Merge Tags
1306		- *
1307		- * @since 1.0.5-beta
1308		- *
1309		- * @return void
	1306	+ *
	1307	+ * @since 1.0.5-beta
	1308	+ *
	1309	+ * @return void
1310	1310	*/
1311	1311	static function enqueue_gravity_forms_scripts() {
1312	1312	GFForms::register_scripts();
1313	1313
1314	1314	$scripts = array(
1315		- 'sack',
1316		- 'gform_gravityforms',
1317		- 'gform_forms',
1318		- 'gform_form_admin',
1319		- 'jquery-ui-autocomplete'
	1315	+ 'sack',
	1316	+ 'gform_gravityforms',
	1317	+ 'gform_forms',
	1318	+ 'gform_form_admin',
	1319	+ 'jquery-ui-autocomplete'
1320	1320	);
1321	1321
1322	1322	if ( wp_is_mobile() ) {
1323		- $scripts[] = 'jquery-touch-punch';
	1323	+ $scripts[] = 'jquery-touch-punch';
1324	1324	}
1325	1325
1326	1326	wp_enqueue_script( $scripts );

		@@ -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	);

gravityview / GravityView

Pull Request — develop (#1742)

Status

Category

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

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

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

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

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

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

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

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

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