gravityview / GravityView

includes/class-frontend-views.php

Doc Comments +5 added lines, -5 removed lines

@@ -150,7 +150,7 @@ 
 
 	/**
 	 * Sets the single entry ID and also the entry
-	 * @param bool|int $single_entry
+	 * @param boolean|string $single_entry
 	 */
 	public function setSingleEntry( $single_entry ) {
 
@@ -167,7 +167,7 @@ 
 
 	/**
 	 * Set the current entry
-	 * @param array|int $entry Entry array or entry ID
+	 * @param boolean|string $entry Entry array or entry ID
 	 */
 	public function setEntry( $entry ) {
 
@@ -225,7 +225,7 @@ 
 	 *
 	 *
 	 *
-	 * @param null $view_id
+	 * @param string $view_id
 	 */
 	public function set_context_view_id( $view_id = null ) {
 
@@ -934,7 +934,7 @@ 
 	 *
 	 * @uses  gravityview_get_entries()
 	 * @access public
-	 * @param array $args\n
+	 * @param array $args
 	 *   - $id - View id
 	 *   - $page_size - Page
 	 *   - $sort_field - form field id to sort
@@ -1364,7 +1364,7 @@ 
 	/**
 	 * Checks if field (column) is sortable
 	 *
-	 * @param string $field Field settings
+	 * @param string $field_id Field settings
 	 * @param array $form Gravity Forms form array
 	 *
 	 * @since 1.7

Indentation +10 added lines, -10 removed lines

@@ -1,15 +1,15 @@
 <?php
 /**
- * GravityView Frontend functions
- *
- * @package   GravityView
- * @license   GPL2+
- * @author    Katz Web Services, Inc.
- * @link      http://gravityview.co
- * @copyright Copyright 2014, Katz Web Services, Inc.
- *
- * @since 1.0.0
- */
+	 * GravityView Frontend functions
+	 *
+	 * @package   GravityView
+	 * @license   GPL2+
+	 * @author    Katz Web Services, Inc.
+	 * @link      http://gravityview.co
+	 * @copyright Copyright 2014, Katz Web Services, Inc.
+	 *
+	 * @since 1.0.0
+	 */
 
 
 class GravityView_frontend {

Spacing +263 added lines, -263 removed lines

@@ -20,7 +20,7 @@ 
 	 * @since 1.7.4.1
 	 * @var array
 	 */
-	private static $search_parameters = array( 'gv_search', 'gv_start', 'gv_end', 'gv_id', 'gv_by', 'filter_*' );
+	private static $search_parameters = array('gv_search', 'gv_start', 'gv_end', 'gv_id', 'gv_by', 'filter_*');
 
 	/**
 	 * Is the currently viewed post a `gravityview` post type?
@@ -85,18 +85,18 @@ 
 	private function __construct() {}
 
 	private function initialize() {
-		add_action( 'wp', array( $this, 'parse_content'), 11 );
-		add_action( 'template_redirect', array( $this, 'set_entry_data'), 1 );
+		add_action('wp', array($this, 'parse_content'), 11);
+		add_action('template_redirect', array($this, 'set_entry_data'), 1);
 
 		// Enqueue scripts and styles after GravityView_Template::register_styles()
-		add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 20 );
+		add_action('wp_enqueue_scripts', array($this, 'add_scripts_and_styles'), 20);
 
 		// Enqueue and print styles in the footer. Added 1 priorty so stuff gets printed at 10 priority.
-		add_action( 'wp_print_footer_scripts', array( $this, 'add_scripts_and_styles' ), 1 );
+		add_action('wp_print_footer_scripts', array($this, 'add_scripts_and_styles'), 1);
 
-		add_filter( 'the_title', array( $this, 'single_entry_title' ), 1, 2 );
-		add_filter( 'the_content', array( $this, 'insert_view_in_content' ) );
-		add_filter( 'comments_open', array( $this, 'comments_open' ), 10, 2 );
+		add_filter('the_title', array($this, 'single_entry_title'), 1, 2);
+		add_filter('the_content', array($this, 'insert_view_in_content'));
+		add_filter('comments_open', array($this, 'comments_open'), 10, 2);
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 	 */
 	public static function getInstance() {
 
-		if ( empty( self::$instance ) ) {
+		if (empty(self::$instance)) {
 			self::$instance = new self;
 			self::$instance->initialize();
 		}
@@ -123,7 +123,7 @@ 
 	/**
 	 * @param GravityView_View_Data $gv_output_data
 	 */
-	public function setGvOutputData( $gv_output_data ) {
+	public function setGvOutputData($gv_output_data) {
 		$this->gv_output_data = $gv_output_data;
 	}
 
@@ -137,7 +137,7 @@ 
 	/**
 	 * @param boolean $is_search
 	 */
-	public function setIsSearch( $is_search ) {
+	public function setIsSearch($is_search) {
 		$this->is_search = $is_search;
 	}
 
@@ -152,7 +152,7 @@ 
 	 * Sets the single entry ID and also the entry
 	 * @param bool|int $single_entry
 	 */
-	public function setSingleEntry( $single_entry ) {
+	public function setSingleEntry($single_entry) {
 
 		$this->single_entry = $single_entry;
 
@@ -169,10 +169,10 @@ 
 	 * Set the current entry
 	 * @param array|int $entry Entry array or entry ID
 	 */
-	public function setEntry( $entry ) {
+	public function setEntry($entry) {
 
-		if ( ! is_array( $entry ) ) {
-			$entry = GVCommon::get_entry( $entry );
+		if (!is_array($entry)) {
+			$entry = GVCommon::get_entry($entry);
 		}
 
 		$this->entry = $entry;
@@ -188,7 +188,7 @@ 
 	/**
 	 * @param int $post_id
 	 */
-	public function setPostId( $post_id ) {
+	public function setPostId($post_id) {
 		$this->post_id = $post_id;
 	}
 
@@ -202,7 +202,7 @@ 
 	/**
 	 * @param boolean $post_has_shortcode
 	 */
-	public function setPostHasShortcode( $post_has_shortcode ) {
+	public function setPostHasShortcode($post_has_shortcode) {
 		$this->post_has_shortcode = $post_has_shortcode;
 	}
 
@@ -216,7 +216,7 @@ 
 	/**
 	 * @param boolean $is_gravityview_post_type
 	 */
-	public function setIsGravityviewPostType( $is_gravityview_post_type ) {
+	public function setIsGravityviewPostType($is_gravityview_post_type) {
 		$this->is_gravityview_post_type = $is_gravityview_post_type;
 	}
 
@@ -227,13 +227,13 @@ 
 	 *
 	 * @param null $view_id
 	 */
-	public function set_context_view_id( $view_id = null ) {
+	public function set_context_view_id($view_id = null) {
 
-		if ( ! empty( $view_id ) ) {
+		if (!empty($view_id)) {
 
 			$this->context_view_id = $view_id;
 
-		} elseif ( isset( $_GET['gvid'] ) && $this->getGvOutputData()->has_multiple_views() ) {
+		} elseif (isset($_GET['gvid']) && $this->getGvOutputData()->has_multiple_views()) {
 			/**
 			 * used on a has_multiple_views context
 			 * @see GravityView_API::entry_link
@@ -241,10 +241,10 @@ 
 			 */
 			$this->context_view_id = $_GET['gvid'];
 
-		} elseif ( ! $this->getGvOutputData()->has_multiple_views() )  {
-			$array_keys = array_keys( $this->getGvOutputData()->get_views() );
-			$this->context_view_id = array_pop( $array_keys );
-			unset( $array_keys );
+		} elseif (!$this->getGvOutputData()->has_multiple_views()) {
+			$array_keys = array_keys($this->getGvOutputData()->get_views());
+			$this->context_view_id = array_pop($array_keys);
+			unset($array_keys);
 		}
 
 	}
@@ -265,31 +265,31 @@ 
 	 * @param  array  $wp Passed in the `wp` hook. Not used.
 	 * @return void
 	 */
-	function parse_content( $wp = array() ) {
+	function parse_content($wp = array()) {
 		global $post;
 
 		// If in admin and NOT AJAX request, get outta here.
-		if ( GravityView_Plugin::is_admin() )  {
+		if (GravityView_Plugin::is_admin()) {
 			return;
 		}
 
 		// Calculate requested Views
-		$this->setGvOutputData( GravityView_View_Data::getInstance( $post ) );
+		$this->setGvOutputData(GravityView_View_Data::getInstance($post));
 
 		// !important: we need to run this before getting single entry (to kick the advanced filter)
 		$this->set_context_view_id();
 
-		$this->setIsGravityviewPostType( get_post_type( $post ) === 'gravityview' );
+		$this->setIsGravityviewPostType(get_post_type($post) === 'gravityview');
 
-		$post_id = $this->getPostId() ? $this->getPostId() : (isset( $post ) ? $post->ID : null );
-		$this->setPostId( $post_id );
-		$post_has_shortcode = ! empty( $post->post_content ) ? gravityview_has_shortcode_r( $post->post_content, 'gravityview' ) : false;
-		$this->setPostHasShortcode( $this->isGravityviewPostType() ? null : ! empty( $post_has_shortcode ) );
+		$post_id = $this->getPostId() ? $this->getPostId() : (isset($post) ? $post->ID : null);
+		$this->setPostId($post_id);
+		$post_has_shortcode = !empty($post->post_content) ? gravityview_has_shortcode_r($post->post_content, 'gravityview') : false;
+		$this->setPostHasShortcode($this->isGravityviewPostType() ? null : !empty($post_has_shortcode));
 
 		// check if the View is showing search results (only for multiple entries View)
-		$this->setIsSearch( $this->is_searching() );
+		$this->setIsSearch($this->is_searching());
 
-		unset( $entry, $post_id, $post_has_shortcode );
+		unset($entry, $post_id, $post_has_shortcode);
 	}
 
 	/**
@@ -297,8 +297,8 @@ 
 	 */
 	function set_entry_data() {
 		$entry_id = self::is_single_entry();
-		$this->setSingleEntry( $entry_id );
-		$this->setEntry( $entry_id );
+		$this->setSingleEntry($entry_id);
+		$this->setEntry($entry_id);
 	}
 
 	/**
@@ -311,31 +311,31 @@ 
 	function is_searching() {
 
 		// It's a single entry, not search
-		if ( $this->getSingleEntry() ) {
+		if ($this->getSingleEntry()) {
 			return false;
 		}
 
 		// No $_GET parameters
-		if ( empty( $_GET ) || ! is_array( $_GET ) ) {
+		if (empty($_GET) || !is_array($_GET)) {
 			return false;
 		}
 
 		// Remove empty values
-		$get = array_filter( $_GET );
+		$get = array_filter($_GET);
 
 		// If the $_GET parameters are empty, it's no search.
-		if ( empty( $get ) ) {
+		if (empty($get)) {
 			return false;
 		}
 
-		$search_keys = array_keys( $get );
+		$search_keys = array_keys($get);
 
-		$search_match = implode( '|', self::$search_parameters );
+		$search_match = implode('|', self::$search_parameters);
 
-		foreach ( $search_keys as $search_key ) {
+		foreach ($search_keys as $search_key) {
 
 			// Analyze the search key $_GET parameter and see if it matches known GV args
-			if ( preg_match( '/(' . $search_match . ')/i', $search_key ) ) {
+			if (preg_match('/('.$search_match.')/i', $search_key)) {
 				return true;
 			}
 		}
@@ -350,11 +350,11 @@ 
 	 * @param  int $passed_post_id Post ID
 	 * @return string          (modified) title
 	 */
-	public function single_entry_title( $title, $passed_post_id = null ) {
+	public function single_entry_title($title, $passed_post_id = null) {
 		global $post;
 
 		// If this is the directory view, return.
-		if ( ! $this->getSingleEntry() ) {
+		if (!$this->getSingleEntry()) {
 			return $title;
 		}
 
@@ -365,44 +365,44 @@ 
 		 * @param boolean $in_the_loop Whether to apply the filter to the menu title and the meta tag <title> - outside the loop
 		 * @param array $entry Current entry
 		 */
-		$apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop' , in_the_loop(), $entry );
+		$apply_outside_loop = apply_filters('gravityview/single/title/out_loop', in_the_loop(), $entry);
 
-		if ( ! $apply_outside_loop ) {
+		if (!$apply_outside_loop) {
 			return $title;
 		}
 
 		// User reported WooCommerce doesn't pass two args.
-		if ( empty( $passed_post_id ) )  {
+		if (empty($passed_post_id)) {
 			return $title;
 		}
 
 		// Don't modify the title for anything other than the current view/post.
 		// This is true for embedded shortcodes and Views.
-		if ( is_object( $post ) && (int) $post->ID !== (int) $passed_post_id ) {
+		if (is_object($post) && (int)$post->ID !== (int)$passed_post_id) {
 			return $title;
 		}
 
 		$context_view_id = $this->get_context_view_id();
 
-		if ( $this->getGvOutputData()->has_multiple_views() && ! empty( $context_view_id ) ) {
-			$view_meta = $this->getGvOutputData()->get_view( $context_view_id );
+		if ($this->getGvOutputData()->has_multiple_views() && !empty($context_view_id)) {
+			$view_meta = $this->getGvOutputData()->get_view($context_view_id);
 		} else {
-			foreach ( $this->getGvOutputData()->get_views() as $view_id => $view_data ) {
-				if ( intval( $view_data['form_id'] ) === intval( $entry['form_id'] ) ) {
+			foreach ($this->getGvOutputData()->get_views() as $view_id => $view_data) {
+				if (intval($view_data['form_id']) === intval($entry['form_id'])) {
 					$view_meta = $view_data;
 					break;
 				}
 			}
 		}
 
-		if ( ! empty( $view_meta['atts']['single_title'] ) ) {
+		if (!empty($view_meta['atts']['single_title'])) {
 
 			$title = $view_meta['atts']['single_title'];
 
 			// We are allowing HTML in the fields, so no escaping the output
-			$title = GravityView_API::replace_variables( $title, $view_meta['form'], $entry );
+			$title = GravityView_API::replace_variables($title, $view_meta['form'], $entry);
 
-			$title = do_shortcode( $title );
+			$title = do_shortcode($title);
 		}
 
 		return $title;
@@ -417,38 +417,38 @@ 
 	 * @param mixed $content
 	 * @return string Add the View output into View CPT content
 	 */
-	public function insert_view_in_content( $content ) {
+	public function insert_view_in_content($content) {
 
 		// Plugins may run through the content in the header. WP SEO does this for its OpenGraph functionality.
-		if ( ! did_action( 'loop_start' ) ) {
+		if (!did_action('loop_start')) {
 
-			do_action( 'gravityview_log_debug', '[insert_view_in_content] Not processing yet: loop_start hasn\'t run yet. Current action:', current_filter() );
+			do_action('gravityview_log_debug', '[insert_view_in_content] Not processing yet: loop_start hasn\'t run yet. Current action:', current_filter());
 
 			return $content;
 		}
 
 		//	We don't want this filter to run infinite loop on any post content fields
-		remove_filter( 'the_content', array( $this, 'insert_view_in_content' ) );
+		remove_filter('the_content', array($this, 'insert_view_in_content'));
 
 		// Otherwise, this is called on the Views page when in Excerpt mode.
-		if ( is_admin() ) {
+		if (is_admin()) {
 			return $content;
 		}
 
-		if ( $this->isGravityviewPostType() ) {
+		if ($this->isGravityviewPostType()) {
 
 			/** @since 1.7.4 */
-			if ( is_preview() && ! gravityview_get_form_id( $this->post_id ) ) {
-				$content .= __( 'When using a Start Fresh template, you must save the View before a Preview is available.', 'gravityview' );
+			if (is_preview() && !gravityview_get_form_id($this->post_id)) {
+				$content .= __('When using a Start Fresh template, you must save the View before a Preview is available.', 'gravityview');
 			} else {
-				foreach ( $this->getGvOutputData()->get_views() as $view_id => $data ) {
-					$content .= $this->render_view( array( 'id' => $view_id ) );
+				foreach ($this->getGvOutputData()->get_views() as $view_id => $data) {
+					$content .= $this->render_view(array('id' => $view_id));
 				}
 			}
 		}
 
 		//	Add the filter back in
-		add_filter( 'the_content', array( $this, 'insert_view_in_content' ) );
+		add_filter('the_content', array($this, 'insert_view_in_content'));
 
 		return $content;
 	}
@@ -459,9 +459,9 @@ 
 	 * @param  int $post_id Post ID
 	 * @return boolean
 	 */
-	public function comments_open( $open, $post_id ) {
+	public function comments_open($open, $post_id) {
 
-		if ( $this->isGravityviewPostType() ) {
+		if ($this->isGravityviewPostType()) {
 			$open = false;
 		}
 
@@ -471,7 +471,7 @@ 
 		 * @param  boolean $open Open or closed status
 		 * @param  int $post_id Post ID to set comment status for
 		 */
-		$open = apply_filters( 'gravityview/comments_open', $open, $post_id );
+		$open = apply_filters('gravityview/comments_open', $open, $post_id);
 
 		return $open;
 	}
@@ -498,55 +498,55 @@ 
 	 *
 	 * @return string|null HTML output of a View, NULL if View isn't found
 	 */
-	public function render_view( $passed_args ) {
+	public function render_view($passed_args) {
 
 		// validate attributes
-		if ( empty( $passed_args['id'] ) ) {
-			do_action( 'gravityview_log_error', '[render_view] Returning; no ID defined.', $passed_args );
+		if (empty($passed_args['id'])) {
+			do_action('gravityview_log_error', '[render_view] Returning; no ID defined.', $passed_args);
 			return null;
 		}
 
 		// Solve problem when loading content via admin-ajax.php
 		// @hack
-		if ( ! $this->getGvOutputData() ) {
+		if (!$this->getGvOutputData()) {
 
-			do_action( 'gravityview_log_error', '[render_view] gv_output_data not defined; parsing content.', $passed_args );
+			do_action('gravityview_log_error', '[render_view] gv_output_data not defined; parsing content.', $passed_args);
 
 			$this->parse_content();
 		}
 
 		// Make 100% sure that we're dealing with a properly called situation
-		if ( ! is_object( $this->getGvOutputData() ) || ! is_callable( array( $this->getGvOutputData(), 'get_view' ) ) ) {
+		if (!is_object($this->getGvOutputData()) || !is_callable(array($this->getGvOutputData(), 'get_view'))) {
 
-			do_action( 'gravityview_log_error', '[render_view] gv_output_data not an object or get_view not callable.', $this->getGvOutputData() );
+			do_action('gravityview_log_error', '[render_view] gv_output_data not an object or get_view not callable.', $this->getGvOutputData());
 
 			return null;
 		}
 
 		$view_id = $passed_args['id'];
 
-		$view_data = $this->getGvOutputData()->get_view( $view_id, $passed_args );
+		$view_data = $this->getGvOutputData()->get_view($view_id, $passed_args);
 
-		do_action( 'gravityview_log_debug', '[render_view] View Data: ', $view_data );
+		do_action('gravityview_log_debug', '[render_view] View Data: ', $view_data);
 
-		do_action( 'gravityview_log_debug', '[render_view] Init View. Arguments: ', $passed_args );
+		do_action('gravityview_log_debug', '[render_view] Init View. Arguments: ', $passed_args);
 
 		// The passed args were always winning, even if they were NULL.
 		// This prevents that. Filters NULL, FALSE, and empty strings.
-		$passed_args = array_filter( $passed_args, 'strlen' );
+		$passed_args = array_filter($passed_args, 'strlen');
 
 		//Override shortcode args over View template settings
-		$atts = wp_parse_args( $passed_args, $view_data['atts'] );
+		$atts = wp_parse_args($passed_args, $view_data['atts']);
 
-		do_action( 'gravityview_log_debug', '[render_view] Arguments after merging with View settings: ', $atts );
+		do_action('gravityview_log_debug', '[render_view] Arguments after merging with View settings: ', $atts);
 
 		// It's password protected and you need to log in.
-		if ( post_password_required( $view_id ) ) {
+		if (post_password_required($view_id)) {
 
-			do_action( 'gravityview_log_error', sprintf( '[render_view] Returning: View %d is password protected.', $view_id ) );
+			do_action('gravityview_log_error', sprintf('[render_view] Returning: View %d is password protected.', $view_id));
 
 			// If we're in an embed or on an archive page, show the password form
-			if ( get_the_ID() !== $view_id ) {
+			if (get_the_ID() !== $view_id) {
 				return get_the_password_form();
 			}
 
@@ -558,11 +558,11 @@ 
 		 * Don't render View if user isn't allowed to see it
 		 * @since 1.15
 		 */
-		if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
+		if (is_user_logged_in() && false === GVCommon::has_cap('read_gravityview', $view_id)) {
 			return null;
 		}
 
-		if( $this->isGravityviewPostType() ) {
+		if ($this->isGravityviewPostType()) {
 
 			/**
 			 * @filter `gravityview_direct_access` Should Views be directly accessible, or only visible using the shortcode?
@@ -572,12 +572,12 @@ 
 			 * @param[in,out] boolean `true`: allow Views to be accessible directly. `false`: Only allow Views to be embedded via shortcode. Default: `true`
 			 * @param int $view_id The ID of the View currently being requested. `0` for general setting
 			 */
-			$direct_access = apply_filters( 'gravityview_direct_access', true, $view_id );
+			$direct_access = apply_filters('gravityview_direct_access', true, $view_id);
 
-			$embed_only = ! empty( $atts['embed_only'] );
+			$embed_only = !empty($atts['embed_only']);
 
-			if( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
-				return __( 'You are not allowed to view this content.', 'gravityview' );
+			if (!$direct_access || ($embed_only && !GVCommon::has_cap('read_private_gravityviews'))) {
+				return __('You are not allowed to view this content.', 'gravityview');
 			}
 		}
 
@@ -589,137 +589,137 @@ 
 		 */
 		global $gravityview_view;
 
-		$gravityview_view = new GravityView_View( $view_data );
+		$gravityview_view = new GravityView_View($view_data);
 
-		$post_id = ! empty( $atts['post_id'] ) ? intval( $atts['post_id'] ) : $this->getPostId();
+		$post_id = !empty($atts['post_id']) ? intval($atts['post_id']) : $this->getPostId();
 
-		$gravityview_view->setPostId( $post_id );
+		$gravityview_view->setPostId($post_id);
 
-		if ( ! $this->getSingleEntry() ) {
+		if (!$this->getSingleEntry()) {
 
 			// user requested Directory View
-			do_action( 'gravityview_log_debug', '[render_view] Executing Directory View' );
+			do_action('gravityview_log_debug', '[render_view] Executing Directory View');
 
 			//fetch template and slug
-			$view_slug = apply_filters( 'gravityview_template_slug_'. $view_data['template_id'], 'table', 'directory' );
+			$view_slug = apply_filters('gravityview_template_slug_'.$view_data['template_id'], 'table', 'directory');
 
-			do_action( 'gravityview_log_debug', '[render_view] View template slug: ', $view_slug );
+			do_action('gravityview_log_debug', '[render_view] View template slug: ', $view_slug);
 
 			/**
 			 * Disable fetching initial entries for views that don't need it (DataTables)
 			 */
-			$get_entries = apply_filters( 'gravityview_get_view_entries_'.$view_slug, true );
+			$get_entries = apply_filters('gravityview_get_view_entries_'.$view_slug, true);
 
 			/**
 			 * Hide View data until search is performed
 			 * @since 1.5.4
 			 */
-			if ( ! empty( $atts['hide_until_searched'] ) && ! $this->isSearch() ) {
-				$gravityview_view->setHideUntilSearched( true );
+			if (!empty($atts['hide_until_searched']) && !$this->isSearch()) {
+				$gravityview_view->setHideUntilSearched(true);
 				$get_entries = false;
 			}
 
 
-			if ( $get_entries ) {
+			if ($get_entries) {
 
-				if ( ! empty( $atts['sort_columns'] ) ) {
+				if (!empty($atts['sort_columns'])) {
 					// add filter to enable column sorting
-					add_filter( 'gravityview/template/field_label', array( $this, 'add_columns_sort_links' ) , 100, 3 );
+					add_filter('gravityview/template/field_label', array($this, 'add_columns_sort_links'), 100, 3);
 				}
 
-				$view_entries = self::get_view_entries( $atts, $view_data['form_id'] );
+				$view_entries = self::get_view_entries($atts, $view_data['form_id']);
 
-				do_action( 'gravityview_log_debug', sprintf( '[render_view] Get Entries. Found %s entries total, showing %d entries', $view_entries['count'], sizeof( $view_entries['entries'] ) ) );
+				do_action('gravityview_log_debug', sprintf('[render_view] Get Entries. Found %s entries total, showing %d entries', $view_entries['count'], sizeof($view_entries['entries'])));
 
 			} else {
 
-				$view_entries = array( 'count' => null, 'entries' => null, 'paging' => null );
+				$view_entries = array('count' => null, 'entries' => null, 'paging' => null);
 
-				do_action( 'gravityview_log_debug', '[render_view] Not fetching entries because `gravityview_get_view_entries_'.$view_slug.'` is false' );
+				do_action('gravityview_log_debug', '[render_view] Not fetching entries because `gravityview_get_view_entries_'.$view_slug.'` is false');
 			}
 
-			$gravityview_view->setPaging( $view_entries['paging'] );
-			$gravityview_view->setContext( 'directory' );
-			$sections = array( 'header', 'body', 'footer' );
+			$gravityview_view->setPaging($view_entries['paging']);
+			$gravityview_view->setContext('directory');
+			$sections = array('header', 'body', 'footer');
 
 		} else {
 
 			// user requested Single Entry View
-			do_action( 'gravityview_log_debug', '[render_view] Executing Single View' );
+			do_action('gravityview_log_debug', '[render_view] Executing Single View');
 
-			do_action( 'gravityview_render_entry_'.$view_data['id'] );
+			do_action('gravityview_render_entry_'.$view_data['id']);
 
 			$entry = $this->getEntry();
 
 			// You are not permitted to view this entry.
-			if ( empty( $entry ) || ! self::is_entry_approved( $entry, $atts ) ) {
+			if (empty($entry) || !self::is_entry_approved($entry, $atts)) {
 
-				do_action( 'gravityview_log_debug', '[render_view] Entry does not exist. This may be because of View filters limiting access.' );
+				do_action('gravityview_log_debug', '[render_view] Entry does not exist. This may be because of View filters limiting access.');
 
 				/**
 				 * @since 1.6
 				 */
-				echo esc_attr( apply_filters( 'gravityview/render/entry/not_visible', __( 'You have attempted to view an entry that is not visible or may not exist.', 'gravityview' ) ) );
+				echo esc_attr(apply_filters('gravityview/render/entry/not_visible', __('You have attempted to view an entry that is not visible or may not exist.', 'gravityview')));
 
 				return null;
 			}
 
 			// We're in single view, but the view being processed is not the same view the single entry belongs to.
 			// important: do not remove this as it prevents fake attempts of displaying entries from other views/forms
-			if ( $this->getGvOutputData()->has_multiple_views() && $view_id != $this->get_context_view_id() ) {
-				do_action( 'gravityview_log_debug', '[render_view] In single entry view, but the entry does not belong to this View. Perhaps there are multiple views on the page. View ID: '. $view_id );
+			if ($this->getGvOutputData()->has_multiple_views() && $view_id != $this->get_context_view_id()) {
+				do_action('gravityview_log_debug', '[render_view] In single entry view, but the entry does not belong to this View. Perhaps there are multiple views on the page. View ID: '.$view_id);
 				return null;
 			}
 
 			//fetch template and slug
-			$view_slug = apply_filters( 'gravityview_template_slug_' . $view_data['template_id'], 'table', 'single' );
-			do_action( 'gravityview_log_debug', '[render_view] View single template slug: ', $view_slug );
+			$view_slug = apply_filters('gravityview_template_slug_'.$view_data['template_id'], 'table', 'single');
+			do_action('gravityview_log_debug', '[render_view] View single template slug: ', $view_slug);
 
 			//fetch entry detail
 			$view_entries['count'] = 1;
 			$view_entries['entries'][] = $entry;
-			do_action( 'gravityview_log_debug', '[render_view] Get single entry: ', $view_entries['entries'] );
+			do_action('gravityview_log_debug', '[render_view] Get single entry: ', $view_entries['entries']);
 
-			$back_link_label = isset( $atts['back_link_label'] ) ? $atts['back_link_label'] : null;
+			$back_link_label = isset($atts['back_link_label']) ? $atts['back_link_label'] : null;
 
 			// set back link label
-			$gravityview_view->setBackLinkLabel( $back_link_label );
-			$gravityview_view->setContext( 'single' );
-			$sections = array( 'single' );
+			$gravityview_view->setBackLinkLabel($back_link_label);
+			$gravityview_view->setContext('single');
+			$sections = array('single');
 
 		}
 
 		// add template style
-		self::add_style( $view_data['template_id'] );
+		self::add_style($view_data['template_id']);
 
 		// Prepare to render view and set vars
-		$gravityview_view->setEntries( $view_entries['entries'] );
-		$gravityview_view->setTotalEntries( $view_entries['count'] );
+		$gravityview_view->setEntries($view_entries['entries']);
+		$gravityview_view->setTotalEntries($view_entries['count']);
 
 		// If Edit
-		if ( 'edit' === gravityview_get_context() ) {
+		if ('edit' === gravityview_get_context()) {
 
-			do_action( 'gravityview_log_debug', '[render_view] Edit Entry ' );
+			do_action('gravityview_log_debug', '[render_view] Edit Entry ');
 
-			do_action( 'gravityview_edit_entry', $this->getGvOutputData() );
+			do_action('gravityview_edit_entry', $this->getGvOutputData());
 
 			return ob_get_clean();
 
 		} else {
 			// finaly we'll render some html
-			$sections = apply_filters( 'gravityview_render_view_sections', $sections, $view_data['template_id'] );
+			$sections = apply_filters('gravityview_render_view_sections', $sections, $view_data['template_id']);
 
-			do_action( 'gravityview_log_debug', '[render_view] Sections to render: ', $sections );
-			foreach ( $sections as $section ) {
-				do_action( 'gravityview_log_debug', '[render_view] Rendering '. $section . ' section.' );
-				$gravityview_view->render( $view_slug, $section, false );
+			do_action('gravityview_log_debug', '[render_view] Sections to render: ', $sections);
+			foreach ($sections as $section) {
+				do_action('gravityview_log_debug', '[render_view] Rendering '.$section.' section.');
+				$gravityview_view->render($view_slug, $section, false);
 			}
 		}
 
 		//@todo: check why we need the IF statement vs. print the view id always.
-		if ( $this->isGravityviewPostType() || $this->isPostHasShortcode() ) {
+		if ($this->isGravityviewPostType() || $this->isPostHasShortcode()) {
 			// Print the View ID to enable proper cookie pagination
-			echo '<input type="hidden" class="gravityview-view-id" value="' . esc_attr( $view_id ) . '">';
+			echo '<input type="hidden" class="gravityview-view-id" value="'.esc_attr($view_id).'">';
 		}
 		$output = ob_get_clean();
 
@@ -741,23 +741,23 @@ 
 	 * @param  array      $search_criteria Search being performed, if any
 	 * @return array                       Modified `$search_criteria` array
 	 */
-	public static function process_search_dates( $args, $search_criteria = array() ) {
+	public static function process_search_dates($args, $search_criteria = array()) {
 
 		$return_search_criteria = $search_criteria;
 
-		foreach ( array( 'start_date', 'end_date' ) as $key ) {
+		foreach (array('start_date', 'end_date') as $key) {
 
 
 			// Is the start date or end date set in the view or shortcode?
 			// If so, we want to make sure that the search doesn't go outside the bounds defined.
-			if ( ! empty( $args[ $key ] ) ) {
+			if (!empty($args[$key])) {
 
 				// Get a timestamp and see if it's a valid date format
-				$date = strtotime( $args[ $key ] );
+				$date = strtotime($args[$key]);
 
 				// The date was invalid
-				if ( empty( $date ) ) {
-					do_action( 'gravityview_log_error', __METHOD__ . ' Invalid ' . $key . ' date format: ' . $args[ $key ] );
+				if (empty($date)) {
+					do_action('gravityview_log_error', __METHOD__.' Invalid '.$key.' date format: '.$args[$key]);
 					continue;
 				}
 
@@ -765,12 +765,12 @@ 
 				$datetime_format = 'Y-m-d H:i:s';
 				$search_is_outside_view_bounds = false;
 
-				if( ! empty( $search_criteria[ $key ] ) ) {
+				if (!empty($search_criteria[$key])) {
 
-					$search_date = strtotime( $search_criteria[ $key ] );
+					$search_date = strtotime($search_criteria[$key]);
 
 					// The search is for entries before the start date defined by the settings
-					switch ( $key ) {
+					switch ($key) {
 						case 'end_date':
 							/**
 							 * If the end date is formatted as 'Y-m-d', it should be formatted without hours and seconds
@@ -780,28 +780,28 @@ 
 							 *
 							 * @see GFFormsModel::get_date_range_where
 							 */
-							$datetime_format               = gravityview_is_valid_datetime( $args[ $key ] ) ? 'Y-m-d' : 'Y-m-d H:i:s';
-							$search_is_outside_view_bounds = ( $search_date > $date );
+							$datetime_format               = gravityview_is_valid_datetime($args[$key]) ? 'Y-m-d' : 'Y-m-d H:i:s';
+							$search_is_outside_view_bounds = ($search_date > $date);
 							break;
 						case 'start_date':
-							$search_is_outside_view_bounds = ( $search_date < $date );
+							$search_is_outside_view_bounds = ($search_date < $date);
 							break;
 					}
 				}
 
 				// If there is no search being performed, or if there is a search being performed that's outside the bounds
-				if ( empty( $search_criteria[ $key ] ) || $search_is_outside_view_bounds ) {
+				if (empty($search_criteria[$key]) || $search_is_outside_view_bounds) {
 
 					// Then we override the search and re-set the start date
-					$return_search_criteria[ $key ] = date_i18n( $datetime_format , $date, true );
+					$return_search_criteria[$key] = date_i18n($datetime_format, $date, true);
 				}
 			}
 		}
 
-		if( isset( $return_search_criteria['start_date'] ) && isset( $return_search_criteria['end_date'] ) ) {
+		if (isset($return_search_criteria['start_date']) && isset($return_search_criteria['end_date'])) {
 			// The start date is AFTER the end date. This will result in no results, but let's not force the issue.
-			if ( strtotime( $return_search_criteria['start_date'] ) > strtotime( $return_search_criteria['end_date'] ) ) {
-				do_action( 'gravityview_log_error', __METHOD__ . ' Invalid search: the start date is after the end date.', $return_search_criteria );
+			if (strtotime($return_search_criteria['start_date']) > strtotime($return_search_criteria['end_date'])) {
+				do_action('gravityview_log_error', __METHOD__.' Invalid search: the start date is after the end date.', $return_search_criteria);
 			}
 		}
 
@@ -816,13 +816,13 @@ 
 	 * @param  array      $search_criteria Search being performed, if any
 	 * @return array                       Modified `$search_criteria` array
 	 */
-	public static function process_search_only_approved( $args, $search_criteria ) {
+	public static function process_search_only_approved($args, $search_criteria) {
 
-		if ( ! empty( $args['show_only_approved'] ) ) {
-			$search_criteria['field_filters'][] = array( 'key' => 'is_approved', 'value' => 'Approved' );
+		if (!empty($args['show_only_approved'])) {
+			$search_criteria['field_filters'][] = array('key' => 'is_approved', 'value' => 'Approved');
 			$search_criteria['field_filters']['mode'] = 'all'; // force all the criterias to be met
 
-			do_action( 'gravityview_log_debug', '[process_search_only_approved] Search Criteria if show only approved: ', $search_criteria );
+			do_action('gravityview_log_debug', '[process_search_only_approved] Search Criteria if show only approved: ', $search_criteria);
 		}
 
 		return $search_criteria;
@@ -842,16 +842,16 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function is_entry_approved( $entry, $args = array() ) {
+	public static function is_entry_approved($entry, $args = array()) {
 
-		if ( empty( $entry['id'] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args['show_only_approved'] ) ) {
+		if (empty($entry['id']) || (array_key_exists('show_only_approved', $args) && !$args['show_only_approved'])) {
 			// is implicitly approved if entry is null or View settings doesn't require to check for approval
 			return true;
 		}
 
-		$is_approved = gform_get_meta( $entry['id'], 'is_approved' );
+		$is_approved = gform_get_meta($entry['id'], 'is_approved');
 
-		if ( $is_approved ) {
+		if ($is_approved) {
 			return true;
 		}
 
@@ -872,47 +872,47 @@ 
 	 * @param  int $form_id Gravity Forms form ID
 	 * @return array          Array of search parameters, formatted in Gravity Forms mode, using `status` key set to "active" by default, `field_filters` array with `key`, `value` and `operator` keys.
 	 */
-	public static function get_search_criteria( $args, $form_id ) {
+	public static function get_search_criteria($args, $form_id) {
 
 		// Search Criteria
-		$search_criteria = apply_filters( 'gravityview_fe_search_criteria', array( 'field_filters' => array() ), $form_id );
+		$search_criteria = apply_filters('gravityview_fe_search_criteria', array('field_filters' => array()), $form_id);
 
 		$original_search_criteria = $search_criteria;
 
-		do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after hook gravityview_fe_search_criteria: ', $search_criteria );
+		do_action('gravityview_log_debug', '[get_search_criteria] Search Criteria after hook gravityview_fe_search_criteria: ', $search_criteria);
 
 		// implicity search
-		if ( ! empty( $args['search_value'] ) ) {
+		if (!empty($args['search_value'])) {
 
 			// Search operator options. Options: `is` or `contains`
-			$operator = ! empty( $args['search_operator'] ) && in_array( $args['search_operator'], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args['search_operator'] : 'contains';
+			$operator = !empty($args['search_operator']) && in_array($args['search_operator'], array('is', 'isnot', '>', '<', 'contains')) ? $args['search_operator'] : 'contains';
 
 			$search_criteria['field_filters'][] = array(
-				'key' => rgget( 'search_field', $args ), // The field ID to search
-				'value' => esc_attr( $args['search_value'] ), // The value to search
+				'key' => rgget('search_field', $args), // The field ID to search
+				'value' => esc_attr($args['search_value']), // The value to search
 				'operator' => $operator,
 			);
 		}
 
-		if( $search_criteria !== $original_search_criteria ) {
-			do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after implicity search: ', $search_criteria );
+		if ($search_criteria !== $original_search_criteria) {
+			do_action('gravityview_log_debug', '[get_search_criteria] Search Criteria after implicity search: ', $search_criteria);
 		}
 
 		// Handle setting date range
-		$search_criteria = self::process_search_dates( $args, $search_criteria );
+		$search_criteria = self::process_search_dates($args, $search_criteria);
 
-		if( $search_criteria !== $original_search_criteria ) {
-			do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after date params: ', $search_criteria );
+		if ($search_criteria !== $original_search_criteria) {
+			do_action('gravityview_log_debug', '[get_search_criteria] Search Criteria after date params: ', $search_criteria);
 		}
 
 		// remove not approved entries
-		$search_criteria = self::process_search_only_approved( $args, $search_criteria );
+		$search_criteria = self::process_search_only_approved($args, $search_criteria);
 
 		/**
 		 * @filter `gravityview_status` Modify entry status requirements to be included in search results.
 		 * @param string $status Default: `active`. Accepts all Gravity Forms entry statuses, including `spam` and `trash`
 		 */
-		$search_criteria['status'] = apply_filters( 'gravityview_status', 'active', $args );
+		$search_criteria['status'] = apply_filters('gravityview_status', 'active', $args);
 
 		return $search_criteria;
 	}
@@ -946,29 +946,29 @@ 
 	 * @param int $form_id Gravity Forms Form ID
 	 * @return array Associative array with `count`, `entries`, and `paging` keys. `count` has the total entries count, `entries` is an array with Gravity Forms full entry data, `paging` is an array with `offset` and `page_size` keys
 	 */
-	public static function get_view_entries( $args, $form_id ) {
+	public static function get_view_entries($args, $form_id) {
 
-		do_action( 'gravityview_log_debug', '[get_view_entries] init' );
+		do_action('gravityview_log_debug', '[get_view_entries] init');
 		// start filters and sorting
 
 		/**
 		 * Process search parameters
 		 * @var array
 		 */
-		$search_criteria = self::get_search_criteria( $args, $form_id );
+		$search_criteria = self::get_search_criteria($args, $form_id);
 
 		// Paging & offset
-		$page_size = ! empty( $args['page_size'] ) ? intval( $args['page_size'] ) : apply_filters( 'gravityview_default_page_size', 25 );
+		$page_size = !empty($args['page_size']) ? intval($args['page_size']) : apply_filters('gravityview_default_page_size', 25);
 
 		if ( -1 === $page_size ) {
 			$page_size = PHP_INT_MAX;
 		}
 
-		if ( isset( $args['offset'] ) ) {
-			$offset = intval( $args['offset'] );
+		if (isset($args['offset'])) {
+			$offset = intval($args['offset']);
 		} else {
-			$curr_page = empty( $_GET['pagenum'] ) ? 1 : intval( $_GET['pagenum'] );
-			$offset = ( $curr_page - 1 ) * $page_size;
+			$curr_page = empty($_GET['pagenum']) ? 1 : intval($_GET['pagenum']);
+			$offset = ($curr_page - 1) * $page_size;
 		}
 
 		$paging = array(
@@ -976,16 +976,16 @@ 
 			'page_size' => $page_size,
 		);
 
-		do_action( 'gravityview_log_debug', '[get_view_entries] Paging: ', $paging );
+		do_action('gravityview_log_debug', '[get_view_entries] Paging: ', $paging);
 
 		// Sorting
-		$sorting = self::updateViewSorting( $args, $form_id );
+		$sorting = self::updateViewSorting($args, $form_id);
 
 		$parameters = array(
 			'search_criteria' => $search_criteria,
 			'sorting' => $sorting,
 			'paging' => $paging,
-			'cache' => isset( $args['cache'] ) ? $args['cache'] : true,
+			'cache' => isset($args['cache']) ? $args['cache'] : true,
 		);
 
 		/**
@@ -1003,22 +1003,22 @@ 
 		 * }
 		 * @param int $form_id ID of Gravity Forms form
 		 */
-		$parameters = apply_filters( 'gravityview_get_entries', $parameters, $args, $form_id );
+		$parameters = apply_filters('gravityview_get_entries', $parameters, $args, $form_id);
 
 		/**
 		 * @filter `gravityview_get_entries_{View ID}` Filter get entries criteria
 		 * @param array $parameters Array with `search_criteria`, `sorting` and `paging` keys.
 		 * @param array $args View configuration args.
 		 */
-		$parameters = apply_filters( 'gravityview_get_entries_'.$args['id'], $parameters, $args, $form_id );
+		$parameters = apply_filters('gravityview_get_entries_'.$args['id'], $parameters, $args, $form_id);
 
-		do_action( 'gravityview_log_debug', '[get_view_entries] $parameters passed to gravityview_get_entries(): ', $parameters );
+		do_action('gravityview_log_debug', '[get_view_entries] $parameters passed to gravityview_get_entries(): ', $parameters);
 
 		//fetch entries
 		$count = 0;
-		$entries = gravityview_get_entries( $form_id, $parameters, $count );
+		$entries = gravityview_get_entries($form_id, $parameters, $count);
 
-		do_action( 'gravityview_log_debug', sprintf( '[get_view_entries] Get Entries. Found: %s entries', $count ), $entries );
+		do_action('gravityview_log_debug', sprintf('[get_view_entries] Get Entries. Found: %s entries', $count), $entries);
 
 		/**
 		 * @filter `gravityview_view_entries` Filter the entries output to the View
@@ -1026,7 +1026,7 @@ 
 		 * @param array $args View settings associative array
 		 * @var array
 		 */
-		$entries = apply_filters( 'gravityview_view_entries', $entries, $args );
+		$entries = apply_filters('gravityview_view_entries', $entries, $args);
 
 		/**
 		 * @filter `gravityview/view/entries` Filter the entries output to the View
@@ -1034,7 +1034,7 @@ 
 		 * @param array $args View settings associative array
 		 * @since 1.5.2
 		 */
-		return apply_filters( 'gravityview/view/entries', compact( 'count', 'entries', 'paging' ), $args );
+		return apply_filters('gravityview/view/entries', compact('count', 'entries', 'paging'), $args);
 
 	}
 
@@ -1048,24 +1048,24 @@ 
 	 * @param int $form_id The ID of the form used to sort
 	 * @return array $sorting Array with `key`, `direction` and `is_numeric` keys
 	 */
-	public static function updateViewSorting( $args, $form_id ) {
+	public static function updateViewSorting($args, $form_id) {
 		$sorting = array();
-		$sort_field_id = isset( $_GET['sort'] ) ? $_GET['sort'] : rgar( $args, 'sort_field' );
-		$sort_direction = isset( $_GET['dir'] ) ? $_GET['dir'] : rgar( $args, 'sort_direction' );
+		$sort_field_id = isset($_GET['sort']) ? $_GET['sort'] : rgar($args, 'sort_field');
+		$sort_direction = isset($_GET['dir']) ? $_GET['dir'] : rgar($args, 'sort_direction');
 
-		$sort_field_id = self::_override_sorting_id_by_field_type( $sort_field_id, $form_id );
+		$sort_field_id = self::_override_sorting_id_by_field_type($sort_field_id, $form_id);
 
-		if ( ! empty( $sort_field_id ) ) {
+		if (!empty($sort_field_id)) {
 			$sorting = array(
 				'key' => $sort_field_id,
-				'direction' => strtolower( $sort_direction ),
-				'is_numeric' => GVCommon::is_field_numeric( $form_id, $sort_field_id )
+				'direction' => strtolower($sort_direction),
+				'is_numeric' => GVCommon::is_field_numeric($form_id, $sort_field_id)
 			);
 		}
 
-		GravityView_View::getInstance()->setSorting( $sorting );
+		GravityView_View::getInstance()->setSorting($sorting);
 
-		do_action( 'gravityview_log_debug', '[updateViewSorting] Sort Criteria : ', $sorting );
+		do_action('gravityview_log_debug', '[updateViewSorting] Sort Criteria : ', $sorting);
 
 		return $sorting;
 
@@ -1085,17 +1085,17 @@ 
 	 *
 	 * @return string Possibly modified sorting ID
 	 */
-	private static function _override_sorting_id_by_field_type( $sort_field_id, $form_id ) {
+	private static function _override_sorting_id_by_field_type($sort_field_id, $form_id) {
 
-		$form = gravityview_get_form( $form_id );
+		$form = gravityview_get_form($form_id);
 
-		$sort_field = GFFormsModel::get_field( $form, $sort_field_id );
+		$sort_field = GFFormsModel::get_field($form, $sort_field_id);
 
-		switch ( $sort_field['type'] ) {
+		switch ($sort_field['type']) {
 
 			case 'address':
 				// Sorting by full address
-				if ( floatval( $sort_field_id ) === floor( $sort_field_id ) ) {
+				if (floatval($sort_field_id) === floor($sort_field_id)) {
 
 					/**
 					 * Override how to sort when sorting address
@@ -1106,9 +1106,9 @@ 
 					 * @param string $sort_field_id Field used for sorting
 					 * @param int $form_id GF Form ID
 					 */
-					$address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id );
+					$address_part = apply_filters('gravityview/sorting/address', 'city', $sort_field_id, $form_id);
 
-					switch( strtolower( $address_part ) ){
+					switch (strtolower($address_part)) {
 						case 'street':
 							$sort_field_id .= '.1';
 							break;
@@ -1134,7 +1134,7 @@ 
 				break;
 			case 'name':
 				// Sorting by full name, not first, last, etc.
-				if ( floatval( $sort_field_id ) === floor( $sort_field_id ) ) {
+				if (floatval($sort_field_id) === floor($sort_field_id)) {
 					/**
 					 * @filter `gravityview/sorting/full-name` Override how to sort when sorting full name.
 					 * @since 1.7.4
@@ -1142,9 +1142,9 @@ 
 					 * @param[in] string $sort_field_id Field used for sorting
 					 * @param[in] int $form_id GF Form ID
 					 */
-					$name_part = apply_filters( 'gravityview/sorting/full-name', 'first', $sort_field_id, $form_id );
+					$name_part = apply_filters('gravityview/sorting/full-name', 'first', $sort_field_id, $form_id);
 
-					if ( 'last' === strtolower( $name_part ) ) {
+					if ('last' === strtolower($name_part)) {
 						$sort_field_id .= '.6';
 					} else {
 						$sort_field_id .= '.3';
@@ -1163,7 +1163,7 @@ 
 				 * @param[in,out] string $name_part Field used for sorting
 				 * @param[in] int $form_id GF Form ID
 				 */
-				$sort_field_id = apply_filters( 'gravityview/sorting/time', $sort_field_id, $form_id );
+				$sort_field_id = apply_filters('gravityview/sorting/time', $sort_field_id, $form_id);
 				break;
 		}
 
@@ -1178,7 +1178,7 @@ 
 
 		$var_name = GravityView_Post_Types::get_entry_var_name();
 
-		$single_entry = get_query_var( $var_name );
+		$single_entry = get_query_var($var_name);
 
 		/**
 		 * Modify the entry that is being displayed.
@@ -1186,9 +1186,9 @@ 
 		 * @internal Should only be used by things like the oEmbed functionality.
 		 * @since 1.6
 		 */
-		$single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry );
+		$single_entry = apply_filters('gravityview/is_single_entry', $single_entry);
 
-		if ( empty( $single_entry ) ){
+		if (empty($single_entry)) {
 			return false;
 		} else {
 			return $single_entry;
@@ -1205,38 +1205,38 @@ 
 	public function add_scripts_and_styles() {
 		global $post, $posts;
 		// enqueue template specific styles
-		if ( $this->getGvOutputData() ) {
+		if ($this->getGvOutputData()) {
 
 			$views = $this->getGvOutputData()->get_views();
 
-			foreach ( $views as $view_id => $data ) {
+			foreach ($views as $view_id => $data) {
 
 				/**
 				 * Don't enqueue the scripts or styles if it's not going to be displayed.
 				 * @since 1.15
 				 */
-				if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
+				if (is_user_logged_in() && false === GVCommon::has_cap('read_gravityview', $view_id)) {
 					continue;
 				}
 
 				// By default, no thickbox
-				$js_dependencies = array( 'jquery', 'gravityview-jquery-cookie' );
+				$js_dependencies = array('jquery', 'gravityview-jquery-cookie');
 				$css_dependencies = array();
 
 				// If the thickbox is enqueued, add dependencies
-				if ( ! empty( $data['atts']['lightbox'] ) ) {
+				if (!empty($data['atts']['lightbox'])) {
 
 					/**
 					 * @filter `gravity_view_lightbox_script` Override the lightbox script to enqueue. Default: `thickbox`
 					 * @param string $script_slug If you want to use a different lightbox script, return the name of it here.
 					 */
-					$js_dependencies[] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' );
+					$js_dependencies[] = apply_filters('gravity_view_lightbox_script', 'thickbox');
 
 					/**
 					 * @filter `gravity_view_lightbox_style` Modify the lightbox CSS slug. Default: `thickbox`
 					 * @param string $script_slug If you want to use a different lightbox script, return the name of its CSS file here.
 					 */
-					$css_dependencies[] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' );
+					$css_dependencies[] = apply_filters('gravity_view_lightbox_style', 'thickbox');
 				}
 
 				/**
@@ -1244,34 +1244,34 @@ 
 				 * @see https://github.com/katzwebservices/GravityView/issues/536
 				 * @since 1.15
 				 */
-				if( gravityview_view_has_single_checkbox_or_radio( $data['form'], $data['fields'] ) ) {
+				if (gravityview_view_has_single_checkbox_or_radio($data['form'], $data['fields'])) {
 					$css_dependencies[] = 'dashicons';
 				}
 
-				wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'includes/lib/jquery-cookie/jquery_cookie.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true );
+				wp_register_script('gravityview-jquery-cookie', plugins_url('includes/lib/jquery-cookie/jquery_cookie.js', GRAVITYVIEW_FILE), array('jquery'), GravityView_Plugin::version, true);
 
-				$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
+				$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
 
-				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ) , GravityView_Plugin::version, true );
+				wp_register_script('gravityview-fe-view', plugins_url('assets/js/fe-views'.$script_debug.'.js', GRAVITYVIEW_FILE), apply_filters('gravityview_js_dependencies', $js_dependencies), GravityView_Plugin::version, true);
 
-				wp_enqueue_script( 'gravityview-fe-view' );
+				wp_enqueue_script('gravityview-fe-view');
 
-				if ( ! empty( $data['atts']['sort_columns'] ) ) {
-					wp_enqueue_style( 'gravityview_font', plugins_url( 'assets/css/font.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' );
+				if (!empty($data['atts']['sort_columns'])) {
+					wp_enqueue_style('gravityview_font', plugins_url('assets/css/font.css', GRAVITYVIEW_FILE), $css_dependencies, GravityView_Plugin::version, 'all');
 				}
 
-				wp_enqueue_style( 'gravityview_default_style', plugins_url( 'templates/css/gv-default-styles.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' );
+				wp_enqueue_style('gravityview_default_style', plugins_url('templates/css/gv-default-styles.css', GRAVITYVIEW_FILE), $css_dependencies, GravityView_Plugin::version, 'all');
 
-				self::add_style( $data['template_id'] );
+				self::add_style($data['template_id']);
 
 			}
 
-			if ( 'wp_print_footer_scripts' === current_filter() ) {
+			if ('wp_print_footer_scripts' === current_filter()) {
 
 				$js_localization = array(
 					'cookiepath' => COOKIEPATH,
-					'clear' => _x( 'Clear', 'Clear all data from the form', 'gravityview' ),
-					'reset' => _x( 'Reset', 'Reset the search form to the state that existed on page load', 'gravityview' ),
+					'clear' => _x('Clear', 'Clear all data from the form', 'gravityview'),
+					'reset' => _x('Reset', 'Reset the search form to the state that existed on page load', 'gravityview'),
 				);
 
 				/**
@@ -1279,9 +1279,9 @@ 
 				 * @param array $js_localization The data padded to the Javascript file
 				 * @param array $views Array of View data arrays with View settings
 				 */
-				$js_localization = apply_filters( 'gravityview_js_localization', $js_localization, $views );
+				$js_localization = apply_filters('gravityview_js_localization', $js_localization, $views);
 
-				wp_localize_script( 'gravityview-fe-view', 'gvGlobals', $js_localization );
+				wp_localize_script('gravityview-fe-view', 'gvGlobals', $js_localization);
 			}
 		}
 	}
@@ -1290,15 +1290,15 @@ 
 	 * Add template extra style if exists
 	 * @param string $template_id
 	 */
-	public static function add_style( $template_id ) {
+	public static function add_style($template_id) {
 
-		if ( ! empty( $template_id ) && wp_style_is( 'gravityview_style_' . $template_id, 'registered' ) ) {
-			do_action( 'gravityview_log_debug', sprintf( '[add_style] Adding extra template style for %s', $template_id ) );
-			wp_enqueue_style( 'gravityview_style_' . $template_id );
-		} elseif ( empty( $template_id ) ) {
-			do_action( 'gravityview_log_error', '[add_style] Cannot add template style; template_id is empty' );
+		if (!empty($template_id) && wp_style_is('gravityview_style_'.$template_id, 'registered')) {
+			do_action('gravityview_log_debug', sprintf('[add_style] Adding extra template style for %s', $template_id));
+			wp_enqueue_style('gravityview_style_'.$template_id);
+		} elseif (empty($template_id)) {
+			do_action('gravityview_log_error', '[add_style] Cannot add template style; template_id is empty');
 		} else {
-			do_action( 'gravityview_log_error', sprintf( '[add_style] Cannot add template style; %s is not registered', 'gravityview_style_'.$template_id ) );
+			do_action('gravityview_log_error', sprintf('[add_style] Cannot add template style; %s is not registered', 'gravityview_style_'.$template_id));
 		}
 
 	}
@@ -1317,17 +1317,17 @@ 
 	 *
 	 * @return string Field Label
 	 */
-	public function add_columns_sort_links( $label = '', $field, $form ) {
+	public function add_columns_sort_links($label = '', $field, $form) {
 
 		/**
 		 * Not a table-based template; don't add sort icons
 		 * @since 1.12
 		 */
-		if( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
+		if (!preg_match('/table/ism', GravityView_View::getInstance()->getTemplatePartSlug())) {
 			return $label;
 		}
 
-		if ( ! $this->is_field_sortable( $field['id'], $form ) ) {
+		if (!$this->is_field_sortable($field['id'], $form)) {
 			return $label;
 		}
 
@@ -1335,16 +1335,16 @@ 
 
 		$class = 'gv-sort icon';
 
-		$sort_field_id = self::_override_sorting_id_by_field_type( $field['id'], $form['id'] );
+		$sort_field_id = self::_override_sorting_id_by_field_type($field['id'], $form['id']);
 
 		$sort_args = array(
 			'sort' => $field['id'],
 			'dir' => 'asc',
 		);
 
-		if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) {
+		if (!empty($sorting['key']) && (string)$sort_field_id === (string)$sorting['key']) {
 			//toggle sorting direction.
-			if ( 'asc' === $sorting['direction'] ) {
+			if ('asc' === $sorting['direction']) {
 				$sort_args['dir'] = 'desc';
 				$class .= ' gv-icon-sort-desc';
 			} else {
@@ -1355,9 +1355,9 @@ 
 			$class .= ' gv-icon-caret-up-down';
 		}
 
-		$url = add_query_arg( $sort_args, remove_query_arg( array('pagenum') ) );
+		$url = add_query_arg($sort_args, remove_query_arg(array('pagenum')));
 
-		return '<a href="'. esc_url_raw( $url ) .'" class="'. $class .'" ></a>&nbsp;'. $label;
+		return '<a href="'.esc_url_raw($url).'" class="'.$class.'" ></a>&nbsp;'.$label;
 
 	}
 
@@ -1371,10 +1371,10 @@ 
 	 *
 	 * @return bool True: Yes, field is sortable; False: not sortable
 	 */
-	public function is_field_sortable( $field_id = '', $form ) {
+	public function is_field_sortable($field_id = '', $form) {
 
-		if( is_numeric( $field_id ) ) {
-			$field = GFFormsModel::get_field( $form, $field_id );
+		if (is_numeric($field_id)) {
+			$field = GFFormsModel::get_field($form, $field_id);
 			$field_id = $field->type;
 		}
 
@@ -1390,13 +1390,13 @@ 
 		 * @param string $field_id Field ID to check whether the field is sortable
 		 * @param array $form Gravity Forms form
 		 */
-		$not_sortable = apply_filters( 'gravityview/sortable/field_blacklist', $not_sortable, $field_id, $form );
+		$not_sortable = apply_filters('gravityview/sortable/field_blacklist', $not_sortable, $field_id, $form);
 
-		if ( in_array( $field_id, $not_sortable ) ) {
+		if (in_array($field_id, $not_sortable)) {
 			return false;
 		}
 
-		return apply_filters( "gravityview/sortable/formfield_{$form['id']}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
+		return apply_filters("gravityview/sortable/formfield_{$form['id']}_{$field_id}", apply_filters("gravityview/sortable/field_{$field_id}", true, $form));
 
 	}
 

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

Doc Comments +1 added lines, -1 removed lines

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

Spacing +71 added lines, -71 removed lines

@@ -15,12 +15,12 @@ 
 	function __construct() {
 
 		// Only run on Admin
-		if ( !is_admin() ) {
+		if (!is_admin()) {
 			return;
 		}
 
 		// If the Duplicate Post plugin is active, don't run.
-		if( defined('DUPLICATE_POST_CURRENT_VERSION') ) {
+		if (defined('DUPLICATE_POST_CURRENT_VERSION')) {
 			return;
 		}
 
@@ -33,18 +33,18 @@ 
 	 * @return void
 	 */
 	private function add_hooks() {
-		add_filter( 'post_row_actions', array( $this, 'make_duplicate_link_row' ), 10, 2 );
+		add_filter('post_row_actions', array($this, 'make_duplicate_link_row'), 10, 2);
 
 		/**
 		 * Connect actions to functions
 		 */
-		add_action( 'admin_action_duplicate_view', array( $this, 'save_as_new_view' ) );
-		add_action( 'admin_action_duplicate_view_as_draft', array( $this, 'save_as_new_view_draft' ) );
+		add_action('admin_action_duplicate_view', array($this, 'save_as_new_view'));
+		add_action('admin_action_duplicate_view_as_draft', array($this, 'save_as_new_view_draft'));
 
 		// Using our action hooks to copy meta fields
-		add_action( 'gv_duplicate_view', array( $this, 'copy_view_meta_info' ), 10, 2 );
+		add_action('gv_duplicate_view', array($this, 'copy_view_meta_info'), 10, 2);
 
-		add_filter( 'gravityview_connected_form_links', array( $this, 'connected_form_links' ), 10, 2 );
+		add_filter('gravityview_connected_form_links', array($this, 'connected_form_links'), 10, 2);
 	}
 
 	/**
@@ -55,15 +55,15 @@ 
 	 *
 	 * @return array If it's the All Views page, return unedited. Otherwise, add a link to create cloned draft of View
 	 */
-	function connected_form_links( $links = array(), $form = array() ) {
+	function connected_form_links($links = array(), $form = array()) {
 		/** @global WP_Post $post */
 		global $post;
 
 		// We only want to add Clone links to the Edit View metabox
-		if( !$this->is_all_views_page() ) {
+		if (!$this->is_all_views_page()) {
 
-			if( $duplicate_links = $this->make_duplicate_link_row( array(), $post ) ) {
-				$links[] = '<span>' . $duplicate_links['edit_as_new_draft'] . '</span>';
+			if ($duplicate_links = $this->make_duplicate_link_row(array(), $post)) {
+				$links[] = '<span>'.$duplicate_links['edit_as_new_draft'].'</span>';
 			}
 
 		}
@@ -88,12 +88,12 @@ 
 	 *
 	 * @since 1.6
 	 */
-	private function current_user_can_copy( $post ) {
+	private function current_user_can_copy($post) {
 
-		$id = is_object( $post ) ? $post->ID : $post;
+		$id = is_object($post) ? $post->ID : $post;
 
 		// Can't edit this current View
-		return GVCommon::has_cap( 'copy_gravityviews', $id );
+		return GVCommon::has_cap('copy_gravityviews', $id);
 
 	}
 
@@ -104,10 +104,10 @@ 
 	 * @param string $status The post status
 	 * @since 1.6
 	 */
-	private function create_duplicate( $post, $status = '' ) {
+	private function create_duplicate($post, $status = '') {
 
 		// We only want to clone Views
-		if ( $post->post_type !== 'gravityview' ) {
+		if ($post->post_type !== 'gravityview') {
 			return;
 		}
 
@@ -119,7 +119,7 @@ 
 		 * @param string|null If string, the status to set for the new View. If empty, use existing View status.
 		 * @param WP_Post $post View being cloned
 		 */
-		$new_view_status = apply_filters('gravityview/duplicate-view/status', $status, $post );
+		$new_view_status = apply_filters('gravityview/duplicate-view/status', $status, $post);
 
 		$new_view = array(
 			'menu_order'     => $post->menu_order,
@@ -131,7 +131,7 @@ 
 			'post_mime_type' => $post->post_mime_type,
 			'post_parent'    => $post->post_parent,
 			'post_password'  => $post->post_password,
-			'post_status'    => ( empty( $new_view_status ) ) ? $post->post_status : $new_view_status,
+			'post_status'    => (empty($new_view_status)) ? $post->post_status : $new_view_status,
 			'post_title'     => $post->post_title,
 			'post_type'      => $post->post_type,
 		);
@@ -142,11 +142,11 @@ 
 		 * @param boolean $copy_date Whether the copy the date from the existing View. Default: `false`
 		 * @param WP_Post $post View being cloned
 		 */
-		$copy_date = apply_filters('gravityview/duplicate-view/copy-date', false, $post );
+		$copy_date = apply_filters('gravityview/duplicate-view/copy-date', false, $post);
 
-		if ( $copy_date ) {
+		if ($copy_date) {
 			$new_view['post_date']     = $new_post_date = $post->post_date;
-			$new_view['post_date_gmt'] = get_gmt_from_date( $new_post_date );
+			$new_view['post_date_gmt'] = get_gmt_from_date($new_post_date);
 		}
 
 		/**
@@ -155,15 +155,15 @@ 
 		 * @param array $new_view Array of settings to be passed to wp_insert_post()
 		 * @param WP_Post $post View being cloned
 		 */
-		$new_view = apply_filters('gravityview/duplicate-view/new-view', $new_view, $post );
+		$new_view = apply_filters('gravityview/duplicate-view/new-view', $new_view, $post);
 
 		// Magic happens here.
-		$new_view_id = wp_insert_post( $new_view );
+		$new_view_id = wp_insert_post($new_view);
 
 		// If the copy is published or scheduled, we have to set a proper slug.
-		if ( $new_view_status == 'publish' || $new_view_status == 'future' ) {
+		if ($new_view_status == 'publish' || $new_view_status == 'future') {
 
-			$view_name = wp_unique_post_slug( $post->post_name, $new_view_id, $new_view_status, $post->post_type, $post->post_parent );
+			$view_name = wp_unique_post_slug($post->post_name, $new_view_id, $new_view_status, $post->post_type, $post->post_parent);
 
 			$new_view_name_array = array(
 				'ID' => $new_view_id,
@@ -171,7 +171,7 @@ 
 			);
 
 			// Update the post into the database
-			wp_update_post( $new_view_name_array );
+			wp_update_post($new_view_name_array);
 		}
 
 		/**
@@ -181,11 +181,11 @@ 
 		 * @param int $new_view_id The ID of the newly created View
 		 * @param WP_Post The View that was just cloned
 		 */
-		do_action( 'gv_duplicate_view', $new_view_id, $post );
+		do_action('gv_duplicate_view', $new_view_id, $post);
 
-		delete_post_meta( $new_view_id, '_dp_original' );
+		delete_post_meta($new_view_id, '_dp_original');
 
-		add_post_meta( $new_view_id, '_dp_original', $post->ID, false );
+		add_post_meta($new_view_id, '_dp_original', $post->ID, false);
 
 		return $new_view_id;
 	}
@@ -200,23 +200,23 @@ 
 	 *
 	 * @return void
 	 */
-	public function copy_view_meta_info( $new_id, $post ) {
+	public function copy_view_meta_info($new_id, $post) {
 
-		$post_meta_keys = get_post_custom_keys( $post->ID );
+		$post_meta_keys = get_post_custom_keys($post->ID);
 
-		if ( empty( $post_meta_keys ) ) {
+		if (empty($post_meta_keys)) {
 			return;
 		}
 
-		foreach ( $post_meta_keys as $meta_key ) {
+		foreach ($post_meta_keys as $meta_key) {
 
-			$meta_values = get_post_custom_values( $meta_key, $post->ID );
+			$meta_values = get_post_custom_values($meta_key, $post->ID);
 
-			foreach ( $meta_values as $meta_value ) {
+			foreach ($meta_values as $meta_value) {
 
-				$meta_value = maybe_unserialize( $meta_value );
+				$meta_value = maybe_unserialize($meta_value);
 
-				add_post_meta( $new_id, $meta_key, $meta_value );
+				add_post_meta($new_id, $meta_key, $meta_value);
 			}
 		}
 	}
@@ -228,22 +228,22 @@ 
 	 * @param array $actions Row action links. Defaults are 'Edit', 'Quick Edit', 'Restore, 'Trash', 'Delete Permanently', 'Preview', and 'View'
 	 * @param WP_Post $post
 	 */
-	public function make_duplicate_link_row( $actions, $post ) {
+	public function make_duplicate_link_row($actions, $post) {
 
 		// Only process on GravityView Views
-		if ( get_post_type( $post ) === 'gravityview' && $this->current_user_can_copy( $post ) ) {
+		if (get_post_type($post) === 'gravityview' && $this->current_user_can_copy($post)) {
 
-			$clone_link = $this->get_clone_view_link( $post->ID, 'display', false );
-			$clone_text = __( 'Clone', 'gravityview' );
-			$clone_title = __( 'Clone this View', 'gravityview' );
+			$clone_link = $this->get_clone_view_link($post->ID, 'display', false);
+			$clone_text = __('Clone', 'gravityview');
+			$clone_title = __('Clone this View', 'gravityview');
 
-			$actions['clone'] = gravityview_get_link( $clone_link, $clone_text, 'title='.$clone_title );
+			$actions['clone'] = gravityview_get_link($clone_link, $clone_text, 'title='.$clone_title);
 
-			$clone_draft_link = $this->get_clone_view_link( $post->ID );
-			$clone_draft_text = $this->is_all_views_page() ? __( 'New Draft', 'gravityview' ) : __( 'Clone View', 'gravityview' );
-			$clone_draft_title = __( 'Copy as a new draft View', 'gravityview' );
+			$clone_draft_link = $this->get_clone_view_link($post->ID);
+			$clone_draft_text = $this->is_all_views_page() ? __('New Draft', 'gravityview') : __('Clone View', 'gravityview');
+			$clone_draft_title = __('Copy as a new draft View', 'gravityview');
 
-			$actions['edit_as_new_draft'] = gravityview_get_link( $clone_draft_link, esc_html( $clone_draft_text ), 'title='.$clone_draft_title );
+			$actions['edit_as_new_draft'] = gravityview_get_link($clone_draft_link, esc_html($clone_draft_text), 'title='.$clone_draft_title);
 		}
 
 		return $actions;
@@ -259,31 +259,31 @@ 
 	 * @param string $draft Optional, default to true
 	 * @return string
 	 */
-	private function get_clone_view_link( $id = 0, $context = 'display', $draft = true ) {
+	private function get_clone_view_link($id = 0, $context = 'display', $draft = true) {
 
 		// Make sure they have permission
-		if ( false === $this->current_user_can_copy( $id ) ) {
+		if (false === $this->current_user_can_copy($id)) {
 			return '';
 		}
 
 		// Verify the View exists
-		if ( !$view = get_post( $id ) ) {
+		if (!$view = get_post($id)) {
 			return '';
 		}
 
 		$action_name = $draft ? "duplicate_view_as_draft" : "duplicate_view";
 
-		$action = '?action=' . $action_name . '&post=' . $view->ID;
+		$action = '?action='.$action_name.'&post='.$view->ID;
 
-		if ( 'display' == $context ) {
-			$action = esc_html( $action );
+		if ('display' == $context) {
+			$action = esc_html($action);
 		}
 
-		$post_type_object = get_post_type_object( $view->post_type );
+		$post_type_object = get_post_type_object($view->post_type);
 
 		/** If there's no gravityview post type for some reason, abort! */
-		if ( !$post_type_object ) {
-			do_action( 'gravityview_log_error', __METHOD__ . ' No gravityview post type exists when trying to clone the View.', $view );
+		if (!$post_type_object) {
+			do_action('gravityview_log_error', __METHOD__.' No gravityview post type exists when trying to clone the View.', $view);
 			return '';
 		}
 
@@ -294,7 +294,7 @@ 
 		 * @param int $view_id View ID
 		 * @param string $context How to display the link. If "display", the URL is run through esc_html(). Default: `display`
 		 */
-		$clone_view_link = apply_filters( 'gravityview/duplicate-view/get_clone_view_link', admin_url( "admin.php". $action ), $view->ID, $context );
+		$clone_view_link = apply_filters('gravityview/duplicate-view/get_clone_view_link', admin_url("admin.php".$action), $view->ID, $context);
 
 		return $clone_view_link;
 	}
@@ -308,7 +308,7 @@ 
 	 * @return void
 	 */
 	public function save_as_new_view_draft() {
-		$this->save_as_new_view( 'draft' );
+		$this->save_as_new_view('draft');
 	}
 
 	/**
@@ -319,38 +319,38 @@ 
 	 * @param string $status The status to set for the new View
 	 * @return void
 	 */
-	public function save_as_new_view( $status = '' ) {
+	public function save_as_new_view($status = '') {
 
-		if ( ! ( isset( $_GET['post'] ) || isset( $_POST['post'] ) ) ) {
-			wp_die( __( 'No post to duplicate has been supplied!', 'gravityview' ) );
+		if (!(isset($_GET['post']) || isset($_POST['post']))) {
+			wp_die(__('No post to duplicate has been supplied!', 'gravityview'));
 		}
 
 		// Get the original post
-		$id   = ( isset( $_GET['post'] ) ? $_GET['post'] : $_POST['post'] );
+		$id = (isset($_GET['post']) ? $_GET['post'] : $_POST['post']);
 
-		if( ! $this->current_user_can_copy( $id ) ) {
-			wp_die( __( 'You don\'t have permission to copy this View.', 'gravityview' ) );
+		if (!$this->current_user_can_copy($id)) {
+			wp_die(__('You don\'t have permission to copy this View.', 'gravityview'));
 		}
 
-		$post = get_post( $id );
+		$post = get_post($id);
 
 		// Copy the post and insert it
-		if ( isset( $post ) && $post != NULL ) {
+		if (isset($post) && $post != NULL) {
 
-			$new_id = $this->create_duplicate( $post, $status );
+			$new_id = $this->create_duplicate($post, $status);
 
-			if ( $status == '' ) {
+			if ($status == '') {
 				// Redirect to the post list screen
-				wp_redirect( admin_url( 'edit.php?post_type=' . $post->post_type ) );
+				wp_redirect(admin_url('edit.php?post_type='.$post->post_type));
 			} else {
 				// Redirect to the edit screen for the new draft post
-				wp_redirect( admin_url( 'post.php?action=edit&post=' . $new_id ) );
+				wp_redirect(admin_url('post.php?action=edit&post='.$new_id));
 			}
 			exit;
 
 		} else {
 
-			wp_die( sprintf( esc_attr__( 'Copy creation failed, could not find original View with ID #%d', 'gravityview' ), $id ) );
+			wp_die(sprintf(esc_attr__('Copy creation failed, could not find original View with ID #%d', 'gravityview'), $id));
 
 		}
 	}

includes/class-gravityview-compatibility.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +1 added lines, -1 removed lines

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

Spacing +39 added lines, -39 removed lines

@@ -57,7 +57,7 @@ 
 
 	function add_hooks() {
 
-		add_filter( 'gravityview/admin/notices', array( $this, 'insert_admin_notices' ) );
+		add_filter('gravityview/admin/notices', array($this, 'insert_admin_notices'));
 
 		$this->add_fallback_shortcode();
 	}
@@ -68,15 +68,15 @@ 
 	 *
 	 * @return array
 	 */
-	function insert_admin_notices( $notices = array() ) {
-		return array_merge( $notices, self::$notices );
+	function insert_admin_notices($notices = array()) {
+		return array_merge($notices, self::$notices);
 	}
 
 	/**
 	 * @return GravityView_Compatibility
 	 */
 	public static function getInstance() {
-		if( self::$instance ) {
+		if (self::$instance) {
 			return self::$instance;
 		}
 		return new self;
@@ -87,7 +87,7 @@ 
 	 * @return bool
 	 */
 	public static function is_valid() {
-		return ( self::is_valid_gravity_forms() && self::is_valid_wordpress() && self::is_valid_php() );
+		return (self::is_valid_gravity_forms() && self::is_valid_wordpress() && self::is_valid_php());
 	}
 
 	/**
@@ -123,10 +123,10 @@ 
 		// If Gravity Forms doesn't exist or is outdated, load the admin view class to
 		// show the notice, but not load any post types or process shortcodes.
 		// Without Gravity Forms, there is no GravityView. Beautiful, really.
-		if( ! self::is_valid() ) {
+		if (!self::is_valid()) {
 
 			// If the plugin's not loaded, might as well hide the shortcode for people.
-			add_shortcode( 'gravityview', array( $this, '_shortcode_gf_notice') );
+			add_shortcode('gravityview', array($this, '_shortcode_gf_notice'));
 
 		}
 	}
@@ -150,17 +150,17 @@ 
 	 *
 	 * @return null|string NULL returned if user can't activate plugins. Notice shown with a warning that GF isn't supported.
 	 */
-	public function _shortcode_gf_notice( $atts = array(), $content = null, $shortcode = 'gravityview' ) {
+	public function _shortcode_gf_notice($atts = array(), $content = null, $shortcode = 'gravityview') {
 
-		if( ! GVCommon::has_cap( 'activate_plugins' ) ) {
+		if (!GVCommon::has_cap('activate_plugins')) {
 			return null;
 		}
 
 		$notices = self::get_notices();
 
-		$message = '<div style="border:1px solid red; padding: 15px;"><p style="text-align:center;"><em>' . esc_html__( 'You are seeing this notice because you are an administrator. Other users of the site will see nothing.', 'gravityview') . '</em></p>';
-		foreach( (array)$notices as $notice ) {
-			$message .= wpautop( $notice['message'] );
+		$message = '<div style="border:1px solid red; padding: 15px;"><p style="text-align:center;"><em>'.esc_html__('You are seeing this notice because you are an administrator. Other users of the site will see nothing.', 'gravityview').'</em></p>';
+		foreach ((array)$notices as $notice) {
+			$message .= wpautop($notice['message']);
 		}
 		$message .= '</div>';
 
@@ -175,11 +175,11 @@ 
 	 * @return boolean
 	 */
 	public static function check_php() {
-		if( false === version_compare( phpversion(), GV_MIN_PHP_VERSION , '>=' ) ) {
+		if (false === version_compare(phpversion(), GV_MIN_PHP_VERSION, '>=')) {
 
 			self::$notices['php_version'] = array(
 				'class' => 'error',
-				'message' => sprintf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.phpversion().'</span>' ),
+				'message' => sprintf(__("%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview'), '<h3>', GV_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.phpversion().'</span>'),
 				'cap' => 'manage_options',
 				'dismiss' => 'php_version',
 			);
@@ -199,11 +199,11 @@ 
 	public static function check_wordpress() {
 		global $wp_version;
 
-		if( version_compare( $wp_version, GV_MIN_WP_VERSION ) <= 0 ) {
+		if (version_compare($wp_version, GV_MIN_WP_VERSION) <= 0) {
 
 			self::$notices['wp_version'] = array(
 				'class' => 'error',
-				'message' => sprintf( __( "%sGravityView requires WordPress %s or newer.%s \n\nYou're using Version %s. Please upgrade your WordPress installation.", 'gravityview' ), '<h3>', GV_MIN_WP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.$wp_version.'</span>' ),
+				'message' => sprintf(__("%sGravityView requires WordPress %s or newer.%s \n\nYou're using Version %s. Please upgrade your WordPress installation.", 'gravityview'), '<h3>', GV_MIN_WP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.$wp_version.'</span>'),
 			    'cap' => 'update_core',
 				'dismiss' => 'wp_version',
 			);
@@ -226,17 +226,17 @@ 
 	public static function check_gravityforms() {
 
 		// Bypass other checks: if the class exists
-		if( class_exists( 'GFCommon' ) ) {
+		if (class_exists('GFCommon')) {
 
 			// and the version's right, we're good.
-			if( true === version_compare( GFCommon::$version, GV_MIN_GF_VERSION, ">=" ) ) {
+			if (true === version_compare(GFCommon::$version, GV_MIN_GF_VERSION, ">=")) {
 				return true;
 			}
 
 			// Or the version's wrong
 			self::$notices['gf_version'] = array(
 				'class' => 'error',
-				'message' => sprintf( __( "%sGravityView requires Gravity Forms Version %s or newer.%s \n\nYou're using Version %s. Please update your Gravity Forms or purchase a license. %sGet Gravity Forms%s - starting at $39%s%s", 'gravityview' ), '<h3>', GV_MIN_GF_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.GFCommon::$version.'</span>', "\n\n".'<a href="http://katz.si/gravityforms" class="button button-secondary button-large button-hero">' , '<em>', '</em>', '</a>'),
+				'message' => sprintf(__("%sGravityView requires Gravity Forms Version %s or newer.%s \n\nYou're using Version %s. Please update your Gravity Forms or purchase a license. %sGet Gravity Forms%s - starting at $39%s%s", 'gravityview'), '<h3>', GV_MIN_GF_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.GFCommon::$version.'</span>', "\n\n".'<a href="http://katz.si/gravityforms" class="button button-secondary button-large button-hero">', '<em>', '</em>', '</a>'),
 				'cap' => 'update_plugins',
 				'dismiss' => 'gf_version',
 			);
@@ -244,40 +244,40 @@ 
 			return false;
 		}
 
-		$gf_status = self::get_plugin_status( 'gravityforms/gravityforms.php' );
+		$gf_status = self::get_plugin_status('gravityforms/gravityforms.php');
 
 		/**
 		 * The plugin is activated and yet somehow GFCommon didn't get picked up...
 		 * OR
 		 * It's the Network Admin and we just don't know whether the sites have GF activated themselves.
 		 */
-		if( true === $gf_status || is_network_admin() ) {
+		if (true === $gf_status || is_network_admin()) {
 			return true;
 		}
 
 		// If GFCommon doesn't exist, assume GF not active
 		$return = false;
 
-		switch( $gf_status ) {
+		switch ($gf_status) {
 			case 'inactive':
 
 				// Required for multisite
-				if( ! function_exists('wp_create_nonce') ) {
-					require_once ABSPATH . WPINC . '/pluggable.php';
+				if (!function_exists('wp_create_nonce')) {
+					require_once ABSPATH.WPINC.'/pluggable.php';
 				}
 
 				// Otherwise, throws an error on activation & deactivation "Use of undefined constant LOGGED_IN_COOKIE"
-				if( is_multisite() ) {
+				if (is_multisite()) {
 					wp_cookie_constants();
 				}
 
 				$return = false;
 
-				$button = function_exists('is_network_admin') && is_network_admin() ? '<strong><a href="#gravity-forms">' : '<strong><a href="'. wp_nonce_url( admin_url( 'plugins.php?action=activate&plugin=gravityforms/gravityforms.php' ), 'activate-plugin_gravityforms/gravityforms.php') . '" class="button button-large">';
+				$button = function_exists('is_network_admin') && is_network_admin() ? '<strong><a href="#gravity-forms">' : '<strong><a href="'.wp_nonce_url(admin_url('plugins.php?action=activate&plugin=gravityforms/gravityforms.php'), 'activate-plugin_gravityforms/gravityforms.php').'" class="button button-large">';
 
 				self::$notices['gf_inactive'] = array(
 					'class' => 'error',
-					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be active. %sActivate Gravity Forms%s to use the GravityView plugin.', 'gravityview' ), '<h3>', "</h3>\n\n". $button, '</a></strong>' ),
+					'message' => sprintf(__('%sGravityView requires Gravity Forms to be active. %sActivate Gravity Forms%s to use the GravityView plugin.', 'gravityview'), '<h3>', "</h3>\n\n".$button, '</a></strong>'),
 					'cap' => 'activate_plugins',
 					'dismiss' => 'gf_inactive',
 				);
@@ -286,7 +286,7 @@ 
 			default:
 				self::$notices['gf_installed'] = array(
 					'class' => 'error',
-					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be installed in order to run properly. %sGet Gravity Forms%s - starting at $39%s%s', 'gravityview' ), '<h3>', "</h3>\n\n".'<a href="http://katz.si/gravityforms" class="button button-secondary button-large button-hero">' , '<em>', '</em>', '</a>'),
+					'message' => sprintf(__('%sGravityView requires Gravity Forms to be installed in order to run properly. %sGet Gravity Forms%s - starting at $39%s%s', 'gravityview'), '<h3>', "</h3>\n\n".'<a href="http://katz.si/gravityforms" class="button button-secondary button-large button-hero">', '<em>', '</em>', '</a>'),
 					'cap' => 'install_plugins',
 					'dismiss' => 'gf_installed',
 				);
@@ -303,11 +303,11 @@ 
 	 */
 	private static function check_gf_directory() {
 
-		if( class_exists( 'GFDirectory' ) ) {
+		if (class_exists('GFDirectory')) {
 			self::$notices['gf_directory'] = array(
 				'class' => 'error is-dismissible',
-				'title' => __('Potential Conflict', 'gravityview' ),
-				'message' => __( 'GravityView and Gravity Forms Directory are both active. This may cause problems. If you experience issues, disable the Gravity Forms Directory plugin.', 'gravityview' ),
+				'title' => __('Potential Conflict', 'gravityview'),
+				'message' => __('GravityView and Gravity Forms Directory are both active. This may cause problems. If you experience issues, disable the Gravity Forms Directory plugin.', 'gravityview'),
 				'dismiss' => 'gf_directory',
 				'cap' => 'activate_plugins',
 			);
@@ -323,23 +323,23 @@ 
 	 * @param string $location (default: '')
 	 * @return boolean|string True: plugin is active; False: plugin file doesn't exist at path; 'inactive' it's inactive
 	 */
-	public static function get_plugin_status( $location = '' ) {
+	public static function get_plugin_status($location = '') {
 
-		if( ! function_exists('is_plugin_active') ) {
-			include_once( ABSPATH . '/wp-admin/includes/plugin.php' );
+		if (!function_exists('is_plugin_active')) {
+			include_once(ABSPATH.'/wp-admin/includes/plugin.php');
 		}
 
-		if( is_network_admin() && is_plugin_active_for_network( $location ) ) {
+		if (is_network_admin() && is_plugin_active_for_network($location)) {
 			return true;
 		}
 
-		if( !is_network_admin() && is_plugin_active( $location ) ) {
+		if (!is_network_admin() && is_plugin_active($location)) {
 			return true;
 		}
 
-		if(
-			!file_exists( trailingslashit( WP_PLUGIN_DIR ) . $location ) &&
-			!file_exists( trailingslashit( WPMU_PLUGIN_DIR ) . $location )
+		if (
+			!file_exists(trailingslashit(WP_PLUGIN_DIR).$location) &&
+			!file_exists(trailingslashit(WPMU_PLUGIN_DIR).$location)
 		) {
 			return false;
 		}

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

Doc Comments +1 added lines, -2 removed lines

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

Spacing +59 added lines, -59 removed lines

@@ -51,17 +51,17 @@ 
 	 * @since 1.15
 	 */
 	private function add_hooks() {
-		add_shortcode( 'gv_entry_link', array( $this, 'read_shortcode' ) );
-		add_shortcode( 'gv_edit_entry_link', array( $this, 'edit_shortcode' ) );
-		add_shortcode( 'gv_delete_entry_link', array( $this, 'delete_shortcode' ) );
+		add_shortcode('gv_entry_link', array($this, 'read_shortcode'));
+		add_shortcode('gv_edit_entry_link', array($this, 'edit_shortcode'));
+		add_shortcode('gv_delete_entry_link', array($this, 'delete_shortcode'));
 	}
 
 	/**
 	 * @since 1.15
 	 * @copydoc GravityView_Entry_Link_Shortcode::shortcode
 	 */
-	public function read_shortcode( $atts, $content = null, $context = 'gv_entry_link' ) {
-		return $this->shortcode( $atts, $content, $context );
+	public function read_shortcode($atts, $content = null, $context = 'gv_entry_link') {
+		return $this->shortcode($atts, $content, $context);
 	}
 
 	/**
@@ -71,10 +71,10 @@ 
 	 * @since 1.15
 	 * @copydoc GravityView_Entry_Link_Shortcode::shortcode
 	 */
-	public function edit_shortcode( $atts, $content = null, $context = 'gv_edit_entry_link' ) {
+	public function edit_shortcode($atts, $content = null, $context = 'gv_edit_entry_link') {
 		$atts['action'] = 'edit';
 
-		return $this->shortcode( $atts, $content, $context );
+		return $this->shortcode($atts, $content, $context);
 	}
 
 	/**
@@ -84,10 +84,10 @@ 
 	 * @since 1.15
 	 * @copydoc GravityView_Entry_Link_Shortcode::shortcode
 	 */
-	public function delete_shortcode( $atts, $content = null, $context = 'gv_delete_entry_link' ) {
+	public function delete_shortcode($atts, $content = null, $context = 'gv_delete_entry_link') {
 		$atts['action'] = 'delete';
 
-		return $this->shortcode( $atts, $content, $context );
+		return $this->shortcode($atts, $content, $context);
 	}
 
 	/**
@@ -110,58 +110,58 @@ 
 	 *
 	 * @return null|string If admin or an error occurred, returns null. Otherwise, returns entry link output. If `$atts['return']` is 'url', the entry link URL. Otherwise, entry link `<a>` HTML tag.
 	 */
-	private function shortcode( $atts, $content = null, $context = 'gv_entry_link' ) {
+	private function shortcode($atts, $content = null, $context = 'gv_entry_link') {
 
 		// Don't process when saving post. Keep processing if it's admin-ajax.php
-		if ( ! class_exists( 'GravityView_Plugin' ) || GravityView_Plugin::is_admin() ) {
+		if (!class_exists('GravityView_Plugin') || GravityView_Plugin::is_admin()) {
 			return null;
 		}
 
 		// Make sure GV is loaded
-		if ( ! class_exists( 'GravityView_frontend' ) || ! class_exists( 'GravityView_View' ) ) {
-			do_action( 'gravityview_log_error', __METHOD__ . ' GravityView_frontend or GravityView_View do not exist.' );
+		if (!class_exists('GravityView_frontend') || !class_exists('GravityView_View')) {
+			do_action('gravityview_log_error', __METHOD__.' GravityView_frontend or GravityView_View do not exist.');
 
 			return null;
 		}
 
-		$this->settings = shortcode_atts( self::$defaults, $atts, $context );
+		$this->settings = shortcode_atts(self::$defaults, $atts, $context);
 
-		$this->view_id = empty( $this->settings['view_id'] ) ? GravityView_View::getInstance()->getViewId() : absint( $this->settings['view_id'] );
+		$this->view_id = empty($this->settings['view_id']) ? GravityView_View::getInstance()->getViewId() : absint($this->settings['view_id']);
 
-		if ( empty( $this->view_id ) ) {
-			do_action( 'gravityview_log_error', __METHOD__ . ' A View ID was not defined and we are not inside a View' );
+		if (empty($this->view_id)) {
+			do_action('gravityview_log_error', __METHOD__.' A View ID was not defined and we are not inside a View');
 
 			return null;
 		}
 
-		$this->entry = $this->get_entry( $this->settings['entry_id'] );
+		$this->entry = $this->get_entry($this->settings['entry_id']);
 
-		do_action( 'gravityview_log_debug', __METHOD__ . ' ' . $context . ' $atts: ', $atts );
+		do_action('gravityview_log_debug', __METHOD__.' '.$context.' $atts: ', $atts);
 
-		if ( ! $this->has_cap() ) {
-			do_action( 'gravityview_log_error', __METHOD__ . ' User does not have the capability to ' . esc_attr( $this->settings['action'] ) . ' this entry: ' . $this->entry['id'] );
+		if (!$this->has_cap()) {
+			do_action('gravityview_log_error', __METHOD__.' User does not have the capability to '.esc_attr($this->settings['action']).' this entry: '.$this->entry['id']);
 
 			return null;
 		}
 
 		$url = $this->get_url();
 
-		if ( ! $url ) {
-			do_action( 'gravityview_log_error', __METHOD__ . ' Link returned false; View or Post may not exist.' );
+		if (!$url) {
+			do_action('gravityview_log_error', __METHOD__.' Link returned false; View or Post may not exist.');
 
 			return false;
 		}
 
 		// Get just the URL, not the tag
-		if ( 'url' === $this->settings['return'] ) {
+		if ('url' === $this->settings['return']) {
 			return $url;
 		}
 
 		$link_atts = $this->get_link_atts();
 
-		$link_text = $this->get_anchor_text( $content );
+		$link_text = $this->get_anchor_text($content);
 
-		return gravityview_get_link( $url, $link_text, $link_atts );
+		return gravityview_get_link($url, $link_text, $link_atts);
 	}
 
 	/**
@@ -174,13 +174,13 @@ 
 	 */
 	private function get_link_atts() {
 
-		wp_parse_str( $this->settings['link_atts'], $link_atts );
+		wp_parse_str($this->settings['link_atts'], $link_atts);
 
-		if ( 'delete' === $this->settings['action'] ) {
-			$link_atts['onclick'] = isset( $link_atts['onclick'] ) ? $link_atts['onclick'] : GravityView_Delete_Entry::get_confirm_dialog();
+		if ('delete' === $this->settings['action']) {
+			$link_atts['onclick'] = isset($link_atts['onclick']) ? $link_atts['onclick'] : GravityView_Delete_Entry::get_confirm_dialog();
 		}
 
-		return (array) $link_atts;
+		return (array)$link_atts;
 	}
 
 	/**
@@ -194,21 +194,21 @@ 
 	 *
 	 * @return string Text to use for HTML anchor
 	 */
-	private function get_anchor_text( $content = null ) {
+	private function get_anchor_text($content = null) {
 
-		if ( $content ) {
+		if ($content) {
 			return $content;
 		}
 
-		switch ( $this->settings['action'] ) {
+		switch ($this->settings['action']) {
 			case 'edit':
-				$anchor_text = __( 'Edit Entry', 'gravityview' );
+				$anchor_text = __('Edit Entry', 'gravityview');
 				break;
 			case 'delete':
-				$anchor_text = __( 'Delete Entry', 'gravityview' );
+				$anchor_text = __('Delete Entry', 'gravityview');
 				break;
 			default:
-				$anchor_text = __( 'View Details', 'gravityview' );
+				$anchor_text = __('View Details', 'gravityview');
 		}
 
 		return $anchor_text;
@@ -228,21 +228,21 @@ 
 	private function get_url() {
 
 		// if post_id is not defined, default to view_id
-		$post_id = empty( $this->settings['post_id'] ) ? $this->view_id : absint( $this->settings['post_id'] );
+		$post_id = empty($this->settings['post_id']) ? $this->view_id : absint($this->settings['post_id']);
 
-		switch ( $this->settings['action'] ) {
+		switch ($this->settings['action']) {
 			case 'edit':
-				$url = GravityView_Edit_Entry::get_edit_link( $this->entry, $this->view_id, $post_id );
+				$url = GravityView_Edit_Entry::get_edit_link($this->entry, $this->view_id, $post_id);
 				break;
 			case 'delete':
-				$url = GravityView_Delete_Entry::get_delete_link( $this->entry, $this->view_id, $post_id );
+				$url = GravityView_Delete_Entry::get_delete_link($this->entry, $this->view_id, $post_id);
 				break;
 			case 'read':
 			default:
-				$url = GravityView_API::entry_link( $this->entry, $post_id );
+				$url = GravityView_API::entry_link($this->entry, $post_id);
 		}
 
-		$url = $this->maybe_add_field_values_query_args( $url );
+		$url = $this->maybe_add_field_values_query_args($url);
 
 		return $url;
 	}
@@ -255,12 +255,12 @@ 
 	 */
 	private function has_cap() {
 
-		switch ( $this->settings['action'] ) {
+		switch ($this->settings['action']) {
 			case 'edit':
-				$has_cap = GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry, $this->view_id );
+				$has_cap = GravityView_Edit_Entry::check_user_cap_edit_entry($this->entry, $this->view_id);
 				break;
 			case 'delete':
-				$has_cap = GravityView_Delete_Entry::check_user_cap_delete_entry( $this->entry, array(), $this->view_id );
+				$has_cap = GravityView_Delete_Entry::check_user_cap_delete_entry($this->entry, array(), $this->view_id);
 				break;
 			case 'read':
 			default:
@@ -281,28 +281,28 @@ 
 	 *
 	 * @return array|bool Gravity Forms array, if found. Otherwise, false.
 	 */
-	private function get_entry( $entry_id = 0 ) {
+	private function get_entry($entry_id = 0) {
 
 		$backup_entry = GravityView_frontend::getInstance()->getSingleEntry() ? GravityView_frontend::getInstance()->getEntry() : GravityView_View::getInstance()->getCurrentEntry();
 
-		if ( empty( $entry_id ) ) {
-			if ( ! $backup_entry ) {
-				do_action( 'gravityview_log_error', __METHOD__ . ' No entry defined (or entry id not valid number)', $this->settings );
+		if (empty($entry_id)) {
+			if (!$backup_entry) {
+				do_action('gravityview_log_error', __METHOD__.' No entry defined (or entry id not valid number)', $this->settings);
 
 				return false;
 			}
 			$entry = $backup_entry;
 		} else {
-			$entry = wp_cache_get( 'gv_entry_link_entry_' . $entry_id, 'gravityview_entry_link_shortcode' );
-			if ( false === $entry ) {
-				$entry = GVCommon::get_entry( $entry_id, true, false );
-				wp_cache_add( 'gv_entry_link_entry_' . $entry_id, $entry, 'gravityview_entry_link_shortcode' );
+			$entry = wp_cache_get('gv_entry_link_entry_'.$entry_id, 'gravityview_entry_link_shortcode');
+			if (false === $entry) {
+				$entry = GVCommon::get_entry($entry_id, true, false);
+				wp_cache_add('gv_entry_link_entry_'.$entry_id, $entry, 'gravityview_entry_link_shortcode');
 			}
 		}
 
 		// No search results
-		if ( false === $entry ) {
-			do_action( 'gravityview_log_error', __METHOD__ . ' No entries match the entry ID defined', $entry_id );
+		if (false === $entry) {
+			do_action('gravityview_log_error', __METHOD__.' No entries match the entry ID defined', $entry_id);
 
 			return false;
 		}
@@ -318,13 +318,13 @@ 
 	 *
 	 * @param string $href URL
 	 */
-	private function maybe_add_field_values_query_args( $url ) {
+	private function maybe_add_field_values_query_args($url) {
 
-		if ( $url && ! empty( $this->settings['field_values'] ) ) {
+		if ($url && !empty($this->settings['field_values'])) {
 
-			wp_parse_str( $this->settings['field_values'], $field_values );
+			wp_parse_str($this->settings['field_values'], $field_values);
 
-			$url = add_query_arg( $field_values, $url );
+			$url = add_query_arg($field_values, $url);
 		}
 
 		return $url;

includes/class-gravityview-extension.php

Doc Comments +1 added lines, -1 removed lines

@@ -278,7 +278,7 @@
 
 	/**
 	 * Add a notice to be displayed in the admin.
-	 * @param array $notice Array with `class` and `message` keys. The message is not escaped.
+	 * @param string $notice Array with `class` and `message` keys. The message is not escaped.
 	 */
 	public static function add_notice( $notice = array() ) {
 

Indentation +7 added lines, -7 removed lines

@@ -244,13 +244,13 @@
 			$this->_remote_update_url,
 			$this->_path,
 			array(
-            	'version'	=> $this->_version, // current version number
-            	'license'	=> $license['license'],
-	            'item_id'   => $this->_item_id, // The ID of the download on _remote_update_url
-            	'item_name' => $this->_title,  // name of this plugin
-            	'author' 	=> strip_tags( $this->_author )  // author of this plugin
-          	)
-        );
+				'version'	=> $this->_version, // current version number
+				'license'	=> $license['license'],
+				'item_id'   => $this->_item_id, // The ID of the download on _remote_update_url
+				'item_name' => $this->_title,  // name of this plugin
+				'author' 	=> strip_tags( $this->_author )  // author of this plugin
+		  	)
+		);
 	}
 
 	/**

Spacing +56 added lines, -56 removed lines

@@ -69,22 +69,22 @@ 
 
 	function __construct() {
 
-		add_action( 'init', array( $this, 'load_plugin_textdomain' ) );
+		add_action('init', array($this, 'load_plugin_textdomain'));
 
-		add_action( 'admin_init', array( $this, 'settings') );
+		add_action('admin_init', array($this, 'settings'));
 
-		add_action( 'admin_notices', array( $this, 'admin_notice' ), 100 );
+		add_action('admin_notices', array($this, 'admin_notice'), 100);
 
-		add_action( 'gravityview/metaboxes/before_render', array( $this, 'add_metabox_tab' ) );
+		add_action('gravityview/metaboxes/before_render', array($this, 'add_metabox_tab'));
 
-		if( false === $this->is_extension_supported() ) {
+		if (false === $this->is_extension_supported()) {
 			return;
 		}
 
-		add_filter( 'gravityview_tooltips', array( $this, 'tooltips' ) );
+		add_filter('gravityview_tooltips', array($this, 'tooltips'));
 
 		// Save the form configuration. Run at 14 so that View metadata is already saved (at 10)
-		add_action( 'save_post', array( $this, 'save_post' ), 14 );
+		add_action('save_post', array($this, 'save_post'), 14);
 
 		$this->add_hooks();
 
@@ -116,7 +116,7 @@ 
 		$tab_settings = $this->tab_settings();
 
 		// Don't add a tab if it's empty.
-		if( empty( $tab_settings ) ) {
+		if (empty($tab_settings)) {
 			return;
 		}
 
@@ -131,20 +131,20 @@ 
 			'priority' => 'default',
 		);
 
-		$tab = wp_parse_args( $tab_settings, $tab_defaults );
+		$tab = wp_parse_args($tab_settings, $tab_defaults);
 
 		// Force the screen to be GravityView
 		$tab['screen'] = 'gravityview';
 
-		if( class_exists('GravityView_Metabox_Tab') ) {
+		if (class_exists('GravityView_Metabox_Tab')) {
 
-			$metabox = new GravityView_Metabox_Tab( $tab['id'], $tab['title'], $tab['file'], $tab['icon-class'], $tab['callback'], $tab['callback_args'] );
+			$metabox = new GravityView_Metabox_Tab($tab['id'], $tab['title'], $tab['file'], $tab['icon-class'], $tab['callback'], $tab['callback_args']);
 
-			GravityView_Metabox_Tabs::add( $metabox );
+			GravityView_Metabox_Tabs::add($metabox);
 
 		} else {
 
-			add_meta_box( 'gravityview_'.$tab['id'], $tab['title'], $tab['callback'], $tab['screen'], $tab['context'], $tab['priority'] );
+			add_meta_box('gravityview_'.$tab['id'], $tab['title'], $tab['callback'], $tab['screen'], $tab['context'], $tab['priority']);
 
 		}
 	}
@@ -160,37 +160,37 @@ 
 	 */
 	public function load_plugin_textdomain() {
 
-		if( empty( $this->_text_domain ) ) {
-			do_action( 'gravityview_log_debug', __METHOD__ . ': Extension translation cannot be loaded; the `_text_domain` variable is not defined', $this );
+		if (empty($this->_text_domain)) {
+			do_action('gravityview_log_debug', __METHOD__.': Extension translation cannot be loaded; the `_text_domain` variable is not defined', $this);
 			return;
 		}
 
 		// Backward compat for Ratings & Reviews / Maps
-		$path = isset( $this->_path ) ? $this->_path : ( isset( $this->plugin_file ) ? $this->plugin_file : '' );
+		$path = isset($this->_path) ? $this->_path : (isset($this->plugin_file) ? $this->plugin_file : '');
 
 		// Set filter for plugin's languages directory
-		$lang_dir = dirname( plugin_basename( $path ) ) . '/languages/';
+		$lang_dir = dirname(plugin_basename($path)).'/languages/';
 
 		// Traditional WordPress plugin locale filter
-		$locale = apply_filters( 'plugin_locale',  get_locale(), $this->_text_domain );
+		$locale = apply_filters('plugin_locale', get_locale(), $this->_text_domain);
 
-		$mofile = sprintf( '%1$s-%2$s.mo', $this->_text_domain, $locale );
+		$mofile = sprintf('%1$s-%2$s.mo', $this->_text_domain, $locale);
 
 		// Setup paths to current locale file
-		$mofile_local  = $lang_dir . $mofile;
-		$mofile_global = WP_LANG_DIR . '/' . $this->_text_domain . '/' . $mofile;
+		$mofile_local  = $lang_dir.$mofile;
+		$mofile_global = WP_LANG_DIR.'/'.$this->_text_domain.'/'.$mofile;
 
-		if ( file_exists( $mofile_global ) ) {
+		if (file_exists($mofile_global)) {
 			// Look in global /wp-content/languages/[plugin-dir]/ folder
-			load_textdomain( $this->_text_domain, $mofile_global );
+			load_textdomain($this->_text_domain, $mofile_global);
 		}
-		elseif ( file_exists( $mofile_local ) ) {
+		elseif (file_exists($mofile_local)) {
 			// Look in local /wp-content/plugins/[plugin-dir]/languages/ folder
-			load_textdomain( $this->_text_domain, $mofile_local );
+			load_textdomain($this->_text_domain, $mofile_local);
 		}
 		else {
 			// Load the default language files
-			load_plugin_textdomain( $this->_text_domain, false, $lang_dir );
+			load_plugin_textdomain($this->_text_domain, false, $lang_dir);
 		}
 	}
 
@@ -202,7 +202,7 @@ 
 	 */
 	protected function get_license() {
 
-		if( !class_exists( 'GravityView_Settings' ) ) {
+		if (!class_exists('GravityView_Settings')) {
 			return false;
 		}
 
@@ -219,17 +219,17 @@ 
 	public function settings() {
 
 		// If doing ajax, get outta here
-		if( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) )  {
+		if (!is_admin() || (defined('DOING_AJAX') && DOING_AJAX)) {
 			return;
 		}
 
-		if( !class_exists( 'EDD_SL_Plugin_Updater' ) ) {
+		if (!class_exists('EDD_SL_Plugin_Updater')) {
 
-			$file_path = plugin_dir_path( __FILE__ ) . 'lib/EDD_SL_Plugin_Updater.php';
+			$file_path = plugin_dir_path(__FILE__).'lib/EDD_SL_Plugin_Updater.php';
 
 			// This file may be in the lib/ directory already
-			if( ! file_exists( $file_path ) ) {
-				$file_path = plugin_dir_path( __FILE__ ) . '/EDD_SL_Plugin_Updater.php';
+			if (!file_exists($file_path)) {
+				$file_path = plugin_dir_path(__FILE__).'/EDD_SL_Plugin_Updater.php';
 			}
 
 			include_once $file_path;
@@ -238,7 +238,7 @@ 
 		$license = $this->get_license();
 
 		// Don't update if invalid license.
-		if( false === $license || empty( $license['status'] ) || strtolower( $license['status'] ) !== 'valid' ) { return; }
+		if (false === $license || empty($license['status']) || strtolower($license['status']) !== 'valid') { return; }
 
 		new EDD_SL_Plugin_Updater(
 			$this->_remote_update_url,
@@ -247,8 +247,8 @@ 
             	'version'	=> $this->_version, // current version number
             	'license'	=> $license['license'],
 	            'item_id'   => $this->_item_id, // The ID of the download on _remote_update_url
-            	'item_name' => $this->_title,  // name of this plugin
-            	'author' 	=> strip_tags( $this->_author )  // author of this plugin
+            	'item_name' => $this->_title, // name of this plugin
+            	'author' 	=> strip_tags($this->_author)  // author of this plugin
           	)
         );
 	}
@@ -260,14 +260,14 @@ 
 	 */
 	public function admin_notice() {
 
-		if( empty( self::$admin_notices ) ) {
+		if (empty(self::$admin_notices)) {
 			return;
 		}
 
-		foreach( self::$admin_notices as $key => $notice ) {
+		foreach (self::$admin_notices as $key => $notice) {
 
-			echo '<div id="message" class="'. esc_attr( $notice['class'] ).'">';
-			echo wpautop( $notice['message'] );
+			echo '<div id="message" class="'.esc_attr($notice['class']).'">';
+			echo wpautop($notice['message']);
 			echo '<div class="clear"></div>';
 			echo '</div>';
 		}
@@ -280,16 +280,16 @@ 
 	 * Add a notice to be displayed in the admin.
 	 * @param array $notice Array with `class` and `message` keys. The message is not escaped.
 	 */
-	public static function add_notice( $notice = array() ) {
+	public static function add_notice($notice = array()) {
 
-		if( is_array( $notice ) && !isset( $notice['message'] ) ) {
-			do_action( 'gravityview_log_error', __CLASS__.'[add_notice] Notice not set', $notice );
+		if (is_array($notice) && !isset($notice['message'])) {
+			do_action('gravityview_log_error', __CLASS__.'[add_notice] Notice not set', $notice);
 			return;
-		} else if( is_string( $notice ) ) {
-			$notice = array( 'message' => $notice );
+		} else if (is_string($notice)) {
+			$notice = array('message' => $notice);
 		}
 
-		$notice['class'] = empty( $notice['class'] ) ? 'error' : $notice['class'];
+		$notice['class'] = empty($notice['class']) ? 'error' : $notice['class'];
 
 		self::$admin_notices[] = $notice;
 	}
@@ -304,7 +304,7 @@ 
 	 * @param  int $post_id Post ID
 	 * @return void
 	 */
-	public function save_post( $post_id ) {}
+	public function save_post($post_id) {}
 
 	/**
 	 * Add tooltips for the extension.
@@ -323,7 +323,7 @@ 
 	 * @param  array  $tooltips Existing GV tooltips, with `title` and `value` keys
 	 * @return array           Modified tooltips
 	 */
-	public function tooltips( $tooltips = array() ) {
+	public function tooltips($tooltips = array()) {
 
 		return $tooltips;
 
@@ -346,17 +346,17 @@ 
 
 		$message = '';
 
-		if( !class_exists( 'GravityView_Plugin' ) ) {
+		if (!class_exists('GravityView_Plugin')) {
 
-			$message = sprintf( __('Could not activate the %s Extension; GravityView is not active.', 'gravityview'), $this->_title );
+			$message = sprintf(__('Could not activate the %s Extension; GravityView is not active.', 'gravityview'), $this->_title);
 
-		} else if( false === version_compare(GravityView_Plugin::version, $this->_min_gravityview_version , ">=") ) {
+		} else if (false === version_compare(GravityView_Plugin::version, $this->_min_gravityview_version, ">=")) {
 
-			$message = sprintf( __('The %s Extension requires GravityView Version %s or newer.', 'gravityview' ), $this->_title, '<tt>'.$this->_min_gravityview_version.'</tt>' );
+			$message = sprintf(__('The %s Extension requires GravityView Version %s or newer.', 'gravityview'), $this->_title, '<tt>'.$this->_min_gravityview_version.'</tt>');
 
-		} else if( isset( $this->_min_php_version ) && false === version_compare( phpversion(), $this->_min_php_version , ">=") ) {
+		} else if (isset($this->_min_php_version) && false === version_compare(phpversion(), $this->_min_php_version, ">=")) {
 
-			$message = sprintf( __('The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview' ), $this->_title, '<tt>'.$this->_min_php_version.'</tt>' );
+			$message = sprintf(__('The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview'), $this->_title, '<tt>'.$this->_min_php_version.'</tt>');
 
 		} else {
 
@@ -364,11 +364,11 @@ 
 
 		}
 
-		if ( ! empty( $message ) ) {
+		if (!empty($message)) {
 
-			self::add_notice( $message );
+			self::add_notice($message);
 
-			do_action( 'gravityview_log_error', __METHOD__. ' ' . $message );
+			do_action('gravityview_log_error', __METHOD__.' '.$message);
 
 			self::$is_compatible = false;
 		}

Braces +2 added lines, -4 removed lines

@@ -183,12 +183,10 @@
 		if ( file_exists( $mofile_global ) ) {
 			// Look in global /wp-content/languages/[plugin-dir]/ folder
 			load_textdomain( $this->_text_domain, $mofile_global );
-		}
-		elseif ( file_exists( $mofile_local ) ) {
+		} elseif ( file_exists( $mofile_local ) ) {
 			// Look in local /wp-content/plugins/[plugin-dir]/languages/ folder
 			load_textdomain( $this->_text_domain, $mofile_local );
-		}
-		else {
+		} else {
 			// Load the default language files
 			load_plugin_textdomain( $this->_text_domain, false, $lang_dir );
 		}

includes/class-gravityview-merge-tags.php

Doc Comments +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
 	 * @param bool $url_encode Whether to URL-encode output
 	 * @param bool $esc_html Whether to apply `esc_html()` to output
 	 *
-	 * @return mixed
+	 * @return string
 	 */
 	public static function replace_gv_merge_tags(  $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
 

Spacing +39 added lines, -39 removed lines

@@ -19,10 +19,10 @@ 
 	 */
 	private function add_hooks() {
 
-		add_filter( 'gform_custom_merge_tags', array( $this, '_gform_custom_merge_tags' ), 10, 4 );
+		add_filter('gform_custom_merge_tags', array($this, '_gform_custom_merge_tags'), 10, 4);
 
 		/** @see GFCommon::replace_variables_prepopulate **/
-		add_filter( 'gform_replace_merge_tags', array( 'GravityView_Merge_Tags', 'replace_gv_merge_tags' ), 10, 7 );
+		add_filter('gform_replace_merge_tags', array('GravityView_Merge_Tags', 'replace_gv_merge_tags'), 10, 7);
 
 	}
 
@@ -43,7 +43,7 @@ 
 	 * @param  bool       $esc_html     Pass return value through `esc_html()`
 	 * @return string                  Text with variables maybe replaced
 	 */
-	public static function replace_variables($text, $form = array(), $entry = array(), $url_encode = false, $esc_html = true ) {
+	public static function replace_variables($text, $form = array(), $entry = array(), $url_encode = false, $esc_html = true) {
 
 		/**
 		 * @filter `gravityview_do_replace_variables` Turn off merge tag variable replacements.\n
@@ -55,9 +55,9 @@ 
 		 * @param[in]  array      $form        GF Form array
 		 * @param[in]  array      $entry        GF Entry array
 		 */
-		$do_replace_variables = apply_filters( 'gravityview/merge_tags/do_replace_variables', true, $text, $form, $entry );
+		$do_replace_variables = apply_filters('gravityview/merge_tags/do_replace_variables', true, $text, $form, $entry);
 
-		if ( strpos( $text, '{' ) === false || ! $do_replace_variables ) {
+		if (strpos($text, '{') === false || !$do_replace_variables) {
 			return $text;
 		}
 
@@ -66,10 +66,10 @@ 
 		 *
 		 * @internal Reported to GF Support on 12/3
 		 */
-		$form['title'] = isset( $form['title'] ) ? $form['title'] : '';
-		$form['id']    = isset( $form['id'] ) ? $form['id'] : '';
+		$form['title'] = isset($form['title']) ? $form['title'] : '';
+		$form['id']    = isset($form['id']) ? $form['id'] : '';
 
-		return GFCommon::replace_variables( $text, $form, $entry, $url_encode, $esc_html );
+		return GFCommon::replace_variables($text, $form, $entry, $url_encode, $esc_html);
 	}
 
 	/**
@@ -84,7 +84,7 @@ 
 	 *
 	 * @return array Modified merge tags
 	 */
-	public function _gform_custom_merge_tags( $existing_merge_tags = array(), $form_id, $fields = array(), $element_id = '' ) {
+	public function _gform_custom_merge_tags($existing_merge_tags = array(), $form_id, $fields = array(), $element_id = '') {
 
 		$created_by_merge_tags = array(
 			array(
@@ -110,7 +110,7 @@ 
 		);
 
 		//return the form object from the php hook
-		return array_merge( $existing_merge_tags, $created_by_merge_tags );
+		return array_merge($existing_merge_tags, $created_by_merge_tags);
 	}
 
 	/**
@@ -128,21 +128,21 @@ 
 	 *
 	 * @return mixed
 	 */
-	public static function replace_gv_merge_tags(  $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
+	public static function replace_gv_merge_tags($text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false) {
 
 		/**
 		 * This prevents the gform_replace_merge_tags filter from being called twice, as defined in:
 		 * @see GFCommon::replace_variables()
 		 * @see GFCommon::replace_variables_prepopulate()
 		 */
-		if( false === $form ) {
+		if (false === $form) {
 			return $text;
 		}
 
-		$text = self::replace_get_variables( $text, $form, $entry, $url_encode );
+		$text = self::replace_get_variables($text, $form, $entry, $url_encode);
 
 		// Process the merge vars here
-		$text = self::replace_user_variables_created_by( $text, $form, $entry, $url_encode, $esc_html );
+		$text = self::replace_user_variables_created_by($text, $form, $entry, $url_encode, $esc_html);
 
 		return $text;
 	}
@@ -168,22 +168,22 @@ 
 	 * @param array $entry Entry array
 	 * @param bool $url_encode Whether to URL-encode output
 	 */
-	public static function replace_get_variables( $text, $form = array(), $entry = array(), $url_encode = false ) {
+	public static function replace_get_variables($text, $form = array(), $entry = array(), $url_encode = false) {
 
 		// Is there is {get:[xyz]} merge tag?
-		preg_match_all( "/{get:(.*?)}/ism", $text, $matches, PREG_SET_ORDER );
+		preg_match_all("/{get:(.*?)}/ism", $text, $matches, PREG_SET_ORDER);
 
 		// If there are no matches OR the Entry `created_by` isn't set or is 0 (no user)
-		if( empty( $matches ) ) {
+		if (empty($matches)) {
 			return $text;
 		}
 
-		foreach ( $matches as $match ) {
+		foreach ($matches as $match) {
 
 			$full_tag = $match[0];
 			$property = $match[1];
 
-			$value = stripslashes_deep( rgget( $property ) );
+			$value = stripslashes_deep(rgget($property));
 
 			/**
 			 * @filter `gravityview/merge_tags/get/glue/` Modify the glue used to convert an array of `{get}` values from an array to string
@@ -191,11 +191,11 @@ 
 			 * @param[in,out] string $glue String used to `implode()` $_GET values Default: ', '
 			 * @param[in] string $property The current name of the $_GET parameter being combined
 			 */
-			$glue = apply_filters( 'gravityview/merge_tags/get/glue/', ', ', $property );
+			$glue = apply_filters('gravityview/merge_tags/get/glue/', ', ', $property);
 
-			$value = is_array( $value ) ? implode( $glue, $value ) : $value;
+			$value = is_array($value) ? implode($glue, $value) : $value;
 
-			$value = $url_encode ? urlencode( $value ) : $value;
+			$value = $url_encode ? urlencode($value) : $value;
 
 			/**
 			 * @filter `gravityview/merge_tags/get/esc_html/{url parameter name}` Disable esc_html() from running on `{get}` merge tag
@@ -205,9 +205,9 @@ 
 			 * @since 1.15
 			 * @param bool $esc_html Whether to esc_html() the value. Default: `true`
 			 */
-			$esc_html = apply_filters('gravityview/merge_tags/get/esc_html/' . $property, true );
+			$esc_html = apply_filters('gravityview/merge_tags/get/esc_html/'.$property, true);
 
-			$value = $esc_html ? esc_html( $value ) : $value;
+			$value = $esc_html ? esc_html($value) : $value;
 
 			/**
 			 * @filter `gravityview/merge_tags/get/esc_html/{url parameter name}` Modify the value of the `{get}` replacement before being used
@@ -216,12 +216,12 @@ 
 			 * @param[in] array $form Gravity Forms form array
 			 * @param[in] array $entry Entry array
 			 */
-			$value = apply_filters('gravityview/merge_tags/get/value/' . $property, $value, $text, $form, $entry );
+			$value = apply_filters('gravityview/merge_tags/get/value/'.$property, $value, $text, $form, $entry);
 
-			$text = str_replace( $full_tag, $value, $text );
+			$text = str_replace($full_tag, $value, $text);
 		}
 
-		unset( $value, $glue, $matches );
+		unset($value, $glue, $matches);
 
 		return $text;
 	}
@@ -242,41 +242,41 @@ 
 	 *
 	 * @return string Text, with user variables replaced, if they existed
 	 */
-	private static function replace_user_variables_created_by( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
+	private static function replace_user_variables_created_by($text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false) {
 
 		// Is there is {created_by:[xyz]} merge tag?
-		preg_match_all( "/\{created_by:(.*?)\}/", $text, $matches, PREG_SET_ORDER );
+		preg_match_all("/\{created_by:(.*?)\}/", $text, $matches, PREG_SET_ORDER);
 
 		// If there are no matches OR the Entry `created_by` isn't set or is 0 (no user)
-		if( empty( $matches ) || empty( $entry['created_by'] ) ) {
+		if (empty($matches) || empty($entry['created_by'])) {
 			return $text;
 		}
 
 		// Get the creator of the entry
-		$entry_creator = new WP_User( $entry['created_by'] );
+		$entry_creator = new WP_User($entry['created_by']);
 
-		foreach ( $matches as $match ) {
+		foreach ($matches as $match) {
 
 			$full_tag = $match[0];
 			$property = $match[1];
 
-			switch( $property ) {
+			switch ($property) {
 				/** @since 1.13.2 */
 				case 'roles':
-					$value = implode( ', ', $entry_creator->roles );
+					$value = implode(', ', $entry_creator->roles);
 					break;
 				default:
-					$value = $entry_creator->get( $property );
+					$value = $entry_creator->get($property);
 			}
 
-			$value = $url_encode ? urlencode( $value ) : $value;
+			$value = $url_encode ? urlencode($value) : $value;
 
-			$value = $esc_html ? esc_html( $value ) : $value;
+			$value = $esc_html ? esc_html($value) : $value;
 
-			$text = str_replace( $full_tag, $value, $text );
+			$text = str_replace($full_tag, $value, $text);
 		}
 
-		unset( $entry_creator );
+		unset($entry_creator);
 
 		return $text;
 	}

includes/class-gravityview-roles-capabilities.php

Doc Comments -1 removed lines

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

Indentation +1 added lines, -2 removed lines

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

Spacing +57 added lines, -57 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GravityView Roles Class
@@ -33,7 +33,7 @@ 
 	 */
 	public static function get_instance() {
 
-		if( ! self::$instance ) {
+		if (!self::$instance) {
 			self::$instance = new self;
 		}
 
@@ -53,10 +53,10 @@ 
 	 * @since 1.15
 	 */
 	private function add_hooks() {
-		add_filter( 'members_get_capabilities', array( 'GravityView_Roles_Capabilities', 'merge_with_all_caps' ) );
-		add_action( 'members_register_cap_groups', array( $this, 'members_register_cap_group' ), 20 );
-		add_filter( 'user_has_cap', array( $this, 'filter_user_has_cap' ), 10, 4 );
-        add_action( 'admin_init', array( $this, 'add_caps') );
+		add_filter('members_get_capabilities', array('GravityView_Roles_Capabilities', 'merge_with_all_caps'));
+		add_action('members_register_cap_groups', array($this, 'members_register_cap_group'), 20);
+		add_filter('user_has_cap', array($this, 'filter_user_has_cap'), 10, 4);
+        add_action('admin_init', array($this, 'add_caps'));
 	}
 
 
@@ -74,28 +74,28 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function filter_user_has_cap( $usercaps = array(), $caps = array(), $args = array(), $user = NULL ) {
+	public function filter_user_has_cap($usercaps = array(), $caps = array(), $args = array(), $user = NULL) {
 
 		// Empty caps_to_check array
-		if( ! $usercaps || ! $caps ) {
+		if (!$usercaps || !$caps) {
 			return $usercaps;
 		}
 
 		/**
 		 * Enable all GravityView caps_to_check if `gravityview_full_access` is enabled
 		 */
-		if( ! empty( $usercaps['gravityview_full_access'] ) ) {
+		if (!empty($usercaps['gravityview_full_access'])) {
 
 			$all_gravityview_caps = self::all_caps();
 
-			foreach( $all_gravityview_caps as $gv_cap ) {
-				$usercaps[ $gv_cap ] = true;
+			foreach ($all_gravityview_caps as $gv_cap) {
+				$usercaps[$gv_cap] = true;
 			}
 
-			unset( $all_gravityview_caps );
+			unset($all_gravityview_caps);
 		}
 
-		$usercaps = $this->add_gravity_forms_usercaps_to_gravityview_caps( $usercaps );
+		$usercaps = $this->add_gravity_forms_usercaps_to_gravityview_caps($usercaps);
 
 		return $usercaps;
 	}
@@ -114,7 +114,7 @@ 
 	 *
 	 * @return array
 	 */
-	private function add_gravity_forms_usercaps_to_gravityview_caps( $usercaps ) {
+	private function add_gravity_forms_usercaps_to_gravityview_caps($usercaps) {
 
 		$gf_to_gv_caps = array(
 			'gravityforms_edit_entries'     => 'gravityview_edit_others_entries',
@@ -122,9 +122,9 @@ 
 			'gravityforms_edit_entry_notes' => 'gravityview_edit_others_entry_notes',
 		);
 
-		foreach ( $gf_to_gv_caps as $gf_cap => $gv_cap ) {
-			if ( isset( $usercaps[ $gf_cap ] ) && ! isset( $usercaps[ $gv_cap ] ) ) {
-				$usercaps[ $gv_cap ] = $usercaps[ $gf_cap ];
+		foreach ($gf_to_gv_caps as $gf_cap => $gv_cap) {
+			if (isset($usercaps[$gf_cap]) && !isset($usercaps[$gv_cap])) {
+				$usercaps[$gv_cap] = $usercaps[$gf_cap];
 			}
 		}
 
@@ -138,17 +138,17 @@ 
 	 * @return void
 	 */
 	function members_register_cap_group() {
-		if ( function_exists( 'members_register_cap_group' ) ) {
+		if (function_exists('members_register_cap_group')) {
 
 			$args = array(
-				'label'         => __( 'GravityView', 'gravityview' ),
+				'label'         => __('GravityView', 'gravityview'),
 				'icon'          => 'gv-icon-astronaut-head',
 				'caps'          => self::all_caps(),
 				'merge_added'   => true,
 				'diff_added'    => false,
 			);
 
-			members_register_cap_group( 'gravityview', $args );
+			members_register_cap_group('gravityview', $args);
 		}
 	}
 
@@ -159,11 +159,11 @@ 
 	 * @param array $caps Existing capabilities
 	 * @return array Modified capabilities array
 	 */
-	public static function merge_with_all_caps( $caps ) {
+	public static function merge_with_all_caps($caps) {
 
-		$return_caps = array_merge( $caps, self::all_caps() );
+		$return_caps = array_merge($caps, self::all_caps());
 
-		return array_unique( $return_caps );
+		return array_unique($return_caps);
 	}
 
 	/**
@@ -178,7 +178,7 @@ 
 	private function wp_roles() {
 		global $wp_roles;
 
-		if ( ! isset( $wp_roles ) ) {
+		if (!isset($wp_roles)) {
 			$wp_roles = new WP_Roles();
 		}
 
@@ -196,7 +196,7 @@ 
 
 		$wp_roles = $this->wp_roles();
 
-		if ( is_object( $wp_roles ) ) {
+		if (is_object($wp_roles)) {
 
 			$_use_db_backup = $wp_roles->use_db;
 
@@ -206,11 +206,11 @@ 
 			 */
 			$wp_roles->use_db = false;
 
-			$capabilities = self::all_caps( false, false );
+			$capabilities = self::all_caps(false, false);
 
-			foreach ( $capabilities as $role_slug => $role_caps ) {
-				foreach ( $role_caps as $cap ) {
-					$wp_roles->add_cap( $role_slug, $cap );
+			foreach ($capabilities as $role_slug => $role_caps) {
+				foreach ($role_caps as $cap) {
+					$wp_roles->add_cap($role_slug, $cap);
 				}
 			}
 
@@ -219,7 +219,7 @@ 
 			 *
 			 * @see WP_Roles::add_cap() Original code
 			 */
-			update_option( $wp_roles->role_key, $wp_roles->roles );
+			update_option($wp_roles->role_key, $wp_roles->roles);
 
 			/**
 			 * Restore previous $use_db setting
@@ -240,7 +240,7 @@ 
 	 *
 	 * @return array If $role is set, flat array of caps_to_check. Otherwise, a multi-dimensional array of roles and their caps_to_check with the following keys: 'administrator', 'editor', 'author', 'contributor', 'subscriber'
 	 */
-	public static function all_caps( $single_role = false, $flat_array = true ) {
+	public static function all_caps($single_role = false, $flat_array = true) {
 
 		// Change settings
 		$administrator_caps = array(
@@ -297,20 +297,20 @@ 
 		);
 
 		$subscriber = $subscriber_caps;
-		$contributor = array_merge( $contributor_caps, $subscriber_caps );
-		$author = array_merge( $author_caps, $contributor_caps, $subscriber_caps );
-		$editor = array_merge( $editor_caps, $author_caps, $contributor_caps, $subscriber_caps );
-		$administrator = array_merge( $administrator_caps, $editor_caps, $author_caps, $contributor_caps, $subscriber_caps );
+		$contributor = array_merge($contributor_caps, $subscriber_caps);
+		$author = array_merge($author_caps, $contributor_caps, $subscriber_caps);
+		$editor = array_merge($editor_caps, $author_caps, $contributor_caps, $subscriber_caps);
+		$administrator = array_merge($administrator_caps, $editor_caps, $author_caps, $contributor_caps, $subscriber_caps);
 		$all = $administrator;
 
 		// If role is set, return caps_to_check for just that role.
-		if( $single_role ) {
-			$caps = isset( ${$single_role} ) ? ${$single_role} : false;
-			return $flat_array ? $caps : array( $single_role => $caps );
+		if ($single_role) {
+			$caps = isset(${$single_role} ) ? ${$single_role} : false;
+			return $flat_array ? $caps : array($single_role => $caps);
 		}
 
 		// Otherwise, return multi-dimensional array of all caps_to_check
-		return $flat_array ? $all : compact( 'administrator', 'editor', 'author', 'contributor', 'subscriber' );
+		return $flat_array ? $all : compact('administrator', 'editor', 'author', 'contributor', 'subscriber');
 	}
 
 	/**
@@ -330,25 +330,25 @@ 
 	 *
 	 * @return bool True: user has at least one passed capability; False: user does not have any defined capabilities
 	 */
-	public static function has_cap( $caps_to_check = '', $object_id = null, $user_id = null ) {
+	public static function has_cap($caps_to_check = '', $object_id = null, $user_id = null) {
 
 		$has_cap = false;
 
-		if( empty( $caps_to_check ) ) {
+		if (empty($caps_to_check)) {
 			return $has_cap;
 		}
 
 		// Add full access caps for GV & GF
-		$caps_to_check = self::maybe_add_full_access_caps( $caps_to_check );
+		$caps_to_check = self::maybe_add_full_access_caps($caps_to_check);
 
-		foreach ( $caps_to_check as $cap ) {
-			if( ! is_null( $object_id ) ) {
-				$has_cap = $user_id ? user_can( $user_id, $cap, $object_id ) : current_user_can( $cap, $object_id );
+		foreach ($caps_to_check as $cap) {
+			if (!is_null($object_id)) {
+				$has_cap = $user_id ? user_can($user_id, $cap, $object_id) : current_user_can($cap, $object_id);
 			} else {
-				$has_cap = $user_id ? user_can( $user_id, $cap ) : current_user_can( $cap );
+				$has_cap = $user_id ? user_can($user_id, $cap) : current_user_can($cap);
 			}
 			// At the first successful response, stop checking
-			if( $has_cap ) {
+			if ($has_cap) {
 				break;
 			}
 		}
@@ -365,25 +365,25 @@ 
 	 *
 	 * @return array
 	 */
-	public static function maybe_add_full_access_caps( $caps_to_check = array() ) {
+	public static function maybe_add_full_access_caps($caps_to_check = array()) {
 
 		$caps_to_check = (array)$caps_to_check;
 
 		$all_gravityview_caps = self::all_caps();
 
 		// Are there any $caps_to_check that are from GravityView?
-		if( $has_gravityview_caps = array_intersect( $caps_to_check, $all_gravityview_caps ) ) {
+		if ($has_gravityview_caps = array_intersect($caps_to_check, $all_gravityview_caps)) {
 			$caps_to_check[] = 'gravityview_full_access';
 		}
 
-		$all_gravity_forms_caps = class_exists( 'GFCommon' ) ? GFCommon::all_caps() : array();
+		$all_gravity_forms_caps = class_exists('GFCommon') ? GFCommon::all_caps() : array();
 
 		// Are there any $caps_to_check that are from Gravity Forms?
-		if( $all_gravity_forms_caps = array_intersect( $caps_to_check, $all_gravity_forms_caps ) ) {
+		if ($all_gravity_forms_caps = array_intersect($caps_to_check, $all_gravity_forms_caps)) {
 			$caps_to_check[] = 'gform_full_access';
 		}
 
-		return array_unique( $caps_to_check );
+		return array_unique($caps_to_check);
 	}
 
 	/**
@@ -396,19 +396,19 @@ 
 
 		$wp_roles = $this->wp_roles();
 
-		if ( is_object( $wp_roles ) ) {
+		if (is_object($wp_roles)) {
 
 			/** Remove all GravityView caps_to_check from all roles */
 			$capabilities = self::all_caps();
 
 			// Loop through each role and remove GV caps_to_check
-			foreach( $wp_roles->get_names() as $role_slug => $role_name ) {
-				foreach ( $capabilities as $cap ) {
-					$wp_roles->remove_cap( $role_slug, $cap );
+			foreach ($wp_roles->get_names() as $role_slug => $role_name) {
+				foreach ($capabilities as $cap) {
+					$wp_roles->remove_cap($role_slug, $cap);
 				}
 			}
 		}
 	}
 }
 
-add_action( 'init', array( 'GravityView_Roles_Capabilities', 'get_instance' ), 1 );
\ No newline at end of file
+add_action('init', array('GravityView_Roles_Capabilities', 'get_instance'), 1);
\ No newline at end of file

includes/class-gravityview-template.php

Doc Comments +8 added lines, -2 removed lines

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

Spacing +36 added lines, -36 removed lines

@@ -37,15 +37,15 @@ 
 	public $active_areas;
 
 
-	function __construct( $id, $settings = array(), $field_options = array(), $areas = array() ) {
+	function __construct($id, $settings = array(), $field_options = array(), $areas = array()) {
 
-		if ( empty( $id ) ) {
+		if (empty($id)) {
 			return;
 		}
 
 		$this->template_id = $id;
 
-		$this->merge_defaults( $settings );
+		$this->merge_defaults($settings);
 
 		$this->field_options = $field_options;
 		$this->active_areas  = $areas;
@@ -60,25 +60,25 @@ 
 	 */
 	private function add_hooks() {
 
-		add_filter( 'gravityview_register_directory_template', array( $this, 'register_template' ) );
+		add_filter('gravityview_register_directory_template', array($this, 'register_template'));
 
 		// presets hooks:
 		// form xml
-		add_filter( 'gravityview_template_formxml', array( $this, 'assign_form_xml' ), 10, 2 );
+		add_filter('gravityview_template_formxml', array($this, 'assign_form_xml'), 10, 2);
 		// fields config xml
-		add_filter( 'gravityview_template_fieldsxml', array( $this, 'assign_fields_xml' ), 10, 2 );
+		add_filter('gravityview_template_fieldsxml', array($this, 'assign_fields_xml'), 10, 2);
 
 		// assign active areas
-		add_filter( 'gravityview_template_active_areas', array( $this, 'assign_active_areas' ), 10, 3 );
+		add_filter('gravityview_template_active_areas', array($this, 'assign_active_areas'), 10, 3);
 
 		// field options
-		add_filter( 'gravityview_template_field_options', array( $this, 'assign_field_options' ), 10, 4 );
+		add_filter('gravityview_template_field_options', array($this, 'assign_field_options'), 10, 4);
 
 		// template slug
-		add_filter( "gravityview_template_slug_{$this->template_id}", array( $this, 'assign_view_slug' ), 10, 2 );
+		add_filter("gravityview_template_slug_{$this->template_id}", array($this, 'assign_view_slug'), 10, 2);
 
 		// register template CSS
-		add_action( 'wp_enqueue_scripts', array( $this, 'register_styles' ) );
+		add_action('wp_enqueue_scripts', array($this, 'register_styles'));
 	}
 
 	/**
@@ -90,7 +90,7 @@ 
 	 *
 	 * @return array                Merged template settings.
 	 */
-	private function merge_defaults( $settings = array() ) {
+	private function merge_defaults($settings = array()) {
 
 		$defaults = array(
 			'slug'          => '',
@@ -105,7 +105,7 @@ 
 			'preset_fields' => ''
 		);
 
-		$this->settings = wp_parse_args( $settings, $defaults );
+		$this->settings = wp_parse_args($settings, $defaults);
 
 		return $this->settings;
 	}
@@ -119,8 +119,8 @@ 
 	 *
 	 * @return array Array of templates available for GV
 	 */
-	public function register_template( $templates ) {
-		$templates[ $this->template_id ] = $this->settings;
+	public function register_template($templates) {
+		$templates[$this->template_id] = $this->settings;
 
 		return $templates;
 	}
@@ -136,17 +136,17 @@ 
 	 *
 	 * @return array Array of active areas
 	 */
-	public function assign_active_areas( $areas, $template = '', $context = 'directory' ) {
-		if ( $this->template_id === $template ) {
-			$areas = $this->get_active_areas( $context );
+	public function assign_active_areas($areas, $template = '', $context = 'directory') {
+		if ($this->template_id === $template) {
+			$areas = $this->get_active_areas($context);
 		}
 
 		return $areas;
 	}
 
-	public function get_active_areas( $context ) {
-		if ( isset( $this->active_areas[ $context ] ) ) {
-			return $this->active_areas[ $context ];
+	public function get_active_areas($context) {
+		if (isset($this->active_areas[$context])) {
+			return $this->active_areas[$context];
 		} else {
 			return $this->active_areas;
 		}
@@ -163,21 +163,21 @@ 
 	 *
 	 * @return array Array of field options
 	 */
-	public function assign_field_options( $field_options, $template_id, $field_id = NULL, $context = 'directory' ) {
+	public function assign_field_options($field_options, $template_id, $field_id = NULL, $context = 'directory') {
 
-		if ( $this->template_id === $template_id ) {
+		if ($this->template_id === $template_id) {
 
-			foreach ( $this->field_options as $key => $field_option ) {
+			foreach ($this->field_options as $key => $field_option) {
 
-				$field_context = rgar( $field_option, 'context' );
+				$field_context = rgar($field_option, 'context');
 
 				// Does the field option only apply to a certain context?
 				// You can define multiple contexts as an array:  `context => array("directory", "single")`
-				$context_matches = is_array( $field_context ) ? in_array( $context, $field_context ) : $context === $field_context;
+				$context_matches = is_array($field_context) ? in_array($context, $field_context) : $context === $field_context;
 
 				// If the context matches (or isn't defined), add the field options.
-				if ( $context_matches ) {
-					$field_options[ $key ] = $field_option;
+				if ($context_matches) {
+					$field_options[$key] = $field_option;
 				}
 			}
 		}
@@ -192,8 +192,8 @@ 
 	 * @see GravityView_Admin_Views::create_preset_form()
 	 * @return string                Path to XML file
 	 */
-	public function assign_form_xml( $xml = '', $template = '' ) {
-		if ( $this->settings['type'] === 'preset' && ! empty( $this->settings['preset_form'] ) && $this->template_id === $template ) {
+	public function assign_form_xml($xml = '', $template = '') {
+		if ($this->settings['type'] === 'preset' && !empty($this->settings['preset_form']) && $this->template_id === $template) {
 			return $this->settings['preset_form'];
 		}
 
@@ -206,8 +206,8 @@ 
 	 * @see GravityView_Admin_Views::pre_get_form_fields()
 	 * @return string                Path to XML file
 	 */
-	public function assign_fields_xml( $xml = '', $template = '' ) {
-		if ( $this->settings['type'] === 'preset' && ! empty( $this->settings['preset_fields'] ) && $this->template_id === $template ) {
+	public function assign_fields_xml($xml = '', $template = '') {
+		if ($this->settings['type'] === 'preset' && !empty($this->settings['preset_fields']) && $this->template_id === $template) {
 			return $this->settings['preset_fields'];
 		}
 
@@ -224,12 +224,12 @@ 
 	 *
 	 * @return string
 	 */
-	public function assign_view_slug( $default, $context ) {
+	public function assign_view_slug($default, $context) {
 
-		if ( ! empty( $this->settings['slug'] ) ) {
+		if (!empty($this->settings['slug'])) {
 			return $this->settings['slug'];
 		}
-		if ( ! empty( $default ) ) {
+		if (!empty($default)) {
 			return $default;
 		}
 
@@ -244,8 +244,8 @@ 
 	 * @return void
 	 */
 	public function register_styles() {
-		if ( ! empty( $this->settings['css_source'] ) ) {
-			wp_register_style( 'gravityview_style_' . $this->template_id, $this->settings['css_source'], array(), GravityView_Plugin::version, 'all' );
+		if (!empty($this->settings['css_source'])) {
+			wp_register_style('gravityview_style_'.$this->template_id, $this->settings['css_source'], array(), GravityView_Plugin::version, 'all');
 		}
 	}
 

includes/class-gv-license-handler.php

Doc Comments +4 added lines, -1 removed lines

@@ -53,6 +53,9 @@ 
 		add_action( 'wp_ajax_gravityview_license', array( $this, 'license_call' ) );
 	}
 
+	/**
+	 * @param boolean $echo
+	 */
 	function settings_edd_license_activation( $field, $echo ) {
 
 		wp_enqueue_script( 'gv-admin-edd-license', GRAVITYVIEW_URL . 'assets/js/admin-edd-license.js', array( 'jquery' ) );
@@ -241,7 +244,7 @@ 
 	 * Generate the status message box HTML based on the current status
 	 *
 	 * @since 1.7.4
-	 * @param $message
+	 * @param string $message
 	 * @param string $class
 	 *
 	 * @return string

Indentation +1 added lines, -1 removed lines

@@ -340,7 +340,7 @@
 		// Update option with passed data license
 		$settings = $this->Addon->get_app_settings();
 
-        $settings['license_key'] = $license_data->license_key = trim( $data['license'] );
+		$settings['license_key'] = $license_data->license_key = trim( $data['license'] );
 		$settings['license_key_status'] = $license_data->license;
 		$settings['license_key_response'] = (array)$license_data;
 

Spacing +86 added lines, -86 removed lines

@@ -33,14 +33,14 @@ 
 	 *
 	 * @return GV_License_Handler
 	 */
-	public static function get_instance( GravityView_Settings $GFAddOn ) {
-		if( empty( self::$instance ) ) {
-			self::$instance = new self( $GFAddOn );
+	public static function get_instance(GravityView_Settings $GFAddOn) {
+		if (empty(self::$instance)) {
+			self::$instance = new self($GFAddOn);
 		}
 		return self::$instance;
 	}
 	
-	private function __construct( GravityView_Settings $GFAddOn ) {
+	private function __construct(GravityView_Settings $GFAddOn) {
 
 		$this->Addon = $GFAddOn;
 
@@ -50,25 +50,25 @@ 
 	}
 
 	private function add_hooks() {
-		add_action( 'wp_ajax_gravityview_license', array( $this, 'license_call' ) );
+		add_action('wp_ajax_gravityview_license', array($this, 'license_call'));
 	}
 
-	function settings_edd_license_activation( $field, $echo ) {
+	function settings_edd_license_activation($field, $echo) {
 
-		wp_enqueue_script( 'gv-admin-edd-license', GRAVITYVIEW_URL . 'assets/js/admin-edd-license.js', array( 'jquery' ) );
+		wp_enqueue_script('gv-admin-edd-license', GRAVITYVIEW_URL.'assets/js/admin-edd-license.js', array('jquery'));
 
-		$status = trim( $this->Addon->get_app_setting( 'license_key_status' ) );
-		$key = trim( $this->Addon->get_app_setting( 'license_key' ) );
+		$status = trim($this->Addon->get_app_setting('license_key_status'));
+		$key = trim($this->Addon->get_app_setting('license_key'));
 
-		if( !empty( $key ) ) {
-			$response = $this->Addon->get_app_setting( 'license_key_response' );
-			$response = is_array( $response ) ? (object) $response : json_decode( $response );
+		if (!empty($key)) {
+			$response = $this->Addon->get_app_setting('license_key_response');
+			$response = is_array($response) ? (object)$response : json_decode($response);
 		} else {
 			$response = array();
 		}
 
-		wp_localize_script( 'gv-admin-edd-license', 'GVGlobals', array(
-			'license_box' => $this->get_license_message( $response )
+		wp_localize_script('gv-admin-edd-license', 'GVGlobals', array(
+			'license_box' => $this->get_license_message($response)
 		));
 
 
@@ -85,7 +85,7 @@ 
 				'value' => __('Deactivate License', 'gravityview'),
 				'data-pending_text' => __('Deactivating license…', 'gravityview'),
 				'data-edd_action' => 'deactivate_license',
-				'class' => ( empty( $status ) ? 'button-primary hide' : 'button-primary' ),
+				'class' => (empty($status) ? 'button-primary hide' : 'button-primary'),
 			),
 			array(
 				'name'  => 'edd-check',
@@ -100,19 +100,19 @@ 
 
 		$class = 'button gv-edd-action';
 
-		$class .= ( !empty( $key ) && $status !== 'valid' ) ? '' : ' hide';
+		$class .= (!empty($key) && $status !== 'valid') ? '' : ' hide';
 
-		$disabled_attribute = GVCommon::has_cap( 'gravityview_edit_settings' ) ? false : 'disabled';
+		$disabled_attribute = GVCommon::has_cap('gravityview_edit_settings') ? false : 'disabled';
 
 		$submit = '<div class="gv-edd-button-wrapper">';
-		foreach ( $fields as $field ) {
+		foreach ($fields as $field) {
 			$field['type'] = 'button';
-			$field['class'] = isset( $field['class'] ) ? $field['class'] . ' '. $class : $class;
+			$field['class'] = isset($field['class']) ? $field['class'].' '.$class : $class;
 			$field['style'] = 'margin-left: 10px;';
-			if( $disabled_attribute ) {
+			if ($disabled_attribute) {
 				$field['disabled'] = $disabled_attribute;
 			}
-			$submit .= $this->Addon->settings_submit( $field, $echo );
+			$submit .= $this->Addon->settings_submit($field, $echo);
 		}
 		$submit .= '</div>';
 
@@ -126,8 +126,8 @@ 
 	 */
 	private function setup_edd() {
 
-		if( !class_exists('EDD_SL_Plugin_Updater') ) {
-			require_once( GRAVITYVIEW_DIR . 'includes/lib/EDD_SL_Plugin_Updater.php');
+		if (!class_exists('EDD_SL_Plugin_Updater')) {
+			require_once(GRAVITYVIEW_DIR.'includes/lib/EDD_SL_Plugin_Updater.php');
 		}
 
 		// setup the updater
@@ -149,10 +149,10 @@ 
 	 *
 	 * @return array
 	 */
-	function _get_edd_settings( $action = '', $license = '' ) {
+	function _get_edd_settings($action = '', $license = '') {
 
 		// retrieve our license key from the DB
-		$license_key = empty( $license ) ? trim( $this->Addon->get_app_setting( 'license_key' ) ) : $license;
+		$license_key = empty($license) ? trim($this->Addon->get_app_setting('license_key')) : $license;
 
 		$settings = array(
 			'version'   => self::version,
@@ -163,11 +163,11 @@ 
 			'url'       => home_url(),
 		);
 
-		if( !empty( $action ) ) {
-			$settings['edd_action'] = esc_attr( $action );
+		if (!empty($action)) {
+			$settings['edd_action'] = esc_attr($action);
 		}
 
-		$settings = array_map( 'urlencode', $settings );
+		$settings = array_map('urlencode', $settings);
 
 		return $settings;
 	}
@@ -176,27 +176,27 @@ 
 	 * Perform the call
 	 * @return array|WP_Error
 	 */
-	private function _license_get_remote_response( $data, $license = '' ) {
+	private function _license_get_remote_response($data, $license = '') {
 
-		$api_params = $this->_get_edd_settings( $data['edd_action'], $license );
+		$api_params = $this->_get_edd_settings($data['edd_action'], $license);
 
-		$url = add_query_arg( $api_params, self::url );
+		$url = add_query_arg($api_params, self::url);
 
-		$response = wp_remote_get( $url, array(
+		$response = wp_remote_get($url, array(
 			'timeout'   => 15,
 			'sslverify' => false,
 		));
 
-		if ( is_wp_error( $response ) ) {
+		if (is_wp_error($response)) {
 			return array();
 		}
 
-		$license_data = json_decode( wp_remote_retrieve_body( $response ) );
+		$license_data = json_decode(wp_remote_retrieve_body($response));
 
 		// Not JSON
-		if ( empty( $license_data ) ) {
+		if (empty($license_data)) {
 
-			delete_transient( 'gravityview_' . esc_attr( $data['field_id'] ) . '_valid' );
+			delete_transient('gravityview_'.esc_attr($data['field_id']).'_valid');
 
 			// Change status
 			return array();
@@ -216,14 +216,14 @@ 
 	 *
 	 * @return string
 	 */
-	function get_license_message( $license_data ) {
+	function get_license_message($license_data) {
 
-		if( empty( $license_data ) ) {
+		if (empty($license_data)) {
 			$class = 'hide';
 			$message = '';
 		} else {
 
-			if( ! empty( $license_data->error ) ) {
+			if (!empty($license_data->error)) {
 				$class = 'error';
 				$string_key = $license_data->error;
 			} else {
@@ -231,10 +231,10 @@ 
 				$string_key = $license_data->license;
 			}
 
-			$message = sprintf( '<p><strong>%s: %s</strong></p>', $this->strings('status'), $this->strings( $string_key, $license_data ) );
+			$message = sprintf('<p><strong>%s: %s</strong></p>', $this->strings('status'), $this->strings($string_key, $license_data));
 		}
 
-		return $this->generate_license_box( $message, $class );
+		return $this->generate_license_box($message, $class);
 	}
 
 	/**
@@ -246,11 +246,11 @@ 
 	 *
 	 * @return string
 	 */
-	private function generate_license_box( $message, $class = '' ) {
+	private function generate_license_box($message, $class = '') {
 
 		$template = '<div id="gv-edd-status" class="gv-edd-message inline %s">%s</div>';
 
-		$output = sprintf( $template, esc_attr( $class ), $message );
+		$output = sprintf($template, esc_attr($class), $message);
 
 		return $output;
 	}
@@ -270,63 +270,63 @@ 
 	 *
 	 * @return mixed|string|void
 	 */
-	public function license_call( $array = array() ) {
+	public function license_call($array = array()) {
 
-		$is_ajax = ( defined('DOING_AJAX') && DOING_AJAX );
-		$data = empty( $array ) ? $_POST['data'] : $array;
-		$has_cap = GVCommon::has_cap( 'gravityview_edit_settings' );
+		$is_ajax = (defined('DOING_AJAX') && DOING_AJAX);
+		$data = empty($array) ? $_POST['data'] : $array;
+		$has_cap = GVCommon::has_cap('gravityview_edit_settings');
 
-		if ( $is_ajax && empty( $data['license'] ) ) {
-			die( - 1 );
+		if ($is_ajax && empty($data['license'])) {
+			die( -1 );
 		}
 
 		// If the user isn't allowed to edit settings, show an error message
-		if( ! $has_cap ) {
+		if (!$has_cap) {
 			$license_data = new stdClass();
 			$license_data->error = 'capability';
-			$license_data->message = $this->get_license_message( $license_data );
-			$json = json_encode( $license_data );
+			$license_data->message = $this->get_license_message($license_data);
+			$json = json_encode($license_data);
 		} else {
 
-			$license      = esc_attr( rgget( 'license', $data ) );
-			$license_data = $this->_license_get_remote_response( $data, $license );
+			$license      = esc_attr(rgget('license', $data));
+			$license_data = $this->_license_get_remote_response($data, $license);
 
 			// Empty is returned when there's an error.
-			if ( empty( $license_data ) ) {
-				if ( $is_ajax ) {
-					exit( json_encode( array() ) );
+			if (empty($license_data)) {
+				if ($is_ajax) {
+					exit(json_encode(array()));
 				} else { // Non-ajax call
-					return json_encode( array() );
+					return json_encode(array());
 				}
 			}
 
-			$license_data->message = $this->get_license_message( $license_data );
+			$license_data->message = $this->get_license_message($license_data);
 
-			$json = json_encode( $license_data );
+			$json = json_encode($license_data);
 
-			$update_license = ( ! isset( $data['update'] ) || ! empty( $data['update'] ) );
+			$update_license = (!isset($data['update']) || !empty($data['update']));
 
-			$is_check_action_button = ( 'check_license' === $data['edd_action'] && defined( 'DOING_AJAX' ) && DOING_AJAX );
+			$is_check_action_button = ('check_license' === $data['edd_action'] && defined('DOING_AJAX') && DOING_AJAX);
 
 			// Failed is the response from trying to de-activate a license and it didn't work.
 			// This likely happened because people entered in a different key and clicked "Deactivate",
 			// meaning to deactivate the original key. We don't want to save this response, since it is
 			// most likely a mistake.
-			if ( $license_data->license !== 'failed' && ! $is_check_action_button && $update_license ) {
+			if ($license_data->license !== 'failed' && !$is_check_action_button && $update_license) {
 
-				if ( ! empty( $data['field_id'] ) ) {
-					set_transient( 'gravityview_' . esc_attr( $data['field_id'] ) . '_valid', $license_data, DAY_IN_SECONDS );
+				if (!empty($data['field_id'])) {
+					set_transient('gravityview_'.esc_attr($data['field_id']).'_valid', $license_data, DAY_IN_SECONDS);
 				}
 
-				$this->license_call_update_settings( $license_data, $data );
+				$this->license_call_update_settings($license_data, $data);
 
 			}
 		} // End $has_cap
 
-		if ( $is_ajax ) {
-			exit( $json );
+		if ($is_ajax) {
+			exit($json);
 		} else { // Non-ajax call
-			return ( rgget('format', $data ) === 'object' ) ? $license_data : $json;
+			return (rgget('format', $data) === 'object') ? $license_data : $json;
 		}
 	}
 
@@ -335,16 +335,16 @@ 
 	 * @param object $license_data
 	 * @return void
 	 */
-	private function license_call_update_settings( $license_data, $data ) {
+	private function license_call_update_settings($license_data, $data) {
 
 		// Update option with passed data license
 		$settings = $this->Addon->get_app_settings();
 
-        $settings['license_key'] = $license_data->license_key = trim( $data['license'] );
+        $settings['license_key'] = $license_data->license_key = trim($data['license']);
 		$settings['license_key_status'] = $license_data->license;
 		$settings['license_key_response'] = (array)$license_data;
 
-		$this->Addon->update_app_settings( $settings );
+		$this->Addon->update_app_settings($settings);
 	}
 
 	/**
@@ -353,8 +353,8 @@ 
 	 * @param  object|null $license_data Object with license data
 	 * @return string Renewal or account URL
 	 */
-	private function get_license_renewal_url( $license_data ) {
-		$renew_license_url = ( ! empty( $license_data ) && !empty( $license_data->license_key ) ) ? sprintf( 'https://gravityview.co/checkout/?download_id=17&edd_license_key=%s&utm_source=admin_notice&utm_medium=admin&utm_content=expired&utm_campaign=Activation', $license_data->license_key ) : 'https://gravityview.co/account/';
+	private function get_license_renewal_url($license_data) {
+		$renew_license_url = (!empty($license_data) && !empty($license_data->license_key)) ? sprintf('https://gravityview.co/checkout/?download_id=17&edd_license_key=%s&utm_source=admin_notice&utm_medium=admin&utm_content=expired&utm_campaign=Activation', $license_data->license_key) : 'https://gravityview.co/account/';
 		return $renew_license_url;
 	}
 
@@ -364,7 +364,7 @@ 
 	 * @param  object|null $license_data Object with license data
 	 * @return array          Modified array of content
 	 */
-	public function strings( $status = NULL, $license_data = null ) {
+	public function strings($status = NULL, $license_data = null) {
 
 
 		$strings = array(
@@ -372,14 +372,14 @@ 
 			'error' => esc_html__('There was an error processing the request.', 'gravityview'),
 			'failed'  => esc_html__('Could not deactivate the license. The license key you attempted to deactivate may not be active or valid.', 'gravityview'),
 			'site_inactive' => esc_html__('The license key is valid, but it has not been activated for this site.', 'gravityview'),
-			'no_activations_left' => esc_html__('Invalid: this license has reached its activation limit.', 'gravityview') . ' ' . sprintf( esc_html__('You can manage license activations %son your GravityView account page%s.', 'gravityview'), '<a href="https://gravityview.co/account/#licenses">', '</a>' ),
+			'no_activations_left' => esc_html__('Invalid: this license has reached its activation limit.', 'gravityview').' '.sprintf(esc_html__('You can manage license activations %son your GravityView account page%s.', 'gravityview'), '<a href="https://gravityview.co/account/#licenses">', '</a>'),
 			'deactivated' => esc_html__('The license has been deactivated.', 'gravityview'),
 			'valid' => esc_html__('The license key is valid and active.', 'gravityview'),
 			'invalid' => esc_html__('The license key entered is invalid.', 'gravityview'),
 			'missing' => esc_html__('The license key was not defined.', 'gravityview'),
 			'revoked' => esc_html__('This license key has been revoked.', 'gravityview'),
-			'expired' => sprintf( esc_html__('This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview'), '<a href="'. esc_url( $this->get_license_renewal_url( $license_data ) ) .'">', '</a>' ),
-			'capability' => esc_html__( 'You don\'t have the ability to edit plugin settings.', 'gravityview' ),
+			'expired' => sprintf(esc_html__('This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview'), '<a href="'.esc_url($this->get_license_renewal_url($license_data)).'">', '</a>'),
+			'capability' => esc_html__('You don\'t have the ability to edit plugin settings.', 'gravityview'),
 
 			'verifying_license' => esc_html__('Verifying license&hellip;', 'gravityview'),
 			'activate_license' => esc_html__('Activate License', 'gravityview'),
@@ -387,33 +387,33 @@ 
 			'check_license' => esc_html__('Verify License', 'gravityview'),
 		);
 
-		if( empty( $status ) ) {
+		if (empty($status)) {
 			return $strings;
 		}
 
-		if( isset( $strings[ $status ] ) ) {
-			return $strings[ $status ];
+		if (isset($strings[$status])) {
+			return $strings[$status];
 		}
 
 		return NULL;
 	}
 
-	public function validate_license_key( $value, $field ) {
+	public function validate_license_key($value, $field) {
 
 		// No license? No status.
-		if( empty( $value ) ) {
+		if (empty($value)) {
 			return NULL;
 		}
 
 		$response = $this->license_call(array(
-			'license' => $this->Addon->get_app_setting( 'license_key' ),
+			'license' => $this->Addon->get_app_setting('license_key'),
 			'edd_action' => 'check_license',
 			'field_id' => $field['name'],
 		));
 
-		$response = is_string( $response ) ? json_decode( $response, true ) : $response;
+		$response = is_string($response) ? json_decode($response, true) : $response;
 
-		switch( $response['license'] ) {
+		switch ($response['license']) {
 			case 'valid':
 				$return = true;
 				break;