gravityview / GravityView

includes/class-gravityview-compatibility.php

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

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-entry-list.php

Spacing +31 added lines, -31 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 /** If this file is called directly, abort. */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	die;
 }
 
@@ -75,7 +75,7 @@ 
 	 * @param string $link_format
 	 * @param string $after_link
 	 */
-	function __construct( $entries = array(), $post_id = 0, $form = array(), $link_format = '', $after_link = '', $context = '' ) {
+	function __construct($entries = array(), $post_id = 0, $form = array(), $link_format = '', $after_link = '', $context = '') {
 
 		$this->entries = $entries;
 		$this->post_id = $post_id;
@@ -90,28 +90,28 @@ 
 	/**
 	 * @param int $post_id
 	 */
-	public function set_post_id( $post_id ) {
+	public function set_post_id($post_id) {
 		$this->post_id = $post_id;
 	}
 
 	/**
 	 * @param string $link_format
 	 */
-	public function set_link_format( $link_format ) {
+	public function set_link_format($link_format) {
 		$this->link_format = $link_format;
 	}
 
 	/**
 	 * @param boolean $skip_current_entry
 	 */
-	public function set_skip_current_entry( $skip_current_entry ) {
+	public function set_skip_current_entry($skip_current_entry) {
 		$this->skip_current_entry = (bool)$skip_current_entry;
 	}
 
 	/**
 	 * @param string $after_link
 	 */
-	public function set_after_link( $after_link ) {
+	public function set_after_link($after_link) {
 		$this->after_link = $after_link;
 	}
 
@@ -119,7 +119,7 @@ 
 	 * Set the message when there are no entries to display
 	 * @param string $empty_message
 	 */
-	public function set_empty_message( $empty_message ) {
+	public function set_empty_message($empty_message) {
 		$this->empty_message = $empty_message;
 	}
 
@@ -127,23 +127,23 @@ 
 	 * Set the context in which this entry list is being displayed.
 	 * @param string $context
 	 */
-	public function set_context( $context ) {
+	public function set_context($context) {
 		$this->context = $context;
 	}
 
 	/**
 	 * @param string $wrapper_tag
 	 */
-	public function set_wrapper_tag( $wrapper_tag ) {
-		$this->wrapper_tag = esc_attr( $wrapper_tag );
+	public function set_wrapper_tag($wrapper_tag) {
+		$this->wrapper_tag = esc_attr($wrapper_tag);
 	}
 
 	/**
 	 *
 	 * @param string $item_tag
 	 */
-	public function set_item_tag( $item_tag ) {
-		$this->item_tag = esc_attr( $item_tag );
+	public function set_item_tag($item_tag) {
+		$this->item_tag = esc_attr($item_tag);
 	}
 
 	/**
@@ -170,32 +170,32 @@ 
 	public function get_output() {
 
 		// No Entries
-		if( empty( $this->entries ) ) {
+		if (empty($this->entries)) {
 			return '<div class="gv-no-results">'.$this->empty_message.'</div>';
 		}
 
 		$output = '';
 		$current_entry = GravityView_View::getInstance()->getCurrentEntry();
 
-		$output .= '<'. $this->wrapper_tag .'>';
+		$output .= '<'.$this->wrapper_tag.'>';
 
-		foreach( $this->entries as $entry ) {
+		foreach ($this->entries as $entry) {
 
-			if( $this->skip_entry( $entry, $current_entry ) ) {
+			if ($this->skip_entry($entry, $current_entry)) {
 				continue;
 			}
 
-			$output .= $this->get_item_output( $entry );
+			$output .= $this->get_item_output($entry);
 		}
 
-		$output .= '</'. $this->wrapper_tag .'>';
+		$output .= '</'.$this->wrapper_tag.'>';
 
 		/**
 		 * @filter `gravityview/widget/recent-entries/output` Modify the HTML of the Recent Entries widget output
 		 * @param string $output HTML to be displayed
 		 * @param GravityView_Entry_List $this The current class instance
 		 */
-		$output = apply_filters( 'gravityview/widget/recent-entries/output', $output, $this );
+		$output = apply_filters('gravityview/widget/recent-entries/output', $output, $this);
 
 		return $output;
 	}
@@ -208,18 +208,18 @@ 
 	 *
 	 * @return bool True: Skip entry; False: don't skip entry
 	 */
-	private function skip_entry( $entry, $current_entry ) {
+	private function skip_entry($entry, $current_entry) {
 
 		// If skip entry is off, or there's no current entry, return false
-		if( empty( $this->skip_current_entry ) || empty( $current_entry ) ) {
+		if (empty($this->skip_current_entry) || empty($current_entry)) {
 			return false;
 		}
 
 		// If in Single or Edit mode, $current_entry will be an array.
-		$current_entry_id = is_array( $current_entry ) ? $current_entry['id'] : $current_entry;
+		$current_entry_id = is_array($current_entry) ? $current_entry['id'] : $current_entry;
 
 		// If the entry ID matches the current entry, yes: skip
-		if( $entry['id'] === $current_entry_id ) {
+		if ($entry['id'] === $current_entry_id) {
 			return true;
 		}
 
@@ -240,13 +240,13 @@ 
 	 *
 	 * @return string HTML output for the entry
 	 */
-	private function get_item_output( $entry ) {
+	private function get_item_output($entry) {
 
-		$link = GravityView_API::entry_link( $entry, $this->post_id );
+		$link = GravityView_API::entry_link($entry, $this->post_id);
 
-		$item_output = gravityview_get_link( $link, $this->link_format );
+		$item_output = gravityview_get_link($link, $this->link_format);
 
-		if( !empty( $this->after_link ) ) {
+		if (!empty($this->after_link)) {
 
 			/**
 			 * @filter `gravityview/entry-list/after-link` Modify the content displayed after the entry link in an entry list
@@ -255,14 +255,14 @@ 
 			 * @param array $entry Gravity Forms entry array
 			 * @param GravityView_Entry_List $this The current class instance
 			 */
-			$after_link = apply_filters( 'gravityview/entry-list/after-link', '<div>'.$this->after_link.'</div>', $entry, $this );
+			$after_link = apply_filters('gravityview/entry-list/after-link', '<div>'.$this->after_link.'</div>', $entry, $this);
 
 			$item_output .= $after_link;
 		}
 
-		$item_output = GravityView_API::replace_variables( $item_output, $this->form, $entry );
+		$item_output = GravityView_API::replace_variables($item_output, $this->form, $entry);
 
-		$item_output = '<'. $this->item_tag .'>'. $item_output .'</'. $this->item_tag .'>';
+		$item_output = '<'.$this->item_tag.'>'.$item_output.'</'.$this->item_tag.'>';
 
 		/**
 		 * @filter `gravityview/entry-list/item` Modify each item's output in an entry list
@@ -271,7 +271,7 @@ 
 		 * @param array $entry Gravity Forms entry array
 		 * @param GravityView_Entry_List $this The current class instance
 		 */
-		$item_output = apply_filters( 'gravityview/entry-list/item', $item_output, $entry, $this );
+		$item_output = apply_filters('gravityview/entry-list/item', $item_output, $entry, $this);
 
 		return $item_output;
 	}

includes/class-gravityview-entry-notes.php

Spacing +17 added lines, -17 removed lines

@@ -17,7 +17,7 @@ 
 	 * @since 1.15
 	 */
 	private function add_hooks() {
-		add_filter( 'gform_notes_avatar', array( 'GravityView_Entry_Notes', 'filter_avatar' ), 10, 2 );
+		add_filter('gform_notes_avatar', array('GravityView_Entry_Notes', 'filter_avatar'), 10, 2);
 	}
 
 
@@ -31,7 +31,7 @@ 
 	 * @param string $note Note content.
 	 * @param string $note_type Type of note. Default: `gravityview`
 	 */
-	public static function add_note( $lead_id, $user_id, $user_name, $note = '', $note_type = 'gravityview' ) {
+	public static function add_note($lead_id, $user_id, $user_name, $note = '', $note_type = 'gravityview') {
 
 		$default_note = array(
 			'lead_id' => 0,
@@ -47,12 +47,12 @@ 
 		 * @since 1.15.2
 		 * @param array $note Array with `lead_id`, `user_id`, `user_name`, `note`, and `note_type` key value pairs
 		 */
-		$note = apply_filters( 'gravityview/entry_notes/add_note', compact( 'lead_id', 'user_id', 'user_name', 'note', 'note_type' ) );
+		$note = apply_filters('gravityview/entry_notes/add_note', compact('lead_id', 'user_id', 'user_name', 'note', 'note_type'));
 
 		// Make sure the keys are all set
-		$note = wp_parse_args( $note, $default_note );
+		$note = wp_parse_args($note, $default_note);
 
-		GFFormsModel::add_note( intval( $note['lead_id'] ), intval( $note['user_id'] ), esc_attr( $note['user_name'] ), $note['note'], esc_attr( $note['note_type'] ) );
+		GFFormsModel::add_note(intval($note['lead_id']), intval($note['user_id']), esc_attr($note['user_name']), $note['note'], esc_attr($note['note_type']));
 	}
 
 	/**
@@ -60,8 +60,8 @@ 
 	 * @see GFFormsModel::delete_note()
 	 * @param int $note_id Entry note ID
 	 */
-	public static function delete_note( $note_id ) {
-		GFFormsModel::delete_note( $note_id );
+	public static function delete_note($note_id) {
+		GFFormsModel::delete_note($note_id);
 	}
 
 	/**
@@ -70,13 +70,13 @@ 
 	 * @todo Write more efficient delete note method using SQL
 	 * @param int[] $note_ids Array of entry note ids
 	 */
-	public static function delete_notes( $note_ids = array() ) {
+	public static function delete_notes($note_ids = array()) {
 
-		if( !is_array( $note_ids ) ) {
-			do_action( 'gravityview_log_error', __METHOD__ . ' - Note IDs not an array', $note_ids );
+		if (!is_array($note_ids)) {
+			do_action('gravityview_log_error', __METHOD__.' - Note IDs not an array', $note_ids);
 		}
 
-		GFFormsModel::delete_notes( $note_ids );
+		GFFormsModel::delete_notes($note_ids);
 	}
 
 	/**
@@ -87,8 +87,8 @@ 
 	 *
 	 * @return stdClass[] Integer-keyed array of note objects
 	 */
-	public static function get_notes( $entry_id ) {
-		$notes = GFFormsModel::get_lead_notes( $entry_id );
+	public static function get_notes($entry_id) {
+		$notes = GFFormsModel::get_lead_notes($entry_id);
 
 		/**
 		 * @filter `gravityview/entry_notes/get_notes` Modify the notes array for an entry
@@ -96,7 +96,7 @@ 
 		 * @param stdClass[] $notes Integer-keyed array of note objects
 		 * @param int $entry_id Entry to get notes for
 		 */
-		$notes = apply_filters( 'gravityview/entry_notes/get_notes', $notes, $entry_id );
+		$notes = apply_filters('gravityview/entry_notes/get_notes', $notes, $entry_id);
 
 		return $notes;
 	}
@@ -109,10 +109,10 @@ 
 	 * @param object $note Note object with id, user_id, date_created, value, note_type, user_name, user_email vars
 	 * @return string Possibly-modified avatar
 	 */
-	public static function filter_avatar( $avatar = '', $note ) {
+	public static function filter_avatar($avatar = '', $note) {
 
-		if( 'gravityview' === $note->note_type && -1 === (int)$note->user_id ) {
-			$avatar =  sprintf( '<img src="%s" width="48" height="48" alt="GravityView" class="avatar avatar-48 gravityview-avatar" />', esc_url_raw( plugins_url( 'assets/images/floaty-avatar.png', GRAVITYVIEW_FILE ) ) );
+		if ('gravityview' === $note->note_type && -1 === (int)$note->user_id) {
+			$avatar = sprintf('<img src="%s" width="48" height="48" alt="GravityView" class="avatar avatar-48 gravityview-avatar" />', esc_url_raw(plugins_url('assets/images/floaty-avatar.png', GRAVITYVIEW_FILE)));
 		}
 
 		return $avatar;

includes/class-gravityview-extension.php

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;
 		}

includes/class-gravityview-image.php

Spacing +25 added lines, -25 removed lines

@@ -49,7 +49,7 @@ 
 	}
 
 
-	function __construct( $atts = array() ) {
+	function __construct($atts = array()) {
 
 		$defaults = array(
 			'width' => $this->width,
@@ -63,13 +63,13 @@ 
 			'validate_src' => true
 		);
 
-		$atts = wp_parse_args( $atts, $defaults );
+		$atts = wp_parse_args($atts, $defaults);
 
-		foreach( $atts as $key => $val ) {
+		foreach ($atts as $key => $val) {
 			$this->{$key} = $val;
 		}
 
-		$this->class = !empty( $this->class ) ? esc_attr( implode( ' ', (array)$this->class ) ) : $this->class;
+		$this->class = !empty($this->class) ? esc_attr(implode(' ', (array)$this->class)) : $this->class;
 
 		$this->set_image_size();
 
@@ -85,17 +85,17 @@ 
 	 */
 	function validate_image_src() {
 
-		if ( !$this->validate_src ) { return true; }
+		if (!$this->validate_src) { return true; }
 
-		$info = pathinfo( $this->src );
+		$info = pathinfo($this->src);
 
 		/**
 		 * @filter `gravityview_image_extensions` Extensions that GravityView recognizes as valid images to be shown in an `img` tag
 		 * @param array $image_exts Default: `['jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico']`
 		 */
-		$image_exts = apply_filters( 'gravityview_image_extensions', array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico' ));
+		$image_exts = apply_filters('gravityview_image_extensions', array('jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico'));
 
-		return isset( $info['extension'] ) && in_array( strtolower( $info['extension'] ), $image_exts);
+		return isset($info['extension']) && in_array(strtolower($info['extension']), $image_exts);
 	}
 
 	/**
@@ -103,20 +103,20 @@ 
 	 *
 	 * @return void
 	 */
-	public function set_image_size( $string = NULL, $width = NULL, $height = NULL ) {
+	public function set_image_size($string = NULL, $width = NULL, $height = NULL) {
 
 
 		// If there is no width or height passed
-		if ( empty( $width ) || empty( $height ) ) {
+		if (empty($width) || empty($height)) {
 
 			// And there is no string size passed
 			// 		And we want to get the image size using PHP
-			if ( empty( $string ) && !empty( $this->getimagesize ) ) {
+			if (empty($string) && !empty($this->getimagesize)) {
 
-				$image_size = getimagesize( $this->src );
+				$image_size = getimagesize($this->src);
 
-				if ( !empty( $image_size ) ) {
-					list( $width, $height ) = $image_size;
+				if (!empty($image_size)) {
+					list($width, $height) = $image_size;
 				}
 
 			}
@@ -127,14 +127,14 @@ 
 				 * @filter `gravityview_image_sizes` Modify the image size presets used by GravityView_Image class
 				 * @param array $image_sizes Array of image sizes with the key being the size slug, and the value being an array with `width` and `height` defined, in pixels
 				 */
-				$image_sizes = apply_filters( 'gravityview_image_sizes', array(
+				$image_sizes = apply_filters('gravityview_image_sizes', array(
 					'tiny' => array('width' => 40, 'height' => 30),
 					'small' => array('width' => 100, 'height' => 75),
 					'medium' => array('width' => 250, 'height' => 188),
 					'large' => array('width' => 448, 'height' => 336),
-				) );
+				));
 
-				switch( $this->size ) {
+				switch ($this->size) {
 					case 'tiny':
 						extract($image_sizes['tiny']);
 						break;
@@ -153,8 +153,8 @@ 
 						break;
 					default:
 						// Verify that the passed sizes are integers.
-						$width = !empty( $width ) ? intval( $width ) : intval( $this->width );
-						$height = !empty( $height ) ? intval( $height ) : intval( $this->height );
+						$width = !empty($width) ? intval($width) : intval($this->width);
+						$height = !empty($height) ? intval($height) : intval($this->height);
 				}
 
 			}
@@ -171,18 +171,18 @@ 
 	 */
 	public function html() {
 
-		if ( ! $this->validate_image_src() ) {
+		if (!$this->validate_image_src()) {
 			$html = '';
 		} else {
 			$atts = '';
-			foreach ( array( 'width', 'height', 'alt', 'title', 'class' ) as $attr ) {
+			foreach (array('width', 'height', 'alt', 'title', 'class') as $attr) {
 
-				if ( empty( $this->{$attr} ) ) { continue; }
+				if (empty($this->{$attr} )) { continue; }
 
-				$atts .= sprintf( ' %s="%s"', $attr, esc_attr( $this->{$attr} ) );
+				$atts .= sprintf(' %s="%s"', $attr, esc_attr($this->{$attr} ));
 			}
 
-			$html = sprintf( '<img src="%s" %s />', esc_url_raw( $this->src ), $atts );
+			$html = sprintf('<img src="%s" %s />', esc_url_raw($this->src), $atts);
 		}
 
 		/**
@@ -190,6 +190,6 @@ 
 		 * @param string $html the generated image html
 		 * @param GravityView_Image $this The current image object
 		 */
-		return apply_filters( 'gravityview_image_html', $html, $this );
+		return apply_filters('gravityview_image_html', $html, $this);
 	}
 }

includes/class-gravityview-logging.php

Spacing +21 added lines, -21 removed lines

@@ -7,15 +7,15 @@ 
 
 	function __construct() {
 
-		add_action( 'gravityview_log_error', array( $this, 'log_error'), 10, 2 );
+		add_action('gravityview_log_error', array($this, 'log_error'), 10, 2);
 
-		add_action( 'gravityview_log_debug', array( $this, 'log_debug'), 10, 2 );
+		add_action('gravityview_log_debug', array($this, 'log_debug'), 10, 2);
 
 		// Enable debug with Gravity Forms Logging Add-on
-	    add_filter( 'gform_logging_supported', array( $this, 'enable_gform_logging' ) );
+	    add_filter('gform_logging_supported', array($this, 'enable_gform_logging'));
 
 	    // Load Debug Bar integration
-	    add_filter( 'debug_bar_panels', array( $this, 'add_debug_bar' ) );
+	    add_filter('debug_bar_panels', array($this, 'add_debug_bar'));
 
 	}
 
@@ -24,14 +24,14 @@ 
 	 *
 	 * @see http://wordpress.org/plugins/debug-bar/
 	 */
-	public function add_debug_bar( $panels ) {
+	public function add_debug_bar($panels) {
 
-		if ( ! class_exists( 'Debug_Bar_Panel' ) ) {
+		if (!class_exists('Debug_Bar_Panel')) {
 			return;
 		}
 
-		if ( ! class_exists( 'GravityView_Debug_Bar' ) ) {
-			include_once( GRAVITYVIEW_DIR . 'includes/class-debug-bar.php' );
+		if (!class_exists('GravityView_Debug_Bar')) {
+			include_once(GRAVITYVIEW_DIR.'includes/class-debug-bar.php');
 		}
 
 		$panels[] = new GravityView_Debug_Bar;
@@ -43,7 +43,7 @@ 
 	 * Enables debug with Gravity Forms logging add-on
 	 * @param array $supported_plugins List of plugins
 	 */
-	public function enable_gform_logging( $supported_plugins ) {
+	public function enable_gform_logging($supported_plugins) {
 	    $supported_plugins['gravityview'] = 'GravityView';
 	    return $supported_plugins;
 	}
@@ -72,7 +72,7 @@ 
 	 * @return string "print_r" or "var_export"
 	 */
 	static function get_print_function() {
-		if( ob_get_level() > 0 ) {
+		if (ob_get_level() > 0) {
 			$function = 'var_export';
 		} else {
 			$function = 'print_r';
@@ -81,43 +81,43 @@ 
 		return $function;
 	}
 
-	static function log_debug( $message = '', $data = null ) {
+	static function log_debug($message = '', $data = null) {
 
 		$function = self::get_print_function();
 
 		$notice = array(
-			'message' => $function( $message, true ),
+			'message' => $function($message, true),
 			'data' => $data,
-			'backtrace' => function_exists('wp_debug_backtrace_summary') ? wp_debug_backtrace_summary( null, 3 ) : '',
+			'backtrace' => function_exists('wp_debug_backtrace_summary') ? wp_debug_backtrace_summary(null, 3) : '',
 		);
 
-		if( !in_array( $notice, self::$notices ) ) {
+		if (!in_array($notice, self::$notices)) {
 			self::$notices[] = $notice;
 		}
 
-		if ( class_exists("GFLogging") ) {
+		if (class_exists("GFLogging")) {
 			GFLogging::include_logger();
-	        GFLogging::log_message( 'gravityview', $function( $message, true ) . $function($data, true), KLogger::DEBUG );
+	        GFLogging::log_message('gravityview', $function($message, true).$function($data, true), KLogger::DEBUG);
 	    }
 	}
 
-	static function log_error( $message = '', $data = null  ) {
+	static function log_error($message = '', $data = null) {
 
 		$function = self::get_print_function();
 
 		$error = array(
 			'message' => $message,
 			'data' => $data,
-			'backtrace' => function_exists('wp_debug_backtrace_summary') ? wp_debug_backtrace_summary( null, 3 ) : '',
+			'backtrace' => function_exists('wp_debug_backtrace_summary') ? wp_debug_backtrace_summary(null, 3) : '',
 		);
 
-		if( !in_array( $error, self::$errors ) ) {
+		if (!in_array($error, self::$errors)) {
 			self::$errors[] = $error;
 		}
 
-		if ( class_exists("GFLogging") ) {
+		if (class_exists("GFLogging")) {
 		    GFLogging::include_logger();
-		    GFLogging::log_message( 'gravityview', $function ( $message, true ) . $function ($data, true), KLogger::ERROR );
+		    GFLogging::log_message('gravityview', $function($message, true).$function($data, true), KLogger::ERROR);
 		}
 	}
 

includes/class-gravityview-migrate.php

Spacing +60 added lines, -60 removed lines

@@ -15,7 +15,7 @@ 
 class GravityView_Migrate {
 
 	function __construct() {
-		add_action( 'admin_init', array( $this, 'update_settings' ), 1 );
+		add_action('admin_init', array($this, 'update_settings'), 1);
 	}
 
 	public function update_settings() {
@@ -32,8 +32,8 @@ 
 	private function maybe_migrate_search_widget() {
 
 		// check if search migration is already performed
-		$is_updated = get_option( 'gv_migrate_searchwidget' );
-		if ( $is_updated ) {
+		$is_updated = get_option('gv_migrate_searchwidget');
+		if ($is_updated) {
 			return;
 		} else {
 			$this->update_search_on_views();
@@ -51,22 +51,22 @@ 
 		$redux_settings = $this->get_redux_settings();
 
 		// No need to process
-		if( false === $redux_settings ) {
+		if (false === $redux_settings) {
 			return;
 		}
 
-		if( empty(  $redux_settings['license_key_status'] ) ) {
-			$redux_settings = $this->get_redux_license_status( $redux_settings );
+		if (empty($redux_settings['license_key_status'])) {
+			$redux_settings = $this->get_redux_license_status($redux_settings);
 		}
 
 		// Get the current app settings (just defaults)
 		$current = GravityView_Settings::get_instance()->get_app_settings();
 
 		// Merge the redux settings with the defaults
-		$updated_settings = wp_parse_args( $redux_settings, $current );
+		$updated_settings = wp_parse_args($redux_settings, $current);
 
 		// Update the defaults to the new merged
-		GravityView_Settings::get_instance()->update_app_settings( $updated_settings );
+		GravityView_Settings::get_instance()->update_app_settings($updated_settings);
 
 		// And now remove the previous option, so this is a one-time thing.
 		delete_option('gravityview_settings');
@@ -82,20 +82,20 @@ 
 	 *
 	 * @return array
 	 */
-	function get_redux_license_status( $redux_settings = array() ) {
+	function get_redux_license_status($redux_settings = array()) {
 
 		$data = array(
 			'edd_action' => 'check_license',
-			'license' => rgget('license_key', $redux_settings ),
+			'license' => rgget('license_key', $redux_settings),
 			'update' => false,
 			'format' => 'object',
 		);
 
-		$license_call = GravityView_Settings::get_instance()->get_license_handler()->license_call( $data );
+		$license_call = GravityView_Settings::get_instance()->get_license_handler()->license_call($data);
 
-		if( is_object( $license_call ) && isset( $license_call->license ) ) {
+		if (is_object($license_call) && isset($license_call->license)) {
 			$redux_settings['license_key_status'] = $license_call->license;
-			$redux_settings['license_key_response'] = json_encode( $license_call );
+			$redux_settings['license_key_response'] = json_encode($license_call);
 		}
 
 		return $redux_settings;
@@ -112,31 +112,31 @@ 
 		$redux_option = get_option('gravityview_settings');
 
 		// No Redux settings? Don't proceed.
-		if( false === $redux_option ) {
+		if (false === $redux_option) {
 			return false;
 		}
 
 
 		$redux_settings = array(
-			'support-email' => rgget( 'support-email', $redux_option ),
-			'no-conflict-mode' => ( rgget( 'no-conflict-mode', $redux_option ) ? '1' : '0' ),
+			'support-email' => rgget('support-email', $redux_option),
+			'no-conflict-mode' => (rgget('no-conflict-mode', $redux_option) ? '1' : '0'),
 		);
 
-		if( $license_array = rgget( 'license', $redux_option ) ) {
+		if ($license_array = rgget('license', $redux_option)) {
 
-			$redux_settings['license_key'] = $license_key = rgget( 'license', $license_array );
+			$redux_settings['license_key'] = $license_key = rgget('license', $license_array);
 
 			$redux_last_changed_values = get_option('gravityview_settings-transients');
 
 			// This contains the last response for license validation
-			if( !empty( $redux_last_changed_values ) && $saved_values = rgget( 'changed_values', $redux_last_changed_values ) ) {
+			if (!empty($redux_last_changed_values) && $saved_values = rgget('changed_values', $redux_last_changed_values)) {
 
-				$saved_license = rgget('license', $saved_values );
+				$saved_license = rgget('license', $saved_values);
 
 				// Only use the last-saved values if they are for the same license
-				if( $saved_license && rgget( 'license', $saved_license ) === $license_key ) {
-					$redux_settings['license_key_status'] = rgget( 'status', $saved_license );
-					$redux_settings['license_key_response'] = rgget( 'response', $saved_license );
+				if ($saved_license && rgget('license', $saved_license) === $license_key) {
+					$redux_settings['license_key_status'] = rgget('status', $saved_license);
+					$redux_settings['license_key_response'] = rgget('response', $saved_license);
 				}
 			}
 		}
@@ -148,8 +148,8 @@ 
 	/** ----  Migrate from old search widget to new search widget  ---- */
 	function update_search_on_views() {
 
-		if( !class_exists('GravityView_Widget_Search') ) {
-			include_once( GRAVITYVIEW_DIR .'includes/extensions/search-widget/class-search-widget.php' );
+		if (!class_exists('GravityView_Widget_Search')) {
+			include_once(GRAVITYVIEW_DIR.'includes/extensions/search-widget/class-search-widget.php');
 		}
 
 		// Loop through all the views
@@ -159,94 +159,94 @@ 
 			'posts_per_page' => -1,
 		);
 
-		$views = get_posts( $query_args );
+		$views = get_posts($query_args);
 
-		foreach( $views as $view ) {
+		foreach ($views as $view) {
 
-			$widgets = get_post_meta( $view->ID, '_gravityview_directory_widgets', true );
+			$widgets = get_post_meta($view->ID, '_gravityview_directory_widgets', true);
 			$search_fields = null;
 
-			if( empty( $widgets ) || !is_array( $widgets ) ) { continue; }
+			if (empty($widgets) || !is_array($widgets)) { continue; }
 
-			do_action( 'gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Loading View ID: ', $view->ID );
+			do_action('gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Loading View ID: ', $view->ID);
 
-			foreach( $widgets as $area => $ws ) {
-				foreach( $ws as $k => $widget ) {
-					if( $widget['id'] !== 'search_bar' ) { continue; }
+			foreach ($widgets as $area => $ws) {
+				foreach ($ws as $k => $widget) {
+					if ($widget['id'] !== 'search_bar') { continue; }
 
-					if( is_null( $search_fields ) ) {
-						$search_fields = $this->get_search_fields( $view->ID );
+					if (is_null($search_fields)) {
+						$search_fields = $this->get_search_fields($view->ID);
 					}
 
 					// check widget settings:
 					//  [search_free] => 1
 			        //  [search_date] => 1
 			        $search_generic = array();
-					if( !empty( $widget['search_free'] ) ) {
-						$search_generic[] = array( 'field' => 'search_all', 'input' => 'input_text' );
+					if (!empty($widget['search_free'])) {
+						$search_generic[] = array('field' => 'search_all', 'input' => 'input_text');
 					}
-					if( !empty( $widget['search_date'] ) ) {
-						$search_generic[] = array( 'field' => 'entry_date', 'input' => 'date' );
+					if (!empty($widget['search_date'])) {
+						$search_generic[] = array('field' => 'entry_date', 'input' => 'date');
 					}
 
-					$search_config = array_merge( $search_generic, $search_fields );
+					$search_config = array_merge($search_generic, $search_fields);
 
 					// don't throw '[]' when json_encode an empty array
-					if( empty( $search_config ) ) {
+					if (empty($search_config)) {
 						$search_config = '';
 					} else {
-						$search_config = json_encode( $search_config );
+						$search_config = json_encode($search_config);
 					}
 
-					$widgets[ $area ][ $k ]['search_fields'] = $search_config;
-					$widgets[ $area ][ $k ]['search_layout'] = 'horizontal';
+					$widgets[$area][$k]['search_fields'] = $search_config;
+					$widgets[$area][$k]['search_layout'] = 'horizontal';
 
-					do_action( 'gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Updated Widget: ', $widgets[ $area ][ $k ] );
+					do_action('gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Updated Widget: ', $widgets[$area][$k]);
 				}
 			}
 
 			// update widgets view
-			update_post_meta( $view->ID, '_gravityview_directory_widgets', $widgets );
+			update_post_meta($view->ID, '_gravityview_directory_widgets', $widgets);
 
 		} // foreach Views
 
 		// all done! enjoy the new Search Widget!
-		update_option( 'gv_migrate_searchwidget', true );
+		update_option('gv_migrate_searchwidget', true);
 
-		do_action( 'gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] All done! enjoy the new Search Widget!' );
+		do_action('gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] All done! enjoy the new Search Widget!');
 	}
 
 
-	function get_search_fields( $view_id ) {
+	function get_search_fields($view_id) {
 
-		$form_id = gravityview_get_form_id( $view_id );
-		$form = gravityview_get_form( $form_id );
+		$form_id = gravityview_get_form_id($view_id);
+		$form = gravityview_get_form($form_id);
 
 		$search_fields = array();
 
 		// check view fields' settings
-		$fields = get_post_meta( $view_id, '_gravityview_directory_fields', true );
+		$fields = get_post_meta($view_id, '_gravityview_directory_fields', true);
 
-		if( !empty( $fields ) && is_array( $fields ) ) {
+		if (!empty($fields) && is_array($fields)) {
 
-			foreach( $fields as $t => $fs ) {
+			foreach ($fields as $t => $fs) {
 
-				foreach( $fs as $k => $field ) {
+				foreach ($fs as $k => $field) {
 					// is field a search_filter ?
-					if( empty( $field['search_filter'] ) ) { continue; }
+					if (empty($field['search_filter'])) { continue; }
 
 					// get field type & calculate the input type (by default)
-					$form_field = gravityview_get_field( $form, $field['id'] );
+					$form_field = gravityview_get_field($form, $field['id']);
 
-					if( empty( $form_field['type'] ) ) {
+					if (empty($form_field['type'])) {
 						continue;
 					}
 
 					// depending on the field type assign a group of possible search field types
-					$type = GravityView_Widget_Search::get_search_input_types( $field['id'], $form_field['type'] );
+					$type = GravityView_Widget_Search::get_search_input_types($field['id'], $form_field['type']);
 
 					// add field to config
-					$search_fields[] = array( 'field' => $field['id'], 'input' => $type );
+					$search_fields[] = array('field' => $field['id'], 'input' => $type);
 
 				}
 			}

includes/class-gravityview-roles-capabilities.php

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