gravityview / GravityView

future/includes/class-gv-wrappers.php

Indentation +70 added lines, -70 removed lines

@@ -15,85 +15,85 @@
  */
 class views
 {
-    /**
-     * @var \GV\View An internal View keeper.
-     */
-    private $view = null;
+	/**
+	 * @var \GV\View An internal View keeper.
+	 */
+	private $view = null;
 
-    /**
-     * Gets a View.
-     *
-     * Doesn't care what you provide it. Will try to find
-     *  out what you need from the current context, from the supplied
-     *  args, etc.
-     *
-     * @param string|int|array|\GV\View|\WP_Post|null Anything goes.
-     *
-     * @return \GV\View|null The detected View.
-     */
-    public function get($view = null)
-    {
+	/**
+	 * Gets a View.
+	 *
+	 * Doesn't care what you provide it. Will try to find
+	 *  out what you need from the current context, from the supplied
+	 *  args, etc.
+	 *
+	 * @param string|int|array|\GV\View|\WP_Post|null Anything goes.
+	 *
+	 * @return \GV\View|null The detected View.
+	 */
+	public function get($view = null)
+	{
 
-        /**
-         * By View.
-         */
-        if ($view instanceof \GV\View && $view->ID) {
-            return $this->get($view->ID);
-        }
+		/**
+		 * By View.
+		 */
+		if ($view instanceof \GV\View && $view->ID) {
+			return $this->get($view->ID);
+		}
 
-        /**
-         * By View ID.
-         */
-        if (is_numeric($view)) {
-            return \GV\View::by_id($view);
-        }
+		/**
+		 * By View ID.
+		 */
+		if (is_numeric($view)) {
+			return \GV\View::by_id($view);
+		}
 
-        /**
-         * By post object.
-         */
-        if ($view instanceof \WP_Post) {
-            return \GV\View::from_post($view);
-        }
+		/**
+		 * By post object.
+		 */
+		if ($view instanceof \WP_Post) {
+			return \GV\View::from_post($view);
+		}
 
-        /**
-         * By array.
-         */
-        if (is_array($view) && !empty($view['id'])) {
-            return $this->get($view['id']);
-        }
+		/**
+		 * By array.
+		 */
+		if (is_array($view) && !empty($view['id'])) {
+			return $this->get($view['id']);
+		}
 
-        /**
-         * From various contexts.
-         */
-        if (is_null($view)) {
-            if (gravityview()->request->is_renderable() && $view = gravityview()->request->is_view()) {
-                return $view;
-            }
+		/**
+		 * From various contexts.
+		 */
+		if (is_null($view)) {
+			if (gravityview()->request->is_renderable() && $view = gravityview()->request->is_view()) {
+				return $view;
+			}
 
-            global $post;
+			global $post;
 
-            if ($post instanceof \WP_Post && $post->post_type == 'gravityview') {
-                return $this->get($post);
-            }
+			if ($post instanceof \WP_Post && $post->post_type == 'gravityview') {
+				return $this->get($post);
+			}
 
-            /**
-             * Final fallback.
-             */
-            return $this->view;
-        }
+			/**
+			 * Final fallback.
+			 */
+			return $this->view;
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    /**
-     * Mock the internal pointer.
-     *
-     * @param \GV\View $view The View to supply on fallback in ::get()
-     *
-     * @return void
-     */
-    public function set($view)
-    {
-        $this->view = $view;
-    }
+	/**
+	 * Mock the internal pointer.
+	 *
+	 * @param \GV\View $view The View to supply on fallback in ::get()
+	 *
+	 * @return void
+	 */
+	public function set($view)
+	{
+		$this->view = $view;
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -31,49 +31,49 @@ 
      *
      * @return \GV\View|null The detected View.
      */
-    public function get($view = null)
+    public function get( $view = null )
     {
 
         /**
          * By View.
          */
-        if ($view instanceof \GV\View && $view->ID) {
-            return $this->get($view->ID);
+        if ( $view instanceof \GV\View && $view->ID ) {
+            return $this->get( $view->ID );
         }
 
         /**
          * By View ID.
          */
-        if (is_numeric($view)) {
-            return \GV\View::by_id($view);
+        if ( is_numeric( $view ) ) {
+            return \GV\View::by_id( $view );
         }
 
         /**
          * By post object.
          */
-        if ($view instanceof \WP_Post) {
-            return \GV\View::from_post($view);
+        if ( $view instanceof \WP_Post ) {
+            return \GV\View::from_post( $view );
         }
 
         /**
          * By array.
          */
-        if (is_array($view) && !empty($view['id'])) {
-            return $this->get($view['id']);
+        if ( is_array( $view ) && ! empty( $view[ 'id' ] ) ) {
+            return $this->get( $view[ 'id' ] );
         }
 
         /**
          * From various contexts.
          */
-        if (is_null($view)) {
-            if (gravityview()->request->is_renderable() && $view = gravityview()->request->is_view()) {
+        if ( is_null( $view ) ) {
+            if ( gravityview()->request->is_renderable() && $view = gravityview()->request->is_view() ) {
                 return $view;
             }
 
             global $post;
 
-            if ($post instanceof \WP_Post && $post->post_type == 'gravityview') {
-                return $this->get($post);
+            if ( $post instanceof \WP_Post && $post->post_type == 'gravityview' ) {
+                return $this->get( $post );
             }
 
             /**
@@ -92,7 +92,7 @@ 
      *
      * @return void
      */
-    public function set($view)
+    public function set( $view )
     {
         $this->view = $view;
     }

Braces +3 added lines, -6 removed lines

@@ -13,8 +13,7 @@ 
 /**
  * The views magic wrapper.
  */
-class views
-{
+class views {
     /**
      * @var \GV\View An internal View keeper.
      */
@@ -31,8 +30,7 @@ 
      *
      * @return \GV\View|null The detected View.
      */
-    public function get($view = null)
-    {
+    public function get($view = null) {
 
         /**
          * By View.
@@ -92,8 +90,7 @@ 
      *
      * @return void
      */
-    public function set($view)
-    {
+    public function set($view) {
         $this->view = $view;
     }
 }

future/includes/class-gv-renderer.php

Indentation +252 added lines, -252 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -14,255 +14,255 @@ 
  */
 class Renderer
 {
-    /**
-     * Initialization.
-     */
-    public function __construct()
-    {
-        if (!has_action('gravityview/template/before', [__CLASS__, 'maybe_print_notices'])) {
-            add_action('gravityview/template/before', [__CLASS__, 'maybe_print_notices']);
-        }
-    }
-
-    /**
-     * Print unconfigured notices to admins.
-     * Print reserved slug warnings.
-     * Print entry approval notice.
-     *
-     * @param \GV\Template_Context $gravityview The $gravityview template object.
-     *
-     * @return void
-     */
-    public static function maybe_print_notices($gravityview = null)
-    {
-        if (!$gravityview instanceof \GV\Template_Context) {
-            /** Call the legacy code. */
-            \GravityView_frontend::getInstance()->context_not_configured_warning(gravityview_get_view_id());
-
-            return;
-        }
-
-        self::maybe_print_reserved_slugs_notice($gravityview);
-
-        self::maybe_print_configuration_notice($gravityview);
-
-        self::maybe_print_entry_approval_notice($gravityview);
-    }
-
-    /**
-     * Print notice warning admins that "Show only approved" is enabled.
-     *
-     * @since 2.9.5
-     *
-     * @param \GV\Template_Context $gravityview The $gravityview template object.
-     *
-     * @return void
-     */
-    private static function maybe_print_entry_approval_notice($gravityview)
-    {
-        if ($gravityview->entries && $gravityview->entries->count()) {
-            return;
-        }
-
-        if ($gravityview->request->is_search()) {
-            return;
-        }
-
-        // "Show Only Approved" is not enabled.
-        if (!$gravityview->view->settings->get('show_only_approved', 0)) {
-            return;
-        }
-
-        // If "Show all entries to administrators" is enabled, approval status isn't the issue.
-        if ($gravityview->view->settings->get('admin_show_all_statuses', 0)) {
-            return;
-        }
-
-        // Don't show when no entries are being displayed due to "Hide View data until search is performed".
-        if ($gravityview->view->settings->get('hide_until_searched', 0)) {
-            return;
-        }
-
-        $current_user = wp_get_current_user();
-        $user_meta_key = '_gv_dismissed_entry_approval_notice'.$gravityview->view->ID;
-
-        if (isset($_GET['gv-dismiss']) && wp_verify_nonce($_GET['gv-dismiss'], 'dismiss')) {
-            add_user_meta($current_user->ID, $user_meta_key, 1); // Prevent user from seeing this again for this View
-
-            return;
-        }
-
-        // The user has already dismissed the notice
-        if (get_user_meta($current_user->ID, $user_meta_key, true)) {
-            return;
-        }
-
-        $form = $gravityview->view->form;
-
-        if (!$form) {
-            return;
-        }
-
-        $count = \GFAPI::count_entries($gravityview->view->form->ID, [
-            'status'        => 'active',
-            'field_filters' => [
-                [
-                    'key'      => 'is_approved',
-                    'operator' => 'isnot',
-                    'value'    => \GravityView_Entry_Approval_Status::APPROVED,
-                ],
-            ],
-        ]);
-
-        // There aren't any entries to show!
-        if (empty($count)) {
-            return;
-        }
-
-        $notice_title = _n(
-            esc_html__('There is an unapproved entry that is not being shown.', 'gravityview'),
-            esc_html__('There are %s unapproved entries that are not being shown.', 'gravityview'),
-            $count
-        );
-
-        $float_dir = is_rtl() ? 'left' : 'right';
-        $hide_link = sprintf('<a href="%s" style="float: '.$float_dir.'; font-size: 1rem" role="button">%s</a>', esc_url(wp_nonce_url(add_query_arg(['notice' => 'no_entries_'.$gravityview->view->ID]), 'dismiss', 'gv-dismiss')), esc_html__('Hide this notice', 'gravityview'));
-
-        $message_strings = [
-            '<h3>'.sprintf($notice_title, number_format_i18n($count)).$hide_link.'</h3>',
-            esc_html__('The "Show only approved entries" setting is enabled, so only entries that have been approved are displayed.', 'gravityview'),
-            sprintf('<a href="%s">%s</a>', 'https://docs.gravityview.co/article/490-entry-approval-gravity-forms', esc_html__('Learn about entry approval.', 'gravityview')),
-            "\n\n",
-            sprintf(esc_html_x('%sEdit the View settings%s or %sApprove entries%s', 'Replacements are HTML links', 'gravityview'), '<a href="'.esc_url(get_edit_post_link($gravityview->view->ID, false)).'" style="font-weight: bold;">', '</a>', '<a href="'.esc_url(admin_url('admin.php?page=gf_entries&id='.$gravityview->view->form->ID)).'" style="font-weight: bold;">', '</a>'),
-            "\n\n",
-            sprintf('<img alt="%s" src="%s" style="padding: 10px 0; max-width: 550px;" />', esc_html__('Show only approved entries', 'gravityview'), esc_url(plugins_url('assets/images/screenshots/entry-approval.png', GRAVITYVIEW_FILE))),
-            "\n\n",
-            esc_html__('You can only see this message because you are able to edit this View.', 'gravityview'),
-        ];
-
-        $notice = wpautop(implode(' ', $message_strings));
-
-        echo \GVCommon::generate_notice($notice, 'warning', 'edit_gravityview', $gravityview->view->ID);
-    }
-
-    /**
-     * Check empty configuration.
-     *
-     * @since 2.10
-     *
-     * @param \GV\Template_Context $gravityview The $gravityview template object.
-     *
-     * @return void
-     */
-    private static function maybe_print_configuration_notice($gravityview)
-    {
-        switch (true) {
-            case  $gravityview->request->is_edit_entry() :
-                $tab = __('Edit Entry', 'gravityview');
-                $context = 'edit';
-                break;
-            case  $gravityview->request->is_entry($gravityview->view->form ? $gravityview->view->form->ID : 0) :
-                $tab = __('Single Entry', 'gravityview');
-                $context = 'single';
-                break;
-            default:
-                $tab = __('Multiple Entries', 'gravityview');
-                $context = 'directory';
-                break;
-        }
-
-        $cls = $gravityview->template;
-        $slug = property_exists($cls, '_configuration_slug') ? $cls::$_configuration_slug : $cls::$slug;
-
-        // If the zone has been configured, don't display notice.
-        if ($gravityview->fields->by_position(sprintf('%s_%s-*', $context, $slug))->by_visible($gravityview->view)->count()) {
-            return;
-        }
-
-        $title = sprintf(esc_html_x('The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview'), $tab);
-        $edit_link = admin_url(sprintf('post.php?post=%d&action=edit#%s-view', $gravityview->view->ID, $context));
-        $action_text = sprintf(esc_html__('Add fields to %s', 'gravityview'), $tab);
-        $message = esc_html__('You can only see this message because you are able to edit this View.', 'gravityview');
-
-        $image = sprintf('<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url(plugins_url(sprintf('assets/images/tab-%s.png', $context), GRAVITYVIEW_FILE)));
-        $output = sprintf('<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url($edit_link), $action_text, $message);
-
-        echo \GVCommon::generate_notice($output.$image, 'gv-warning warning', 'edit_gravityview', $gravityview->view->ID);
-    }
-
-    /**
-     * Print reserved slug warnings, if they exist.
-     *
-     * @since 2.9.5
-     *
-     * @param Template_Context $gravityview The $gravityview template object.
-     *
-     * @return void
-     */
-    private static function maybe_print_reserved_slugs_notice($gravityview)
-    {
-        global $wp;
-        global $wp_rewrite;
-
-        $reserved_slugs = [
-            $wp_rewrite->search_base,
-            apply_filters('gravityview_directory_endpoint', 'entry'),
-        ];
-
-        $post_types = get_post_types();
-
-        foreach ($post_types as $post_type) {
-            $post_type_rewrite = get_post_type_object($post_type)->rewrite;
-
-            if ($slug = \GV\Utils::get($post_type_rewrite, 'slug')) {
-                $reserved_slugs[] = $slug;
-            }
-        }
-
-        unset($post_types, $post_type_rewrite);
-
-        /**
-         * @filter `gravityview/rewrite/reserved_slugs` Modify the reserved embed slugs that trigger a warning.
-         *
-         * @since 2.5
-         *
-         * @param array                $reserved_slugs An array of strings, reserved slugs.
-         * @param \GV\Template_Context $gravityview    The context.
-         */
-        $reserved_slugs = apply_filters('gravityview/rewrite/reserved_slugs', $reserved_slugs, $gravityview);
-
-        $reserved_slugs = array_map('strtolower', $reserved_slugs);
-
-        if (!in_array(strtolower($wp->request), $reserved_slugs, true)) {
-            return;
-        }
-
-        gravityview()->log->error('{slug} page URL is reserved.', ['slug' => $wp->request]);
-
-        $title = esc_html__('GravityView will not work correctly on this page because of the URL Slug.', 'gravityview');
-        $message = __('Please <a href="%s">read this article</a> for more information.', 'gravityview');
-        $message .= ' '.esc_html__('You can only see this message because you are able to edit this View.', 'gravityview');
-
-        $output = sprintf('<h3>%s</h3><p>%s</p>', $title, sprintf($message, 'https://docs.gravityview.co/article/659-reserved-urls'));
-
-        echo \GVCommon::generate_notice($output, 'gv-error error', 'edit_gravityview', $gravityview->view->ID);
-    }
-
-    /**
-     * Warn about legacy template being used.
-     *
-     * Generate a callback that shows which legacy template was at fault.
-     * Used in gravityview_before.
-     *
-     * @param \GV\View $view The view we're looking at.
-     * @param string   $path The path of the offending template.
-     *
-     * @return \callable A closure used in the filter.
-     */
-    public function legacy_template_warning($view, $path)
-    {
-        return function () {
-            // Do not panic for now...
-        };
-    }
+	/**
+	 * Initialization.
+	 */
+	public function __construct()
+	{
+		if (!has_action('gravityview/template/before', [__CLASS__, 'maybe_print_notices'])) {
+			add_action('gravityview/template/before', [__CLASS__, 'maybe_print_notices']);
+		}
+	}
+
+	/**
+	 * Print unconfigured notices to admins.
+	 * Print reserved slug warnings.
+	 * Print entry approval notice.
+	 *
+	 * @param \GV\Template_Context $gravityview The $gravityview template object.
+	 *
+	 * @return void
+	 */
+	public static function maybe_print_notices($gravityview = null)
+	{
+		if (!$gravityview instanceof \GV\Template_Context) {
+			/** Call the legacy code. */
+			\GravityView_frontend::getInstance()->context_not_configured_warning(gravityview_get_view_id());
+
+			return;
+		}
+
+		self::maybe_print_reserved_slugs_notice($gravityview);
+
+		self::maybe_print_configuration_notice($gravityview);
+
+		self::maybe_print_entry_approval_notice($gravityview);
+	}
+
+	/**
+	 * Print notice warning admins that "Show only approved" is enabled.
+	 *
+	 * @since 2.9.5
+	 *
+	 * @param \GV\Template_Context $gravityview The $gravityview template object.
+	 *
+	 * @return void
+	 */
+	private static function maybe_print_entry_approval_notice($gravityview)
+	{
+		if ($gravityview->entries && $gravityview->entries->count()) {
+			return;
+		}
+
+		if ($gravityview->request->is_search()) {
+			return;
+		}
+
+		// "Show Only Approved" is not enabled.
+		if (!$gravityview->view->settings->get('show_only_approved', 0)) {
+			return;
+		}
+
+		// If "Show all entries to administrators" is enabled, approval status isn't the issue.
+		if ($gravityview->view->settings->get('admin_show_all_statuses', 0)) {
+			return;
+		}
+
+		// Don't show when no entries are being displayed due to "Hide View data until search is performed".
+		if ($gravityview->view->settings->get('hide_until_searched', 0)) {
+			return;
+		}
+
+		$current_user = wp_get_current_user();
+		$user_meta_key = '_gv_dismissed_entry_approval_notice'.$gravityview->view->ID;
+
+		if (isset($_GET['gv-dismiss']) && wp_verify_nonce($_GET['gv-dismiss'], 'dismiss')) {
+			add_user_meta($current_user->ID, $user_meta_key, 1); // Prevent user from seeing this again for this View
+
+			return;
+		}
+
+		// The user has already dismissed the notice
+		if (get_user_meta($current_user->ID, $user_meta_key, true)) {
+			return;
+		}
+
+		$form = $gravityview->view->form;
+
+		if (!$form) {
+			return;
+		}
+
+		$count = \GFAPI::count_entries($gravityview->view->form->ID, [
+			'status'        => 'active',
+			'field_filters' => [
+				[
+					'key'      => 'is_approved',
+					'operator' => 'isnot',
+					'value'    => \GravityView_Entry_Approval_Status::APPROVED,
+				],
+			],
+		]);
+
+		// There aren't any entries to show!
+		if (empty($count)) {
+			return;
+		}
+
+		$notice_title = _n(
+			esc_html__('There is an unapproved entry that is not being shown.', 'gravityview'),
+			esc_html__('There are %s unapproved entries that are not being shown.', 'gravityview'),
+			$count
+		);
+
+		$float_dir = is_rtl() ? 'left' : 'right';
+		$hide_link = sprintf('<a href="%s" style="float: '.$float_dir.'; font-size: 1rem" role="button">%s</a>', esc_url(wp_nonce_url(add_query_arg(['notice' => 'no_entries_'.$gravityview->view->ID]), 'dismiss', 'gv-dismiss')), esc_html__('Hide this notice', 'gravityview'));
+
+		$message_strings = [
+			'<h3>'.sprintf($notice_title, number_format_i18n($count)).$hide_link.'</h3>',
+			esc_html__('The "Show only approved entries" setting is enabled, so only entries that have been approved are displayed.', 'gravityview'),
+			sprintf('<a href="%s">%s</a>', 'https://docs.gravityview.co/article/490-entry-approval-gravity-forms', esc_html__('Learn about entry approval.', 'gravityview')),
+			"\n\n",
+			sprintf(esc_html_x('%sEdit the View settings%s or %sApprove entries%s', 'Replacements are HTML links', 'gravityview'), '<a href="'.esc_url(get_edit_post_link($gravityview->view->ID, false)).'" style="font-weight: bold;">', '</a>', '<a href="'.esc_url(admin_url('admin.php?page=gf_entries&id='.$gravityview->view->form->ID)).'" style="font-weight: bold;">', '</a>'),
+			"\n\n",
+			sprintf('<img alt="%s" src="%s" style="padding: 10px 0; max-width: 550px;" />', esc_html__('Show only approved entries', 'gravityview'), esc_url(plugins_url('assets/images/screenshots/entry-approval.png', GRAVITYVIEW_FILE))),
+			"\n\n",
+			esc_html__('You can only see this message because you are able to edit this View.', 'gravityview'),
+		];
+
+		$notice = wpautop(implode(' ', $message_strings));
+
+		echo \GVCommon::generate_notice($notice, 'warning', 'edit_gravityview', $gravityview->view->ID);
+	}
+
+	/**
+	 * Check empty configuration.
+	 *
+	 * @since 2.10
+	 *
+	 * @param \GV\Template_Context $gravityview The $gravityview template object.
+	 *
+	 * @return void
+	 */
+	private static function maybe_print_configuration_notice($gravityview)
+	{
+		switch (true) {
+			case  $gravityview->request->is_edit_entry() :
+				$tab = __('Edit Entry', 'gravityview');
+				$context = 'edit';
+				break;
+			case  $gravityview->request->is_entry($gravityview->view->form ? $gravityview->view->form->ID : 0) :
+				$tab = __('Single Entry', 'gravityview');
+				$context = 'single';
+				break;
+			default:
+				$tab = __('Multiple Entries', 'gravityview');
+				$context = 'directory';
+				break;
+		}
+
+		$cls = $gravityview->template;
+		$slug = property_exists($cls, '_configuration_slug') ? $cls::$_configuration_slug : $cls::$slug;
+
+		// If the zone has been configured, don't display notice.
+		if ($gravityview->fields->by_position(sprintf('%s_%s-*', $context, $slug))->by_visible($gravityview->view)->count()) {
+			return;
+		}
+
+		$title = sprintf(esc_html_x('The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview'), $tab);
+		$edit_link = admin_url(sprintf('post.php?post=%d&action=edit#%s-view', $gravityview->view->ID, $context));
+		$action_text = sprintf(esc_html__('Add fields to %s', 'gravityview'), $tab);
+		$message = esc_html__('You can only see this message because you are able to edit this View.', 'gravityview');
+
+		$image = sprintf('<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url(plugins_url(sprintf('assets/images/tab-%s.png', $context), GRAVITYVIEW_FILE)));
+		$output = sprintf('<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url($edit_link), $action_text, $message);
+
+		echo \GVCommon::generate_notice($output.$image, 'gv-warning warning', 'edit_gravityview', $gravityview->view->ID);
+	}
+
+	/**
+	 * Print reserved slug warnings, if they exist.
+	 *
+	 * @since 2.9.5
+	 *
+	 * @param Template_Context $gravityview The $gravityview template object.
+	 *
+	 * @return void
+	 */
+	private static function maybe_print_reserved_slugs_notice($gravityview)
+	{
+		global $wp;
+		global $wp_rewrite;
+
+		$reserved_slugs = [
+			$wp_rewrite->search_base,
+			apply_filters('gravityview_directory_endpoint', 'entry'),
+		];
+
+		$post_types = get_post_types();
+
+		foreach ($post_types as $post_type) {
+			$post_type_rewrite = get_post_type_object($post_type)->rewrite;
+
+			if ($slug = \GV\Utils::get($post_type_rewrite, 'slug')) {
+				$reserved_slugs[] = $slug;
+			}
+		}
+
+		unset($post_types, $post_type_rewrite);
+
+		/**
+		 * @filter `gravityview/rewrite/reserved_slugs` Modify the reserved embed slugs that trigger a warning.
+		 *
+		 * @since 2.5
+		 *
+		 * @param array                $reserved_slugs An array of strings, reserved slugs.
+		 * @param \GV\Template_Context $gravityview    The context.
+		 */
+		$reserved_slugs = apply_filters('gravityview/rewrite/reserved_slugs', $reserved_slugs, $gravityview);
+
+		$reserved_slugs = array_map('strtolower', $reserved_slugs);
+
+		if (!in_array(strtolower($wp->request), $reserved_slugs, true)) {
+			return;
+		}
+
+		gravityview()->log->error('{slug} page URL is reserved.', ['slug' => $wp->request]);
+
+		$title = esc_html__('GravityView will not work correctly on this page because of the URL Slug.', 'gravityview');
+		$message = __('Please <a href="%s">read this article</a> for more information.', 'gravityview');
+		$message .= ' '.esc_html__('You can only see this message because you are able to edit this View.', 'gravityview');
+
+		$output = sprintf('<h3>%s</h3><p>%s</p>', $title, sprintf($message, 'https://docs.gravityview.co/article/659-reserved-urls'));
+
+		echo \GVCommon::generate_notice($output, 'gv-error error', 'edit_gravityview', $gravityview->view->ID);
+	}
+
+	/**
+	 * Warn about legacy template being used.
+	 *
+	 * Generate a callback that shows which legacy template was at fault.
+	 * Used in gravityview_before.
+	 *
+	 * @param \GV\View $view The view we're looking at.
+	 * @param string   $path The path of the offending template.
+	 *
+	 * @return \callable A closure used in the filter.
+	 */
+	public function legacy_template_warning($view, $path)
+	{
+		return function () {
+			// Do not panic for now...
+		};
+	}
 }

Spacing +66 added lines, -67 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -19,8 +19,8 @@ 
      */
     public function __construct()
     {
-        if (!has_action('gravityview/template/before', [__CLASS__, 'maybe_print_notices'])) {
-            add_action('gravityview/template/before', [__CLASS__, 'maybe_print_notices']);
+        if ( ! has_action( 'gravityview/template/before', [ __CLASS__, 'maybe_print_notices' ] ) ) {
+            add_action( 'gravityview/template/before', [ __CLASS__, 'maybe_print_notices' ] );
         }
     }
 
@@ -33,20 +33,20 @@ 
      *
      * @return void
      */
-    public static function maybe_print_notices($gravityview = null)
+    public static function maybe_print_notices( $gravityview = null )
     {
-        if (!$gravityview instanceof \GV\Template_Context) {
+        if ( ! $gravityview instanceof \GV\Template_Context ) {
             /** Call the legacy code. */
-            \GravityView_frontend::getInstance()->context_not_configured_warning(gravityview_get_view_id());
+            \GravityView_frontend::getInstance()->context_not_configured_warning( gravityview_get_view_id() );
 
             return;
         }
 
-        self::maybe_print_reserved_slugs_notice($gravityview);
+        self::maybe_print_reserved_slugs_notice( $gravityview );
 
-        self::maybe_print_configuration_notice($gravityview);
+        self::maybe_print_configuration_notice( $gravityview );
 
-        self::maybe_print_entry_approval_notice($gravityview);
+        self::maybe_print_entry_approval_notice( $gravityview );
     }
 
     /**
@@ -58,52 +58,52 @@ 
      *
      * @return void
      */
-    private static function maybe_print_entry_approval_notice($gravityview)
+    private static function maybe_print_entry_approval_notice( $gravityview )
     {
-        if ($gravityview->entries && $gravityview->entries->count()) {
+        if ( $gravityview->entries && $gravityview->entries->count() ) {
             return;
         }
 
-        if ($gravityview->request->is_search()) {
+        if ( $gravityview->request->is_search() ) {
             return;
         }
 
         // "Show Only Approved" is not enabled.
-        if (!$gravityview->view->settings->get('show_only_approved', 0)) {
+        if ( ! $gravityview->view->settings->get( 'show_only_approved', 0 ) ) {
             return;
         }
 
         // If "Show all entries to administrators" is enabled, approval status isn't the issue.
-        if ($gravityview->view->settings->get('admin_show_all_statuses', 0)) {
+        if ( $gravityview->view->settings->get( 'admin_show_all_statuses', 0 ) ) {
             return;
         }
 
         // Don't show when no entries are being displayed due to "Hide View data until search is performed".
-        if ($gravityview->view->settings->get('hide_until_searched', 0)) {
+        if ( $gravityview->view->settings->get( 'hide_until_searched', 0 ) ) {
             return;
         }
 
         $current_user = wp_get_current_user();
-        $user_meta_key = '_gv_dismissed_entry_approval_notice'.$gravityview->view->ID;
+        $user_meta_key = '_gv_dismissed_entry_approval_notice' . $gravityview->view->ID;
 
-        if (isset($_GET['gv-dismiss']) && wp_verify_nonce($_GET['gv-dismiss'], 'dismiss')) {
-            add_user_meta($current_user->ID, $user_meta_key, 1); // Prevent user from seeing this again for this View
+        if ( isset( $_GET[ 'gv-dismiss' ] ) && wp_verify_nonce( $_GET[ 'gv-dismiss' ], 'dismiss' ) ) {
+            add_user_meta( $current_user->ID, $user_meta_key, 1 ); // Prevent user from seeing this again for this View
 
             return;
         }
 
         // The user has already dismissed the notice
-        if (get_user_meta($current_user->ID, $user_meta_key, true)) {
+        if ( get_user_meta( $current_user->ID, $user_meta_key, true ) ) {
             return;
         }
 
         $form = $gravityview->view->form;
 
-        if (!$form) {
+        if ( ! $form ) {
             return;
         }
 
-        $count = \GFAPI::count_entries($gravityview->view->form->ID, [
+        $count = \GFAPI::count_entries( $gravityview->view->form->ID, [
             'status'        => 'active',
             'field_filters' => [
                 [
@@ -112,37 +112,37 @@ 
                     'value'    => \GravityView_Entry_Approval_Status::APPROVED,
                 ],
             ],
-        ]);
+        ] );
 
         // There aren't any entries to show!
-        if (empty($count)) {
+        if ( empty( $count ) ) {
             return;
         }
 
         $notice_title = _n(
-            esc_html__('There is an unapproved entry that is not being shown.', 'gravityview'),
-            esc_html__('There are %s unapproved entries that are not being shown.', 'gravityview'),
+            esc_html__( 'There is an unapproved entry that is not being shown.', 'gravityview' ),
+            esc_html__( 'There are %s unapproved entries that are not being shown.', 'gravityview' ),
             $count
         );
 
         $float_dir = is_rtl() ? 'left' : 'right';
-        $hide_link = sprintf('<a href="%s" style="float: '.$float_dir.'; font-size: 1rem" role="button">%s</a>', esc_url(wp_nonce_url(add_query_arg(['notice' => 'no_entries_'.$gravityview->view->ID]), 'dismiss', 'gv-dismiss')), esc_html__('Hide this notice', 'gravityview'));
+        $hide_link = sprintf( '<a href="%s" style="float: ' . $float_dir . '; font-size: 1rem" role="button">%s</a>', esc_url( wp_nonce_url( add_query_arg( [ 'notice' => 'no_entries_' . $gravityview->view->ID ] ), 'dismiss', 'gv-dismiss' ) ), esc_html__( 'Hide this notice', 'gravityview' ) );
 
         $message_strings = [
-            '<h3>'.sprintf($notice_title, number_format_i18n($count)).$hide_link.'</h3>',
-            esc_html__('The "Show only approved entries" setting is enabled, so only entries that have been approved are displayed.', 'gravityview'),
-            sprintf('<a href="%s">%s</a>', 'https://docs.gravityview.co/article/490-entry-approval-gravity-forms', esc_html__('Learn about entry approval.', 'gravityview')),
+            '<h3>' . sprintf( $notice_title, number_format_i18n( $count ) ) . $hide_link . '</h3>',
+            esc_html__( 'The "Show only approved entries" setting is enabled, so only entries that have been approved are displayed.', 'gravityview' ),
+            sprintf( '<a href="%s">%s</a>', 'https://docs.gravityview.co/article/490-entry-approval-gravity-forms', esc_html__( 'Learn about entry approval.', 'gravityview' ) ),
             "\n\n",
-            sprintf(esc_html_x('%sEdit the View settings%s or %sApprove entries%s', 'Replacements are HTML links', 'gravityview'), '<a href="'.esc_url(get_edit_post_link($gravityview->view->ID, false)).'" style="font-weight: bold;">', '</a>', '<a href="'.esc_url(admin_url('admin.php?page=gf_entries&id='.$gravityview->view->form->ID)).'" style="font-weight: bold;">', '</a>'),
+            sprintf( esc_html_x( '%sEdit the View settings%s or %sApprove entries%s', 'Replacements are HTML links', 'gravityview' ), '<a href="' . esc_url( get_edit_post_link( $gravityview->view->ID, false ) ) . '" style="font-weight: bold;">', '</a>', '<a href="' . esc_url( admin_url( 'admin.php?page=gf_entries&id=' . $gravityview->view->form->ID ) ) . '" style="font-weight: bold;">', '</a>' ),
             "\n\n",
-            sprintf('<img alt="%s" src="%s" style="padding: 10px 0; max-width: 550px;" />', esc_html__('Show only approved entries', 'gravityview'), esc_url(plugins_url('assets/images/screenshots/entry-approval.png', GRAVITYVIEW_FILE))),
+            sprintf( '<img alt="%s" src="%s" style="padding: 10px 0; max-width: 550px;" />', esc_html__( 'Show only approved entries', 'gravityview' ), esc_url( plugins_url( 'assets/images/screenshots/entry-approval.png', GRAVITYVIEW_FILE ) ) ),
             "\n\n",
-            esc_html__('You can only see this message because you are able to edit this View.', 'gravityview'),
+            esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' ),
         ];
 
-        $notice = wpautop(implode(' ', $message_strings));
+        $notice = wpautop( implode( ' ', $message_strings ) );
 
-        echo \GVCommon::generate_notice($notice, 'warning', 'edit_gravityview', $gravityview->view->ID);
+        echo \GVCommon::generate_notice( $notice, 'warning', 'edit_gravityview', $gravityview->view->ID );
     }
 
     /**
@@ -154,40 +154,39 @@ 
      *
      * @return void
      */
-    private static function maybe_print_configuration_notice($gravityview)
+    private static function maybe_print_configuration_notice( $gravityview )
     {
-        switch (true) {
+        switch ( true ) {
             case  $gravityview->request->is_edit_entry() :
-                $tab = __('Edit Entry', 'gravityview');
+                $tab = __( 'Edit Entry', 'gravityview' );
                 $context = 'edit';
                 break;
-            case  $gravityview->request->is_entry($gravityview->view->form ? $gravityview->view->form->ID : 0) :
-                $tab = __('Single Entry', 'gravityview');
+            case  $gravityview->request->is_entry( $gravityview->view->form ? $gravityview->view->form->ID : 0 ) : $tab = __( 'Single Entry', 'gravityview' );
                 $context = 'single';
                 break;
             default:
-                $tab = __('Multiple Entries', 'gravityview');
+                $tab = __( 'Multiple Entries', 'gravityview' );
                 $context = 'directory';
                 break;
         }
 
         $cls = $gravityview->template;
-        $slug = property_exists($cls, '_configuration_slug') ? $cls::$_configuration_slug : $cls::$slug;
+        $slug = property_exists( $cls, '_configuration_slug' ) ? $cls::$_configuration_slug : $cls::$slug;
 
         // If the zone has been configured, don't display notice.
-        if ($gravityview->fields->by_position(sprintf('%s_%s-*', $context, $slug))->by_visible($gravityview->view)->count()) {
+        if ( $gravityview->fields->by_position( sprintf( '%s_%s-*', $context, $slug ) )->by_visible( $gravityview->view )->count() ) {
             return;
         }
 
-        $title = sprintf(esc_html_x('The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview'), $tab);
-        $edit_link = admin_url(sprintf('post.php?post=%d&action=edit#%s-view', $gravityview->view->ID, $context));
-        $action_text = sprintf(esc_html__('Add fields to %s', 'gravityview'), $tab);
-        $message = esc_html__('You can only see this message because you are able to edit this View.', 'gravityview');
+        $title = sprintf( esc_html_x( 'The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview' ), $tab );
+        $edit_link = admin_url( sprintf( 'post.php?post=%d&action=edit#%s-view', $gravityview->view->ID, $context ) );
+        $action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab );
+        $message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' );
 
-        $image = sprintf('<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url(plugins_url(sprintf('assets/images/tab-%s.png', $context), GRAVITYVIEW_FILE)));
-        $output = sprintf('<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url($edit_link), $action_text, $message);
+        $image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
+        $output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message );
 
-        echo \GVCommon::generate_notice($output.$image, 'gv-warning warning', 'edit_gravityview', $gravityview->view->ID);
+        echo \GVCommon::generate_notice( $output . $image, 'gv-warning warning', 'edit_gravityview', $gravityview->view->ID );
     }
 
     /**
@@ -199,27 +198,27 @@ 
      *
      * @return void
      */
-    private static function maybe_print_reserved_slugs_notice($gravityview)
+    private static function maybe_print_reserved_slugs_notice( $gravityview )
     {
         global $wp;
         global $wp_rewrite;
 
         $reserved_slugs = [
             $wp_rewrite->search_base,
-            apply_filters('gravityview_directory_endpoint', 'entry'),
+            apply_filters( 'gravityview_directory_endpoint', 'entry' ),
         ];
 
         $post_types = get_post_types();
 
-        foreach ($post_types as $post_type) {
-            $post_type_rewrite = get_post_type_object($post_type)->rewrite;
+        foreach ( $post_types as $post_type ) {
+            $post_type_rewrite = get_post_type_object( $post_type )->rewrite;
 
-            if ($slug = \GV\Utils::get($post_type_rewrite, 'slug')) {
-                $reserved_slugs[] = $slug;
+            if ( $slug = \GV\Utils::get( $post_type_rewrite, 'slug' ) ) {
+                $reserved_slugs[ ] = $slug;
             }
         }
 
-        unset($post_types, $post_type_rewrite);
+        unset( $post_types, $post_type_rewrite );
 
         /**
          * @filter `gravityview/rewrite/reserved_slugs` Modify the reserved embed slugs that trigger a warning.
@@ -229,23 +228,23 @@ 
          * @param array                $reserved_slugs An array of strings, reserved slugs.
          * @param \GV\Template_Context $gravityview    The context.
          */
-        $reserved_slugs = apply_filters('gravityview/rewrite/reserved_slugs', $reserved_slugs, $gravityview);
+        $reserved_slugs = apply_filters( 'gravityview/rewrite/reserved_slugs', $reserved_slugs, $gravityview );
 
-        $reserved_slugs = array_map('strtolower', $reserved_slugs);
+        $reserved_slugs = array_map( 'strtolower', $reserved_slugs );
 
-        if (!in_array(strtolower($wp->request), $reserved_slugs, true)) {
+        if ( ! in_array( strtolower( $wp->request ), $reserved_slugs, true ) ) {
             return;
         }
 
-        gravityview()->log->error('{slug} page URL is reserved.', ['slug' => $wp->request]);
+        gravityview()->log->error( '{slug} page URL is reserved.', [ 'slug' => $wp->request ] );
 
-        $title = esc_html__('GravityView will not work correctly on this page because of the URL Slug.', 'gravityview');
-        $message = __('Please <a href="%s">read this article</a> for more information.', 'gravityview');
-        $message .= ' '.esc_html__('You can only see this message because you are able to edit this View.', 'gravityview');
+        $title = esc_html__( 'GravityView will not work correctly on this page because of the URL Slug.', 'gravityview' );
+        $message = __( 'Please <a href="%s">read this article</a> for more information.', 'gravityview' );
+        $message .= ' ' . esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' );
 
-        $output = sprintf('<h3>%s</h3><p>%s</p>', $title, sprintf($message, 'https://docs.gravityview.co/article/659-reserved-urls'));
+        $output = sprintf( '<h3>%s</h3><p>%s</p>', $title, sprintf( $message, 'https://docs.gravityview.co/article/659-reserved-urls' ) );
 
-        echo \GVCommon::generate_notice($output, 'gv-error error', 'edit_gravityview', $gravityview->view->ID);
+        echo \GVCommon::generate_notice( $output, 'gv-error error', 'edit_gravityview', $gravityview->view->ID );
     }
 
     /**
@@ -259,9 +258,9 @@ 
      *
      * @return \callable A closure used in the filter.
      */
-    public function legacy_template_warning($view, $path)
+    public function legacy_template_warning( $view, $path )
     {
-        return function () {
+        return function() {
             // Do not panic for now...
         };
     }

Braces +7 added lines, -14 removed lines

@@ -12,13 +12,11 @@ 
  *
  * The base for all renderers.
  */
-class Renderer
-{
+class Renderer {
     /**
      * Initialization.
      */
-    public function __construct()
-    {
+    public function __construct() {
         if (!has_action('gravityview/template/before', [__CLASS__, 'maybe_print_notices'])) {
             add_action('gravityview/template/before', [__CLASS__, 'maybe_print_notices']);
         }
@@ -33,8 +31,7 @@ 
      *
      * @return void
      */
-    public static function maybe_print_notices($gravityview = null)
-    {
+    public static function maybe_print_notices($gravityview = null) {
         if (!$gravityview instanceof \GV\Template_Context) {
             /** Call the legacy code. */
             \GravityView_frontend::getInstance()->context_not_configured_warning(gravityview_get_view_id());
@@ -58,8 +55,7 @@ 
      *
      * @return void
      */
-    private static function maybe_print_entry_approval_notice($gravityview)
-    {
+    private static function maybe_print_entry_approval_notice($gravityview) {
         if ($gravityview->entries && $gravityview->entries->count()) {
             return;
         }
@@ -154,8 +150,7 @@ 
      *
      * @return void
      */
-    private static function maybe_print_configuration_notice($gravityview)
-    {
+    private static function maybe_print_configuration_notice($gravityview) {
         switch (true) {
             case  $gravityview->request->is_edit_entry() :
                 $tab = __('Edit Entry', 'gravityview');
@@ -199,8 +194,7 @@ 
      *
      * @return void
      */
-    private static function maybe_print_reserved_slugs_notice($gravityview)
-    {
+    private static function maybe_print_reserved_slugs_notice($gravityview) {
         global $wp;
         global $wp_rewrite;
 
@@ -259,8 +253,7 @@ 
      *
      * @return \callable A closure used in the filter.
      */
-    public function legacy_template_warning($view, $path)
-    {
+    public function legacy_template_warning($view, $path) {
         return function () {
             // Do not panic for now...
         };

future/includes/class-gv-entry.php

Indentation +267 added lines, -267 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -14,270 +14,270 @@ 
  */
 abstract class Entry
 {
-    /**
-     * @var string The identifier of the backend used for this entry.
-     *
-     * @api
-     *
-     * @since 2.0
-     */
-    public static $backend = null;
-
-    /**
-     * @var int The ID for this entry.
-     *
-     * @api
-     *
-     * @since 2.0
-     */
-    public $ID = null;
-
-    /**
-     * @var mixed The backing entry.
-     */
-    protected $entry;
-
-    /**
-     * Adds the necessary rewrites for single Entries.
-     *
-     * @internal
-     *
-     * @return void
-     */
-    public static function add_rewrite_endpoint()
-    {
-        global $wp_rewrite;
-
-        $endpoint = self::get_endpoint_name();
-
-        /** Let's make sure the endpoint array is not polluted. */
-        if (in_array([EP_PERMALINK | EP_PERMALINK | EP_ROOT, $endpoint, $endpoint], $wp_rewrite->endpoints)) {
-            return;
-        }
-
-        add_rewrite_endpoint($endpoint, EP_PAGES | EP_PERMALINK | EP_ROOT);
-    }
-
-    /**
-     * Return the endpoint name for a single Entry.
-     *
-     * Also used as the query_var for the time being.
-     *
-     * @internal
-     *
-     * @return string The name. Default: "entry"
-     */
-    public static function get_endpoint_name()
-    {
-        /**
-         * @filter `gravityview_directory_endpoint` Change the slug used for single entries
-         *
-         * @param string $endpoint Slug to use when accessing single entry. Default: `entry`
-         */
-        $endpoint = apply_filters('gravityview_directory_endpoint', 'entry');
-
-        return sanitize_title($endpoint);
-    }
-
-    /**
-     * Construct a \GV\Entry instance by ID.
-     *
-     * @param int|string $entry_id The internal entry ID.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return \GV\Entry|null An instance of this entry or null if not found.
-     */
-    public static function by_id($entry_id)
-    {
-        return null;
-    }
-
-    /**
-     * Return the backing entry object.
-     *
-     * @return array The backing entry object.
-     */
-    public function as_entry()
-    {
-        return $this->entry;
-    }
-
-    /**
-     * Return the link to this entry in the supplied context.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @param \GV\View|null $view            The View context.
-     * @param \GV\Request   $request         The Request (current if null).
-     * @param bool          $track_directory Keep the housing directory arguments intact (used for breadcrumbs, for example). Default: true.
-     *
-     * @return string The permalink to this entry.
-     */
-    public function get_permalink(\GV\View $view = null, \GV\Request $request = null, $track_directory = true)
-    {
-        if (is_null($request)) {
-            $request = &gravityview()->request;
-        }
-
-        global $post;
-
-        $args = [];
-
-        $view_id = is_null($view) ? null : $view->ID;
-
-        $permalink = null;
-
-        /** This is not a regular view. */
-        if (!$request->is_view()) {
-
-            /** Must be an embed of some sort. */
-            if (is_object($post) && is_numeric($post->ID)) {
-                $permalink = get_permalink($post->ID);
-
-                $view_collection = View_Collection::from_post($post);
-
-                if (1 < $view_collection->count()) {
-                    $args['gvid'] = $view_id;
-                }
-            }
-        }
-
-        /** Fallback to regular view base. */
-        if (is_null($permalink)) {
-            $permalink = get_permalink($view_id);
-        }
-
-        /**
-         * @filter `gravityview_directory_link` Modify the URL to the View "directory" context
-         *
-         * @since 1.19.4
-         *
-         * @param string $link    URL to the View's "directory" context (Multiple Entries screen)
-         * @param int    $post_id ID of the post to link to. If the View is embedded, it is the post or page ID
-         */
-        $permalink = apply_filters('gravityview_directory_link', $permalink, $request->is_view() ? $view_id : ($post ? $post->ID : null));
-
-        $entry_endpoint_name = \GV\Entry::get_endpoint_name();
-
-        $entry_slug = $this->get_slug(true, $view, $request, $track_directory);
-
-        /** Assemble the permalink. */
-        if (get_option('permalink_structure') && !is_preview()) {
-            /**
-             * Make sure the $directory_link doesn't contain any query otherwise it will break when adding the entry slug.
-             *
-             * @since 1.16.5
-             */
-            $link_parts = explode('?', $permalink);
-
-            $query = !empty($link_parts[1]) ? '?'.$link_parts[1] : '';
-
-            $permalink = trailingslashit($link_parts[0]).$entry_endpoint_name.'/'.$entry_slug.'/'.$query;
-        } else {
-            $args[$entry_endpoint_name] = $entry_slug;
-        }
-
-        if ($track_directory) {
-            if (!empty($_GET['pagenum'])) {
-                $args['pagenum'] = intval($_GET['pagenum']);
-            }
-
-            if ($sort = Utils::_GET('sort')) {
-                $args['sort'] = $sort;
-                $args['dir'] = Utils::_GET('dir');
-            }
-        }
-
-        $permalink = add_query_arg($args, $permalink);
-
-        /**
-         * @filter `gravityview/entry/permalink` The permalink of this entry.
-         *
-         * @since 2.0
-         *
-         * @param string        $permalink The permalink.
-         * @param \GV\Entry     $entry     The entry we're retrieving it for.
-         * @param \GV\View|null $view      The view context.
-         * @param \GV\Request   $request   The request context.
-         */
-        return apply_filters('gravityview/entry/permalink', $permalink, $this, $view, $request);
-    }
-
-    /**
-     * Get the entry slug.
-     *
-     * @internal (for now!)
-     *
-     * @todo Should $apply_filter be default true or false? Unit tests pass either way...
-     *
-     * @since 2.7
-     *
-     * @uses \GravityView_API::get_entry_slug
-     *
-     * @param bool          $apply_filter    Whether to apply the `gravityview/entry/slug` filter. Default: false.
-     * @param \GV\View|null $view            The View context.
-     * @param \GV\Request   $request         The Request (current if null).
-     * @param bool          $track_directory Keep the housing directory arguments intact (used for breadcrumbs, for example). Default: true.
-     *
-     * @return string Unique slug ID, passed through `sanitize_title()`, with `gravityview/entry/slug` filter applied
-     */
-    public function get_slug($apply_filter = false, \GV\View $view = null, \GV\Request $request = null, $track_directory = true)
-    {
-        $entry_slug = \GravityView_API::get_entry_slug($this->ID, $this->as_entry());
-
-        if (!$apply_filter) {
-            return $entry_slug;
-        }
-
-        /**
-         * @filter `gravityview/entry/slug` Modify the entry URL slug as needed.
-         *
-         * @since 2.2.1
-         *
-         * @param string           $entry_slug      The slug, sanitized with sanitize_title()
-         * @param null|\GV\Entry   $this            The entry object.
-         * @param null|\GV\View    $view            The view object.
-         * @param null|\GV\Request $request         The request.
-         * @param bool             $track_directory Whether the directory is tracked.
-         */
-        $entry_slug = apply_filters('gravityview/entry/slug', $entry_slug, $this, $view, $request, $track_directory);
-
-        return $entry_slug;
-    }
-
-    /**
-     * Is this a multi-entry (joined entry).
-     *
-     * @since 2.2
-     *
-     * @return bool
-     */
-    public function is_multi()
-    {
-        return $this instanceof Multi_Entry;
-    }
-
-    /**
-     * If this is a Multi_Entry filter it by Field.
-     *
-     * @since 2.2
-     *
-     * @param \GV\Field $field    The field to filter by.
-     * @param int       $fallback A fallback form_id if the field supplied is invalid.
-     *
-     * @return \GV\Entry|null A \GV\Entry or null if not found.
-     */
-    public function from_field($field, $fallback = null)
-    {
-        if (!$this->is_multi()) {
-            return $this;
-        }
-
-        return Utils::get($this, $field->form_id, $fallback);
-    }
+	/**
+	 * @var string The identifier of the backend used for this entry.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 */
+	public static $backend = null;
+
+	/**
+	 * @var int The ID for this entry.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 */
+	public $ID = null;
+
+	/**
+	 * @var mixed The backing entry.
+	 */
+	protected $entry;
+
+	/**
+	 * Adds the necessary rewrites for single Entries.
+	 *
+	 * @internal
+	 *
+	 * @return void
+	 */
+	public static function add_rewrite_endpoint()
+	{
+		global $wp_rewrite;
+
+		$endpoint = self::get_endpoint_name();
+
+		/** Let's make sure the endpoint array is not polluted. */
+		if (in_array([EP_PERMALINK | EP_PERMALINK | EP_ROOT, $endpoint, $endpoint], $wp_rewrite->endpoints)) {
+			return;
+		}
+
+		add_rewrite_endpoint($endpoint, EP_PAGES | EP_PERMALINK | EP_ROOT);
+	}
+
+	/**
+	 * Return the endpoint name for a single Entry.
+	 *
+	 * Also used as the query_var for the time being.
+	 *
+	 * @internal
+	 *
+	 * @return string The name. Default: "entry"
+	 */
+	public static function get_endpoint_name()
+	{
+		/**
+		 * @filter `gravityview_directory_endpoint` Change the slug used for single entries
+		 *
+		 * @param string $endpoint Slug to use when accessing single entry. Default: `entry`
+		 */
+		$endpoint = apply_filters('gravityview_directory_endpoint', 'entry');
+
+		return sanitize_title($endpoint);
+	}
+
+	/**
+	 * Construct a \GV\Entry instance by ID.
+	 *
+	 * @param int|string $entry_id The internal entry ID.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return \GV\Entry|null An instance of this entry or null if not found.
+	 */
+	public static function by_id($entry_id)
+	{
+		return null;
+	}
+
+	/**
+	 * Return the backing entry object.
+	 *
+	 * @return array The backing entry object.
+	 */
+	public function as_entry()
+	{
+		return $this->entry;
+	}
+
+	/**
+	 * Return the link to this entry in the supplied context.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @param \GV\View|null $view            The View context.
+	 * @param \GV\Request   $request         The Request (current if null).
+	 * @param bool          $track_directory Keep the housing directory arguments intact (used for breadcrumbs, for example). Default: true.
+	 *
+	 * @return string The permalink to this entry.
+	 */
+	public function get_permalink(\GV\View $view = null, \GV\Request $request = null, $track_directory = true)
+	{
+		if (is_null($request)) {
+			$request = &gravityview()->request;
+		}
+
+		global $post;
+
+		$args = [];
+
+		$view_id = is_null($view) ? null : $view->ID;
+
+		$permalink = null;
+
+		/** This is not a regular view. */
+		if (!$request->is_view()) {
+
+			/** Must be an embed of some sort. */
+			if (is_object($post) && is_numeric($post->ID)) {
+				$permalink = get_permalink($post->ID);
+
+				$view_collection = View_Collection::from_post($post);
+
+				if (1 < $view_collection->count()) {
+					$args['gvid'] = $view_id;
+				}
+			}
+		}
+
+		/** Fallback to regular view base. */
+		if (is_null($permalink)) {
+			$permalink = get_permalink($view_id);
+		}
+
+		/**
+		 * @filter `gravityview_directory_link` Modify the URL to the View "directory" context
+		 *
+		 * @since 1.19.4
+		 *
+		 * @param string $link    URL to the View's "directory" context (Multiple Entries screen)
+		 * @param int    $post_id ID of the post to link to. If the View is embedded, it is the post or page ID
+		 */
+		$permalink = apply_filters('gravityview_directory_link', $permalink, $request->is_view() ? $view_id : ($post ? $post->ID : null));
+
+		$entry_endpoint_name = \GV\Entry::get_endpoint_name();
+
+		$entry_slug = $this->get_slug(true, $view, $request, $track_directory);
+
+		/** Assemble the permalink. */
+		if (get_option('permalink_structure') && !is_preview()) {
+			/**
+			 * Make sure the $directory_link doesn't contain any query otherwise it will break when adding the entry slug.
+			 *
+			 * @since 1.16.5
+			 */
+			$link_parts = explode('?', $permalink);
+
+			$query = !empty($link_parts[1]) ? '?'.$link_parts[1] : '';
+
+			$permalink = trailingslashit($link_parts[0]).$entry_endpoint_name.'/'.$entry_slug.'/'.$query;
+		} else {
+			$args[$entry_endpoint_name] = $entry_slug;
+		}
+
+		if ($track_directory) {
+			if (!empty($_GET['pagenum'])) {
+				$args['pagenum'] = intval($_GET['pagenum']);
+			}
+
+			if ($sort = Utils::_GET('sort')) {
+				$args['sort'] = $sort;
+				$args['dir'] = Utils::_GET('dir');
+			}
+		}
+
+		$permalink = add_query_arg($args, $permalink);
+
+		/**
+		 * @filter `gravityview/entry/permalink` The permalink of this entry.
+		 *
+		 * @since 2.0
+		 *
+		 * @param string        $permalink The permalink.
+		 * @param \GV\Entry     $entry     The entry we're retrieving it for.
+		 * @param \GV\View|null $view      The view context.
+		 * @param \GV\Request   $request   The request context.
+		 */
+		return apply_filters('gravityview/entry/permalink', $permalink, $this, $view, $request);
+	}
+
+	/**
+	 * Get the entry slug.
+	 *
+	 * @internal (for now!)
+	 *
+	 * @todo Should $apply_filter be default true or false? Unit tests pass either way...
+	 *
+	 * @since 2.7
+	 *
+	 * @uses \GravityView_API::get_entry_slug
+	 *
+	 * @param bool          $apply_filter    Whether to apply the `gravityview/entry/slug` filter. Default: false.
+	 * @param \GV\View|null $view            The View context.
+	 * @param \GV\Request   $request         The Request (current if null).
+	 * @param bool          $track_directory Keep the housing directory arguments intact (used for breadcrumbs, for example). Default: true.
+	 *
+	 * @return string Unique slug ID, passed through `sanitize_title()`, with `gravityview/entry/slug` filter applied
+	 */
+	public function get_slug($apply_filter = false, \GV\View $view = null, \GV\Request $request = null, $track_directory = true)
+	{
+		$entry_slug = \GravityView_API::get_entry_slug($this->ID, $this->as_entry());
+
+		if (!$apply_filter) {
+			return $entry_slug;
+		}
+
+		/**
+		 * @filter `gravityview/entry/slug` Modify the entry URL slug as needed.
+		 *
+		 * @since 2.2.1
+		 *
+		 * @param string           $entry_slug      The slug, sanitized with sanitize_title()
+		 * @param null|\GV\Entry   $this            The entry object.
+		 * @param null|\GV\View    $view            The view object.
+		 * @param null|\GV\Request $request         The request.
+		 * @param bool             $track_directory Whether the directory is tracked.
+		 */
+		$entry_slug = apply_filters('gravityview/entry/slug', $entry_slug, $this, $view, $request, $track_directory);
+
+		return $entry_slug;
+	}
+
+	/**
+	 * Is this a multi-entry (joined entry).
+	 *
+	 * @since 2.2
+	 *
+	 * @return bool
+	 */
+	public function is_multi()
+	{
+		return $this instanceof Multi_Entry;
+	}
+
+	/**
+	 * If this is a Multi_Entry filter it by Field.
+	 *
+	 * @since 2.2
+	 *
+	 * @param \GV\Field $field    The field to filter by.
+	 * @param int       $fallback A fallback form_id if the field supplied is invalid.
+	 *
+	 * @return \GV\Entry|null A \GV\Entry or null if not found.
+	 */
+	public function from_field($field, $fallback = null)
+	{
+		if (!$this->is_multi()) {
+			return $this;
+		}
+
+		return Utils::get($this, $field->form_id, $fallback);
+	}
 }

Spacing +40 added lines, -40 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -51,11 +51,11 @@ 
         $endpoint = self::get_endpoint_name();
 
         /** Let's make sure the endpoint array is not polluted. */
-        if (in_array([EP_PERMALINK | EP_PERMALINK | EP_ROOT, $endpoint, $endpoint], $wp_rewrite->endpoints)) {
+        if ( in_array( [ EP_PERMALINK | EP_PERMALINK | EP_ROOT, $endpoint, $endpoint ], $wp_rewrite->endpoints ) ) {
             return;
         }
 
-        add_rewrite_endpoint($endpoint, EP_PAGES | EP_PERMALINK | EP_ROOT);
+        add_rewrite_endpoint( $endpoint, EP_PAGES | EP_PERMALINK | EP_ROOT );
     }
 
     /**
@@ -74,9 +74,9 @@ 
          *
          * @param string $endpoint Slug to use when accessing single entry. Default: `entry`
          */
-        $endpoint = apply_filters('gravityview_directory_endpoint', 'entry');
+        $endpoint = apply_filters( 'gravityview_directory_endpoint', 'entry' );
 
-        return sanitize_title($endpoint);
+        return sanitize_title( $endpoint );
     }
 
     /**
@@ -90,7 +90,7 @@ 
      *
      * @return \GV\Entry|null An instance of this entry or null if not found.
      */
-    public static function by_id($entry_id)
+    public static function by_id( $entry_id )
     {
         return null;
     }
@@ -118,38 +118,38 @@ 
      *
      * @return string The permalink to this entry.
      */
-    public function get_permalink(\GV\View $view = null, \GV\Request $request = null, $track_directory = true)
+    public function get_permalink( \GV\View $view = null, \GV\Request $request = null, $track_directory = true )
     {
-        if (is_null($request)) {
+        if ( is_null( $request ) ) {
             $request = &gravityview()->request;
         }
 
         global $post;
 
-        $args = [];
+        $args = [ ];
 
-        $view_id = is_null($view) ? null : $view->ID;
+        $view_id = is_null( $view ) ? null : $view->ID;
 
         $permalink = null;
 
         /** This is not a regular view. */
-        if (!$request->is_view()) {
+        if ( ! $request->is_view() ) {
 
             /** Must be an embed of some sort. */
-            if (is_object($post) && is_numeric($post->ID)) {
-                $permalink = get_permalink($post->ID);
+            if ( is_object( $post ) && is_numeric( $post->ID ) ) {
+                $permalink = get_permalink( $post->ID );
 
-                $view_collection = View_Collection::from_post($post);
+                $view_collection = View_Collection::from_post( $post );
 
-                if (1 < $view_collection->count()) {
-                    $args['gvid'] = $view_id;
+                if ( 1 < $view_collection->count() ) {
+                    $args[ 'gvid' ] = $view_id;
                 }
             }
         }
 
         /** Fallback to regular view base. */
-        if (is_null($permalink)) {
-            $permalink = get_permalink($view_id);
+        if ( is_null( $permalink ) ) {
+            $permalink = get_permalink( $view_id );
         }
 
         /**
@@ -160,40 +160,40 @@ 
          * @param string $link    URL to the View's "directory" context (Multiple Entries screen)
          * @param int    $post_id ID of the post to link to. If the View is embedded, it is the post or page ID
          */
-        $permalink = apply_filters('gravityview_directory_link', $permalink, $request->is_view() ? $view_id : ($post ? $post->ID : null));
+        $permalink = apply_filters( 'gravityview_directory_link', $permalink, $request->is_view() ? $view_id : ( $post ? $post->ID : null ) );
 
         $entry_endpoint_name = \GV\Entry::get_endpoint_name();
 
-        $entry_slug = $this->get_slug(true, $view, $request, $track_directory);
+        $entry_slug = $this->get_slug( true, $view, $request, $track_directory );
 
         /** Assemble the permalink. */
-        if (get_option('permalink_structure') && !is_preview()) {
+        if ( get_option( 'permalink_structure' ) && ! is_preview() ) {
             /**
              * Make sure the $directory_link doesn't contain any query otherwise it will break when adding the entry slug.
              *
              * @since 1.16.5
              */
-            $link_parts = explode('?', $permalink);
+            $link_parts = explode( '?', $permalink );
 
-            $query = !empty($link_parts[1]) ? '?'.$link_parts[1] : '';
+            $query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
 
-            $permalink = trailingslashit($link_parts[0]).$entry_endpoint_name.'/'.$entry_slug.'/'.$query;
+            $permalink = trailingslashit( $link_parts[ 0 ] ) . $entry_endpoint_name . '/' . $entry_slug . '/' . $query;
         } else {
-            $args[$entry_endpoint_name] = $entry_slug;
+            $args[ $entry_endpoint_name ] = $entry_slug;
         }
 
-        if ($track_directory) {
-            if (!empty($_GET['pagenum'])) {
-                $args['pagenum'] = intval($_GET['pagenum']);
+        if ( $track_directory ) {
+            if ( ! empty( $_GET[ 'pagenum' ] ) ) {
+                $args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
             }
 
-            if ($sort = Utils::_GET('sort')) {
-                $args['sort'] = $sort;
-                $args['dir'] = Utils::_GET('dir');
+            if ( $sort = Utils::_GET( 'sort' ) ) {
+                $args[ 'sort' ] = $sort;
+                $args[ 'dir' ] = Utils::_GET( 'dir' );
             }
         }
 
-        $permalink = add_query_arg($args, $permalink);
+        $permalink = add_query_arg( $args, $permalink );
 
         /**
          * @filter `gravityview/entry/permalink` The permalink of this entry.
@@ -205,7 +205,7 @@ 
          * @param \GV\View|null $view      The view context.
          * @param \GV\Request   $request   The request context.
          */
-        return apply_filters('gravityview/entry/permalink', $permalink, $this, $view, $request);
+        return apply_filters( 'gravityview/entry/permalink', $permalink, $this, $view, $request );
     }
 
     /**
@@ -226,11 +226,11 @@ 
      *
      * @return string Unique slug ID, passed through `sanitize_title()`, with `gravityview/entry/slug` filter applied
      */
-    public function get_slug($apply_filter = false, \GV\View $view = null, \GV\Request $request = null, $track_directory = true)
+    public function get_slug( $apply_filter = false, \GV\View $view = null, \GV\Request $request = null, $track_directory = true )
     {
-        $entry_slug = \GravityView_API::get_entry_slug($this->ID, $this->as_entry());
+        $entry_slug = \GravityView_API::get_entry_slug( $this->ID, $this->as_entry() );
 
-        if (!$apply_filter) {
+        if ( ! $apply_filter ) {
             return $entry_slug;
         }
 
@@ -245,7 +245,7 @@ 
          * @param null|\GV\Request $request         The request.
          * @param bool             $track_directory Whether the directory is tracked.
          */
-        $entry_slug = apply_filters('gravityview/entry/slug', $entry_slug, $this, $view, $request, $track_directory);
+        $entry_slug = apply_filters( 'gravityview/entry/slug', $entry_slug, $this, $view, $request, $track_directory );
 
         return $entry_slug;
     }
@@ -272,12 +272,12 @@ 
      *
      * @return \GV\Entry|null A \GV\Entry or null if not found.
      */
-    public function from_field($field, $fallback = null)
+    public function from_field( $field, $fallback = null )
     {
-        if (!$this->is_multi()) {
+        if ( ! $this->is_multi() ) {
             return $this;
         }
 
-        return Utils::get($this, $field->form_id, $fallback);
+        return Utils::get( $this, $field->form_id, $fallback );
     }
 }

Braces +9 added lines, -18 removed lines

@@ -12,8 +12,7 @@ 
  *
  * Contains all entry data and some processing and logic rules.
  */
-abstract class Entry
-{
+abstract class Entry {
     /**
      * @var string The identifier of the backend used for this entry.
      *
@@ -44,8 +43,7 @@ 
      *
      * @return void
      */
-    public static function add_rewrite_endpoint()
-    {
+    public static function add_rewrite_endpoint() {
         global $wp_rewrite;
 
         $endpoint = self::get_endpoint_name();
@@ -67,8 +65,7 @@ 
      *
      * @return string The name. Default: "entry"
      */
-    public static function get_endpoint_name()
-    {
+    public static function get_endpoint_name() {
         /**
          * @filter `gravityview_directory_endpoint` Change the slug used for single entries
          *
@@ -90,8 +87,7 @@ 
      *
      * @return \GV\Entry|null An instance of this entry or null if not found.
      */
-    public static function by_id($entry_id)
-    {
+    public static function by_id($entry_id) {
         return null;
     }
 
@@ -100,8 +96,7 @@ 
      *
      * @return array The backing entry object.
      */
-    public function as_entry()
-    {
+    public function as_entry() {
         return $this->entry;
     }
 
@@ -118,8 +113,7 @@ 
      *
      * @return string The permalink to this entry.
      */
-    public function get_permalink(\GV\View $view = null, \GV\Request $request = null, $track_directory = true)
-    {
+    public function get_permalink(\GV\View $view = null, \GV\Request $request = null, $track_directory = true) {
         if (is_null($request)) {
             $request = &gravityview()->request;
         }
@@ -226,8 +220,7 @@ 
      *
      * @return string Unique slug ID, passed through `sanitize_title()`, with `gravityview/entry/slug` filter applied
      */
-    public function get_slug($apply_filter = false, \GV\View $view = null, \GV\Request $request = null, $track_directory = true)
-    {
+    public function get_slug($apply_filter = false, \GV\View $view = null, \GV\Request $request = null, $track_directory = true) {
         $entry_slug = \GravityView_API::get_entry_slug($this->ID, $this->as_entry());
 
         if (!$apply_filter) {
@@ -257,8 +250,7 @@ 
      *
      * @return bool
      */
-    public function is_multi()
-    {
+    public function is_multi() {
         return $this instanceof Multi_Entry;
     }
 
@@ -272,8 +264,7 @@ 
      *
      * @return \GV\Entry|null A \GV\Entry or null if not found.
      */
-    public function from_field($field, $fallback = null)
-    {
+    public function from_field($field, $fallback = null) {
         if (!$this->is_multi()) {
             return $this;
         }

future/includes/class-gv-collection-field.php

Indentation +176 added lines, -176 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -12,179 +12,179 @@ 
  */
 class Field_Collection extends Collection
 {
-    /**
-     * Returns all the objects in this collection as an an array. Here for docBlock purposes only.
-     *
-     * @since 2.0.13.1
-     *
-     * @return \GV\Field[]
-     */
-    public function all()
-    {
-        return parent::all();
-    }
-
-    /**
-     * Add a \GV\Field to this collection.
-     *
-     * @param \GV\Field $field The field to add to the internal array.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return void
-     */
-    public function add($field)
-    {
-        if (!$field instanceof Field) {
-            gravityview()->log->error('Field_Collections can only contain objects of type \GV\Field.');
-
-            return;
-        }
-        parent::add($field);
-    }
-
-    /**
-     * Get a \GV\Field from this list by UID.
-     *
-     * @param int $field_uid The UID of the field in the field to get.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return \GV\Field|null The \GV\Field with the $field_uid as the UID, or null if not found.
-     */
-    public function get($field_uid)
-    {
-        foreach ($this->all() as $field) {
-            if ($field->UID == $field_uid) {
-                return $field;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Get a copy of this \GV\Field_Collection filtered by position.
-     *
-     * @param string $position The position to get the fields for.
-     *                         Can be a wildcard *
-     *
-     * @api
-     *
-     * @since
-     *
-     * @return \GV\Field_Collection A filtered collection of \GV\Fields, filtered by position.
-     */
-    public function by_position($position)
-    {
-        $fields = new self();
-
-        $search = implode('.*', array_map('preg_quote', explode('*', $position)));
-
-        foreach ($this->all() as $field) {
-            if (preg_match("#^{$search}$#", $field->position)) {
-                $fields->add($field);
-            }
-        }
-
-        return $fields;
-    }
-
-    /**
-     * Get a copy of this \GV\Field_Collection filtered by visibility to current user context.
-     *
-     * @api
-     *
-     * @since
-     *
-     * @param $view \GV\View The view!
-     *
-     * @return \GV\Field_Collection A filtered collection of \GV\Fields, filtered by visibility.
-     */
-    public function by_visible($view = null)
-    {
-        $fields = new self();
-
-        /** @var \GV\Field $field */
-        foreach ($this->all() as $field) {
-            if ($field->is_visible($view)) {
-                $fields->add($field);
-            }
-        }
-
-        return $fields;
-    }
-
-    /**
-     * Parse a configuration array into a Field_Collection.
-     *
-     * @param array $configuration The configuration, structured like so:
-     *
-     * array(
-     *
-     * 	[other zones]
-     *
-     * 	'directory_list-title' => array(
-     *
-     *   	[other fields]
-     *
-     *  	'5372653f25d44' => array(
-     *
-     *			@see \GV\Field::as_configuration() for structure
-     *  	)
-     *
-     * 		[other fields]
-     *  )
-     *
-     * 	[other zones]
-     * )
-     *
-     * @return \GV\Field_Collection A collection of fields.
-     */
-    public static function from_configuration($configuration)
-    {
-        $fields = new self();
-        foreach ($configuration as $position => $_fields) {
-            if (empty($_fields) || !is_array($_fields)) {
-                continue;
-            }
-
-            foreach ($_fields as $uid => $_configuration) {
-                $field = Field::from_configuration($_configuration);
-                $field->UID = $uid;
-                $field->position = $position;
-
-                $fields->add($field);
-            }
-        }
-
-        return $fields;
-    }
-
-    /**
-     * Return a configuration array for this field collection.
-     *
-     * @return array See \GV\Field_Collection::from_configuration() for structure.
-     */
-    public function as_configuration()
-    {
-        $configuration = [];
-
-        /**
-         * @var \GV\Field $field
-         */
-        foreach ($this->all() as $field) {
-            if (empty($configuration[$field->position])) {
-                $configuration[$field->position] = [];
-            }
-
-            $configuration[$field->position][$field->UID] = $field->as_configuration();
-        }
-
-        return $configuration;
-    }
+	/**
+	 * Returns all the objects in this collection as an an array. Here for docBlock purposes only.
+	 *
+	 * @since 2.0.13.1
+	 *
+	 * @return \GV\Field[]
+	 */
+	public function all()
+	{
+		return parent::all();
+	}
+
+	/**
+	 * Add a \GV\Field to this collection.
+	 *
+	 * @param \GV\Field $field The field to add to the internal array.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return void
+	 */
+	public function add($field)
+	{
+		if (!$field instanceof Field) {
+			gravityview()->log->error('Field_Collections can only contain objects of type \GV\Field.');
+
+			return;
+		}
+		parent::add($field);
+	}
+
+	/**
+	 * Get a \GV\Field from this list by UID.
+	 *
+	 * @param int $field_uid The UID of the field in the field to get.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return \GV\Field|null The \GV\Field with the $field_uid as the UID, or null if not found.
+	 */
+	public function get($field_uid)
+	{
+		foreach ($this->all() as $field) {
+			if ($field->UID == $field_uid) {
+				return $field;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Get a copy of this \GV\Field_Collection filtered by position.
+	 *
+	 * @param string $position The position to get the fields for.
+	 *                         Can be a wildcard *
+	 *
+	 * @api
+	 *
+	 * @since
+	 *
+	 * @return \GV\Field_Collection A filtered collection of \GV\Fields, filtered by position.
+	 */
+	public function by_position($position)
+	{
+		$fields = new self();
+
+		$search = implode('.*', array_map('preg_quote', explode('*', $position)));
+
+		foreach ($this->all() as $field) {
+			if (preg_match("#^{$search}$#", $field->position)) {
+				$fields->add($field);
+			}
+		}
+
+		return $fields;
+	}
+
+	/**
+	 * Get a copy of this \GV\Field_Collection filtered by visibility to current user context.
+	 *
+	 * @api
+	 *
+	 * @since
+	 *
+	 * @param $view \GV\View The view!
+	 *
+	 * @return \GV\Field_Collection A filtered collection of \GV\Fields, filtered by visibility.
+	 */
+	public function by_visible($view = null)
+	{
+		$fields = new self();
+
+		/** @var \GV\Field $field */
+		foreach ($this->all() as $field) {
+			if ($field->is_visible($view)) {
+				$fields->add($field);
+			}
+		}
+
+		return $fields;
+	}
+
+	/**
+	 * Parse a configuration array into a Field_Collection.
+	 *
+	 * @param array $configuration The configuration, structured like so:
+	 *
+	 * array(
+	 *
+	 * 	[other zones]
+	 *
+	 * 	'directory_list-title' => array(
+	 *
+	 *   	[other fields]
+	 *
+	 *  	'5372653f25d44' => array(
+	 *
+	 *			@see \GV\Field::as_configuration() for structure
+	 *  	)
+	 *
+	 * 		[other fields]
+	 *  )
+	 *
+	 * 	[other zones]
+	 * )
+	 *
+	 * @return \GV\Field_Collection A collection of fields.
+	 */
+	public static function from_configuration($configuration)
+	{
+		$fields = new self();
+		foreach ($configuration as $position => $_fields) {
+			if (empty($_fields) || !is_array($_fields)) {
+				continue;
+			}
+
+			foreach ($_fields as $uid => $_configuration) {
+				$field = Field::from_configuration($_configuration);
+				$field->UID = $uid;
+				$field->position = $position;
+
+				$fields->add($field);
+			}
+		}
+
+		return $fields;
+	}
+
+	/**
+	 * Return a configuration array for this field collection.
+	 *
+	 * @return array See \GV\Field_Collection::from_configuration() for structure.
+	 */
+	public function as_configuration()
+	{
+		$configuration = [];
+
+		/**
+		 * @var \GV\Field $field
+		 */
+		foreach ($this->all() as $field) {
+			if (empty($configuration[$field->position])) {
+				$configuration[$field->position] = [];
+			}
+
+			$configuration[$field->position][$field->UID] = $field->as_configuration();
+		}
+
+		return $configuration;
+	}
 }

Spacing +28 added lines, -28 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -35,14 +35,14 @@ 
      *
      * @return void
      */
-    public function add($field)
+    public function add( $field )
     {
-        if (!$field instanceof Field) {
-            gravityview()->log->error('Field_Collections can only contain objects of type \GV\Field.');
+        if ( ! $field instanceof Field ) {
+            gravityview()->log->error( 'Field_Collections can only contain objects of type \GV\Field.' );
 
             return;
         }
-        parent::add($field);
+        parent::add( $field );
     }
 
     /**
@@ -56,10 +56,10 @@ 
      *
      * @return \GV\Field|null The \GV\Field with the $field_uid as the UID, or null if not found.
      */
-    public function get($field_uid)
+    public function get( $field_uid )
     {
-        foreach ($this->all() as $field) {
-            if ($field->UID == $field_uid) {
+        foreach ( $this->all() as $field ) {
+            if ( $field->UID == $field_uid ) {
                 return $field;
             }
         }
@@ -79,15 +79,15 @@ 
      *
      * @return \GV\Field_Collection A filtered collection of \GV\Fields, filtered by position.
      */
-    public function by_position($position)
+    public function by_position( $position )
     {
         $fields = new self();
 
-        $search = implode('.*', array_map('preg_quote', explode('*', $position)));
+        $search = implode( '.*', array_map( 'preg_quote', explode( '*', $position ) ) );
 
-        foreach ($this->all() as $field) {
-            if (preg_match("#^{$search}$#", $field->position)) {
-                $fields->add($field);
+        foreach ( $this->all() as $field ) {
+            if ( preg_match( "#^{$search}$#", $field->position ) ) {
+                $fields->add( $field );
             }
         }
 
@@ -105,14 +105,14 @@ 
      *
      * @return \GV\Field_Collection A filtered collection of \GV\Fields, filtered by visibility.
      */
-    public function by_visible($view = null)
+    public function by_visible( $view = null )
     {
         $fields = new self();
 
         /** @var \GV\Field $field */
-        foreach ($this->all() as $field) {
-            if ($field->is_visible($view)) {
-                $fields->add($field);
+        foreach ( $this->all() as $field ) {
+            if ( $field->is_visible( $view ) ) {
+                $fields->add( $field );
             }
         }
 
@@ -145,20 +145,20 @@ 
      *
      * @return \GV\Field_Collection A collection of fields.
      */
-    public static function from_configuration($configuration)
+    public static function from_configuration( $configuration )
     {
         $fields = new self();
-        foreach ($configuration as $position => $_fields) {
-            if (empty($_fields) || !is_array($_fields)) {
+        foreach ( $configuration as $position => $_fields ) {
+            if ( empty( $_fields ) || ! is_array( $_fields ) ) {
                 continue;
             }
 
-            foreach ($_fields as $uid => $_configuration) {
-                $field = Field::from_configuration($_configuration);
+            foreach ( $_fields as $uid => $_configuration ) {
+                $field = Field::from_configuration( $_configuration );
                 $field->UID = $uid;
                 $field->position = $position;
 
-                $fields->add($field);
+                $fields->add( $field );
             }
         }
 
@@ -172,17 +172,17 @@ 
      */
     public function as_configuration()
     {
-        $configuration = [];
+        $configuration = [ ];
 
         /**
          * @var \GV\Field $field
          */
-        foreach ($this->all() as $field) {
-            if (empty($configuration[$field->position])) {
-                $configuration[$field->position] = [];
+        foreach ( $this->all() as $field ) {
+            if ( empty( $configuration[ $field->position ] ) ) {
+                $configuration[ $field->position ] = [ ];
             }
 
-            $configuration[$field->position][$field->UID] = $field->as_configuration();
+            $configuration[ $field->position ][ $field->UID ] = $field->as_configuration();
         }
 
         return $configuration;

Braces +8 added lines, -16 removed lines

@@ -10,8 +10,7 @@ 
 /**
  * A collection of \GV\Field objects.
  */
-class Field_Collection extends Collection
-{
+class Field_Collection extends Collection {
     /**
      * Returns all the objects in this collection as an an array. Here for docBlock purposes only.
      *
@@ -19,8 +18,7 @@ 
      *
      * @return \GV\Field[]
      */
-    public function all()
-    {
+    public function all() {
         return parent::all();
     }
 
@@ -35,8 +33,7 @@ 
      *
      * @return void
      */
-    public function add($field)
-    {
+    public function add($field) {
         if (!$field instanceof Field) {
             gravityview()->log->error('Field_Collections can only contain objects of type \GV\Field.');
 
@@ -56,8 +53,7 @@ 
      *
      * @return \GV\Field|null The \GV\Field with the $field_uid as the UID, or null if not found.
      */
-    public function get($field_uid)
-    {
+    public function get($field_uid) {
         foreach ($this->all() as $field) {
             if ($field->UID == $field_uid) {
                 return $field;
@@ -79,8 +75,7 @@ 
      *
      * @return \GV\Field_Collection A filtered collection of \GV\Fields, filtered by position.
      */
-    public function by_position($position)
-    {
+    public function by_position($position) {
         $fields = new self();
 
         $search = implode('.*', array_map('preg_quote', explode('*', $position)));
@@ -105,8 +100,7 @@ 
      *
      * @return \GV\Field_Collection A filtered collection of \GV\Fields, filtered by visibility.
      */
-    public function by_visible($view = null)
-    {
+    public function by_visible($view = null) {
         $fields = new self();
 
         /** @var \GV\Field $field */
@@ -145,8 +139,7 @@ 
      *
      * @return \GV\Field_Collection A collection of fields.
      */
-    public static function from_configuration($configuration)
-    {
+    public static function from_configuration($configuration) {
         $fields = new self();
         foreach ($configuration as $position => $_fields) {
             if (empty($_fields) || !is_array($_fields)) {
@@ -170,8 +163,7 @@ 
      *
      * @return array See \GV\Field_Collection::from_configuration() for structure.
      */
-    public function as_configuration()
-    {
+    public function as_configuration() {
         $configuration = [];
 
         /**

future/includes/class-gv-entry-multi.php

Indentation +162 added lines, -162 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -15,165 +15,165 @@ 
  */
 class Multi_Entry extends Entry implements \ArrayAccess
 {
-    /**
-     * The entries in this form.
-     */
-    public $entries = [];
-
-    /**
-     * @var string The identifier of the backend used for this entry.
-     *
-     * @api
-     *
-     * @since 2.0
-     */
-    public static $backend = 'multi';
-
-    /**
-     * Initialization.
-     */
-    private function __construct()
-    {
-    }
-
-    /**
-     * Construct a multientry from an array of entries.
-     *
-     * @param \GV\Entry[] $entries The entries.
-     *
-     * @return \GV\Multi_Entry A multientry object.
-     */
-    public static function from_entries($entries)
-    {
-        $_entry = new self();
-        foreach ($entries as &$entry) {
-            if (!$entry instanceof Entry) {
-                continue;
-            }
-            $_entry->entries[$entry['form_id']] = &$entry;
-        }
-
-        return $_entry;
-    }
-
-    /**
-     * Fake legacy template support.
-     *
-     * Take the first entry and set it as the current entry.
-     * But support nesting.
-     *
-     * @return array See \GV\Entry::as_entry()
-     */
-    public function as_entry()
-    {
-        $_entry = [];
-
-        if ($entry = reset($this->entries)) {
-            $_entry = $entry->as_entry();
-
-            foreach ($this->entries as $entry) {
-                $entry = $entry->as_entry();
-                $_entry['_multi'][$entry['form_id']] = $entry;
-            }
-        }
-
-        return $_entry;
-    }
-
-    /**
-     * Return the link to this multi entry in the supplied context.
-     *
-     * @api
-     *
-     * @since 2.2
-     *
-     * @param \GV\View|null $view            The View context.
-     * @param \GV\Request   $request         The Request (current if null).
-     * @param bool          $track_directory Keep the housing directory arguments intact (used for breadcrumbs, for example). Default: true.
-     *
-     * @return string The permalink to this entry.
-     */
-    public function get_permalink(\GV\View $view = null, \GV\Request $request = null, $track_directory = true)
-    {
-        $slugs = [];
-        add_filter('gravityview/entry/slug', $callback = function ($slug) use (&$slugs) {
-            $slugs[] = $slug;
-
-            return implode(',', $slugs);
-        }, 10, 1);
-
-        foreach ($this->entries as $entry) {
-            $permalink = call_user_func_array([$entry, __FUNCTION__], func_get_args());
-        }
-
-        remove_filter('gravityview/entry/slug', $callback);
-
-        return $permalink;
-    }
-
-    /**
-     * ArrayAccess compatibility layer with a Gravity Forms entry array.
-     *
-     * @internal
-     *
-     * @deprecated
-     * @since 2.0
-     *
-     * @return bool Whether the offset exists or not.
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->entries[$offset]);
-    }
-
-    /**
-     * ArrayAccess compatibility layer with a Gravity Forms entry array.
-     *
-     * Maps the old keys to the new data;
-     *
-     * @internal
-     *
-     * @deprecated
-     * @since 2.0
-     *
-     * @return mixed The value of the requested entry data.
-     */
-    public function offsetGet($offset)
-    {
-        if (!$this->offsetExists($offset)) {
-            return null;
-        }
-
-        return $this->entries[$offset];
-    }
-
-    /**
-     * ArrayAccess compatibility layer with a Gravity Forms entry array.
-     *
-     * @internal
-     *
-     * @deprecated
-     * @since 2.0
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        gravityview()->log->error('The underlying multi entry is immutable. This is a \GV\Entry object and should not be accessed as an array.');
-    }
-
-    /**
-     * ArrayAccess compatibility layer with a Gravity Forms entry array.
-     *
-     * @internal
-     *
-     * @deprecated
-     * @since 2.0
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        gravityview()->log->error('The underlying multi entry is immutable. This is a \GV\Entry object and should not be accessed as an array.');
-    }
+	/**
+	 * The entries in this form.
+	 */
+	public $entries = [];
+
+	/**
+	 * @var string The identifier of the backend used for this entry.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 */
+	public static $backend = 'multi';
+
+	/**
+	 * Initialization.
+	 */
+	private function __construct()
+	{
+	}
+
+	/**
+	 * Construct a multientry from an array of entries.
+	 *
+	 * @param \GV\Entry[] $entries The entries.
+	 *
+	 * @return \GV\Multi_Entry A multientry object.
+	 */
+	public static function from_entries($entries)
+	{
+		$_entry = new self();
+		foreach ($entries as &$entry) {
+			if (!$entry instanceof Entry) {
+				continue;
+			}
+			$_entry->entries[$entry['form_id']] = &$entry;
+		}
+
+		return $_entry;
+	}
+
+	/**
+	 * Fake legacy template support.
+	 *
+	 * Take the first entry and set it as the current entry.
+	 * But support nesting.
+	 *
+	 * @return array See \GV\Entry::as_entry()
+	 */
+	public function as_entry()
+	{
+		$_entry = [];
+
+		if ($entry = reset($this->entries)) {
+			$_entry = $entry->as_entry();
+
+			foreach ($this->entries as $entry) {
+				$entry = $entry->as_entry();
+				$_entry['_multi'][$entry['form_id']] = $entry;
+			}
+		}
+
+		return $_entry;
+	}
+
+	/**
+	 * Return the link to this multi entry in the supplied context.
+	 *
+	 * @api
+	 *
+	 * @since 2.2
+	 *
+	 * @param \GV\View|null $view            The View context.
+	 * @param \GV\Request   $request         The Request (current if null).
+	 * @param bool          $track_directory Keep the housing directory arguments intact (used for breadcrumbs, for example). Default: true.
+	 *
+	 * @return string The permalink to this entry.
+	 */
+	public function get_permalink(\GV\View $view = null, \GV\Request $request = null, $track_directory = true)
+	{
+		$slugs = [];
+		add_filter('gravityview/entry/slug', $callback = function ($slug) use (&$slugs) {
+			$slugs[] = $slug;
+
+			return implode(',', $slugs);
+		}, 10, 1);
+
+		foreach ($this->entries as $entry) {
+			$permalink = call_user_func_array([$entry, __FUNCTION__], func_get_args());
+		}
+
+		remove_filter('gravityview/entry/slug', $callback);
+
+		return $permalink;
+	}
+
+	/**
+	 * ArrayAccess compatibility layer with a Gravity Forms entry array.
+	 *
+	 * @internal
+	 *
+	 * @deprecated
+	 * @since 2.0
+	 *
+	 * @return bool Whether the offset exists or not.
+	 */
+	public function offsetExists($offset)
+	{
+		return isset($this->entries[$offset]);
+	}
+
+	/**
+	 * ArrayAccess compatibility layer with a Gravity Forms entry array.
+	 *
+	 * Maps the old keys to the new data;
+	 *
+	 * @internal
+	 *
+	 * @deprecated
+	 * @since 2.0
+	 *
+	 * @return mixed The value of the requested entry data.
+	 */
+	public function offsetGet($offset)
+	{
+		if (!$this->offsetExists($offset)) {
+			return null;
+		}
+
+		return $this->entries[$offset];
+	}
+
+	/**
+	 * ArrayAccess compatibility layer with a Gravity Forms entry array.
+	 *
+	 * @internal
+	 *
+	 * @deprecated
+	 * @since 2.0
+	 *
+	 * @return void
+	 */
+	public function offsetSet($offset, $value)
+	{
+		gravityview()->log->error('The underlying multi entry is immutable. This is a \GV\Entry object and should not be accessed as an array.');
+	}
+
+	/**
+	 * ArrayAccess compatibility layer with a Gravity Forms entry array.
+	 *
+	 * @internal
+	 *
+	 * @deprecated
+	 * @since 2.0
+	 *
+	 * @return void
+	 */
+	public function offsetUnset($offset)
+	{
+		gravityview()->log->error('The underlying multi entry is immutable. This is a \GV\Entry object and should not be accessed as an array.');
+	}
 }

Spacing +28 added lines, -28 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -18,7 +18,7 @@ 
     /**
      * The entries in this form.
      */
-    public $entries = [];
+    public $entries = [ ];
 
     /**
      * @var string The identifier of the backend used for this entry.
@@ -43,14 +43,14 @@ 
      *
      * @return \GV\Multi_Entry A multientry object.
      */
-    public static function from_entries($entries)
+    public static function from_entries( $entries )
     {
         $_entry = new self();
-        foreach ($entries as &$entry) {
-            if (!$entry instanceof Entry) {
+        foreach ( $entries as &$entry ) {
+            if ( ! $entry instanceof Entry ) {
                 continue;
             }
-            $_entry->entries[$entry['form_id']] = &$entry;
+            $_entry->entries[ $entry[ 'form_id' ] ] = &$entry;
         }
 
         return $_entry;
@@ -66,14 +66,14 @@ 
      */
     public function as_entry()
     {
-        $_entry = [];
+        $_entry = [ ];
 
-        if ($entry = reset($this->entries)) {
+        if ( $entry = reset( $this->entries ) ) {
             $_entry = $entry->as_entry();
 
-            foreach ($this->entries as $entry) {
+            foreach ( $this->entries as $entry ) {
                 $entry = $entry->as_entry();
-                $_entry['_multi'][$entry['form_id']] = $entry;
+                $_entry[ '_multi' ][ $entry[ 'form_id' ] ] = $entry;
             }
         }
 
@@ -93,20 +93,20 @@ 
      *
      * @return string The permalink to this entry.
      */
-    public function get_permalink(\GV\View $view = null, \GV\Request $request = null, $track_directory = true)
+    public function get_permalink( \GV\View $view = null, \GV\Request $request = null, $track_directory = true )
     {
-        $slugs = [];
-        add_filter('gravityview/entry/slug', $callback = function ($slug) use (&$slugs) {
-            $slugs[] = $slug;
+        $slugs = [ ];
+        add_filter( 'gravityview/entry/slug', $callback = function( $slug ) use ( &$slugs ) {
+            $slugs[ ] = $slug;
 
-            return implode(',', $slugs);
-        }, 10, 1);
+            return implode( ',', $slugs );
+        }, 10, 1 );
 
-        foreach ($this->entries as $entry) {
-            $permalink = call_user_func_array([$entry, __FUNCTION__], func_get_args());
+        foreach ( $this->entries as $entry ) {
+            $permalink = call_user_func_array( [ $entry, __FUNCTION__ ], func_get_args() );
         }
 
-        remove_filter('gravityview/entry/slug', $callback);
+        remove_filter( 'gravityview/entry/slug', $callback );
 
         return $permalink;
     }
@@ -121,9 +121,9 @@ 
      *
      * @return bool Whether the offset exists or not.
      */
-    public function offsetExists($offset)
+    public function offsetExists( $offset )
     {
-        return isset($this->entries[$offset]);
+        return isset( $this->entries[ $offset ] );
     }
 
     /**
@@ -138,13 +138,13 @@ 
      *
      * @return mixed The value of the requested entry data.
      */
-    public function offsetGet($offset)
+    public function offsetGet( $offset )
     {
-        if (!$this->offsetExists($offset)) {
+        if ( ! $this->offsetExists( $offset ) ) {
             return null;
         }
 
-        return $this->entries[$offset];
+        return $this->entries[ $offset ];
     }
 
     /**
@@ -157,9 +157,9 @@ 
      *
      * @return void
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet( $offset, $value )
     {
-        gravityview()->log->error('The underlying multi entry is immutable. This is a \GV\Entry object and should not be accessed as an array.');
+        gravityview()->log->error( 'The underlying multi entry is immutable. This is a \GV\Entry object and should not be accessed as an array.' );
     }
 
     /**
@@ -172,8 +172,8 @@ 
      *
      * @return void
      */
-    public function offsetUnset($offset)
+    public function offsetUnset( $offset )
     {
-        gravityview()->log->error('The underlying multi entry is immutable. This is a \GV\Entry object and should not be accessed as an array.');
+        gravityview()->log->error( 'The underlying multi entry is immutable. This is a \GV\Entry object and should not be accessed as an array.' );
     }
 }

Braces +8 added lines, -16 removed lines

@@ -32,8 +32,7 @@ 
     /**
      * Initialization.
      */
-    private function __construct()
-    {
+    private function __construct() {
     }
 
     /**
@@ -43,8 +42,7 @@ 
      *
      * @return \GV\Multi_Entry A multientry object.
      */
-    public static function from_entries($entries)
-    {
+    public static function from_entries($entries) {
         $_entry = new self();
         foreach ($entries as &$entry) {
             if (!$entry instanceof Entry) {
@@ -64,8 +62,7 @@ 
      *
      * @return array See \GV\Entry::as_entry()
      */
-    public function as_entry()
-    {
+    public function as_entry() {
         $_entry = [];
 
         if ($entry = reset($this->entries)) {
@@ -93,8 +90,7 @@ 
      *
      * @return string The permalink to this entry.
      */
-    public function get_permalink(\GV\View $view = null, \GV\Request $request = null, $track_directory = true)
-    {
+    public function get_permalink(\GV\View $view = null, \GV\Request $request = null, $track_directory = true) {
         $slugs = [];
         add_filter('gravityview/entry/slug', $callback = function ($slug) use (&$slugs) {
             $slugs[] = $slug;
@@ -121,8 +117,7 @@ 
      *
      * @return bool Whether the offset exists or not.
      */
-    public function offsetExists($offset)
-    {
+    public function offsetExists($offset) {
         return isset($this->entries[$offset]);
     }
 
@@ -138,8 +133,7 @@ 
      *
      * @return mixed The value of the requested entry data.
      */
-    public function offsetGet($offset)
-    {
+    public function offsetGet($offset) {
         if (!$this->offsetExists($offset)) {
             return null;
         }
@@ -157,8 +151,7 @@ 
      *
      * @return void
      */
-    public function offsetSet($offset, $value)
-    {
+    public function offsetSet($offset, $value) {
         gravityview()->log->error('The underlying multi entry is immutable. This is a \GV\Entry object and should not be accessed as an array.');
     }
 
@@ -172,8 +165,7 @@ 
      *
      * @return void
      */
-    public function offsetUnset($offset)
-    {
+    public function offsetUnset($offset) {
         gravityview()->log->error('The underlying multi entry is immutable. This is a \GV\Entry object and should not be accessed as an array.');
     }
 }

future/includes/class-gv-template-field-csv.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_CSV_Template extends Field_Template
 {
-    /**
-     * @var string The template slug to be loaded (like "table", "list", "plain")
-     */
-    public static $slug = 'csv';
+	/**
+	 * @var string The template slug to be loaded (like "table", "list", "plain")
+	 */
+	public static $slug = 'csv';
 }

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_CSV_Template extends Field_Template
-{
+class Field_CSV_Template extends Field_Template {
     /**
      * @var string The template slug to be loaded (like "table", "list", "plain")
      */

future/includes/class-gv-form.php

Indentation +50 added lines, -50 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -15,57 +15,57 @@ 
  */
 abstract class Form extends Source
 {
-    /**
-     * @var int The ID for this form.
-     *
-     * @api
-     *
-     * @since 2.0
-     */
-    public $ID = null;
+	/**
+	 * @var int The ID for this form.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 */
+	public $ID = null;
 
-    /**
-     * @var array The backing form.
-     */
-    private $form;
+	/**
+	 * @var array The backing form.
+	 */
+	private $form;
 
-    /**
-     * Construct a \GV\Form instance by ID.
-     *
-     * @param int|string $form_id The internal form ID.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return \GV\Form|null An instance of this form or null if not found.
-     */
-    public static function by_id($form_id)
-    {
-        return null;
-    }
+	/**
+	 * Construct a \GV\Form instance by ID.
+	 *
+	 * @param int|string $form_id The internal form ID.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return \GV\Form|null An instance of this form or null if not found.
+	 */
+	public static function by_id($form_id)
+	{
+		return null;
+	}
 
-    /**
-     * Get all entries for this form.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return \GV\Entry_Collection The \GV\Entry_Collection
-     */
-    abstract public function get_entries();
+	/**
+	 * Get all entries for this form.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return \GV\Entry_Collection The \GV\Entry_Collection
+	 */
+	abstract public function get_entries();
 
-    /**
-     * Magic shortcuts.
-     *
-     * - `entries` -> `$this->get_entries()`
-     */
-    public function __get($key)
-    {
-        switch ($key) {
-            case 'entries':
-                return $this->get_entries();
-        }
-    }
+	/**
+	 * Magic shortcuts.
+	 *
+	 * - `entries` -> `$this->get_entries()`
+	 */
+	public function __get($key)
+	{
+		switch ($key) {
+			case 'entries':
+				return $this->get_entries();
+		}
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -40,7 +40,7 @@ 
      *
      * @return \GV\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 )
     {
         return null;
     }
@@ -61,9 +61,9 @@ 
      *
      * - `entries` -> `$this->get_entries()`
      */
-    public function __get($key)
+    public function __get( $key )
     {
-        switch ($key) {
+        switch ( $key ) {
             case 'entries':
                 return $this->get_entries();
         }

Braces +3 added lines, -6 removed lines

@@ -13,8 +13,7 @@ 
  * Houses all base Form functionality and provides a uniform
  *  API to various form backends via \GV\Form implementations.
  */
-abstract class Form extends Source
-{
+abstract class Form extends Source {
     /**
      * @var int The ID for this form.
      *
@@ -40,8 +39,7 @@ 
      *
      * @return \GV\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) {
         return null;
     }
 
@@ -61,8 +59,7 @@ 
      *
      * - `entries` -> `$this->get_entries()`
      */
-    public function __get($key)
-    {
+    public function __get($key) {
         switch ($key) {
             case 'entries':
                 return $this->get_entries();

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

Indentation +85 added lines, -85 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -14,88 +14,88 @@ 
  */
 class Join
 {
-    /**
-     * @var GF_Form|Source|Form
-     *
-     * @since 2.2 Made private property public
-     */
-    public $join;
-
-    /**
-     * @var GF_Form|Source|Form
-     *
-     * @since 2.2 Made private property public
-     */
-    public $join_on;
-
-    /**
-     * @var Field
-     */
-    public $join_column;
-
-    /**
-     * @var Field
-     */
-    public $join_on_column;
-
-    /**
-     * Construct a JOIN container.
-     *
-     * @param \GV\Source $join           The form we're joining to.
-     * @param \GV\Field  $join_column    Its column.
-     * @param \GV\Source $join_on        The form we're joining on.
-     * @param \GV\Field  $join_on_column Its column.
-     */
-    public function __construct($join, $join_column, $join_on, $join_on_column)
-    {
-        if ($join instanceof \GV\Source) {
-            $this->join = $join;
-        }
-
-        if ($join_on instanceof \GV\Source) {
-            $this->join_on = $join_on;
-        }
-
-        if ($join_column instanceof \GV\Field) {
-            $this->join_column = $join_column;
-        }
-
-        if ($join_on_column instanceof \GV\Field) {
-            $this->join_on_column = $join_on_column;
-        }
-    }
-
-    /**
-     * Inject this join into the query.
-     *
-     * @param \GF_Query $query The \GF_Query instance.
-     *
-     * @return \GF_Query The $query
-     */
-    public function as_query_join($query)
-    {
-        if (!gravityview()->plugin->supports(Plugin::FEATURE_JOINS)) {
-            return null;
-        }
-
-        if (!$query instanceof \GF_Query) {
-            gravityview()->log->error('Query not instance of \GF_Query.');
-
-            return null;
-        }
-
-        $join_id = intval($this->join->ID);
-        $join_on_id = intval($this->join_on->ID);
-
-        if (empty($join_id) || empty($join_on_id)) {
-            gravityview()->log->error('Query join form not an integer.', ['data' => $this]);
-
-            return null;
-        }
-
-        return $query->join(
-            new \GF_Query_Column($this->join_on_column->ID, $join_on_id),
-            new \GF_Query_Column($this->join_column->ID, $join_id)
-        );
-    }
+	/**
+	 * @var GF_Form|Source|Form
+	 *
+	 * @since 2.2 Made private property public
+	 */
+	public $join;
+
+	/**
+	 * @var GF_Form|Source|Form
+	 *
+	 * @since 2.2 Made private property public
+	 */
+	public $join_on;
+
+	/**
+	 * @var Field
+	 */
+	public $join_column;
+
+	/**
+	 * @var Field
+	 */
+	public $join_on_column;
+
+	/**
+	 * Construct a JOIN container.
+	 *
+	 * @param \GV\Source $join           The form we're joining to.
+	 * @param \GV\Field  $join_column    Its column.
+	 * @param \GV\Source $join_on        The form we're joining on.
+	 * @param \GV\Field  $join_on_column Its column.
+	 */
+	public function __construct($join, $join_column, $join_on, $join_on_column)
+	{
+		if ($join instanceof \GV\Source) {
+			$this->join = $join;
+		}
+
+		if ($join_on instanceof \GV\Source) {
+			$this->join_on = $join_on;
+		}
+
+		if ($join_column instanceof \GV\Field) {
+			$this->join_column = $join_column;
+		}
+
+		if ($join_on_column instanceof \GV\Field) {
+			$this->join_on_column = $join_on_column;
+		}
+	}
+
+	/**
+	 * Inject this join into the query.
+	 *
+	 * @param \GF_Query $query The \GF_Query instance.
+	 *
+	 * @return \GF_Query The $query
+	 */
+	public function as_query_join($query)
+	{
+		if (!gravityview()->plugin->supports(Plugin::FEATURE_JOINS)) {
+			return null;
+		}
+
+		if (!$query instanceof \GF_Query) {
+			gravityview()->log->error('Query not instance of \GF_Query.');
+
+			return null;
+		}
+
+		$join_id = intval($this->join->ID);
+		$join_on_id = intval($this->join_on->ID);
+
+		if (empty($join_id) || empty($join_on_id)) {
+			gravityview()->log->error('Query join form not an integer.', ['data' => $this]);
+
+			return null;
+		}
+
+		return $query->join(
+			new \GF_Query_Column($this->join_on_column->ID, $join_on_id),
+			new \GF_Query_Column($this->join_column->ID, $join_id)
+		);
+	}
 }

Spacing +16 added lines, -16 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -46,21 +46,21 @@ 
      * @param \GV\Source $join_on        The form we're joining on.
      * @param \GV\Field  $join_on_column Its column.
      */
-    public function __construct($join, $join_column, $join_on, $join_on_column)
+    public function __construct( $join, $join_column, $join_on, $join_on_column )
     {
-        if ($join instanceof \GV\Source) {
+        if ( $join instanceof \GV\Source ) {
             $this->join = $join;
         }
 
-        if ($join_on instanceof \GV\Source) {
+        if ( $join_on instanceof \GV\Source ) {
             $this->join_on = $join_on;
         }
 
-        if ($join_column instanceof \GV\Field) {
+        if ( $join_column instanceof \GV\Field ) {
             $this->join_column = $join_column;
         }
 
-        if ($join_on_column instanceof \GV\Field) {
+        if ( $join_on_column instanceof \GV\Field ) {
             $this->join_on_column = $join_on_column;
         }
     }
@@ -72,30 +72,30 @@ 
      *
      * @return \GF_Query The $query
      */
-    public function as_query_join($query)
+    public function as_query_join( $query )
     {
-        if (!gravityview()->plugin->supports(Plugin::FEATURE_JOINS)) {
+        if ( ! gravityview()->plugin->supports( Plugin::FEATURE_JOINS ) ) {
             return null;
         }
 
-        if (!$query instanceof \GF_Query) {
-            gravityview()->log->error('Query not instance of \GF_Query.');
+        if ( ! $query instanceof \GF_Query ) {
+            gravityview()->log->error( 'Query not instance of \GF_Query.' );
 
             return null;
         }
 
-        $join_id = intval($this->join->ID);
-        $join_on_id = intval($this->join_on->ID);
+        $join_id = intval( $this->join->ID );
+        $join_on_id = intval( $this->join_on->ID );
 
-        if (empty($join_id) || empty($join_on_id)) {
-            gravityview()->log->error('Query join form not an integer.', ['data' => $this]);
+        if ( empty( $join_id ) || empty( $join_on_id ) ) {
+            gravityview()->log->error( 'Query join form not an integer.', [ 'data' => $this ] );
 
             return null;
         }
 
         return $query->join(
-            new \GF_Query_Column($this->join_on_column->ID, $join_on_id),
-            new \GF_Query_Column($this->join_column->ID, $join_id)
+            new \GF_Query_Column( $this->join_on_column->ID, $join_on_id ),
+            new \GF_Query_Column( $this->join_column->ID, $join_id )
         );
     }
 }

Braces +3 added lines, -6 removed lines

@@ -12,8 +12,7 @@ 
  *
  * Contains a join between two Sources on two Fields.
  */
-class Join
-{
+class Join {
     /**
      * @var GF_Form|Source|Form
      *
@@ -46,8 +45,7 @@ 
      * @param \GV\Source $join_on        The form we're joining on.
      * @param \GV\Field  $join_on_column Its column.
      */
-    public function __construct($join, $join_column, $join_on, $join_on_column)
-    {
+    public function __construct($join, $join_column, $join_on, $join_on_column) {
         if ($join instanceof \GV\Source) {
             $this->join = $join;
         }
@@ -72,8 +70,7 @@ 
      *
      * @return \GF_Query The $query
      */
-    public function as_query_join($query)
-    {
+    public function as_query_join($query) {
         if (!gravityview()->plugin->supports(Plugin::FEATURE_JOINS)) {
             return null;
         }

future/includes/class-gv-template-entry-legacy.php

Indentation +32 added lines, -32 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -14,46 +14,46 @@ 
  */
 class Entry_Legacy_Template extends Entry_Template
 {
-    /**
-     * Render an old template.
-     */
-    public function render()
-    {
-        if (!class_exists('GravityView_Template')) {
-            return;
-        }
+	/**
+	 * Render an old template.
+	 */
+	public function render()
+	{
+		if (!class_exists('GravityView_Template')) {
+			return;
+		}
 
-        $entries = new \GV\Entry_Collection();
-        $entries->add($this->entry);
+		$entries = new \GV\Entry_Collection();
+		$entries->add($this->entry);
 
-        $context = [
-            'view'    => $this->view,
-            'fields'  => $this->view->fields->by_visible($this->view),
-            'entries' => $entries,
-            'entry'   => $this->entry,
-            'request' => $this->request,
-        ];
+		$context = [
+			'view'    => $this->view,
+			'fields'  => $this->view->fields->by_visible($this->view),
+			'entries' => $entries,
+			'entry'   => $this->entry,
+			'request' => $this->request,
+		];
 
-        global $post;
+		global $post;
 
-        if ($post) {
-            $context['post'] = $post;
-        }
+		if ($post) {
+			$context['post'] = $post;
+		}
 
-        \GV\Mocks\Legacy_Context::push($context);
+		\GV\Mocks\Legacy_Context::push($context);
 
-        $sections = ['single'];
+		$sections = ['single'];
 
-        $sections = apply_filters('gravityview_render_view_sections', $sections, $this->view->settings->get('template'));
+		$sections = apply_filters('gravityview_render_view_sections', $sections, $this->view->settings->get('template'));
 
-        $template = \GravityView_View::getInstance();
+		$template = \GravityView_View::getInstance();
 
-        $slug = apply_filters('gravityview_template_slug_'.$this->view->settings->get('template'), 'table', 'directory');
+		$slug = apply_filters('gravityview_template_slug_'.$this->view->settings->get('template'), 'table', 'directory');
 
-        foreach ($sections as $section) {
-            $template->render($slug, $section, false);
-        }
+		foreach ($sections as $section) {
+			$template->render($slug, $section, false);
+		}
 
-        \GV\Mocks\Legacy_Context::pop();
-    }
+		\GV\Mocks\Legacy_Context::pop();
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -19,16 +19,16 @@ 
      */
     public function render()
     {
-        if (!class_exists('GravityView_Template')) {
+        if ( ! class_exists( 'GravityView_Template' ) ) {
             return;
         }
 
         $entries = new \GV\Entry_Collection();
-        $entries->add($this->entry);
+        $entries->add( $this->entry );
 
         $context = [
             'view'    => $this->view,
-            'fields'  => $this->view->fields->by_visible($this->view),
+            'fields'  => $this->view->fields->by_visible( $this->view ),
             'entries' => $entries,
             'entry'   => $this->entry,
             'request' => $this->request,
@@ -36,22 +36,22 @@ 
 
         global $post;
 
-        if ($post) {
-            $context['post'] = $post;
+        if ( $post ) {
+            $context[ 'post' ] = $post;
         }
 
-        \GV\Mocks\Legacy_Context::push($context);
+        \GV\Mocks\Legacy_Context::push( $context );
 
-        $sections = ['single'];
+        $sections = [ 'single' ];
 
-        $sections = apply_filters('gravityview_render_view_sections', $sections, $this->view->settings->get('template'));
+        $sections = apply_filters( 'gravityview_render_view_sections', $sections, $this->view->settings->get( 'template' ) );
 
         $template = \GravityView_View::getInstance();
 
-        $slug = apply_filters('gravityview_template_slug_'.$this->view->settings->get('template'), 'table', 'directory');
+        $slug = apply_filters( 'gravityview_template_slug_' . $this->view->settings->get( 'template' ), 'table', 'directory' );
 
-        foreach ($sections as $section) {
-            $template->render($slug, $section, false);
+        foreach ( $sections as $section ) {
+            $template->render( $slug, $section, false );
         }
 
         \GV\Mocks\Legacy_Context::pop();

Braces +2 added lines, -4 removed lines

@@ -12,13 +12,11 @@
  *
  * A back-compatibility layer for old templates to work.
  */
-class Entry_Legacy_Template extends Entry_Template
-{
+class Entry_Legacy_Template extends Entry_Template {
     /**
      * Render an old template.
      */
-    public function render()
-    {
+    public function render() {
         if (!class_exists('GravityView_Template')) {
             return;
         }