gravityview / GravityView

includes/class-ajax.php

Doc Comments +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
 	 * @since 1.15
 	 * @param bool|false $mixed
 	 *
-	 * @return bool
+	 * @return boolean|null
 	 */
 	private function _exit( $mixed = NULL ) {
 
@@ -200,7 +200,7 @@ 
 	 * Import Gravity Form XML or JSON
 	 *
 	 * @param  string $xml_or_json_path Path to form XML or JSON file
-	 * @return int|bool       Imported form ID or false
+	 * @return false|string       Imported form ID or false
 	 */
 	function import_form( $xml_or_json_path = '' ) {
 

Indentation +28 added lines, -28 removed lines

@@ -138,7 +138,7 @@ 
 
 		// template areas
 		$template_areas_directory = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'directory' );
-        $template_areas_single = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'single' );
+		$template_areas_single = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'single' );
 
 		// widget areas
 		$default_widget_areas = \GV\Widget::get_default_widget_areas();
@@ -331,40 +331,40 @@ 
 		// load file
 		$xmlstr = file_get_contents( $form_file );
 
-        $options = array(
-            "page" => array("unserialize_as_array" => true),
-            "form"=> array("unserialize_as_array" => true),
-            "field"=> array("unserialize_as_array" => true),
-            "rule"=> array("unserialize_as_array" => true),
-            "choice"=> array("unserialize_as_array" => true),
-            "input"=> array("unserialize_as_array" => true),
-            "routing_item"=> array("unserialize_as_array" => true),
-            "creditCard"=> array("unserialize_as_array" => true),
-            "routin"=> array("unserialize_as_array" => true),
-            "confirmation" => array("unserialize_as_array" => true),
-            "notification" => array("unserialize_as_array" => true)
-        );
+		$options = array(
+			"page" => array("unserialize_as_array" => true),
+			"form"=> array("unserialize_as_array" => true),
+			"field"=> array("unserialize_as_array" => true),
+			"rule"=> array("unserialize_as_array" => true),
+			"choice"=> array("unserialize_as_array" => true),
+			"input"=> array("unserialize_as_array" => true),
+			"routing_item"=> array("unserialize_as_array" => true),
+			"creditCard"=> array("unserialize_as_array" => true),
+			"routin"=> array("unserialize_as_array" => true),
+			"confirmation" => array("unserialize_as_array" => true),
+			"notification" => array("unserialize_as_array" => true)
+		);
 
 		$xml = new RGXML($options);
-        $forms = $xml->unserialize($xmlstr);
+		$forms = $xml->unserialize($xmlstr);
 
-        if( !$forms ) {
-        	gravityview()->log->error( 'Importing Form Fields for preset [{template_id}]. Error importing file. (File) {path}', array( 'template_id' => $template_id, 'path' => $form_file ) );
-        	return false;
-        }
+		if( !$forms ) {
+			gravityview()->log->error( 'Importing Form Fields for preset [{template_id}]. Error importing file. (File) {path}', array( 'template_id' => $template_id, 'path' => $form_file ) );
+			return false;
+		}
 
-        if( !empty( $forms[0] ) && is_array( $forms[0] ) ) {
-        	$form = $forms[0];
-        }
+		if( !empty( $forms[0] ) && is_array( $forms[0] ) ) {
+			$form = $forms[0];
+		}
 
-        if( empty( $form ) ) {
-        	gravityview()->log->error( '$form not set.', array( 'data' => $forms ) );
-        	return false;
-        }
+		if( empty( $form ) ) {
+			gravityview()->log->error( '$form not set.', array( 'data' => $forms ) );
+			return false;
+		}
 
-        gravityview()->log->debug( '[pre_get_available_fields] Importing Form Fields for preset [{template_id}]. (Form)', array( 'template_id' => $template_id, 'data' => $form ) );
+		gravityview()->log->debug( '[pre_get_available_fields] Importing Form Fields for preset [{template_id}]. (Form)', array( 'template_id' => $template_id, 'data' => $form ) );
 
-        return $form;
+		return $form;
 
 	}
 

includes/class-gravityview-admin-duplicate-view.php

Doc Comments +1 added lines, -1 removed lines

@@ -195,7 +195,7 @@
 	 *
 	 * @since 1.6
 	 *
-	 * @param int $new_view_id The ID of the newly created View
+	 * @param int $new_id The ID of the newly created View
 	 * @param WP_Post $post The View that was just cloned
 	 *
 	 * @return void

includes/class-gravityview-compatibility.php

Doc Comments +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
 
 	/**
 	 * @since 1.12
-	 * @return bool
+	 * @return boolean|null
 	 */
 	private function add_fallback_shortcode() {
 

Indentation +1 added lines, -1 removed lines

@@ -240,7 +240,7 @@
 			self::$notices['wp_version'] = array(
 				'class' => 'error',
 				'message' => sprintf( __( "%sGravityView requires WordPress %s or newer.%s \n\nYou're using Version %s. Please upgrade your WordPress installation.", 'gravityview' ), '<h3>', GV_MIN_WP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . $wp_version . '</span>' ),
-			    'cap' => 'update_core',
+				'cap' => 'update_core',
 				'dismiss' => 'wp_version',
 			);
 

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

Doc Comments +1 added lines, -2 removed lines

@@ -221,7 +221,6 @@ 
 	 *
 	 * @since 1.15
 	 *
-	 * @param string|null $content Content inside shortcode, if defined
 	 *
 	 * @return string|boolean If URL is fetched, the URL to the entry link. If not found, returns false.
 	 */
@@ -316,7 +315,7 @@ 
 	 *
 	 * @since 1.15
 	 *
-	 * @param string $href URL
+	 * @param string|null $url
 	 */
 	private function maybe_add_field_values_query_args( $url ) {
 

includes/class-gravityview-roles-capabilities.php

Doc Comments -1 removed lines

@@ -67,7 +67,6 @@
 	 *
 	 * @since 1.15
 	 *
-	 * @param array   $allcaps An array of all the user's capabilities.
 	 * @param array   $caps    Actual capabilities for meta capability.
 	 * @param array   $args    Optional parameters passed to has_cap(), typically object ID.
 	 * @param WP_User|null $user    The user object, in WordPress 3.7.0 or higher

Indentation +1 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 		add_filter( 'members_get_capabilities', array( 'GravityView_Roles_Capabilities', 'merge_with_all_caps' ) );
 		add_action( 'members_register_cap_groups', array( $this, 'members_register_cap_group' ), 20 );
 		add_filter( 'user_has_cap', array( $this, 'filter_user_has_cap' ), 10, 4 );
-        add_action( 'admin_init', array( $this, 'add_caps') );
+		add_action( 'admin_init', array( $this, 'add_caps') );
 	}
 
 
@@ -360,7 +360,6 @@ 
 	 * Add Gravity Forms and GravityView's "full access" caps when any other caps are checked against.
 	 *
 	 * @since 1.15
-
 	 * @param array $caps_to_check
 	 *
 	 * @return array

includes/class-gravityview-template.php

Doc Comments +8 added lines, -2 removed lines

@@ -37,6 +37,9 @@ 
 	public $active_areas;
 
 
+	/**
+	 * @param string $id
+	 */
 	function __construct( $id, $settings = array(), $field_options = array(), $areas = array() ) {
 
 		if ( empty( $id ) ) {
@@ -144,6 +147,9 @@ 
 		return $areas;
 	}
 
+	/**
+	 * @param string $context
+	 */
 	public function get_active_areas( $context ) {
 		if ( isset( $this->active_areas[ $context ] ) ) {
 			return $this->active_areas[ $context ];
@@ -156,8 +162,8 @@ 
 	/**
 	 * Assign template specific field options
 	 *
-	 * @param array $options (default: array())
-	 * @param string $template (default: '')
+	 * @param array $field_options (default: array())
+	 * @param string $template_id (default: '')
 	 * @param string $field_id key for the field
 	 * @param  string|array $context Context for the field; `directory` or `single` for example.
 	 *

includes/extensions/edit-entry/class-edit-entry-admin.php

Doc Comments -1 removed lines

@@ -69,7 +69,6 @@
      * Change wording for the Edit context to read Entry Creator
      *
      * @param  array 	   $visibility_caps        Array of capabilities to display in field dropdown.
-     * @param  string      $field_type  Type of field options to render (`field` or `widget`)
      * @param  string      $template_id Table slug
      * @param  float       $field_id    GF Field ID - Example: `3`, `5.2`, `entry_link`, `created_by`
      * @param  string      $context     What context are we in? Example: `single` or `directory`

Indentation +139 added lines, -139 removed lines

@@ -10,42 +10,42 @@ 
  */
 
 if ( ! defined( 'WPINC' ) ) {
-    die;
+	die;
 }
 
 
 class GravityView_Edit_Entry_Admin {
 
-    protected $loader;
+	protected $loader;
 
-    function __construct( GravityView_Edit_Entry $loader ) {
-        $this->loader = $loader;
-    }
+	function __construct( GravityView_Edit_Entry $loader ) {
+		$this->loader = $loader;
+	}
 
-    function load() {
+	function load() {
 
-        if( !is_admin() ) {
-            return;
-        }
+		if( !is_admin() ) {
+			return;
+		}
 
-        // Add Edit Link as a default field, outside those set in the Gravity Form form
-        add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 );
+		// Add Edit Link as a default field, outside those set in the Gravity Form form
+		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 );
 
-        // For the Edit Entry Link, you don't want visible to all users.
-        add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 );
+		// For the Edit Entry Link, you don't want visible to all users.
+		add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 );
 
-        // Modify the field options based on the name of the field type
-        add_filter( 'gravityview_template_edit_link_options', array( $this, 'edit_link_field_options' ), 10, 5 );
+		// Modify the field options based on the name of the field type
+		add_filter( 'gravityview_template_edit_link_options', array( $this, 'edit_link_field_options' ), 10, 5 );
 
-        // add tooltips
-        add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips') );
+		// add tooltips
+		add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips') );
 
-        // custom fields' options for zone EDIT
-        add_filter( 'gravityview_template_field_options', array( $this, 'field_options' ), 10, 6 );
+		// custom fields' options for zone EDIT
+		add_filter( 'gravityview_template_field_options', array( $this, 'field_options' ), 10, 6 );
 
-        // Add Edit Entry settings to View Settings
-        add_action( 'gravityview/metaboxes/edit_entry', array( $this, 'view_settings_metabox' ) );
-    }
+		// Add Edit Entry settings to View Settings
+		add_action( 'gravityview/metaboxes/edit_entry', array( $this, 'view_settings_metabox' ) );
+	}
 
 	/**
 	 * Render Edit Entry View metabox settings
@@ -69,101 +69,101 @@ 
 		GravityView_Render_Settings::render_setting_row( 'edit_redirect_url', $current_settings );
 	}
 
-    /**
-     * Add Edit Link as a default field, outside those set in the Gravity Form form
-     * @param array $entry_default_fields Existing fields
-     * @param  string|array $form form_ID or form object
-     * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
-     */
-    function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
-
-        if( $zone !== 'edit' ) {
-
-            $entry_default_fields['edit_link'] = array(
-                'label' => __('Link to Edit Entry', 'gravityview'),
-                'type' => 'edit_link',
-                'desc'	=> __('A link to edit the entry. Visible based on View settings.', 'gravityview'),
-                'icon' => 'dashicons-welcome-write-blog',
-            );
-
-        }
-
-        return $entry_default_fields;
-    }
-
-    /**
-     * Change wording for the Edit context to read Entry Creator
-     *
-     * @param  array 	   $visibility_caps        Array of capabilities to display in field dropdown.
-     * @param  string      $field_type  Type of field options to render (`field` or `widget`)
-     * @param  string      $template_id Table slug
-     * @param  float       $field_id    GF Field ID - Example: `3`, `5.2`, `entry_link`, `created_by`
-     * @param  string      $context     What context are we in? Example: `single` or `directory`
-     * @param  string      $input_type  (textarea, list, select, etc.)
-     * @return array                   Array of field options with `label`, `value`, `type`, `default` keys
-     */
-    function modify_visibility_caps( $visibility_caps = array(), $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
-
-        $caps = $visibility_caps;
-
-        // If we're configuring fields in the edit context, we want a limited selection
-        if( $context === 'edit' ) {
-
-            // Remove other built-in caps.
-            unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
-
-            $caps['read'] = _x('Entry Creator','User capability', 'gravityview');
-        }
-
-        return $caps;
-    }
-
-    /**
-     * Add "Edit Link Text" setting to the edit_link field settings
-     *
-     * @param array  $field_options
-     * @param string $template_id
-     * @param string $field_id
-     * @param string $context
-     * @param string $input_type
-     *
-     * @return array $field_options, with "Edit Link Text" field option
-     */
-    function edit_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
-
-        // Always a link, never a filter
-        unset( $field_options['show_as_link'], $field_options['search_filter'] );
-
-        // Edit Entry link should only appear to visitors capable of editing entries
-        unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
-
-        $add_option['edit_link'] = array(
-            'type' => 'text',
-            'label' => __( 'Edit Link Text', 'gravityview' ),
-            'desc' => NULL,
-            'value' => __('Edit Entry', 'gravityview'),
-            'merge_tags' => true,
-        );
-
-        return array_merge( $add_option, $field_options );
-    }
-
-    /**
-     * Add tooltips
-     * @param  array $tooltips Existing tooltips
-     * @return array           Modified tooltips
-     */
-    function tooltips( $tooltips ) {
-
-        $return = $tooltips;
-
-        $return['allow_edit_cap'] = array(
-            'title' => __('Limiting Edit Access', 'gravityview'),
-            'value' => __('Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview'),
-        );
-
-        return $return;
-    }
+	/**
+	 * Add Edit Link as a default field, outside those set in the Gravity Form form
+	 * @param array $entry_default_fields Existing fields
+	 * @param  string|array $form form_ID or form object
+	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
+	 */
+	function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
+
+		if( $zone !== 'edit' ) {
+
+			$entry_default_fields['edit_link'] = array(
+				'label' => __('Link to Edit Entry', 'gravityview'),
+				'type' => 'edit_link',
+				'desc'	=> __('A link to edit the entry. Visible based on View settings.', 'gravityview'),
+				'icon' => 'dashicons-welcome-write-blog',
+			);
+
+		}
+
+		return $entry_default_fields;
+	}
+
+	/**
+	 * Change wording for the Edit context to read Entry Creator
+	 *
+	 * @param  array 	   $visibility_caps        Array of capabilities to display in field dropdown.
+	 * @param  string      $field_type  Type of field options to render (`field` or `widget`)
+	 * @param  string      $template_id Table slug
+	 * @param  float       $field_id    GF Field ID - Example: `3`, `5.2`, `entry_link`, `created_by`
+	 * @param  string      $context     What context are we in? Example: `single` or `directory`
+	 * @param  string      $input_type  (textarea, list, select, etc.)
+	 * @return array                   Array of field options with `label`, `value`, `type`, `default` keys
+	 */
+	function modify_visibility_caps( $visibility_caps = array(), $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
+
+		$caps = $visibility_caps;
+
+		// If we're configuring fields in the edit context, we want a limited selection
+		if( $context === 'edit' ) {
+
+			// Remove other built-in caps.
+			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
+
+			$caps['read'] = _x('Entry Creator','User capability', 'gravityview');
+		}
+
+		return $caps;
+	}
+
+	/**
+	 * Add "Edit Link Text" setting to the edit_link field settings
+	 *
+	 * @param array  $field_options
+	 * @param string $template_id
+	 * @param string $field_id
+	 * @param string $context
+	 * @param string $input_type
+	 *
+	 * @return array $field_options, with "Edit Link Text" field option
+	 */
+	function edit_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
+
+		// Always a link, never a filter
+		unset( $field_options['show_as_link'], $field_options['search_filter'] );
+
+		// Edit Entry link should only appear to visitors capable of editing entries
+		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
+
+		$add_option['edit_link'] = array(
+			'type' => 'text',
+			'label' => __( 'Edit Link Text', 'gravityview' ),
+			'desc' => NULL,
+			'value' => __('Edit Entry', 'gravityview'),
+			'merge_tags' => true,
+		);
+
+		return array_merge( $add_option, $field_options );
+	}
+
+	/**
+	 * Add tooltips
+	 * @param  array $tooltips Existing tooltips
+	 * @return array           Modified tooltips
+	 */
+	function tooltips( $tooltips ) {
+
+		$return = $tooltips;
+
+		$return['allow_edit_cap'] = array(
+			'title' => __('Limiting Edit Access', 'gravityview'),
+			'value' => __('Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview'),
+		);
+
+		return $return;
+	}
 
 	/**
 	 * Add "Edit Link Text" setting to the edit_link field settings
@@ -179,28 +179,28 @@ 
 	 */
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
 
-        // We only want to modify the settings for the edit context
-        if( 'edit' !== $context ) {
-            return $field_options;
-        }
-
-        //  Entry field is only for logged in users
-        unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
-
-        $add_options = array(
-            'allow_edit_cap' => array(
-                'type' => 'select',
-                'label' => __( 'Make field editable to:', 'gravityview' ),
-                'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
-                'tooltip' => 'allow_edit_cap',
-                'class' => 'widefat',
-                'value' => 'read', // Default: entry creator
-                'group' => 'visibility',
-            ),
-        );
-
-        return array_merge( $field_options, $add_options );
-    }
+		// We only want to modify the settings for the edit context
+		if( 'edit' !== $context ) {
+			return $field_options;
+		}
+
+		//  Entry field is only for logged in users
+		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
+
+		$add_options = array(
+			'allow_edit_cap' => array(
+				'type' => 'select',
+				'label' => __( 'Make field editable to:', 'gravityview' ),
+				'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
+				'tooltip' => 'allow_edit_cap',
+				'class' => 'widefat',
+				'value' => 'read', // Default: entry creator
+				'group' => 'visibility',
+			),
+		);
+
+		return array_merge( $field_options, $add_options );
+	}
 
 
 } // end class

includes/extensions/edit-entry/class-edit-entry-user-registration.php

Doc Comments +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
      * @since 1.11
      *
      * @param array $form Gravity Forms form array
-     * @param string $entry_id Gravity Forms entry ID
+     * @param integer $entry_id Gravity Forms entry ID
      * @return void
      */
     public function update_user( $form = array(), $entry_id = 0 ) {

Indentation +262 added lines, -262 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 if ( ! defined( 'WPINC' ) ) {
-    die;
+	die;
 }
 
 /**
@@ -22,109 +22,109 @@ 
 	/**
 	 * @var GravityView_Edit_Entry $loader
 	 */
-    protected $loader;
+	protected $loader;
 
-    /**
-     * @var WP_User|null Temporary storage used by restore_user_details()
-     */
-    private $_user_before_update = null;
+	/**
+	 * @var WP_User|null Temporary storage used by restore_user_details()
+	 */
+	private $_user_before_update = null;
 
-    function __construct( GravityView_Edit_Entry $loader ) {
-        $this->loader = $loader;
-    }
+	function __construct( GravityView_Edit_Entry $loader ) {
+		$this->loader = $loader;
+	}
 
 	/**
 	 * @since 1.11
 	 */
 	public function load() {
 		add_action( 'wp', array( $this, 'add_hooks' ), 10 );
-    }
+	}
 
 	/**
 	 * Add hooks to trigger updating the user
 	 *
 	 * @since 1.18
 	 */
-    public function add_hooks() {
-
-	    /**
-	     * @filter `gravityview/edit_entry/user_registration/trigger_update` Choose whether to update user information via User Registration add-on when an entry is updated?
-	     * @since 1.11
-	     * @param boolean $boolean Whether to trigger update on user registration (default: true)
-	     */
-	    if( apply_filters( 'gravityview/edit_entry/user_registration/trigger_update', true ) ) {
-
-	    	add_action( 'gravityview/edit_entry/after_update' , array( $this, 'update_user' ), 10, 2 );
-
-		    // last resort in case the current user display name don't match any of the defaults
-		    add_action( 'gform_user_updated', array( $this, 'restore_display_name' ), 10, 4 );
-	    }
-    }
-
-    /**
-     * Update the WordPress user profile based on the GF User Registration create feed
-     *
-     * @since 1.11
-     *
-     * @param array $form Gravity Forms form array
-     * @param string $entry_id Gravity Forms entry ID
-     * @return void
-     */
-    public function update_user( $form = array(), $entry_id = 0 ) {
-
-        if( ! class_exists( 'GFAPI' ) || ! class_exists( 'GF_User_Registration' ) ) {
-	        gravityview()->log->error( 'GFAPI or User Registration class not found; not updating the user' );
-	        return;
-        } elseif( empty( $entry_id ) ) {
-        	gravityview()->log->error( 'Entry ID is empty [{entry_id}]; not updating the user', array( 'entry_id' => $entry_id ) );
-	        return;
-        }
-
-        $gf_user_registration = GF_User_Registration::get_instance();
-
-        $entry = GFAPI::get_entry( $entry_id );
-
-	    /**
-	     * @filter `gravityview/edit_entry/user_registration/entry` Modify entry details before updating the user via User Registration add-on
-	     * @since 1.11
-	     * @param array $entry Gravity Forms entry
-	     * @param array $form Gravity Forms form
-	     */
-        $entry = apply_filters( 'gravityview/edit_entry/user_registration/entry', $entry, $form );
-
-	    $config = $this->get_feed_configuration( $entry, $form );
-
-        // Make sure the feed is active
-	    if ( ! \GV\Utils::get( $config, 'is_active', false ) ) {
+	public function add_hooks() {
+
+		/**
+		 * @filter `gravityview/edit_entry/user_registration/trigger_update` Choose whether to update user information via User Registration add-on when an entry is updated?
+		 * @since 1.11
+		 * @param boolean $boolean Whether to trigger update on user registration (default: true)
+		 */
+		if( apply_filters( 'gravityview/edit_entry/user_registration/trigger_update', true ) ) {
+
+			add_action( 'gravityview/edit_entry/after_update' , array( $this, 'update_user' ), 10, 2 );
+
+			// last resort in case the current user display name don't match any of the defaults
+			add_action( 'gform_user_updated', array( $this, 'restore_display_name' ), 10, 4 );
+		}
+	}
+
+	/**
+	 * Update the WordPress user profile based on the GF User Registration create feed
+	 *
+	 * @since 1.11
+	 *
+	 * @param array $form Gravity Forms form array
+	 * @param string $entry_id Gravity Forms entry ID
+	 * @return void
+	 */
+	public function update_user( $form = array(), $entry_id = 0 ) {
+
+		if( ! class_exists( 'GFAPI' ) || ! class_exists( 'GF_User_Registration' ) ) {
+			gravityview()->log->error( 'GFAPI or User Registration class not found; not updating the user' );
 			return;
-	    }
+		} elseif( empty( $entry_id ) ) {
+			gravityview()->log->error( 'Entry ID is empty [{entry_id}]; not updating the user', array( 'entry_id' => $entry_id ) );
+			return;
+		}
+
+		$gf_user_registration = GF_User_Registration::get_instance();
+
+		$entry = GFAPI::get_entry( $entry_id );
 
-	    // If an Update feed, make sure the conditions are met.
-	    if ( \GV\Utils::get( $config, 'meta/feedType' ) === 'update' ) {
-	    	if( ! $gf_user_registration->is_feed_condition_met( $config, $form, $entry ) ) {
-			    return;
-		    }
-	    }
+		/**
+		 * @filter `gravityview/edit_entry/user_registration/entry` Modify entry details before updating the user via User Registration add-on
+		 * @since 1.11
+		 * @param array $entry Gravity Forms entry
+		 * @param array $form Gravity Forms form
+		 */
+		$entry = apply_filters( 'gravityview/edit_entry/user_registration/entry', $entry, $form );
 
-	    // Do not update user if the user hasn't been registered (happens when manual activation is enabled in User Registration feed)
-	    $username = \GV\Utils::get( $config, 'meta/username', null );
-	    if ( ! isset( $entry[ $username ] ) || ! get_user_by( 'login', $entry[ $username ] ) ) {
-		    return;
-	    }
+		$config = $this->get_feed_configuration( $entry, $form );
+
+		// Make sure the feed is active
+		if ( ! \GV\Utils::get( $config, 'is_active', false ) ) {
+			return;
+		}
+
+		// If an Update feed, make sure the conditions are met.
+		if ( \GV\Utils::get( $config, 'meta/feedType' ) === 'update' ) {
+			if( ! $gf_user_registration->is_feed_condition_met( $config, $form, $entry ) ) {
+				return;
+			}
+		}
+
+		// Do not update user if the user hasn't been registered (happens when manual activation is enabled in User Registration feed)
+		$username = \GV\Utils::get( $config, 'meta/username', null );
+		if ( ! isset( $entry[ $username ] ) || ! get_user_by( 'login', $entry[ $username ] ) ) {
+			return;
+		}
 
-        // The priority is set to 3 so that default priority (10) will still override it
-        add_filter( 'send_password_change_email', '__return_false', 3 );
-        add_filter( 'send_email_change_email', '__return_false', 3 );
+		// The priority is set to 3 so that default priority (10) will still override it
+		add_filter( 'send_password_change_email', '__return_false', 3 );
+		add_filter( 'send_email_change_email', '__return_false', 3 );
 
-        // Trigger the User Registration update user method
-        $gf_user_registration->update_user( $entry, $form, $config );
+		// Trigger the User Registration update user method
+		$gf_user_registration->update_user( $entry, $form, $config );
 
-        remove_filter( 'send_password_change_email', '__return_false', 3 );
-        remove_filter( 'send_email_change_email', '__return_false', 3 );
+		remove_filter( 'send_password_change_email', '__return_false', 3 );
+		remove_filter( 'send_email_change_email', '__return_false', 3 );
 
-        // Prevent double-triggering by removing the hook
-	    remove_action( 'gravityview/edit_entry/after_update' , array( $this, 'update_user' ), 10 );
-    }
+		// Prevent double-triggering by removing the hook
+		remove_action( 'gravityview/edit_entry/after_update' , array( $this, 'update_user' ), 10 );
+	}
 
 	/**
 	 * Get the User Registration feed configuration for the entry & form
@@ -139,184 +139,184 @@ 
 	 *
 	 * @return array
 	 */
-    public function get_feed_configuration( $entry, $form ) {
-
-	    $gf_user_registration = GF_User_Registration::get_instance();
-
-	    $config = $gf_user_registration->get_single_submission_feed( $entry, $form );
-
-	    /**
-	     * @filter `gravityview/edit_entry/user_registration/preserve_role` Keep the current user role or override with the role defined in the Create feed
-	     * @since 1.15
-	     * @param[in,out] boolean $preserve_role Preserve current user role Default: true
-	     * @param[in] array $config Gravity Forms User Registration feed configuration for the form
-	     * @param[in] array $form Gravity Forms form array
-	     * @param[in] array $entry Gravity Forms entry being edited
-	     */
-	    $preserve_role = apply_filters( 'gravityview/edit_entry/user_registration/preserve_role', true, $config, $form, $entry );
-
-	    if( $preserve_role ) {
-		    $config['meta']['role'] = 'gfur_preserve_role';
-	    }
-
-	    $displayname = $this->match_current_display_name( $entry['created_by'] );
-
-	    /**
-	     * Make sure the current display name is not changed with the update user method.
-	     * @since 1.15
-	     */
-	    $config['meta']['displayname'] = $displayname ? $displayname : $config['meta']['displayname'];
-
-	    /**
-	     * @filter `gravityview/edit_entry/user_registration/config` Modify the User Registration Addon feed configuration
-	     * @since 1.14
-	     * @param[in,out] array $config Gravity Forms User Registration feed configuration for the form
-	     * @param[in] array $form Gravity Forms form array
-	     * @param[in] array $entry Gravity Forms entry being edited
-	     */
-	    $config = apply_filters( 'gravityview/edit_entry/user_registration/config', $config, $form, $entry );
-
-	    return $config;
-    }
-
-    /**
-     * Calculate the user display name format
-     *
-     * @since 1.15
-     * @since 1.20 Returns false if user not found at $user_id
-     *
-     * @param int $user_id WP User ID
-     * @return false|string Display name format as used inside Gravity Forms User Registration. Returns false if user not found.
-     */
-    public function match_current_display_name( $user_id ) {
-
-        $user = get_userdata( $user_id );
-
-        if( ! $user ) {
-        	return false;
-        }
-
-        $names = $this->generate_display_names( $user );
-
-        $format = array_search( $user->display_name, $names, true );
-
-        /**
-         * In case we can't find the current display name format, trigger last resort method at the 'gform_user_updated' hook
-         * @see restore_display_name
-         */
-        if( false === $format ) {
-            $this->_user_before_update = $user;
-        }
-
-        return $format;
-    }
-
-    /**
-     * Generate an array of all the user display names possibilities
-     *
-     * @since 1.15
-     *
-     * @param object $profileuser WP_User object
-     * @return array List all the possible display names for a certain User object
-     */
-    public function generate_display_names( $profileuser ) {
-
-        $public_display = array();
-        $public_display['nickname']  = $profileuser->nickname;
-        $public_display['username']  = $profileuser->user_login;
-
-        if ( !empty($profileuser->first_name) ) {
-	        $public_display['firstname'] = $profileuser->first_name;
-        }
-
-        if ( !empty($profileuser->last_name) ) {
-	        $public_display['lastname'] = $profileuser->last_name;
-        }
-
-        if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
-            $public_display['firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
-            $public_display['lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
-        }
-
-        $public_display = array_map( 'trim', $public_display );
-        $public_display = array_unique( $public_display );
-
-        return $public_display;
-    }
-
-
-    /**
-     * Restore the Display Name and roles of a user after being updated by Gravity Forms User Registration Addon
-     *
-     * @see GFUser::update_user()
-     * @param int $user_id WP User ID that was updated by Gravity Forms User Registration Addon
-     * @param array $config Gravity Forms User Registration Addon form feed configuration
-     * @param array $entry The Gravity Forms entry that was just updated
-     * @param string $password User password
-     * @return int|false|WP_Error|null True: User updated; False: $user_id not a valid User ID; WP_Error: User update error; Null: Method didn't process
-     */
-    public function restore_display_name( $user_id = 0, $config = array(), $entry = array(), $password = '' ) {
-
-        /**
-         * @filter `gravityview/edit_entry/restore_display_name` Whether display names should be restored to before updating an entry.
-         * Otherwise, display names will be reset to the format specified in Gravity Forms User Registration "Update" feed
-         * @since 1.14.4
-         * @param boolean $restore_display_name Restore Display Name? Default: true
-         */
-        $restore_display_name = apply_filters( 'gravityview/edit_entry/restore_display_name', true );
-
-        $is_update_feed = ( $config && \GV\Utils::get( $config, 'meta/feed_type' ) === 'update' );
-
-        /**
-         * Don't restore display name:
-         *   - either disabled,
-         *   - or it is an Update feed (we only care about Create feed)
-         *   - or we don't need as we found the correct format before updating user.
-         * @since 1.14.4
-         */
-        if( ! $restore_display_name || $is_update_feed || is_null( $this->_user_before_update ) ) {
-            return null;
-        }
-
-        $user_after_update = get_userdata( $user_id );
-
-        // User not found
-	    if ( ! $user_after_update ) {
-	    	gravityview()->log->error( 'User not found at $user_id #{user_id}', array( 'user_id' => $user_id ) );
-		    return false;
-	    }
-
-        $restored_user = $user_after_update;
-
-	    // Restore previous display_name
-        $restored_user->display_name = $this->_user_before_update->display_name;
-
-	    // Don't have WP update the password.
-	    unset( $restored_user->data->user_pass, $restored_user->user_pass );
-
-        /**
-         * Modify the user data after updated by Gravity Forms User Registration but before restored by GravityView
-         * @since 1.14
-         * @param WP_User $restored_user The user with restored details about to be updated by wp_update_user()
-         * @param WP_User $user_before_update The user before being updated by Gravity Forms User Registration
-         * @param WP_User $user_after_update The user after being updated by Gravity Forms User Registration
-         * @param array   $entry The Gravity Forms entry that was just updated
-         */
-        $restored_user = apply_filters( 'gravityview/edit_entry/user_registration/restored_user', $restored_user, $this->_user_before_update, $user_after_update, $entry );
-
-        $updated = wp_update_user( $restored_user );
-
-        if( is_wp_error( $updated ) ) {
-            gravityview()->log->error( 'There was an error updating user #{user_id} details', array( 'user_id' => $user_id, 'data' => $updated ) );
-        } else {
-            gravityview()->log->debug( 'User #{user_id} details restored', array( 'user_id' => $user_id ) );
-        }
-
-        $this->_user_before_update = null;
-
-        unset( $restored_user, $user_after_update );
-
-        return $updated;
-    }
+	public function get_feed_configuration( $entry, $form ) {
+
+		$gf_user_registration = GF_User_Registration::get_instance();
+
+		$config = $gf_user_registration->get_single_submission_feed( $entry, $form );
+
+		/**
+		 * @filter `gravityview/edit_entry/user_registration/preserve_role` Keep the current user role or override with the role defined in the Create feed
+		 * @since 1.15
+		 * @param[in,out] boolean $preserve_role Preserve current user role Default: true
+		 * @param[in] array $config Gravity Forms User Registration feed configuration for the form
+		 * @param[in] array $form Gravity Forms form array
+		 * @param[in] array $entry Gravity Forms entry being edited
+		 */
+		$preserve_role = apply_filters( 'gravityview/edit_entry/user_registration/preserve_role', true, $config, $form, $entry );
+
+		if( $preserve_role ) {
+			$config['meta']['role'] = 'gfur_preserve_role';
+		}
+
+		$displayname = $this->match_current_display_name( $entry['created_by'] );
+
+		/**
+		 * Make sure the current display name is not changed with the update user method.
+		 * @since 1.15
+		 */
+		$config['meta']['displayname'] = $displayname ? $displayname : $config['meta']['displayname'];
+
+		/**
+		 * @filter `gravityview/edit_entry/user_registration/config` Modify the User Registration Addon feed configuration
+		 * @since 1.14
+		 * @param[in,out] array $config Gravity Forms User Registration feed configuration for the form
+		 * @param[in] array $form Gravity Forms form array
+		 * @param[in] array $entry Gravity Forms entry being edited
+		 */
+		$config = apply_filters( 'gravityview/edit_entry/user_registration/config', $config, $form, $entry );
+
+		return $config;
+	}
+
+	/**
+	 * Calculate the user display name format
+	 *
+	 * @since 1.15
+	 * @since 1.20 Returns false if user not found at $user_id
+	 *
+	 * @param int $user_id WP User ID
+	 * @return false|string Display name format as used inside Gravity Forms User Registration. Returns false if user not found.
+	 */
+	public function match_current_display_name( $user_id ) {
+
+		$user = get_userdata( $user_id );
+
+		if( ! $user ) {
+			return false;
+		}
+
+		$names = $this->generate_display_names( $user );
+
+		$format = array_search( $user->display_name, $names, true );
+
+		/**
+		 * In case we can't find the current display name format, trigger last resort method at the 'gform_user_updated' hook
+		 * @see restore_display_name
+		 */
+		if( false === $format ) {
+			$this->_user_before_update = $user;
+		}
+
+		return $format;
+	}
+
+	/**
+	 * Generate an array of all the user display names possibilities
+	 *
+	 * @since 1.15
+	 *
+	 * @param object $profileuser WP_User object
+	 * @return array List all the possible display names for a certain User object
+	 */
+	public function generate_display_names( $profileuser ) {
+
+		$public_display = array();
+		$public_display['nickname']  = $profileuser->nickname;
+		$public_display['username']  = $profileuser->user_login;
+
+		if ( !empty($profileuser->first_name) ) {
+			$public_display['firstname'] = $profileuser->first_name;
+		}
+
+		if ( !empty($profileuser->last_name) ) {
+			$public_display['lastname'] = $profileuser->last_name;
+		}
+
+		if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
+			$public_display['firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
+			$public_display['lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
+		}
+
+		$public_display = array_map( 'trim', $public_display );
+		$public_display = array_unique( $public_display );
+
+		return $public_display;
+	}
+
+
+	/**
+	 * Restore the Display Name and roles of a user after being updated by Gravity Forms User Registration Addon
+	 *
+	 * @see GFUser::update_user()
+	 * @param int $user_id WP User ID that was updated by Gravity Forms User Registration Addon
+	 * @param array $config Gravity Forms User Registration Addon form feed configuration
+	 * @param array $entry The Gravity Forms entry that was just updated
+	 * @param string $password User password
+	 * @return int|false|WP_Error|null True: User updated; False: $user_id not a valid User ID; WP_Error: User update error; Null: Method didn't process
+	 */
+	public function restore_display_name( $user_id = 0, $config = array(), $entry = array(), $password = '' ) {
+
+		/**
+		 * @filter `gravityview/edit_entry/restore_display_name` Whether display names should be restored to before updating an entry.
+		 * Otherwise, display names will be reset to the format specified in Gravity Forms User Registration "Update" feed
+		 * @since 1.14.4
+		 * @param boolean $restore_display_name Restore Display Name? Default: true
+		 */
+		$restore_display_name = apply_filters( 'gravityview/edit_entry/restore_display_name', true );
+
+		$is_update_feed = ( $config && \GV\Utils::get( $config, 'meta/feed_type' ) === 'update' );
+
+		/**
+		 * Don't restore display name:
+		 *   - either disabled,
+		 *   - or it is an Update feed (we only care about Create feed)
+		 *   - or we don't need as we found the correct format before updating user.
+		 * @since 1.14.4
+		 */
+		if( ! $restore_display_name || $is_update_feed || is_null( $this->_user_before_update ) ) {
+			return null;
+		}
+
+		$user_after_update = get_userdata( $user_id );
+
+		// User not found
+		if ( ! $user_after_update ) {
+			gravityview()->log->error( 'User not found at $user_id #{user_id}', array( 'user_id' => $user_id ) );
+			return false;
+		}
+
+		$restored_user = $user_after_update;
+
+		// Restore previous display_name
+		$restored_user->display_name = $this->_user_before_update->display_name;
+
+		// Don't have WP update the password.
+		unset( $restored_user->data->user_pass, $restored_user->user_pass );
+
+		/**
+		 * Modify the user data after updated by Gravity Forms User Registration but before restored by GravityView
+		 * @since 1.14
+		 * @param WP_User $restored_user The user with restored details about to be updated by wp_update_user()
+		 * @param WP_User $user_before_update The user before being updated by Gravity Forms User Registration
+		 * @param WP_User $user_after_update The user after being updated by Gravity Forms User Registration
+		 * @param array   $entry The Gravity Forms entry that was just updated
+		 */
+		$restored_user = apply_filters( 'gravityview/edit_entry/user_registration/restored_user', $restored_user, $this->_user_before_update, $user_after_update, $entry );
+
+		$updated = wp_update_user( $restored_user );
+
+		if( is_wp_error( $updated ) ) {
+			gravityview()->log->error( 'There was an error updating user #{user_id} details', array( 'user_id' => $user_id, 'data' => $updated ) );
+		} else {
+			gravityview()->log->debug( 'User #{user_id} details restored', array( 'user_id' => $user_id ) );
+		}
+
+		$this->_user_before_update = null;
+
+		unset( $restored_user, $user_after_update );
+
+		return $updated;
+	}
 
 } //end class

includes/admin/field-types/type_hidden.php

Indentation +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 			return;
 		}
 
-        $class = !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
+		$class = !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
 
 		?>
 		<input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="hidden" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>" />