gravityview / GravityView

future/includes/class-gv-collection-entry-offset.php

Indentation +19 added lines, -19 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -14,24 +14,24 @@ 
  */
 class Entry_Offset
 {
-    /** @var int The offset. */
-    public $offset = 0;
+	/** @var int The offset. */
+	public $offset = 0;
 
-    /** @var int The limit. */
-    public $limit = 20;
+	/** @var int The limit. */
+	public $limit = 20;
 
-    /**
-     * Return a search_criteria format for this offset.
-     *
-     * @param int $page The page. Default: 1
-     *
-     * @return array ['page_size' => N, 'offset' => N]
-     */
-    public function to_paging($page = 1)
-    {
-        return [
-            'page_size' => $this->limit,
-            'offset'    => (($page - 1) * $this->limit) + $this->offset,
-        ];
-    }
+	/**
+	 * Return a search_criteria format for this offset.
+	 *
+	 * @param int $page The page. Default: 1
+	 *
+	 * @return array ['page_size' => N, 'offset' => N]
+	 */
+	public function to_paging($page = 1)
+	{
+		return [
+			'page_size' => $this->limit,
+			'offset'    => (($page - 1) * $this->limit) + $this->offset,
+		];
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -27,11 +27,11 @@ 
      *
      * @return array ['page_size' => N, 'offset' => N]
      */
-    public function to_paging($page = 1)
+    public function to_paging( $page = 1 )
     {
         return [
             'page_size' => $this->limit,
-            'offset'    => (($page - 1) * $this->limit) + $this->offset,
+            'offset'    => ( ( $page - 1 ) * $this->limit ) + $this->offset,
         ];
     }
 }

Braces +2 added lines, -4 removed lines

@@ -12,8 +12,7 @@ 
  *
  * Offset and limit, pagination.
  */
-class Entry_Offset
-{
+class Entry_Offset {
     /** @var int The offset. */
     public $offset = 0;
 
@@ -27,8 +26,7 @@ 
      *
      * @return array ['page_size' => N, 'offset' => N]
      */
-    public function to_paging($page = 1)
-    {
+    public function to_paging($page = 1) {
         return [
             'page_size' => $this->limit,
             'offset'    => (($page - 1) * $this->limit) + $this->offset,

future/includes/class-gv-collection.php

Indentation +100 added lines, -100 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -12,110 +12,110 @@ 
  */
 class Collection
 {
-    /**
-     * @var array Main storage for objects in this collection.
-     */
-    private $storage = [];
+	/**
+	 * @var array Main storage for objects in this collection.
+	 */
+	private $storage = [];
 
-    /**
-     * Add an object to this collection.
-     *
-     * @param mixed $value The object to be added.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return void
-     */
-    public function add($value)
-    {
-        $this->storage[] = $value;
-    }
+	/**
+	 * Add an object to this collection.
+	 *
+	 * @param mixed $value The object to be added.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return void
+	 */
+	public function add($value)
+	{
+		$this->storage[] = $value;
+	}
 
-    /**
-     * Clear this collection.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return void
-     */
-    public function clear()
-    {
-        $this->count() && ($this->storage = []);
-    }
+	/**
+	 * Clear this collection.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return void
+	 */
+	public function clear()
+	{
+		$this->count() && ($this->storage = []);
+	}
 
-    /**
-     * Merge another collection into here.
-     *
-     * @param \GV\Collection $collection The collection to be merged.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return void
-     */
-    public function merge(\GV\Collection $collection)
-    {
-        array_map([$this, 'add'], $collection->all());
-    }
+	/**
+	 * Merge another collection into here.
+	 *
+	 * @param \GV\Collection $collection The collection to be merged.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return void
+	 */
+	public function merge(\GV\Collection $collection)
+	{
+		array_map([$this, 'add'], $collection->all());
+	}
 
-    /**
-     * Returns all the objects in this collection as an an array.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return array The objects in this collection.
-     */
-    public function all()
-    {
-        return $this->storage;
-    }
+	/**
+	 * Returns all the objects in this collection as an an array.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return array The objects in this collection.
+	 */
+	public function all()
+	{
+		return $this->storage;
+	}
 
-    /**
-     * Get the last added object.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return mixed|null The last item in here, or null if there are none.
-     */
-    public function last()
-    {
-        return end($this->storage);
-    }
+	/**
+	 * Get the last added object.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return mixed|null The last item in here, or null if there are none.
+	 */
+	public function last()
+	{
+		return end($this->storage);
+	}
 
-    /**
-     * Get the first added object.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return mixed|null The first item in here, or null if there are none.
-     */
-    public function first()
-    {
-        return reset($this->storage);
-    }
+	/**
+	 * Get the first added object.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return mixed|null The first item in here, or null if there are none.
+	 */
+	public function first()
+	{
+		return reset($this->storage);
+	}
 
-    /**
-     * Returns the count of the objects in this collection.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return int The size of this collection.
-     */
-    public function count()
-    {
-        return count($this->storage);
-    }
+	/**
+	 * Returns the count of the objects in this collection.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return int The size of this collection.
+	 */
+	public function count()
+	{
+		return count($this->storage);
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -15,7 +15,7 @@ 
     /**
      * @var array Main storage for objects in this collection.
      */
-    private $storage = [];
+    private $storage = [ ];
 
     /**
      * Add an object to this collection.
@@ -28,9 +28,9 @@ 
      *
      * @return void
      */
-    public function add($value)
+    public function add( $value )
     {
-        $this->storage[] = $value;
+        $this->storage[ ] = $value;
     }
 
     /**
@@ -44,7 +44,7 @@ 
      */
     public function clear()
     {
-        $this->count() && ($this->storage = []);
+        $this->count() && ( $this->storage = [ ] );
     }
 
     /**
@@ -58,9 +58,9 @@ 
      *
      * @return void
      */
-    public function merge(\GV\Collection $collection)
+    public function merge( \GV\Collection $collection )
     {
-        array_map([$this, 'add'], $collection->all());
+        array_map( [ $this, 'add' ], $collection->all() );
     }
 
     /**
@@ -88,7 +88,7 @@ 
      */
     public function last()
     {
-        return end($this->storage);
+        return end( $this->storage );
     }
 
     /**
@@ -102,7 +102,7 @@ 
      */
     public function first()
     {
-        return reset($this->storage);
+        return reset( $this->storage );
     }
 
     /**
@@ -116,6 +116,6 @@ 
      */
     public function count()
     {
-        return count($this->storage);
+        return count( $this->storage );
     }
 }

Braces +8 added lines, -16 removed lines

@@ -10,8 +10,7 @@ 
 /**
  * A generic Collection base class.
  */
-class Collection
-{
+class Collection {
     /**
      * @var array Main storage for objects in this collection.
      */
@@ -28,8 +27,7 @@ 
      *
      * @return void
      */
-    public function add($value)
-    {
+    public function add($value) {
         $this->storage[] = $value;
     }
 
@@ -42,8 +40,7 @@ 
      *
      * @return void
      */
-    public function clear()
-    {
+    public function clear() {
         $this->count() && ($this->storage = []);
     }
 
@@ -58,8 +55,7 @@ 
      *
      * @return void
      */
-    public function merge(\GV\Collection $collection)
-    {
+    public function merge(\GV\Collection $collection) {
         array_map([$this, 'add'], $collection->all());
     }
 
@@ -72,8 +68,7 @@ 
      *
      * @return array The objects in this collection.
      */
-    public function all()
-    {
+    public function all() {
         return $this->storage;
     }
 
@@ -86,8 +81,7 @@ 
      *
      * @return mixed|null The last item in here, or null if there are none.
      */
-    public function last()
-    {
+    public function last() {
         return end($this->storage);
     }
 
@@ -100,8 +94,7 @@ 
      *
      * @return mixed|null The first item in here, or null if there are none.
      */
-    public function first()
-    {
+    public function first() {
         return reset($this->storage);
     }
 
@@ -114,8 +107,7 @@ 
      *
      * @return int The size of this collection.
      */
-    public function count()
-    {
+    public function count() {
         return count($this->storage);
     }
 }

future/includes/class-gv-extension.php

Indentation +388 added lines, -388 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -14,391 +14,391 @@ 
  */
 abstract class Extension
 {
-    /**
-     * @var string Name of the plugin in gravityview.co
-     */
-    protected $_title = null;
-
-    /**
-     * @var string Version number of the plugin
-     */
-    protected $_version = null;
-
-    /**
-     * @var int The ID of the download on gravityview.co
-     *
-     * @since 1.1
-     */
-    protected $_item_id = null;
-
-    /**
-     * @var string Translation textdomain
-     */
-    protected $_text_domain = 'gravityview';
-
-    /**
-     * @var string Minimum version of GravityView the Extension requires
-     */
-    protected $_min_gravityview_version = '2.0-dev';
-
-    /**
-     * @var string Maximum version of GravityView the Extension requires, if any
-     */
-    protected $_max_gravityview_version = null;
-
-    /**
-     * @var string Minimum version of GravityView the Extension requires
-     */
-    protected $_min_php_version = '5.3';
-
-    /**
-     * @var string The URL to fetch license info from. Do not change unless you know what you're doing.
-     */
-    protected $_remote_update_url = 'https://gravityview.co';
-
-    /**
-     * @var string Author of plugin, sent when fetching license info.
-     */
-    protected $_author = 'Katz Web Services, Inc.';
-
-    /**
-     * @var string The path to the extension.
-     */
-    protected $_path = '';
-
-    /**
-     * @var array Admin notices to display
-     */
-    protected static $admin_notices = [];
-
-    /**
-     * @var bool[] An array of extension compatibility.
-     *
-     * @since 2.0 This is an array of classes instead.
-     */
-    public static $is_compatible = [];
-
-    /**
-     * Generic initialization.
-     */
-    public function __construct()
-    {
-        if (false === $this->is_extension_supported()) {
-            return;
-        }
-
-        if (!$this->_path) {
-            $this->_path = __FILE__;
-        }
-
-        add_action('init', [$this, 'load_plugin_textdomain']);
-
-        add_action('admin_init', [$this, 'settings']);
-
-        add_action('admin_notices', [$this, 'admin_notice'], 100);
-
-        // Save the view configuration. Run at 14 so that View metadata is already saved (at 10)
-        add_action('save_post', [$this, 'save_post'], 14);
-
-        add_action('gravityview/metaboxes/before_render', [$this, 'add_metabox_tab']);
-
-        add_filter('gravityview/metaboxes/tooltips', [$this, 'tooltips']);
-
-        $this->add_hooks();
-    }
-
-    /**
-     * Extensions should override this hook to add their hooks.
-     *
-     * @return void
-     */
-    public function add_hooks()
-    {
-    }
-
-    /**
-     * Save extra view configuration.
-     *
-     * @param int $post_id Post ID
-     *
-     * @return void
-     */
-    public function save_post($post_id)
-    {
-    }
-
-    /**
-     * Add tooltips for the extension.
-     *
-     * Add a tooltip with an array using the `title` and `value` keys. The `title` key is the H6 tag value of the tooltip; it's the headline. The `value` is the tooltip content, and can contain any HTML.
-     *
-     * The tooltip key must be `gv_{name_of_setting}`. If the name of the setting is "example_extension_setting", the code would be:
-     *
-     * <code>
-     * $tooltips['gv_example_extension_setting'] = array(
-     * 	'title'	=> 'About Example Extension Setting',
-     *  'value'	=> 'When you do [x] with [y], [z] happens.'
-     * );
-     * </code>
-     *
-     * @param array $tooltips Existing GV tooltips, with `title` and `value` keys
-     *
-     * @return array Modified tooltips
-     */
-    public function tooltips($tooltips = [])
-    {
-        return $tooltips;
-    }
-
-    /**
-     * Add a tab to GravityView Edit View tabbed metabox. By overriding this method, you will add a tab to View settings.
-     *
-     * @since 1.8 (Extension version 1.0.7)
-     * @see https://gist.github.com/zackkatz/6cc381bcf54849f2ed41 For example of adding a metabox
-     *
-     * @return array Array of metabox
-     */
-    protected function tab_settings()
-    {
-        // When overriding, return array with expected keys
-        return [];
-    }
-
-    /**
-     * If Extension overrides tab_settings() and passes its own tab, add it to the tabbed settings metabox.
-     *
-     * @since 1.8 (Extension version 1.0.7)
-     *
-     * @return void
-     */
-    public function add_metabox_tab()
-    {
-        $tab_settings = $this->tab_settings();
-
-        // Don't add a tab if it's empty.
-        if (empty($tab_settings)) {
-            return;
-        }
-
-        $tab_defaults = [
-            'id'            => '',
-            'title'         => '',
-            'callback'      => '',
-            'icon-class'    => '',
-            'file'          => '',
-            'callback_args' => '',
-            'context'       => 'side',
-            'priority'      => 'default',
-        ];
-
-        $tab = wp_parse_args($tab_settings, $tab_defaults);
-
-        // Force the screen to be GravityView
-        $tab['screen'] = 'gravityview';
-
-        if (class_exists('GravityView_Metabox_Tab')) {
-            $metabox = new \GravityView_Metabox_Tab($tab['id'], $tab['title'], $tab['file'], $tab['icon-class'], $tab['callback'], $tab['callback_args']);
-            \GravityView_Metabox_Tabs::add($metabox);
-        } else {
-            add_meta_box('gravityview_'.$tab['id'], $tab['title'], $tab['callback'], $tab['screen'], $tab['context'], $tab['priority']);
-        }
-    }
-
-    /**
-     * Is this extension even compatible?
-     *
-     * @return bool|null Is or is not. Null if unknown yet.
-     */
-    public static function is_compatible()
-    {
-        return Utils::get(self::$is_compatible, get_called_class(), null);
-    }
-
-    /**
-     * Check whether the extension is supported:.
-     *
-     * - Checks if GravityView and Gravity Forms exist
-     * - Checks GravityView and Gravity Forms version numbers
-     * - Checks PHP version numbers
-     * - Sets self::$is_compatible[__CLASS__] to boolean value
-     *
-     * @return bool Is the extension supported?
-     */
-    protected function is_extension_supported()
-    {
-        self::$is_compatible = is_array(self::$is_compatible) ? self::$is_compatible : [get_called_class() => (bool) self::$is_compatible];
-
-        if (!function_exists('gravityview')) {
-            $message = sprintf(__('Could not activate the %s Extension; GravityView is not active.', 'gravityview'), esc_html($this->_title));
-        } elseif (false === version_compare(Plugin::$version, $this->_min_gravityview_version, '>=')) {
-            $message = sprintf(__('The %s Extension requires GravityView Version %s or newer.', 'gravityview'), esc_html($this->_title), '<tt>'.$this->_min_gravityview_version.'</tt>');
-        } elseif (isset($this->_min_php_version) && false === version_compare(phpversion(), $this->_min_php_version, '>=')) {
-            $message = sprintf(__('The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview'), esc_html($this->_title), '<tt>'.$this->_min_php_version.'</tt>');
-        } elseif (!empty($this->_max_gravityview_version) && false === version_compare($this->_max_gravityview_version, Plugin::$version, '>')) {
-            $message = sprintf(__('The %s Extension is not compatible with this version of GravityView. Please update the Extension to the latest version.', 'gravityview'), esc_html($this->_title));
-        } else {
-            $message = '';
-            self::$is_compatible[get_called_class()] = gravityview()->plugin->is_compatible();
-        }
-
-        if (!empty($message)) {
-            self::add_notice($message);
-            self::$is_compatible[get_called_class()] = false;
-            gravityview()->log->error('{message}', ['message' => $message]);
-        }
-
-        return self::is_compatible();
-    }
-
-    /**
-     * Load translations for the extension.
-     *
-     * 1. Check  `wp-content/languages/gravityview/` folder and load using `load_textdomain()`
-     * 2. Check  `wp-content/plugins/gravityview/languages/` folder for `gravityview-[locale].mo` file and load using `load_textdomain()`
-     * 3. Load default file using `load_plugin_textdomain()` from `wp-content/plugins/gravityview/languages/`
-     *
-     * @return void
-     */
-    public function load_plugin_textdomain()
-    {
-        if (empty($this->_text_domain)) {
-            gravityview()->log->debug('Extension translation cannot be loaded; the `_text_domain` variable is not defined', ['data' => $this]);
-
-            return;
-        }
-
-        // Backward compat for Ratings & Reviews / Maps
-        $path = isset($this->_path) ? $this->_path : (isset($this->plugin_file) ? $this->plugin_file : '');
-
-        // Set filter for plugin's languages directory
-        $lang_dir = dirname(plugin_basename($path)).'/languages/';
-
-        $locale = get_locale();
-
-        if (function_exists('get_user_locale') && is_admin()) {
-            $locale = get_user_locale();
-        }
-
-        // Traditional WordPress plugin locale filter
-        $locale = apply_filters('plugin_locale', $locale, $this->_text_domain);
-
-        $mofile = sprintf('%1$s-%2$s.mo', $this->_text_domain, $locale);
-
-        // Setup paths to current locale file
-        $mofile_local = $lang_dir.$mofile;
-        $mofile_global = WP_LANG_DIR.'/'.$this->_text_domain.'/'.$mofile;
-
-        if (file_exists($mofile_global)) {
-            // Look in global /wp-content/languages/[plugin-dir]/ folder
-            load_textdomain($this->_text_domain, $mofile_global);
-        } elseif (file_exists($mofile_local)) {
-            // Look in local /wp-content/plugins/[plugin-dir]/languages/ folder
-            load_textdomain($this->_text_domain, $mofile_local);
-        } else {
-            // Load the default language files
-            load_plugin_textdomain($this->_text_domain, false, $lang_dir);
-        }
-    }
-
-    /**
-     * Register the updater for the Extension using GravityView license information.
-     *
-     * @return void
-     */
-    public function settings()
-    {
-
-        // If doing ajax, get outta here.
-        if (!is_admin() || (defined('DOING_AJAX') && DOING_AJAX && 'update-plugin' !== Utils::_POST('action'))) {
-            return;
-        }
-
-        // To support auto-updates, this needs to run during the wp_version_check cron job for privileged users.
-        $doing_cron = defined('DOING_CRON') && DOING_CRON;
-        if (!current_user_can('manage_options') && !$doing_cron) {
-            return;
-        }
-
-        $license = $this->get_license();
-
-        if (!class_exists('\GV\EDD_SL_Plugin_Updater')) {
-            require_once gravityview()->plugin->dir('future/lib/EDD_SL_Plugin_Updater.php');
-        }
-
-        new EDD_SL_Plugin_Updater(
-            $this->_remote_update_url,
-            $this->_path,
-            [
-                'version'	    => $this->_version, // current version number
-                'license'	    => \GV\Utils::get($license, 'license_key', \GV\Utils::get($license, 'license', null)),
-                'item_id'     => $this->_item_id, // The ID of the download on _remote_update_url
-                'item_name'   => $this->_title,  // name of this plugin
-                'author' 	    => strip_tags($this->_author),  // author of this plugin
-                'php_version' => phpversion(),
-                'wp_version'  => get_bloginfo('version'),
-                'gv_version'  => \GV\Plugin::$version,
-                'environment' => function_exists('wp_get_environment_type') ? wp_get_environment_type() : 'production',
-            ]
-        );
-    }
-
-    /**
-     * Get license information from GravityView.
-     *
-     * @since 1.8 (Extension version 1.0.7)
-     *
-     * @return bool|array False: \GV\Addon_Settings class does not exist. Array: array of GV license data.
-     */
-    protected function get_license()
-    {
-        if (!class_exists('\GV\Addon_Settings')) {
-            return false;
-        }
-
-        return gravityview()->plugin->settings->get('license');
-    }
-
-    /**
-     * Add a notice to be displayed in the admin.
-     *
-     * @param array $notice Array with `class` and `message` keys. The message is not escaped.
-     *
-     * @return void
-     */
-    public static function add_notice($notice = [])
-    {
-        if (is_array($notice) && empty($notice['message'])) {
-            gravityview()->log->error('Notice not set', ['data' => $notice]);
-
-            return;
-        } elseif (is_string($notice)) {
-            $notice = ['message' => $notice];
-        }
-
-        $notice['class'] = empty($notice['class']) ? 'error' : $notice['class'];
-
-        self::$admin_notices[] = $notice;
-    }
-
-    /**
-     * Outputs the admin notices generated by the all plugins.
-     *
-     * @return void
-     */
-    public function admin_notice()
-    {
-        if (empty(self::$admin_notices)) {
-            return;
-        }
-
-        foreach (self::$admin_notices as $key => $notice) {
-            echo '<div id="message" class="'.esc_attr($notice['class']).'">';
-            echo wpautop($notice['message']);
-            echo '<div class="clear"></div>';
-            echo '</div>';
-        }
-
-        //reset the notices handler
-        self::$admin_notices = [];
-    }
+	/**
+	 * @var string Name of the plugin in gravityview.co
+	 */
+	protected $_title = null;
+
+	/**
+	 * @var string Version number of the plugin
+	 */
+	protected $_version = null;
+
+	/**
+	 * @var int The ID of the download on gravityview.co
+	 *
+	 * @since 1.1
+	 */
+	protected $_item_id = null;
+
+	/**
+	 * @var string Translation textdomain
+	 */
+	protected $_text_domain = 'gravityview';
+
+	/**
+	 * @var string Minimum version of GravityView the Extension requires
+	 */
+	protected $_min_gravityview_version = '2.0-dev';
+
+	/**
+	 * @var string Maximum version of GravityView the Extension requires, if any
+	 */
+	protected $_max_gravityview_version = null;
+
+	/**
+	 * @var string Minimum version of GravityView the Extension requires
+	 */
+	protected $_min_php_version = '5.3';
+
+	/**
+	 * @var string The URL to fetch license info from. Do not change unless you know what you're doing.
+	 */
+	protected $_remote_update_url = 'https://gravityview.co';
+
+	/**
+	 * @var string Author of plugin, sent when fetching license info.
+	 */
+	protected $_author = 'Katz Web Services, Inc.';
+
+	/**
+	 * @var string The path to the extension.
+	 */
+	protected $_path = '';
+
+	/**
+	 * @var array Admin notices to display
+	 */
+	protected static $admin_notices = [];
+
+	/**
+	 * @var bool[] An array of extension compatibility.
+	 *
+	 * @since 2.0 This is an array of classes instead.
+	 */
+	public static $is_compatible = [];
+
+	/**
+	 * Generic initialization.
+	 */
+	public function __construct()
+	{
+		if (false === $this->is_extension_supported()) {
+			return;
+		}
+
+		if (!$this->_path) {
+			$this->_path = __FILE__;
+		}
+
+		add_action('init', [$this, 'load_plugin_textdomain']);
+
+		add_action('admin_init', [$this, 'settings']);
+
+		add_action('admin_notices', [$this, 'admin_notice'], 100);
+
+		// Save the view configuration. Run at 14 so that View metadata is already saved (at 10)
+		add_action('save_post', [$this, 'save_post'], 14);
+
+		add_action('gravityview/metaboxes/before_render', [$this, 'add_metabox_tab']);
+
+		add_filter('gravityview/metaboxes/tooltips', [$this, 'tooltips']);
+
+		$this->add_hooks();
+	}
+
+	/**
+	 * Extensions should override this hook to add their hooks.
+	 *
+	 * @return void
+	 */
+	public function add_hooks()
+	{
+	}
+
+	/**
+	 * Save extra view configuration.
+	 *
+	 * @param int $post_id Post ID
+	 *
+	 * @return void
+	 */
+	public function save_post($post_id)
+	{
+	}
+
+	/**
+	 * Add tooltips for the extension.
+	 *
+	 * Add a tooltip with an array using the `title` and `value` keys. The `title` key is the H6 tag value of the tooltip; it's the headline. The `value` is the tooltip content, and can contain any HTML.
+	 *
+	 * The tooltip key must be `gv_{name_of_setting}`. If the name of the setting is "example_extension_setting", the code would be:
+	 *
+	 * <code>
+	 * $tooltips['gv_example_extension_setting'] = array(
+	 * 	'title'	=> 'About Example Extension Setting',
+	 *  'value'	=> 'When you do [x] with [y], [z] happens.'
+	 * );
+	 * </code>
+	 *
+	 * @param array $tooltips Existing GV tooltips, with `title` and `value` keys
+	 *
+	 * @return array Modified tooltips
+	 */
+	public function tooltips($tooltips = [])
+	{
+		return $tooltips;
+	}
+
+	/**
+	 * Add a tab to GravityView Edit View tabbed metabox. By overriding this method, you will add a tab to View settings.
+	 *
+	 * @since 1.8 (Extension version 1.0.7)
+	 * @see https://gist.github.com/zackkatz/6cc381bcf54849f2ed41 For example of adding a metabox
+	 *
+	 * @return array Array of metabox
+	 */
+	protected function tab_settings()
+	{
+		// When overriding, return array with expected keys
+		return [];
+	}
+
+	/**
+	 * If Extension overrides tab_settings() and passes its own tab, add it to the tabbed settings metabox.
+	 *
+	 * @since 1.8 (Extension version 1.0.7)
+	 *
+	 * @return void
+	 */
+	public function add_metabox_tab()
+	{
+		$tab_settings = $this->tab_settings();
+
+		// Don't add a tab if it's empty.
+		if (empty($tab_settings)) {
+			return;
+		}
+
+		$tab_defaults = [
+			'id'            => '',
+			'title'         => '',
+			'callback'      => '',
+			'icon-class'    => '',
+			'file'          => '',
+			'callback_args' => '',
+			'context'       => 'side',
+			'priority'      => 'default',
+		];
+
+		$tab = wp_parse_args($tab_settings, $tab_defaults);
+
+		// Force the screen to be GravityView
+		$tab['screen'] = 'gravityview';
+
+		if (class_exists('GravityView_Metabox_Tab')) {
+			$metabox = new \GravityView_Metabox_Tab($tab['id'], $tab['title'], $tab['file'], $tab['icon-class'], $tab['callback'], $tab['callback_args']);
+			\GravityView_Metabox_Tabs::add($metabox);
+		} else {
+			add_meta_box('gravityview_'.$tab['id'], $tab['title'], $tab['callback'], $tab['screen'], $tab['context'], $tab['priority']);
+		}
+	}
+
+	/**
+	 * Is this extension even compatible?
+	 *
+	 * @return bool|null Is or is not. Null if unknown yet.
+	 */
+	public static function is_compatible()
+	{
+		return Utils::get(self::$is_compatible, get_called_class(), null);
+	}
+
+	/**
+	 * Check whether the extension is supported:.
+	 *
+	 * - Checks if GravityView and Gravity Forms exist
+	 * - Checks GravityView and Gravity Forms version numbers
+	 * - Checks PHP version numbers
+	 * - Sets self::$is_compatible[__CLASS__] to boolean value
+	 *
+	 * @return bool Is the extension supported?
+	 */
+	protected function is_extension_supported()
+	{
+		self::$is_compatible = is_array(self::$is_compatible) ? self::$is_compatible : [get_called_class() => (bool) self::$is_compatible];
+
+		if (!function_exists('gravityview')) {
+			$message = sprintf(__('Could not activate the %s Extension; GravityView is not active.', 'gravityview'), esc_html($this->_title));
+		} elseif (false === version_compare(Plugin::$version, $this->_min_gravityview_version, '>=')) {
+			$message = sprintf(__('The %s Extension requires GravityView Version %s or newer.', 'gravityview'), esc_html($this->_title), '<tt>'.$this->_min_gravityview_version.'</tt>');
+		} elseif (isset($this->_min_php_version) && false === version_compare(phpversion(), $this->_min_php_version, '>=')) {
+			$message = sprintf(__('The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview'), esc_html($this->_title), '<tt>'.$this->_min_php_version.'</tt>');
+		} elseif (!empty($this->_max_gravityview_version) && false === version_compare($this->_max_gravityview_version, Plugin::$version, '>')) {
+			$message = sprintf(__('The %s Extension is not compatible with this version of GravityView. Please update the Extension to the latest version.', 'gravityview'), esc_html($this->_title));
+		} else {
+			$message = '';
+			self::$is_compatible[get_called_class()] = gravityview()->plugin->is_compatible();
+		}
+
+		if (!empty($message)) {
+			self::add_notice($message);
+			self::$is_compatible[get_called_class()] = false;
+			gravityview()->log->error('{message}', ['message' => $message]);
+		}
+
+		return self::is_compatible();
+	}
+
+	/**
+	 * Load translations for the extension.
+	 *
+	 * 1. Check  `wp-content/languages/gravityview/` folder and load using `load_textdomain()`
+	 * 2. Check  `wp-content/plugins/gravityview/languages/` folder for `gravityview-[locale].mo` file and load using `load_textdomain()`
+	 * 3. Load default file using `load_plugin_textdomain()` from `wp-content/plugins/gravityview/languages/`
+	 *
+	 * @return void
+	 */
+	public function load_plugin_textdomain()
+	{
+		if (empty($this->_text_domain)) {
+			gravityview()->log->debug('Extension translation cannot be loaded; the `_text_domain` variable is not defined', ['data' => $this]);
+
+			return;
+		}
+
+		// Backward compat for Ratings & Reviews / Maps
+		$path = isset($this->_path) ? $this->_path : (isset($this->plugin_file) ? $this->plugin_file : '');
+
+		// Set filter for plugin's languages directory
+		$lang_dir = dirname(plugin_basename($path)).'/languages/';
+
+		$locale = get_locale();
+
+		if (function_exists('get_user_locale') && is_admin()) {
+			$locale = get_user_locale();
+		}
+
+		// Traditional WordPress plugin locale filter
+		$locale = apply_filters('plugin_locale', $locale, $this->_text_domain);
+
+		$mofile = sprintf('%1$s-%2$s.mo', $this->_text_domain, $locale);
+
+		// Setup paths to current locale file
+		$mofile_local = $lang_dir.$mofile;
+		$mofile_global = WP_LANG_DIR.'/'.$this->_text_domain.'/'.$mofile;
+
+		if (file_exists($mofile_global)) {
+			// Look in global /wp-content/languages/[plugin-dir]/ folder
+			load_textdomain($this->_text_domain, $mofile_global);
+		} elseif (file_exists($mofile_local)) {
+			// Look in local /wp-content/plugins/[plugin-dir]/languages/ folder
+			load_textdomain($this->_text_domain, $mofile_local);
+		} else {
+			// Load the default language files
+			load_plugin_textdomain($this->_text_domain, false, $lang_dir);
+		}
+	}
+
+	/**
+	 * Register the updater for the Extension using GravityView license information.
+	 *
+	 * @return void
+	 */
+	public function settings()
+	{
+
+		// If doing ajax, get outta here.
+		if (!is_admin() || (defined('DOING_AJAX') && DOING_AJAX && 'update-plugin' !== Utils::_POST('action'))) {
+			return;
+		}
+
+		// To support auto-updates, this needs to run during the wp_version_check cron job for privileged users.
+		$doing_cron = defined('DOING_CRON') && DOING_CRON;
+		if (!current_user_can('manage_options') && !$doing_cron) {
+			return;
+		}
+
+		$license = $this->get_license();
+
+		if (!class_exists('\GV\EDD_SL_Plugin_Updater')) {
+			require_once gravityview()->plugin->dir('future/lib/EDD_SL_Plugin_Updater.php');
+		}
+
+		new EDD_SL_Plugin_Updater(
+			$this->_remote_update_url,
+			$this->_path,
+			[
+				'version'	    => $this->_version, // current version number
+				'license'	    => \GV\Utils::get($license, 'license_key', \GV\Utils::get($license, 'license', null)),
+				'item_id'     => $this->_item_id, // The ID of the download on _remote_update_url
+				'item_name'   => $this->_title,  // name of this plugin
+				'author' 	    => strip_tags($this->_author),  // author of this plugin
+				'php_version' => phpversion(),
+				'wp_version'  => get_bloginfo('version'),
+				'gv_version'  => \GV\Plugin::$version,
+				'environment' => function_exists('wp_get_environment_type') ? wp_get_environment_type() : 'production',
+			]
+		);
+	}
+
+	/**
+	 * Get license information from GravityView.
+	 *
+	 * @since 1.8 (Extension version 1.0.7)
+	 *
+	 * @return bool|array False: \GV\Addon_Settings class does not exist. Array: array of GV license data.
+	 */
+	protected function get_license()
+	{
+		if (!class_exists('\GV\Addon_Settings')) {
+			return false;
+		}
+
+		return gravityview()->plugin->settings->get('license');
+	}
+
+	/**
+	 * Add a notice to be displayed in the admin.
+	 *
+	 * @param array $notice Array with `class` and `message` keys. The message is not escaped.
+	 *
+	 * @return void
+	 */
+	public static function add_notice($notice = [])
+	{
+		if (is_array($notice) && empty($notice['message'])) {
+			gravityview()->log->error('Notice not set', ['data' => $notice]);
+
+			return;
+		} elseif (is_string($notice)) {
+			$notice = ['message' => $notice];
+		}
+
+		$notice['class'] = empty($notice['class']) ? 'error' : $notice['class'];
+
+		self::$admin_notices[] = $notice;
+	}
+
+	/**
+	 * Outputs the admin notices generated by the all plugins.
+	 *
+	 * @return void
+	 */
+	public function admin_notice()
+	{
+		if (empty(self::$admin_notices)) {
+			return;
+		}
+
+		foreach (self::$admin_notices as $key => $notice) {
+			echo '<div id="message" class="'.esc_attr($notice['class']).'">';
+			echo wpautop($notice['message']);
+			echo '<div class="clear"></div>';
+			echo '</div>';
+		}
+
+		//reset the notices handler
+		self::$admin_notices = [];
+	}
 }

Spacing +75 added lines, -75 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -69,40 +69,40 @@ 
     /**
      * @var array Admin notices to display
      */
-    protected static $admin_notices = [];
+    protected static $admin_notices = [ ];
 
     /**
      * @var bool[] An array of extension compatibility.
      *
      * @since 2.0 This is an array of classes instead.
      */
-    public static $is_compatible = [];
+    public static $is_compatible = [ ];
 
     /**
      * Generic initialization.
      */
     public function __construct()
     {
-        if (false === $this->is_extension_supported()) {
+        if ( false === $this->is_extension_supported() ) {
             return;
         }
 
-        if (!$this->_path) {
+        if ( ! $this->_path ) {
             $this->_path = __FILE__;
         }
 
-        add_action('init', [$this, 'load_plugin_textdomain']);
+        add_action( 'init', [ $this, 'load_plugin_textdomain' ] );
 
-        add_action('admin_init', [$this, 'settings']);
+        add_action( 'admin_init', [ $this, 'settings' ] );
 
-        add_action('admin_notices', [$this, 'admin_notice'], 100);
+        add_action( 'admin_notices', [ $this, 'admin_notice' ], 100 );
 
         // Save the view configuration. Run at 14 so that View metadata is already saved (at 10)
-        add_action('save_post', [$this, 'save_post'], 14);
+        add_action( 'save_post', [ $this, 'save_post' ], 14 );
 
-        add_action('gravityview/metaboxes/before_render', [$this, 'add_metabox_tab']);
+        add_action( 'gravityview/metaboxes/before_render', [ $this, 'add_metabox_tab' ] );
 
-        add_filter('gravityview/metaboxes/tooltips', [$this, 'tooltips']);
+        add_filter( 'gravityview/metaboxes/tooltips', [ $this, 'tooltips' ] );
 
         $this->add_hooks();
     }
@@ -123,7 +123,7 @@ 
      *
      * @return void
      */
-    public function save_post($post_id)
+    public function save_post( $post_id )
     {
     }
 
@@ -145,7 +145,7 @@ 
      *
      * @return array Modified tooltips
      */
-    public function tooltips($tooltips = [])
+    public function tooltips( $tooltips = [ ] )
     {
         return $tooltips;
     }
@@ -161,7 +161,7 @@ 
     protected function tab_settings()
     {
         // When overriding, return array with expected keys
-        return [];
+        return [ ];
     }
 
     /**
@@ -176,7 +176,7 @@ 
         $tab_settings = $this->tab_settings();
 
         // Don't add a tab if it's empty.
-        if (empty($tab_settings)) {
+        if ( empty( $tab_settings ) ) {
             return;
         }
 
@@ -191,16 +191,16 @@ 
             'priority'      => 'default',
         ];
 
-        $tab = wp_parse_args($tab_settings, $tab_defaults);
+        $tab = wp_parse_args( $tab_settings, $tab_defaults );
 
         // Force the screen to be GravityView
-        $tab['screen'] = 'gravityview';
+        $tab[ 'screen' ] = 'gravityview';
 
-        if (class_exists('GravityView_Metabox_Tab')) {
-            $metabox = new \GravityView_Metabox_Tab($tab['id'], $tab['title'], $tab['file'], $tab['icon-class'], $tab['callback'], $tab['callback_args']);
-            \GravityView_Metabox_Tabs::add($metabox);
+        if ( class_exists( 'GravityView_Metabox_Tab' ) ) {
+            $metabox = new \GravityView_Metabox_Tab( $tab[ 'id' ], $tab[ 'title' ], $tab[ 'file' ], $tab[ 'icon-class' ], $tab[ 'callback' ], $tab[ 'callback_args' ] );
+            \GravityView_Metabox_Tabs::add( $metabox );
         } else {
-            add_meta_box('gravityview_'.$tab['id'], $tab['title'], $tab['callback'], $tab['screen'], $tab['context'], $tab['priority']);
+            add_meta_box( 'gravityview_' . $tab[ 'id' ], $tab[ 'title' ], $tab[ 'callback' ], $tab[ 'screen' ], $tab[ 'context' ], $tab[ 'priority' ] );
         }
     }
 
@@ -211,7 +211,7 @@ 
      */
     public static function is_compatible()
     {
-        return Utils::get(self::$is_compatible, get_called_class(), null);
+        return Utils::get( self::$is_compatible, get_called_class(), null );
     }
 
     /**
@@ -226,25 +226,25 @@ 
      */
     protected function is_extension_supported()
     {
-        self::$is_compatible = is_array(self::$is_compatible) ? self::$is_compatible : [get_called_class() => (bool) self::$is_compatible];
-
-        if (!function_exists('gravityview')) {
-            $message = sprintf(__('Could not activate the %s Extension; GravityView is not active.', 'gravityview'), esc_html($this->_title));
-        } elseif (false === version_compare(Plugin::$version, $this->_min_gravityview_version, '>=')) {
-            $message = sprintf(__('The %s Extension requires GravityView Version %s or newer.', 'gravityview'), esc_html($this->_title), '<tt>'.$this->_min_gravityview_version.'</tt>');
-        } elseif (isset($this->_min_php_version) && false === version_compare(phpversion(), $this->_min_php_version, '>=')) {
-            $message = sprintf(__('The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview'), esc_html($this->_title), '<tt>'.$this->_min_php_version.'</tt>');
-        } elseif (!empty($this->_max_gravityview_version) && false === version_compare($this->_max_gravityview_version, Plugin::$version, '>')) {
-            $message = sprintf(__('The %s Extension is not compatible with this version of GravityView. Please update the Extension to the latest version.', 'gravityview'), esc_html($this->_title));
+        self::$is_compatible = is_array( self::$is_compatible ) ? self::$is_compatible : [ get_called_class() => (bool)self::$is_compatible ];
+
+        if ( ! function_exists( 'gravityview' ) ) {
+            $message = sprintf( __( 'Could not activate the %s Extension; GravityView is not active.', 'gravityview' ), esc_html( $this->_title ) );
+        } elseif ( false === version_compare( Plugin::$version, $this->_min_gravityview_version, '>=' ) ) {
+            $message = sprintf( __( 'The %s Extension requires GravityView Version %s or newer.', 'gravityview' ), esc_html( $this->_title ), '<tt>' . $this->_min_gravityview_version . '</tt>' );
+        } elseif ( isset( $this->_min_php_version ) && false === version_compare( phpversion(), $this->_min_php_version, '>=' ) ) {
+            $message = sprintf( __( 'The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview' ), esc_html( $this->_title ), '<tt>' . $this->_min_php_version . '</tt>' );
+        } elseif ( ! empty( $this->_max_gravityview_version ) && false === version_compare( $this->_max_gravityview_version, Plugin::$version, '>' ) ) {
+            $message = sprintf( __( 'The %s Extension is not compatible with this version of GravityView. Please update the Extension to the latest version.', 'gravityview' ), esc_html( $this->_title ) );
         } else {
             $message = '';
-            self::$is_compatible[get_called_class()] = gravityview()->plugin->is_compatible();
+            self::$is_compatible[ get_called_class() ] = gravityview()->plugin->is_compatible();
         }
 
-        if (!empty($message)) {
-            self::add_notice($message);
-            self::$is_compatible[get_called_class()] = false;
-            gravityview()->log->error('{message}', ['message' => $message]);
+        if ( ! empty( $message ) ) {
+            self::add_notice( $message );
+            self::$is_compatible[ get_called_class() ] = false;
+            gravityview()->log->error( '{message}', [ 'message' => $message ] );
         }
 
         return self::is_compatible();
@@ -261,42 +261,42 @@ 
      */
     public function load_plugin_textdomain()
     {
-        if (empty($this->_text_domain)) {
-            gravityview()->log->debug('Extension translation cannot be loaded; the `_text_domain` variable is not defined', ['data' => $this]);
+        if ( empty( $this->_text_domain ) ) {
+            gravityview()->log->debug( 'Extension translation cannot be loaded; the `_text_domain` variable is not defined', [ 'data' => $this ] );
 
             return;
         }
 
         // Backward compat for Ratings & Reviews / Maps
-        $path = isset($this->_path) ? $this->_path : (isset($this->plugin_file) ? $this->plugin_file : '');
+        $path = isset( $this->_path ) ? $this->_path : ( isset( $this->plugin_file ) ? $this->plugin_file : '' );
 
         // Set filter for plugin's languages directory
-        $lang_dir = dirname(plugin_basename($path)).'/languages/';
+        $lang_dir = dirname( plugin_basename( $path ) ) . '/languages/';
 
         $locale = get_locale();
 
-        if (function_exists('get_user_locale') && is_admin()) {
+        if ( function_exists( 'get_user_locale' ) && is_admin() ) {
             $locale = get_user_locale();
         }
 
         // Traditional WordPress plugin locale filter
-        $locale = apply_filters('plugin_locale', $locale, $this->_text_domain);
+        $locale = apply_filters( 'plugin_locale', $locale, $this->_text_domain );
 
-        $mofile = sprintf('%1$s-%2$s.mo', $this->_text_domain, $locale);
+        $mofile = sprintf( '%1$s-%2$s.mo', $this->_text_domain, $locale );
 
         // Setup paths to current locale file
-        $mofile_local = $lang_dir.$mofile;
-        $mofile_global = WP_LANG_DIR.'/'.$this->_text_domain.'/'.$mofile;
+        $mofile_local = $lang_dir . $mofile;
+        $mofile_global = WP_LANG_DIR . '/' . $this->_text_domain . '/' . $mofile;
 
-        if (file_exists($mofile_global)) {
+        if ( file_exists( $mofile_global ) ) {
             // Look in global /wp-content/languages/[plugin-dir]/ folder
-            load_textdomain($this->_text_domain, $mofile_global);
-        } elseif (file_exists($mofile_local)) {
+            load_textdomain( $this->_text_domain, $mofile_global );
+        } elseif ( file_exists( $mofile_local ) ) {
             // Look in local /wp-content/plugins/[plugin-dir]/languages/ folder
-            load_textdomain($this->_text_domain, $mofile_local);
+            load_textdomain( $this->_text_domain, $mofile_local );
         } else {
             // Load the default language files
-            load_plugin_textdomain($this->_text_domain, false, $lang_dir);
+            load_plugin_textdomain( $this->_text_domain, false, $lang_dir );
         }
     }
 
@@ -309,20 +309,20 @@ 
     {
 
         // If doing ajax, get outta here.
-        if (!is_admin() || (defined('DOING_AJAX') && DOING_AJAX && 'update-plugin' !== Utils::_POST('action'))) {
+        if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST( 'action' ) ) ) {
             return;
         }
 
         // To support auto-updates, this needs to run during the wp_version_check cron job for privileged users.
-        $doing_cron = defined('DOING_CRON') && DOING_CRON;
-        if (!current_user_can('manage_options') && !$doing_cron) {
+        $doing_cron = defined( 'DOING_CRON' ) && DOING_CRON;
+        if ( ! current_user_can( 'manage_options' ) && ! $doing_cron ) {
             return;
         }
 
         $license = $this->get_license();
 
-        if (!class_exists('\GV\EDD_SL_Plugin_Updater')) {
-            require_once gravityview()->plugin->dir('future/lib/EDD_SL_Plugin_Updater.php');
+        if ( ! class_exists( '\GV\EDD_SL_Plugin_Updater' ) ) {
+            require_once gravityview()->plugin->dir( 'future/lib/EDD_SL_Plugin_Updater.php' );
         }
 
         new EDD_SL_Plugin_Updater(
@@ -330,14 +330,14 @@ 
             $this->_path,
             [
                 'version'	    => $this->_version, // current version number
-                'license'	    => \GV\Utils::get($license, 'license_key', \GV\Utils::get($license, 'license', null)),
+                'license'	    => \GV\Utils::get( $license, 'license_key', \GV\Utils::get( $license, 'license', null ) ),
                 'item_id'     => $this->_item_id, // The ID of the download on _remote_update_url
-                'item_name'   => $this->_title,  // name of this plugin
-                'author' 	    => strip_tags($this->_author),  // author of this plugin
+                'item_name'   => $this->_title, // name of this plugin
+                'author' 	    => strip_tags( $this->_author ), // author of this plugin
                 'php_version' => phpversion(),
-                'wp_version'  => get_bloginfo('version'),
+                'wp_version'  => get_bloginfo( 'version' ),
                 'gv_version'  => \GV\Plugin::$version,
-                'environment' => function_exists('wp_get_environment_type') ? wp_get_environment_type() : 'production',
+                'environment' => function_exists( 'wp_get_environment_type' ) ? wp_get_environment_type() : 'production',
             ]
         );
     }
@@ -351,11 +351,11 @@ 
      */
     protected function get_license()
     {
-        if (!class_exists('\GV\Addon_Settings')) {
+        if ( ! class_exists( '\GV\Addon_Settings' ) ) {
             return false;
         }
 
-        return gravityview()->plugin->settings->get('license');
+        return gravityview()->plugin->settings->get( 'license' );
     }
 
     /**
@@ -365,19 +365,19 @@ 
      *
      * @return void
      */
-    public static function add_notice($notice = [])
+    public static function add_notice( $notice = [ ] )
     {
-        if (is_array($notice) && empty($notice['message'])) {
-            gravityview()->log->error('Notice not set', ['data' => $notice]);
+        if ( is_array( $notice ) && empty( $notice[ 'message' ] ) ) {
+            gravityview()->log->error( 'Notice not set', [ 'data' => $notice ] );
 
             return;
-        } elseif (is_string($notice)) {
-            $notice = ['message' => $notice];
+        } elseif ( is_string( $notice ) ) {
+            $notice = [ 'message' => $notice ];
         }
 
-        $notice['class'] = empty($notice['class']) ? 'error' : $notice['class'];
+        $notice[ 'class' ] = empty( $notice[ 'class' ] ) ? 'error' : $notice[ 'class' ];
 
-        self::$admin_notices[] = $notice;
+        self::$admin_notices[ ] = $notice;
     }
 
     /**
@@ -387,18 +387,18 @@ 
      */
     public function admin_notice()
     {
-        if (empty(self::$admin_notices)) {
+        if ( empty( self::$admin_notices ) ) {
             return;
         }
 
-        foreach (self::$admin_notices as $key => $notice) {
-            echo '<div id="message" class="'.esc_attr($notice['class']).'">';
-            echo wpautop($notice['message']);
+        foreach ( self::$admin_notices as $key => $notice ) {
+            echo '<div id="message" class="' . esc_attr( $notice[ 'class' ] ) . '">';
+            echo wpautop( $notice[ 'message' ] );
             echo '<div class="clear"></div>';
             echo '</div>';
         }
 
         //reset the notices handler
-        self::$admin_notices = [];
+        self::$admin_notices = [ ];
     }
 }

Braces +14 added lines, -28 removed lines

@@ -12,8 +12,7 @@ 
  *
  * An interface that most extensions would want to adhere to and inherit from.
  */
-abstract class Extension
-{
+abstract class Extension {
     /**
      * @var string Name of the plugin in gravityview.co
      */
@@ -81,8 +80,7 @@ 
     /**
      * Generic initialization.
      */
-    public function __construct()
-    {
+    public function __construct() {
         if (false === $this->is_extension_supported()) {
             return;
         }
@@ -112,8 +110,7 @@ 
      *
      * @return void
      */
-    public function add_hooks()
-    {
+    public function add_hooks() {
     }
 
     /**
@@ -123,8 +120,7 @@ 
      *
      * @return void
      */
-    public function save_post($post_id)
-    {
+    public function save_post($post_id) {
     }
 
     /**
@@ -145,8 +141,7 @@ 
      *
      * @return array Modified tooltips
      */
-    public function tooltips($tooltips = [])
-    {
+    public function tooltips($tooltips = []) {
         return $tooltips;
     }
 
@@ -158,8 +153,7 @@ 
      *
      * @return array Array of metabox
      */
-    protected function tab_settings()
-    {
+    protected function tab_settings() {
         // When overriding, return array with expected keys
         return [];
     }
@@ -171,8 +165,7 @@ 
      *
      * @return void
      */
-    public function add_metabox_tab()
-    {
+    public function add_metabox_tab() {
         $tab_settings = $this->tab_settings();
 
         // Don't add a tab if it's empty.
@@ -209,8 +202,7 @@ 
      *
      * @return bool|null Is or is not. Null if unknown yet.
      */
-    public static function is_compatible()
-    {
+    public static function is_compatible() {
         return Utils::get(self::$is_compatible, get_called_class(), null);
     }
 
@@ -224,8 +216,7 @@ 
      *
      * @return bool Is the extension supported?
      */
-    protected function is_extension_supported()
-    {
+    protected function is_extension_supported() {
         self::$is_compatible = is_array(self::$is_compatible) ? self::$is_compatible : [get_called_class() => (bool) self::$is_compatible];
 
         if (!function_exists('gravityview')) {
@@ -259,8 +250,7 @@ 
      *
      * @return void
      */
-    public function load_plugin_textdomain()
-    {
+    public function load_plugin_textdomain() {
         if (empty($this->_text_domain)) {
             gravityview()->log->debug('Extension translation cannot be loaded; the `_text_domain` variable is not defined', ['data' => $this]);
 
@@ -305,8 +295,7 @@ 
      *
      * @return void
      */
-    public function settings()
-    {
+    public function settings() {
 
         // If doing ajax, get outta here.
         if (!is_admin() || (defined('DOING_AJAX') && DOING_AJAX && 'update-plugin' !== Utils::_POST('action'))) {
@@ -349,8 +338,7 @@ 
      *
      * @return bool|array False: \GV\Addon_Settings class does not exist. Array: array of GV license data.
      */
-    protected function get_license()
-    {
+    protected function get_license() {
         if (!class_exists('\GV\Addon_Settings')) {
             return false;
         }
@@ -365,8 +353,7 @@ 
      *
      * @return void
      */
-    public static function add_notice($notice = [])
-    {
+    public static function add_notice($notice = []) {
         if (is_array($notice) && empty($notice['message'])) {
             gravityview()->log->error('Notice not set', ['data' => $notice]);
 
@@ -385,8 +372,7 @@ 
      *
      * @return void
      */
-    public function admin_notice()
-    {
+    public function admin_notice() {
         if (empty(self::$admin_notices)) {
             return;
         }

future/includes/class-gv-template-field-html.php

Indentation +5 added lines, -5 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -14,8 +14,8 @@ 
  */
 class Field_HTML_Template extends Field_Template
 {
-    /**
-     * @var string The template slug to be loaded (like "table", "list", "plain")
-     */
-    public static $slug = 'html';
+	/**
+	 * @var string The template slug to be loaded (like "table", "list", "plain")
+	 */
+	public static $slug = 'html';
 }

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 

Braces +1 added lines, -2 removed lines

@@ -12,8 +12,7 @@
  *
  * Attached to a \GV\Field and used by a \GV\Field_Renderer.
  */
-class Field_HTML_Template extends Field_Template
-{
+class Field_HTML_Template extends Field_Template {
     /**
      * @var string The template slug to be loaded (like "table", "list", "plain")
      */

future/includes/class-gv-shortcode.php

Indentation +130 added lines, -130 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -14,135 +14,135 @@ 
  */
 class Shortcode
 {
-    /*
+	/*
      * @var array All GravityView-registered and loaded shortcodes can be found here.
      */
-    private static $shortcodes;
-
-    /**
-     * @var array The parsed attributes of this shortcode.
-     */
-    public $atts;
-
-    /**
-     * @var string The parsed name of this shortcode.
-     */
-    public $name;
-
-    /**
-     * @var string The parsed content between tags of this shortcode.
-     */
-    public $content;
-
-    /**
-     * The WordPress Shortcode API callback for this shortcode.
-     *
-     * @param array  $atts    The attributes passed.
-     * @param string $content The content inside the shortcode.
-     * @param string $tag     The tag.
-     *
-     * @return string The output.
-     */
-    public function callback($atts, $content = '', $tag = '')
-    {
-        gravityview()->log->error('[{shortcode}] shortcode {class}::callback method not implemented.', ['shortcode' => $this->name, 'class' => get_class($this)]);
-
-        return '';
-    }
-
-    /**
-     * Register this shortcode class with the WordPress Shortcode API.
-     *
-     * @internal
-     *
-     * @since develop
-     *
-     * @param string $name A shortcode name override. Default: self::$name
-     *
-     * @return \GV\Shortcode|null The only internally registered instance of this shortcode, or null on error.
-     */
-    public static function add($name = null)
-    {
-        $shortcode = new static();
-        $name = $name ? $name : $shortcode->name;
-        if (shortcode_exists($name)) {
-            if (empty(self::$shortcodes[$name])) {
-                gravityview()->log->error('Shortcode [{shortcode}] has already been registered elsewhere.', ['shortcode' => $name]);
-
-                return null;
-            }
-        } else {
-            add_shortcode($name, [$shortcode, 'callback']);
-            self::$shortcodes[$name] = $shortcode;
-        }
-
-        return self::$shortcodes[$name];
-    }
-
-    /**
-     * Unregister this shortcode.
-     *
-     * @internal
-     *
-     * @return void
-     */
-    public static function remove()
-    {
-        $shortcode = new static();
-        unset(self::$shortcodes[$shortcode->name]);
-        remove_shortcode($shortcode->name);
-    }
-
-    /**
-     * Parse a string of content and figure out which ones there are.
-     *
-     * Only registered shortcodes (via add_shortcode) will show up.
-     * Returned order is not guaranteed.
-     *
-     * @param string $content Some post content to search through.
-     *
-     * @internal
-     *
-     * @return \GV\Shortcode[] An array of \GV\Shortcode (and subclass) instances.
-     */
-    public static function parse($content)
-    {
-        $shortcodes = [];
-
-        /**
-         * The matches contains:.
-         *
-         * 1 - An extra [ to allow for escaping shortcodes with double [[]]
-         * 2 - The shortcode name
-         * 3 - The shortcode argument list
-         * 4 - The self closing /
-         * 5 - The content of a shortcode when it wraps some content.
-         * 6 - An extra ] to allow for escaping shortcodes with double [[]]
-         */
-        preg_match_all('/'.get_shortcode_regex().'/', $content, $matches, PREG_SET_ORDER);
-
-        foreach ($matches as $shortcode) {
-            $shortcode_name = $shortcode[2];
-
-            $shortcode_atts = shortcode_parse_atts($shortcode[3]);
-            $shortcode_content = $shortcode[5];
-
-            /** This is a registered GravityView shortcode. */
-            if (!empty(self::$shortcodes[$shortcode_name])) {
-                $shortcode = clone self::$shortcodes[$shortcode_name];
-            } else {
-                /** This is some generic shortcode. */
-                $shortcode = new self();
-                $shortcode->name = $shortcode_name;
-            }
-
-            $shortcode->atts = $shortcode_atts;
-            $shortcode->content = $shortcode_content;
-
-            /** Merge inner shortcodes. */
-            $shortcodes = array_merge($shortcodes, [$shortcode], self::parse($shortcode_content));
-        }
-
-        return $shortcodes;
-    }
+	private static $shortcodes;
+
+	/**
+	 * @var array The parsed attributes of this shortcode.
+	 */
+	public $atts;
+
+	/**
+	 * @var string The parsed name of this shortcode.
+	 */
+	public $name;
+
+	/**
+	 * @var string The parsed content between tags of this shortcode.
+	 */
+	public $content;
+
+	/**
+	 * The WordPress Shortcode API callback for this shortcode.
+	 *
+	 * @param array  $atts    The attributes passed.
+	 * @param string $content The content inside the shortcode.
+	 * @param string $tag     The tag.
+	 *
+	 * @return string The output.
+	 */
+	public function callback($atts, $content = '', $tag = '')
+	{
+		gravityview()->log->error('[{shortcode}] shortcode {class}::callback method not implemented.', ['shortcode' => $this->name, 'class' => get_class($this)]);
+
+		return '';
+	}
+
+	/**
+	 * Register this shortcode class with the WordPress Shortcode API.
+	 *
+	 * @internal
+	 *
+	 * @since develop
+	 *
+	 * @param string $name A shortcode name override. Default: self::$name
+	 *
+	 * @return \GV\Shortcode|null The only internally registered instance of this shortcode, or null on error.
+	 */
+	public static function add($name = null)
+	{
+		$shortcode = new static();
+		$name = $name ? $name : $shortcode->name;
+		if (shortcode_exists($name)) {
+			if (empty(self::$shortcodes[$name])) {
+				gravityview()->log->error('Shortcode [{shortcode}] has already been registered elsewhere.', ['shortcode' => $name]);
+
+				return null;
+			}
+		} else {
+			add_shortcode($name, [$shortcode, 'callback']);
+			self::$shortcodes[$name] = $shortcode;
+		}
+
+		return self::$shortcodes[$name];
+	}
+
+	/**
+	 * Unregister this shortcode.
+	 *
+	 * @internal
+	 *
+	 * @return void
+	 */
+	public static function remove()
+	{
+		$shortcode = new static();
+		unset(self::$shortcodes[$shortcode->name]);
+		remove_shortcode($shortcode->name);
+	}
+
+	/**
+	 * Parse a string of content and figure out which ones there are.
+	 *
+	 * Only registered shortcodes (via add_shortcode) will show up.
+	 * Returned order is not guaranteed.
+	 *
+	 * @param string $content Some post content to search through.
+	 *
+	 * @internal
+	 *
+	 * @return \GV\Shortcode[] An array of \GV\Shortcode (and subclass) instances.
+	 */
+	public static function parse($content)
+	{
+		$shortcodes = [];
+
+		/**
+		 * The matches contains:.
+		 *
+		 * 1 - An extra [ to allow for escaping shortcodes with double [[]]
+		 * 2 - The shortcode name
+		 * 3 - The shortcode argument list
+		 * 4 - The self closing /
+		 * 5 - The content of a shortcode when it wraps some content.
+		 * 6 - An extra ] to allow for escaping shortcodes with double [[]]
+		 */
+		preg_match_all('/'.get_shortcode_regex().'/', $content, $matches, PREG_SET_ORDER);
+
+		foreach ($matches as $shortcode) {
+			$shortcode_name = $shortcode[2];
+
+			$shortcode_atts = shortcode_parse_atts($shortcode[3]);
+			$shortcode_content = $shortcode[5];
+
+			/** This is a registered GravityView shortcode. */
+			if (!empty(self::$shortcodes[$shortcode_name])) {
+				$shortcode = clone self::$shortcodes[$shortcode_name];
+			} else {
+				/** This is some generic shortcode. */
+				$shortcode = new self();
+				$shortcode->name = $shortcode_name;
+			}
+
+			$shortcode->atts = $shortcode_atts;
+			$shortcode->content = $shortcode_content;
+
+			/** Merge inner shortcodes. */
+			$shortcodes = array_merge($shortcodes, [$shortcode], self::parse($shortcode_content));
+		}
+
+		return $shortcodes;
+	}
 }

Spacing +22 added lines, -22 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -43,9 +43,9 @@ 
      *
      * @return string The output.
      */
-    public function callback($atts, $content = '', $tag = '')
+    public function callback( $atts, $content = '', $tag = '' )
     {
-        gravityview()->log->error('[{shortcode}] shortcode {class}::callback method not implemented.', ['shortcode' => $this->name, 'class' => get_class($this)]);
+        gravityview()->log->error( '[{shortcode}] shortcode {class}::callback method not implemented.', [ 'shortcode' => $this->name, 'class' => get_class( $this ) ] );
 
         return '';
     }
@@ -61,22 +61,22 @@ 
      *
      * @return \GV\Shortcode|null The only internally registered instance of this shortcode, or null on error.
      */
-    public static function add($name = null)
+    public static function add( $name = null )
     {
         $shortcode = new static();
         $name = $name ? $name : $shortcode->name;
-        if (shortcode_exists($name)) {
-            if (empty(self::$shortcodes[$name])) {
-                gravityview()->log->error('Shortcode [{shortcode}] has already been registered elsewhere.', ['shortcode' => $name]);
+        if ( shortcode_exists( $name ) ) {
+            if ( empty( self::$shortcodes[ $name ] ) ) {
+                gravityview()->log->error( 'Shortcode [{shortcode}] has already been registered elsewhere.', [ 'shortcode' => $name ] );
 
                 return null;
             }
         } else {
-            add_shortcode($name, [$shortcode, 'callback']);
-            self::$shortcodes[$name] = $shortcode;
+            add_shortcode( $name, [ $shortcode, 'callback' ] );
+            self::$shortcodes[ $name ] = $shortcode;
         }
 
-        return self::$shortcodes[$name];
+        return self::$shortcodes[ $name ];
     }
 
     /**
@@ -89,8 +89,8 @@ 
     public static function remove()
     {
         $shortcode = new static();
-        unset(self::$shortcodes[$shortcode->name]);
-        remove_shortcode($shortcode->name);
+        unset( self::$shortcodes[ $shortcode->name ] );
+        remove_shortcode( $shortcode->name );
     }
 
     /**
@@ -105,9 +105,9 @@ 
      *
      * @return \GV\Shortcode[] An array of \GV\Shortcode (and subclass) instances.
      */
-    public static function parse($content)
+    public static function parse( $content )
     {
-        $shortcodes = [];
+        $shortcodes = [ ];
 
         /**
          * The matches contains:.
@@ -119,17 +119,17 @@ 
          * 5 - The content of a shortcode when it wraps some content.
          * 6 - An extra ] to allow for escaping shortcodes with double [[]]
          */
-        preg_match_all('/'.get_shortcode_regex().'/', $content, $matches, PREG_SET_ORDER);
+        preg_match_all( '/' . get_shortcode_regex() . '/', $content, $matches, PREG_SET_ORDER );
 
-        foreach ($matches as $shortcode) {
-            $shortcode_name = $shortcode[2];
+        foreach ( $matches as $shortcode ) {
+            $shortcode_name = $shortcode[ 2 ];
 
-            $shortcode_atts = shortcode_parse_atts($shortcode[3]);
-            $shortcode_content = $shortcode[5];
+            $shortcode_atts = shortcode_parse_atts( $shortcode[ 3 ] );
+            $shortcode_content = $shortcode[ 5 ];
 
             /** This is a registered GravityView shortcode. */
-            if (!empty(self::$shortcodes[$shortcode_name])) {
-                $shortcode = clone self::$shortcodes[$shortcode_name];
+            if ( ! empty( self::$shortcodes[ $shortcode_name ] ) ) {
+                $shortcode = clone self::$shortcodes[ $shortcode_name ];
             } else {
                 /** This is some generic shortcode. */
                 $shortcode = new self();
@@ -140,7 +140,7 @@ 
             $shortcode->content = $shortcode_content;
 
             /** Merge inner shortcodes. */
-            $shortcodes = array_merge($shortcodes, [$shortcode], self::parse($shortcode_content));
+            $shortcodes = array_merge( $shortcodes, [ $shortcode ], self::parse( $shortcode_content ) );
         }
 
         return $shortcodes;

Braces +5 added lines, -10 removed lines

@@ -12,8 +12,7 @@ 
  *
  * Contains some unitility methods, base class for all GV Shortcodes.
  */
-class Shortcode
-{
+class Shortcode {
     /*
      * @var array All GravityView-registered and loaded shortcodes can be found here.
      */
@@ -43,8 +42,7 @@ 
      *
      * @return string The output.
      */
-    public function callback($atts, $content = '', $tag = '')
-    {
+    public function callback($atts, $content = '', $tag = '') {
         gravityview()->log->error('[{shortcode}] shortcode {class}::callback method not implemented.', ['shortcode' => $this->name, 'class' => get_class($this)]);
 
         return '';
@@ -61,8 +59,7 @@ 
      *
      * @return \GV\Shortcode|null The only internally registered instance of this shortcode, or null on error.
      */
-    public static function add($name = null)
-    {
+    public static function add($name = null) {
         $shortcode = new static();
         $name = $name ? $name : $shortcode->name;
         if (shortcode_exists($name)) {
@@ -86,8 +83,7 @@ 
      *
      * @return void
      */
-    public static function remove()
-    {
+    public static function remove() {
         $shortcode = new static();
         unset(self::$shortcodes[$shortcode->name]);
         remove_shortcode($shortcode->name);
@@ -105,8 +101,7 @@ 
      *
      * @return \GV\Shortcode[] An array of \GV\Shortcode (and subclass) instances.
      */
-    public static function parse($content)
-    {
+    public static function parse($content) {
         $shortcodes = [];
 
         /**

future/includes/class-gv-template.php

Indentation +102 added lines, -102 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -13,7 +13,7 @@ 
  * @see https://github.com/GaryJones/Gamajo-Template-Loader
  */
 if (!class_exists('\GV\Gamajo_Template_Loader')) {
-    require gravityview()->plugin->dir('future/lib/class-gamajo-template-loader.php');
+	require gravityview()->plugin->dir('future/lib/class-gamajo-template-loader.php');
 }
 
 /**
@@ -24,104 +24,104 @@ 
  */
 abstract class Template extends \GV\Gamajo_Template_Loader
 {
-    /**
-     * @var array The template data stack.
-     */
-    private static $data_stack = [];
-
-    /**
-     * @var string The located template.
-     */
-    public $located_template = '';
-
-    /**
-     * General template initialization.
-     *
-     * Sets the $plugin_directory field.
-     */
-    public function __construct()
-    {
-        /** Set plugin directory. */
-        $this->plugin_directory = gravityview()->plugin->dir();
-    }
-
-    /**
-     * Disallow any cleanup for fear of loss of global data.
-     *
-     * The destructor in Gamajo 1.3.0 destroys all of `$wp_query`.
-     * This has the chance of inappropriately destroying valid
-     *  data that's been stored under the same key.
-     *
-     * Disallow this.
-     */
-    public function __destruct()
-    {
-    }
-
-    /**
-     * Get a directory part and a full slug+name (file) components.
-     *
-     * @param string $slug The slug, template base.
-     * @param string $name The name, template part. Default: null
-     *
-     * @return array containing slug directory and slug+name.
-     */
-    public static function split_slug($slug, $name = null)
-    {
-        $dir_name = (dirname($slug) != '.') ? trailingslashit(dirname($slug)) : '';
-        $slug_name = basename($slug).($name ? "-$name" : '');
-
-        return [$dir_name, $slug_name];
-    }
-
-    /**
-     * Push the current template data down the stack and set.
-     *
-     * This allows us to use the same variable in the template scope
-     *  without destroying data under the same variable in a nested
-     *  or parallel template.
-     *
-     * @param mixed  $data     The data to set.
-     * @param string $var_name The data variable identifier (Default: "data")
-     *
-     * @see \Gamajo_Template_Loader::set_template_data
-     * @see \GV\Template::pop_template_data
-     *
-     * @return \GV\Gamajo_Template_Loader The current instance.
-     */
-    public function push_template_data($data, $var_name = 'data')
-    {
-        if (!isset(self::$data_stack[$var_name])) {
-            self::$data_stack[$var_name] = [];
-        }
-
-        global $wp_query;
-
-        if (isset($wp_query->query_vars[$var_name])) {
-            array_push(self::$data_stack[$var_name], $wp_query->query_vars[$var_name]);
-        }
-
-        $this->set_template_data($data, $var_name);
-
-        return $this;
-    }
-
-    /**
-     * Restore the template data from the stack.
-     *
-     * @param string $var_name The data variable identifier (Default: "data")
-     *
-     * @see \Gamajo_Template_Loader::set_template_data
-     * @see \GV\Template::pop_template_data
-     *
-     * @return $this;
-     */
-    public function pop_template_data($var_name = 'data')
-    {
-        if (!empty(self::$data_stack[$var_name])) {
-            $this->set_template_data(array_pop(self::$data_stack[$var_name]), $var_name);
-        }
-
-        return $this;
-    }
+	/**
+	 * @var array The template data stack.
+	 */
+	private static $data_stack = [];
+
+	/**
+	 * @var string The located template.
+	 */
+	public $located_template = '';
+
+	/**
+	 * General template initialization.
+	 *
+	 * Sets the $plugin_directory field.
+	 */
+	public function __construct()
+	{
+		/** Set plugin directory. */
+		$this->plugin_directory = gravityview()->plugin->dir();
+	}
+
+	/**
+	 * Disallow any cleanup for fear of loss of global data.
+	 *
+	 * The destructor in Gamajo 1.3.0 destroys all of `$wp_query`.
+	 * This has the chance of inappropriately destroying valid
+	 *  data that's been stored under the same key.
+	 *
+	 * Disallow this.
+	 */
+	public function __destruct()
+	{
+	}
+
+	/**
+	 * Get a directory part and a full slug+name (file) components.
+	 *
+	 * @param string $slug The slug, template base.
+	 * @param string $name The name, template part. Default: null
+	 *
+	 * @return array containing slug directory and slug+name.
+	 */
+	public static function split_slug($slug, $name = null)
+	{
+		$dir_name = (dirname($slug) != '.') ? trailingslashit(dirname($slug)) : '';
+		$slug_name = basename($slug).($name ? "-$name" : '');
+
+		return [$dir_name, $slug_name];
+	}
+
+	/**
+	 * Push the current template data down the stack and set.
+	 *
+	 * This allows us to use the same variable in the template scope
+	 *  without destroying data under the same variable in a nested
+	 *  or parallel template.
+	 *
+	 * @param mixed  $data     The data to set.
+	 * @param string $var_name The data variable identifier (Default: "data")
+	 *
+	 * @see \Gamajo_Template_Loader::set_template_data
+	 * @see \GV\Template::pop_template_data
+	 *
+	 * @return \GV\Gamajo_Template_Loader The current instance.
+	 */
+	public function push_template_data($data, $var_name = 'data')
+	{
+		if (!isset(self::$data_stack[$var_name])) {
+			self::$data_stack[$var_name] = [];
+		}
+
+		global $wp_query;
+
+		if (isset($wp_query->query_vars[$var_name])) {
+			array_push(self::$data_stack[$var_name], $wp_query->query_vars[$var_name]);
+		}
+
+		$this->set_template_data($data, $var_name);
+
+		return $this;
+	}
+
+	/**
+	 * Restore the template data from the stack.
+	 *
+	 * @param string $var_name The data variable identifier (Default: "data")
+	 *
+	 * @see \Gamajo_Template_Loader::set_template_data
+	 * @see \GV\Template::pop_template_data
+	 *
+	 * @return $this;
+	 */
+	public function pop_template_data($var_name = 'data')
+	{
+		if (!empty(self::$data_stack[$var_name])) {
+			$this->set_template_data(array_pop(self::$data_stack[$var_name]), $var_name);
+		}
+
+		return $this;
+	}
 }

Spacing +17 added lines, -17 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -12,8 +12,8 @@ 
  *
  * @see https://github.com/GaryJones/Gamajo-Template-Loader
  */
-if (!class_exists('\GV\Gamajo_Template_Loader')) {
-    require gravityview()->plugin->dir('future/lib/class-gamajo-template-loader.php');
+if ( ! class_exists( '\GV\Gamajo_Template_Loader' ) ) {
+    require gravityview()->plugin->dir( 'future/lib/class-gamajo-template-loader.php' );
 }
 
 /**
@@ -27,7 +27,7 @@ 
     /**
      * @var array The template data stack.
      */
-    private static $data_stack = [];
+    private static $data_stack = [ ];
 
     /**
      * @var string The located template.
@@ -66,12 +66,12 @@ 
      *
      * @return array containing slug directory and slug+name.
      */
-    public static function split_slug($slug, $name = null)
+    public static function split_slug( $slug, $name = null )
     {
-        $dir_name = (dirname($slug) != '.') ? trailingslashit(dirname($slug)) : '';
-        $slug_name = basename($slug).($name ? "-$name" : '');
+        $dir_name = ( dirname( $slug ) != '.' ) ? trailingslashit( dirname( $slug ) ) : '';
+        $slug_name = basename( $slug ) . ( $name ? "-$name" : '' );
 
-        return [$dir_name, $slug_name];
+        return [ $dir_name, $slug_name ];
     }
 
     /**
@@ -89,19 +89,19 @@ 
      *
      * @return \GV\Gamajo_Template_Loader The current instance.
      */
-    public function push_template_data($data, $var_name = 'data')
+    public function push_template_data( $data, $var_name = 'data' )
     {
-        if (!isset(self::$data_stack[$var_name])) {
-            self::$data_stack[$var_name] = [];
+        if ( ! isset( self::$data_stack[ $var_name ] ) ) {
+            self::$data_stack[ $var_name ] = [ ];
         }
 
         global $wp_query;
 
-        if (isset($wp_query->query_vars[$var_name])) {
-            array_push(self::$data_stack[$var_name], $wp_query->query_vars[$var_name]);
+        if ( isset( $wp_query->query_vars[ $var_name ] ) ) {
+            array_push( self::$data_stack[ $var_name ], $wp_query->query_vars[ $var_name ] );
         }
 
-        $this->set_template_data($data, $var_name);
+        $this->set_template_data( $data, $var_name );
 
         return $this;
     }
@@ -116,10 +116,10 @@ 
      *
      * @return $this;
      */
-    public function pop_template_data($var_name = 'data')
+    public function pop_template_data( $var_name = 'data' )
     {
-        if (!empty(self::$data_stack[$var_name])) {
-            $this->set_template_data(array_pop(self::$data_stack[$var_name]), $var_name);
+        if ( ! empty( self::$data_stack[ $var_name ] ) ) {
+            $this->set_template_data( array_pop( self::$data_stack[ $var_name ] ), $var_name );
         }
 
         return $this;

Braces +5 added lines, -10 removed lines

@@ -39,8 +39,7 @@ 
      *
      * Sets the $plugin_directory field.
      */
-    public function __construct()
-    {
+    public function __construct() {
         /** Set plugin directory. */
         $this->plugin_directory = gravityview()->plugin->dir();
     }
@@ -54,8 +53,7 @@ 
      *
      * Disallow this.
      */
-    public function __destruct()
-    {
+    public function __destruct() {
     }
 
     /**
@@ -66,8 +64,7 @@ 
      *
      * @return array containing slug directory and slug+name.
      */
-    public static function split_slug($slug, $name = null)
-    {
+    public static function split_slug($slug, $name = null) {
         $dir_name = (dirname($slug) != '.') ? trailingslashit(dirname($slug)) : '';
         $slug_name = basename($slug).($name ? "-$name" : '');
 
@@ -89,8 +86,7 @@ 
      *
      * @return \GV\Gamajo_Template_Loader The current instance.
      */
-    public function push_template_data($data, $var_name = 'data')
-    {
+    public function push_template_data($data, $var_name = 'data') {
         if (!isset(self::$data_stack[$var_name])) {
             self::$data_stack[$var_name] = [];
         }
@@ -116,8 +112,7 @@ 
      *
      * @return $this;
      */
-    public function pop_template_data($var_name = 'data')
-    {
+    public function pop_template_data($var_name = 'data') {
         if (!empty(self::$data_stack[$var_name])) {
             $this->set_template_data(array_pop(self::$data_stack[$var_name]), $var_name);
         }

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

Indentation +1249 added lines, -1249 removed lines

@@ -6,11 +6,11 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 if (!class_exists('\GFAddOn')) {
-    return;
+	return;
 }
 
 /**
@@ -20,367 +20,367 @@ 
  */
 class Addon_Settings extends \GFAddOn
 {
-    /**
-     * @var string Title of the plugin to be used on the settings page, form settings and plugins page. Example: 'Gravity Forms MailChimp Add-On'
-     */
-    protected $_title = 'GravityView';
-
-    /**
-     * @var string Short version of the plugin title to be used on menus and other places where a less verbose string is useful. Example: 'MailChimp'
-     */
-    protected $_short_title = 'GravityView';
-
-    /**
-     * @var string URL-friendly identifier used for form settings, add-on settings, text domain localization...
-     */
-    protected $_slug = 'gravityview';
-
-    /**
-     * @var string|array A string or an array of capabilities or roles that can uninstall the plugin
-     */
-    protected $_capabilities_uninstall = 'gravityview_uninstall';
-
-    /**
-     * @var string|array A string or an array of capabilities or roles that have access to the settings page
-     */
-    protected $_capabilities_app_settings = 'gravityview_view_settings';
-
-    /**
-     * @var string|array A string or an array of capabilities or roles that have access to the settings page
-     */
-    protected $_capabilities_app_menu = 'gravityview_view_settings';
-
-    /**
-     * @var string The hook suffix for the app menu
-     */
-    public $app_hook_suffix = 'gravityview';
-
-    /**
-     * @var \GV\License_Handler Process license validation
-     */
-    private $License_Handler;
-
-    /**
-     * @var bool Whether we have initialized already or not.
-     */
-    private static $initialized = false;
-
-    public function __construct()
-    {
-        $this->_version = Plugin::$version;
-        $this->_min_gravityforms_version = Plugin::$min_gf_version;
-
-        /**
-         * Hook everywhere, but only once.
-         */
-        if (!self::$initialized) {
-            parent::__construct();
-            self::$initialized = true;
-        }
-    }
-
-    /**
-     * Run actions when initializing admin.
-     *
-     * Triggers the license key notice, etc.
-     *
-     * @return void
-     */
-    public function init_admin()
-    {
-        $this->_load_license_handler();
-
-        add_filter('admin_body_class', [$this, 'body_class']);
-
-        add_action('admin_head', [$this, 'license_key_notice']);
-
-        add_filter('gform_addon_app_settings_menu_gravityview', [$this, 'modify_app_settings_menu_title']);
-
-        add_filter('gform_settings_save_button', [$this, 'modify_gform_settings_save_button'], 10, 2);
-
-        /** @since 1.7.6 */
-        add_action('network_admin_menu', [$this, 'add_network_menu']);
-
-        add_filter('gravityview_noconflict_styles', [$this, 'register_no_conflict']);
-
-        parent::init_admin();
-    }
-
-    /**
-     * Return tabs for GV Settings page.
-     *
-     * @since XXX
-     *
-     * @return array
-     */
-    public function get_app_settings_tabs()
-    {
-        $setting_tabs = parent::get_app_settings_tabs();
-
-        foreach ($setting_tabs as &$tab) {
-            if ('uninstall' !== $tab['name']) {
-                continue;
-            }
-
-            // Do not display uninstall tab if user is lacking permissions/this is a multisite
-            if (!($this->current_user_can_any($this->_capabilities_uninstall) && (!function_exists('is_multisite') || !is_multisite() || is_super_admin()))) {
-                $tab = null;
-                continue;
-            }
-
-            // Add trash can icon to resemble the look and feel of the GF Settings page
-            $tab['icon'] = 'dashicons-trash';
-        }
-
-        return array_filter($setting_tabs);
-    }
-
-    /**
-     * Allow GF styles to load in no-conflict mode.
-     *
-     * @param array $items Styles to exclude from no-conflict
-     *
-     * @return array
-     */
-    public function register_no_conflict($items)
-    {
-        $items[] = 'gform_settings';
-        $items[] = 'gv-admin-edd-license';
-
-        return $items;
-    }
-
-    /**
-     * Adds a CSS class to the <body> of the admin page if running GF 2.5 or newer.
-     *
-     * @param $css_class
-     *
-     * @return string
-     */
-    public function body_class($css_class)
-    {
-        if (!gravityview()->request->is_admin('', 'settings')) {
-            return $css_class;
-        }
-
-        if (gravityview()->plugin->is_GF_25()) {
-            $css_class .= ' gf-2-5';
-        }
-
-        return $css_class;
-    }
-
-    /**
-     * Adds an "Uninstall" button next to the GF 2.5 Save Settings button.
-     *
-     * @since 2.9.1
-     *
-     * @param string                                     $html      HTML of the save button.
-     * @param \Gravity_Forms\Gravity_Forms\Settings|null $framework Current instance of the Settings Framework. Or null if < 2.5.
-     */
-    public function modify_gform_settings_save_button($html, $framework = null)
-    {
-        if (!gravityview()->request->is_admin('', 'settings')) {
-            return $html;
-        }
-
-        if (!($this->current_user_can_any($this->_capabilities_uninstall) && (!function_exists('is_multisite') || !is_multisite() || is_super_admin()))) {
-            return $html;
-        }
-
-        if (gravityview()->plugin->is_GF_25()) {
-            $html_class = 'button outline secondary alignright button-danger';
-        } else {
-            $html_class = 'button button-secondary button-large alignright button-danger';
-        }
-
-        $href = add_query_arg(['post_type' => 'gravityview', 'page' => 'gravityview_settings', 'view' => 'uninstall'], admin_url('edit.php'));
-
-        $uninstall_button = '<a href="'.esc_url($href).'" class="'.gravityview_sanitize_html_class($html_class).'">'.esc_html__('Uninstall GravityView', 'gravityview').'</a>';
-
-        $html .= $uninstall_button;
-
-        return $html;
-    }
-
-    /**
-     * Roll our own "Hero" Save button with an Unsubscribe button attached.
-     *
-     * @since 2.9.1
-     *
-     * @param array $field
-     * @param bool  $echo
-     *
-     * @return string|null HTML of the button.
-     */
-    public function settings_save($field, $echo = true)
-    {
-        $field['type'] = 'submit';
-        $field['name'] = 'gform-settings-save';
-        $field['class'] = 'button button-primary primary button-hero';
-        $field['value'] = Utils::get($field, 'value', __('Update Settings', 'gravityview'));
-
-        $html = $this->as_html($field, false);
-
-        $html = $this->modify_gform_settings_save_button($html);
-
-        if ($echo) {
-            echo $html;
-        }
-
-        return $html;
-    }
-
-    /**
-     * Change the settings page header title to "GravityView".
-     *
-     * @param $setting_tabs
-     *
-     * @return array
-     */
-    public function modify_app_settings_menu_title($setting_tabs)
-    {
-        $setting_tabs[0]['label'] = __('GravityView Settings', 'gravityview');
-        $setting_tabs[0]['icon'] = 'dashicons-admin-settings';
-
-        return $setting_tabs;
-    }
-
-    /**
-     * Load license handler in admin-ajax.php.
-     *
-     * @return void
-     */
-    public function init_ajax()
-    {
-        $this->_load_license_handler();
-    }
-
-    /**
-     * Make sure the license handler is available.
-     *
-     * @return void
-     */
-    private function _load_license_handler()
-    {
-        if (!empty($this->License_Handler)) {
-            return;
-        }
-        $this->License_Handler = License_Handler::get($this);
-    }
-
-    /**
-     * Add global Settings page for Multisite.
-     *
-     * @since 1.7.6
-     *
-     * @return void
-     */
-    public function add_network_menu()
-    {
-        if (!gravityview()->plugin->is_network_activated()) {
-            return;
-        }
-
-        add_menu_page(__('Settings', 'gravityview'), __('GravityView', 'gravityview'), $this->_capabilities_app_settings, "{$this->_slug}_settings", [$this, 'app_tab_page'], 'none');
-    }
-
-    /**
-     * Uninstall all traces of GravityView.
-     *
-     * Note: method is public because parent method is public
-     *
-     * @return bool
-     */
-    public function uninstall()
-    {
-        gravityview()->plugin->uninstall();
-
-        /**
-         * Set the path so that Gravity Forms can de-activate GravityView.
-         *
-         * @see  GFAddOn::uninstall_addon
-         *
-         * @uses deactivate_plugins()
-         */
-        $this->_path = GRAVITYVIEW_FILE;
-
-        return true;
-    }
-
-    /**
-     * Prevent uninstall tab from being shown by returning false for the uninstall capability check. Otherwise:.
-     *
-     * @inheritDoc
-     *
-     * @hack
-     *
-     * @param array|string $caps
-     *
-     * @return bool
-     */
-    public function current_user_can_any($caps)
-    {
-        if (empty($caps)) {
-            $caps = ['gravityview_full_access'];
-        }
-
-        return \GVCommon::has_cap($caps);
-    }
-
-    public function uninstall_warning_message()
-    {
-        $heading = esc_html__('If you delete then re-install GravityView, it will be like installing GravityView for the first time.', 'gravityview');
-        $message = esc_html__('Delete all Views, GravityView entry approval status, GravityView-generated entry notes (including approval and entry creator changes), and GravityView plugin settings.', 'gravityview');
-
-        return sprintf('<h4>%s</h4><p>%s</p>', $heading, $message);
-    }
+	/**
+	 * @var string Title of the plugin to be used on the settings page, form settings and plugins page. Example: 'Gravity Forms MailChimp Add-On'
+	 */
+	protected $_title = 'GravityView';
+
+	/**
+	 * @var string Short version of the plugin title to be used on menus and other places where a less verbose string is useful. Example: 'MailChimp'
+	 */
+	protected $_short_title = 'GravityView';
+
+	/**
+	 * @var string URL-friendly identifier used for form settings, add-on settings, text domain localization...
+	 */
+	protected $_slug = 'gravityview';
+
+	/**
+	 * @var string|array A string or an array of capabilities or roles that can uninstall the plugin
+	 */
+	protected $_capabilities_uninstall = 'gravityview_uninstall';
+
+	/**
+	 * @var string|array A string or an array of capabilities or roles that have access to the settings page
+	 */
+	protected $_capabilities_app_settings = 'gravityview_view_settings';
+
+	/**
+	 * @var string|array A string or an array of capabilities or roles that have access to the settings page
+	 */
+	protected $_capabilities_app_menu = 'gravityview_view_settings';
+
+	/**
+	 * @var string The hook suffix for the app menu
+	 */
+	public $app_hook_suffix = 'gravityview';
+
+	/**
+	 * @var \GV\License_Handler Process license validation
+	 */
+	private $License_Handler;
+
+	/**
+	 * @var bool Whether we have initialized already or not.
+	 */
+	private static $initialized = false;
+
+	public function __construct()
+	{
+		$this->_version = Plugin::$version;
+		$this->_min_gravityforms_version = Plugin::$min_gf_version;
+
+		/**
+		 * Hook everywhere, but only once.
+		 */
+		if (!self::$initialized) {
+			parent::__construct();
+			self::$initialized = true;
+		}
+	}
+
+	/**
+	 * Run actions when initializing admin.
+	 *
+	 * Triggers the license key notice, etc.
+	 *
+	 * @return void
+	 */
+	public function init_admin()
+	{
+		$this->_load_license_handler();
+
+		add_filter('admin_body_class', [$this, 'body_class']);
+
+		add_action('admin_head', [$this, 'license_key_notice']);
+
+		add_filter('gform_addon_app_settings_menu_gravityview', [$this, 'modify_app_settings_menu_title']);
+
+		add_filter('gform_settings_save_button', [$this, 'modify_gform_settings_save_button'], 10, 2);
+
+		/** @since 1.7.6 */
+		add_action('network_admin_menu', [$this, 'add_network_menu']);
+
+		add_filter('gravityview_noconflict_styles', [$this, 'register_no_conflict']);
+
+		parent::init_admin();
+	}
+
+	/**
+	 * Return tabs for GV Settings page.
+	 *
+	 * @since XXX
+	 *
+	 * @return array
+	 */
+	public function get_app_settings_tabs()
+	{
+		$setting_tabs = parent::get_app_settings_tabs();
+
+		foreach ($setting_tabs as &$tab) {
+			if ('uninstall' !== $tab['name']) {
+				continue;
+			}
 
-    /**
-     * Get an array of reasons why the plugin might be uninstalled.
-     *
-     * @since 1.17.5
-     *
-     * @return array Array of reasons with the label and followup questions for each uninstall reason
-     */
-    private function get_uninstall_reasons()
-    {
-        $reasons = [
-            'will-continue'  => [
-                'label' => esc_html__('I am going to continue using GravityView', 'gravityview'),
-            ],
-            'no-longer-need' => [
-                'label' => esc_html__('I no longer need GravityView', 'gravityview'),
-            ],
-            'doesnt-work'    => [
-                'label' => esc_html__('The plugin doesn\'t work', 'gravityview'),
-            ],
-            'found-other'    => [
-                'label'    => esc_html__('I found a better plugin', 'gravityview'),
-                'followup' => esc_attr__('What plugin you are using, and why?', 'gravityview'),
-            ],
-            'other'          => [
-                'label' => esc_html__('Other', 'gravityview'),
-            ],
-        ];
-
-        shuffle($reasons);
-
-        return $reasons;
-    }
-
-    /**
-     * Display a feedback form when the plugin is uninstalled.
-     *
-     * @since 1.17.5
-     *
-     * @return string HTML of the uninstallation form
-     */
-    public function uninstall_form()
-    {
-        ob_start();
+			// Do not display uninstall tab if user is lacking permissions/this is a multisite
+			if (!($this->current_user_can_any($this->_capabilities_uninstall) && (!function_exists('is_multisite') || !is_multisite() || is_super_admin()))) {
+				$tab = null;
+				continue;
+			}
 
-        $user = wp_get_current_user(); ?>
+			// Add trash can icon to resemble the look and feel of the GF Settings page
+			$tab['icon'] = 'dashicons-trash';
+		}
+
+		return array_filter($setting_tabs);
+	}
+
+	/**
+	 * Allow GF styles to load in no-conflict mode.
+	 *
+	 * @param array $items Styles to exclude from no-conflict
+	 *
+	 * @return array
+	 */
+	public function register_no_conflict($items)
+	{
+		$items[] = 'gform_settings';
+		$items[] = 'gv-admin-edd-license';
+
+		return $items;
+	}
+
+	/**
+	 * Adds a CSS class to the <body> of the admin page if running GF 2.5 or newer.
+	 *
+	 * @param $css_class
+	 *
+	 * @return string
+	 */
+	public function body_class($css_class)
+	{
+		if (!gravityview()->request->is_admin('', 'settings')) {
+			return $css_class;
+		}
+
+		if (gravityview()->plugin->is_GF_25()) {
+			$css_class .= ' gf-2-5';
+		}
+
+		return $css_class;
+	}
+
+	/**
+	 * Adds an "Uninstall" button next to the GF 2.5 Save Settings button.
+	 *
+	 * @since 2.9.1
+	 *
+	 * @param string                                     $html      HTML of the save button.
+	 * @param \Gravity_Forms\Gravity_Forms\Settings|null $framework Current instance of the Settings Framework. Or null if < 2.5.
+	 */
+	public function modify_gform_settings_save_button($html, $framework = null)
+	{
+		if (!gravityview()->request->is_admin('', 'settings')) {
+			return $html;
+		}
+
+		if (!($this->current_user_can_any($this->_capabilities_uninstall) && (!function_exists('is_multisite') || !is_multisite() || is_super_admin()))) {
+			return $html;
+		}
+
+		if (gravityview()->plugin->is_GF_25()) {
+			$html_class = 'button outline secondary alignright button-danger';
+		} else {
+			$html_class = 'button button-secondary button-large alignright button-danger';
+		}
+
+		$href = add_query_arg(['post_type' => 'gravityview', 'page' => 'gravityview_settings', 'view' => 'uninstall'], admin_url('edit.php'));
+
+		$uninstall_button = '<a href="'.esc_url($href).'" class="'.gravityview_sanitize_html_class($html_class).'">'.esc_html__('Uninstall GravityView', 'gravityview').'</a>';
+
+		$html .= $uninstall_button;
+
+		return $html;
+	}
+
+	/**
+	 * Roll our own "Hero" Save button with an Unsubscribe button attached.
+	 *
+	 * @since 2.9.1
+	 *
+	 * @param array $field
+	 * @param bool  $echo
+	 *
+	 * @return string|null HTML of the button.
+	 */
+	public function settings_save($field, $echo = true)
+	{
+		$field['type'] = 'submit';
+		$field['name'] = 'gform-settings-save';
+		$field['class'] = 'button button-primary primary button-hero';
+		$field['value'] = Utils::get($field, 'value', __('Update Settings', 'gravityview'));
+
+		$html = $this->as_html($field, false);
+
+		$html = $this->modify_gform_settings_save_button($html);
+
+		if ($echo) {
+			echo $html;
+		}
+
+		return $html;
+	}
+
+	/**
+	 * Change the settings page header title to "GravityView".
+	 *
+	 * @param $setting_tabs
+	 *
+	 * @return array
+	 */
+	public function modify_app_settings_menu_title($setting_tabs)
+	{
+		$setting_tabs[0]['label'] = __('GravityView Settings', 'gravityview');
+		$setting_tabs[0]['icon'] = 'dashicons-admin-settings';
+
+		return $setting_tabs;
+	}
+
+	/**
+	 * Load license handler in admin-ajax.php.
+	 *
+	 * @return void
+	 */
+	public function init_ajax()
+	{
+		$this->_load_license_handler();
+	}
+
+	/**
+	 * Make sure the license handler is available.
+	 *
+	 * @return void
+	 */
+	private function _load_license_handler()
+	{
+		if (!empty($this->License_Handler)) {
+			return;
+		}
+		$this->License_Handler = License_Handler::get($this);
+	}
+
+	/**
+	 * Add global Settings page for Multisite.
+	 *
+	 * @since 1.7.6
+	 *
+	 * @return void
+	 */
+	public function add_network_menu()
+	{
+		if (!gravityview()->plugin->is_network_activated()) {
+			return;
+		}
+
+		add_menu_page(__('Settings', 'gravityview'), __('GravityView', 'gravityview'), $this->_capabilities_app_settings, "{$this->_slug}_settings", [$this, 'app_tab_page'], 'none');
+	}
+
+	/**
+	 * Uninstall all traces of GravityView.
+	 *
+	 * Note: method is public because parent method is public
+	 *
+	 * @return bool
+	 */
+	public function uninstall()
+	{
+		gravityview()->plugin->uninstall();
+
+		/**
+		 * Set the path so that Gravity Forms can de-activate GravityView.
+		 *
+		 * @see  GFAddOn::uninstall_addon
+		 *
+		 * @uses deactivate_plugins()
+		 */
+		$this->_path = GRAVITYVIEW_FILE;
+
+		return true;
+	}
+
+	/**
+	 * Prevent uninstall tab from being shown by returning false for the uninstall capability check. Otherwise:.
+	 *
+	 * @inheritDoc
+	 *
+	 * @hack
+	 *
+	 * @param array|string $caps
+	 *
+	 * @return bool
+	 */
+	public function current_user_can_any($caps)
+	{
+		if (empty($caps)) {
+			$caps = ['gravityview_full_access'];
+		}
+
+		return \GVCommon::has_cap($caps);
+	}
+
+	public function uninstall_warning_message()
+	{
+		$heading = esc_html__('If you delete then re-install GravityView, it will be like installing GravityView for the first time.', 'gravityview');
+		$message = esc_html__('Delete all Views, GravityView entry approval status, GravityView-generated entry notes (including approval and entry creator changes), and GravityView plugin settings.', 'gravityview');
+
+		return sprintf('<h4>%s</h4><p>%s</p>', $heading, $message);
+	}
+
+	/**
+	 * Get an array of reasons why the plugin might be uninstalled.
+	 *
+	 * @since 1.17.5
+	 *
+	 * @return array Array of reasons with the label and followup questions for each uninstall reason
+	 */
+	private function get_uninstall_reasons()
+	{
+		$reasons = [
+			'will-continue'  => [
+				'label' => esc_html__('I am going to continue using GravityView', 'gravityview'),
+			],
+			'no-longer-need' => [
+				'label' => esc_html__('I no longer need GravityView', 'gravityview'),
+			],
+			'doesnt-work'    => [
+				'label' => esc_html__('The plugin doesn\'t work', 'gravityview'),
+			],
+			'found-other'    => [
+				'label'    => esc_html__('I found a better plugin', 'gravityview'),
+				'followup' => esc_attr__('What plugin you are using, and why?', 'gravityview'),
+			],
+			'other'          => [
+				'label' => esc_html__('Other', 'gravityview'),
+			],
+		];
+
+		shuffle($reasons);
+
+		return $reasons;
+	}
+
+	/**
+	 * Display a feedback form when the plugin is uninstalled.
+	 *
+	 * @since 1.17.5
+	 *
+	 * @return string HTML of the uninstallation form
+	 */
+	public function uninstall_form()
+	{
+		ob_start();
+
+		$user = wp_get_current_user(); ?>
 		<style>
 			#gv-reason-details {
 				min-height: 100px;
@@ -412,10 +412,10 @@ 
 		</style>
 
 		<?php
-        if (gravityview()->plugin->is_GF_25()) {
-            $uninstall_title = esc_html__('Uninstall GravityView', 'gravityview');
+		if (gravityview()->plugin->is_GF_25()) {
+			$uninstall_title = esc_html__('Uninstall GravityView', 'gravityview');
 
-            echo <<<HTML
+			echo <<<HTML
 <div class="gform-settings-panel">
     <header class="gform-settings-panel__header">
         <h4 class="gform-settings-panel__title">{$uninstall_title}</h4>
@@ -423,9 +423,9 @@ 
     <div class="gform-settings-panel__content" style="padding: 0 1rem 1.25rem">
 
 HTML;
-        } else {
-            echo '<div class="gv-uninstall-form-wrapper" style="font-size: 110%; padding: 15px 0;">';
-        } ?>
+		} else {
+			echo '<div class="gv-uninstall-form-wrapper" style="font-size: 110%; padding: 15px 0;">';
+		} ?>
 		<script>
 			jQuery( function( $ ) {
 				$( '#gv-uninstall-feedback' ).on( 'change', function( e ) {
@@ -472,10 +472,10 @@ 
 			<h2><?php esc_html_e('Why did you uninstall GravityView?', 'gravityview'); ?></h2>
 			<ul>
 				<?php
-                $reasons = $this->get_uninstall_reasons();
-        foreach ($reasons as $reason) {
-            printf('<li><label><input name="reason" type="radio" value="other" data-followup="%s"> %s</label></li>', Utils::get($reason, 'followup'), Utils::get($reason, 'label'));
-        } ?>
+				$reasons = $this->get_uninstall_reasons();
+		foreach ($reasons as $reason) {
+			printf('<li><label><input name="reason" type="radio" value="other" data-followup="%s"> %s</label></li>', Utils::get($reason, 'followup'), Utils::get($reason, 'label'));
+		} ?>
 			</ul>
 			<div class="gv-followup widefat">
 				<p><strong><label for="gv-reason-details"><?php esc_html_e('Comments', 'gravityview'); ?></label></strong></p>
@@ -485,11 +485,11 @@ 
 				<p><strong><?php esc_html_e('How likely are you to recommend GravityView?', 'gravityview'); ?></strong></p>
 				<ul class="inline">
 					<?php
-                    $i = 0;
-        while ($i < 11) {
-            echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_'.$i.'" value="'.$i.'" type="radio"> '.$i.'</label></li>';
-            $i++;
-        } ?>
+					$i = 0;
+		while ($i < 11) {
+			echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_'.$i.'" value="'.$i.'" type="radio"> '.$i.'</label></li>';
+			$i++;
+		} ?>
 				</ul>
 				<p class="description"><?php printf(esc_html_x('%s ("Not at all likely") to %s ("Extremely likely")', 'A scale from 0 (bad) to 10 (good)', 'gravityview'), '<label for="likely_to_refer_0"><code>0</code></label>', '<label for="likely_to_refer_10"><code>10</code></label>'); ?></p>
 			</div>
@@ -515,178 +515,178 @@ 
 		</div>
 		</div>
 		<?php
-        if (gravityview()->plugin->is_GF_25()) {
-            echo '</div>';
-        }
-
-        $form = ob_get_clean();
-
-        return $form;
-    }
-
-    public function app_settings_tab()
-    {
-        parent::app_settings_tab();
-
-        if ($this->maybe_uninstall()) {
-            echo $this->uninstall_form();
-        }
-    }
-
-    /**
-     * The Settings title.
-     *
-     * @return string
-     */
-    public function app_settings_title()
-    {
-        return null;
-    }
-
-    /**
-     * Prevent displaying of any icon.
-     *
-     * @return string
-     */
-    public function app_settings_icon()
-    {
-        return '&nbsp;';
-    }
-
-    /**
-     * Retrieve a setting.
-     *
-     * @param string $setting_name The setting key.
-     *
-     * @return mixed The setting or null
-     *
-     * @deprecated Use \GV\Addon_Settings::get
-     */
-    public function get_app_setting($setting_name)
-    {
-        return $this->get($setting_name);
-    }
-
-    /**
-     * Retrieve a setting.
-     *
-     * @param string $key     The setting key.
-     * @param string $default A default if not found.
-     *
-     * @return mixed The setting value.
-     */
-    public function get($key, $default = null)
-    {
-
-        /**
-         * Backward compatibility with Redux.
-         */
-        if ($key === 'license') {
-            return [
-                'license'  => $this->get('license_key'),
-                'status'   => $this->get('license_key_status'),
-                'response' => $this->get('license_key_response'),
-            ];
-        }
-
-        if ('license_key' === $key && defined('GRAVITYVIEW_LICENSE_KEY')) {
-            return GRAVITYVIEW_LICENSE_KEY;
-        }
-
-        return Utils::get($this->all(), $key, $default);
-    }
-
-    /**
-     * Get the setting for GravityView by name.
-     *
-     * @param string $key Option key to fetch
-     *
-     * @return mixed
-     *
-     * @deprecated Use gravityview()->plugin->settings->get()
-     */
-    public static function getSetting($key)
-    {
-        if (gravityview()->plugin->settings instanceof Addon_Settings) {
-            return gravityview()->plugin->settings->get($key);
-        }
-    }
-
-    /**
-     * Get all settings.
-     *
-     * @return array The settings.
-     *
-     * @deprecated Use \GV\Addon_Settings::all() or \GV\Addon_Settings::get()
-     */
-    public function get_app_settings()
-    {
-        return $this->all();
-    }
-
-    /**
-     * Get all the settings.
-     *
-     * @return array The settings.
-     */
-    public function all()
-    {
-        $option_name = 'gravityformsaddon_'.$this->_slug.'_app_settings';
-
-        if ($this->has_site_settings()) {
-            $defaults = $this->defaults();
-            $option_value = get_option($option_name, []);
-        } else {
-            $defaults = get_blog_option(get_main_site_id(), $option_name);
-            $option_value = get_blog_option(get_main_site_id(), $option_name);
-        }
-
-        return wp_parse_args($option_value, $defaults);
-    }
-
-    /**
-     * Default settings.
-     *
-     * @return array The defaults.
-     *
-     * @deprecated Use \GV\Addon_Settings::defaults()
-     */
-    public function get_default_settings()
-    {
-        return $this->defaults();
-    }
-
-    /**
-     * Default settings.
-     *
-     * @return array The defaults.
-     */
-    private function defaults()
-    {
-        $defaults = [
-            // Set the default license in wp-config.php
-            'license_key'          => defined('GRAVITYVIEW_LICENSE_KEY') ? GRAVITYVIEW_LICENSE_KEY : '',
-            'license_key_response' => '',
-            'license_key_status'   => '',
-            'support-email'        => get_bloginfo('admin_email'),
-            'no-conflict-mode'     => '1',
-            'support_port'         => '1',
-            'flexbox_search'       => '1',
-            'lightbox'             => 'fancybox',
-            'rest_api'             => '0',
-            'beta'                 => '0',
-            'powered_by'           => '0',
-        ];
-
-        /**
-         * @filter `gravityview/settings/default` Filter default global settings.
-         *
-         * @param  [in,out] array The defaults.
-         */
-        return apply_filters('gravityview/settings/defaults', $defaults);
-    }
-
-    /***
+		if (gravityview()->plugin->is_GF_25()) {
+			echo '</div>';
+		}
+
+		$form = ob_get_clean();
+
+		return $form;
+	}
+
+	public function app_settings_tab()
+	{
+		parent::app_settings_tab();
+
+		if ($this->maybe_uninstall()) {
+			echo $this->uninstall_form();
+		}
+	}
+
+	/**
+	 * The Settings title.
+	 *
+	 * @return string
+	 */
+	public function app_settings_title()
+	{
+		return null;
+	}
+
+	/**
+	 * Prevent displaying of any icon.
+	 *
+	 * @return string
+	 */
+	public function app_settings_icon()
+	{
+		return '&nbsp;';
+	}
+
+	/**
+	 * Retrieve a setting.
+	 *
+	 * @param string $setting_name The setting key.
+	 *
+	 * @return mixed The setting or null
+	 *
+	 * @deprecated Use \GV\Addon_Settings::get
+	 */
+	public function get_app_setting($setting_name)
+	{
+		return $this->get($setting_name);
+	}
+
+	/**
+	 * Retrieve a setting.
+	 *
+	 * @param string $key     The setting key.
+	 * @param string $default A default if not found.
+	 *
+	 * @return mixed The setting value.
+	 */
+	public function get($key, $default = null)
+	{
+
+		/**
+		 * Backward compatibility with Redux.
+		 */
+		if ($key === 'license') {
+			return [
+				'license'  => $this->get('license_key'),
+				'status'   => $this->get('license_key_status'),
+				'response' => $this->get('license_key_response'),
+			];
+		}
+
+		if ('license_key' === $key && defined('GRAVITYVIEW_LICENSE_KEY')) {
+			return GRAVITYVIEW_LICENSE_KEY;
+		}
+
+		return Utils::get($this->all(), $key, $default);
+	}
+
+	/**
+	 * Get the setting for GravityView by name.
+	 *
+	 * @param string $key Option key to fetch
+	 *
+	 * @return mixed
+	 *
+	 * @deprecated Use gravityview()->plugin->settings->get()
+	 */
+	public static function getSetting($key)
+	{
+		if (gravityview()->plugin->settings instanceof Addon_Settings) {
+			return gravityview()->plugin->settings->get($key);
+		}
+	}
+
+	/**
+	 * Get all settings.
+	 *
+	 * @return array The settings.
+	 *
+	 * @deprecated Use \GV\Addon_Settings::all() or \GV\Addon_Settings::get()
+	 */
+	public function get_app_settings()
+	{
+		return $this->all();
+	}
+
+	/**
+	 * Get all the settings.
+	 *
+	 * @return array The settings.
+	 */
+	public function all()
+	{
+		$option_name = 'gravityformsaddon_'.$this->_slug.'_app_settings';
+
+		if ($this->has_site_settings()) {
+			$defaults = $this->defaults();
+			$option_value = get_option($option_name, []);
+		} else {
+			$defaults = get_blog_option(get_main_site_id(), $option_name);
+			$option_value = get_blog_option(get_main_site_id(), $option_name);
+		}
+
+		return wp_parse_args($option_value, $defaults);
+	}
+
+	/**
+	 * Default settings.
+	 *
+	 * @return array The defaults.
+	 *
+	 * @deprecated Use \GV\Addon_Settings::defaults()
+	 */
+	public function get_default_settings()
+	{
+		return $this->defaults();
+	}
+
+	/**
+	 * Default settings.
+	 *
+	 * @return array The defaults.
+	 */
+	private function defaults()
+	{
+		$defaults = [
+			// Set the default license in wp-config.php
+			'license_key'          => defined('GRAVITYVIEW_LICENSE_KEY') ? GRAVITYVIEW_LICENSE_KEY : '',
+			'license_key_response' => '',
+			'license_key_status'   => '',
+			'support-email'        => get_bloginfo('admin_email'),
+			'no-conflict-mode'     => '1',
+			'support_port'         => '1',
+			'flexbox_search'       => '1',
+			'lightbox'             => 'fancybox',
+			'rest_api'             => '0',
+			'beta'                 => '0',
+			'powered_by'           => '0',
+		];
+
+		/**
+		 * @filter `gravityview/settings/default` Filter default global settings.
+		 *
+		 * @param  [in,out] array The defaults.
+		 */
+		return apply_filters('gravityview/settings/defaults', $defaults);
+	}
+
+	/***
      * Renders the save button for settings pages
      *
      * @param array $field - Field array containing the configuration options of this field
@@ -694,635 +694,635 @@ 
      *
      * @return string The HTML
      */
-    public function as_html($field, $echo = true)
-    {
-        $field['type'] = (isset($field['type']) && in_array($field['type'], ['submit', 'reset', 'button'])) ? $field['type'] : 'submit';
+	public function as_html($field, $echo = true)
+	{
+		$field['type'] = (isset($field['type']) && in_array($field['type'], ['submit', 'reset', 'button'])) ? $field['type'] : 'submit';
 
-        $attributes = $this->get_field_attributes($field);
-        $default_value = Utils::get($field, 'value', Utils::get($field, 'default_value'));
-        $value = $this->get($field['name'], $default_value);
+		$attributes = $this->get_field_attributes($field);
+		$default_value = Utils::get($field, 'value', Utils::get($field, 'default_value'));
+		$value = $this->get($field['name'], $default_value);
 
-        $attributes['class'] = isset($attributes['class']) ? esc_attr($attributes['class']) : 'button-primary primary gfbutton';
-        $name = ($field['name'] === 'gform-settings-save') ? $field['name'] : '_gaddon_setting_'.$field['name'];
+		$attributes['class'] = isset($attributes['class']) ? esc_attr($attributes['class']) : 'button-primary primary gfbutton';
+		$name = ($field['name'] === 'gform-settings-save') ? $field['name'] : '_gaddon_setting_'.$field['name'];
 
-        if (empty($value)) {
-            $value = __('Update Settings', 'gravityview');
-        }
+		if (empty($value)) {
+			$value = __('Update Settings', 'gravityview');
+		}
 
-        $attributes = $this->get_field_attributes($field);
+		$attributes = $this->get_field_attributes($field);
 
-        $html = '<input
+		$html = '<input
                     type="'.$field['type'].'"
                     name="'.esc_attr($name).'"
                     value="'.$value.'" '.
-                implode(' ', $attributes).
-                ' />';
-
-        if ($echo) {
-            echo $html;
-        }
-
-        return $html;
-    }
-
-    /**
-     * @deprecated Use \GV\Addon_Settings::as_html
-     */
-    public function settings_submit($field, $echo = true)
-    {
-        gravityview()->log->warning('\GV\Addon_Settings::settings_submit has been deprecated for \GV\Addon_Settings::as_html');
-
-        return $this->as_html($field, $echo);
-    }
-
-    /**
-     * Check whether GravityView is being saved.
-     *
-     * The generic is_save_postback() is true for all addons
-     *
-     * @since 2.0.8
-     *
-     * @return bool
-     */
-    public function is_save_postback()
-    {
-        return isset($_POST['gform-settings-save']) && isset($_POST['_gravityview_save_settings_nonce']);
-    }
-
-    /**
-     * Display a notice if the plugin is inactive.
-     *
-     * @return void
-     */
-    public function license_key_notice()
-    {
-        if ('uninstall' === rgget('view')) {
-            return; // Do not display license notice on the uninstall page in GF 2.5
-        }
-
-        if ($this->is_save_postback()) {
-            $settings = $this->get_posted_settings();
-            $license_key = defined('GRAVITYVIEW_LICENSE_KEY') ? GRAVITYVIEW_LICENSE_KEY : \GV\Utils::get($settings, 'license_key');
-            $license_status = \GV\Utils::get($settings, 'license_key_status', 'inactive');
-        } else {
-            $license_status = $this->get('license_key_status', 'inactive');
-            $license_key = $this->get('license_key');
-        }
-
-        if (empty($license_key)) {
-            $license_id = 'license';
-            $license_status = '';
-        } else {
-            $license_id = $license_key;
-        }
-
-        $message = esc_html__('Your GravityView license %s. This means you&rsquo;re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview');
-
-        /** @internal Do not use! Will change without notice (pun slightly intended). */
-        $message = apply_filters('gravityview/settings/license-key-notice', $message);
-
-        /**
-         * I wanted to remove the period from after the buttons in the string,
-         * but didn't want to mess up the translation strings for the translators.
-         */
-        $message = mb_substr($message, 0, mb_strlen($message) - 1);
-        $title = __('Inactive License', 'gravityview');
-        $status = '';
-        $update_below = false;
-        $primary_button_link = admin_url('edit.php?post_type=gravityview&amp;page=gravityview_settings');
-
-        switch ($license_status) {
-            /** @since 1.17 */
-            case 'expired':
-                $title = __('Expired License', 'gravityview');
-                $status = __('has expired', 'gravityview');
-                $message = $this->get_license_handler()->strings('expired', $this->get('license_key_response'));
-                break;
-            case 'invalid':
-                $title = __('Invalid License', 'gravityview');
-                $status = __('is invalid', 'gravityview');
-                break;
-            case 'deactivated':
-                $status = __('is inactive', 'gravityview');
-                $update_below = __('Activate your license key below.', 'gravityview');
-                break;
-            /** @noinspection PhpMissingBreakStatementInspection */
-            case '':
-                $license_status = 'site_inactive';
-            // break intentionally left blank
-            case 'inactive':
-            case 'site_inactive':
-                $status = __('has not been activated', 'gravityview');
-                $update_below = __('Activate your license key below.', 'gravityview');
-                break;
-        }
-        $url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content='.$license_status.'&utm_campaign=Admin%20Notice';
-
-        // Show a different notice on settings page for inactive licenses (hide the buttons)
-        if ($update_below && gravityview()->request->is_admin('', 'settings')) {
-            $message = sprintf($message, $status, '<div class="hidden">', '', '', '</div><a href="#" onclick="jQuery(\'#license_key\').focus(); return false;">'.$update_below.'</a>');
-        } else {
-            $message = sprintf($message, $status, "\n\n".'<a href="'.esc_url($primary_button_link).'" class="button button-primary primary">', '</a>', '<a href="'.esc_url($url).'" class="button button-secondary">', '</a>');
-        }
-
-        if (empty($status)) {
-            return;
-        }
-
-        \GravityView_Admin_Notices::add_notice([
-            'message' => $message,
-            'class'   => 'notice notice-warning gv-license-warning',
-            'title'   => $title,
-            'cap'     => 'gravityview_edit_settings',
-            'dismiss' => sha1($license_status.'_'.$license_id.'_'.date('z')), // Show every day, instead of every 8 weeks (which is the default)
-        ]);
-    }
-
-    /**
-     * Allow public access to the GV\License_Handler class.
-     *
-     * @since 1.7.4
-     *
-     * @return \GV\License_Handler
-     */
-    public function get_license_handler()
-    {
-        return $this->License_Handler;
-    }
-
-    /**
-     * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason.
-     *
-     * @since 1.21.5
-     * @see   GFAddOn::scripts()
-     *
-     * @return array Array of scripts
-     */
-    public function scripts()
-    {
-        $scripts = parent::scripts();
-
-        $scripts[] = [
-            'handle'  => 'gform_tooltip_init',
-            'enqueue' => [
-                [
-                    'admin_page' => ['app_settings'],
-                ],
-            ],
-        ];
-
-        return $scripts;
-    }
-
-    /**
-     * Register styles in the app admin page.
-     *
-     * @return array
-     */
-    public function styles()
-    {
-        $styles = parent::styles();
-
-        $deps = [
-            'gform_admin',
-            'gaddon_form_settings_css',
-            'gform_font_awesome',
-        ];
-
-        // This file was removed from 2.5
-        if (!gravityview()->plugin->is_GF_25()) {
-            $deps[] = 'gform_tooltip';
-        }
-
-        $styles[] = [
-            'handle'  => 'gravityview_settings',
-            'src'     => plugins_url('assets/css/admin-settings.css', GRAVITYVIEW_FILE),
-            'version' => Plugin::$version,
-            'deps'    => $deps,
-            'enqueue' => [
-                [
-                    'admin_page' => [
-                        'app_settings',
-                        'plugin_settings',
-                    ],
-                ],
-            ],
-        ];
-
-        return $styles;
-    }
-
-    /**
-     * Does the current site have its own settings?
-     *
-     * - If not multisite, returns true.
-     * - If multisite and the plugin is network activated, returns true; we need to register the submenu page for the Network Admin settings to work.
-     * - If multisite and not network admin, return false.
-     *
-     * @since 2.8.2
-     *
-     * @return bool
-     */
-    private function has_site_settings()
-    {
-        return (!is_multisite()) || is_main_site() || (!gravityview()->plugin->is_network_activated()) || (is_network_admin() && gravityview()->plugin->is_network_activated());
-    }
-
-    /**
-     * Add Settings link to GravityView menu.
-     *
-     * @return void
-     */
-    public function create_app_menu()
-    {
-
-        /**
-         * Override whether to show the Settings menu on a per-blog basis.
-         *
-         * @since 1.7.6
-         *
-         * @param bool $hide_if_network_activated Default: true
-         */
-        $show_submenu = apply_filters('gravityview/show-settings-menu', $this->has_site_settings());
-
-        if (!$show_submenu) {
-            return;
-        }
-
-        add_submenu_page('edit.php?post_type=gravityview', __('Settings', 'gravityview'), __('Settings', 'gravityview'), $this->_capabilities_app_settings, $this->_slug.'_settings', [$this, 'app_tab_page']);
-    }
-
-    /**
-     * Gets the required indicator
-     * Gets the markup of the required indicator symbol to highlight fields that are required.
-     *
-     * @param $field - The field meta.
-     *
-     * @return string - Returns markup of the required indicator symbol
-     */
-    public function get_required_indicator($field)
-    {
-        return '<span class="required" title="'.esc_attr__('Required', 'gravityview').'">*</span>';
-    }
-
-    /**
-     * Specify the settings fields to be rendered on the plugin settings page.
-     *
-     * @return array
-     */
-    public function app_settings_fields()
-    {
-        $default_settings = $this->defaults();
-
-        $disabled_attribute = \GVCommon::has_cap('gravityview_edit_settings') ? false : 'disabled';
-
-        $affiliate_link = 'https://gravityview.co/account/affiliate/?utm_source=in-plugin&utm_medium=setting&utm_content=Register as an affiliate';
-
-        $fields = [
-            [
-                'name'          => 'support-email',
-                'type'          => 'text',
-                'validate'      => 'email',
-                'default_value' => $default_settings['support-email'],
-                'label'         => __('Support Email', 'gravityview'),
-                'description'   => __('In order to provide responses to your support requests, please provide your email address.', 'gravityview'),
-                'class'         => 'code regular-text',
-            ],
-            /**
-             * @since 1.15 Added Support Port support
-             */
-            [
-                'name'          => 'support_port',
-                'type'          => 'radio',
-                'label'         => __('Show Support Port?', 'gravityview'),
-                'default_value' => $default_settings['support_port'],
-                'horizontal'    => 1,
-                'choices'       => [
-                    [
-                        'label' => _x('Show', 'Setting: Show or Hide', 'gravityview'),
-                        'value' => '1',
-                    ],
-                    [
-                        'label' => _x('Hide', 'Setting: Show or Hide', 'gravityview'),
-                        'value' => '0',
-                    ],
-                ],
-                'tooltip'     => '<p>'.esc_html__('The Support Port provides quick access to how-to articles and tutorials. For administrators, it also makes it easy to contact support.', 'gravityview').'<img src="'.esc_url_raw(plugins_url('assets/images/beacon.png', GRAVITYVIEW_FILE)).'" alt="'.esc_attr__('The Support Port looks like this.', 'gravityview').'" class="aligncenter" style="display: block; max-width:100%; margin:1em auto;" /></p>',
-                'description' => __('Show the Support Port on GravityView pages?', 'gravityview'),
-            ],
-            [
-                'name'          => 'no-conflict-mode',
-                'type'          => 'radio',
-                'label'         => __('No-Conflict Mode', 'gravityview'),
-                'default_value' => $default_settings['no-conflict-mode'],
-                'horizontal'    => 1,
-                'choices'       => [
-                    [
-                        'label' => _x('On', 'Setting: On or off', 'gravityview'),
-                        'value' => '1',
-                    ],
-                    [
-                        'label' => _x('Off', 'Setting: On or off', 'gravityview'),
-                        'value' => '0',
-                    ],
-                ],
-                'description'   => __('Set this to ON to prevent extraneous scripts and styles from being printed on GravityView admin pages, reducing conflicts with other plugins and themes.', 'gravityview').' '.__('If your Edit View tabs are ugly, enable this setting.', 'gravityview'),
-            ],
-            /**
-             * @since 2.0 Added REST API
-             */
-            gravityview()->plugin->supports(Plugin::FEATURE_REST) ?
-                    [
-                        'name'          => 'rest_api',
-                        'type'          => 'radio',
-                        'label'         => __('REST API', 'gravityview'),
-                        'default_value' => $default_settings['rest_api'],
-                        'horizontal'    => 1,
-                        'choices'       => [
-                            [
-                                'label' => _x('Enable', 'Setting: Enable or Disable', 'gravityview'),
-                                'value' => '1',
-                            ],
-                            [
-                                'label' => _x('Disable', 'Setting: Enable or Disable', 'gravityview'),
-                                'value' => '0',
-                            ],
-                        ],
-                        'description'   => __('Enable View and Entry access via the REST API? Regular per-View restrictions apply (private, password protected, etc.).', 'gravityview'),
-                        'tooltip'       => '<p>'.esc_html__('If you are unsure, choose the Disable setting.', 'gravityview').'</p>',
-                    ] : [],
-            [
-                'name'          => 'powered_by',
-                'type'          => 'checkbox',
-                'label'         => __('Display "Powered By" Link', 'gravityview'),
-                'default_value' => $default_settings['powered_by'],
-                'choices'       => [
-                    [
-                        'label' => esc_html__('Display a "Powered by GravityView" link', 'gravityview'),
-                        'value' => '1',
-                        'name'  => 'powered_by',
-                    ],
-                ],
-                'description'   => __('When enabled, a "Powered by GravityView" link will be displayed below Views. Help us spread the word!', 'gravityview'),
-            ],
-            [
-                'name'          => 'affiliate_id',
-                'type'          => 'text',
-                'input_type'    => 'number',
-                'default_value' => null,
-                'label'         => __('Affiliate ID', 'gravityview'),
-                'description'   => sprintf(__('Earn money when people clicking your links become GravityView customers. <a href="%s" rel="external">Register as an affiliate</a>!', 'gravityview'), esc_url($affiliate_link)),
-                'class'         => 'code',
-                'placeholder'   => '123',
-                'data-requires' => 'powered_by',
-            ],
-            [
-                'name'          => 'beta',
-                'type'          => 'checkbox',
-                'label'         => __('Become a Beta Tester', 'gravityview'),
-                'default_value' => $default_settings['beta'],
-                'horizontal'    => 1,
-                'choices'       => [
-                    [
-                        'label' => esc_html__('Show me beta versions if they are available.', 'gravityview'),
-                        'value' => '1',
-                        'name'  => 'beta',
-                    ],
-                ],
-                'description'   => __('You will have early access to the latest GravityView features and improvements. There may be bugs! If you encounter an issue, help make GravityView better by reporting it!', 'gravityview'),
-            ],
-        ];
-
-        $fields = array_filter($fields, 'count');
-
-        /**
-         * @filter     `gravityview_settings_fields` Filter the settings fields.
-         *
-         * @param array $fields The fields to filter.
-         *
-         * @deprecated Use `gravityview/settings/fields`.
-         */
-        $fields = apply_filters('gravityview_settings_fields', $fields);
-
-        /**
-         * @filter `gravityview/settings/fields` Filter the settings fields.
-         *
-         * @param array $fields The fields to filter.
-         */
-        $fields = apply_filters('gravityview/settings/fields', $fields);
-
-        /**
-         * Redux backward compatibility.
-         *
-         * @since 1.7.4
-         */
-        foreach ($fields as &$field) {
-            $field['name'] = isset($field['name']) ? $field['name'] : Utils::get($field, 'id');
-            $field['label'] = isset($field['label']) ? $field['label'] : Utils::get($field, 'title');
-            $field['default_value'] = isset($field['default_value']) ? $field['default_value'] : Utils::get($field, 'default');
-            $field['description'] = isset($field['description']) ? $field['description'] : Utils::get($field, 'subtitle');
-
-            if ($disabled_attribute) {
-                $field['disabled'] = $disabled_attribute;
-            }
-
-            if (empty($field['disabled'])) {
-                unset($field['disabled']);
-            }
-        }
-
-        $license_fields = [
-            [
-                'name'              => 'license_key',
-                'required'          => !defined('GRAVITYVIEW_LICENSE_KEY') || !GRAVITYVIEW_LICENSE_KEY,
-                'label'             => __('License Key', 'gravityview'),
-                'description'       => __('Enter the license key that was sent to you on purchase. This enables plugin updates &amp; support.', 'gravityview'),
-                'type'              => 'edd_license',
-                'data-pending-text' => __('Verifying license&hellip;', 'gravityview'),
-                'default_value'     => $default_settings['license_key'],
-                'class'             => ('' == $this->get('license_key')) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key',
-            ],
-            [
-                'name'          => 'license_key_response',
-                'default_value' => $default_settings['license_key_response'],
-                'type'          => 'hidden',
-            ],
-            [
-                'name'          => 'license_key_status',
-                'default_value' => $default_settings['license_key_status'],
-                'type'          => 'hidden',
-            ],
-        ];
-
-        if (defined('GRAVITYVIEW_LICENSE_KEY') && GRAVITYVIEW_LICENSE_KEY) {
-            $license_fields[0] = array_merge($license_fields[0], [
-                'disabled' => true,
-                'title'    => __('The license key is defined by your site\'s configuration file.', 'gravityview'),
-            ]);
-        }
-
-        $sections = [];
-        $version_info = '<span class="gv-version-info" title="'.sprintf(__('You are running GravityView version %s', 'gravityview'), Plugin::$version).'">Version '.esc_html(Plugin::$version).'</span>';
-
-        if (\gravityview()->plugin->is_GF_25()) {
-            $sections[] = [
-                'title'       => __('GravityView License', 'gravityview'),
-                'class'       => 'gform-settings-panel--full gv-settings-panel--license',
-                'description' => $version_info,
-                'fields'      => $license_fields,
-            ];
-        } else {
-            $fields = array_merge($license_fields, $fields);
-
-            array_unshift($fields, [
-                'name'  => 'gv_header',
-                'value' => $version_info,
-                'type'  => 'html',
-            ]);
-        }
-
-        $sections[] = [
-            'title'       => (gravityview()->plugin->is_GF_25() ? __('GravityView Settings', 'gravityview') : null),
-            'class'       => 'gform-settings-panel--full gv-settings-panel--core',
-            'fields'      => $fields,
-        ];
-
-        /**
-         * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page
-         * Extensions can tap in here to insert their own section and settings.
-         * <code>
-         *   $sections[] = array(
-         *      'title' => __( 'GravityView My Extension Settings', 'gravityview' ),
-         *      'fields' => $settings,
-         *   );
-         * </code>
-         *
-         * @param array $extension_settings Empty array, ready for extension settings!
-         */
-        $extension_sections = apply_filters('gravityview/settings/extension/sections', []);
-
-        // If there are extensions, add a section for them
-        if (!empty($extension_sections)) {
-            if ($disabled_attribute) {
-                foreach ($extension_sections as &$section) {
-                    foreach ($section['fields'] as &$field) {
-                        $field['disabled'] = $disabled_attribute;
-                    }
-                }
-            }
-
-            $sections = array_merge($sections, $extension_sections);
-        }
-
-        return $sections;
-    }
-
-    /**
-     * Updates app settings with the provided settings.
-     *
-     * Same as the GFAddon, except it returns the value from update_option()
-     *
-     * @param array $settings - App settings to be saved
-     *
-     * @return bool False if value was not updated and true if value was updated.
-     *
-     * @deprecated Use \GV\Addon_Settings::set or \GV\Addon_Settings::update
-     */
-    public function update_app_settings($settings)
-    {
-        return $this->update($settings);
-    }
-
-    /**
-     * Sets a subset of settings.
-     *
-     * @param array|string An array of settings to update, or string (key) and $value to update one setting.
-     * @param mixed $value A value if $settings is string (key). Default: null.
-     */
-    public function set($settings, $value = null)
-    {
-        if (is_string($settings)) {
-            $settings = [$settings => $value];
-        }
-        $settings = wp_parse_args($settings, $this->all());
-
-        return update_option('gravityformsaddon_'.$this->_slug.'_app_settings', $settings);
-    }
-
-    /**
-     * Updates settings.
-     *
-     * @param array $settings The settings array.
-     *
-     * @return bool False if value was not updated and true if value was updated.
-     */
-    public function update($settings)
-    {
-        return update_option('gravityformsaddon_'.$this->_slug.'_app_settings', $settings);
-    }
-
-    /**
-     * Register the settings field for the EDD License field type.
-     *
-     * @param array $field
-     * @param bool  $echo  Whether to echo the
-     *
-     * @return string
-     */
-    public function settings_edd_license($field, $echo = true)
-    {
-        if (defined('GRAVITYVIEW_LICENSE_KEY') && GRAVITYVIEW_LICENSE_KEY) {
-            $field['input_type'] = 'password';
-        }
-
-        $text = $this->settings_text($field, false);
-
-        $activation = $this->License_Handler->settings_edd_license_activation($field, false);
-
-        $return = $text.$activation;
-
-        $return .= $this->get_license_handler()->license_details(\GV\Addon_Settings::get('license_key_response'));
-
-        if ($echo) {
-            echo $return;
-        }
-
-        return $return;
-    }
-
-    /**
-     * Allow pure HTML settings row.
-     *
-     * @since 2.0.6
-     *
-     * @param array $field
-     * @param bool  $echo  Whether to echo the
-     *
-     * @return string
-     */
-    protected function settings_html($field, $echo = true)
-    {
-        $return = \GV\Utils::get($field, 'value', '');
-
-        if ($echo) {
-            echo $return;
-        }
+				implode(' ', $attributes).
+				' />';
+
+		if ($echo) {
+			echo $html;
+		}
+
+		return $html;
+	}
+
+	/**
+	 * @deprecated Use \GV\Addon_Settings::as_html
+	 */
+	public function settings_submit($field, $echo = true)
+	{
+		gravityview()->log->warning('\GV\Addon_Settings::settings_submit has been deprecated for \GV\Addon_Settings::as_html');
+
+		return $this->as_html($field, $echo);
+	}
+
+	/**
+	 * Check whether GravityView is being saved.
+	 *
+	 * The generic is_save_postback() is true for all addons
+	 *
+	 * @since 2.0.8
+	 *
+	 * @return bool
+	 */
+	public function is_save_postback()
+	{
+		return isset($_POST['gform-settings-save']) && isset($_POST['_gravityview_save_settings_nonce']);
+	}
+
+	/**
+	 * Display a notice if the plugin is inactive.
+	 *
+	 * @return void
+	 */
+	public function license_key_notice()
+	{
+		if ('uninstall' === rgget('view')) {
+			return; // Do not display license notice on the uninstall page in GF 2.5
+		}
+
+		if ($this->is_save_postback()) {
+			$settings = $this->get_posted_settings();
+			$license_key = defined('GRAVITYVIEW_LICENSE_KEY') ? GRAVITYVIEW_LICENSE_KEY : \GV\Utils::get($settings, 'license_key');
+			$license_status = \GV\Utils::get($settings, 'license_key_status', 'inactive');
+		} else {
+			$license_status = $this->get('license_key_status', 'inactive');
+			$license_key = $this->get('license_key');
+		}
+
+		if (empty($license_key)) {
+			$license_id = 'license';
+			$license_status = '';
+		} else {
+			$license_id = $license_key;
+		}
+
+		$message = esc_html__('Your GravityView license %s. This means you&rsquo;re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview');
+
+		/** @internal Do not use! Will change without notice (pun slightly intended). */
+		$message = apply_filters('gravityview/settings/license-key-notice', $message);
+
+		/**
+		 * I wanted to remove the period from after the buttons in the string,
+		 * but didn't want to mess up the translation strings for the translators.
+		 */
+		$message = mb_substr($message, 0, mb_strlen($message) - 1);
+		$title = __('Inactive License', 'gravityview');
+		$status = '';
+		$update_below = false;
+		$primary_button_link = admin_url('edit.php?post_type=gravityview&amp;page=gravityview_settings');
+
+		switch ($license_status) {
+			/** @since 1.17 */
+			case 'expired':
+				$title = __('Expired License', 'gravityview');
+				$status = __('has expired', 'gravityview');
+				$message = $this->get_license_handler()->strings('expired', $this->get('license_key_response'));
+				break;
+			case 'invalid':
+				$title = __('Invalid License', 'gravityview');
+				$status = __('is invalid', 'gravityview');
+				break;
+			case 'deactivated':
+				$status = __('is inactive', 'gravityview');
+				$update_below = __('Activate your license key below.', 'gravityview');
+				break;
+			/** @noinspection PhpMissingBreakStatementInspection */
+			case '':
+				$license_status = 'site_inactive';
+			// break intentionally left blank
+			case 'inactive':
+			case 'site_inactive':
+				$status = __('has not been activated', 'gravityview');
+				$update_below = __('Activate your license key below.', 'gravityview');
+				break;
+		}
+		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content='.$license_status.'&utm_campaign=Admin%20Notice';
+
+		// Show a different notice on settings page for inactive licenses (hide the buttons)
+		if ($update_below && gravityview()->request->is_admin('', 'settings')) {
+			$message = sprintf($message, $status, '<div class="hidden">', '', '', '</div><a href="#" onclick="jQuery(\'#license_key\').focus(); return false;">'.$update_below.'</a>');
+		} else {
+			$message = sprintf($message, $status, "\n\n".'<a href="'.esc_url($primary_button_link).'" class="button button-primary primary">', '</a>', '<a href="'.esc_url($url).'" class="button button-secondary">', '</a>');
+		}
+
+		if (empty($status)) {
+			return;
+		}
+
+		\GravityView_Admin_Notices::add_notice([
+			'message' => $message,
+			'class'   => 'notice notice-warning gv-license-warning',
+			'title'   => $title,
+			'cap'     => 'gravityview_edit_settings',
+			'dismiss' => sha1($license_status.'_'.$license_id.'_'.date('z')), // Show every day, instead of every 8 weeks (which is the default)
+		]);
+	}
+
+	/**
+	 * Allow public access to the GV\License_Handler class.
+	 *
+	 * @since 1.7.4
+	 *
+	 * @return \GV\License_Handler
+	 */
+	public function get_license_handler()
+	{
+		return $this->License_Handler;
+	}
+
+	/**
+	 * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason.
+	 *
+	 * @since 1.21.5
+	 * @see   GFAddOn::scripts()
+	 *
+	 * @return array Array of scripts
+	 */
+	public function scripts()
+	{
+		$scripts = parent::scripts();
+
+		$scripts[] = [
+			'handle'  => 'gform_tooltip_init',
+			'enqueue' => [
+				[
+					'admin_page' => ['app_settings'],
+				],
+			],
+		];
+
+		return $scripts;
+	}
+
+	/**
+	 * Register styles in the app admin page.
+	 *
+	 * @return array
+	 */
+	public function styles()
+	{
+		$styles = parent::styles();
+
+		$deps = [
+			'gform_admin',
+			'gaddon_form_settings_css',
+			'gform_font_awesome',
+		];
+
+		// This file was removed from 2.5
+		if (!gravityview()->plugin->is_GF_25()) {
+			$deps[] = 'gform_tooltip';
+		}
+
+		$styles[] = [
+			'handle'  => 'gravityview_settings',
+			'src'     => plugins_url('assets/css/admin-settings.css', GRAVITYVIEW_FILE),
+			'version' => Plugin::$version,
+			'deps'    => $deps,
+			'enqueue' => [
+				[
+					'admin_page' => [
+						'app_settings',
+						'plugin_settings',
+					],
+				],
+			],
+		];
+
+		return $styles;
+	}
+
+	/**
+	 * Does the current site have its own settings?
+	 *
+	 * - If not multisite, returns true.
+	 * - If multisite and the plugin is network activated, returns true; we need to register the submenu page for the Network Admin settings to work.
+	 * - If multisite and not network admin, return false.
+	 *
+	 * @since 2.8.2
+	 *
+	 * @return bool
+	 */
+	private function has_site_settings()
+	{
+		return (!is_multisite()) || is_main_site() || (!gravityview()->plugin->is_network_activated()) || (is_network_admin() && gravityview()->plugin->is_network_activated());
+	}
+
+	/**
+	 * Add Settings link to GravityView menu.
+	 *
+	 * @return void
+	 */
+	public function create_app_menu()
+	{
+
+		/**
+		 * Override whether to show the Settings menu on a per-blog basis.
+		 *
+		 * @since 1.7.6
+		 *
+		 * @param bool $hide_if_network_activated Default: true
+		 */
+		$show_submenu = apply_filters('gravityview/show-settings-menu', $this->has_site_settings());
+
+		if (!$show_submenu) {
+			return;
+		}
+
+		add_submenu_page('edit.php?post_type=gravityview', __('Settings', 'gravityview'), __('Settings', 'gravityview'), $this->_capabilities_app_settings, $this->_slug.'_settings', [$this, 'app_tab_page']);
+	}
+
+	/**
+	 * Gets the required indicator
+	 * Gets the markup of the required indicator symbol to highlight fields that are required.
+	 *
+	 * @param $field - The field meta.
+	 *
+	 * @return string - Returns markup of the required indicator symbol
+	 */
+	public function get_required_indicator($field)
+	{
+		return '<span class="required" title="'.esc_attr__('Required', 'gravityview').'">*</span>';
+	}
+
+	/**
+	 * Specify the settings fields to be rendered on the plugin settings page.
+	 *
+	 * @return array
+	 */
+	public function app_settings_fields()
+	{
+		$default_settings = $this->defaults();
+
+		$disabled_attribute = \GVCommon::has_cap('gravityview_edit_settings') ? false : 'disabled';
+
+		$affiliate_link = 'https://gravityview.co/account/affiliate/?utm_source=in-plugin&utm_medium=setting&utm_content=Register as an affiliate';
+
+		$fields = [
+			[
+				'name'          => 'support-email',
+				'type'          => 'text',
+				'validate'      => 'email',
+				'default_value' => $default_settings['support-email'],
+				'label'         => __('Support Email', 'gravityview'),
+				'description'   => __('In order to provide responses to your support requests, please provide your email address.', 'gravityview'),
+				'class'         => 'code regular-text',
+			],
+			/**
+			 * @since 1.15 Added Support Port support
+			 */
+			[
+				'name'          => 'support_port',
+				'type'          => 'radio',
+				'label'         => __('Show Support Port?', 'gravityview'),
+				'default_value' => $default_settings['support_port'],
+				'horizontal'    => 1,
+				'choices'       => [
+					[
+						'label' => _x('Show', 'Setting: Show or Hide', 'gravityview'),
+						'value' => '1',
+					],
+					[
+						'label' => _x('Hide', 'Setting: Show or Hide', 'gravityview'),
+						'value' => '0',
+					],
+				],
+				'tooltip'     => '<p>'.esc_html__('The Support Port provides quick access to how-to articles and tutorials. For administrators, it also makes it easy to contact support.', 'gravityview').'<img src="'.esc_url_raw(plugins_url('assets/images/beacon.png', GRAVITYVIEW_FILE)).'" alt="'.esc_attr__('The Support Port looks like this.', 'gravityview').'" class="aligncenter" style="display: block; max-width:100%; margin:1em auto;" /></p>',
+				'description' => __('Show the Support Port on GravityView pages?', 'gravityview'),
+			],
+			[
+				'name'          => 'no-conflict-mode',
+				'type'          => 'radio',
+				'label'         => __('No-Conflict Mode', 'gravityview'),
+				'default_value' => $default_settings['no-conflict-mode'],
+				'horizontal'    => 1,
+				'choices'       => [
+					[
+						'label' => _x('On', 'Setting: On or off', 'gravityview'),
+						'value' => '1',
+					],
+					[
+						'label' => _x('Off', 'Setting: On or off', 'gravityview'),
+						'value' => '0',
+					],
+				],
+				'description'   => __('Set this to ON to prevent extraneous scripts and styles from being printed on GravityView admin pages, reducing conflicts with other plugins and themes.', 'gravityview').' '.__('If your Edit View tabs are ugly, enable this setting.', 'gravityview'),
+			],
+			/**
+			 * @since 2.0 Added REST API
+			 */
+			gravityview()->plugin->supports(Plugin::FEATURE_REST) ?
+					[
+						'name'          => 'rest_api',
+						'type'          => 'radio',
+						'label'         => __('REST API', 'gravityview'),
+						'default_value' => $default_settings['rest_api'],
+						'horizontal'    => 1,
+						'choices'       => [
+							[
+								'label' => _x('Enable', 'Setting: Enable or Disable', 'gravityview'),
+								'value' => '1',
+							],
+							[
+								'label' => _x('Disable', 'Setting: Enable or Disable', 'gravityview'),
+								'value' => '0',
+							],
+						],
+						'description'   => __('Enable View and Entry access via the REST API? Regular per-View restrictions apply (private, password protected, etc.).', 'gravityview'),
+						'tooltip'       => '<p>'.esc_html__('If you are unsure, choose the Disable setting.', 'gravityview').'</p>',
+					] : [],
+			[
+				'name'          => 'powered_by',
+				'type'          => 'checkbox',
+				'label'         => __('Display "Powered By" Link', 'gravityview'),
+				'default_value' => $default_settings['powered_by'],
+				'choices'       => [
+					[
+						'label' => esc_html__('Display a "Powered by GravityView" link', 'gravityview'),
+						'value' => '1',
+						'name'  => 'powered_by',
+					],
+				],
+				'description'   => __('When enabled, a "Powered by GravityView" link will be displayed below Views. Help us spread the word!', 'gravityview'),
+			],
+			[
+				'name'          => 'affiliate_id',
+				'type'          => 'text',
+				'input_type'    => 'number',
+				'default_value' => null,
+				'label'         => __('Affiliate ID', 'gravityview'),
+				'description'   => sprintf(__('Earn money when people clicking your links become GravityView customers. <a href="%s" rel="external">Register as an affiliate</a>!', 'gravityview'), esc_url($affiliate_link)),
+				'class'         => 'code',
+				'placeholder'   => '123',
+				'data-requires' => 'powered_by',
+			],
+			[
+				'name'          => 'beta',
+				'type'          => 'checkbox',
+				'label'         => __('Become a Beta Tester', 'gravityview'),
+				'default_value' => $default_settings['beta'],
+				'horizontal'    => 1,
+				'choices'       => [
+					[
+						'label' => esc_html__('Show me beta versions if they are available.', 'gravityview'),
+						'value' => '1',
+						'name'  => 'beta',
+					],
+				],
+				'description'   => __('You will have early access to the latest GravityView features and improvements. There may be bugs! If you encounter an issue, help make GravityView better by reporting it!', 'gravityview'),
+			],
+		];
+
+		$fields = array_filter($fields, 'count');
+
+		/**
+		 * @filter     `gravityview_settings_fields` Filter the settings fields.
+		 *
+		 * @param array $fields The fields to filter.
+		 *
+		 * @deprecated Use `gravityview/settings/fields`.
+		 */
+		$fields = apply_filters('gravityview_settings_fields', $fields);
+
+		/**
+		 * @filter `gravityview/settings/fields` Filter the settings fields.
+		 *
+		 * @param array $fields The fields to filter.
+		 */
+		$fields = apply_filters('gravityview/settings/fields', $fields);
+
+		/**
+		 * Redux backward compatibility.
+		 *
+		 * @since 1.7.4
+		 */
+		foreach ($fields as &$field) {
+			$field['name'] = isset($field['name']) ? $field['name'] : Utils::get($field, 'id');
+			$field['label'] = isset($field['label']) ? $field['label'] : Utils::get($field, 'title');
+			$field['default_value'] = isset($field['default_value']) ? $field['default_value'] : Utils::get($field, 'default');
+			$field['description'] = isset($field['description']) ? $field['description'] : Utils::get($field, 'subtitle');
+
+			if ($disabled_attribute) {
+				$field['disabled'] = $disabled_attribute;
+			}
 
-        return $return;
-    }
+			if (empty($field['disabled'])) {
+				unset($field['disabled']);
+			}
+		}
+
+		$license_fields = [
+			[
+				'name'              => 'license_key',
+				'required'          => !defined('GRAVITYVIEW_LICENSE_KEY') || !GRAVITYVIEW_LICENSE_KEY,
+				'label'             => __('License Key', 'gravityview'),
+				'description'       => __('Enter the license key that was sent to you on purchase. This enables plugin updates &amp; support.', 'gravityview'),
+				'type'              => 'edd_license',
+				'data-pending-text' => __('Verifying license&hellip;', 'gravityview'),
+				'default_value'     => $default_settings['license_key'],
+				'class'             => ('' == $this->get('license_key')) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key',
+			],
+			[
+				'name'          => 'license_key_response',
+				'default_value' => $default_settings['license_key_response'],
+				'type'          => 'hidden',
+			],
+			[
+				'name'          => 'license_key_status',
+				'default_value' => $default_settings['license_key_status'],
+				'type'          => 'hidden',
+			],
+		];
+
+		if (defined('GRAVITYVIEW_LICENSE_KEY') && GRAVITYVIEW_LICENSE_KEY) {
+			$license_fields[0] = array_merge($license_fields[0], [
+				'disabled' => true,
+				'title'    => __('The license key is defined by your site\'s configuration file.', 'gravityview'),
+			]);
+		}
+
+		$sections = [];
+		$version_info = '<span class="gv-version-info" title="'.sprintf(__('You are running GravityView version %s', 'gravityview'), Plugin::$version).'">Version '.esc_html(Plugin::$version).'</span>';
+
+		if (\gravityview()->plugin->is_GF_25()) {
+			$sections[] = [
+				'title'       => __('GravityView License', 'gravityview'),
+				'class'       => 'gform-settings-panel--full gv-settings-panel--license',
+				'description' => $version_info,
+				'fields'      => $license_fields,
+			];
+		} else {
+			$fields = array_merge($license_fields, $fields);
+
+			array_unshift($fields, [
+				'name'  => 'gv_header',
+				'value' => $version_info,
+				'type'  => 'html',
+			]);
+		}
+
+		$sections[] = [
+			'title'       => (gravityview()->plugin->is_GF_25() ? __('GravityView Settings', 'gravityview') : null),
+			'class'       => 'gform-settings-panel--full gv-settings-panel--core',
+			'fields'      => $fields,
+		];
+
+		/**
+		 * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page
+		 * Extensions can tap in here to insert their own section and settings.
+		 * <code>
+		 *   $sections[] = array(
+		 *      'title' => __( 'GravityView My Extension Settings', 'gravityview' ),
+		 *      'fields' => $settings,
+		 *   );
+		 * </code>
+		 *
+		 * @param array $extension_settings Empty array, ready for extension settings!
+		 */
+		$extension_sections = apply_filters('gravityview/settings/extension/sections', []);
+
+		// If there are extensions, add a section for them
+		if (!empty($extension_sections)) {
+			if ($disabled_attribute) {
+				foreach ($extension_sections as &$section) {
+					foreach ($section['fields'] as &$field) {
+						$field['disabled'] = $disabled_attribute;
+					}
+				}
+			}
 
-    /**
-     * No <th> needed for pure HTML settings row.
-     *
-     * @since 2.0.6
-     *
-     * @param array $field
-     *
-     * @return void
-     */
-    public function single_setting_row_html($field)
-    {
-        ?>
+			$sections = array_merge($sections, $extension_sections);
+		}
+
+		return $sections;
+	}
+
+	/**
+	 * Updates app settings with the provided settings.
+	 *
+	 * Same as the GFAddon, except it returns the value from update_option()
+	 *
+	 * @param array $settings - App settings to be saved
+	 *
+	 * @return bool False if value was not updated and true if value was updated.
+	 *
+	 * @deprecated Use \GV\Addon_Settings::set or \GV\Addon_Settings::update
+	 */
+	public function update_app_settings($settings)
+	{
+		return $this->update($settings);
+	}
+
+	/**
+	 * Sets a subset of settings.
+	 *
+	 * @param array|string An array of settings to update, or string (key) and $value to update one setting.
+	 * @param mixed $value A value if $settings is string (key). Default: null.
+	 */
+	public function set($settings, $value = null)
+	{
+		if (is_string($settings)) {
+			$settings = [$settings => $value];
+		}
+		$settings = wp_parse_args($settings, $this->all());
+
+		return update_option('gravityformsaddon_'.$this->_slug.'_app_settings', $settings);
+	}
+
+	/**
+	 * Updates settings.
+	 *
+	 * @param array $settings The settings array.
+	 *
+	 * @return bool False if value was not updated and true if value was updated.
+	 */
+	public function update($settings)
+	{
+		return update_option('gravityformsaddon_'.$this->_slug.'_app_settings', $settings);
+	}
+
+	/**
+	 * Register the settings field for the EDD License field type.
+	 *
+	 * @param array $field
+	 * @param bool  $echo  Whether to echo the
+	 *
+	 * @return string
+	 */
+	public function settings_edd_license($field, $echo = true)
+	{
+		if (defined('GRAVITYVIEW_LICENSE_KEY') && GRAVITYVIEW_LICENSE_KEY) {
+			$field['input_type'] = 'password';
+		}
+
+		$text = $this->settings_text($field, false);
+
+		$activation = $this->License_Handler->settings_edd_license_activation($field, false);
+
+		$return = $text.$activation;
+
+		$return .= $this->get_license_handler()->license_details(\GV\Addon_Settings::get('license_key_response'));
+
+		if ($echo) {
+			echo $return;
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Allow pure HTML settings row.
+	 *
+	 * @since 2.0.6
+	 *
+	 * @param array $field
+	 * @param bool  $echo  Whether to echo the
+	 *
+	 * @return string
+	 */
+	protected function settings_html($field, $echo = true)
+	{
+		$return = \GV\Utils::get($field, 'value', '');
+
+		if ($echo) {
+			echo $return;
+		}
+
+		return $return;
+	}
+
+	/**
+	 * No <th> needed for pure HTML settings row.
+	 *
+	 * @since 2.0.6
+	 *
+	 * @param array $field
+	 *
+	 * @return void
+	 */
+	public function single_setting_row_html($field)
+	{
+		?>
 
 		<tr id="gaddon-setting-row-<?php echo esc_attr($field['name']); ?>">
 			<td colspan="2">
@@ -1331,95 +1331,95 @@ 
 		</tr>
 
 		<?php
-    }
+	}
+
+	/**
+	 * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it.
+	 *
+	 * Converts `$field['description']` to `$field['gv_description']`
+	 * Converts `$field['subtitle']` to `$field['description']`
+	 *
+	 * @since 1.21.5.2
+	 * @see   http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description
+	 * @see   \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description`
+	 *
+	 * @param array $field
+	 *
+	 * @return void
+	 */
+	public function single_setting_row($field)
+	{
+		$field['gv_description'] = Utils::get($field, 'description');
+		$field['description'] = Utils::get($field, 'subtitle');
+		parent::single_setting_row($field);
+	}
+
+	/**
+	 * The same as the parent, except added support for field descriptions.
+	 *
+	 * @inheritDoc
+	 *
+	 * @param $field array
+	 */
+	public function single_setting_label($field)
+	{
+		parent::single_setting_label($field);
+		if ($description = Utils::get($field, 'gv_description')) {
+			echo '<span class="description">'.$description.'</span>';
+		}
+	}
+
+	/**
+	 * Check for the `gravityview_edit_settings` capability before saving plugin settings.
+	 * Gravity Forms says you're able to edit if you're able to view settings. GravityView allows two different permissions.
+	 *
+	 * @since 1.15
+	 *
+	 * @return void
+	 */
+	public function maybe_save_app_settings()
+	{
+		if ($this->is_save_postback()) {
+			if (!\GVCommon::has_cap('gravityview_edit_settings')) {
+				$_POST = []; // If you don't reset the $_POST array, it *looks* like the settings were changed, but they weren't
+				\GFCommon::add_error_message(__('You don\'t have the ability to edit plugin settings.', 'gravityview'));
+
+				return;
+			}
+		}
+		parent::maybe_save_app_settings();
+	}
 
-    /**
-     * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it.
-     *
-     * Converts `$field['description']` to `$field['gv_description']`
-     * Converts `$field['subtitle']` to `$field['description']`
-     *
-     * @since 1.21.5.2
-     * @see   http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description
-     * @see   \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description`
-     *
-     * @param array $field
-     *
-     * @return void
-     */
-    public function single_setting_row($field)
-    {
-        $field['gv_description'] = Utils::get($field, 'description');
-        $field['description'] = Utils::get($field, 'subtitle');
-        parent::single_setting_row($field);
-    }
-
-    /**
-     * The same as the parent, except added support for field descriptions.
-     *
-     * @inheritDoc
-     *
-     * @param $field array
-     */
-    public function single_setting_label($field)
-    {
-        parent::single_setting_label($field);
-        if ($description = Utils::get($field, 'gv_description')) {
-            echo '<span class="description">'.$description.'</span>';
-        }
-    }
-
-    /**
-     * Check for the `gravityview_edit_settings` capability before saving plugin settings.
-     * Gravity Forms says you're able to edit if you're able to view settings. GravityView allows two different permissions.
-     *
-     * @since 1.15
-     *
-     * @return void
-     */
-    public function maybe_save_app_settings()
-    {
-        if ($this->is_save_postback()) {
-            if (!\GVCommon::has_cap('gravityview_edit_settings')) {
-                $_POST = []; // If you don't reset the $_POST array, it *looks* like the settings were changed, but they weren't
-                \GFCommon::add_error_message(__('You don\'t have the ability to edit plugin settings.', 'gravityview'));
-
-                return;
-            }
-        }
-        parent::maybe_save_app_settings();
-    }
-
-    /**
-     * When the settings are saved, make sure the license key matches the previously activated key.
-     *
-     * @return array settings from parent::get_posted_settings(), with `license_key_response` and `license_key_status` potentially unset
-     */
-    public function get_posted_settings()
-    {
-        $posted_settings = parent::get_posted_settings();
+	/**
+	 * When the settings are saved, make sure the license key matches the previously activated key.
+	 *
+	 * @return array settings from parent::get_posted_settings(), with `license_key_response` and `license_key_status` potentially unset
+	 */
+	public function get_posted_settings()
+	{
+		$posted_settings = parent::get_posted_settings();
 
-        $local_key = Utils::get($posted_settings, 'license_key');
+		$local_key = Utils::get($posted_settings, 'license_key');
 
-        if (!$local_key && defined('GRAVITYVIEW_LICENSE_KEY')) {
-            $local_key = GRAVITYVIEW_LICENSE_KEY;
-        }
+		if (!$local_key && defined('GRAVITYVIEW_LICENSE_KEY')) {
+			$local_key = GRAVITYVIEW_LICENSE_KEY;
+		}
 
-        $response_key = Utils::get($posted_settings, 'license_key_response/license_key');
+		$response_key = Utils::get($posted_settings, 'license_key_response/license_key');
 
-        static $added_message = false;
+		static $added_message = false;
 
-        // If the posted key doesn't match the activated/deactivated key (set using the Activate License button, AJAX response),
-        // then we assume it's changed. If it's changed, unset the status and the previous response.
-        if (!$added_message && ($local_key !== $response_key)) {
-            unset($posted_settings['license_key_response']);
-            unset($posted_settings['license_key_status']);
+		// If the posted key doesn't match the activated/deactivated key (set using the Activate License button, AJAX response),
+		// then we assume it's changed. If it's changed, unset the status and the previous response.
+		if (!$added_message && ($local_key !== $response_key)) {
+			unset($posted_settings['license_key_response']);
+			unset($posted_settings['license_key_status']);
 
-            \GFCommon::add_error_message(__('The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview'));
+			\GFCommon::add_error_message(__('The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview'));
 
-            $added_message = true;
-        }
+			$added_message = true;
+		}
 
-        return $posted_settings;
-    }
+		return $posted_settings;
+	}
 }

Spacing +276 added lines, -276 removed lines

@@ -5,11 +5,11 @@ 
 use GV\Shortcodes\gravityview;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
-if (!class_exists('\GFAddOn')) {
+if ( ! class_exists( '\GFAddOn' ) ) {
     return;
 }
 
@@ -73,7 +73,7 @@ 
         /**
          * Hook everywhere, but only once.
          */
-        if (!self::$initialized) {
+        if ( ! self::$initialized ) {
             parent::__construct();
             self::$initialized = true;
         }
@@ -90,18 +90,18 @@ 
     {
         $this->_load_license_handler();
 
-        add_filter('admin_body_class', [$this, 'body_class']);
+        add_filter( 'admin_body_class', [ $this, 'body_class' ] );
 
-        add_action('admin_head', [$this, 'license_key_notice']);
+        add_action( 'admin_head', [ $this, 'license_key_notice' ] );
 
-        add_filter('gform_addon_app_settings_menu_gravityview', [$this, 'modify_app_settings_menu_title']);
+        add_filter( 'gform_addon_app_settings_menu_gravityview', [ $this, 'modify_app_settings_menu_title' ] );
 
-        add_filter('gform_settings_save_button', [$this, 'modify_gform_settings_save_button'], 10, 2);
+        add_filter( 'gform_settings_save_button', [ $this, 'modify_gform_settings_save_button' ], 10, 2 );
 
         /** @since 1.7.6 */
-        add_action('network_admin_menu', [$this, 'add_network_menu']);
+        add_action( 'network_admin_menu', [ $this, 'add_network_menu' ] );
 
-        add_filter('gravityview_noconflict_styles', [$this, 'register_no_conflict']);
+        add_filter( 'gravityview_noconflict_styles', [ $this, 'register_no_conflict' ] );
 
         parent::init_admin();
     }
@@ -117,22 +117,22 @@ 
     {
         $setting_tabs = parent::get_app_settings_tabs();
 
-        foreach ($setting_tabs as &$tab) {
-            if ('uninstall' !== $tab['name']) {
+        foreach ( $setting_tabs as &$tab ) {
+            if ( 'uninstall' !== $tab[ 'name' ] ) {
                 continue;
             }
 
             // Do not display uninstall tab if user is lacking permissions/this is a multisite
-            if (!($this->current_user_can_any($this->_capabilities_uninstall) && (!function_exists('is_multisite') || !is_multisite() || is_super_admin()))) {
+            if ( ! ( $this->current_user_can_any( $this->_capabilities_uninstall ) && ( ! function_exists( 'is_multisite' ) || ! is_multisite() || is_super_admin() ) ) ) {
                 $tab = null;
                 continue;
             }
 
             // Add trash can icon to resemble the look and feel of the GF Settings page
-            $tab['icon'] = 'dashicons-trash';
+            $tab[ 'icon' ] = 'dashicons-trash';
         }
 
-        return array_filter($setting_tabs);
+        return array_filter( $setting_tabs );
     }
 
     /**
@@ -142,10 +142,10 @@ 
      *
      * @return array
      */
-    public function register_no_conflict($items)
+    public function register_no_conflict( $items )
     {
-        $items[] = 'gform_settings';
-        $items[] = 'gv-admin-edd-license';
+        $items[ ] = 'gform_settings';
+        $items[ ] = 'gv-admin-edd-license';
 
         return $items;
     }
@@ -157,13 +157,13 @@ 
      *
      * @return string
      */
-    public function body_class($css_class)
+    public function body_class( $css_class )
     {
-        if (!gravityview()->request->is_admin('', 'settings')) {
+        if ( ! gravityview()->request->is_admin( '', 'settings' ) ) {
             return $css_class;
         }
 
-        if (gravityview()->plugin->is_GF_25()) {
+        if ( gravityview()->plugin->is_GF_25() ) {
             $css_class .= ' gf-2-5';
         }
 
@@ -178,25 +178,25 @@ 
      * @param string                                     $html      HTML of the save button.
      * @param \Gravity_Forms\Gravity_Forms\Settings|null $framework Current instance of the Settings Framework. Or null if < 2.5.
      */
-    public function modify_gform_settings_save_button($html, $framework = null)
+    public function modify_gform_settings_save_button( $html, $framework = null )
     {
-        if (!gravityview()->request->is_admin('', 'settings')) {
+        if ( ! gravityview()->request->is_admin( '', 'settings' ) ) {
             return $html;
         }
 
-        if (!($this->current_user_can_any($this->_capabilities_uninstall) && (!function_exists('is_multisite') || !is_multisite() || is_super_admin()))) {
+        if ( ! ( $this->current_user_can_any( $this->_capabilities_uninstall ) && ( ! function_exists( 'is_multisite' ) || ! is_multisite() || is_super_admin() ) ) ) {
             return $html;
         }
 
-        if (gravityview()->plugin->is_GF_25()) {
+        if ( gravityview()->plugin->is_GF_25() ) {
             $html_class = 'button outline secondary alignright button-danger';
         } else {
             $html_class = 'button button-secondary button-large alignright button-danger';
         }
 
-        $href = add_query_arg(['post_type' => 'gravityview', 'page' => 'gravityview_settings', 'view' => 'uninstall'], admin_url('edit.php'));
+        $href = add_query_arg( [ 'post_type' => 'gravityview', 'page' => 'gravityview_settings', 'view' => 'uninstall' ], admin_url( 'edit.php' ) );
 
-        $uninstall_button = '<a href="'.esc_url($href).'" class="'.gravityview_sanitize_html_class($html_class).'">'.esc_html__('Uninstall GravityView', 'gravityview').'</a>';
+        $uninstall_button = '<a href="' . esc_url( $href ) . '" class="' . gravityview_sanitize_html_class( $html_class ) . '">' . esc_html__( 'Uninstall GravityView', 'gravityview' ) . '</a>';
 
         $html .= $uninstall_button;
 
@@ -213,18 +213,18 @@ 
      *
      * @return string|null HTML of the button.
      */
-    public function settings_save($field, $echo = true)
+    public function settings_save( $field, $echo = true )
     {
-        $field['type'] = 'submit';
-        $field['name'] = 'gform-settings-save';
-        $field['class'] = 'button button-primary primary button-hero';
-        $field['value'] = Utils::get($field, 'value', __('Update Settings', 'gravityview'));
+        $field[ 'type' ] = 'submit';
+        $field[ 'name' ] = 'gform-settings-save';
+        $field[ 'class' ] = 'button button-primary primary button-hero';
+        $field[ 'value' ] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
 
-        $html = $this->as_html($field, false);
+        $html = $this->as_html( $field, false );
 
-        $html = $this->modify_gform_settings_save_button($html);
+        $html = $this->modify_gform_settings_save_button( $html );
 
-        if ($echo) {
+        if ( $echo ) {
             echo $html;
         }
 
@@ -238,10 +238,10 @@ 
      *
      * @return array
      */
-    public function modify_app_settings_menu_title($setting_tabs)
+    public function modify_app_settings_menu_title( $setting_tabs )
     {
-        $setting_tabs[0]['label'] = __('GravityView Settings', 'gravityview');
-        $setting_tabs[0]['icon'] = 'dashicons-admin-settings';
+        $setting_tabs[ 0 ][ 'label' ] = __( 'GravityView Settings', 'gravityview' );
+        $setting_tabs[ 0 ][ 'icon' ] = 'dashicons-admin-settings';
 
         return $setting_tabs;
     }
@@ -263,10 +263,10 @@ 
      */
     private function _load_license_handler()
     {
-        if (!empty($this->License_Handler)) {
+        if ( ! empty( $this->License_Handler ) ) {
             return;
         }
-        $this->License_Handler = License_Handler::get($this);
+        $this->License_Handler = License_Handler::get( $this );
     }
 
     /**
@@ -278,11 +278,11 @@ 
      */
     public function add_network_menu()
     {
-        if (!gravityview()->plugin->is_network_activated()) {
+        if ( ! gravityview()->plugin->is_network_activated() ) {
             return;
         }
 
-        add_menu_page(__('Settings', 'gravityview'), __('GravityView', 'gravityview'), $this->_capabilities_app_settings, "{$this->_slug}_settings", [$this, 'app_tab_page'], 'none');
+        add_menu_page( __( 'Settings', 'gravityview' ), __( 'GravityView', 'gravityview' ), $this->_capabilities_app_settings, "{$this->_slug}_settings", [ $this, 'app_tab_page' ], 'none' );
     }
 
     /**
@@ -319,21 +319,21 @@ 
      *
      * @return bool
      */
-    public function current_user_can_any($caps)
+    public function current_user_can_any( $caps )
     {
-        if (empty($caps)) {
-            $caps = ['gravityview_full_access'];
+        if ( empty( $caps ) ) {
+            $caps = [ 'gravityview_full_access' ];
         }
 
-        return \GVCommon::has_cap($caps);
+        return \GVCommon::has_cap( $caps );
     }
 
     public function uninstall_warning_message()
     {
-        $heading = esc_html__('If you delete then re-install GravityView, it will be like installing GravityView for the first time.', 'gravityview');
-        $message = esc_html__('Delete all Views, GravityView entry approval status, GravityView-generated entry notes (including approval and entry creator changes), and GravityView plugin settings.', 'gravityview');
+        $heading = esc_html__( 'If you delete then re-install GravityView, it will be like installing GravityView for the first time.', 'gravityview' );
+        $message = esc_html__( 'Delete all Views, GravityView entry approval status, GravityView-generated entry notes (including approval and entry creator changes), and GravityView plugin settings.', 'gravityview' );
 
-        return sprintf('<h4>%s</h4><p>%s</p>', $heading, $message);
+        return sprintf( '<h4>%s</h4><p>%s</p>', $heading, $message );
     }
 
     /**
@@ -347,24 +347,24 @@ 
     {
         $reasons = [
             'will-continue'  => [
-                'label' => esc_html__('I am going to continue using GravityView', 'gravityview'),
+                'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ),
             ],
             'no-longer-need' => [
-                'label' => esc_html__('I no longer need GravityView', 'gravityview'),
+                'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ),
             ],
             'doesnt-work'    => [
-                'label' => esc_html__('The plugin doesn\'t work', 'gravityview'),
+                'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ),
             ],
             'found-other'    => [
-                'label'    => esc_html__('I found a better plugin', 'gravityview'),
-                'followup' => esc_attr__('What plugin you are using, and why?', 'gravityview'),
+                'label'    => esc_html__( 'I found a better plugin', 'gravityview' ),
+                'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ),
             ],
             'other'          => [
-                'label' => esc_html__('Other', 'gravityview'),
+                'label' => esc_html__( 'Other', 'gravityview' ),
             ],
         ];
 
-        shuffle($reasons);
+        shuffle( $reasons );
 
         return $reasons;
     }
@@ -412,8 +412,8 @@ 
 		</style>
 
 		<?php
-        if (gravityview()->plugin->is_GF_25()) {
-            $uninstall_title = esc_html__('Uninstall GravityView', 'gravityview');
+        if ( gravityview()->plugin->is_GF_25() ) {
+            $uninstall_title = esc_html__( 'Uninstall GravityView', 'gravityview' );
 
             echo <<<HTML
 <div class="gform-settings-panel">
@@ -463,59 +463,59 @@ 
 				} );
 
 				function gv_feedback_append_error_message() {
-					$( '#gv-uninstall-thanks' ).append( '<div class="notice error">' + <?php echo json_encode(esc_html(__('There was an error sharing your feedback. Sorry! Please email us at support@gravityview.co', 'gravityview'))) ?> +'</div>' );
+					$( '#gv-uninstall-thanks' ).append( '<div class="notice error">' + <?php echo json_encode( esc_html( __( 'There was an error sharing your feedback. Sorry! Please email us at support@gravityview.co', 'gravityview' ) ) ) ?> +'</div>' );
 				}
 			} );
 		</script>
 
 		<form id="gv-uninstall-feedback" method="post" action="https://hooks.zapier.com/hooks/catch/28670/6haevn/">
-			<h2><?php esc_html_e('Why did you uninstall GravityView?', 'gravityview'); ?></h2>
+			<h2><?php esc_html_e( 'Why did you uninstall GravityView?', 'gravityview' ); ?></h2>
 			<ul>
 				<?php
                 $reasons = $this->get_uninstall_reasons();
-        foreach ($reasons as $reason) {
-            printf('<li><label><input name="reason" type="radio" value="other" data-followup="%s"> %s</label></li>', Utils::get($reason, 'followup'), Utils::get($reason, 'label'));
+        foreach ( $reasons as $reason ) {
+            printf( '<li><label><input name="reason" type="radio" value="other" data-followup="%s"> %s</label></li>', Utils::get( $reason, 'followup' ), Utils::get( $reason, 'label' ) );
         } ?>
 			</ul>
 			<div class="gv-followup widefat">
-				<p><strong><label for="gv-reason-details"><?php esc_html_e('Comments', 'gravityview'); ?></label></strong></p>
-				<textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview') ?>" placeholder="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview'); ?>" class="large-text"></textarea>
+				<p><strong><label for="gv-reason-details"><?php esc_html_e( 'Comments', 'gravityview' ); ?></label></strong></p>
+				<textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ) ?>" placeholder="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ); ?>" class="large-text"></textarea>
 			</div>
 			<div class="scale-description">
-				<p><strong><?php esc_html_e('How likely are you to recommend GravityView?', 'gravityview'); ?></strong></p>
+				<p><strong><?php esc_html_e( 'How likely are you to recommend GravityView?', 'gravityview' ); ?></strong></p>
 				<ul class="inline">
 					<?php
                     $i = 0;
-        while ($i < 11) {
-            echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_'.$i.'" value="'.$i.'" type="radio"> '.$i.'</label></li>';
+        while ( $i < 11 ) {
+            echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_' . $i . '" value="' . $i . '" type="radio"> ' . $i . '</label></li>';
             $i++;
         } ?>
 				</ul>
-				<p class="description"><?php printf(esc_html_x('%s ("Not at all likely") to %s ("Extremely likely")', 'A scale from 0 (bad) to 10 (good)', 'gravityview'), '<label for="likely_to_refer_0"><code>0</code></label>', '<label for="likely_to_refer_10"><code>10</code></label>'); ?></p>
+				<p class="description"><?php printf( esc_html_x( '%s ("Not at all likely") to %s ("Extremely likely")', 'A scale from 0 (bad) to 10 (good)', 'gravityview' ), '<label for="likely_to_refer_0"><code>0</code></label>', '<label for="likely_to_refer_10"><code>10</code></label>' ); ?></p>
 			</div>
 
 			<div class="gv-form-field-wrapper">
-				<label><input type="checkbox" class="checkbox" name="follow_up_with_me" value="1" /> <?php esc_html_e('Please follow up with me about my feedback', 'gravityview'); ?></label>
+				<label><input type="checkbox" class="checkbox" name="follow_up_with_me" value="1" /> <?php esc_html_e( 'Please follow up with me about my feedback', 'gravityview' ); ?></label>
 			</div>
 
 			<div class="submit">
-				<input type="hidden" name="siteurl" value="<?php echo esc_url(get_bloginfo('url')); ?>" />
-				<input type="hidden" name="email" value="<?php echo esc_attr($user->user_email); ?>" />
-				<input type="hidden" name="display_name" value="<?php echo esc_attr($user->display_name); ?>" />
-				<input type="submit" value="<?php esc_html_e('Send Us Your Feedback', 'gravityview'); ?>" class="button button-primary primary button-hero" />
+				<input type="hidden" name="siteurl" value="<?php echo esc_url( get_bloginfo( 'url' ) ); ?>" />
+				<input type="hidden" name="email" value="<?php echo esc_attr( $user->user_email ); ?>" />
+				<input type="hidden" name="display_name" value="<?php echo esc_attr( $user->display_name ); ?>" />
+				<input type="submit" value="<?php esc_html_e( 'Send Us Your Feedback', 'gravityview' ); ?>" class="button button-primary primary button-hero" />
 			</div>
 		</form>
 
-		<div id="gv-uninstall-thanks" class="<?php echo (gravityview()->plugin->is_GF_25()) ? 'notice-large' : 'notice notice-large notice-updated below-h2'; ?>" style="display:none;">
-			<h3 class="notice-title"><?php esc_html_e('Thank you for using GravityView!', 'gravityview'); ?></h3>
+		<div id="gv-uninstall-thanks" class="<?php echo ( gravityview()->plugin->is_GF_25() ) ? 'notice-large' : 'notice notice-large notice-updated below-h2'; ?>" style="display:none;">
+			<h3 class="notice-title"><?php esc_html_e( 'Thank you for using GravityView!', 'gravityview' ); ?></h3>
 			<p><?php echo gravityview_get_floaty(); ?>
-				<?php echo make_clickable(esc_html__('Your feedback helps us improve GravityView. If you have any questions or comments, email us: support@gravityview.co', 'gravityview')); ?>
+				<?php echo make_clickable( esc_html__( 'Your feedback helps us improve GravityView. If you have any questions or comments, email us: support@gravityview.co', 'gravityview' ) ); ?>
 			</p>
 			<div class="wp-clearfix"></div>
 		</div>
 		</div>
 		<?php
-        if (gravityview()->plugin->is_GF_25()) {
+        if ( gravityview()->plugin->is_GF_25() ) {
             echo '</div>';
         }
 
@@ -528,7 +528,7 @@ 
     {
         parent::app_settings_tab();
 
-        if ($this->maybe_uninstall()) {
+        if ( $this->maybe_uninstall() ) {
             echo $this->uninstall_form();
         }
     }
@@ -562,9 +562,9 @@ 
      *
      * @deprecated Use \GV\Addon_Settings::get
      */
-    public function get_app_setting($setting_name)
+    public function get_app_setting( $setting_name )
     {
-        return $this->get($setting_name);
+        return $this->get( $setting_name );
     }
 
     /**
@@ -575,25 +575,25 @@ 
      *
      * @return mixed The setting value.
      */
-    public function get($key, $default = null)
+    public function get( $key, $default = null )
     {
 
         /**
          * Backward compatibility with Redux.
          */
-        if ($key === 'license') {
+        if ( $key === 'license' ) {
             return [
-                'license'  => $this->get('license_key'),
-                'status'   => $this->get('license_key_status'),
-                'response' => $this->get('license_key_response'),
+                'license'  => $this->get( 'license_key' ),
+                'status'   => $this->get( 'license_key_status' ),
+                'response' => $this->get( 'license_key_response' ),
             ];
         }
 
-        if ('license_key' === $key && defined('GRAVITYVIEW_LICENSE_KEY')) {
+        if ( 'license_key' === $key && defined( 'GRAVITYVIEW_LICENSE_KEY' ) ) {
             return GRAVITYVIEW_LICENSE_KEY;
         }
 
-        return Utils::get($this->all(), $key, $default);
+        return Utils::get( $this->all(), $key, $default );
     }
 
     /**
@@ -605,10 +605,10 @@ 
      *
      * @deprecated Use gravityview()->plugin->settings->get()
      */
-    public static function getSetting($key)
+    public static function getSetting( $key )
     {
-        if (gravityview()->plugin->settings instanceof Addon_Settings) {
-            return gravityview()->plugin->settings->get($key);
+        if ( gravityview()->plugin->settings instanceof Addon_Settings ) {
+            return gravityview()->plugin->settings->get( $key );
         }
     }
 
@@ -631,17 +631,17 @@ 
      */
     public function all()
     {
-        $option_name = 'gravityformsaddon_'.$this->_slug.'_app_settings';
+        $option_name = 'gravityformsaddon_' . $this->_slug . '_app_settings';
 
-        if ($this->has_site_settings()) {
+        if ( $this->has_site_settings() ) {
             $defaults = $this->defaults();
-            $option_value = get_option($option_name, []);
+            $option_value = get_option( $option_name, [ ] );
         } else {
-            $defaults = get_blog_option(get_main_site_id(), $option_name);
-            $option_value = get_blog_option(get_main_site_id(), $option_name);
+            $defaults = get_blog_option( get_main_site_id(), $option_name );
+            $option_value = get_blog_option( get_main_site_id(), $option_name );
         }
 
-        return wp_parse_args($option_value, $defaults);
+        return wp_parse_args( $option_value, $defaults );
     }
 
     /**
@@ -665,10 +665,10 @@ 
     {
         $defaults = [
             // Set the default license in wp-config.php
-            'license_key'          => defined('GRAVITYVIEW_LICENSE_KEY') ? GRAVITYVIEW_LICENSE_KEY : '',
+            'license_key'          => defined( 'GRAVITYVIEW_LICENSE_KEY' ) ? GRAVITYVIEW_LICENSE_KEY : '',
             'license_key_response' => '',
             'license_key_status'   => '',
-            'support-email'        => get_bloginfo('admin_email'),
+            'support-email'        => get_bloginfo( 'admin_email' ),
             'no-conflict-mode'     => '1',
             'support_port'         => '1',
             'flexbox_search'       => '1',
@@ -683,7 +683,7 @@ 
          *
          * @param  [in,out] array The defaults.
          */
-        return apply_filters('gravityview/settings/defaults', $defaults);
+        return apply_filters( 'gravityview/settings/defaults', $defaults );
     }
 
     /***
@@ -694,31 +694,31 @@ 
      *
      * @return string The HTML
      */
-    public function as_html($field, $echo = true)
+    public function as_html( $field, $echo = true )
     {
-        $field['type'] = (isset($field['type']) && in_array($field['type'], ['submit', 'reset', 'button'])) ? $field['type'] : 'submit';
+        $field[ 'type' ] = ( isset( $field[ 'type' ] ) && in_array( $field[ 'type' ], [ 'submit', 'reset', 'button' ] ) ) ? $field[ 'type' ] : 'submit';
 
-        $attributes = $this->get_field_attributes($field);
-        $default_value = Utils::get($field, 'value', Utils::get($field, 'default_value'));
-        $value = $this->get($field['name'], $default_value);
+        $attributes = $this->get_field_attributes( $field );
+        $default_value = Utils::get( $field, 'value', Utils::get( $field, 'default_value' ) );
+        $value = $this->get( $field[ 'name' ], $default_value );
 
-        $attributes['class'] = isset($attributes['class']) ? esc_attr($attributes['class']) : 'button-primary primary gfbutton';
-        $name = ($field['name'] === 'gform-settings-save') ? $field['name'] : '_gaddon_setting_'.$field['name'];
+        $attributes[ 'class' ] = isset( $attributes[ 'class' ] ) ? esc_attr( $attributes[ 'class' ] ) : 'button-primary primary gfbutton';
+        $name = ( $field[ 'name' ] === 'gform-settings-save' ) ? $field[ 'name' ] : '_gaddon_setting_' . $field[ 'name' ];
 
-        if (empty($value)) {
-            $value = __('Update Settings', 'gravityview');
+        if ( empty( $value ) ) {
+            $value = __( 'Update Settings', 'gravityview' );
         }
 
-        $attributes = $this->get_field_attributes($field);
+        $attributes = $this->get_field_attributes( $field );
 
         $html = '<input
-                    type="'.$field['type'].'"
-                    name="'.esc_attr($name).'"
-                    value="'.$value.'" '.
-                implode(' ', $attributes).
+                    type="'.$field[ 'type' ] . '"
+                    name="'.esc_attr( $name ) . '"
+                    value="'.$value . '" ' .
+                implode( ' ', $attributes ) .
                 ' />';
 
-        if ($echo) {
+        if ( $echo ) {
             echo $html;
         }
 
@@ -728,11 +728,11 @@ 
     /**
      * @deprecated Use \GV\Addon_Settings::as_html
      */
-    public function settings_submit($field, $echo = true)
+    public function settings_submit( $field, $echo = true )
     {
-        gravityview()->log->warning('\GV\Addon_Settings::settings_submit has been deprecated for \GV\Addon_Settings::as_html');
+        gravityview()->log->warning( '\GV\Addon_Settings::settings_submit has been deprecated for \GV\Addon_Settings::as_html' );
 
-        return $this->as_html($field, $echo);
+        return $this->as_html( $field, $echo );
     }
 
     /**
@@ -746,7 +746,7 @@ 
      */
     public function is_save_postback()
     {
-        return isset($_POST['gform-settings-save']) && isset($_POST['_gravityview_save_settings_nonce']);
+        return isset( $_POST[ 'gform-settings-save' ] ) && isset( $_POST[ '_gravityview_save_settings_nonce' ] );
     }
 
     /**
@@ -756,55 +756,55 @@ 
      */
     public function license_key_notice()
     {
-        if ('uninstall' === rgget('view')) {
+        if ( 'uninstall' === rgget( 'view' ) ) {
             return; // Do not display license notice on the uninstall page in GF 2.5
         }
 
-        if ($this->is_save_postback()) {
+        if ( $this->is_save_postback() ) {
             $settings = $this->get_posted_settings();
-            $license_key = defined('GRAVITYVIEW_LICENSE_KEY') ? GRAVITYVIEW_LICENSE_KEY : \GV\Utils::get($settings, 'license_key');
-            $license_status = \GV\Utils::get($settings, 'license_key_status', 'inactive');
+            $license_key = defined( 'GRAVITYVIEW_LICENSE_KEY' ) ? GRAVITYVIEW_LICENSE_KEY : \GV\Utils::get( $settings, 'license_key' );
+            $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' );
         } else {
-            $license_status = $this->get('license_key_status', 'inactive');
-            $license_key = $this->get('license_key');
+            $license_status = $this->get( 'license_key_status', 'inactive' );
+            $license_key = $this->get( 'license_key' );
         }
 
-        if (empty($license_key)) {
+        if ( empty( $license_key ) ) {
             $license_id = 'license';
             $license_status = '';
         } else {
             $license_id = $license_key;
         }
 
-        $message = esc_html__('Your GravityView license %s. This means you&rsquo;re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview');
+        $message = esc_html__( 'Your GravityView license %s. This means you&rsquo;re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview' );
 
         /** @internal Do not use! Will change without notice (pun slightly intended). */
-        $message = apply_filters('gravityview/settings/license-key-notice', $message);
+        $message = apply_filters( 'gravityview/settings/license-key-notice', $message );
 
         /**
          * I wanted to remove the period from after the buttons in the string,
          * but didn't want to mess up the translation strings for the translators.
          */
-        $message = mb_substr($message, 0, mb_strlen($message) - 1);
-        $title = __('Inactive License', 'gravityview');
+        $message = mb_substr( $message, 0, mb_strlen( $message ) - 1 );
+        $title = __( 'Inactive License', 'gravityview' );
         $status = '';
         $update_below = false;
-        $primary_button_link = admin_url('edit.php?post_type=gravityview&amp;page=gravityview_settings');
+        $primary_button_link = admin_url( 'edit.php?post_type=gravityview&amp;page=gravityview_settings' );
 
-        switch ($license_status) {
+        switch ( $license_status ) {
             /** @since 1.17 */
             case 'expired':
-                $title = __('Expired License', 'gravityview');
-                $status = __('has expired', 'gravityview');
-                $message = $this->get_license_handler()->strings('expired', $this->get('license_key_response'));
+                $title = __( 'Expired License', 'gravityview' );
+                $status = __( 'has expired', 'gravityview' );
+                $message = $this->get_license_handler()->strings( 'expired', $this->get( 'license_key_response' ) );
                 break;
             case 'invalid':
-                $title = __('Invalid License', 'gravityview');
-                $status = __('is invalid', 'gravityview');
+                $title = __( 'Invalid License', 'gravityview' );
+                $status = __( 'is invalid', 'gravityview' );
                 break;
             case 'deactivated':
-                $status = __('is inactive', 'gravityview');
-                $update_below = __('Activate your license key below.', 'gravityview');
+                $status = __( 'is inactive', 'gravityview' );
+                $update_below = __( 'Activate your license key below.', 'gravityview' );
                 break;
             /** @noinspection PhpMissingBreakStatementInspection */
             case '':
@@ -812,30 +812,30 @@ 
             // break intentionally left blank
             case 'inactive':
             case 'site_inactive':
-                $status = __('has not been activated', 'gravityview');
-                $update_below = __('Activate your license key below.', 'gravityview');
+                $status = __( 'has not been activated', 'gravityview' );
+                $update_below = __( 'Activate your license key below.', 'gravityview' );
                 break;
         }
-        $url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content='.$license_status.'&utm_campaign=Admin%20Notice';
+        $url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content=' . $license_status . '&utm_campaign=Admin%20Notice';
 
         // Show a different notice on settings page for inactive licenses (hide the buttons)
-        if ($update_below && gravityview()->request->is_admin('', 'settings')) {
-            $message = sprintf($message, $status, '<div class="hidden">', '', '', '</div><a href="#" onclick="jQuery(\'#license_key\').focus(); return false;">'.$update_below.'</a>');
+        if ( $update_below && gravityview()->request->is_admin( '', 'settings' ) ) {
+            $message = sprintf( $message, $status, '<div class="hidden">', '', '', '</div><a href="#" onclick="jQuery(\'#license_key\').focus(); return false;">' . $update_below . '</a>' );
         } else {
-            $message = sprintf($message, $status, "\n\n".'<a href="'.esc_url($primary_button_link).'" class="button button-primary primary">', '</a>', '<a href="'.esc_url($url).'" class="button button-secondary">', '</a>');
+            $message = sprintf( $message, $status, "\n\n" . '<a href="' . esc_url( $primary_button_link ) . '" class="button button-primary primary">', '</a>', '<a href="' . esc_url( $url ) . '" class="button button-secondary">', '</a>' );
         }
 
-        if (empty($status)) {
+        if ( empty( $status ) ) {
             return;
         }
 
-        \GravityView_Admin_Notices::add_notice([
+        \GravityView_Admin_Notices::add_notice( [
             'message' => $message,
             'class'   => 'notice notice-warning gv-license-warning',
             'title'   => $title,
             'cap'     => 'gravityview_edit_settings',
-            'dismiss' => sha1($license_status.'_'.$license_id.'_'.date('z')), // Show every day, instead of every 8 weeks (which is the default)
-        ]);
+            'dismiss' => sha1( $license_status . '_' . $license_id . '_' . date( 'z' ) ), // Show every day, instead of every 8 weeks (which is the default)
+        ] );
     }
 
     /**
@@ -862,11 +862,11 @@ 
     {
         $scripts = parent::scripts();
 
-        $scripts[] = [
+        $scripts[ ] = [
             'handle'  => 'gform_tooltip_init',
             'enqueue' => [
                 [
-                    'admin_page' => ['app_settings'],
+                    'admin_page' => [ 'app_settings' ],
                 ],
             ],
         ];
@@ -890,13 +890,13 @@ 
         ];
 
         // This file was removed from 2.5
-        if (!gravityview()->plugin->is_GF_25()) {
-            $deps[] = 'gform_tooltip';
+        if ( ! gravityview()->plugin->is_GF_25() ) {
+            $deps[ ] = 'gform_tooltip';
         }
 
-        $styles[] = [
+        $styles[ ] = [
             'handle'  => 'gravityview_settings',
-            'src'     => plugins_url('assets/css/admin-settings.css', GRAVITYVIEW_FILE),
+            'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
             'version' => Plugin::$version,
             'deps'    => $deps,
             'enqueue' => [
@@ -925,7 +925,7 @@ 
      */
     private function has_site_settings()
     {
-        return (!is_multisite()) || is_main_site() || (!gravityview()->plugin->is_network_activated()) || (is_network_admin() && gravityview()->plugin->is_network_activated());
+        return ( ! is_multisite() ) || is_main_site() || ( ! gravityview()->plugin->is_network_activated() ) || ( is_network_admin() && gravityview()->plugin->is_network_activated() );
     }
 
     /**
@@ -943,13 +943,13 @@ 
          *
          * @param bool $hide_if_network_activated Default: true
          */
-        $show_submenu = apply_filters('gravityview/show-settings-menu', $this->has_site_settings());
+        $show_submenu = apply_filters( 'gravityview/show-settings-menu', $this->has_site_settings() );
 
-        if (!$show_submenu) {
+        if ( ! $show_submenu ) {
             return;
         }
 
-        add_submenu_page('edit.php?post_type=gravityview', __('Settings', 'gravityview'), __('Settings', 'gravityview'), $this->_capabilities_app_settings, $this->_slug.'_settings', [$this, 'app_tab_page']);
+        add_submenu_page( 'edit.php?post_type=gravityview', __( 'Settings', 'gravityview' ), __( 'Settings', 'gravityview' ), $this->_capabilities_app_settings, $this->_slug . '_settings', [ $this, 'app_tab_page' ] );
     }
 
     /**
@@ -960,9 +960,9 @@ 
      *
      * @return string - Returns markup of the required indicator symbol
      */
-    public function get_required_indicator($field)
+    public function get_required_indicator( $field )
     {
-        return '<span class="required" title="'.esc_attr__('Required', 'gravityview').'">*</span>';
+        return '<span class="required" title="' . esc_attr__( 'Required', 'gravityview' ) . '">*</span>';
     }
 
     /**
@@ -974,7 +974,7 @@ 
     {
         $default_settings = $this->defaults();
 
-        $disabled_attribute = \GVCommon::has_cap('gravityview_edit_settings') ? false : 'disabled';
+        $disabled_attribute = \GVCommon::has_cap( 'gravityview_edit_settings' ) ? false : 'disabled';
 
         $affiliate_link = 'https://gravityview.co/account/affiliate/?utm_source=in-plugin&utm_medium=setting&utm_content=Register as an affiliate';
 
@@ -983,9 +983,9 @@ 
                 'name'          => 'support-email',
                 'type'          => 'text',
                 'validate'      => 'email',
-                'default_value' => $default_settings['support-email'],
-                'label'         => __('Support Email', 'gravityview'),
-                'description'   => __('In order to provide responses to your support requests, please provide your email address.', 'gravityview'),
+                'default_value' => $default_settings[ 'support-email' ],
+                'label'         => __( 'Support Email', 'gravityview' ),
+                'description'   => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ),
                 'class'         => 'code regular-text',
             ],
             /**
@@ -994,84 +994,84 @@ 
             [
                 'name'          => 'support_port',
                 'type'          => 'radio',
-                'label'         => __('Show Support Port?', 'gravityview'),
-                'default_value' => $default_settings['support_port'],
+                'label'         => __( 'Show Support Port?', 'gravityview' ),
+                'default_value' => $default_settings[ 'support_port' ],
                 'horizontal'    => 1,
                 'choices'       => [
                     [
-                        'label' => _x('Show', 'Setting: Show or Hide', 'gravityview'),
+                        'label' => _x( 'Show', 'Setting: Show or Hide', 'gravityview' ),
                         'value' => '1',
                     ],
                     [
-                        'label' => _x('Hide', 'Setting: Show or Hide', 'gravityview'),
+                        'label' => _x( 'Hide', 'Setting: Show or Hide', 'gravityview' ),
                         'value' => '0',
                     ],
                 ],
-                'tooltip'     => '<p>'.esc_html__('The Support Port provides quick access to how-to articles and tutorials. For administrators, it also makes it easy to contact support.', 'gravityview').'<img src="'.esc_url_raw(plugins_url('assets/images/beacon.png', GRAVITYVIEW_FILE)).'" alt="'.esc_attr__('The Support Port looks like this.', 'gravityview').'" class="aligncenter" style="display: block; max-width:100%; margin:1em auto;" /></p>',
-                'description' => __('Show the Support Port on GravityView pages?', 'gravityview'),
+                'tooltip'     => '<p>' . esc_html__( 'The Support Port provides quick access to how-to articles and tutorials. For administrators, it also makes it easy to contact support.', 'gravityview' ) . '<img src="' . esc_url_raw( plugins_url( 'assets/images/beacon.png', GRAVITYVIEW_FILE ) ) . '" alt="' . esc_attr__( 'The Support Port looks like this.', 'gravityview' ) . '" class="aligncenter" style="display: block; max-width:100%; margin:1em auto;" /></p>',
+                'description' => __( 'Show the Support Port on GravityView pages?', 'gravityview' ),
             ],
             [
                 'name'          => 'no-conflict-mode',
                 'type'          => 'radio',
-                'label'         => __('No-Conflict Mode', 'gravityview'),
-                'default_value' => $default_settings['no-conflict-mode'],
+                'label'         => __( 'No-Conflict Mode', 'gravityview' ),
+                'default_value' => $default_settings[ 'no-conflict-mode' ],
                 'horizontal'    => 1,
                 'choices'       => [
                     [
-                        'label' => _x('On', 'Setting: On or off', 'gravityview'),
+                        'label' => _x( 'On', 'Setting: On or off', 'gravityview' ),
                         'value' => '1',
                     ],
                     [
-                        'label' => _x('Off', 'Setting: On or off', 'gravityview'),
+                        'label' => _x( 'Off', 'Setting: On or off', 'gravityview' ),
                         'value' => '0',
                     ],
                 ],
-                'description'   => __('Set this to ON to prevent extraneous scripts and styles from being printed on GravityView admin pages, reducing conflicts with other plugins and themes.', 'gravityview').' '.__('If your Edit View tabs are ugly, enable this setting.', 'gravityview'),
+                'description'   => __( 'Set this to ON to prevent extraneous scripts and styles from being printed on GravityView admin pages, reducing conflicts with other plugins and themes.', 'gravityview' ) . ' ' . __( 'If your Edit View tabs are ugly, enable this setting.', 'gravityview' ),
             ],
             /**
              * @since 2.0 Added REST API
              */
-            gravityview()->plugin->supports(Plugin::FEATURE_REST) ?
+            gravityview()->plugin->supports( Plugin::FEATURE_REST ) ?
                     [
                         'name'          => 'rest_api',
                         'type'          => 'radio',
-                        'label'         => __('REST API', 'gravityview'),
-                        'default_value' => $default_settings['rest_api'],
+                        'label'         => __( 'REST API', 'gravityview' ),
+                        'default_value' => $default_settings[ 'rest_api' ],
                         'horizontal'    => 1,
                         'choices'       => [
                             [
-                                'label' => _x('Enable', 'Setting: Enable or Disable', 'gravityview'),
+                                'label' => _x( 'Enable', 'Setting: Enable or Disable', 'gravityview' ),
                                 'value' => '1',
                             ],
                             [
-                                'label' => _x('Disable', 'Setting: Enable or Disable', 'gravityview'),
+                                'label' => _x( 'Disable', 'Setting: Enable or Disable', 'gravityview' ),
                                 'value' => '0',
                             ],
                         ],
-                        'description'   => __('Enable View and Entry access via the REST API? Regular per-View restrictions apply (private, password protected, etc.).', 'gravityview'),
-                        'tooltip'       => '<p>'.esc_html__('If you are unsure, choose the Disable setting.', 'gravityview').'</p>',
-                    ] : [],
+                        'description'   => __( 'Enable View and Entry access via the REST API? Regular per-View restrictions apply (private, password protected, etc.).', 'gravityview' ),
+                        'tooltip'       => '<p>' . esc_html__( 'If you are unsure, choose the Disable setting.', 'gravityview' ) . '</p>',
+                    ] : [ ],
             [
                 'name'          => 'powered_by',
                 'type'          => 'checkbox',
-                'label'         => __('Display "Powered By" Link', 'gravityview'),
-                'default_value' => $default_settings['powered_by'],
+                'label'         => __( 'Display "Powered By" Link', 'gravityview' ),
+                'default_value' => $default_settings[ 'powered_by' ],
                 'choices'       => [
                     [
-                        'label' => esc_html__('Display a "Powered by GravityView" link', 'gravityview'),
+                        'label' => esc_html__( 'Display a "Powered by GravityView" link', 'gravityview' ),
                         'value' => '1',
                         'name'  => 'powered_by',
                     ],
                 ],
-                'description'   => __('When enabled, a "Powered by GravityView" link will be displayed below Views. Help us spread the word!', 'gravityview'),
+                'description'   => __( 'When enabled, a "Powered by GravityView" link will be displayed below Views. Help us spread the word!', 'gravityview' ),
             ],
             [
                 'name'          => 'affiliate_id',
                 'type'          => 'text',
                 'input_type'    => 'number',
                 'default_value' => null,
-                'label'         => __('Affiliate ID', 'gravityview'),
-                'description'   => sprintf(__('Earn money when people clicking your links become GravityView customers. <a href="%s" rel="external">Register as an affiliate</a>!', 'gravityview'), esc_url($affiliate_link)),
+                'label'         => __( 'Affiliate ID', 'gravityview' ),
+                'description'   => sprintf( __( 'Earn money when people clicking your links become GravityView customers. <a href="%s" rel="external">Register as an affiliate</a>!', 'gravityview' ), esc_url( $affiliate_link ) ),
                 'class'         => 'code',
                 'placeholder'   => '123',
                 'data-requires' => 'powered_by',
@@ -1079,21 +1079,21 @@ 
             [
                 'name'          => 'beta',
                 'type'          => 'checkbox',
-                'label'         => __('Become a Beta Tester', 'gravityview'),
-                'default_value' => $default_settings['beta'],
+                'label'         => __( 'Become a Beta Tester', 'gravityview' ),
+                'default_value' => $default_settings[ 'beta' ],
                 'horizontal'    => 1,
                 'choices'       => [
                     [
-                        'label' => esc_html__('Show me beta versions if they are available.', 'gravityview'),
+                        'label' => esc_html__( 'Show me beta versions if they are available.', 'gravityview' ),
                         'value' => '1',
                         'name'  => 'beta',
                     ],
                 ],
-                'description'   => __('You will have early access to the latest GravityView features and improvements. There may be bugs! If you encounter an issue, help make GravityView better by reporting it!', 'gravityview'),
+                'description'   => __( 'You will have early access to the latest GravityView features and improvements. There may be bugs! If you encounter an issue, help make GravityView better by reporting it!', 'gravityview' ),
             ],
         ];
 
-        $fields = array_filter($fields, 'count');
+        $fields = array_filter( $fields, 'count' );
 
         /**
          * @filter     `gravityview_settings_fields` Filter the settings fields.
@@ -1102,87 +1102,87 @@ 
          *
          * @deprecated Use `gravityview/settings/fields`.
          */
-        $fields = apply_filters('gravityview_settings_fields', $fields);
+        $fields = apply_filters( 'gravityview_settings_fields', $fields );
 
         /**
          * @filter `gravityview/settings/fields` Filter the settings fields.
          *
          * @param array $fields The fields to filter.
          */
-        $fields = apply_filters('gravityview/settings/fields', $fields);
+        $fields = apply_filters( 'gravityview/settings/fields', $fields );
 
         /**
          * Redux backward compatibility.
          *
          * @since 1.7.4
          */
-        foreach ($fields as &$field) {
-            $field['name'] = isset($field['name']) ? $field['name'] : Utils::get($field, 'id');
-            $field['label'] = isset($field['label']) ? $field['label'] : Utils::get($field, 'title');
-            $field['default_value'] = isset($field['default_value']) ? $field['default_value'] : Utils::get($field, 'default');
-            $field['description'] = isset($field['description']) ? $field['description'] : Utils::get($field, 'subtitle');
-
-            if ($disabled_attribute) {
-                $field['disabled'] = $disabled_attribute;
+        foreach ( $fields as &$field ) {
+            $field[ 'name' ] = isset( $field[ 'name' ] ) ? $field[ 'name' ] : Utils::get( $field, 'id' );
+            $field[ 'label' ] = isset( $field[ 'label' ] ) ? $field[ 'label' ] : Utils::get( $field, 'title' );
+            $field[ 'default_value' ] = isset( $field[ 'default_value' ] ) ? $field[ 'default_value' ] : Utils::get( $field, 'default' );
+            $field[ 'description' ] = isset( $field[ 'description' ] ) ? $field[ 'description' ] : Utils::get( $field, 'subtitle' );
+
+            if ( $disabled_attribute ) {
+                $field[ 'disabled' ] = $disabled_attribute;
             }
 
-            if (empty($field['disabled'])) {
-                unset($field['disabled']);
+            if ( empty( $field[ 'disabled' ] ) ) {
+                unset( $field[ 'disabled' ] );
             }
         }
 
         $license_fields = [
             [
                 'name'              => 'license_key',
-                'required'          => !defined('GRAVITYVIEW_LICENSE_KEY') || !GRAVITYVIEW_LICENSE_KEY,
-                'label'             => __('License Key', 'gravityview'),
-                'description'       => __('Enter the license key that was sent to you on purchase. This enables plugin updates &amp; support.', 'gravityview'),
+                'required'          => ! defined( 'GRAVITYVIEW_LICENSE_KEY' ) || ! GRAVITYVIEW_LICENSE_KEY,
+                'label'             => __( 'License Key', 'gravityview' ),
+                'description'       => __( 'Enter the license key that was sent to you on purchase. This enables plugin updates &amp; support.', 'gravityview' ),
                 'type'              => 'edd_license',
-                'data-pending-text' => __('Verifying license&hellip;', 'gravityview'),
-                'default_value'     => $default_settings['license_key'],
-                'class'             => ('' == $this->get('license_key')) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key',
+                'data-pending-text' => __( 'Verifying license&hellip;', 'gravityview' ),
+                'default_value'     => $default_settings[ 'license_key' ],
+                'class'             => ( '' == $this->get( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key',
             ],
             [
                 'name'          => 'license_key_response',
-                'default_value' => $default_settings['license_key_response'],
+                'default_value' => $default_settings[ 'license_key_response' ],
                 'type'          => 'hidden',
             ],
             [
                 'name'          => 'license_key_status',
-                'default_value' => $default_settings['license_key_status'],
+                'default_value' => $default_settings[ 'license_key_status' ],
                 'type'          => 'hidden',
             ],
         ];
 
-        if (defined('GRAVITYVIEW_LICENSE_KEY') && GRAVITYVIEW_LICENSE_KEY) {
-            $license_fields[0] = array_merge($license_fields[0], [
+        if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
+            $license_fields[ 0 ] = array_merge( $license_fields[ 0 ], [
                 'disabled' => true,
-                'title'    => __('The license key is defined by your site\'s configuration file.', 'gravityview'),
-            ]);
+                'title'    => __( 'The license key is defined by your site\'s configuration file.', 'gravityview' ),
+            ] );
         }
 
-        $sections = [];
-        $version_info = '<span class="gv-version-info" title="'.sprintf(__('You are running GravityView version %s', 'gravityview'), Plugin::$version).'">Version '.esc_html(Plugin::$version).'</span>';
+        $sections = [ ];
+        $version_info = '<span class="gv-version-info" title="' . sprintf( __( 'You are running GravityView version %s', 'gravityview' ), Plugin::$version ) . '">Version ' . esc_html( Plugin::$version ) . '</span>';
 
-        if (\gravityview()->plugin->is_GF_25()) {
-            $sections[] = [
-                'title'       => __('GravityView License', 'gravityview'),
+        if ( \gravityview()->plugin->is_GF_25() ) {
+            $sections[ ] = [
+                'title'       => __( 'GravityView License', 'gravityview' ),
                 'class'       => 'gform-settings-panel--full gv-settings-panel--license',
                 'description' => $version_info,
                 'fields'      => $license_fields,
             ];
         } else {
-            $fields = array_merge($license_fields, $fields);
+            $fields = array_merge( $license_fields, $fields );
 
-            array_unshift($fields, [
+            array_unshift( $fields, [
                 'name'  => 'gv_header',
                 'value' => $version_info,
                 'type'  => 'html',
-            ]);
+            ] );
         }
 
-        $sections[] = [
-            'title'       => (gravityview()->plugin->is_GF_25() ? __('GravityView Settings', 'gravityview') : null),
+        $sections[ ] = [
+            'title'       => ( gravityview()->plugin->is_GF_25() ? __( 'GravityView Settings', 'gravityview' ) : null ),
             'class'       => 'gform-settings-panel--full gv-settings-panel--core',
             'fields'      => $fields,
         ];
@@ -1199,19 +1199,19 @@ 
          *
          * @param array $extension_settings Empty array, ready for extension settings!
          */
-        $extension_sections = apply_filters('gravityview/settings/extension/sections', []);
+        $extension_sections = apply_filters( 'gravityview/settings/extension/sections', [ ] );
 
         // If there are extensions, add a section for them
-        if (!empty($extension_sections)) {
-            if ($disabled_attribute) {
-                foreach ($extension_sections as &$section) {
-                    foreach ($section['fields'] as &$field) {
-                        $field['disabled'] = $disabled_attribute;
+        if ( ! empty( $extension_sections ) ) {
+            if ( $disabled_attribute ) {
+                foreach ( $extension_sections as &$section ) {
+                    foreach ( $section[ 'fields' ] as &$field ) {
+                        $field[ 'disabled' ] = $disabled_attribute;
                     }
                 }
             }
 
-            $sections = array_merge($sections, $extension_sections);
+            $sections = array_merge( $sections, $extension_sections );
         }
 
         return $sections;
@@ -1228,9 +1228,9 @@ 
      *
      * @deprecated Use \GV\Addon_Settings::set or \GV\Addon_Settings::update
      */
-    public function update_app_settings($settings)
+    public function update_app_settings( $settings )
     {
-        return $this->update($settings);
+        return $this->update( $settings );
     }
 
     /**
@@ -1239,14 +1239,14 @@ 
      * @param array|string An array of settings to update, or string (key) and $value to update one setting.
      * @param mixed $value A value if $settings is string (key). Default: null.
      */
-    public function set($settings, $value = null)
+    public function set( $settings, $value = null )
     {
-        if (is_string($settings)) {
-            $settings = [$settings => $value];
+        if ( is_string( $settings ) ) {
+            $settings = [ $settings => $value ];
         }
-        $settings = wp_parse_args($settings, $this->all());
+        $settings = wp_parse_args( $settings, $this->all() );
 
-        return update_option('gravityformsaddon_'.$this->_slug.'_app_settings', $settings);
+        return update_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', $settings );
     }
 
     /**
@@ -1256,9 +1256,9 @@ 
      *
      * @return bool False if value was not updated and true if value was updated.
      */
-    public function update($settings)
+    public function update( $settings )
     {
-        return update_option('gravityformsaddon_'.$this->_slug.'_app_settings', $settings);
+        return update_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', $settings );
     }
 
     /**
@@ -1269,21 +1269,21 @@ 
      *
      * @return string
      */
-    public function settings_edd_license($field, $echo = true)
+    public function settings_edd_license( $field, $echo = true )
     {
-        if (defined('GRAVITYVIEW_LICENSE_KEY') && GRAVITYVIEW_LICENSE_KEY) {
-            $field['input_type'] = 'password';
+        if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
+            $field[ 'input_type' ] = 'password';
         }
 
-        $text = $this->settings_text($field, false);
+        $text = $this->settings_text( $field, false );
 
-        $activation = $this->License_Handler->settings_edd_license_activation($field, false);
+        $activation = $this->License_Handler->settings_edd_license_activation( $field, false );
 
-        $return = $text.$activation;
+        $return = $text . $activation;
 
-        $return .= $this->get_license_handler()->license_details(\GV\Addon_Settings::get('license_key_response'));
+        $return .= $this->get_license_handler()->license_details( \GV\Addon_Settings::get( 'license_key_response' ) );
 
-        if ($echo) {
+        if ( $echo ) {
             echo $return;
         }
 
@@ -1300,11 +1300,11 @@ 
      *
      * @return string
      */
-    protected function settings_html($field, $echo = true)
+    protected function settings_html( $field, $echo = true )
     {
-        $return = \GV\Utils::get($field, 'value', '');
+        $return = \GV\Utils::get( $field, 'value', '' );
 
-        if ($echo) {
+        if ( $echo ) {
             echo $return;
         }
 
@@ -1320,13 +1320,13 @@ 
      *
      * @return void
      */
-    public function single_setting_row_html($field)
+    public function single_setting_row_html( $field )
     {
         ?>
 
-		<tr id="gaddon-setting-row-<?php echo esc_attr($field['name']); ?>">
+		<tr id="gaddon-setting-row-<?php echo esc_attr( $field[ 'name' ] ); ?>">
 			<td colspan="2">
-				<?php $this->single_setting($field); ?>
+				<?php $this->single_setting( $field ); ?>
 			</td>
 		</tr>
 
@@ -1347,11 +1347,11 @@ 
      *
      * @return void
      */
-    public function single_setting_row($field)
+    public function single_setting_row( $field )
     {
-        $field['gv_description'] = Utils::get($field, 'description');
-        $field['description'] = Utils::get($field, 'subtitle');
-        parent::single_setting_row($field);
+        $field[ 'gv_description' ] = Utils::get( $field, 'description' );
+        $field[ 'description' ] = Utils::get( $field, 'subtitle' );
+        parent::single_setting_row( $field );
     }
 
     /**
@@ -1361,11 +1361,11 @@ 
      *
      * @param $field array
      */
-    public function single_setting_label($field)
+    public function single_setting_label( $field )
     {
-        parent::single_setting_label($field);
-        if ($description = Utils::get($field, 'gv_description')) {
-            echo '<span class="description">'.$description.'</span>';
+        parent::single_setting_label( $field );
+        if ( $description = Utils::get( $field, 'gv_description' ) ) {
+            echo '<span class="description">' . $description . '</span>';
         }
     }
 
@@ -1379,10 +1379,10 @@ 
      */
     public function maybe_save_app_settings()
     {
-        if ($this->is_save_postback()) {
-            if (!\GVCommon::has_cap('gravityview_edit_settings')) {
-                $_POST = []; // If you don't reset the $_POST array, it *looks* like the settings were changed, but they weren't
-                \GFCommon::add_error_message(__('You don\'t have the ability to edit plugin settings.', 'gravityview'));
+        if ( $this->is_save_postback() ) {
+            if ( ! \GVCommon::has_cap( 'gravityview_edit_settings' ) ) {
+                $_POST = [ ]; // If you don't reset the $_POST array, it *looks* like the settings were changed, but they weren't
+                \GFCommon::add_error_message( __( 'You don\'t have the ability to edit plugin settings.', 'gravityview' ) );
 
                 return;
             }
@@ -1399,23 +1399,23 @@ 
     {
         $posted_settings = parent::get_posted_settings();
 
-        $local_key = Utils::get($posted_settings, 'license_key');
+        $local_key = Utils::get( $posted_settings, 'license_key' );
 
-        if (!$local_key && defined('GRAVITYVIEW_LICENSE_KEY')) {
+        if ( ! $local_key && defined( 'GRAVITYVIEW_LICENSE_KEY' ) ) {
             $local_key = GRAVITYVIEW_LICENSE_KEY;
         }
 
-        $response_key = Utils::get($posted_settings, 'license_key_response/license_key');
+        $response_key = Utils::get( $posted_settings, 'license_key_response/license_key' );
 
         static $added_message = false;
 
         // If the posted key doesn't match the activated/deactivated key (set using the Activate License button, AJAX response),
         // then we assume it's changed. If it's changed, unset the status and the previous response.
-        if (!$added_message && ($local_key !== $response_key)) {
-            unset($posted_settings['license_key_response']);
-            unset($posted_settings['license_key_status']);
+        if ( ! $added_message && ( $local_key !== $response_key ) ) {
+            unset( $posted_settings[ 'license_key_response' ] );
+            unset( $posted_settings[ 'license_key_status' ] );
 
-            \GFCommon::add_error_message(__('The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview'));
+            \GFCommon::add_error_message( __( 'The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
 
             $added_message = true;
         }

Braces +47 added lines, -94 removed lines

@@ -65,8 +65,7 @@ 
      */
     private static $initialized = false;
 
-    public function __construct()
-    {
+    public function __construct() {
         $this->_version = Plugin::$version;
         $this->_min_gravityforms_version = Plugin::$min_gf_version;
 
@@ -86,8 +85,7 @@ 
      *
      * @return void
      */
-    public function init_admin()
-    {
+    public function init_admin() {
         $this->_load_license_handler();
 
         add_filter('admin_body_class', [$this, 'body_class']);
@@ -113,8 +111,7 @@ 
      *
      * @return array
      */
-    public function get_app_settings_tabs()
-    {
+    public function get_app_settings_tabs() {
         $setting_tabs = parent::get_app_settings_tabs();
 
         foreach ($setting_tabs as &$tab) {
@@ -142,8 +139,7 @@ 
      *
      * @return array
      */
-    public function register_no_conflict($items)
-    {
+    public function register_no_conflict($items) {
         $items[] = 'gform_settings';
         $items[] = 'gv-admin-edd-license';
 
@@ -157,8 +153,7 @@ 
      *
      * @return string
      */
-    public function body_class($css_class)
-    {
+    public function body_class($css_class) {
         if (!gravityview()->request->is_admin('', 'settings')) {
             return $css_class;
         }
@@ -178,8 +173,7 @@ 
      * @param string                                     $html      HTML of the save button.
      * @param \Gravity_Forms\Gravity_Forms\Settings|null $framework Current instance of the Settings Framework. Or null if < 2.5.
      */
-    public function modify_gform_settings_save_button($html, $framework = null)
-    {
+    public function modify_gform_settings_save_button($html, $framework = null) {
         if (!gravityview()->request->is_admin('', 'settings')) {
             return $html;
         }
@@ -213,8 +207,7 @@ 
      *
      * @return string|null HTML of the button.
      */
-    public function settings_save($field, $echo = true)
-    {
+    public function settings_save($field, $echo = true) {
         $field['type'] = 'submit';
         $field['name'] = 'gform-settings-save';
         $field['class'] = 'button button-primary primary button-hero';
@@ -238,8 +231,7 @@ 
      *
      * @return array
      */
-    public function modify_app_settings_menu_title($setting_tabs)
-    {
+    public function modify_app_settings_menu_title($setting_tabs) {
         $setting_tabs[0]['label'] = __('GravityView Settings', 'gravityview');
         $setting_tabs[0]['icon'] = 'dashicons-admin-settings';
 
@@ -251,8 +243,7 @@ 
      *
      * @return void
      */
-    public function init_ajax()
-    {
+    public function init_ajax() {
         $this->_load_license_handler();
     }
 
@@ -261,8 +252,7 @@ 
      *
      * @return void
      */
-    private function _load_license_handler()
-    {
+    private function _load_license_handler() {
         if (!empty($this->License_Handler)) {
             return;
         }
@@ -276,8 +266,7 @@ 
      *
      * @return void
      */
-    public function add_network_menu()
-    {
+    public function add_network_menu() {
         if (!gravityview()->plugin->is_network_activated()) {
             return;
         }
@@ -292,8 +281,7 @@ 
      *
      * @return bool
      */
-    public function uninstall()
-    {
+    public function uninstall() {
         gravityview()->plugin->uninstall();
 
         /**
@@ -319,8 +307,7 @@ 
      *
      * @return bool
      */
-    public function current_user_can_any($caps)
-    {
+    public function current_user_can_any($caps) {
         if (empty($caps)) {
             $caps = ['gravityview_full_access'];
         }
@@ -328,8 +315,7 @@ 
         return \GVCommon::has_cap($caps);
     }
 
-    public function uninstall_warning_message()
-    {
+    public function uninstall_warning_message() {
         $heading = esc_html__('If you delete then re-install GravityView, it will be like installing GravityView for the first time.', 'gravityview');
         $message = esc_html__('Delete all Views, GravityView entry approval status, GravityView-generated entry notes (including approval and entry creator changes), and GravityView plugin settings.', 'gravityview');
 
@@ -343,8 +329,7 @@ 
      *
      * @return array Array of reasons with the label and followup questions for each uninstall reason
      */
-    private function get_uninstall_reasons()
-    {
+    private function get_uninstall_reasons() {
         $reasons = [
             'will-continue'  => [
                 'label' => esc_html__('I am going to continue using GravityView', 'gravityview'),
@@ -376,8 +361,7 @@ 
      *
      * @return string HTML of the uninstallation form
      */
-    public function uninstall_form()
-    {
+    public function uninstall_form() {
         ob_start();
 
         $user = wp_get_current_user(); ?>
@@ -524,8 +508,7 @@ 
         return $form;
     }
 
-    public function app_settings_tab()
-    {
+    public function app_settings_tab() {
         parent::app_settings_tab();
 
         if ($this->maybe_uninstall()) {
@@ -538,8 +521,7 @@ 
      *
      * @return string
      */
-    public function app_settings_title()
-    {
+    public function app_settings_title() {
         return null;
     }
 
@@ -548,8 +530,7 @@ 
      *
      * @return string
      */
-    public function app_settings_icon()
-    {
+    public function app_settings_icon() {
         return '&nbsp;';
     }
 
@@ -562,8 +543,7 @@ 
      *
      * @deprecated Use \GV\Addon_Settings::get
      */
-    public function get_app_setting($setting_name)
-    {
+    public function get_app_setting($setting_name) {
         return $this->get($setting_name);
     }
 
@@ -575,8 +555,7 @@ 
      *
      * @return mixed The setting value.
      */
-    public function get($key, $default = null)
-    {
+    public function get($key, $default = null) {
 
         /**
          * Backward compatibility with Redux.
@@ -605,8 +584,7 @@ 
      *
      * @deprecated Use gravityview()->plugin->settings->get()
      */
-    public static function getSetting($key)
-    {
+    public static function getSetting($key) {
         if (gravityview()->plugin->settings instanceof Addon_Settings) {
             return gravityview()->plugin->settings->get($key);
         }
@@ -619,8 +597,7 @@ 
      *
      * @deprecated Use \GV\Addon_Settings::all() or \GV\Addon_Settings::get()
      */
-    public function get_app_settings()
-    {
+    public function get_app_settings() {
         return $this->all();
     }
 
@@ -629,8 +606,7 @@ 
      *
      * @return array The settings.
      */
-    public function all()
-    {
+    public function all() {
         $option_name = 'gravityformsaddon_'.$this->_slug.'_app_settings';
 
         if ($this->has_site_settings()) {
@@ -651,8 +627,7 @@ 
      *
      * @deprecated Use \GV\Addon_Settings::defaults()
      */
-    public function get_default_settings()
-    {
+    public function get_default_settings() {
         return $this->defaults();
     }
 
@@ -661,8 +636,7 @@ 
      *
      * @return array The defaults.
      */
-    private function defaults()
-    {
+    private function defaults() {
         $defaults = [
             // Set the default license in wp-config.php
             'license_key'          => defined('GRAVITYVIEW_LICENSE_KEY') ? GRAVITYVIEW_LICENSE_KEY : '',
@@ -694,8 +668,7 @@ 
      *
      * @return string The HTML
      */
-    public function as_html($field, $echo = true)
-    {
+    public function as_html($field, $echo = true) {
         $field['type'] = (isset($field['type']) && in_array($field['type'], ['submit', 'reset', 'button'])) ? $field['type'] : 'submit';
 
         $attributes = $this->get_field_attributes($field);
@@ -728,8 +701,7 @@ 
     /**
      * @deprecated Use \GV\Addon_Settings::as_html
      */
-    public function settings_submit($field, $echo = true)
-    {
+    public function settings_submit($field, $echo = true) {
         gravityview()->log->warning('\GV\Addon_Settings::settings_submit has been deprecated for \GV\Addon_Settings::as_html');
 
         return $this->as_html($field, $echo);
@@ -744,8 +716,7 @@ 
      *
      * @return bool
      */
-    public function is_save_postback()
-    {
+    public function is_save_postback() {
         return isset($_POST['gform-settings-save']) && isset($_POST['_gravityview_save_settings_nonce']);
     }
 
@@ -754,8 +725,7 @@ 
      *
      * @return void
      */
-    public function license_key_notice()
-    {
+    public function license_key_notice() {
         if ('uninstall' === rgget('view')) {
             return; // Do not display license notice on the uninstall page in GF 2.5
         }
@@ -845,8 +815,7 @@ 
      *
      * @return \GV\License_Handler
      */
-    public function get_license_handler()
-    {
+    public function get_license_handler() {
         return $this->License_Handler;
     }
 
@@ -858,8 +827,7 @@ 
      *
      * @return array Array of scripts
      */
-    public function scripts()
-    {
+    public function scripts() {
         $scripts = parent::scripts();
 
         $scripts[] = [
@@ -879,8 +847,7 @@ 
      *
      * @return array
      */
-    public function styles()
-    {
+    public function styles() {
         $styles = parent::styles();
 
         $deps = [
@@ -923,8 +890,7 @@ 
      *
      * @return bool
      */
-    private function has_site_settings()
-    {
+    private function has_site_settings() {
         return (!is_multisite()) || is_main_site() || (!gravityview()->plugin->is_network_activated()) || (is_network_admin() && gravityview()->plugin->is_network_activated());
     }
 
@@ -933,8 +899,7 @@ 
      *
      * @return void
      */
-    public function create_app_menu()
-    {
+    public function create_app_menu() {
 
         /**
          * Override whether to show the Settings menu on a per-blog basis.
@@ -960,8 +925,7 @@ 
      *
      * @return string - Returns markup of the required indicator symbol
      */
-    public function get_required_indicator($field)
-    {
+    public function get_required_indicator($field) {
         return '<span class="required" title="'.esc_attr__('Required', 'gravityview').'">*</span>';
     }
 
@@ -970,8 +934,7 @@ 
      *
      * @return array
      */
-    public function app_settings_fields()
-    {
+    public function app_settings_fields() {
         $default_settings = $this->defaults();
 
         $disabled_attribute = \GVCommon::has_cap('gravityview_edit_settings') ? false : 'disabled';
@@ -1228,8 +1191,7 @@ 
      *
      * @deprecated Use \GV\Addon_Settings::set or \GV\Addon_Settings::update
      */
-    public function update_app_settings($settings)
-    {
+    public function update_app_settings($settings) {
         return $this->update($settings);
     }
 
@@ -1239,8 +1201,7 @@ 
      * @param array|string An array of settings to update, or string (key) and $value to update one setting.
      * @param mixed $value A value if $settings is string (key). Default: null.
      */
-    public function set($settings, $value = null)
-    {
+    public function set($settings, $value = null) {
         if (is_string($settings)) {
             $settings = [$settings => $value];
         }
@@ -1256,8 +1217,7 @@ 
      *
      * @return bool False if value was not updated and true if value was updated.
      */
-    public function update($settings)
-    {
+    public function update($settings) {
         return update_option('gravityformsaddon_'.$this->_slug.'_app_settings', $settings);
     }
 
@@ -1269,8 +1229,7 @@ 
      *
      * @return string
      */
-    public function settings_edd_license($field, $echo = true)
-    {
+    public function settings_edd_license($field, $echo = true) {
         if (defined('GRAVITYVIEW_LICENSE_KEY') && GRAVITYVIEW_LICENSE_KEY) {
             $field['input_type'] = 'password';
         }
@@ -1300,8 +1259,7 @@ 
      *
      * @return string
      */
-    protected function settings_html($field, $echo = true)
-    {
+    protected function settings_html($field, $echo = true) {
         $return = \GV\Utils::get($field, 'value', '');
 
         if ($echo) {
@@ -1320,8 +1278,7 @@ 
      *
      * @return void
      */
-    public function single_setting_row_html($field)
-    {
+    public function single_setting_row_html($field) {
         ?>
 
 		<tr id="gaddon-setting-row-<?php echo esc_attr($field['name']); ?>">
@@ -1347,8 +1304,7 @@ 
      *
      * @return void
      */
-    public function single_setting_row($field)
-    {
+    public function single_setting_row($field) {
         $field['gv_description'] = Utils::get($field, 'description');
         $field['description'] = Utils::get($field, 'subtitle');
         parent::single_setting_row($field);
@@ -1361,8 +1317,7 @@ 
      *
      * @param $field array
      */
-    public function single_setting_label($field)
-    {
+    public function single_setting_label($field) {
         parent::single_setting_label($field);
         if ($description = Utils::get($field, 'gv_description')) {
             echo '<span class="description">'.$description.'</span>';
@@ -1377,8 +1332,7 @@ 
      *
      * @return void
      */
-    public function maybe_save_app_settings()
-    {
+    public function maybe_save_app_settings() {
         if ($this->is_save_postback()) {
             if (!\GVCommon::has_cap('gravityview_edit_settings')) {
                 $_POST = []; // If you don't reset the $_POST array, it *looks* like the settings were changed, but they weren't
@@ -1395,8 +1349,7 @@ 
      *
      * @return array settings from parent::get_posted_settings(), with `license_key_response` and `license_key_status` potentially unset
      */
-    public function get_posted_settings()
-    {
+    public function get_posted_settings() {
         $posted_settings = parent::get_posted_settings();
 
         $local_key = Utils::get($posted_settings, 'license_key');

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -422,7 +422,7 @@
     </header>
     <div class="gform-settings-panel__content" style="padding: 0 1rem 1.25rem">
 
-HTML;
+html;
         } else {
             echo '<div class="gv-uninstall-form-wrapper" style="font-size: 110%; padding: 15px 0;">';
         } ?>

future/includes/class-gv-shortcode-gravityview.php

Indentation +373 added lines, -373 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -12,376 +12,376 @@ 
  */
 class gravityview extends \GV\Shortcode
 {
-    /**
-     * {@inheritDoc}
-     */
-    public $name = 'gravityview';
-
-    /**
-     * A stack of calls to track nested shortcodes.
-     */
-    public static $callstack = [];
-
-    /**
-     * Process and output the [gravityview] shortcode.
-     *
-     * @param array  $passed_atts The attributes passed.
-     * @param string $content     The content inside the shortcode.
-     * @param string $tag         The shortcode tag.
-     *
-     * @return string|null The output.
-     */
-    public function callback($passed_atts, $content = '', $tag = '')
-    {
-        $request = gravityview()->request;
-
-        if ($request->is_admin()) {
-            return '';
-        }
-
-        $atts = wp_parse_args($passed_atts, [
-            'id'      => 0,
-            'view_id' => 0,
-            'detail'  => null,
-            'class'   => '',
-        ]);
-
-        if (!$view_id = $atts['id'] ?: $atts['view_id']) {
-            if ($atts['detail'] && $view = $request->is_view()) {
-                $view_id = $view->ID;
-            }
-        }
-
-        $view = \GV\View::by_id($view_id);
-
-        if (!$view) {
-            gravityview()->log->error('View does not exist #{view_id}', ['view_id' => $view_id]);
-
-            return '';
-        }
-
-        $post = get_post($view->ID);
-
-        $gv_view_data = \GravityView_View_Data::getInstance();
-
-        if (!$gv_view_data->views->contains($view->ID)) {
-            $gv_view_data->views->add($view);
-        }
-
-        /**
-         * @action `gravityview/shortcode/before-processing` Runs before the GV shortcode is processed; can be used to load additional scripts/styles
-         *
-         * @since  2.13.4
-         *
-         * @param \GV\View $view GV View
-         * @param \WP_Post $post Associated WP post
-         */
-        do_action('gravityview/shortcode/before-processing', $view, $post);
-
-        gravityview()->views->set($view);
-
-        /**
-         * When this shortcode is embedded inside a View we can only display it as a directory. There's no other way.
-         * Try to detect that we're not embedded to allow edit and single contexts.
-         */
-        $is_reembedded = false; // Assume not embedded unless detected otherwise.
-        if (in_array(get_class($request), ['GV\Frontend_Request', 'GV\Mock_Request'])) {
-            if (($_view = $request->is_view()) && $_view->ID !== $view->ID) {
-                $is_reembedded = true;
-            } elseif ($request->is_entry($view->form ? $view->form->ID : 0) && self::$callstack) {
-                $is_reembedded = true;
-            }
-        }
-
-        array_push(self::$callstack, true);
-
-        /**
-         * Remove Widgets on a nested embedded View.
-         */
-        if ($is_reembedded) {
-            $view->widgets = new \GV\Widget_Collection();
-        }
-
-        $atts = $this->parse_and_sanitize_atts($atts);
-
-        $view->settings->update(['shortcode_atts' => $atts]);
-        $view->settings->update($atts);
-
-        /**
-         * Check permissions.
-         */
-        while ($error = $view->can_render(['shortcode'], $request)) {
-            if (!is_wp_error($error)) {
-                break;
-            }
-
-            switch (str_replace('gravityview/', '', $error->get_error_code())) {
-                case 'post_password_required':
-                    return self::_return(get_the_password_form($view->ID));
-                case 'no_form_attached':
-                    /**
-                     * This View has no data source. There's nothing to show really.
-                     * ...apart from a nice message if the user can do anything about it.
-                     */
-                    if (\GVCommon::has_cap(['edit_gravityviews', 'edit_gravityview'], $view->ID)) {
-                        return self::_return(sprintf(__('This View is not configured properly. Start by <a href="%s">selecting a form</a>.', 'gravityview'), esc_url(get_edit_post_link($view->ID, false))));
-                    }
-                    break;
-                case 'no_direct_access':
-                case 'embed_only':
-                case 'not_public':
-                default:
-                    return self::_return(__('You are not allowed to view this content.', 'gravityview'));
-            }
-        }
-
-        $is_admin_and_can_view = $view->settings->get('admin_show_all_statuses') && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID);
-
-        /**
-         * View details.
-         */
-        if ($atts['detail']) {
-            $entries = $view->get_entries($request);
-
-            return self::_return($this->detail($view, $entries, $atts));
-
-        /**
-         * Editing a single entry.
-         */
-        } elseif (!$is_reembedded && ($entry = $request->is_edit_entry($view->form ? $view->form->ID : 0))) {
-
-            /**
-             * When editing an entry don't render multiple views.
-             */
-            if (($selected = \GV\Utils::_GET('gvid')) && $view->ID != $selected) {
-                gravityview()->log->notice('Entry ID #{entry_id} not rendered because another View ID was passed using `?gvid`: #{selected}', ['entry_id' => $entry->ID, 'selected' => $selected]);
-
-                return self::_return('');
-            }
-
-            if ($entry['status'] != 'active') {
-                gravityview()->log->notice('Entry ID #{entry_id} is not active', ['entry_id' => $entry->ID]);
-
-                return self::_return(__('You are not allowed to view this content.', 'gravityview'));
-            }
-
-            if (apply_filters('gravityview_custom_entry_slug', false) && $entry->slug != get_query_var(\GV\Entry::get_endpoint_name())) {
-                gravityview()->log->error('Entry ID #{entry_id} was accessed by a bad slug', ['entry_id' => $entry->ID]);
-
-                return self::_return(__('You are not allowed to view this content.', 'gravityview'));
-            }
-
-            if ($view->settings->get('show_only_approved') && !$is_admin_and_can_view) {
-                if (!\GravityView_Entry_Approval_Status::is_approved(gform_get_meta($entry->ID, \GravityView_Entry_Approval::meta_key))) {
-                    gravityview()->log->error('Entry ID #{entry_id} is not approved for viewing', ['entry_id' => $entry->ID]);
-
-                    return self::_return(__('You are not allowed to view this content.', 'gravityview'));
-                }
-            }
-
-            $renderer = new \GV\Edit_Entry_Renderer();
-
-            return self::_return($renderer->render($entry, $view, $request));
-
-        /**
-         * Viewing a single entry.
-         */
-        } elseif (!$is_reembedded && ($entry = $request->is_entry($view->form ? $view->form->ID : 0))) {
-            /**
-             * When viewing an entry don't render multiple views.
-             */
-            if (($selected = \GV\Utils::_GET('gvid')) && $view->ID != $selected) {
-                return self::_return('');
-            }
-
-            $entryset = $entry->is_multi() ? $entry->entries : [$entry];
-
-            foreach ($entryset as $e) {
-                if ($e['status'] != 'active') {
-                    gravityview()->log->notice('Entry ID #{entry_id} is not active', ['entry_id' => $e->ID]);
-
-                    return self::_return(__('You are not allowed to view this content.', 'gravityview'));
-                }
-
-                if (apply_filters('gravityview_custom_entry_slug', false) && $e->slug != get_query_var(\GV\Entry::get_endpoint_name())) {
-                    gravityview()->log->error('Entry ID #{entry_id} was accessed by a bad slug', ['entry_id' => $e->ID]);
-
-                    return self::_return(__('You are not allowed to view this content.', 'gravityview'));
-                }
-
-                if ($view->settings->get('show_only_approved') && !$is_admin_and_can_view) {
-                    if (!\GravityView_Entry_Approval_Status::is_approved(gform_get_meta($e->ID, \GravityView_Entry_Approval::meta_key))) {
-                        gravityview()->log->error('Entry ID #{entry_id} is not approved for viewing', ['entry_id' => $e->ID]);
-
-                        return self::_return(__('You are not allowed to view this content.', 'gravityview'));
-                    }
-                }
-
-                $error = \GVCommon::check_entry_display($e->as_entry(), $view);
-
-                if (is_wp_error($error)) {
-                    gravityview()->log->error('Entry ID #{entry_id} is not approved for viewing: {message}', ['entry_id' => $e->ID, 'message' => $error->get_error_message()]);
-
-                    return self::_return(__('You are not allowed to view this content.', 'gravityview'));
-                }
-            }
-
-            $renderer = new \GV\Entry_Renderer();
-
-            return self::_return($renderer->render($entry, $view, $request));
-
-        /**
-         * Just this view.
-         */
-        } else {
-            if ($is_reembedded) {
-
-                // Mock the request with the actual View, not the global one
-                $mock_request = new \GV\Mock_Request();
-                $mock_request->returns['is_view'] = $view;
-                $mock_request->returns['is_entry'] = $request->is_entry($view->form ? $view->form->ID : 0);
-                $mock_request->returns['is_edit_entry'] = $request->is_edit_entry($view->form ? $view->form->ID : 0);
-                $mock_request->returns['is_search'] = $request->is_search();
-
-                $request = $mock_request;
-            }
-
-            $renderer = new \GV\View_Renderer();
-
-            return self::_return($renderer->render($view, $request));
-        }
-    }
-
-    /**
-     * Validate attributes passed to the [gravityview] shortcode. Supports {get} Merge Tags values.
-     *
-     * Attributes passed to the shortcode are compared to registered attributes {@see \GV\View_Settings::defaults}
-     * Only attributes that are defined will be allowed through.
-     *
-     * Then, {get} merge tags are replaced with their $_GET values, if passed
-     *
-     * Then, attributes are sanitized based on the type of setting (number, checkbox, select, radio, text)
-     *
-     * @see \GV\View_Settings::defaults() Only attributes defined in default() are valid to be passed via the shortcode
-     *
-     * @param array $passed_atts Attribute pairs defined to render the View
-     *
-     * @return array Valid and sanitized attribute pairs
-     */
-    private function parse_and_sanitize_atts($passed_atts)
-    {
-        $defaults = \GV\View_Settings::defaults(true);
-
-        $supported_atts = array_fill_keys(array_keys($defaults), '');
-
-        // Whittle down the attributes to only valid pairs
-        $filtered_atts = shortcode_atts($supported_atts, $passed_atts, 'gravityview');
-
-        // Only keep the passed attributes after making sure that they're valid pairs
-        $filtered_atts = array_intersect_key((array) $passed_atts, $filtered_atts);
-
-        $atts = [];
-
-        foreach ($filtered_atts as $key => $passed_value) {
-
-            // Allow using GravityView merge tags in shortcode attributes, like {get} and {created_by}
-            $passed_value = \GravityView_Merge_Tags::replace_variables($passed_value);
-
-            switch ($defaults[$key]['type']) {
-
-                /**
-                 * Make sure number fields are numeric.
-                 * Also, convert mixed number strings to numbers.
-                 *
-                 * @see http://php.net/manual/en/function.is-numeric.php#107326
-                 */
-                case 'number':
-                    if (is_numeric($passed_value)) {
-                        $atts[$key] = ($passed_value + 0);
-                    }
-                    break;
-
-                // Checkboxes should be 1 or 0
-                case 'checkbox':
-                    $atts[$key] = gv_empty($passed_value, true, false) ? 0 : 1;
-                    break;
-
-                /**
-                 * Only allow values that are defined in the settings.
-                 */
-                case 'select':
-                case 'radio':
-                    $options = isset($defaults[$key]['choices']) ? $defaults[$key]['choices'] : $defaults[$key]['options'];
-                    if (in_array($passed_value, array_keys($options))) {
-                        $atts[$key] = $passed_value;
-                    }
-                    break;
-
-                case 'text':
-                default:
-                    $atts[$key] = $passed_value;
-                    break;
-            }
-        }
-
-        $atts['detail'] = \GV\Utils::get($passed_atts, 'detail', null);
-
-        return $atts;
-    }
-
-    /**
-     * Output view details.
-     *
-     * @param \GV\View             $view    The View.
-     * @param \GV\Entry_Collection $entries The calculated entries.
-     * @param array                $atts    The shortcode attributes (with defaults).
-     *
-     * @return string The output.
-     */
-    private function detail($view, $entries, $atts)
-    {
-        $output = '';
-
-        switch ($key = $atts['detail']) {
-            case 'total_entries':
-                $output = number_format_i18n($entries->total());
-                break;
-            case 'first_entry':
-                $output = number_format_i18n(min($entries->total(), $view->settings->get('offset') + 1));
-                break;
-            case 'last_entry':
-                $output = number_format_i18n($view->settings->get('page_size') + $view->settings->get('offset'));
-                break;
-            case 'page_size':
-                $output = number_format_i18n($view->settings->get($key));
-                break;
-        }
-
-        /**
-         * @filter `gravityview/shortcode/detail/{$detail}` Filter the detail output returned from `[gravityview detail="$detail"]`
-         *
-         * @since 1.13
-         *
-         * @param string[in,out] $output Existing output
-         *
-         * @since 2.0.3
-         *
-         * @param \GV\View             $view    The view.
-         * @param \GV\Entry_Collection $entries The entries.
-         * @param array                $atts    The shortcode atts with defaults.
-         */
-        $output = apply_filters("gravityview/shortcode/detail/$key", $output, $view);
-
-        return $output;
-    }
-
-    /**
-     * Pop the callstack and return the value.
-     */
-    private static function _return($value)
-    {
-        array_pop(self::$callstack);
-
-        return $value;
-    }
+	/**
+	 * {@inheritDoc}
+	 */
+	public $name = 'gravityview';
+
+	/**
+	 * A stack of calls to track nested shortcodes.
+	 */
+	public static $callstack = [];
+
+	/**
+	 * Process and output the [gravityview] shortcode.
+	 *
+	 * @param array  $passed_atts The attributes passed.
+	 * @param string $content     The content inside the shortcode.
+	 * @param string $tag         The shortcode tag.
+	 *
+	 * @return string|null The output.
+	 */
+	public function callback($passed_atts, $content = '', $tag = '')
+	{
+		$request = gravityview()->request;
+
+		if ($request->is_admin()) {
+			return '';
+		}
+
+		$atts = wp_parse_args($passed_atts, [
+			'id'      => 0,
+			'view_id' => 0,
+			'detail'  => null,
+			'class'   => '',
+		]);
+
+		if (!$view_id = $atts['id'] ?: $atts['view_id']) {
+			if ($atts['detail'] && $view = $request->is_view()) {
+				$view_id = $view->ID;
+			}
+		}
+
+		$view = \GV\View::by_id($view_id);
+
+		if (!$view) {
+			gravityview()->log->error('View does not exist #{view_id}', ['view_id' => $view_id]);
+
+			return '';
+		}
+
+		$post = get_post($view->ID);
+
+		$gv_view_data = \GravityView_View_Data::getInstance();
+
+		if (!$gv_view_data->views->contains($view->ID)) {
+			$gv_view_data->views->add($view);
+		}
+
+		/**
+		 * @action `gravityview/shortcode/before-processing` Runs before the GV shortcode is processed; can be used to load additional scripts/styles
+		 *
+		 * @since  2.13.4
+		 *
+		 * @param \GV\View $view GV View
+		 * @param \WP_Post $post Associated WP post
+		 */
+		do_action('gravityview/shortcode/before-processing', $view, $post);
+
+		gravityview()->views->set($view);
+
+		/**
+		 * When this shortcode is embedded inside a View we can only display it as a directory. There's no other way.
+		 * Try to detect that we're not embedded to allow edit and single contexts.
+		 */
+		$is_reembedded = false; // Assume not embedded unless detected otherwise.
+		if (in_array(get_class($request), ['GV\Frontend_Request', 'GV\Mock_Request'])) {
+			if (($_view = $request->is_view()) && $_view->ID !== $view->ID) {
+				$is_reembedded = true;
+			} elseif ($request->is_entry($view->form ? $view->form->ID : 0) && self::$callstack) {
+				$is_reembedded = true;
+			}
+		}
+
+		array_push(self::$callstack, true);
+
+		/**
+		 * Remove Widgets on a nested embedded View.
+		 */
+		if ($is_reembedded) {
+			$view->widgets = new \GV\Widget_Collection();
+		}
+
+		$atts = $this->parse_and_sanitize_atts($atts);
+
+		$view->settings->update(['shortcode_atts' => $atts]);
+		$view->settings->update($atts);
+
+		/**
+		 * Check permissions.
+		 */
+		while ($error = $view->can_render(['shortcode'], $request)) {
+			if (!is_wp_error($error)) {
+				break;
+			}
+
+			switch (str_replace('gravityview/', '', $error->get_error_code())) {
+				case 'post_password_required':
+					return self::_return(get_the_password_form($view->ID));
+				case 'no_form_attached':
+					/**
+					 * This View has no data source. There's nothing to show really.
+					 * ...apart from a nice message if the user can do anything about it.
+					 */
+					if (\GVCommon::has_cap(['edit_gravityviews', 'edit_gravityview'], $view->ID)) {
+						return self::_return(sprintf(__('This View is not configured properly. Start by <a href="%s">selecting a form</a>.', 'gravityview'), esc_url(get_edit_post_link($view->ID, false))));
+					}
+					break;
+				case 'no_direct_access':
+				case 'embed_only':
+				case 'not_public':
+				default:
+					return self::_return(__('You are not allowed to view this content.', 'gravityview'));
+			}
+		}
+
+		$is_admin_and_can_view = $view->settings->get('admin_show_all_statuses') && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID);
+
+		/**
+		 * View details.
+		 */
+		if ($atts['detail']) {
+			$entries = $view->get_entries($request);
+
+			return self::_return($this->detail($view, $entries, $atts));
+
+		/**
+		 * Editing a single entry.
+		 */
+		} elseif (!$is_reembedded && ($entry = $request->is_edit_entry($view->form ? $view->form->ID : 0))) {
+
+			/**
+			 * When editing an entry don't render multiple views.
+			 */
+			if (($selected = \GV\Utils::_GET('gvid')) && $view->ID != $selected) {
+				gravityview()->log->notice('Entry ID #{entry_id} not rendered because another View ID was passed using `?gvid`: #{selected}', ['entry_id' => $entry->ID, 'selected' => $selected]);
+
+				return self::_return('');
+			}
+
+			if ($entry['status'] != 'active') {
+				gravityview()->log->notice('Entry ID #{entry_id} is not active', ['entry_id' => $entry->ID]);
+
+				return self::_return(__('You are not allowed to view this content.', 'gravityview'));
+			}
+
+			if (apply_filters('gravityview_custom_entry_slug', false) && $entry->slug != get_query_var(\GV\Entry::get_endpoint_name())) {
+				gravityview()->log->error('Entry ID #{entry_id} was accessed by a bad slug', ['entry_id' => $entry->ID]);
+
+				return self::_return(__('You are not allowed to view this content.', 'gravityview'));
+			}
+
+			if ($view->settings->get('show_only_approved') && !$is_admin_and_can_view) {
+				if (!\GravityView_Entry_Approval_Status::is_approved(gform_get_meta($entry->ID, \GravityView_Entry_Approval::meta_key))) {
+					gravityview()->log->error('Entry ID #{entry_id} is not approved for viewing', ['entry_id' => $entry->ID]);
+
+					return self::_return(__('You are not allowed to view this content.', 'gravityview'));
+				}
+			}
+
+			$renderer = new \GV\Edit_Entry_Renderer();
+
+			return self::_return($renderer->render($entry, $view, $request));
+
+		/**
+		 * Viewing a single entry.
+		 */
+		} elseif (!$is_reembedded && ($entry = $request->is_entry($view->form ? $view->form->ID : 0))) {
+			/**
+			 * When viewing an entry don't render multiple views.
+			 */
+			if (($selected = \GV\Utils::_GET('gvid')) && $view->ID != $selected) {
+				return self::_return('');
+			}
+
+			$entryset = $entry->is_multi() ? $entry->entries : [$entry];
+
+			foreach ($entryset as $e) {
+				if ($e['status'] != 'active') {
+					gravityview()->log->notice('Entry ID #{entry_id} is not active', ['entry_id' => $e->ID]);
+
+					return self::_return(__('You are not allowed to view this content.', 'gravityview'));
+				}
+
+				if (apply_filters('gravityview_custom_entry_slug', false) && $e->slug != get_query_var(\GV\Entry::get_endpoint_name())) {
+					gravityview()->log->error('Entry ID #{entry_id} was accessed by a bad slug', ['entry_id' => $e->ID]);
+
+					return self::_return(__('You are not allowed to view this content.', 'gravityview'));
+				}
+
+				if ($view->settings->get('show_only_approved') && !$is_admin_and_can_view) {
+					if (!\GravityView_Entry_Approval_Status::is_approved(gform_get_meta($e->ID, \GravityView_Entry_Approval::meta_key))) {
+						gravityview()->log->error('Entry ID #{entry_id} is not approved for viewing', ['entry_id' => $e->ID]);
+
+						return self::_return(__('You are not allowed to view this content.', 'gravityview'));
+					}
+				}
+
+				$error = \GVCommon::check_entry_display($e->as_entry(), $view);
+
+				if (is_wp_error($error)) {
+					gravityview()->log->error('Entry ID #{entry_id} is not approved for viewing: {message}', ['entry_id' => $e->ID, 'message' => $error->get_error_message()]);
+
+					return self::_return(__('You are not allowed to view this content.', 'gravityview'));
+				}
+			}
+
+			$renderer = new \GV\Entry_Renderer();
+
+			return self::_return($renderer->render($entry, $view, $request));
+
+		/**
+		 * Just this view.
+		 */
+		} else {
+			if ($is_reembedded) {
+
+				// Mock the request with the actual View, not the global one
+				$mock_request = new \GV\Mock_Request();
+				$mock_request->returns['is_view'] = $view;
+				$mock_request->returns['is_entry'] = $request->is_entry($view->form ? $view->form->ID : 0);
+				$mock_request->returns['is_edit_entry'] = $request->is_edit_entry($view->form ? $view->form->ID : 0);
+				$mock_request->returns['is_search'] = $request->is_search();
+
+				$request = $mock_request;
+			}
+
+			$renderer = new \GV\View_Renderer();
+
+			return self::_return($renderer->render($view, $request));
+		}
+	}
+
+	/**
+	 * Validate attributes passed to the [gravityview] shortcode. Supports {get} Merge Tags values.
+	 *
+	 * Attributes passed to the shortcode are compared to registered attributes {@see \GV\View_Settings::defaults}
+	 * Only attributes that are defined will be allowed through.
+	 *
+	 * Then, {get} merge tags are replaced with their $_GET values, if passed
+	 *
+	 * Then, attributes are sanitized based on the type of setting (number, checkbox, select, radio, text)
+	 *
+	 * @see \GV\View_Settings::defaults() Only attributes defined in default() are valid to be passed via the shortcode
+	 *
+	 * @param array $passed_atts Attribute pairs defined to render the View
+	 *
+	 * @return array Valid and sanitized attribute pairs
+	 */
+	private function parse_and_sanitize_atts($passed_atts)
+	{
+		$defaults = \GV\View_Settings::defaults(true);
+
+		$supported_atts = array_fill_keys(array_keys($defaults), '');
+
+		// Whittle down the attributes to only valid pairs
+		$filtered_atts = shortcode_atts($supported_atts, $passed_atts, 'gravityview');
+
+		// Only keep the passed attributes after making sure that they're valid pairs
+		$filtered_atts = array_intersect_key((array) $passed_atts, $filtered_atts);
+
+		$atts = [];
+
+		foreach ($filtered_atts as $key => $passed_value) {
+
+			// Allow using GravityView merge tags in shortcode attributes, like {get} and {created_by}
+			$passed_value = \GravityView_Merge_Tags::replace_variables($passed_value);
+
+			switch ($defaults[$key]['type']) {
+
+				/**
+				 * Make sure number fields are numeric.
+				 * Also, convert mixed number strings to numbers.
+				 *
+				 * @see http://php.net/manual/en/function.is-numeric.php#107326
+				 */
+				case 'number':
+					if (is_numeric($passed_value)) {
+						$atts[$key] = ($passed_value + 0);
+					}
+					break;
+
+				// Checkboxes should be 1 or 0
+				case 'checkbox':
+					$atts[$key] = gv_empty($passed_value, true, false) ? 0 : 1;
+					break;
+
+				/**
+				 * Only allow values that are defined in the settings.
+				 */
+				case 'select':
+				case 'radio':
+					$options = isset($defaults[$key]['choices']) ? $defaults[$key]['choices'] : $defaults[$key]['options'];
+					if (in_array($passed_value, array_keys($options))) {
+						$atts[$key] = $passed_value;
+					}
+					break;
+
+				case 'text':
+				default:
+					$atts[$key] = $passed_value;
+					break;
+			}
+		}
+
+		$atts['detail'] = \GV\Utils::get($passed_atts, 'detail', null);
+
+		return $atts;
+	}
+
+	/**
+	 * Output view details.
+	 *
+	 * @param \GV\View             $view    The View.
+	 * @param \GV\Entry_Collection $entries The calculated entries.
+	 * @param array                $atts    The shortcode attributes (with defaults).
+	 *
+	 * @return string The output.
+	 */
+	private function detail($view, $entries, $atts)
+	{
+		$output = '';
+
+		switch ($key = $atts['detail']) {
+			case 'total_entries':
+				$output = number_format_i18n($entries->total());
+				break;
+			case 'first_entry':
+				$output = number_format_i18n(min($entries->total(), $view->settings->get('offset') + 1));
+				break;
+			case 'last_entry':
+				$output = number_format_i18n($view->settings->get('page_size') + $view->settings->get('offset'));
+				break;
+			case 'page_size':
+				$output = number_format_i18n($view->settings->get($key));
+				break;
+		}
+
+		/**
+		 * @filter `gravityview/shortcode/detail/{$detail}` Filter the detail output returned from `[gravityview detail="$detail"]`
+		 *
+		 * @since 1.13
+		 *
+		 * @param string[in,out] $output Existing output
+		 *
+		 * @since 2.0.3
+		 *
+		 * @param \GV\View             $view    The view.
+		 * @param \GV\Entry_Collection $entries The entries.
+		 * @param array                $atts    The shortcode atts with defaults.
+		 */
+		$output = apply_filters("gravityview/shortcode/detail/$key", $output, $view);
+
+		return $output;
+	}
+
+	/**
+	 * Pop the callstack and return the value.
+	 */
+	private static function _return($value)
+	{
+		array_pop(self::$callstack);
+
+		return $value;
+	}
 }

Spacing +102 added lines, -102 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV\Shortcodes;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -20,7 +20,7 @@ 
     /**
      * A stack of calls to track nested shortcodes.
      */
-    public static $callstack = [];
+    public static $callstack = [ ];
 
     /**
      * Process and output the [gravityview] shortcode.
@@ -31,41 +31,41 @@ 
      *
      * @return string|null The output.
      */
-    public function callback($passed_atts, $content = '', $tag = '')
+    public function callback( $passed_atts, $content = '', $tag = '' )
     {
         $request = gravityview()->request;
 
-        if ($request->is_admin()) {
+        if ( $request->is_admin() ) {
             return '';
         }
 
-        $atts = wp_parse_args($passed_atts, [
+        $atts = wp_parse_args( $passed_atts, [
             'id'      => 0,
             'view_id' => 0,
             'detail'  => null,
             'class'   => '',
-        ]);
+        ] );
 
-        if (!$view_id = $atts['id'] ?: $atts['view_id']) {
-            if ($atts['detail'] && $view = $request->is_view()) {
+        if ( ! $view_id = $atts[ 'id' ] ?: $atts[ 'view_id' ] ) {
+            if ( $atts[ 'detail' ] && $view = $request->is_view() ) {
                 $view_id = $view->ID;
             }
         }
 
-        $view = \GV\View::by_id($view_id);
+        $view = \GV\View::by_id( $view_id );
 
-        if (!$view) {
-            gravityview()->log->error('View does not exist #{view_id}', ['view_id' => $view_id]);
+        if ( ! $view ) {
+            gravityview()->log->error( 'View does not exist #{view_id}', [ 'view_id' => $view_id ] );
 
             return '';
         }
 
-        $post = get_post($view->ID);
+        $post = get_post( $view->ID );
 
         $gv_view_data = \GravityView_View_Data::getInstance();
 
-        if (!$gv_view_data->views->contains($view->ID)) {
-            $gv_view_data->views->add($view);
+        if ( ! $gv_view_data->views->contains( $view->ID ) ) {
+            $gv_view_data->views->add( $view );
         }
 
         /**
@@ -76,179 +76,179 @@ 
          * @param \GV\View $view GV View
          * @param \WP_Post $post Associated WP post
          */
-        do_action('gravityview/shortcode/before-processing', $view, $post);
+        do_action( 'gravityview/shortcode/before-processing', $view, $post );
 
-        gravityview()->views->set($view);
+        gravityview()->views->set( $view );
 
         /**
          * When this shortcode is embedded inside a View we can only display it as a directory. There's no other way.
          * Try to detect that we're not embedded to allow edit and single contexts.
          */
         $is_reembedded = false; // Assume not embedded unless detected otherwise.
-        if (in_array(get_class($request), ['GV\Frontend_Request', 'GV\Mock_Request'])) {
-            if (($_view = $request->is_view()) && $_view->ID !== $view->ID) {
+        if ( in_array( get_class( $request ), [ 'GV\Frontend_Request', 'GV\Mock_Request' ] ) ) {
+            if ( ( $_view = $request->is_view() ) && $_view->ID !== $view->ID ) {
                 $is_reembedded = true;
-            } elseif ($request->is_entry($view->form ? $view->form->ID : 0) && self::$callstack) {
+            } elseif ( $request->is_entry( $view->form ? $view->form->ID : 0 ) && self::$callstack ) {
                 $is_reembedded = true;
             }
         }
 
-        array_push(self::$callstack, true);
+        array_push( self::$callstack, true );
 
         /**
          * Remove Widgets on a nested embedded View.
          */
-        if ($is_reembedded) {
+        if ( $is_reembedded ) {
             $view->widgets = new \GV\Widget_Collection();
         }
 
-        $atts = $this->parse_and_sanitize_atts($atts);
+        $atts = $this->parse_and_sanitize_atts( $atts );
 
-        $view->settings->update(['shortcode_atts' => $atts]);
-        $view->settings->update($atts);
+        $view->settings->update( [ 'shortcode_atts' => $atts ] );
+        $view->settings->update( $atts );
 
         /**
          * Check permissions.
          */
-        while ($error = $view->can_render(['shortcode'], $request)) {
-            if (!is_wp_error($error)) {
+        while ( $error = $view->can_render( [ 'shortcode' ], $request ) ) {
+            if ( ! is_wp_error( $error ) ) {
                 break;
             }
 
-            switch (str_replace('gravityview/', '', $error->get_error_code())) {
+            switch ( str_replace( 'gravityview/', '', $error->get_error_code() ) ) {
                 case 'post_password_required':
-                    return self::_return(get_the_password_form($view->ID));
+                    return self::_return( get_the_password_form( $view->ID ) );
                 case 'no_form_attached':
                     /**
                      * This View has no data source. There's nothing to show really.
                      * ...apart from a nice message if the user can do anything about it.
                      */
-                    if (\GVCommon::has_cap(['edit_gravityviews', 'edit_gravityview'], $view->ID)) {
-                        return self::_return(sprintf(__('This View is not configured properly. Start by <a href="%s">selecting a form</a>.', 'gravityview'), esc_url(get_edit_post_link($view->ID, false))));
+                    if ( \GVCommon::has_cap( [ 'edit_gravityviews', 'edit_gravityview' ], $view->ID ) ) {
+                        return self::_return( sprintf( __( 'This View is not configured properly. Start by <a href="%s">selecting a form</a>.', 'gravityview' ), esc_url( get_edit_post_link( $view->ID, false ) ) ) );
                     }
                     break;
                 case 'no_direct_access':
                 case 'embed_only':
                 case 'not_public':
                 default:
-                    return self::_return(__('You are not allowed to view this content.', 'gravityview'));
+                    return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) );
             }
         }
 
-        $is_admin_and_can_view = $view->settings->get('admin_show_all_statuses') && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID);
+        $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
 
         /**
          * View details.
          */
-        if ($atts['detail']) {
-            $entries = $view->get_entries($request);
+        if ( $atts[ 'detail' ] ) {
+            $entries = $view->get_entries( $request );
 
-            return self::_return($this->detail($view, $entries, $atts));
+            return self::_return( $this->detail( $view, $entries, $atts ) );
 
         /**
          * Editing a single entry.
          */
-        } elseif (!$is_reembedded && ($entry = $request->is_edit_entry($view->form ? $view->form->ID : 0))) {
+        } elseif ( ! $is_reembedded && ( $entry = $request->is_edit_entry( $view->form ? $view->form->ID : 0 ) ) ) {
 
             /**
              * When editing an entry don't render multiple views.
              */
-            if (($selected = \GV\Utils::_GET('gvid')) && $view->ID != $selected) {
-                gravityview()->log->notice('Entry ID #{entry_id} not rendered because another View ID was passed using `?gvid`: #{selected}', ['entry_id' => $entry->ID, 'selected' => $selected]);
+            if ( ( $selected = \GV\Utils::_GET( 'gvid' ) ) && $view->ID != $selected ) {
+                gravityview()->log->notice( 'Entry ID #{entry_id} not rendered because another View ID was passed using `?gvid`: #{selected}', [ 'entry_id' => $entry->ID, 'selected' => $selected ] );
 
-                return self::_return('');
+                return self::_return( '' );
             }
 
-            if ($entry['status'] != 'active') {
-                gravityview()->log->notice('Entry ID #{entry_id} is not active', ['entry_id' => $entry->ID]);
+            if ( $entry[ 'status' ] != 'active' ) {
+                gravityview()->log->notice( 'Entry ID #{entry_id} is not active', [ 'entry_id' => $entry->ID ] );
 
-                return self::_return(__('You are not allowed to view this content.', 'gravityview'));
+                return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) );
             }
 
-            if (apply_filters('gravityview_custom_entry_slug', false) && $entry->slug != get_query_var(\GV\Entry::get_endpoint_name())) {
-                gravityview()->log->error('Entry ID #{entry_id} was accessed by a bad slug', ['entry_id' => $entry->ID]);
+            if ( apply_filters( 'gravityview_custom_entry_slug', false ) && $entry->slug != get_query_var( \GV\Entry::get_endpoint_name() ) ) {
+                gravityview()->log->error( 'Entry ID #{entry_id} was accessed by a bad slug', [ 'entry_id' => $entry->ID ] );
 
-                return self::_return(__('You are not allowed to view this content.', 'gravityview'));
+                return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) );
             }
 
-            if ($view->settings->get('show_only_approved') && !$is_admin_and_can_view) {
-                if (!\GravityView_Entry_Approval_Status::is_approved(gform_get_meta($entry->ID, \GravityView_Entry_Approval::meta_key))) {
-                    gravityview()->log->error('Entry ID #{entry_id} is not approved for viewing', ['entry_id' => $entry->ID]);
+            if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
+                if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
+                    gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', [ 'entry_id' => $entry->ID ] );
 
-                    return self::_return(__('You are not allowed to view this content.', 'gravityview'));
+                    return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) );
                 }
             }
 
             $renderer = new \GV\Edit_Entry_Renderer();
 
-            return self::_return($renderer->render($entry, $view, $request));
+            return self::_return( $renderer->render( $entry, $view, $request ) );
 
         /**
          * Viewing a single entry.
          */
-        } elseif (!$is_reembedded && ($entry = $request->is_entry($view->form ? $view->form->ID : 0))) {
+        } elseif ( ! $is_reembedded && ( $entry = $request->is_entry( $view->form ? $view->form->ID : 0 ) ) ) {
             /**
              * When viewing an entry don't render multiple views.
              */
-            if (($selected = \GV\Utils::_GET('gvid')) && $view->ID != $selected) {
-                return self::_return('');
+            if ( ( $selected = \GV\Utils::_GET( 'gvid' ) ) && $view->ID != $selected ) {
+                return self::_return( '' );
             }
 
-            $entryset = $entry->is_multi() ? $entry->entries : [$entry];
+            $entryset = $entry->is_multi() ? $entry->entries : [ $entry ];
 
-            foreach ($entryset as $e) {
-                if ($e['status'] != 'active') {
-                    gravityview()->log->notice('Entry ID #{entry_id} is not active', ['entry_id' => $e->ID]);
+            foreach ( $entryset as $e ) {
+                if ( $e[ 'status' ] != 'active' ) {
+                    gravityview()->log->notice( 'Entry ID #{entry_id} is not active', [ 'entry_id' => $e->ID ] );
 
-                    return self::_return(__('You are not allowed to view this content.', 'gravityview'));
+                    return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) );
                 }
 
-                if (apply_filters('gravityview_custom_entry_slug', false) && $e->slug != get_query_var(\GV\Entry::get_endpoint_name())) {
-                    gravityview()->log->error('Entry ID #{entry_id} was accessed by a bad slug', ['entry_id' => $e->ID]);
+                if ( apply_filters( 'gravityview_custom_entry_slug', false ) && $e->slug != get_query_var( \GV\Entry::get_endpoint_name() ) ) {
+                    gravityview()->log->error( 'Entry ID #{entry_id} was accessed by a bad slug', [ 'entry_id' => $e->ID ] );
 
-                    return self::_return(__('You are not allowed to view this content.', 'gravityview'));
+                    return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) );
                 }
 
-                if ($view->settings->get('show_only_approved') && !$is_admin_and_can_view) {
-                    if (!\GravityView_Entry_Approval_Status::is_approved(gform_get_meta($e->ID, \GravityView_Entry_Approval::meta_key))) {
-                        gravityview()->log->error('Entry ID #{entry_id} is not approved for viewing', ['entry_id' => $e->ID]);
+                if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
+                    if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
+                        gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', [ 'entry_id' => $e->ID ] );
 
-                        return self::_return(__('You are not allowed to view this content.', 'gravityview'));
+                        return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) );
                     }
                 }
 
-                $error = \GVCommon::check_entry_display($e->as_entry(), $view);
+                $error = \GVCommon::check_entry_display( $e->as_entry(), $view );
 
-                if (is_wp_error($error)) {
-                    gravityview()->log->error('Entry ID #{entry_id} is not approved for viewing: {message}', ['entry_id' => $e->ID, 'message' => $error->get_error_message()]);
+                if ( is_wp_error( $error ) ) {
+                    gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing: {message}', [ 'entry_id' => $e->ID, 'message' => $error->get_error_message() ] );
 
-                    return self::_return(__('You are not allowed to view this content.', 'gravityview'));
+                    return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) );
                 }
             }
 
             $renderer = new \GV\Entry_Renderer();
 
-            return self::_return($renderer->render($entry, $view, $request));
+            return self::_return( $renderer->render( $entry, $view, $request ) );
 
         /**
          * Just this view.
          */
         } else {
-            if ($is_reembedded) {
+            if ( $is_reembedded ) {
 
                 // Mock the request with the actual View, not the global one
                 $mock_request = new \GV\Mock_Request();
-                $mock_request->returns['is_view'] = $view;
-                $mock_request->returns['is_entry'] = $request->is_entry($view->form ? $view->form->ID : 0);
-                $mock_request->returns['is_edit_entry'] = $request->is_edit_entry($view->form ? $view->form->ID : 0);
-                $mock_request->returns['is_search'] = $request->is_search();
+                $mock_request->returns[ 'is_view' ] = $view;
+                $mock_request->returns[ 'is_entry' ] = $request->is_entry( $view->form ? $view->form->ID : 0 );
+                $mock_request->returns[ 'is_edit_entry' ] = $request->is_edit_entry( $view->form ? $view->form->ID : 0 );
+                $mock_request->returns[ 'is_search' ] = $request->is_search();
 
                 $request = $mock_request;
             }
 
             $renderer = new \GV\View_Renderer();
 
-            return self::_return($renderer->render($view, $request));
+            return self::_return( $renderer->render( $view, $request ) );
         }
     }
 
@@ -268,26 +268,26 @@ 
      *
      * @return array Valid and sanitized attribute pairs
      */
-    private function parse_and_sanitize_atts($passed_atts)
+    private function parse_and_sanitize_atts( $passed_atts )
     {
-        $defaults = \GV\View_Settings::defaults(true);
+        $defaults = \GV\View_Settings::defaults( true );
 
-        $supported_atts = array_fill_keys(array_keys($defaults), '');
+        $supported_atts = array_fill_keys( array_keys( $defaults ), '' );
 
         // Whittle down the attributes to only valid pairs
-        $filtered_atts = shortcode_atts($supported_atts, $passed_atts, 'gravityview');
+        $filtered_atts = shortcode_atts( $supported_atts, $passed_atts, 'gravityview' );
 
         // Only keep the passed attributes after making sure that they're valid pairs
-        $filtered_atts = array_intersect_key((array) $passed_atts, $filtered_atts);
+        $filtered_atts = array_intersect_key( (array)$passed_atts, $filtered_atts );
 
-        $atts = [];
+        $atts = [ ];
 
-        foreach ($filtered_atts as $key => $passed_value) {
+        foreach ( $filtered_atts as $key => $passed_value ) {
 
             // Allow using GravityView merge tags in shortcode attributes, like {get} and {created_by}
-            $passed_value = \GravityView_Merge_Tags::replace_variables($passed_value);
+            $passed_value = \GravityView_Merge_Tags::replace_variables( $passed_value );
 
-            switch ($defaults[$key]['type']) {
+            switch ( $defaults[ $key ][ 'type' ] ) {
 
                 /**
                  * Make sure number fields are numeric.
@@ -296,14 +296,14 @@ 
                  * @see http://php.net/manual/en/function.is-numeric.php#107326
                  */
                 case 'number':
-                    if (is_numeric($passed_value)) {
-                        $atts[$key] = ($passed_value + 0);
+                    if ( is_numeric( $passed_value ) ) {
+                        $atts[ $key ] = ( $passed_value + 0 );
                     }
                     break;
 
                 // Checkboxes should be 1 or 0
                 case 'checkbox':
-                    $atts[$key] = gv_empty($passed_value, true, false) ? 0 : 1;
+                    $atts[ $key ] = gv_empty( $passed_value, true, false ) ? 0 : 1;
                     break;
 
                 /**
@@ -311,20 +311,20 @@ 
                  */
                 case 'select':
                 case 'radio':
-                    $options = isset($defaults[$key]['choices']) ? $defaults[$key]['choices'] : $defaults[$key]['options'];
-                    if (in_array($passed_value, array_keys($options))) {
-                        $atts[$key] = $passed_value;
+                    $options = isset( $defaults[ $key ][ 'choices' ] ) ? $defaults[ $key ][ 'choices' ] : $defaults[ $key ][ 'options' ];
+                    if ( in_array( $passed_value, array_keys( $options ) ) ) {
+                        $atts[ $key ] = $passed_value;
                     }
                     break;
 
                 case 'text':
                 default:
-                    $atts[$key] = $passed_value;
+                    $atts[ $key ] = $passed_value;
                     break;
             }
         }
 
-        $atts['detail'] = \GV\Utils::get($passed_atts, 'detail', null);
+        $atts[ 'detail' ] = \GV\Utils::get( $passed_atts, 'detail', null );
 
         return $atts;
     }
@@ -338,22 +338,22 @@ 
      *
      * @return string The output.
      */
-    private function detail($view, $entries, $atts)
+    private function detail( $view, $entries, $atts )
     {
         $output = '';
 
-        switch ($key = $atts['detail']) {
+        switch ( $key = $atts[ 'detail' ] ) {
             case 'total_entries':
-                $output = number_format_i18n($entries->total());
+                $output = number_format_i18n( $entries->total() );
                 break;
             case 'first_entry':
-                $output = number_format_i18n(min($entries->total(), $view->settings->get('offset') + 1));
+                $output = number_format_i18n( min( $entries->total(), $view->settings->get( 'offset' ) + 1 ) );
                 break;
             case 'last_entry':
-                $output = number_format_i18n($view->settings->get('page_size') + $view->settings->get('offset'));
+                $output = number_format_i18n( $view->settings->get( 'page_size' ) + $view->settings->get( 'offset' ) );
                 break;
             case 'page_size':
-                $output = number_format_i18n($view->settings->get($key));
+                $output = number_format_i18n( $view->settings->get( $key ) );
                 break;
         }
 
@@ -370,7 +370,7 @@ 
          * @param \GV\Entry_Collection $entries The entries.
          * @param array                $atts    The shortcode atts with defaults.
          */
-        $output = apply_filters("gravityview/shortcode/detail/$key", $output, $view);
+        $output = apply_filters( "gravityview/shortcode/detail/$key", $output, $view );
 
         return $output;
     }
@@ -378,9 +378,9 @@ 
     /**
      * Pop the callstack and return the value.
      */
-    private static function _return($value)
+    private static function _return( $value )
     {
-        array_pop(self::$callstack);
+        array_pop( self::$callstack );
 
         return $value;
     }

Braces +4 added lines, -8 removed lines

@@ -31,8 +31,7 @@ 
      *
      * @return string|null The output.
      */
-    public function callback($passed_atts, $content = '', $tag = '')
-    {
+    public function callback($passed_atts, $content = '', $tag = '') {
         $request = gravityview()->request;
 
         if ($request->is_admin()) {
@@ -268,8 +267,7 @@ 
      *
      * @return array Valid and sanitized attribute pairs
      */
-    private function parse_and_sanitize_atts($passed_atts)
-    {
+    private function parse_and_sanitize_atts($passed_atts) {
         $defaults = \GV\View_Settings::defaults(true);
 
         $supported_atts = array_fill_keys(array_keys($defaults), '');
@@ -338,8 +336,7 @@ 
      *
      * @return string The output.
      */
-    private function detail($view, $entries, $atts)
-    {
+    private function detail($view, $entries, $atts) {
         $output = '';
 
         switch ($key = $atts['detail']) {
@@ -378,8 +375,7 @@ 
     /**
      * Pop the callstack and return the value.
      */
-    private static function _return($value)
-    {
+    private static function _return($value) {
         array_pop(self::$callstack);
 
         return $value;

future/includes/class-gv-form-gravityforms.php

Indentation +270 added lines, -270 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -14,273 +14,273 @@ 
  */
 class GF_Form extends Form implements \ArrayAccess
 {
-    /**
-     * @var string The identifier of the backend used for this form.
-     *
-     * @api
-     *
-     * @since 2.0
-     */
-    public static $backend = self::BACKEND_GRAVITYFORMS;
-
-    /**
-     * Initialization.
-     */
-    private function __construct()
-    {
-        if (!class_exists('GFAPI')) {
-            gravityview()->log->error('Gravity Forms plugin is not active.');
-        }
-    }
-
-    /**
-     * Construct a \GV\GF_Form instance by ID.
-     *
-     * @param int|string $form_id The internal form ID.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return \GV\GF_Form|null An instance of this form or null if not found.
-     */
-    public static function by_id($form_id)
-    {
-        $form = wp_cache_get('gf_form_'.$form_id, 'gravityview');
-
-        if (!$form) {
-            $form = \GFAPI::get_form($form_id);
-        }
-
-        if (!$form) {
-            return null;
-        }
-
-        wp_cache_set('gf_form_'.$form_id, $form, 'gravityview');
-
-        $self = new self();
-        $self->form = $form;
-
-        $self->ID = intval($self->form['id']);
-
-        return $self;
-    }
-
-    /**
-     * Construct a \GV\Form instance from a Gravity Forms form array.
-     *
-     * @since 2.0.7
-     *
-     * @param array $form The form array
-     *
-     * @return \GV\GF_Form|null An instance of this form or null if not found.
-     */
-    public static function from_form($form)
-    {
-        if (empty($form['id'])) {
-            return null;
-        }
-
-        $self = new self();
-        $self->form = $form;
-        $self->ID = $self->form['id'];
-
-        return $self;
-    }
-
-    /**
-     * Get all entries for this form.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return \GV\Entry_Collection The \GV\Entry_Collection
-     */
-    public function get_entries()
-    {
-        $entries = new \GV\Entry_Collection();
-
-        $form = &$this;
-
-        /** Add the fetcher lazy callback. */
-        $entries->add_fetch_callback(function ($filters, $sorts, $offset) use ($form) {
-            $entries = new \GV\Entry_Collection();
-
-            $search_criteria = [];
-            $sorting = [];
-            $paging = [];
-
-            /** Apply the filters */
-            foreach ($filters as $filter) {
-                $search_criteria = $filter::merge_search_criteria($search_criteria, $filter->as_search_criteria());
-            }
-
-            /** Apply the sorts */
-            foreach ($sorts as $sort) {
-                /** Gravity Forms does not have multi-sorting, so just overwrite. */
-                $sorting = [
-                    'key'        => $sort->field->ID,
-                    'direction'  => $sort->direction,
-                    'is_numeric' => $sort->mode == Entry_Sort::NUMERIC,
-                ];
-            }
-
-            /** The offset and limit */
-            if (!empty($offset->limit)) {
-                $paging['page_size'] = $offset->limit;
-            }
-
-            if (!empty($offset->offset)) {
-                $paging['offset'] = $offset->offset;
-            }
-
-            foreach (\GFAPI::get_entries($form->ID, $search_criteria, $sorting, $paging) as $entry) {
-                $entries->add(\GV\GF_Entry::from_entry($entry));
-            }
-
-            return $entries;
-        });
-
-        /** Add the counter lazy callback. */
-        $entries->add_count_callback(function ($filters) use ($form) {
-            $search_criteria = [];
-            $sorting = [];
-
-            /** Apply the filters */
-            /** @var \GV\GF_Entry_Filter|\GV\Entry_Filter $filter */
-            foreach ($filters as $filter) {
-                $search_criteria = $filter::merge_search_criteria($search_criteria, $filter->as_search_criteria());
-            }
-
-            return \GFAPI::count_entries($form->ID, $search_criteria);
-        });
-
-        return $entries;
-    }
-
-    /**
-     * Get a \GV\Field by Form and Field ID for this data source.
-     *
-     * @param \GV\GF_Form $form     The Gravity Form form ID.
-     * @param int         $field_id The Gravity Form field ID for the $form_id.
-     *
-     * @return \GV\Field|null The requested field or null if not found.
-     */
-    public static function get_field(/** varargs */)
-    {
-        $args = func_get_args();
-
-        if (!is_array($args) || count($args) != 2) {
-            gravityview()->log->error('{source} expects 2 arguments for ::get_field ($form, $field_id)', ['source' => __CLASS__]);
-
-            return null;
-        }
-
-        /** Unwrap the arguments. */
-        list($form, $field_id) = $args;
-
-        /** Wrap it up into a \GV\Field. */
-        return GF_Field::by_id($form, $field_id);
-    }
-
-    /**
-     * Get an array of GV Fields for this data source.
-     *
-     * @return \GV\Field[]|array Empty array if no fields
-     */
-    public function get_fields()
-    {
-        $fields = [];
-        foreach ($this['fields'] as $field) {
-            foreach (empty($field['inputs']) ? [$field['id']] : wp_list_pluck($field['inputs'], 'id') as $id) {
-                if (is_numeric($id)) {
-                    $fields[$id] = self::get_field($this, $id);
-                } else {
-                    $fields[$id] = Internal_Field::by_id($id);
-                }
-            }
-        }
-
-        return array_filter($fields);
-    }
-
-    /**
-     * Proxies.
-     *
-     * @param string $key The property to get.
-     *
-     * @return mixed
-     */
-    public function __get($key)
-    {
-        switch ($key) {
-            case 'fields':
-                return $this->get_fields();
-            default:
-                return parent::__get($key);
-        }
-    }
-
-    /**
-     * ArrayAccess compatibility layer with a Gravity Forms form array.
-     *
-     * @internal
-     *
-     * @deprecated
-     * @since 2.0
-     *
-     * @return bool Whether the offset exists or not.
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->form[$offset]);
-    }
-
-    /**
-     * ArrayAccess compatibility layer with a Gravity Forms form array.
-     *
-     * Maps the old keys to the new data;
-     *
-     * @internal
-     *
-     * @deprecated
-     * @since 2.0
-     *
-     * @return mixed The value of the requested form data.
-     */
-    public function offsetGet($offset)
-    {
-        return $this->form[$offset];
-    }
-
-    /**
-     * ArrayAccess compatibility layer with a Gravity Forms form array.
-     *
-     * @internal
-     *
-     * @deprecated
-     * @since 2.0
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        gravityview()->log->error('The underlying Gravity Forms form is immutable. This is a \GV\Form object and should not be accessed as an array.');
-    }
-
-    /**
-     * ArrayAccess compatibility layer with a Gravity Forms form array.
-     *
-     * @internal
-     *
-     * @deprecated
-     * @since 2.0
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        gravityview()->log->error('The underlying Gravity Forms form is immutable. This is a \GV\Form object and should not be accessed as an array.');
-    }
+	/**
+	 * @var string The identifier of the backend used for this form.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 */
+	public static $backend = self::BACKEND_GRAVITYFORMS;
+
+	/**
+	 * Initialization.
+	 */
+	private function __construct()
+	{
+		if (!class_exists('GFAPI')) {
+			gravityview()->log->error('Gravity Forms plugin is not active.');
+		}
+	}
+
+	/**
+	 * Construct a \GV\GF_Form instance by ID.
+	 *
+	 * @param int|string $form_id The internal form ID.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return \GV\GF_Form|null An instance of this form or null if not found.
+	 */
+	public static function by_id($form_id)
+	{
+		$form = wp_cache_get('gf_form_'.$form_id, 'gravityview');
+
+		if (!$form) {
+			$form = \GFAPI::get_form($form_id);
+		}
+
+		if (!$form) {
+			return null;
+		}
+
+		wp_cache_set('gf_form_'.$form_id, $form, 'gravityview');
+
+		$self = new self();
+		$self->form = $form;
+
+		$self->ID = intval($self->form['id']);
+
+		return $self;
+	}
+
+	/**
+	 * Construct a \GV\Form instance from a Gravity Forms form array.
+	 *
+	 * @since 2.0.7
+	 *
+	 * @param array $form The form array
+	 *
+	 * @return \GV\GF_Form|null An instance of this form or null if not found.
+	 */
+	public static function from_form($form)
+	{
+		if (empty($form['id'])) {
+			return null;
+		}
+
+		$self = new self();
+		$self->form = $form;
+		$self->ID = $self->form['id'];
+
+		return $self;
+	}
+
+	/**
+	 * Get all entries for this form.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return \GV\Entry_Collection The \GV\Entry_Collection
+	 */
+	public function get_entries()
+	{
+		$entries = new \GV\Entry_Collection();
+
+		$form = &$this;
+
+		/** Add the fetcher lazy callback. */
+		$entries->add_fetch_callback(function ($filters, $sorts, $offset) use ($form) {
+			$entries = new \GV\Entry_Collection();
+
+			$search_criteria = [];
+			$sorting = [];
+			$paging = [];
+
+			/** Apply the filters */
+			foreach ($filters as $filter) {
+				$search_criteria = $filter::merge_search_criteria($search_criteria, $filter->as_search_criteria());
+			}
+
+			/** Apply the sorts */
+			foreach ($sorts as $sort) {
+				/** Gravity Forms does not have multi-sorting, so just overwrite. */
+				$sorting = [
+					'key'        => $sort->field->ID,
+					'direction'  => $sort->direction,
+					'is_numeric' => $sort->mode == Entry_Sort::NUMERIC,
+				];
+			}
+
+			/** The offset and limit */
+			if (!empty($offset->limit)) {
+				$paging['page_size'] = $offset->limit;
+			}
+
+			if (!empty($offset->offset)) {
+				$paging['offset'] = $offset->offset;
+			}
+
+			foreach (\GFAPI::get_entries($form->ID, $search_criteria, $sorting, $paging) as $entry) {
+				$entries->add(\GV\GF_Entry::from_entry($entry));
+			}
+
+			return $entries;
+		});
+
+		/** Add the counter lazy callback. */
+		$entries->add_count_callback(function ($filters) use ($form) {
+			$search_criteria = [];
+			$sorting = [];
+
+			/** Apply the filters */
+			/** @var \GV\GF_Entry_Filter|\GV\Entry_Filter $filter */
+			foreach ($filters as $filter) {
+				$search_criteria = $filter::merge_search_criteria($search_criteria, $filter->as_search_criteria());
+			}
+
+			return \GFAPI::count_entries($form->ID, $search_criteria);
+		});
+
+		return $entries;
+	}
+
+	/**
+	 * Get a \GV\Field by Form and Field ID for this data source.
+	 *
+	 * @param \GV\GF_Form $form     The Gravity Form form ID.
+	 * @param int         $field_id The Gravity Form field ID for the $form_id.
+	 *
+	 * @return \GV\Field|null The requested field or null if not found.
+	 */
+	public static function get_field(/** varargs */)
+	{
+		$args = func_get_args();
+
+		if (!is_array($args) || count($args) != 2) {
+			gravityview()->log->error('{source} expects 2 arguments for ::get_field ($form, $field_id)', ['source' => __CLASS__]);
+
+			return null;
+		}
+
+		/** Unwrap the arguments. */
+		list($form, $field_id) = $args;
+
+		/** Wrap it up into a \GV\Field. */
+		return GF_Field::by_id($form, $field_id);
+	}
+
+	/**
+	 * Get an array of GV Fields for this data source.
+	 *
+	 * @return \GV\Field[]|array Empty array if no fields
+	 */
+	public function get_fields()
+	{
+		$fields = [];
+		foreach ($this['fields'] as $field) {
+			foreach (empty($field['inputs']) ? [$field['id']] : wp_list_pluck($field['inputs'], 'id') as $id) {
+				if (is_numeric($id)) {
+					$fields[$id] = self::get_field($this, $id);
+				} else {
+					$fields[$id] = Internal_Field::by_id($id);
+				}
+			}
+		}
+
+		return array_filter($fields);
+	}
+
+	/**
+	 * Proxies.
+	 *
+	 * @param string $key The property to get.
+	 *
+	 * @return mixed
+	 */
+	public function __get($key)
+	{
+		switch ($key) {
+			case 'fields':
+				return $this->get_fields();
+			default:
+				return parent::__get($key);
+		}
+	}
+
+	/**
+	 * ArrayAccess compatibility layer with a Gravity Forms form array.
+	 *
+	 * @internal
+	 *
+	 * @deprecated
+	 * @since 2.0
+	 *
+	 * @return bool Whether the offset exists or not.
+	 */
+	public function offsetExists($offset)
+	{
+		return isset($this->form[$offset]);
+	}
+
+	/**
+	 * ArrayAccess compatibility layer with a Gravity Forms form array.
+	 *
+	 * Maps the old keys to the new data;
+	 *
+	 * @internal
+	 *
+	 * @deprecated
+	 * @since 2.0
+	 *
+	 * @return mixed The value of the requested form data.
+	 */
+	public function offsetGet($offset)
+	{
+		return $this->form[$offset];
+	}
+
+	/**
+	 * ArrayAccess compatibility layer with a Gravity Forms form array.
+	 *
+	 * @internal
+	 *
+	 * @deprecated
+	 * @since 2.0
+	 *
+	 * @return void
+	 */
+	public function offsetSet($offset, $value)
+	{
+		gravityview()->log->error('The underlying Gravity Forms form is immutable. This is a \GV\Form object and should not be accessed as an array.');
+	}
+
+	/**
+	 * ArrayAccess compatibility layer with a Gravity Forms form array.
+	 *
+	 * @internal
+	 *
+	 * @deprecated
+	 * @since 2.0
+	 *
+	 * @return void
+	 */
+	public function offsetUnset($offset)
+	{
+		gravityview()->log->error('The underlying Gravity Forms form is immutable. This is a \GV\Form object and should not be accessed as an array.');
+	}
 }

Spacing +55 added lines, -55 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -28,8 +28,8 @@ 
      */
     private function __construct()
     {
-        if (!class_exists('GFAPI')) {
-            gravityview()->log->error('Gravity Forms plugin is not active.');
+        if ( ! class_exists( 'GFAPI' ) ) {
+            gravityview()->log->error( 'Gravity Forms plugin is not active.' );
         }
     }
 
@@ -44,24 +44,24 @@ 
      *
      * @return \GV\GF_Form|null An instance of this form or null if not found.
      */
-    public static function by_id($form_id)
+    public static function by_id( $form_id )
     {
-        $form = wp_cache_get('gf_form_'.$form_id, 'gravityview');
+        $form = wp_cache_get( 'gf_form_' . $form_id, 'gravityview' );
 
-        if (!$form) {
-            $form = \GFAPI::get_form($form_id);
+        if ( ! $form ) {
+            $form = \GFAPI::get_form( $form_id );
         }
 
-        if (!$form) {
+        if ( ! $form ) {
             return null;
         }
 
-        wp_cache_set('gf_form_'.$form_id, $form, 'gravityview');
+        wp_cache_set( 'gf_form_' . $form_id, $form, 'gravityview' );
 
         $self = new self();
         $self->form = $form;
 
-        $self->ID = intval($self->form['id']);
+        $self->ID = intval( $self->form[ 'id' ] );
 
         return $self;
     }
@@ -75,15 +75,15 @@ 
      *
      * @return \GV\GF_Form|null An instance of this form or null if not found.
      */
-    public static function from_form($form)
+    public static function from_form( $form )
     {
-        if (empty($form['id'])) {
+        if ( empty( $form[ 'id' ] ) ) {
             return null;
         }
 
         $self = new self();
         $self->form = $form;
-        $self->ID = $self->form['id'];
+        $self->ID = $self->form[ 'id' ];
 
         return $self;
     }
@@ -104,20 +104,20 @@ 
         $form = &$this;
 
         /** Add the fetcher lazy callback. */
-        $entries->add_fetch_callback(function ($filters, $sorts, $offset) use ($form) {
+        $entries->add_fetch_callback( function( $filters, $sorts, $offset ) use ( $form ) {
             $entries = new \GV\Entry_Collection();
 
-            $search_criteria = [];
-            $sorting = [];
-            $paging = [];
+            $search_criteria = [ ];
+            $sorting = [ ];
+            $paging = [ ];
 
             /** Apply the filters */
-            foreach ($filters as $filter) {
-                $search_criteria = $filter::merge_search_criteria($search_criteria, $filter->as_search_criteria());
+            foreach ( $filters as $filter ) {
+                $search_criteria = $filter::merge_search_criteria( $search_criteria, $filter->as_search_criteria() );
             }
 
             /** Apply the sorts */
-            foreach ($sorts as $sort) {
+            foreach ( $sorts as $sort ) {
                 /** Gravity Forms does not have multi-sorting, so just overwrite. */
                 $sorting = [
                     'key'        => $sort->field->ID,
@@ -127,33 +127,33 @@ 
             }
 
             /** The offset and limit */
-            if (!empty($offset->limit)) {
-                $paging['page_size'] = $offset->limit;
+            if ( ! empty( $offset->limit ) ) {
+                $paging[ 'page_size' ] = $offset->limit;
             }
 
-            if (!empty($offset->offset)) {
-                $paging['offset'] = $offset->offset;
+            if ( ! empty( $offset->offset ) ) {
+                $paging[ 'offset' ] = $offset->offset;
             }
 
-            foreach (\GFAPI::get_entries($form->ID, $search_criteria, $sorting, $paging) as $entry) {
-                $entries->add(\GV\GF_Entry::from_entry($entry));
+            foreach ( \GFAPI::get_entries( $form->ID, $search_criteria, $sorting, $paging ) as $entry ) {
+                $entries->add( \GV\GF_Entry::from_entry( $entry ) );
             }
 
             return $entries;
         });
 
         /** Add the counter lazy callback. */
-        $entries->add_count_callback(function ($filters) use ($form) {
-            $search_criteria = [];
-            $sorting = [];
+        $entries->add_count_callback( function( $filters ) use ( $form ) {
+            $search_criteria = [ ];
+            $sorting = [ ];
 
             /** Apply the filters */
             /** @var \GV\GF_Entry_Filter|\GV\Entry_Filter $filter */
-            foreach ($filters as $filter) {
-                $search_criteria = $filter::merge_search_criteria($search_criteria, $filter->as_search_criteria());
+            foreach ( $filters as $filter ) {
+                $search_criteria = $filter::merge_search_criteria( $search_criteria, $filter->as_search_criteria() );
             }
 
-            return \GFAPI::count_entries($form->ID, $search_criteria);
+            return \GFAPI::count_entries( $form->ID, $search_criteria );
         });
 
         return $entries;
@@ -167,21 +167,21 @@ 
      *
      * @return \GV\Field|null The requested field or null if not found.
      */
-    public static function get_field(/** varargs */)
+    public static function get_field( /** varargs */ )
     {
         $args = func_get_args();
 
-        if (!is_array($args) || count($args) != 2) {
-            gravityview()->log->error('{source} expects 2 arguments for ::get_field ($form, $field_id)', ['source' => __CLASS__]);
+        if ( ! is_array( $args ) || count( $args ) != 2 ) {
+            gravityview()->log->error( '{source} expects 2 arguments for ::get_field ($form, $field_id)', [ 'source' => __CLASS__ ] );
 
             return null;
         }
 
         /** Unwrap the arguments. */
-        list($form, $field_id) = $args;
+        list( $form, $field_id ) = $args;
 
         /** Wrap it up into a \GV\Field. */
-        return GF_Field::by_id($form, $field_id);
+        return GF_Field::by_id( $form, $field_id );
     }
 
     /**
@@ -191,18 +191,18 @@ 
      */
     public function get_fields()
     {
-        $fields = [];
-        foreach ($this['fields'] as $field) {
-            foreach (empty($field['inputs']) ? [$field['id']] : wp_list_pluck($field['inputs'], 'id') as $id) {
-                if (is_numeric($id)) {
-                    $fields[$id] = self::get_field($this, $id);
+        $fields = [ ];
+        foreach ( $this[ 'fields' ] as $field ) {
+            foreach ( empty( $field[ 'inputs' ] ) ? [ $field[ 'id' ] ] : wp_list_pluck( $field[ 'inputs' ], 'id' ) as $id ) {
+                if ( is_numeric( $id ) ) {
+                    $fields[ $id ] = self::get_field( $this, $id );
                 } else {
-                    $fields[$id] = Internal_Field::by_id($id);
+                    $fields[ $id ] = Internal_Field::by_id( $id );
                 }
             }
         }
 
-        return array_filter($fields);
+        return array_filter( $fields );
     }
 
     /**
@@ -212,13 +212,13 @@ 
      *
      * @return mixed
      */
-    public function __get($key)
+    public function __get( $key )
     {
-        switch ($key) {
+        switch ( $key ) {
             case 'fields':
                 return $this->get_fields();
             default:
-                return parent::__get($key);
+                return parent::__get( $key );
         }
     }
 
@@ -232,9 +232,9 @@ 
      *
      * @return bool Whether the offset exists or not.
      */
-    public function offsetExists($offset)
+    public function offsetExists( $offset )
     {
-        return isset($this->form[$offset]);
+        return isset( $this->form[ $offset ] );
     }
 
     /**
@@ -249,9 +249,9 @@ 
      *
      * @return mixed The value of the requested form data.
      */
-    public function offsetGet($offset)
+    public function offsetGet( $offset )
     {
-        return $this->form[$offset];
+        return $this->form[ $offset ];
     }
 
     /**
@@ -264,9 +264,9 @@ 
      *
      * @return void
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet( $offset, $value )
     {
-        gravityview()->log->error('The underlying Gravity Forms form is immutable. This is a \GV\Form object and should not be accessed as an array.');
+        gravityview()->log->error( 'The underlying Gravity Forms form is immutable. This is a \GV\Form object and should not be accessed as an array.' );
     }
 
     /**
@@ -279,8 +279,8 @@ 
      *
      * @return void
      */
-    public function offsetUnset($offset)
+    public function offsetUnset( $offset )
     {
-        gravityview()->log->error('The underlying Gravity Forms form is immutable. This is a \GV\Form object and should not be accessed as an array.');
+        gravityview()->log->error( 'The underlying Gravity Forms form is immutable. This is a \GV\Form object and should not be accessed as an array.' );
     }
 }

Braces +11 added lines, -22 removed lines

@@ -26,8 +26,7 @@ 
     /**
      * Initialization.
      */
-    private function __construct()
-    {
+    private function __construct() {
         if (!class_exists('GFAPI')) {
             gravityview()->log->error('Gravity Forms plugin is not active.');
         }
@@ -44,8 +43,7 @@ 
      *
      * @return \GV\GF_Form|null An instance of this form or null if not found.
      */
-    public static function by_id($form_id)
-    {
+    public static function by_id($form_id) {
         $form = wp_cache_get('gf_form_'.$form_id, 'gravityview');
 
         if (!$form) {
@@ -75,8 +73,7 @@ 
      *
      * @return \GV\GF_Form|null An instance of this form or null if not found.
      */
-    public static function from_form($form)
-    {
+    public static function from_form($form) {
         if (empty($form['id'])) {
             return null;
         }
@@ -97,8 +94,7 @@ 
      *
      * @return \GV\Entry_Collection The \GV\Entry_Collection
      */
-    public function get_entries()
-    {
+    public function get_entries() {
         $entries = new \GV\Entry_Collection();
 
         $form = &$this;
@@ -167,8 +163,7 @@ 
      *
      * @return \GV\Field|null The requested field or null if not found.
      */
-    public static function get_field(/** varargs */)
-    {
+    public static function get_field(/** varargs */) {
         $args = func_get_args();
 
         if (!is_array($args) || count($args) != 2) {
@@ -189,8 +184,7 @@ 
      *
      * @return \GV\Field[]|array Empty array if no fields
      */
-    public function get_fields()
-    {
+    public function get_fields() {
         $fields = [];
         foreach ($this['fields'] as $field) {
             foreach (empty($field['inputs']) ? [$field['id']] : wp_list_pluck($field['inputs'], 'id') as $id) {
@@ -212,8 +206,7 @@ 
      *
      * @return mixed
      */
-    public function __get($key)
-    {
+    public function __get($key) {
         switch ($key) {
             case 'fields':
                 return $this->get_fields();
@@ -232,8 +225,7 @@ 
      *
      * @return bool Whether the offset exists or not.
      */
-    public function offsetExists($offset)
-    {
+    public function offsetExists($offset) {
         return isset($this->form[$offset]);
     }
 
@@ -249,8 +241,7 @@ 
      *
      * @return mixed The value of the requested form data.
      */
-    public function offsetGet($offset)
-    {
+    public function offsetGet($offset) {
         return $this->form[$offset];
     }
 
@@ -264,8 +255,7 @@ 
      *
      * @return void
      */
-    public function offsetSet($offset, $value)
-    {
+    public function offsetSet($offset, $value) {
         gravityview()->log->error('The underlying Gravity Forms form is immutable. This is a \GV\Form object and should not be accessed as an array.');
     }
 
@@ -279,8 +269,7 @@ 
      *
      * @return void
      */
-    public function offsetUnset($offset)
-    {
+    public function offsetUnset($offset) {
         gravityview()->log->error('The underlying Gravity Forms form is immutable. This is a \GV\Form object and should not be accessed as an array.');
     }
 }