eventespresso / event-espresso-core

core/EE_Capabilities.core.php

Doc Comments +3 added lines, -3 removed lines

@@ -557,7 +557,7 @@ 
 	 * @since    4.5.0
 	 *
 	 * @param string $meta_cap     What meta capability is this mapping.
-	 * @param array  $map_values   array {
+	 * @param string[]  $map_values   array {
 	 * 		//array of values that MUST match a count of 4.  It's okay to send an empty string for capabilities that don't get mapped to.
 	 * 		@type $map_values[0] string A string representing the model name. Required.  String's
 	 * 		      	    	       should always be used when Menu Maps are registered via the
@@ -625,8 +625,8 @@ 
 	 * @see EE_Meta_Capability_Map::_map_meta_caps() for docs on params.
 	 * @since 4.6.x
 	 * @param $caps
-	 * @param $cap
-	 * @param $user_id
+	 * @param string $cap
+	 * @param integer $user_id
 	 * @param $args
 	 *
 	 * @return array

Indentation +19 added lines, -20 removed lines

@@ -113,7 +113,6 @@ 
 
 	/**
 	 * This sets the meta caps property.
-
 	 * @since 4.5.0
 	 *
 	 * @return void
@@ -227,7 +226,7 @@ 
 			 * capability mapping which will be used for accessing payment methods owned by
 			 * other users.  This is not fully implemented yet in the payment method ui.
 			 * Currently only the "plural" caps are in active use. (Specific payment method caps are in use as well).
-			**/
+			 **/
 				'ee_manage_gateways',
 				'ee_read_payment_method',
 				'ee_read_payment_methods',
@@ -739,15 +738,15 @@ 
 				}
 			}
 		} else {
-            //not a cpt object so handled differently
-            $has_cap = false;
-            try {
-                $has_cap = method_exists($obj, 'wp_user') && $obj->wp_user() && $user_id == $obj->wp_user();
-            } catch (Exception $e) {
-                if (WP_DEBUG) {
-                    EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
-                }
-            }
+			//not a cpt object so handled differently
+			$has_cap = false;
+			try {
+				$has_cap = method_exists($obj, 'wp_user') && $obj->wp_user() && $user_id == $obj->wp_user();
+			} catch (Exception $e) {
+				if (WP_DEBUG) {
+					EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+				}
+			}
 			if ($has_cap) {
 				$caps[] = $cap;
 			} else {
@@ -854,15 +853,15 @@ 
 				$caps[] = $cap;
 			}
 		} else {
-            //not a cpt object so handled differently
-            $has_cap = false;
-            try {
-                $has_cap = method_exists($obj, 'wp_user') && $obj->wp_user() && $user_id == $obj->wp_user();
-            } catch (Exception $e) {
-                if (WP_DEBUG) {
-                    EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
-                }
-            }
+			//not a cpt object so handled differently
+			$has_cap = false;
+			try {
+				$has_cap = method_exists($obj, 'wp_user') && $obj->wp_user() && $user_id == $obj->wp_user();
+			} catch (Exception $e) {
+				if (WP_DEBUG) {
+					EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+				}
+			}
 			if ($has_cap) {
 				$caps[] = $cap;
 			} elseif ( ! empty( $this->private_cap ) ) {

Spacing +128 added lines, -128 removed lines

@@ -7,8 +7,8 @@ 
  * @package Event Espresso
  * @subpackage core, capabilities
  */
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -71,7 +71,7 @@ 
 	 */
 	public static function instance() {
 		//check if instantiated, and if not do so.
-		if ( ! self::$_instance instanceof EE_Capabilities ) {
+		if ( ! self::$_instance instanceof EE_Capabilities) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -100,10 +100,10 @@ 
 	 * @since 4.5.0
 	 * @return void
 	 */
-	public function init_caps( $reset = false ) {
-		if ( EE_Maintenance_Mode::instance()->models_can_query() ){
+	public function init_caps($reset = false) {
+		if (EE_Maintenance_Mode::instance()->models_can_query()) {
 			$this->_caps_map = $this->_init_caps_map();
-			$this->init_role_caps( $reset );
+			$this->init_role_caps($reset);
 			$this->_set_meta_caps();
 		}
 	}
@@ -122,11 +122,11 @@ 
 		//make sure we're only ever initializing the default _meta_caps array once if it's empty.
 		$this->_meta_caps = $this->_get_default_meta_caps_array();
 
-		$this->_meta_caps = apply_filters( 'FHEE__EE_Capabilities___set_meta_caps__meta_caps', $this->_meta_caps );
+		$this->_meta_caps = apply_filters('FHEE__EE_Capabilities___set_meta_caps__meta_caps', $this->_meta_caps);
 
 		//add filter for map_meta_caps but only if models can query.
-		if ( EE_Maintenance_Mode::instance()->models_can_query() && ! has_filter( 'map_meta_cap', array( $this, 'map_meta_caps' ) ) ) {
-			add_filter( 'map_meta_cap', array( $this, 'map_meta_caps' ), 10, 4 );
+		if (EE_Maintenance_Mode::instance()->models_can_query() && ! has_filter('map_meta_cap', array($this, 'map_meta_caps'))) {
+			add_filter('map_meta_cap', array($this, 'map_meta_caps'), 10, 4);
 		}
 	}
 
@@ -139,37 +139,37 @@ 
 	 */
 	private function _get_default_meta_caps_array() {
 		static $default_meta_caps = array();
-		if ( empty( $default_meta_caps ) ) {
+		if (empty($default_meta_caps)) {
 			$default_meta_caps = array(
 				//edits
-				new EE_Meta_Capability_Map_Edit( 'ee_edit_event', array( 'Event', 'ee_edit_published_events', 'ee_edit_others_events', 'ee_edit_private_events' ) ),
-				new EE_Meta_Capability_Map_Edit( 'ee_edit_venue', array( 'Venue', 'ee_edit_published_venues', 'ee_edit_others_venues', 'ee_edit_private_venues' ) ),
-				new EE_Meta_Capability_Map_Edit( 'ee_edit_registration', array( 'Registration', '', 'ee_edit_others_registrations', '' ) ),
-				new EE_Meta_Capability_Map_Edit( 'ee_edit_checkin', array( 'Registration', '', 'ee_edit_others_checkins', '' ) ),
-				new EE_Meta_Capability_Map_Messages_Cap( 'ee_edit_message', array( 'Message_Template_Group', '', 'ee_edit_others_messages', 'ee_edit_global_messages' ) ),
-				new EE_Meta_Capability_Map_Edit( 'ee_edit_default_ticket', array( 'Ticket', '', 'ee_edit_others_default_tickets', '' ) ),
-				new EE_Meta_Capability_Map_Registration_Form_Cap( 'ee_edit_question', array( 'Question', '', '', 'ee_edit_system_questions' ) ),
-				new EE_Meta_Capability_Map_Registration_Form_Cap( 'ee_edit_question_group', array( 'Question_Group', '', '', 'ee_edit_system_question_groups' ) ),
-				new EE_Meta_Capability_Map_Edit( 'ee_edit_payment_method', array( 'Payment_Method', '', 'ee_edit_others_payment_methods', '' ) ),
+				new EE_Meta_Capability_Map_Edit('ee_edit_event', array('Event', 'ee_edit_published_events', 'ee_edit_others_events', 'ee_edit_private_events')),
+				new EE_Meta_Capability_Map_Edit('ee_edit_venue', array('Venue', 'ee_edit_published_venues', 'ee_edit_others_venues', 'ee_edit_private_venues')),
+				new EE_Meta_Capability_Map_Edit('ee_edit_registration', array('Registration', '', 'ee_edit_others_registrations', '')),
+				new EE_Meta_Capability_Map_Edit('ee_edit_checkin', array('Registration', '', 'ee_edit_others_checkins', '')),
+				new EE_Meta_Capability_Map_Messages_Cap('ee_edit_message', array('Message_Template_Group', '', 'ee_edit_others_messages', 'ee_edit_global_messages')),
+				new EE_Meta_Capability_Map_Edit('ee_edit_default_ticket', array('Ticket', '', 'ee_edit_others_default_tickets', '')),
+				new EE_Meta_Capability_Map_Registration_Form_Cap('ee_edit_question', array('Question', '', '', 'ee_edit_system_questions')),
+				new EE_Meta_Capability_Map_Registration_Form_Cap('ee_edit_question_group', array('Question_Group', '', '', 'ee_edit_system_question_groups')),
+				new EE_Meta_Capability_Map_Edit('ee_edit_payment_method', array('Payment_Method', '', 'ee_edit_others_payment_methods', '')),
 				//reads
-				new EE_Meta_Capability_Map_Read( 'ee_read_event', array( 'Event', '', 'ee_read_others_events', 'ee_read_private_events' ) ),
-				new EE_Meta_Capability_Map_Read( 'ee_read_venue', array( 'Venue', '', 'ee_read_others_venues', 'ee_read_private_venues' ) ),
-				new EE_Meta_Capability_Map_Read( 'ee_read_registration', array( 'Registration', '', '', 'ee_edit_others_registrations' ) ),
-				new EE_Meta_Capability_Map_Read( 'ee_read_checkin', array( 'Registration', '', '', 'ee_read_others_checkins' ) ),
-				new EE_Meta_Capability_Map_Messages_Cap( 'ee_read_message', array( 'Message_Template_Group', '', 'ee_read_others_messages', 'ee_read_global_messages' ) ),
-				new EE_Meta_Capability_Map_Read( 'ee_read_default_ticket', array( 'Ticket', '', '', 'ee_read_others_default_tickets' ) ),
-				new EE_Meta_Capability_Map_Read( 'ee_read_payment_method', array( 'Payment_Method', '', '', 'ee_read_others_payment_methods' ) ),
+				new EE_Meta_Capability_Map_Read('ee_read_event', array('Event', '', 'ee_read_others_events', 'ee_read_private_events')),
+				new EE_Meta_Capability_Map_Read('ee_read_venue', array('Venue', '', 'ee_read_others_venues', 'ee_read_private_venues')),
+				new EE_Meta_Capability_Map_Read('ee_read_registration', array('Registration', '', '', 'ee_edit_others_registrations')),
+				new EE_Meta_Capability_Map_Read('ee_read_checkin', array('Registration', '', '', 'ee_read_others_checkins')),
+				new EE_Meta_Capability_Map_Messages_Cap('ee_read_message', array('Message_Template_Group', '', 'ee_read_others_messages', 'ee_read_global_messages')),
+				new EE_Meta_Capability_Map_Read('ee_read_default_ticket', array('Ticket', '', '', 'ee_read_others_default_tickets')),
+				new EE_Meta_Capability_Map_Read('ee_read_payment_method', array('Payment_Method', '', '', 'ee_read_others_payment_methods')),
 
 				//deletes
-				new EE_Meta_Capability_Map_Delete( 'ee_delete_event', array( 'Event', 'ee_delete_published_events', 'ee_delete_others_events', 'ee_delete_private_events' ) ),
-				new EE_Meta_Capability_Map_Delete( 'ee_delete_venue', array( 'Venue', 'ee_delete_published_venues', 'ee_delete_others_venues', 'ee_delete_private_venues' ) ),
-				new EE_Meta_Capability_Map_Delete( 'ee_delete_registration', array( 'Registration', '', 'ee_delete_others_registrations', '' ) ),
-				new EE_Meta_Capability_Map_Delete( 'ee_delete_checkin', array( 'Registration', '', 'ee_delete_others_checkins', '' ) ),
-				new EE_Meta_Capability_Map_Messages_Cap( 'ee_delete_message', array( 'Message_Template_Group', '', 'ee_delete_others_messages', 'ee_delete_global_messages' ) ),
-				new EE_Meta_Capability_Map_Delete( 'ee_delete_default_ticket', array( 'Ticket', '', 'ee_delete_others_default_tickets', '' ) ),
-				new EE_Meta_Capability_Map_Registration_Form_Cap( 'ee_delete_question', array( 'Question', '', '', 'delete_system_questions' ) ),
-				new EE_Meta_Capability_Map_Registration_Form_Cap( 'ee_delete_question_group', array( 'Question_Group', '', '', 'delete_system_question_groups' ) ),
-				new EE_Meta_Capability_Map_Delete( 'ee_delete_payment_method', array( 'Payment_Method', '', 'ee_delete_others_payment_methods', '' ) ),
+				new EE_Meta_Capability_Map_Delete('ee_delete_event', array('Event', 'ee_delete_published_events', 'ee_delete_others_events', 'ee_delete_private_events')),
+				new EE_Meta_Capability_Map_Delete('ee_delete_venue', array('Venue', 'ee_delete_published_venues', 'ee_delete_others_venues', 'ee_delete_private_venues')),
+				new EE_Meta_Capability_Map_Delete('ee_delete_registration', array('Registration', '', 'ee_delete_others_registrations', '')),
+				new EE_Meta_Capability_Map_Delete('ee_delete_checkin', array('Registration', '', 'ee_delete_others_checkins', '')),
+				new EE_Meta_Capability_Map_Messages_Cap('ee_delete_message', array('Message_Template_Group', '', 'ee_delete_others_messages', 'ee_delete_global_messages')),
+				new EE_Meta_Capability_Map_Delete('ee_delete_default_ticket', array('Ticket', '', 'ee_delete_others_default_tickets', '')),
+				new EE_Meta_Capability_Map_Registration_Form_Cap('ee_delete_question', array('Question', '', '', 'delete_system_questions')),
+				new EE_Meta_Capability_Map_Registration_Form_Cap('ee_delete_question_group', array('Question_Group', '', '', 'delete_system_question_groups')),
+				new EE_Meta_Capability_Map_Delete('ee_delete_payment_method', array('Payment_Method', '', 'ee_delete_others_payment_methods', '')),
 			);
 		}
 		return $default_meta_caps;
@@ -193,15 +193,15 @@ 
 	 *
 	 * @return array   actual users capabilities
 	 */
-	public function map_meta_caps( $caps, $cap, $user_id, $args ) {
+	public function map_meta_caps($caps, $cap, $user_id, $args) {
 		//loop through our _meta_caps array
-		foreach ( $this->_meta_caps as $meta_map ) {
-			if ( ! $meta_map instanceof EE_Meta_Capability_Map ) {
+		foreach ($this->_meta_caps as $meta_map) {
+			if ( ! $meta_map instanceof EE_Meta_Capability_Map) {
 				continue;
 			}
 			$meta_map->ensure_is_model();
 
-			$caps = $meta_map->map_meta_caps( $caps, $cap, $user_id, $args );
+			$caps = $meta_map->map_meta_caps($caps, $cap, $user_id, $args);
 		}
 		return $caps;
 	}
@@ -528,7 +528,7 @@ 
 			)
 		);
 
-		$caps = apply_filters( 'FHEE__EE_Capabilities__init_caps_map__caps', $caps );
+		$caps = apply_filters('FHEE__EE_Capabilities__init_caps_map__caps', $caps);
 		return $caps;
 	}
 
@@ -545,27 +545,27 @@ 
 	 *
 	 * @return void
 	 */
-	public function init_role_caps( $reset = false, $custom_map = array() ) {
+	public function init_role_caps($reset = false, $custom_map = array()) {
 
-		$caps_map = empty( $custom_map ) ? $this->_caps_map : $custom_map;
+		$caps_map = empty($custom_map) ? $this->_caps_map : $custom_map;
 
 		//first let's determine if these caps have already been set.
-		$caps_set_before = get_option( self::option_name, array() );
+		$caps_set_before = get_option(self::option_name, array());
 		//if not reset, see what caps are new for each role. if they're new, add them.
-		foreach ( $caps_map as $role => $caps_for_role ) {
-			foreach ( $caps_for_role as $cap ) {
+		foreach ($caps_map as $role => $caps_for_role) {
+			foreach ($caps_for_role as $cap) {
 				//first check we haven't already added this cap before, or it's a reset
-				if ( $reset || ! isset( $caps_set_before[ $role ] ) || ! in_array( $cap, $caps_set_before[ $role ] ) ) {
-					if ( $this->add_cap_to_role( $role, $cap ) ) {
-						$caps_set_before[ $role ][] = $cap;
+				if ($reset || ! isset($caps_set_before[$role]) || ! in_array($cap, $caps_set_before[$role])) {
+					if ($this->add_cap_to_role($role, $cap)) {
+						$caps_set_before[$role][] = $cap;
 					}
 				}
 			}
 		}
 
 		//now let's just save the cap that has been set.
-		update_option( self::option_name, $caps_set_before );
-		do_action( 'AHEE__EE_Capabilities__init_role_caps__complete', $caps_set_before );
+		update_option(self::option_name, $caps_set_before);
+		do_action('AHEE__EE_Capabilities__init_role_caps__complete', $caps_set_before);
 	}
 
 
@@ -584,20 +584,20 @@ 
 	 * @param bool $grant  Whether to grant access to this cap on this role.
 	 * @return bool
 	 */
-	public function add_cap_to_role( $role, $cap, $grant = true ) {
-		$role_object = get_role( $role );
+	public function add_cap_to_role($role, $cap, $grant = true) {
+		$role_object = get_role($role);
 		//if the role isn't available then we create it.
-		if ( ! $role_object instanceof WP_Role ) {
+		if ( ! $role_object instanceof WP_Role) {
 			//if a plugin wants to create a specific role name then they should create the role before
 			//EE_Capabilities does.  Otherwise this function will create the role name from the slug:
 			// - removes any `ee_` namespacing from the start of the slug.
 			// - replaces `_` with ` ` (empty space).
 			// - sentence case on the resulting string.
-			$role_label = ucwords( str_replace( '_', ' ', str_replace( 'ee_', '', $role ) ) );
-			$role_object = add_role( $role, $role_label );
+			$role_label = ucwords(str_replace('_', ' ', str_replace('ee_', '', $role)));
+			$role_object = add_role($role, $role_label);
 		}
-		if ( $role_object instanceof WP_Role ) {
-			$role_object->add_cap( $cap, $grant );
+		if ($role_object instanceof WP_Role) {
+			$role_object->add_cap($cap, $grant);
 			return true;
 		}
 		return false;
@@ -619,10 +619,10 @@ 
 	 *
 	 * @return void
 	 */
-	public function remove_cap_from_role( $role, $cap ) {
-		$role = get_role( $role );
-		if ( $role instanceof WP_Role ) {
-			$role->remove_cap( $cap );
+	public function remove_cap_from_role($role, $cap) {
+		$role = get_role($role);
+		if ($role instanceof WP_Role) {
+			$role->remove_cap($cap);
 		}
 	}
 
@@ -643,11 +643,11 @@ 
 	 *
 	 * @return bool  Whether user can or not.
 	 */
-	public function current_user_can( $cap, $context, $id = 0 ) {
+	public function current_user_can($cap, $context, $id = 0) {
 		//apply filters (both a global on just the cap, and context specific.  Global overrides context specific)
-		$filtered_cap = apply_filters( 'FHEE__EE_Capabilities__current_user_can__cap__' . $context,  $cap, $id );
-		$filtered_cap = apply_filters( 'FHEE__EE_Capabilities__current_user_can__cap', $filtered_cap, $context, $cap, $id );
-		return ! empty( $id ) ? current_user_can( $filtered_cap, $id ) : current_user_can( $filtered_cap );
+		$filtered_cap = apply_filters('FHEE__EE_Capabilities__current_user_can__cap__'.$context, $cap, $id);
+		$filtered_cap = apply_filters('FHEE__EE_Capabilities__current_user_can__cap', $filtered_cap, $context, $cap, $id);
+		return ! empty($id) ? current_user_can($filtered_cap, $id) : current_user_can($filtered_cap);
 	}
 
 
@@ -664,11 +664,11 @@ 
 	 *
 	 * @return bool Whether user can or not.
 	 */
-	public function user_can( $user, $cap, $context, $id = 0 ) {
+	public function user_can($user, $cap, $context, $id = 0) {
 		//apply filters (both a global on just the cap, and context specific.  Global overrides context specific)
-		$filtered_cap = apply_filters( 'FHEE__EE_Capabilities__user_can__cap__' . $context, $cap, $user, $id );
-		$filtered_cap = apply_filters( 'FHEE__EE_Capabilities__user_can__cap', $filtered_cap, $context, $cap, $user,  $id );
-		return ! empty( $id ) ? user_can( $user, $filtered_cap, $id ) : user_can( $user, $filtered_cap );
+		$filtered_cap = apply_filters('FHEE__EE_Capabilities__user_can__cap__'.$context, $cap, $user, $id);
+		$filtered_cap = apply_filters('FHEE__EE_Capabilities__user_can__cap', $filtered_cap, $context, $cap, $user, $id);
+		return ! empty($id) ? user_can($user, $filtered_cap, $id) : user_can($user, $filtered_cap);
 	}
 
 
@@ -688,12 +688,12 @@ 
 	 *
 	 * @return bool  Whether user can or not.
 	 */
-	public function current_user_can_for_blog( $blog_id, $cap, $context, $id = 0 ) {
-		$user_can = ! empty( $id ) ? current_user_can_for_blog( $blog_id, $cap, $id ) : current_user_can( $blog_id, $cap );
+	public function current_user_can_for_blog($blog_id, $cap, $context, $id = 0) {
+		$user_can = ! empty($id) ? current_user_can_for_blog($blog_id, $cap, $id) : current_user_can($blog_id, $cap);
 
 		//apply filters (both a global on just the cap, and context specific.  Global overrides context specific)
-		$user_can = apply_filters( 'FHEE__EE_Capabilities__current_user_can_for_blog__user_can__' . $context, $user_can, $blog_id, $cap, $id );
-		$user_can = apply_filters( 'FHEE__EE_Capabilities__current_user_can_for_blog__user_can', $user_can, $context, $blog_id, $cap, $id );
+		$user_can = apply_filters('FHEE__EE_Capabilities__current_user_can_for_blog__user_can__'.$context, $user_can, $blog_id, $cap, $id);
+		$user_can = apply_filters('FHEE__EE_Capabilities__current_user_can_for_blog__user_can', $user_can, $context, $blog_id, $cap, $id);
 		return $user_can;
 	}
 
@@ -709,12 +709,12 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_ee_capabilities( $role = 'administrator' ) {
+	public function get_ee_capabilities($role = 'administrator') {
 		$capabilities = $this->_init_caps_map();
-		if ( empty( $role ) ) {
+		if (empty($role)) {
 			return $capabilities;
 		}
-		return isset( $capabilities[ $role ] ) ? $capabilities[ $role ] : array();
+		return isset($capabilities[$role]) ? $capabilities[$role] : array();
 	}
 }
 
@@ -762,11 +762,11 @@ 
 	 * 	}
 	 * @throws EE_Error
 	 */
-	public function __construct( $meta_cap, $map_values ) {
+	public function __construct($meta_cap, $map_values) {
 		$this->meta_cap = $meta_cap;
 		//verify there are four args in the $map_values array;
-		if ( count( $map_values ) !== 4 ) {
-			throw new EE_Error( sprintf( __( 'Incoming $map_values array should have a count of four values in it.  This is what was given: %s', 'event_espresso' ), '<br>' . print_r( $map_values, true ) ) );
+		if (count($map_values) !== 4) {
+			throw new EE_Error(sprintf(__('Incoming $map_values array should have a count of four values in it.  This is what was given: %s', 'event_espresso'), '<br>'.print_r($map_values, true)));
 		}
 
 		//set properties
@@ -780,8 +780,8 @@ 
 	/**
 	 * Makes it so this object stops filtering caps
 	 */
-	public function remove_filters(){
-		remove_filter( 'map_meta_cap', array( $this, 'map_meta_caps' ), 10 );
+	public function remove_filters() {
+		remove_filter('map_meta_cap', array($this, 'map_meta_caps'), 10);
 	}
 
 
@@ -796,19 +796,19 @@ 
 	 */
 	public function ensure_is_model() {
 		//is it already instantiated?
-		if ( $this->_model instanceof EEM_Base ) {
+		if ($this->_model instanceof EEM_Base) {
 			return;
 		}
 
 		//ensure model name is string
 		$this->_model_name = (string) $this->_model_name;
 		//error proof if the name has EEM in it
-		$this->_model_name = str_replace( 'EEM', '', $this->_model_name );
+		$this->_model_name = str_replace('EEM', '', $this->_model_name);
 
-		$this->_model = EE_Registry::instance()->load_model( $this->_model_name );
+		$this->_model = EE_Registry::instance()->load_model($this->_model_name);
 
-		if ( ! $this->_model instanceof EEM_Base ) {
-			throw new EE_Error( sprintf( __( 'This string passed in to %s to represent a EEM_Base model class was not able to be used to instantiate the class.   Please ensure that the string is a match for the EEM_Base model name (not including the EEM_ part). This was given: %s', 'event_espresso' ), get_class( $this ), $this->_model ) );
+		if ( ! $this->_model instanceof EEM_Base) {
+			throw new EE_Error(sprintf(__('This string passed in to %s to represent a EEM_Base model class was not able to be used to instantiate the class.   Please ensure that the string is a match for the EEM_Base model name (not including the EEM_ part). This was given: %s', 'event_espresso'), get_class($this), $this->_model));
 		}
 	}
 
@@ -824,8 +824,8 @@ 
 	 *
 	 * @return array
 	 */
-	public function map_meta_caps( $caps, $cap, $user_id, $args ) {
-		return $this->_map_meta_caps( $caps, $cap, $user_id, $args );
+	public function map_meta_caps($caps, $cap, $user_id, $args) {
+		return $this->_map_meta_caps($caps, $cap, $user_id, $args);
 	}
 
 
@@ -843,7 +843,7 @@ 
 	 *
 	 * @return array   actual users capabilities
 	 */
-	abstract protected function _map_meta_caps( $caps, $cap, $user_id, $args );
+	abstract protected function _map_meta_caps($caps, $cap, $user_id, $args);
 }
 
 
@@ -875,28 +875,28 @@ 
 	 *
 	 * @return array   actual users capabilities
 	 */
-	protected function _map_meta_caps( $caps, $cap, $user_id, $args ) {
+	protected function _map_meta_caps($caps, $cap, $user_id, $args) {
 		//only process if we're checking our mapped_cap
-		if ( $cap !== $this->meta_cap ) {
+		if ($cap !== $this->meta_cap) {
 			return $caps;
 		}
 
-		$obj = ! empty( $args[0] ) ? $this->_model->get_one_by_ID( $args[0] ) : null;
+		$obj = ! empty($args[0]) ? $this->_model->get_one_by_ID($args[0]) : null;
 
 		//if no obj then let's just do cap
-		if ( ! $obj instanceof EE_Base_Class ) {
+		if ( ! $obj instanceof EE_Base_Class) {
 			$caps[] = $cap;
 			return $caps;
 		}
 
-		if ( $obj instanceof EE_CPT_Base ) {
+		if ($obj instanceof EE_CPT_Base) {
 			//if the item author is set and the user is the author...
-			if ( $obj->wp_user() && $user_id == $obj->wp_user() ) {
-				if ( empty( $this->published_cap ) ) {
+			if ($obj->wp_user() && $user_id == $obj->wp_user()) {
+				if (empty($this->published_cap)) {
 					$caps[] = $cap;
 				} else {
 					//if obj is published...
-					if ( $obj->status() == 'publish' ) {
+					if ($obj->status() == 'publish') {
 						$caps[] = $this->published_cap;
 					} else {
 						$caps[] = $cap;
@@ -904,12 +904,12 @@ 
 				}
 			} else {
 				//the user is trying to edit someone else's obj
-				if ( ! empty( $this->others_cap ) ) {
+				if ( ! empty($this->others_cap)) {
 					$caps[] = $this->others_cap;
 				}
-				if ( ! empty( $this->published_cap ) && $obj->status() == 'publish' ) {
+				if ( ! empty($this->published_cap) && $obj->status() == 'publish') {
 					$caps[] = $this->published_cap;
-				} elseif ( ! empty( $this->private_cap ) && $obj->status() == 'private' ) {
+				} elseif ( ! empty($this->private_cap) && $obj->status() == 'private') {
 					$caps[] = $this->private_cap;
 				}
 			}
@@ -926,7 +926,7 @@ 
 			if ($has_cap) {
 				$caps[] = $cap;
 			} else {
-				if ( ! empty( $this->others_cap ) ) {
+				if ( ! empty($this->others_cap)) {
 					$caps[] = $this->others_cap;
 				}
 			}
@@ -963,8 +963,8 @@ 
 	 *
 	 * @return array   actual users capabilities
 	 */
-	protected function _map_meta_caps( $caps, $cap, $user_id, $args ) {
-		return parent::_map_meta_caps( $caps, $cap, $user_id, $args );
+	protected function _map_meta_caps($caps, $cap, $user_id, $args) {
+		return parent::_map_meta_caps($caps, $cap, $user_id, $args);
 	}
 }
 
@@ -996,34 +996,34 @@ 
 	 *
 	 * @return array   actual users capabilities
 	 */
-	protected function _map_meta_caps( $caps, $cap, $user_id, $args ) {
+	protected function _map_meta_caps($caps, $cap, $user_id, $args) {
 		//only process if we're checking our mapped cap;
-		if ( $cap !== $this->meta_cap ) {
+		if ($cap !== $this->meta_cap) {
 			return $caps;
 		}
 
-		$obj = ! empty( $args[0] ) ? $this->_model->get_one_by_ID( $args[0] ) : null;
+		$obj = ! empty($args[0]) ? $this->_model->get_one_by_ID($args[0]) : null;
 
 		//if no obj then let's just do cap
-		if ( ! $obj instanceof EE_Base_Class ) {
+		if ( ! $obj instanceof EE_Base_Class) {
 			$caps[] = $cap;
 			return $caps;
 		}
 
-		if ( $obj instanceof EE_CPT_Base ) {
-			$status_obj = get_post_status_object( $obj->status() );
-			if ( $status_obj->public ) {
+		if ($obj instanceof EE_CPT_Base) {
+			$status_obj = get_post_status_object($obj->status());
+			if ($status_obj->public) {
 				$caps[] = $cap;
 				return $caps;
 			}
 
 			//if the item author is set and the user is the author...
-			if ( $obj->wp_user() && $user_id == $obj->wp_user() ) {
+			if ($obj->wp_user() && $user_id == $obj->wp_user()) {
 				$caps[] = $cap;
-			} elseif ( $status_obj->private && ! empty( $this->private_cap ) ) {
+			} elseif ($status_obj->private && ! empty($this->private_cap)) {
 				//the user is trying to view someone else's obj
 				$caps[] = $this->private_cap;
-			} elseif ( ! empty( $this->others_cap ) ) {
+			} elseif ( ! empty($this->others_cap)) {
 				$caps[] = $this->others_cap;
 			} else {
 				$caps[] = $cap;
@@ -1040,9 +1040,9 @@ 
             }
 			if ($has_cap) {
 				$caps[] = $cap;
-			} elseif ( ! empty( $this->private_cap ) ) {
+			} elseif ( ! empty($this->private_cap)) {
 				$caps[] = $this->private_cap;
-			} elseif ( ! empty( $this->others_cap ) ) {
+			} elseif ( ! empty($this->others_cap)) {
 				$caps[] = $this->others_cap;
 			} else {
 				$caps[] = $cap;
@@ -1079,30 +1079,30 @@ 
 	 *
 	 * @return array   actual users capabilities
 	 */
-	protected function _map_meta_caps( $caps, $cap, $user_id, $args ) {
+	protected function _map_meta_caps($caps, $cap, $user_id, $args) {
 		//only process if we're checking our mapped_cap
-		if ( $cap !== $this->meta_cap ) {
+		if ($cap !== $this->meta_cap) {
 			return $caps;
 		}
 
-		$obj = ! empty( $args[0] ) ? $this->_model->get_one_by_ID( $args[0] ) : null;
+		$obj = ! empty($args[0]) ? $this->_model->get_one_by_ID($args[0]) : null;
 
 		//if no obj then let's just do cap
-		if ( ! $obj instanceof EE_Message_Template_Group ) {
+		if ( ! $obj instanceof EE_Message_Template_Group) {
 			$caps[] = $cap;
 			return $caps;
 		}
 
 		$is_global = $obj->is_global();
 
-		if ( $obj->wp_user() && $user_id == $obj->wp_user() ) {
-			if ( $is_global ) {
-				$caps[]  = $this->private_cap;
+		if ($obj->wp_user() && $user_id == $obj->wp_user()) {
+			if ($is_global) {
+				$caps[] = $this->private_cap;
 			} else {
 				$caps[] = $cap;
 			}
 		} else {
-			if ( $is_global ) {
+			if ($is_global) {
 				$caps[] = $this->private_cap;
 			} else {
 				$caps[] = $this->others_cap;
@@ -1140,16 +1140,16 @@ 
 	 *
 	 * @return array   actual users capabilities
 	 */
-	protected function _map_meta_caps( $caps, $cap, $user_id, $args ) {
+	protected function _map_meta_caps($caps, $cap, $user_id, $args) {
 		//only process if we're checking our mapped_cap
-		if ( $cap !== $this->meta_cap ) {
+		if ($cap !== $this->meta_cap) {
 			return $caps;
 		}
 
-		$obj = ! empty( $args[0] ) ? $this->_model->get_one_by_ID( $args[0] ) : null;
+		$obj = ! empty($args[0]) ? $this->_model->get_one_by_ID($args[0]) : null;
 
 		//if no obj then let's just do cap
-		if ( ! $obj instanceof EE_Base_Class ) {
+		if ( ! $obj instanceof EE_Base_Class) {
 			$caps[] = $cap;
 			return $caps;
 		}
@@ -1157,7 +1157,7 @@ 
 		$is_system = $obj instanceof EE_Question_Group ? $obj->system_group() : false;
 		$is_system = $obj instanceof EE_Question ? $obj->is_system_question() : $is_system;
 
-		if ( $is_system ) {
+		if ($is_system) {
 			$caps[] = $this->private_cap;
 		} else {
 			$caps[] = $cap;

core/EE_Maintenance_Mode.core.php

Doc Comments +1 added lines, -1 removed lines

@@ -184,7 +184,7 @@
 	 *   returns TRUE if M-Mode is engaged and the current request is not for the admin
 	 *
 	 * @access    public
-	 * @return    string
+	 * @return    boolean
 	 */
 	public static function disable_frontend_for_maintenance() {
 		return ! is_admin() && EE_Maintenance_Mode::instance()->level() ? TRUE : FALSE;

Indentation +4 added lines, -4 removed lines

@@ -48,10 +48,10 @@
 	 */
 	const option_name_maintenance_mode = 'ee_maintenance_mode';
    /**
-     * 	EE_Maintenance_Mode Object
-     * 	@var EE_Maintenance_Mode $_instance
-	 * 	@access 	private
-     */
+    * 	EE_Maintenance_Mode Object
+    * 	@var EE_Maintenance_Mode $_instance
+    * 	@access 	private
+    */
 	private static $_instance = NULL;
 
 	/**

Braces +3 added lines, -3 removed lines

@@ -141,7 +141,7 @@ 
 			current_user_can('administrator') && //when the user is an admin
 			$real_maintenance_mode_level == EE_Maintenance_Mode::level_1_frontend_only_maintenance){//and we're in level 1
 			$maintenance_mode_level = EE_Maintenance_Mode::level_0_not_in_maintenance;
-		}else{
+		} else{
 			$maintenance_mode_level = $real_maintenance_mode_level;
 		}
 		return $maintenance_mode_level;
@@ -156,12 +156,12 @@ 
 		if( EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts()){
 			update_option(self::option_name_maintenance_mode, self::level_2_complete_maintenance);
 			return true;
-		}elseif( $this->level() == self::level_2_complete_maintenance ){
+		} elseif( $this->level() == self::level_2_complete_maintenance ){
 			//we also want to handle the opposite: if the site is mm2, but there aren't any migrations to run
 			//then we shouldn't be in mm2. (Maybe an addon got deactivated?)
 			update_option( self::option_name_maintenance_mode, self::level_0_not_in_maintenance );
 			return false;
-		}else{
+		} else{
 			return false;
 		}
 	}

Spacing +35 added lines, -35 removed lines

@@ -73,7 +73,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_Maintenance_Mode )) {
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_Maintenance_Mode)) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -83,7 +83,7 @@ 
 	 * Resets maintenance mode (mostly just re-checks whether or not we should be in maintenance mode)
 	 * @return EE_Maintenance_Mode
 	 */
-	public static function reset(){
+	public static function reset() {
 		self::instance()->set_maintenance_mode_if_db_old();
 		return self::instance();
 	}
@@ -98,11 +98,11 @@ 
 	 */
 	private function __construct() {
 		// if M-Mode level 2 is engaged, we still need basic assets loaded
-		add_action( 'wp_enqueue_scripts', array( $this, 'load_assets_required_for_m_mode' ));
+		add_action('wp_enqueue_scripts', array($this, 'load_assets_required_for_m_mode'));
 		// shut 'er down down for maintenance ?
-		add_filter( 'the_content', array( $this, 'the_content' ), 2 );
+		add_filter('the_content', array($this, 'the_content'), 2);
 		// add powered by EE msg
-		add_action( 'shutdown', array( $this, 'display_maintenance_mode_notice' ), 10 );
+		add_action('shutdown', array($this, 'display_maintenance_mode_notice'), 10);
 	}
 
 
@@ -112,8 +112,8 @@ 
 	 * retrieves the maintenance mode option value from the db
 	 * @return int
 	 */
-	public function real_level(){
-		return get_option( self::option_name_maintenance_mode, EE_Maintenance_Mode::level_0_not_in_maintenance );
+	public function real_level() {
+		return get_option(self::option_name_maintenance_mode, EE_Maintenance_Mode::level_0_not_in_maintenance);
 	}
 
 	/**
@@ -121,7 +121,7 @@ 
 	 * thinks their tables are present and up-to-date).
 	 * @return boolean
 	 */
-	public function models_can_query(){
+	public function models_can_query() {
 		return $this->real_level() != EE_Maintenance_Mode::level_2_complete_maintenance;
 	}
 
@@ -134,14 +134,14 @@ 
 	 * EE_Maintenance_Mode::level_2_complete_maintenance => frontend and backend maintenance mode
 	 * @return int
 	 */
-	public function level(){
+	public function level() {
 		$real_maintenance_mode_level = $this->real_level();
 		//if this is an admin request, we'll be honest... except if it's ajax, because that might be from the frontend
-		if( ( ! is_admin() || (defined('DOING_AJAX') && DOING_AJAX)) && //only on frontend or ajax requests
+		if (( ! is_admin() || (defined('DOING_AJAX') && DOING_AJAX)) && //only on frontend or ajax requests
 			current_user_can('administrator') && //when the user is an admin
-			$real_maintenance_mode_level == EE_Maintenance_Mode::level_1_frontend_only_maintenance){//and we're in level 1
+			$real_maintenance_mode_level == EE_Maintenance_Mode::level_1_frontend_only_maintenance) {//and we're in level 1
 			$maintenance_mode_level = EE_Maintenance_Mode::level_0_not_in_maintenance;
-		}else{
+		} else {
 			$maintenance_mode_level = $real_maintenance_mode_level;
 		}
 		return $maintenance_mode_level;
@@ -151,17 +151,17 @@ 
 	 * Determines if we need to put EE in maintenance mode because the database needs updating
 	 * @return boolean true if DB is old and maintenance mode was triggered; false otherwise
 	 */
-	public function set_maintenance_mode_if_db_old(){
-		EE_Registry::instance()->load_core( 'Data_Migration_Manager' );
-		if( EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts()){
+	public function set_maintenance_mode_if_db_old() {
+		EE_Registry::instance()->load_core('Data_Migration_Manager');
+		if (EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts()) {
 			update_option(self::option_name_maintenance_mode, self::level_2_complete_maintenance);
 			return true;
-		}elseif( $this->level() == self::level_2_complete_maintenance ){
+		}elseif ($this->level() == self::level_2_complete_maintenance) {
 			//we also want to handle the opposite: if the site is mm2, but there aren't any migrations to run
 			//then we shouldn't be in mm2. (Maybe an addon got deactivated?)
-			update_option( self::option_name_maintenance_mode, self::level_0_not_in_maintenance );
+			update_option(self::option_name_maintenance_mode, self::level_0_not_in_maintenance);
 			return false;
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -171,8 +171,8 @@ 
 	 * @param int $level
 	 * @return void
 	 */
-	public function set_maintenance_level($level){
-		do_action( 'AHEE__EE_Maintenance_Mode__set_maintenance_level', $level );
+	public function set_maintenance_level($level) {
+		do_action('AHEE__EE_Maintenance_Mode__set_maintenance_level', $level);
 		update_option(self::option_name_maintenance_mode, intval($level));
 	}
 
@@ -199,11 +199,11 @@ 
 	 *  @return 	string
 	 */
 	public function load_assets_required_for_m_mode() {
-		if ( $this->real_level() == EE_Maintenance_Mode::level_2_complete_maintenance && ! wp_script_is( 'espresso_core', 'enqueued' )) {
-			wp_register_style( 'espresso_default', EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css', array( 'dashicons' ), EVENT_ESPRESSO_VERSION );
+		if ($this->real_level() == EE_Maintenance_Mode::level_2_complete_maintenance && ! wp_script_is('espresso_core', 'enqueued')) {
+			wp_register_style('espresso_default', EE_GLOBAL_ASSETS_URL.'css/espresso_default.css', array('dashicons'), EVENT_ESPRESSO_VERSION);
 			wp_enqueue_style('espresso_default');
-			wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_enqueue_script( 'espresso_core' );
+			wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_enqueue_script('espresso_core');
 		}
 	}
 
@@ -221,7 +221,7 @@ 
 	 */
 	public static function template_include() {
 		// shut 'er down down for maintenance ? then don't use any of our templates for our endpoints
-		return get_template_directory() . '/index.php';
+		return get_template_directory().'/index.php';
 	}
 
 
@@ -235,12 +235,12 @@ 
 	 * @param    string $the_content
 	 * @return    string
 	 */
-	public function the_content( $the_content ) {
+	public function the_content($the_content) {
 		// check if M-mode is engaged and for EE shortcode
-		if ( $this->level() && strpos( $the_content, '[ESPRESSO_' ) !== false ) {
+		if ($this->level() && strpos($the_content, '[ESPRESSO_') !== false) {
 			// this can eventually be moved to a template, or edited via admin. But for now...
 			$the_content = sprintf(
-				__( '%sMaintenance Mode%sEvent Registration has been temporarily closed while system maintenance is being performed. We\'re sorry for any inconveniences this may have caused. Please try back again later.%s', 'event_espresso' ),
+				__('%sMaintenance Mode%sEvent Registration has been temporarily closed while system maintenance is being performed. We\'re sorry for any inconveniences this may have caused. Please try back again later.%s', 'event_espresso'),
 				'<h3>',
 				'</h3><p>',
 				'</p>'
@@ -264,16 +264,16 @@ 
 		// check if M-mode is engaged and for EE shortcode
 		if (
 			$this->real_level() &&
-			current_user_can( 'administrator' ) &&
+			current_user_can('administrator') &&
 			! is_admin() &&
-			! ( defined( 'DOING_AJAX' ) && DOING_AJAX )
+			! (defined('DOING_AJAX') && DOING_AJAX)
 			&& EE_Registry::instance()->REQ->is_espresso_page()
 		) {
 			printf(
-				__( '%sclose%sEvent Registration is currently disabled because Event Espresso has been placed into Maintenance Mode. To change Maintenance Mode settings, click here %sEE Maintenance Mode Admin Page%s', 'event_espresso' ),
+				__('%sclose%sEvent Registration is currently disabled because Event Espresso has been placed into Maintenance Mode. To change Maintenance Mode settings, click here %sEE Maintenance Mode Admin Page%s', 'event_espresso'),
 				'<div id="ee-m-mode-admin-notice-dv" class="ee-really-important-notice-dv"><a class="close-espresso-notice" title="',
 				'">&times;</a><p>',
-				' &raquo; <a href="' . add_query_arg( array( 'page' => 'espresso_maintenance_settings' ), admin_url( 'admin.php' )) . '">',
+				' &raquo; <a href="'.add_query_arg(array('page' => 'espresso_maintenance_settings'), admin_url('admin.php')).'">',
 				'</a></p></div>'
 			);
 		}
@@ -291,9 +291,9 @@ 
 	 *		@ return void
 	 */
 	final function __destruct() {}
-	final function __call($a,$b) {}
+	final function __call($a, $b) {}
 	final function __get($a) {}
-	final function __set($a,$b) {}
+	final function __set($a, $b) {}
 	final function __isset($a) {}
 	final function __unset($a) {}
 	final function __sleep() {
@@ -304,7 +304,7 @@ 
 	final function __invoke() {}
 	final function __set_state() {}
 	final function __clone() {}
-	final static function __callStatic($a,$b) {}
+	final static function __callStatic($a, $b) {}
 
 }
 // End of file EE_Maintenance_Mode.core.php

core/helpers/EEH_Form_Fields.helper.php

Doc Comments +5 added lines, -5 removed lines

@@ -774,7 +774,7 @@ 
 	 *
 	 * @param mixed $opt_group
 	 * @param mixed $QSOs
-	 * @param mixed $answer
+	 * @param string $answer
 	 * @return string
 	 */
 	private static function _generate_select_option_group( $opt_group, $QSOs, $answer ){
@@ -1122,7 +1122,7 @@ 
 	/**
 	 * 	prep_required
 	 * @param string|array 	$required
-	 * @return array
+	 * @return string
 	 */
 	static function prep_required( $required = array() ){
 		// make sure required is an array
@@ -1173,8 +1173,8 @@ 
 
 	/**
 	 * 	_load_system_dropdowns
-	 * @param array 	$QFI
-	 * @return array
+	 * @param EE_Question_Form_Input 	$QFI
+	 * @return EE_Question_Form_Input
 	 */
 	private static function _load_system_dropdowns( $QFI ){
 		$QST_system = $QFI->get('QST_system');
@@ -1463,7 +1463,7 @@ 
 	 * @param    string   $nonce_action     - if using nonces
 	 * @param    bool|string $input_only       - whether to print form header and footer. TRUE returns the input without the form
 	 * @param    string   $extra_attributes - any extra attributes that need to be attached to the form input
-	 * @return    void
+	 * @return    string
 	 */
 	public static function submit_button( $url = '', $ID = '', $class = '', $text = '', $nonce_action = '', $input_only = FALSE, $extra_attributes = '' ) {
 		$btn = '';

Indentation +7 added lines, -7 removed lines

@@ -393,7 +393,7 @@ 
 
 	/**
 	 * generate_question_groups_html
- 	 *
+	 *
 	 * @param string $question_groups
 	 * @return string HTML
 	 */
@@ -537,7 +537,7 @@ 
 
 	/**
 	 * generate_form_input
- 	 *
+	 *
 	 * @param EE_Question_Form_Input $QFI
 	 * @return string HTML
 	 */
@@ -612,7 +612,7 @@ 
 
 	/**
 	 * generates HTML for a form text input
- 	 *
+	 *
 	 * @param string $question 	label content
 	 * @param string $answer 		form input value attribute
 	 * @param string $name 			form input name attribute
@@ -657,7 +657,7 @@ 
 
 	/**
 	 * generates HTML for a form textarea
- 	 *
+	 *
 	 * @param string $question 		label content
 	 * @param string $answer 		form input value attribute
 	 * @param string $name 			form input name attribute
@@ -708,7 +708,7 @@ 
 
 	/**
 	 * generates HTML for a form select input
- 	 *
+	 *
 	 * @param string $question 		label content
 	 * @param string $answer 		form input value attribute
 	 * @param array $options			array of answer options where array key = option value and array value = option display text
@@ -885,7 +885,7 @@ 
 
 	/**
 	 * generates HTML for form checkbox inputs
- 	 *
+	 *
 	 * @param string $question 		label content
 	 * @param string $answer 		form input value attribute
 	 * @param array $options 			array of options where array key = option value and array value = option display text
@@ -966,7 +966,7 @@ 
 
 	/**
 	 * generates HTML for a form datepicker input
- 	 *
+	 *
 	 * @param string $question 	label content
 	 * @param string $answer 		form input value attribute
 	 * @param string $name 			form input name attribute

Braces +9 added lines, -6 removed lines

@@ -366,14 +366,16 @@ 
 		$field = '<select id="' . EEH_Formatter::ee_tep_output_string($name) . '" name="' . EEH_Formatter::ee_tep_output_string($name) . '"';
 		//Debug
 		//EEH_Debug_Tools::printr( $values, '$values  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		if ( EEH_Formatter::ee_tep_not_null($parameters))
-			$field .= ' ' . $parameters;
+		if ( EEH_Formatter::ee_tep_not_null($parameters)) {
+					$field .= ' ' . $parameters;
+		}
 		if ($autosize) {
 			$size = 'med';
 			for ($ii = 0, $ni = sizeof($values); $ii < $ni; $ii++) {
 				if ($values[$ii]['text']) {
-					if (strlen($values[$ii]['text']) > 5)
-						$size = 'wide';
+					if (strlen($values[$ii]['text']) > 5) {
+											$size = 'wide';
+					}
 				}
 			}
 		} else {
@@ -382,8 +384,9 @@ 
 
 		$field .= ' class="' . $class . ' ' . $size . '">';
 
-		if (empty($default) && isset($GLOBALS[$name]))
-			$default = stripslashes($GLOBALS[$name]);
+		if (empty($default) && isset($GLOBALS[$name])) {
+					$default = stripslashes($GLOBALS[$name]);
+		}
 
 
 		for ($i = 0, $n = sizeof($values); $i < $n; $i++) {

Spacing +377 added lines, -377 removed lines

@@ -69,10 +69,10 @@ 
 	 * 	@return string
 	 * 	@todo: at some point we can break this down into other static methods to abstract it a bit better.
 	 */
-	static public function get_form_fields( $input_vars = array(), $id = FALSE ) {
+	static public function get_form_fields($input_vars = array(), $id = FALSE) {
 		
-		if ( empty($input_vars) ) {
-			EE_Error::add_error( __('missing required variables for the form field generator', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
+		if (empty($input_vars)) {
+			EE_Error::add_error(__('missing required variables for the form field generator', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
@@ -98,25 +98,25 @@ 
 				'append_content' => ''
 				);
 
-			$input_value = wp_parse_args( $input_value, $defaults );
+			$input_value = wp_parse_args($input_value, $defaults);
 
 			// required fields get a *
 			$required = isset($input_value['required']) && $input_value['required'] ? ' <span>*</span>: ' : ': ';
 			// and the css class "required"
-			$css_class = isset( $input_value['css_class'] ) ? $input_value['css_class'] : '';
-			$styles = $input_value['required'] ? 'required ' . $css_class : $css_class;
+			$css_class = isset($input_value['css_class']) ? $input_value['css_class'] : '';
+			$styles = $input_value['required'] ? 'required '.$css_class : $css_class;
 
-			$field_id = ($id) ? $id . '-' . $input_key : $input_key;
-			$tabindex = !empty($input_value['tabindex']) ? ' tabindex="' . $input_value['tabindex'] . '"' : '';
+			$field_id = ($id) ? $id.'-'.$input_key : $input_key;
+			$tabindex = ! empty($input_value['tabindex']) ? ' tabindex="'.$input_value['tabindex'].'"' : '';
 
 			//rows or cols?
-			$rows = isset($input_value['rows'] ) ? $input_value['rows'] : '10';
-			$cols = isset($input_value['cols'] ) ? $input_value['cols'] : '80';
+			$rows = isset($input_value['rows']) ? $input_value['rows'] : '10';
+			$cols = isset($input_value['cols']) ? $input_value['cols'] : '80';
 
 			//any content?
 			$append_content = $input_value['append_content'];
 
-			$output .= (!$close) ? '<ul>' : '';
+			$output .= ( ! $close) ? '<ul>' : '';
 			$output .= '<li>';
 
 			// what type of input are we dealing with ?
@@ -124,15 +124,15 @@ 
 
 				// text inputs
 				case 'text' :
-					$output .= "\n\t\t\t" . '<label for="' . $field_id . '">' . $input_value['label'] . $required . '</label>';
-					$output .= "\n\t\t\t" . '<input id="' . $field_id . '" class="' . $styles . '" type="text" value="' . $input_value['value'] . '" name="' . $input_value['name'] . '"' . $tabindex . '>';
+					$output .= "\n\t\t\t".'<label for="'.$field_id.'">'.$input_value['label'].$required.'</label>';
+					$output .= "\n\t\t\t".'<input id="'.$field_id.'" class="'.$styles.'" type="text" value="'.$input_value['value'].'" name="'.$input_value['name'].'"'.$tabindex.'>';
 					break;
 
 				// dropdowns
 				case 'select' :
 
-					$output .= "\n\t\t\t" . '<label for="' . $field_id . '">' . $input_value['label'] . $required . '</label>';
-					$output .= "\n\t\t\t" . '<select id="' . $field_id . '" class="' . $styles . '" name="' . $input_value['name'] . '"' . $tabindex . '>';
+					$output .= "\n\t\t\t".'<label for="'.$field_id.'">'.$input_value['label'].$required.'</label>';
+					$output .= "\n\t\t\t".'<select id="'.$field_id.'" class="'.$styles.'" name="'.$input_value['name'].'"'.$tabindex.'>';
 
 					if (is_array($input_value['options'])) {
 						$options = $input_value['options'];
@@ -141,30 +141,30 @@ 
 					}
 
 					foreach ($options as $key => $value) {
-						$selected = isset( $input_value['value'] ) && $input_value['value'] == $key ? 'selected=selected' : '';
+						$selected = isset($input_value['value']) && $input_value['value'] == $key ? 'selected=selected' : '';
 						//$key = str_replace( ' ', '_', sanitize_key( $value ));
-						$output .= "\n\t\t\t\t" . '<option '. $selected . ' value="' . $key . '">' . $value . '</option>';
+						$output .= "\n\t\t\t\t".'<option '.$selected.' value="'.$key.'">'.$value.'</option>';
 					}
-					$output .= "\n\t\t\t" . '</select>';
+					$output .= "\n\t\t\t".'</select>';
 
 					break;
 
 				case 'textarea' :
 
-					$output .= "\n\t\t\t" . '<label for="' . $field_id . '">' . $input_value['label'] . $required . '</label>';
-					$output .= "\n\t\t\t" . '<textarea id="' . $field_id . '" class="' . $styles . '" rows="'.$rows.'" cols="'.$cols.'" name="' . $input_value['name'] . '"' . $tabindex . '>' . $input_value['value'] . '</textarea>';
+					$output .= "\n\t\t\t".'<label for="'.$field_id.'">'.$input_value['label'].$required.'</label>';
+					$output .= "\n\t\t\t".'<textarea id="'.$field_id.'" class="'.$styles.'" rows="'.$rows.'" cols="'.$cols.'" name="'.$input_value['name'].'"'.$tabindex.'>'.$input_value['value'].'</textarea>';
 					break;
 
 				case 'hidden' :
 					$close = false;
 					$output .= "</li></ul>";
-					$output .= "\n\t\t\t" . '<input id="' . $field_id . '" type="hidden" name="' . $input_value['name'] . '" value="' . $input_value['value'] . '">';
+					$output .= "\n\t\t\t".'<input id="'.$field_id.'" type="hidden" name="'.$input_value['name'].'" value="'.$input_value['value'].'">';
 					break;
 
 				case 'checkbox' :
-					$checked = ( $input_value['value'] == 1 ) ? 'checked="checked"' : '';
-					$output .= "\n\t\t\t" . '<label for="' . $field_id . '">' . $input_value['label'] . $required . '</label>';
-					$output .= "\n\t\t\t" . '<input id="' . $field_id. '" type="checkbox" name="' . $input_value['name'] . '" value="1"' . $checked . $tabindex . ' />';
+					$checked = ($input_value['value'] == 1) ? 'checked="checked"' : '';
+					$output .= "\n\t\t\t".'<label for="'.$field_id.'">'.$input_value['label'].$required.'</label>';
+					$output .= "\n\t\t\t".'<input id="'.$field_id.'" type="checkbox" name="'.$input_value['name'].'" value="1"'.$checked.$tabindex.' />';
 					break;
 
 				case 'wp_editor' :
@@ -177,19 +177,19 @@ 
 					);
 					$output .= '</li>';
 					$output .= '</ul>';
-					$output .= '<h4>' . $input_value['label'] . '</h4>';
-					if ( $append_content ) {
+					$output .= '<h4>'.$input_value['label'].'</h4>';
+					if ($append_content) {
 						$output .= $append_content;
 					}
 					ob_start();
-					wp_editor( $input_value['value'], $field_id, $editor_settings);
+					wp_editor($input_value['value'], $field_id, $editor_settings);
 					$editor = ob_get_contents();
 					ob_end_clean();
 					$output .= $editor;
 					break;
 
 				}
-				if ( $append_content && $input_value['input'] !== 'wp_editor' ) {
+				if ($append_content && $input_value['input'] !== 'wp_editor') {
 					$output .= $append_content;
 				}
 				$output .= ($close) ? '</li>' : '';
@@ -230,7 +230,7 @@ 
 		$form_fields = array();
 		$fields = (array) $fields;
 
-		foreach ( $fields as $field_name => $field_atts ) {
+		foreach ($fields as $field_name => $field_atts) {
 			//defaults:
 			$defaults = array(
 				'label' => '',
@@ -248,67 +248,67 @@ 
 				'wpeditor_args' => array()
 				);
 			// merge defaults with passed arguments
-			$_fields = wp_parse_args( $field_atts, $defaults);
-			extract( $_fields );
+			$_fields = wp_parse_args($field_atts, $defaults);
+			extract($_fields);
 			// generate label
-			$label = empty($label) ? '' : '<label for="' . $id . '">' . $label . '</label>';
+			$label = empty($label) ? '' : '<label for="'.$id.'">'.$label.'</label>';
 			// generate field name
-			$f_name = !empty($unique_id) ? $field_name . '[' . $unique_id . ']' : $field_name;
+			$f_name = ! empty($unique_id) ? $field_name.'['.$unique_id.']' : $field_name;
 
 			//tabindex
-			$tabindex_str = !empty( $tabindex ) ? ' tabindex="' . $tabindex . '"' : '';
+			$tabindex_str = ! empty($tabindex) ? ' tabindex="'.$tabindex.'"' : '';
 
 			//we determine what we're building based on the type
-			switch ( $type ) {
+			switch ($type) {
 
 				case 'textarea' :
-						$fld = '<textarea id="' . $id . '" class="' . $class . '" rows="' . $dimensions[1] . '" cols="' . $dimensions[0] . '" name="' . $f_name . '"' . $tabindex_str . '>' . $value . '</textarea>';
+						$fld = '<textarea id="'.$id.'" class="'.$class.'" rows="'.$dimensions[1].'" cols="'.$dimensions[0].'" name="'.$f_name.'"'.$tabindex_str.'>'.$value.'</textarea>';
 						$fld .= $extra_desc;
 					break;
 
 				case 'checkbox' :
 						$c_input = '';
-						if ( is_array($value) ) {
-							foreach ( $value as $key => $val ) {
-								$c_id = $field_name . '_' . $value;
-								$c_class = isset($classes[$key]) ? ' class="' . $classes[$key] . '" ' : '';
-								$c_label = isset($labels[$key]) ? '<label for="' . $c_id . '">' . $labels[$key] . '</label>' : '';
-								$checked = !empty($default) && $default == $val ? ' checked="checked" ' : '';
-								$c_input .= '<input name="' . $f_name . '[]" type="checkbox" id="' . $c_id . '"' . $c_class . 'value="' . $val . '"' . $checked . $tabindex_str . ' />' . "\n" . $c_label;
+						if (is_array($value)) {
+							foreach ($value as $key => $val) {
+								$c_id = $field_name.'_'.$value;
+								$c_class = isset($classes[$key]) ? ' class="'.$classes[$key].'" ' : '';
+								$c_label = isset($labels[$key]) ? '<label for="'.$c_id.'">'.$labels[$key].'</label>' : '';
+								$checked = ! empty($default) && $default == $val ? ' checked="checked" ' : '';
+								$c_input .= '<input name="'.$f_name.'[]" type="checkbox" id="'.$c_id.'"'.$c_class.'value="'.$val.'"'.$checked.$tabindex_str.' />'."\n".$c_label;
 							}
 							$fld = $c_input;
 						} else {
-							$checked = !empty($default) && $default == $val ? 'checked="checked" ' : '';
-							$fld = '<input name="'. $f_name . '" type="checkbox" id="' . $id . '" class="' . $class . '" value="' . $value . '"' . $checked . $tabindex_str . ' />' . "\n";
+							$checked = ! empty($default) && $default == $val ? 'checked="checked" ' : '';
+							$fld = '<input name="'.$f_name.'" type="checkbox" id="'.$id.'" class="'.$class.'" value="'.$value.'"'.$checked.$tabindex_str.' />'."\n";
 						}
 					break;
 
 				case 'radio' :
 						$c_input = '';
-						if ( is_array($value) ) {
-							foreach ( $value as $key => $val ) {
-								$c_id = $field_name . '_' . $value;
-								$c_class = isset($classes[$key]) ? 'class="' . $classes[$key] . '" ' : '';
-								$c_label = isset($labels[$key]) ? '<label for="' . $c_id . '">' . $labels[$key] . '</label>' : '';
-								$checked = !empty($default) && $default == $val ? ' checked="checked" ' : '';
-								$c_input .= '<input name="' . $f_name . '" type="checkbox" id="' . $c_id . '"' . $c_class . 'value="' . $val . '"' . $checked . $tabindex_str . ' />' . "\n" . $c_label;
+						if (is_array($value)) {
+							foreach ($value as $key => $val) {
+								$c_id = $field_name.'_'.$value;
+								$c_class = isset($classes[$key]) ? 'class="'.$classes[$key].'" ' : '';
+								$c_label = isset($labels[$key]) ? '<label for="'.$c_id.'">'.$labels[$key].'</label>' : '';
+								$checked = ! empty($default) && $default == $val ? ' checked="checked" ' : '';
+								$c_input .= '<input name="'.$f_name.'" type="checkbox" id="'.$c_id.'"'.$c_class.'value="'.$val.'"'.$checked.$tabindex_str.' />'."\n".$c_label;
 							}
 							$fld = $c_input;
 						} else {
-							$checked = !empty($default) && $default == $val ? 'checked="checked" ' : '';
-							$fld = '<input name="'. $f_name . '" type="checkbox" id="' . $id . '" class="' . $class . '" value="' . $value . '"' . $checked . $tabindex_str . ' />' . "\n";
+							$checked = ! empty($default) && $default == $val ? 'checked="checked" ' : '';
+							$fld = '<input name="'.$f_name.'" type="checkbox" id="'.$id.'" class="'.$class.'" value="'.$value.'"'.$checked.$tabindex_str.' />'."\n";
 						}
 					break;
 
 				case 'hidden' :
-						$fld = '<input name="' . $f_name . '" type="hidden" id="' . $id . '" class="' . $class . '" value="' . $value . '" />' . "\n";
+						$fld = '<input name="'.$f_name.'" type="hidden" id="'.$id.'" class="'.$class.'" value="'.$value.'" />'."\n";
 					break;
 
 				case 'select' :
-						$fld = '<select name="' . $f_name . '" class="' . $class . '" id="' . $id . '"' . $tabindex_str . '>' . "\n";
-						foreach ( $value as $key => $val ) {
-							$checked = !empty($default) && $default == $val ? ' selected="selected"' : '';
-							$fld .= "\t" . '<option value="' . $val . '"' . $checked . '>' . $labels[$key] . '</option>' . "\n";
+						$fld = '<select name="'.$f_name.'" class="'.$class.'" id="'.$id.'"'.$tabindex_str.'>'."\n";
+						foreach ($value as $key => $val) {
+							$checked = ! empty($default) && $default == $val ? ' selected="selected"' : '';
+							$fld .= "\t".'<option value="'.$val.'"'.$checked.'>'.$labels[$key].'</option>'."\n";
 						}
 						$fld .= '</select>';
 					break;
@@ -320,21 +320,21 @@ 
 							'editor_class' => $class,
 							'tabindex' => $tabindex
 							);
-						$editor_settings = array_merge( $wpeditor_args, $editor_settings );
+						$editor_settings = array_merge($wpeditor_args, $editor_settings);
 						ob_start();
-						wp_editor( $value, $id, $editor_settings );
+						wp_editor($value, $id, $editor_settings);
 						$editor = ob_get_contents();
 						ob_end_clean();
 						$fld = $editor;
 					break;
 
 				default : //'text fields'
-						$fld = '<input name="' . $f_name . '" type="text" id="' . $id . '" class="' . $class . '" value="' . $value . '"' . $tabindex_str . ' />' . "\n";
+						$fld = '<input name="'.$f_name.'" type="text" id="'.$id.'" class="'.$class.'" value="'.$value.'"'.$tabindex_str.' />'."\n";
 						$fld .= $extra_desc;
 
 			}
 
-			$form_fields[ $field_name ] = array( 'label' => $label, 'field' => $fld );
+			$form_fields[$field_name] = array('label' => $label, 'field' => $fld);
 		}
 
 		return $form_fields;
@@ -363,19 +363,19 @@ 
 	 */
 	static public function select_input($name, $values, $default = '', $parameters = '', $class = '', $autosize = true) {
 		//if $values was submitted in the wrong format, convert it over
-		if(!empty($values) && (!array_key_exists(0,$values) || !is_array($values[0]))){
-			$converted_values=array();
-			foreach($values as $id=>$text){
-				$converted_values[]=array('id'=>$id,'text'=>$text);
+		if ( ! empty($values) && ( ! array_key_exists(0, $values) || ! is_array($values[0]))) {
+			$converted_values = array();
+			foreach ($values as $id=>$text) {
+				$converted_values[] = array('id'=>$id, 'text'=>$text);
 			}
-			$values=$converted_values;
+			$values = $converted_values;
 		}
 
-		$field = '<select id="' . EEH_Formatter::ee_tep_output_string($name) . '" name="' . EEH_Formatter::ee_tep_output_string($name) . '"';
+		$field = '<select id="'.EEH_Formatter::ee_tep_output_string($name).'" name="'.EEH_Formatter::ee_tep_output_string($name).'"';
 		//Debug
 		//EEH_Debug_Tools::printr( $values, '$values  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		if ( EEH_Formatter::ee_tep_not_null($parameters))
-			$field .= ' ' . $parameters;
+		if (EEH_Formatter::ee_tep_not_null($parameters))
+			$field .= ' '.$parameters;
 		if ($autosize) {
 			$size = 'med';
 			for ($ii = 0, $ni = sizeof($values); $ii < $ni; $ii++) {
@@ -388,21 +388,21 @@ 
 			$size = '';
 		}
 
-		$field .= ' class="' . $class . ' ' . $size . '">';
+		$field .= ' class="'.$class.' '.$size.'">';
 
 		if (empty($default) && isset($GLOBALS[$name]))
 			$default = stripslashes($GLOBALS[$name]);
 
 
 		for ($i = 0, $n = sizeof($values); $i < $n; $i++) {
-			$field .= '<option value="' . $values[$i]['id'] . '"';
+			$field .= '<option value="'.$values[$i]['id'].'"';
 			if ($default == $values[$i]['id']) {
 				$field .= ' selected = "selected"';
 			}
-			if ( isset( $values[$i]['class'] ) ) {
-				$field .= ' class="' . $values[$i]['class'] . '"';
+			if (isset($values[$i]['class'])) {
+				$field .= ' class="'.$values[$i]['class'].'"';
 			}
-			$field .= '>' . $values[$i]['text'] . '</option>';
+			$field .= '>'.$values[$i]['text'].'</option>';
 		}
 		$field .= '</select>';
 
@@ -420,38 +420,38 @@ 
 	 * @param string $question_groups
 	 * @return string HTML
 	 */
-	static function generate_question_groups_html( $question_groups = array(), $group_wrapper = 'fieldset' ) {
+	static function generate_question_groups_html($question_groups = array(), $group_wrapper = 'fieldset') {
 
 		$html = '';
-		$before_question_group_questions = apply_filters( 'FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '' );
-		$after_question_group_questions = apply_filters( 'FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '' );
+		$before_question_group_questions = apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '');
+		$after_question_group_questions = apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '');
 
-		if ( ! empty( $question_groups )) {
+		if ( ! empty($question_groups)) {
 			//EEH_Debug_Tools::printr( $question_groups, '$question_groups  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 			// loop thru question groups
-			foreach ( $question_groups as $QSG ) {
+			foreach ($question_groups as $QSG) {
 				// check that questions exist
-				if ( ! empty( $QSG['QSG_questions'] )) {
+				if ( ! empty($QSG['QSG_questions'])) {
 					// use fieldsets
-					$html .= "\n\t" . '<' . $group_wrapper . ' class="espresso-question-group-wrap" id="' . $QSG['QSG_identifier'] . '">';
+					$html .= "\n\t".'<'.$group_wrapper.' class="espresso-question-group-wrap" id="'.$QSG['QSG_identifier'].'">';
 					// group_name
-					$html .= $QSG['QSG_show_group_name'] ? "\n\t\t" . '<h5 class="espresso-question-group-title-h5 section-title">' . self::prep_answer( $QSG['QSG_name'] ) . '</h5>' : '';
+					$html .= $QSG['QSG_show_group_name'] ? "\n\t\t".'<h5 class="espresso-question-group-title-h5 section-title">'.self::prep_answer($QSG['QSG_name']).'</h5>' : '';
 					// group_desc
-					$html .= $QSG['QSG_show_group_desc'] && ! empty( $QSG['QSG_desc'] ) ? '<div class="espresso-question-group-desc-pg">' . self::prep_answer( $QSG['QSG_desc'] ) . '</div>' : '';
+					$html .= $QSG['QSG_show_group_desc'] && ! empty($QSG['QSG_desc']) ? '<div class="espresso-question-group-desc-pg">'.self::prep_answer($QSG['QSG_desc']).'</div>' : '';
 
 					$html .= $before_question_group_questions;
 					// loop thru questions
-					foreach ( $QSG['QSG_questions'] as $question ) {
+					foreach ($QSG['QSG_questions'] as $question) {
 //						EEH_Debug_Tools::printr( $question, '$question  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 						$QFI = new EE_Question_Form_Input(
 							$question['qst_obj'],
 							$question['ans_obj'],
 							$question
 						);
-						$html .= self::generate_form_input( $QFI );
+						$html .= self::generate_form_input($QFI);
 					}
 					$html .= $after_question_group_questions;
-					$html .= "\n\t" . '</' . $group_wrapper . '>';
+					$html .= "\n\t".'</'.$group_wrapper.'>';
 				}
 			}
 		}
@@ -471,11 +471,11 @@ 
 	 * @param string       $group_wrapper
 	 * @return string HTML
 	 */
-	static function generate_question_groups_html2( $question_groups = array(), $q_meta = array(), 	$from_admin = FALSE, $group_wrapper = 'fieldset' ) {
+	static function generate_question_groups_html2($question_groups = array(), $q_meta = array(), $from_admin = FALSE, $group_wrapper = 'fieldset') {
 
 		$html = '';
-		$before_question_group_questions = apply_filters( 'FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '' );
-		$after_question_group_questions = apply_filters( 'FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '' );
+		$before_question_group_questions = apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '');
+		$after_question_group_questions = apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '');
 
 		$default_q_meta = array(
 				'att_nmbr' => 1,
@@ -484,55 +484,55 @@ 
 				'input_id' => '',
 				'input_class' => ''
 		);
-		$q_meta = array_merge( $default_q_meta, $q_meta );
+		$q_meta = array_merge($default_q_meta, $q_meta);
 		//EEH_Debug_Tools::printr( $q_meta, '$q_meta  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 
-		if ( ! empty( $question_groups )) {
+		if ( ! empty($question_groups)) {
 //			EEH_Debug_Tools::printr( $question_groups, '$question_groups  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 			// loop thru question groups
-			foreach ( $question_groups as $QSG ) {
-				if ( $QSG instanceof EE_Question_Group ) {
+			foreach ($question_groups as $QSG) {
+				if ($QSG instanceof EE_Question_Group) {
 					// check that questions exist
 
-					$where = array( 'QST_deleted' => 0 );
-					if ( ! $from_admin ) {
+					$where = array('QST_deleted' => 0);
+					if ( ! $from_admin) {
 						$where['QST_admin_only'] = 0;
 					}
-					$questions = $QSG->questions( array( $where, 'order_by' => array( 'Question_Group_Question.QGQ_order' => 'ASC' )));
-					if ( ! empty( $questions )) {
+					$questions = $QSG->questions(array($where, 'order_by' => array('Question_Group_Question.QGQ_order' => 'ASC')));
+					if ( ! empty($questions)) {
 						// use fieldsets
-						$html .= "\n\t" . '<' . $group_wrapper . ' class="espresso-question-group-wrap" id="' . $QSG->get( 'QSG_identifier' ) . '">';
+						$html .= "\n\t".'<'.$group_wrapper.' class="espresso-question-group-wrap" id="'.$QSG->get('QSG_identifier').'">';
 						// group_name
-						if ( $QSG->show_group_name() ) {
-							$html .=  "\n\t\t" . '<h5 class="espresso-question-group-title-h5 section-title">' . $QSG->get_pretty( 'QSG_name' ) . '</h5>';
+						if ($QSG->show_group_name()) {
+							$html .= "\n\t\t".'<h5 class="espresso-question-group-title-h5 section-title">'.$QSG->get_pretty('QSG_name').'</h5>';
 						}
 						// group_desc
-						if ( $QSG->show_group_desc() ) {
-							$html .=  '<div class="espresso-question-group-desc-pg">' . $QSG->get_pretty( 'QSG_desc'  ) . '</div>';
+						if ($QSG->show_group_desc()) {
+							$html .= '<div class="espresso-question-group-desc-pg">'.$QSG->get_pretty('QSG_desc').'</div>';
 						}
 
 						$html .= $before_question_group_questions;
 						// loop thru questions
-						foreach ( $questions as $QST ) {
+						foreach ($questions as $QST) {
 							$qstn_id = $QST->is_system_question() ? $QST->system_ID() : $QST->ID();
 
 							$answer = NULL;
 
-							if (  isset( $_GET['qstn'] ) && isset( $q_meta['input_id'] ) && isset( $q_meta['att_nmbr'] )) {
+							if (isset($_GET['qstn']) && isset($q_meta['input_id']) && isset($q_meta['att_nmbr'])) {
 								// check for answer in $_GET in case we are reprocessing a form after an error
-								if ( isset( $_GET['qstn'][ $q_meta['input_id'] ][ $qstn_id ] )) {
-									$answer = is_array( $_GET['qstn'][ $q_meta['input_id'] ][ $qstn_id ] ) ? $_GET['qstn'][ $q_meta['input_id'] ][ $qstn_id ] : sanitize_text_field( $_GET['qstn'][ $q_meta['input_id'] ][ $qstn_id ] );
+								if (isset($_GET['qstn'][$q_meta['input_id']][$qstn_id])) {
+									$answer = is_array($_GET['qstn'][$q_meta['input_id']][$qstn_id]) ? $_GET['qstn'][$q_meta['input_id']][$qstn_id] : sanitize_text_field($_GET['qstn'][$q_meta['input_id']][$qstn_id]);
 								}
-							} else if ( isset( $q_meta['attendee'] ) && $q_meta['attendee'] ) {
+							} else if (isset($q_meta['attendee']) && $q_meta['attendee']) {
 								//attendee data from the session
-								$answer = isset( $q_meta['attendee'][ $qstn_id ] ) ? $q_meta['attendee'][ $qstn_id ] : NULL;
+								$answer = isset($q_meta['attendee'][$qstn_id]) ? $q_meta['attendee'][$qstn_id] : NULL;
 							}
 
 
 
 							$QFI = new EE_Question_Form_Input(
 									$QST,
-									EE_Answer::new_instance ( array(
+									EE_Answer::new_instance(array(
 											'ANS_ID'=> 0,
 											'QST_ID'=> 0,
 											'REG_ID'=> 0,
@@ -541,10 +541,10 @@ 
 									$q_meta
 							);
 							//EEH_Debug_Tools::printr( $QFI, '$QFI  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-							$html .= self::generate_form_input( $QFI );
+							$html .= self::generate_form_input($QFI);
 						}
 						$html .= $after_question_group_questions;
-						$html .= "\n\t" . '</' . $group_wrapper . '>';
+						$html .= "\n\t".'</'.$group_wrapper.'>';
 					}
 				}
 			}
@@ -564,63 +564,63 @@ 
 	 * @param EE_Question_Form_Input $QFI
 	 * @return string HTML
 	 */
-	static function generate_form_input( EE_Question_Form_Input $QFI ) {
-		if ( isset( $QFI->QST_admin_only) && $QFI->QST_admin_only && ! is_admin() ) {
+	static function generate_form_input(EE_Question_Form_Input $QFI) {
+		if (isset($QFI->QST_admin_only) && $QFI->QST_admin_only && ! is_admin()) {
 			return '';
 		}
 
-		$QFI = self::_load_system_dropdowns( $QFI );
-		$QFI = self::_load_specialized_dropdowns( $QFI );
+		$QFI = self::_load_system_dropdowns($QFI);
+		$QFI = self::_load_specialized_dropdowns($QFI);
 
 		//we also need to verify
 
 		$display_text = $QFI->get('QST_display_text');
 		$input_name = $QFI->get('QST_input_name');
-		$answer = EE_Registry::instance()->REQ->is_set( $input_name ) ? EE_Registry::instance()->REQ->get( $input_name ) : $QFI->get('ANS_value');
+		$answer = EE_Registry::instance()->REQ->is_set($input_name) ? EE_Registry::instance()->REQ->get($input_name) : $QFI->get('ANS_value');
 		$input_id = $QFI->get('QST_input_id');
 		$input_class = $QFI->get('QST_input_class');
 //		$disabled = $QFI->get('QST_disabled') ? ' disabled="disabled"' : '';
 		$disabled = $QFI->get('QST_disabled') ? TRUE : FALSE;
-		$required_label = apply_filters(' FHEE__EEH_Form_Fields__generate_form_input__required_label', '<em>*</em>' );
+		$required_label = apply_filters(' FHEE__EEH_Form_Fields__generate_form_input__required_label', '<em>*</em>');
 		$QST_required = $QFI->get('QST_required');
-		$required = $QST_required ? array( 'label' => $required_label, 'class' => 'required needs-value', 'title' => $QST_required ) : array();
-		$use_html_entities = $QFI->get_meta( 'htmlentities' );
-		$required_text = $QFI->get('QST_required_text') != '' ? $QFI->get('QST_required_text') : __( 'This field is required', 'event_espresso' );
-		$required_text = $QST_required ? "\n\t\t\t" . '<div class="required-text hidden">' . self::prep_answer( $required_text, $use_html_entities ) . '</div>' : '';
+		$required = $QST_required ? array('label' => $required_label, 'class' => 'required needs-value', 'title' => $QST_required) : array();
+		$use_html_entities = $QFI->get_meta('htmlentities');
+		$required_text = $QFI->get('QST_required_text') != '' ? $QFI->get('QST_required_text') : __('This field is required', 'event_espresso');
+		$required_text = $QST_required ? "\n\t\t\t".'<div class="required-text hidden">'.self::prep_answer($required_text, $use_html_entities).'</div>' : '';
 		$label_class = 'espresso-form-input-lbl';
-		$QST_options = $QFI->options(true,$answer);
-		$options = is_array( $QST_options ) ? self::prep_answer_options( $QST_options ) : array();
+		$QST_options = $QFI->options(true, $answer);
+		$options = is_array($QST_options) ? self::prep_answer_options($QST_options) : array();
 		$system_ID = $QFI->get('QST_system');
-		$label_b4 = $QFI->get_meta( 'label_b4' );
-		$use_desc_4_label = $QFI->get_meta( 'use_desc_4_label' );
+		$label_b4 = $QFI->get_meta('label_b4');
+		$use_desc_4_label = $QFI->get_meta('use_desc_4_label');
 
 
-		switch ( $QFI->get('QST_type') ){
+		switch ($QFI->get('QST_type')) {
 
 			case 'TEXTAREA' :
-					return EEH_Form_Fields::textarea( $display_text, $answer, $input_name, $input_id, $input_class, array(), $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities );
+					return EEH_Form_Fields::textarea($display_text, $answer, $input_name, $input_id, $input_class, array(), $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities);
 				break;
 
 			case 'DROPDOWN' :
-					return EEH_Form_Fields::select( $display_text, $answer, $options, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities, TRUE );
+					return EEH_Form_Fields::select($display_text, $answer, $options, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities, TRUE);
 				break;
 
 
 			case 'RADIO_BTN' :
-					return EEH_Form_Fields::radio( $display_text, $answer, $options, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities, $label_b4, $use_desc_4_label );
+					return EEH_Form_Fields::radio($display_text, $answer, $options, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities, $label_b4, $use_desc_4_label);
 				break;
 
 			case 'CHECKBOX' :
-					return EEH_Form_Fields::checkbox( $display_text, $answer, $options, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $label_b4, $system_ID, $use_html_entities );
+					return EEH_Form_Fields::checkbox($display_text, $answer, $options, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $label_b4, $system_ID, $use_html_entities);
 				break;
 
 			case 'DATE' :
-					return EEH_Form_Fields::datepicker( $display_text, $answer, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities );
+					return EEH_Form_Fields::datepicker($display_text, $answer, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities);
 				break;
 
 			case 'TEXT' :
 			default:
-					return EEH_Form_Fields::text( $display_text, $answer, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities );
+					return EEH_Form_Fields::text($display_text, $answer, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities);
 				break;
 
 		}
@@ -646,31 +646,31 @@ 
 	 * @param string $disabled 		disabled="disabled" or null
 	 * @return string HTML
 	 */
-	static function text( $question = FALSE, $answer = NULL, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE ) {
+	static function text($question = FALSE, $answer = NULL, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE) {
 		// need these
-		if ( ! $question || ! $name ) {
+		if ( ! $question || ! $name) {
 			return NULL;
 		}
 		// prep the answer
-		$answer = is_array( $answer ) ? '' : self::prep_answer( $answer, $use_html_entities );
+		$answer = is_array($answer) ? '' : self::prep_answer($answer, $use_html_entities);
 		// prep the required array
-		$required = self::prep_required( $required );
+		$required = self::prep_required($required);
 		// set disabled tag
-		$disabled = $answer === NULL || ! $disabled  ? '' : ' disabled="disabled"';
+		$disabled = $answer === NULL || ! $disabled ? '' : ' disabled="disabled"';
 		// ya gots ta have style man!!!
 		$txt_class = is_admin() ? 'regular-text' : 'espresso-text-inp';
-		$class = empty( $class ) ? $txt_class : $class;
-		$class .= ! empty( $system_ID ) ? ' ' . $system_ID : '';
-		$extra = apply_filters( 'FHEE__EEH_Form_Fields__additional_form_field_attributes', '' );
+		$class = empty($class) ? $txt_class : $class;
+		$class .= ! empty($system_ID) ? ' '.$system_ID : '';
+		$extra = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
 
-		$label_html = $required_text . "\n\t\t\t" . '<label for="' . $name . '" class="' . $label_class . '">' . self::prep_question( $question ) . $required['label'] . '</label><br/>';
+		$label_html = $required_text."\n\t\t\t".'<label for="'.$name.'" class="'.$label_class.'">'.self::prep_question($question).$required['label'].'</label><br/>';
 		// filter label but ensure required text comes before it
-		$label_html = apply_filters( 'FHEE__EEH_Form_Fields__label_html', $label_html, $required_text );
+		$label_html = apply_filters('FHEE__EEH_Form_Fields__label_html', $label_html, $required_text);
 
-		$input_html = "\n\t\t\t" . '<input type="text" name="' . $name . '" id="' . $id . '" class="' . $class . ' ' . $required['class'] . '" value="' . esc_attr( $answer ) . '"  title="' . esc_attr( $required['msg'] ) . '" ' . $disabled .' ' . $extra . '/>';
+		$input_html = "\n\t\t\t".'<input type="text" name="'.$name.'" id="'.$id.'" class="'.$class.' '.$required['class'].'" value="'.esc_attr($answer).'"  title="'.esc_attr($required['msg']).'" '.$disabled.' '.$extra.'/>';
 
-		$input_html =  apply_filters( 'FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id );
-		return  $label_html . $input_html;
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
+		return  $label_html.$input_html;
 
 	}
 
@@ -692,35 +692,35 @@ 
 	 * @param string $disabled 		disabled="disabled" or null
 	 * @return string HTML
 	 */
-	static function textarea( $question = FALSE, $answer = NULL, $name = FALSE, $id = '', $class = '', $dimensions = FALSE, $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE ) {
+	static function textarea($question = FALSE, $answer = NULL, $name = FALSE, $id = '', $class = '', $dimensions = FALSE, $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE) {
 		// need these
-		if ( ! $question || ! $name ) {
+		if ( ! $question || ! $name) {
 			return NULL;
 		}
 		// prep the answer
-		$answer = is_array( $answer ) ? '' : self::prep_answer( $answer, $use_html_entities );
+		$answer = is_array($answer) ? '' : self::prep_answer($answer, $use_html_entities);
 		// prep the required array
-		$required = self::prep_required( $required );
+		$required = self::prep_required($required);
 		// make sure $dimensions is an array
-		$dimensions = is_array( $dimensions ) ? $dimensions : array();
+		$dimensions = is_array($dimensions) ? $dimensions : array();
 		// and set some defaults
-		$dimensions = array_merge( array( 'rows' => 3, 'cols' => 40 ), $dimensions );
+		$dimensions = array_merge(array('rows' => 3, 'cols' => 40), $dimensions);
 		// set disabled tag
-		$disabled = $answer === NULL || ! $disabled  ? '' : ' disabled="disabled"';
+		$disabled = $answer === NULL || ! $disabled ? '' : ' disabled="disabled"';
 		// ya gots ta have style man!!!
 		$txt_class = is_admin() ? 'regular-text' : 'espresso-textarea-inp';
-		$class = empty( $class ) ? $txt_class : $class;
-		$class .= ! empty( $system_ID ) ? ' ' . $system_ID : '';
-		$extra = apply_filters( 'FHEE__EEH_Form_Fields__additional_form_field_attributes', '' );
+		$class = empty($class) ? $txt_class : $class;
+		$class .= ! empty($system_ID) ? ' '.$system_ID : '';
+		$extra = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
 
-		$label_html = $required_text . "\n\t\t\t" . '<label for="' . $name . '" class="' . $label_class . '">' . self::prep_question( $question ) . $required['label'] . '</label><br/>';
+		$label_html = $required_text."\n\t\t\t".'<label for="'.$name.'" class="'.$label_class.'">'.self::prep_question($question).$required['label'].'</label><br/>';
 		// filter label but ensure required text comes before it
-		$label_html = apply_filters( 'FHEE__EEH_Form_Fields__label_html', $label_html, $required_text );
+		$label_html = apply_filters('FHEE__EEH_Form_Fields__label_html', $label_html, $required_text);
 
-		$input_html = "\n\t\t\t" . '<textarea name="' . $name . '" id="' . $id . '" class="' . $class . ' ' . $required['class'] . '" rows="' . $dimensions['rows'] . '" cols="' . $dimensions['cols'] . '"  title="' . $required['msg'] . '" ' . $disabled . ' ' . $extra . '>' . $answer . '</textarea>';
+		$input_html = "\n\t\t\t".'<textarea name="'.$name.'" id="'.$id.'" class="'.$class.' '.$required['class'].'" rows="'.$dimensions['rows'].'" cols="'.$dimensions['cols'].'"  title="'.$required['msg'].'" '.$disabled.' '.$extra.'>'.$answer.'</textarea>';
 
-		$input_html =  apply_filters( 'FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id );
-		return  $label_html . $input_html;
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
+		return  $label_html.$input_html;
 
 	}
 
@@ -743,47 +743,47 @@ 
 	 * @param string $disabled 		disabled="disabled" or null
 	 * @return string HTML
 	 */
-	static function select( $question = FALSE, $answer = NULL, $options = FALSE, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE, $add_please_select_option = FALSE ) {
+	static function select($question = FALSE, $answer = NULL, $options = FALSE, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE, $add_please_select_option = FALSE) {
 
 		// need these
-		if ( ! $question || ! $name || ! $options || empty( $options ) || ! is_array( $options )) {
+		if ( ! $question || ! $name || ! $options || empty($options) || ! is_array($options)) {
 			return NULL;
 		}
 		// prep the answer
-		$answer = is_array( $answer ) ? self::prep_answer( array_shift( $answer ), $use_html_entities) : self::prep_answer( $answer, $use_html_entities );
+		$answer = is_array($answer) ? self::prep_answer(array_shift($answer), $use_html_entities) : self::prep_answer($answer, $use_html_entities);
 		// prep the required array
-		$required = self::prep_required( $required );
+		$required = self::prep_required($required);
 		// set disabled tag
-		$disabled = $answer === NULL || ! $disabled  ? '' : ' disabled="disabled"';
+		$disabled = $answer === NULL || ! $disabled ? '' : ' disabled="disabled"';
 		// ya gots ta have style man!!!
 		$txt_class = is_admin() ? 'wide' : 'espresso-select-inp';
-		$class = empty( $class ) ? $txt_class : $class;
-		$class .= ! empty( $system_ID ) ? ' ' . $system_ID : '';
-		$extra = apply_filters( 'FHEE__EEH_Form_Fields__additional_form_field_attributes', '' );
+		$class = empty($class) ? $txt_class : $class;
+		$class .= ! empty($system_ID) ? ' '.$system_ID : '';
+		$extra = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
 
-		$label_html = $required_text . "\n\t\t\t" . '<label for="' . $name . '" class="' . $label_class . '">' . self::prep_question( $question ) . $required['label'] . '</label><br/>';
+		$label_html = $required_text."\n\t\t\t".'<label for="'.$name.'" class="'.$label_class.'">'.self::prep_question($question).$required['label'].'</label><br/>';
 		// filter label but ensure required text comes before it
-		$label_html = apply_filters( 'FHEE__EEH_Form_Fields__label_html', $label_html, $required_text );
+		$label_html = apply_filters('FHEE__EEH_Form_Fields__label_html', $label_html, $required_text);
 
-		$input_html = "\n\t\t\t" . '<select name="' . $name . '" id="' . $id . '" class="' . $class . ' ' . $required['class'] . '" title="' . esc_attr( $required['msg'] ) . '"' . $disabled . ' ' . $extra . '>';
+		$input_html = "\n\t\t\t".'<select name="'.$name.'" id="'.$id.'" class="'.$class.' '.$required['class'].'" title="'.esc_attr($required['msg']).'"'.$disabled.' '.$extra.'>';
 		// recursively count array elements, to determine total number of options
-		$only_option = count( $options, 1 ) == 1 ? TRUE : FALSE;
-		if ( ! $only_option ) {
+		$only_option = count($options, 1) == 1 ? TRUE : FALSE;
+		if ( ! $only_option) {
 			// if there is NO answer set and there are multiple options to choose from, then set the "please select" message as selected
 			$selected = $answer === NULL ? ' selected="selected"' : '';
-			$input_html .= $add_please_select_option ? "\n\t\t\t\t" . '<option value=""' . $selected . '>' . __(' - please select - ', 'event_espresso') . '</option>' : '';
+			$input_html .= $add_please_select_option ? "\n\t\t\t\t".'<option value=""'.$selected.'>'.__(' - please select - ', 'event_espresso').'</option>' : '';
 		}
-		foreach ( $options as $key => $value ) {
+		foreach ($options as $key => $value) {
 			// if value is an array, then create option groups, else create regular ol' options
-			$input_html .= is_array( $value ) ? self::_generate_select_option_group( $key, $value, $answer, $use_html_entities ) : self::_generate_select_option( $value->value(), $value->desc(), $answer, $only_option, $use_html_entities );
+			$input_html .= is_array($value) ? self::_generate_select_option_group($key, $value, $answer, $use_html_entities) : self::_generate_select_option($value->value(), $value->desc(), $answer, $only_option, $use_html_entities);
 		}
 
-		$input_html .= "\n\t\t\t" . '</select>';
+		$input_html .= "\n\t\t\t".'</select>';
 
-		$input_html =  apply_filters( 'FHEE__EEH_Form_Fields__select__before_end_wrapper', $input_html, $question, $answer, $name, $id, $class, $system_ID );
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__select__before_end_wrapper', $input_html, $question, $answer, $name, $id, $class, $system_ID);
 
-		$input_html =  apply_filters( 'FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id );
-		return  $label_html . $input_html;
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
+		return  $label_html.$input_html;
 
 	}
 
@@ -801,12 +801,12 @@ 
 	 * @param boolean $use_html_entities
 	 * @return string
 	 */
-	private static function _generate_select_option_group( $opt_group, $QSOs, $answer, $use_html_entities = true ){
-		$html = "\n\t\t\t\t" . '<optgroup label="' . self::prep_option_value( $opt_group ) . '">';
-		foreach ( $QSOs as $QSO ) {
-			$html .= self::_generate_select_option( $QSO->value(), $QSO->desc(), $answer, false, $use_html_entities );
+	private static function _generate_select_option_group($opt_group, $QSOs, $answer, $use_html_entities = true) {
+		$html = "\n\t\t\t\t".'<optgroup label="'.self::prep_option_value($opt_group).'">';
+		foreach ($QSOs as $QSO) {
+			$html .= self::_generate_select_option($QSO->value(), $QSO->desc(), $answer, false, $use_html_entities);
 		}
-		$html .= "\n\t\t\t\t" . '</optgroup>';
+		$html .= "\n\t\t\t\t".'</optgroup>';
 		return $html;
 	}
 
@@ -821,12 +821,12 @@ 
 	 * @param boolean $use_html_entities
 	 * @return string
 	 */
-	private static function _generate_select_option( $key, $value, $answer, $only_option = FALSE, $use_html_entities = true ){
-		$key = self::prep_answer( $key, $use_html_entities );
-		$value = self::prep_answer( $value, $use_html_entities );
-		$value = ! empty( $value ) ? $value : $key;
-		$selected = ( $answer == $key || $only_option ) ? ' selected="selected"' : '';
-		return "\n\t\t\t\t" . '<option value="' . self::prep_option_value( $key ) . '"' . $selected . '> ' . $value . '&nbsp;&nbsp;&nbsp;</option>';
+	private static function _generate_select_option($key, $value, $answer, $only_option = FALSE, $use_html_entities = true) {
+		$key = self::prep_answer($key, $use_html_entities);
+		$value = self::prep_answer($value, $use_html_entities);
+		$value = ! empty($value) ? $value : $key;
+		$selected = ($answer == $key || $only_option) ? ' selected="selected"' : '';
+		return "\n\t\t\t\t".'<option value="'.self::prep_option_value($key).'"'.$selected.'> '.$value.'&nbsp;&nbsp;&nbsp;</option>';
 	}
 
 
@@ -850,56 +850,56 @@ 
 	 * @param bool        $use_desc_4_label
 	 * @return string HTML
 	 */
-	static function radio( $question = FALSE, $answer = NULL, $options = FALSE, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE, $label_b4 = FALSE, $use_desc_4_label = FALSE ) {
+	static function radio($question = FALSE, $answer = NULL, $options = FALSE, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE, $label_b4 = FALSE, $use_desc_4_label = FALSE) {
 		// need these
-		if ( ! $question || ! $name || ! $options || empty( $options ) || ! is_array( $options )) {
+		if ( ! $question || ! $name || ! $options || empty($options) || ! is_array($options)) {
 			return NULL;
 		}
 		// prep the answer
-		$answer = is_array( $answer ) ? '' : self::prep_answer( $answer, $use_html_entities );
+		$answer = is_array($answer) ? '' : self::prep_answer($answer, $use_html_entities);
 		// prep the required array
-		$required = self::prep_required( $required );
+		$required = self::prep_required($required);
 		// set disabled tag
-		$disabled = $answer === NULL || ! $disabled  ? '' : ' disabled="disabled"';
+		$disabled = $answer === NULL || ! $disabled ? '' : ' disabled="disabled"';
 		// ya gots ta have style man!!!
 		$radio_class = is_admin() ? 'ee-admin-radio-lbl' : $label_class;
-		$class = ! empty( $class ) ? $class : 'espresso-radio-btn-inp';
-		$extra = apply_filters( 'FHEE__EEH_Form_Fields__additional_form_field_attributes', '' );
+		$class = ! empty($class) ? $class : 'espresso-radio-btn-inp';
+		$extra = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
 
-		$label_html = $required_text . "\n\t\t\t" . '<label class="' . $label_class . '">' . self::prep_question( $question ) . $required['label'] . '</label> ';
+		$label_html = $required_text."\n\t\t\t".'<label class="'.$label_class.'">'.self::prep_question($question).$required['label'].'</label> ';
 		// filter label but ensure required text comes before it
-		$label_html = apply_filters( 'FHEE__EEH_Form_Fields__label_html', $label_html, $required_text );
+		$label_html = apply_filters('FHEE__EEH_Form_Fields__label_html', $label_html, $required_text);
 
-		$input_html = "\n\t\t\t" . '<ul id="' . $id . '-ul" class="espresso-radio-btn-options-ul ' . $label_class . ' ' . $class . '-ul">';
+		$input_html = "\n\t\t\t".'<ul id="'.$id.'-ul" class="espresso-radio-btn-options-ul '.$label_class.' '.$class.'-ul">';
 
-		$class .= ! empty( $system_ID ) ? ' ' . $system_ID : '';
-		$class .= ! empty( $required['class'] ) ? ' ' . $required['class'] : '';
+		$class .= ! empty($system_ID) ? ' '.$system_ID : '';
+		$class .= ! empty($required['class']) ? ' '.$required['class'] : '';
 
-		foreach ( $options as $OPT ) {
-			if ( $OPT instanceof EE_Question_Option ) {
-				$value = self::prep_option_value( $OPT->value() );
+		foreach ($options as $OPT) {
+			if ($OPT instanceof EE_Question_Option) {
+				$value = self::prep_option_value($OPT->value());
 				$label = $use_desc_4_label ? $OPT->desc() : $OPT->value();
-				$size = $use_desc_4_label ? self::get_label_size_class( $OPT->value() . ' ' . $OPT->desc() ) : self::get_label_size_class( $OPT->value() );
-				$desc = $OPT->desc();//no self::prep_answer
-				$answer = is_numeric( $value ) && empty( $answer ) ? 0 : $answer;
-				$checked = (string)$value == (string)$answer ? ' checked="checked"' : '';
-				$opt = '-' . sanitize_key( $value );
-
-				$input_html .= "\n\t\t\t\t" . '<li' . $size . '>';
-				$input_html .= "\n\t\t\t\t\t" . '<label class="' . $radio_class . ' espresso-radio-btn-lbl">';
-				$input_html .= $label_b4  ? "\n\t\t\t\t\t\t" . '<span>' . $label . '</span>' : '';
-				$input_html .= "\n\t\t\t\t\t\t" . '<input type="radio" name="' . $name . '" id="' . $id . $opt . '" class="' . $class . '" value="' . $value . '" title="' . esc_attr( $required['msg'] ) . '" ' . $disabled . $checked . ' ' . $extra . '/>';
-				$input_html .= ! $label_b4  ? "\n\t\t\t\t\t\t" . '<span class="espresso-radio-btn-desc">' . $label . '</span>' : '';
-				$input_html .= "\n\t\t\t\t\t" . '</label>';
-				$input_html .= $use_desc_4_label ? '' : '<span class="espresso-radio-btn-option-desc small-text grey-text">' . $desc . '</span>';
-				$input_html .= "\n\t\t\t\t" . '</li>';
+				$size = $use_desc_4_label ? self::get_label_size_class($OPT->value().' '.$OPT->desc()) : self::get_label_size_class($OPT->value());
+				$desc = $OPT->desc(); //no self::prep_answer
+				$answer = is_numeric($value) && empty($answer) ? 0 : $answer;
+				$checked = (string) $value == (string) $answer ? ' checked="checked"' : '';
+				$opt = '-'.sanitize_key($value);
+
+				$input_html .= "\n\t\t\t\t".'<li'.$size.'>';
+				$input_html .= "\n\t\t\t\t\t".'<label class="'.$radio_class.' espresso-radio-btn-lbl">';
+				$input_html .= $label_b4 ? "\n\t\t\t\t\t\t".'<span>'.$label.'</span>' : '';
+				$input_html .= "\n\t\t\t\t\t\t".'<input type="radio" name="'.$name.'" id="'.$id.$opt.'" class="'.$class.'" value="'.$value.'" title="'.esc_attr($required['msg']).'" '.$disabled.$checked.' '.$extra.'/>';
+				$input_html .= ! $label_b4 ? "\n\t\t\t\t\t\t".'<span class="espresso-radio-btn-desc">'.$label.'</span>' : '';
+				$input_html .= "\n\t\t\t\t\t".'</label>';
+				$input_html .= $use_desc_4_label ? '' : '<span class="espresso-radio-btn-option-desc small-text grey-text">'.$desc.'</span>';
+				$input_html .= "\n\t\t\t\t".'</li>';
 			}
 		}
 
-		$input_html .= "\n\t\t\t" . '</ul>';
+		$input_html .= "\n\t\t\t".'</ul>';
 
-		$input_html =  apply_filters( 'FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id );
-		return  $label_html . $input_html;
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
+		return  $label_html.$input_html;
 
 	}
 
@@ -922,65 +922,65 @@ 
 	 * @param string $disabled 		disabled="disabled" or null
 	 * @return string HTML
 	 */
-	static function checkbox( $question = FALSE, $answer = NULL, $options = FALSE, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $label_b4 = FALSE, $system_ID = FALSE, $use_html_entities = TRUE ) {
+	static function checkbox($question = FALSE, $answer = NULL, $options = FALSE, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $label_b4 = FALSE, $system_ID = FALSE, $use_html_entities = TRUE) {
 		// need these
-		if ( ! $question || ! $name || ! $options || empty( $options ) || ! is_array( $options )) {
+		if ( ! $question || ! $name || ! $options || empty($options) || ! is_array($options)) {
 			return NULL;
 		}
-		$answer = maybe_unserialize( $answer );
+		$answer = maybe_unserialize($answer);
 
 		// prep the answer(s)
-		$answer = is_array( $answer ) ? $answer : array( sanitize_key( $answer ) => $answer );
+		$answer = is_array($answer) ? $answer : array(sanitize_key($answer) => $answer);
 
-		foreach ( $answer as $key => $value ) {
-			$key = self::prep_option_value( $key );
-			$answer[$key] = self::prep_answer( $value, $use_html_entities );
+		foreach ($answer as $key => $value) {
+			$key = self::prep_option_value($key);
+			$answer[$key] = self::prep_answer($value, $use_html_entities);
 		}
 
 		// prep the required array
-		$required = self::prep_required( $required );
+		$required = self::prep_required($required);
 		// set disabled tag
-		$disabled = $answer === NULL || ! $disabled  ? '' : ' disabled="disabled"';
+		$disabled = $answer === NULL || ! $disabled ? '' : ' disabled="disabled"';
 		// ya gots ta have style man!!!
 		$radio_class = is_admin() ? 'ee-admin-radio-lbl' : $label_class;
-		$class = empty( $class ) ? 'espresso-radio-btn-inp' : $class;
-		$extra = apply_filters( 'FHEE__EEH_Form_Fields__additional_form_field_attributes', '' );
+		$class = empty($class) ? 'espresso-radio-btn-inp' : $class;
+		$extra = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
 
-		$label_html = $required_text . "\n\t\t\t" . '<label class="' . $label_class . '">' . self::prep_question( $question ) . $required['label'] . '</label> ';
+		$label_html = $required_text."\n\t\t\t".'<label class="'.$label_class.'">'.self::prep_question($question).$required['label'].'</label> ';
 		// filter label but ensure required text comes before it
-		$label_html = apply_filters( 'FHEE__EEH_Form_Fields__label_html', $label_html, $required_text );
-
-		$input_html = "\n\t\t\t" . '<ul id="' . $id . '-ul" class="espresso-checkbox-options-ul ' . $label_class . ' ' . $class . '-ul">';
-
-		$class .= ! empty( $system_ID ) ? ' ' . $system_ID : '';
-		$class .= ! empty( $required['class'] ) ? ' ' . $required['class'] : '';
-
-		foreach ( $options as $OPT ) {
-			$value = $OPT->value();//self::prep_option_value( $OPT->value() );
-			$size = self::get_label_size_class(  $OPT->value() . ' ' . $OPT->desc() );
-			$text = self::prep_answer( $OPT->value() );
-			$desc = $OPT->desc() ;
-			$opt = '-' . sanitize_key( $value );
-
-			$checked = is_array( $answer ) && in_array( $text, $answer ) ? ' checked="checked"' : '';
-
-			$input_html .= "\n\t\t\t\t" . '<li' . $size . '>';
-			$input_html .= "\n\t\t\t\t\t" . '<label class="' . $radio_class . ' espresso-checkbox-lbl">';
-			$input_html .= $label_b4  ? "\n\t\t\t\t\t\t" . '<span>' . $text . '</span>' : '';
-			$input_html .= "\n\t\t\t\t\t\t" . '<input type="checkbox" name="' . $name . '[' . $OPT->ID() . ']" id="' . $id . $opt . '" class="' . $class . '" value="' . $value . '" title="' . esc_attr( $required['msg'] ) . '" ' . $disabled . $checked . ' ' . $extra . '/>';
-			$input_html .= ! $label_b4  ? "\n\t\t\t\t\t\t" . '<span>' . $text . '</span>' : '';
- 			$input_html .= "\n\t\t\t\t\t" . '</label>';
-			if ( ! empty( $desc ) && $desc != $text ) {
-	 			$input_html .= "\n\t\t\t\t\t" . ' &nbsp; <br/><div class="espresso-checkbox-option-desc small-text grey-text">' . $desc . '</div>';
+		$label_html = apply_filters('FHEE__EEH_Form_Fields__label_html', $label_html, $required_text);
+
+		$input_html = "\n\t\t\t".'<ul id="'.$id.'-ul" class="espresso-checkbox-options-ul '.$label_class.' '.$class.'-ul">';
+
+		$class .= ! empty($system_ID) ? ' '.$system_ID : '';
+		$class .= ! empty($required['class']) ? ' '.$required['class'] : '';
+
+		foreach ($options as $OPT) {
+			$value = $OPT->value(); //self::prep_option_value( $OPT->value() );
+			$size = self::get_label_size_class($OPT->value().' '.$OPT->desc());
+			$text = self::prep_answer($OPT->value());
+			$desc = $OPT->desc();
+			$opt = '-'.sanitize_key($value);
+
+			$checked = is_array($answer) && in_array($text, $answer) ? ' checked="checked"' : '';
+
+			$input_html .= "\n\t\t\t\t".'<li'.$size.'>';
+			$input_html .= "\n\t\t\t\t\t".'<label class="'.$radio_class.' espresso-checkbox-lbl">';
+			$input_html .= $label_b4 ? "\n\t\t\t\t\t\t".'<span>'.$text.'</span>' : '';
+			$input_html .= "\n\t\t\t\t\t\t".'<input type="checkbox" name="'.$name.'['.$OPT->ID().']" id="'.$id.$opt.'" class="'.$class.'" value="'.$value.'" title="'.esc_attr($required['msg']).'" '.$disabled.$checked.' '.$extra.'/>';
+			$input_html .= ! $label_b4 ? "\n\t\t\t\t\t\t".'<span>'.$text.'</span>' : '';
+ 			$input_html .= "\n\t\t\t\t\t".'</label>';
+			if ( ! empty($desc) && $desc != $text) {
+	 			$input_html .= "\n\t\t\t\t\t".' &nbsp; <br/><div class="espresso-checkbox-option-desc small-text grey-text">'.$desc.'</div>';
 			}
-			$input_html .= "\n\t\t\t\t" . '</li>';
+			$input_html .= "\n\t\t\t\t".'</li>';
 
 		}
 
-		$input_html .= "\n\t\t\t" . '</ul>';
+		$input_html .= "\n\t\t\t".'</ul>';
 
-		$input_html =  apply_filters( 'FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id );
-		return  $label_html . $input_html;
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
+		return  $label_html.$input_html;
 
 	}
 
@@ -1002,36 +1002,36 @@ 
 	 * @param string $disabled 		disabled="disabled" or null
 	 * @return string HTML
 	 */
-	static function datepicker( $question = FALSE, $answer = NULL, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE ) {
+	static function datepicker($question = FALSE, $answer = NULL, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE) {
 		// need these
-		if ( ! $question || ! $name ) {
+		if ( ! $question || ! $name) {
 			return NULL;
 		}
 		// prep the answer
-		$answer = is_array( $answer ) ? '' : self::prep_answer( $answer, $use_html_entities );
+		$answer = is_array($answer) ? '' : self::prep_answer($answer, $use_html_entities);
 		// prep the required array
-		$required = self::prep_required( $required );
+		$required = self::prep_required($required);
 		// set disabled tag
-		$disabled = $answer === NULL || ! $disabled  ? '' : ' disabled="disabled"';
+		$disabled = $answer === NULL || ! $disabled ? '' : ' disabled="disabled"';
 		// ya gots ta have style man!!!
 		$txt_class = is_admin() ? 'regular-text' : 'espresso-datepicker-inp';
-		$class = empty( $class ) ? $txt_class : $class;
-		$class .= ! empty( $system_ID ) ? ' ' . $system_ID : '';
-		$extra = apply_filters( 'FHEE__EEH_Form_Fields__additional_form_field_attributes', '' );
+		$class = empty($class) ? $txt_class : $class;
+		$class .= ! empty($system_ID) ? ' '.$system_ID : '';
+		$extra = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
 
-		$label_html = $required_text . "\n\t\t\t" . '<label for="' . $name . '" class="' . $label_class . '">' . self::prep_question( $question ) . $required['label'] . '</label><br/>';
+		$label_html = $required_text."\n\t\t\t".'<label for="'.$name.'" class="'.$label_class.'">'.self::prep_question($question).$required['label'].'</label><br/>';
 		// filter label but ensure required text comes before it
-		$label_html = apply_filters( 'FHEE__EEH_Form_Fields__label_html', $label_html, $required_text );
+		$label_html = apply_filters('FHEE__EEH_Form_Fields__label_html', $label_html, $required_text);
 
-		$input_html = "\n\t\t\t" . '<input type="text" name="' . $name . '" id="' . $id . '" class="' . $class . ' ' . $required['class'] . ' datepicker" value="' . $answer . '"  title="' . esc_attr( $required['msg'] ) . '" ' . $disabled . ' ' . $extra . '/>';
+		$input_html = "\n\t\t\t".'<input type="text" name="'.$name.'" id="'.$id.'" class="'.$class.' '.$required['class'].' datepicker" value="'.$answer.'"  title="'.esc_attr($required['msg']).'" '.$disabled.' '.$extra.'/>';
 
 		// enqueue scripts
-		wp_register_style( 'espresso-ui-theme', EE_GLOBAL_ASSETS_URL . 'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_style( 'espresso-ui-theme');
-		wp_enqueue_script( 'jquery-ui-datepicker' );
+		wp_register_style('espresso-ui-theme', EE_GLOBAL_ASSETS_URL.'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('espresso-ui-theme');
+		wp_enqueue_script('jquery-ui-datepicker');
 
-		$input_html =  apply_filters( 'FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id );
-		return  $label_html . $input_html;
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
+		return  $label_html.$input_html;
 
 	}
 
@@ -1043,7 +1043,7 @@ 
 	 * 	@access public
 	 * 	@return 	string
 	 */
-	public static function remove_label_keep_required_msg( $label_html, $required_text ) {
+	public static function remove_label_keep_required_msg($label_html, $required_text) {
 		return $required_text;
 	}
 
@@ -1057,9 +1057,9 @@ 
 	 * @param string $value
 	 * @return string HTML
 	 */
-	static function hidden_input( $name, $value, $id = '' ){
-		$id = ! empty( $id ) ? $id : $name;
-		return '<input id="' . $id . '" type="hidden" name="'.$name.'" value="' .  $value . '"/>';
+	static function hidden_input($name, $value, $id = '') {
+		$id = ! empty($id) ? $id : $name;
+		return '<input id="'.$id.'" type="hidden" name="'.$name.'" value="'.$value.'"/>';
 	}
 
 
@@ -1071,7 +1071,7 @@ 
 	 * @param string $question
 	 * @return string
 	 */
-	static function prep_question( $question ){
+	static function prep_question($question) {
 		return $question;
 //		$link = '';
 //		// does this label have a help link attached ?
@@ -1094,13 +1094,13 @@ 
 	 * @param mixed $answer
 	 * @return string
 	 */
-	static function prep_answer( $answer, $use_html_entities = TRUE ){
+	static function prep_answer($answer, $use_html_entities = TRUE) {
 		//make sure we convert bools first.  Otherwise (bool) false becomes an empty string which is NOT desired, we want "0".
-		if ( is_bool( $answer ) ) {
+		if (is_bool($answer)) {
 			$answer = $answer ? 1 : 0;
 		}
-		$answer = trim( stripslashes( str_replace( '&#039;', "'", $answer )));
-		return $use_html_entities ? htmlentities( $answer, ENT_QUOTES, 'UTF-8' ) : $answer;
+		$answer = trim(stripslashes(str_replace('&#039;', "'", $answer)));
+		return $use_html_entities ? htmlentities($answer, ENT_QUOTES, 'UTF-8') : $answer;
 	}
 
 
@@ -1110,18 +1110,18 @@ 
 	 * 	@param array $QSOs  array of EE_Question_Option objects
 	 * 	@return array
 	 */
-	public static function prep_answer_options( $QSOs = array() ){
+	public static function prep_answer_options($QSOs = array()) {
 		$prepped_answer_options = array();
-		if ( is_array( $QSOs ) && ! empty( $QSOs )) {
-			foreach( $QSOs as $key => $QSO ) {
-				if ( ! $QSO instanceof EE_Question_Option ) {
-					$QSO = EE_Question_Option::new_instance( array(
-						'QSO_value' => is_array( $QSO ) && isset( $QSO['id'] ) ? (string)$QSO['id'] : (string)$key,
-						'QSO_desc' => is_array( $QSO ) && isset( $QSO['text'] ) ? (string)$QSO['text'] : (string)$QSO
+		if (is_array($QSOs) && ! empty($QSOs)) {
+			foreach ($QSOs as $key => $QSO) {
+				if ( ! $QSO instanceof EE_Question_Option) {
+					$QSO = EE_Question_Option::new_instance(array(
+						'QSO_value' => is_array($QSO) && isset($QSO['id']) ? (string) $QSO['id'] : (string) $key,
+						'QSO_desc' => is_array($QSO) && isset($QSO['text']) ? (string) $QSO['text'] : (string) $QSO
 					));
 				}
-				if ( $QSO->opt_group() ) {
-					$prepped_answer_options[ $QSO->opt_group() ][] = $QSO;
+				if ($QSO->opt_group()) {
+					$prepped_answer_options[$QSO->opt_group()][] = $QSO;
 				} else {
 					$prepped_answer_options[] = $QSO;
 				}
@@ -1137,8 +1137,8 @@ 
 	 * @param string $option_value
 	 * @return string
 	 */
-	static function prep_option_value( $option_value ){
-		return esc_attr( trim( stripslashes( $option_value ) ) );
+	static function prep_option_value($option_value) {
+		return esc_attr(trim(stripslashes($option_value)));
 	}
 
 
@@ -1149,11 +1149,11 @@ 
 	 * @param string|array 	$required
 	 * @return array
 	 */
-	static function prep_required( $required = array() ){
+	static function prep_required($required = array()) {
 		// make sure required is an array
-		$required = is_array( $required ) ? $required : array();
+		$required = is_array($required) ? $required : array();
 		// and set some defaults
-		$required = array_merge( array( 'label' => '', 'class' => '', 'msg' => '' ), $required );
+		$required = array_merge(array('label' => '', 'class' => '', 'msg' => ''), $required);
 		return $required;
 	}
 
@@ -1164,30 +1164,30 @@ 
 	 * @param string 	$value
 	 * @return string
 	 */
-	static function get_label_size_class( $value = FALSE ){
-			if ( $value === FALSE || $value == '' ) {
+	static function get_label_size_class($value = FALSE) {
+			if ($value === FALSE || $value == '') {
 				return ' class="medium-lbl"';
 			}
 			// determine length of option value
-			$val_size = strlen( $value );
-			switch( $val_size ){
+			$val_size = strlen($value);
+			switch ($val_size) {
 				case $val_size < 3 :
-					$size =  ' class="nano-lbl"';
+					$size = ' class="nano-lbl"';
 					break;
 				case $val_size < 6 :
-					$size =  ' class="micro-lbl"';
+					$size = ' class="micro-lbl"';
 					break;
 				case $val_size < 12 :
-					$size =  ' class="tiny-lbl"';
+					$size = ' class="tiny-lbl"';
 					break;
 				case $val_size < 25 :
-					$size =  ' class="small-lbl"';
+					$size = ' class="small-lbl"';
 					break;
 				case $val_size > 100 :
-					$size =  ' class="big-lbl"';
+					$size = ' class="big-lbl"';
 					break;
 				default:
-					$size =  ' class="medium-lbl"';
+					$size = ' class="medium-lbl"';
 					break;
 			}
 		return $size;
@@ -1201,20 +1201,20 @@ 
 	 * @param array 	$QFI
 	 * @return array
 	 */
-	private static function _load_system_dropdowns( $QFI ){
+	private static function _load_system_dropdowns($QFI) {
 		$QST_system = $QFI->get('QST_system');
-		switch ( $QST_system ) {
+		switch ($QST_system) {
 			case 'state' :
-				$QFI = self::generate_state_dropdown( $QFI );
+				$QFI = self::generate_state_dropdown($QFI);
 				break;
 			case 'country' :
-				$QFI = self::generate_country_dropdown( $QFI );
+				$QFI = self::generate_country_dropdown($QFI);
 				break;
 			case 'admin-state' :
-				$QFI = self::generate_state_dropdown( $QFI, TRUE );
+				$QFI = self::generate_state_dropdown($QFI, TRUE);
 				break;
 			case 'admin-country' :
-				$QFI = self::generate_country_dropdown( $QFI, TRUE );
+				$QFI = self::generate_country_dropdown($QFI, TRUE);
 				break;
 		}
 		return $QFI;
@@ -1231,13 +1231,13 @@ 
 	 *
 	 * @return EE_Question_Form_Input
 	 */
-	protected static function _load_specialized_dropdowns( $QFI ) {
-		switch( $QFI->get( 'QST_type' ) ) {
+	protected static function _load_specialized_dropdowns($QFI) {
+		switch ($QFI->get('QST_type')) {
 			case 'STATE' :
-				$QFI = self::generate_state_dropdown( $QFI );
+				$QFI = self::generate_state_dropdown($QFI);
 				break;
 			case 'COUNTRY' :
-				$QFI = self::generate_country_dropdown( $QFI );
+				$QFI = self::generate_country_dropdown($QFI);
 				break;
 		}
 		return $QFI;
@@ -1251,23 +1251,23 @@ 
 	 * @param bool  $get_all
 	 * @return array
 	 */
-	public static function generate_state_dropdown( $QST, $get_all = FALSE ){
+	public static function generate_state_dropdown($QST, $get_all = FALSE) {
 		$states = $get_all ? EEM_State::instance()->get_all_states() : EEM_State::instance()->get_all_states_of_active_countries();
-		if ( $states && count( $states ) != count( $QST->options() )) {
-			$QST->set( 'QST_type', 'DROPDOWN' );
+		if ($states && count($states) != count($QST->options())) {
+			$QST->set('QST_type', 'DROPDOWN');
 			// if multiple countries, we'll create option groups within the dropdown
-			foreach ( $states as $state ) {
-				if ( $state instanceof EE_State ) {
-					$QSO = EE_Question_Option::new_instance ( array (
+			foreach ($states as $state) {
+				if ($state instanceof EE_State) {
+					$QSO = EE_Question_Option::new_instance(array(
 						'QSO_value' => $state->ID(),
 						'QSO_desc' => $state->name(),
-						'QST_ID' => $QST->get( 'QST_ID' ),
+						'QST_ID' => $QST->get('QST_ID'),
 						'QSO_deleted' => FALSE
 					));
 					// set option group
-					$QSO->set_opt_group( $state->country()->name() );
+					$QSO->set_opt_group($state->country()->name());
 					// add option to question
-					$QST->add_temp_option( $QSO );
+					$QST->add_temp_option($QSO);
 				}
 			}
 		}
@@ -1283,20 +1283,20 @@ 
 	 * @internal param array $question
 	 * @return array
 	 */
-	public static function generate_country_dropdown( $QST, $get_all = FALSE ){
+	public static function generate_country_dropdown($QST, $get_all = FALSE) {
 		$countries = $get_all ? EEM_Country::instance()->get_all_countries() : EEM_Country::instance()->get_all_active_countries();
-		if ( $countries && count( $countries ) != count( $QST->options() ) ) {
-			$QST->set( 'QST_type', 'DROPDOWN' );
+		if ($countries && count($countries) != count($QST->options())) {
+			$QST->set('QST_type', 'DROPDOWN');
 			// now add countries
-			foreach ( $countries as $country ) {
-				if ( $country instanceof EE_Country ) {
-					$QSO = EE_Question_Option::new_instance ( array (
+			foreach ($countries as $country) {
+				if ($country instanceof EE_Country) {
+					$QSO = EE_Question_Option::new_instance(array(
 						'QSO_value' => $country->ID(),
 						'QSO_desc' => $country->name(),
-						'QST_ID' => $QST->get( 'QST_ID' ),
+						'QST_ID' => $QST->get('QST_ID'),
 						'QSO_deleted' => FALSE
 					));
-					$QST->add_temp_option( $QSO );
+					$QST->add_temp_option($QSO);
 				}
 			}
 		}
@@ -1313,11 +1313,11 @@ 
 	 */
 	public static function two_digit_months_dropdown_options() {
 		$options = array();
-		for ( $x = 1; $x <= 12; $x++ ) {
-			$mm = str_pad( $x, 2, '0', STR_PAD_LEFT );
-			$options[ (string)$mm ] = (string)$mm;
+		for ($x = 1; $x <= 12; $x++) {
+			$mm = str_pad($x, 2, '0', STR_PAD_LEFT);
+			$options[(string) $mm] = (string) $mm;
 		}
-		return EEH_Form_Fields::prep_answer_options( $options );
+		return EEH_Form_Fields::prep_answer_options($options);
 	}
 
 
@@ -1332,11 +1332,11 @@ 
 		$options = array();
 		$current_year = date('y');
 		$next_decade = $current_year + 10;
-		for ( $x = $current_year; $x <= $next_decade; $x++ ) {
-			$yy = str_pad( $x, 2, '0', STR_PAD_LEFT );
-			$options[ (string)$yy ] = (string)$yy;
+		for ($x = $current_year; $x <= $next_decade; $x++) {
+			$yy = str_pad($x, 2, '0', STR_PAD_LEFT);
+			$options[(string) $yy] = (string) $yy;
 		}
-		return EEH_Form_Fields::prep_answer_options( $options );
+		return EEH_Form_Fields::prep_answer_options($options);
 	}
 
 
@@ -1350,17 +1350,17 @@ 
 	 * @param  integer $evt_category Event Category ID if the Event Category filter is selected
 	 * @return string                html
 	 */
-	public static function generate_registration_months_dropdown( $cur_date = '', $status = '', $evt_category = 0 ) {
+	public static function generate_registration_months_dropdown($cur_date = '', $status = '', $evt_category = 0) {
 		$_where = array();
-		if ( !empty( $status ) ) {
+		if ( ! empty($status)) {
 			$_where['STS_ID'] = $status;
 		}
 
-		if ( $evt_category > 0 ) {
+		if ($evt_category > 0) {
 			$_where['Event.Term_Taxonomy.term_id'] = $evt_category;
 		}
 
-		$regdtts = EEM_Registration::instance()->get_reg_months_and_years( $_where );
+		$regdtts = EEM_Registration::instance()->get_reg_months_and_years($_where);
 
 		//setup vals for select input helper
 		$options = array(
@@ -1370,15 +1370,15 @@ 
 				)
 			);
 
-		foreach ( $regdtts as $regdtt ) {
-			$date = $regdtt->reg_month. ' ' . $regdtt->reg_year;
+		foreach ($regdtts as $regdtt) {
+			$date = $regdtt->reg_month.' '.$regdtt->reg_year;
 			$options[] = array(
 				'text' => $date,
 				'id' => $date
 				);
 		}
 
-		return self::select_input('month_range', $options, $cur_date, '', 'wide' );
+		return self::select_input('month_range', $options, $cur_date, '', 'wide');
 	}
 
 
@@ -1392,18 +1392,18 @@ 
 	 * @param  string $evt_active_status "upcoming", "expired", "active", or "inactive"
 	 * @return string                    html
 	 */
-	public static function generate_event_months_dropdown( $cur_date = '', $status = NULL, $evt_category = NULL, $evt_active_status = NULL ) {
+	public static function generate_event_months_dropdown($cur_date = '', $status = NULL, $evt_category = NULL, $evt_active_status = NULL) {
 		//determine what post_status our condition will have for the query.
-		switch ( $status ) {
+		switch ($status) {
 			case 'month' :
 			case 'today' :
 			case NULL :
 			case 'all' :
-				$where['Event.status'] = array( 'NOT IN', array('trash') );
+				$where['Event.status'] = array('NOT IN', array('trash'));
 				break;
 
 			case 'draft' :
-				$where['Event.status'] = array( 'IN', array('draft', 'auto-draft') );
+				$where['Event.status'] = array('IN', array('draft', 'auto-draft'));
 
 			default :
 				$where['Event.status'] = $status;
@@ -1412,7 +1412,7 @@ 
 		//categories?
 
 
-		if ( !empty ( $evt_category ) ) {
+		if ( ! empty ($evt_category)) {
 			$where['Event.Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
 			$where['Event.Term_Taxonomy.term_id'] = $evt_category;
 		}
@@ -1420,7 +1420,7 @@ 
 
 //		$where['DTT_is_primary'] = 1;
 
-		$DTTS = EE_Registry::instance()->load_model('Datetime')->get_dtt_months_and_years($where, $evt_active_status );
+		$DTTS = EE_Registry::instance()->load_model('Datetime')->get_dtt_months_and_years($where, $evt_active_status);
 
 		//let's setup vals for select input helper
 		$options = array(
@@ -1435,9 +1435,9 @@ 
 		//translate month and date
 		global $wp_locale;
 
-		foreach ( $DTTS as $DTT ) {
-			$localized_date = $wp_locale->get_month( $DTT->dtt_month_num ) . ' ' . $DTT->dtt_year;
-			$id = $DTT->dtt_month . ' ' . $DTT->dtt_year;
+		foreach ($DTTS as $DTT) {
+			$localized_date = $wp_locale->get_month($DTT->dtt_month_num).' '.$DTT->dtt_year;
+			$id = $DTT->dtt_month.' '.$DTT->dtt_year;
 			$options[] = array(
 				'text' => $localized_date,
 				'id' => $id
@@ -1445,7 +1445,7 @@ 
 		}
 
 
-		return self::select_input( 'month_range', $options, $cur_date, '', 'wide' );
+		return self::select_input('month_range', $options, $cur_date, '', 'wide');
 	}
 
 
@@ -1456,7 +1456,7 @@ 
 	 * @param  integer $current_cat currently selected category
 	 * @return string               html for dropdown
 	 */
-	public static function generate_event_category_dropdown( $current_cat = -1 ) {
+	public static function generate_event_category_dropdown($current_cat = -1) {
 		$categories = EEM_Term::instance()->get_all_ee_categories(TRUE);
 		$options = array(
 			'0' => array(
@@ -1466,14 +1466,14 @@ 
 			);
 
 		//setup categories for dropdown
-		foreach ( $categories as $category ) {
+		foreach ($categories as $category) {
 			$options[] = array(
 				'text' => $category->get('name'),
 				'id' => $category->ID()
 				);
 		}
 
-		return self::select_input( 'EVT_CAT', $options, $current_cat );
+		return self::select_input('EVT_CAT', $options, $current_cat);
 	}
 
 
@@ -1492,20 +1492,20 @@ 
 	 * @param    string   $extra_attributes - any extra attributes that need to be attached to the form input
 	 * @return    void
 	 */
-	public static function submit_button( $url = '', $ID = '', $class = '', $text = '', $nonce_action = '', $input_only = FALSE, $extra_attributes = '' ) {
+	public static function submit_button($url = '', $ID = '', $class = '', $text = '', $nonce_action = '', $input_only = FALSE, $extra_attributes = '') {
 		$btn = '';
-		if ( empty( $url ) || empty( $ID )) {
+		if (empty($url) || empty($ID)) {
 			return $btn;
 		}
-		$text = ! empty( $text ) ? $text : __('Submit', 'event_espresso' );
-		$btn .= '<input id="' . $ID . '-btn" class="' . $class . '" type="submit" value="' . $text . '" ' . $extra_attributes . '/>';
-		if ( ! $input_only ) {
-			$btn_frm = '<form id="' . $ID . '-frm" method="POST" action="' . $url . '">';
-			$btn_frm .= ! empty( $nonce_action ) ? wp_nonce_field( $nonce_action, $nonce_action . '_nonce', TRUE, FALSE ) : '';
+		$text = ! empty($text) ? $text : __('Submit', 'event_espresso');
+		$btn .= '<input id="'.$ID.'-btn" class="'.$class.'" type="submit" value="'.$text.'" '.$extra_attributes.'/>';
+		if ( ! $input_only) {
+			$btn_frm = '<form id="'.$ID.'-frm" method="POST" action="'.$url.'">';
+			$btn_frm .= ! empty($nonce_action) ? wp_nonce_field($nonce_action, $nonce_action.'_nonce', TRUE, FALSE) : '';
 			$btn_frm .= $btn;
 			$btn_frm .= '</form>';
 			$btn = $btn_frm;
-			unset ( $btn_frm );
+			unset ($btn_frm);
 		}
 		return $btn;
 	}

core/helpers/EEH_Qtip_Loader.helper.php

Doc Comments +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
 	 * - registers and enqueues the qtip scripts and styles.
 	 *
 	 * @access public
-	 * @param  array  $paths      Array of paths to check for the EE_Qtip class. If present we check these path(s) first.  If not present (empty array), then it's assumed it's either in core/libraries/qtips OR the file is already loaded.
+	 * @param  string[]  $paths      Array of paths to check for the EE_Qtip class. If present we check these path(s) first.  If not present (empty array), then it's assumed it's either in core/libraries/qtips OR the file is already loaded.
 	 * @param  string|array $configname name of the Qtip class (full class name is expected and will be used for looking for file, Qtip config classes must extend EE_Qtip_Config) [if this is an array, then we loop through the array to instantiate and setup the qtips]
 	 * @return void
 	 */

Spacing +44 added lines, -44 removed lines

@@ -32,7 +32,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EEH_Qtip_Loader )) {
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EEH_Qtip_Loader)) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -48,8 +48,8 @@ 
 	 */
 	private function __construct() {
 		//let's just make sure this is instantiated in the right place.
-		if ( did_action( 'wp_print_styles' ) || did_action( 'admin_head' )) {
-			EE_Error::doing_it_wrong( 'EEH_Qtip_Loader', __('This helper must be instantiated before or within a callback for the WordPress wp_enqueue_scripts hook action hook.', 'event_espresso' ), '4.1' );
+		if (did_action('wp_print_styles') || did_action('admin_head')) {
+			EE_Error::doing_it_wrong('EEH_Qtip_Loader', __('This helper must be instantiated before or within a callback for the WordPress wp_enqueue_scripts hook action hook.', 'event_espresso'), '4.1');
 		}
 	}
 
@@ -61,27 +61,27 @@ 
 	 * @return void
 	 */
 	public function register_and_enqueue() {
-		$qtips_js = !defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.js' : EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.js';
-		$qtip_images_loaded = EE_THIRD_PARTY_URL . 'qtip/imagesloaded.pkg.min.js';
-		$qtip_map = EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.map';
-		$qtipcss = !defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.css' : EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.css';
+		$qtips_js = ! defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL.'qtip/jquery.qtip.min.js' : EE_THIRD_PARTY_URL.'qtip/jquery.qtip.js';
+		$qtip_images_loaded = EE_THIRD_PARTY_URL.'qtip/imagesloaded.pkg.min.js';
+		$qtip_map = EE_THIRD_PARTY_URL.'qtip/jquery.qtip.min.map';
+		$qtipcss = ! defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL.'qtip/jquery.qtip.min.css' : EE_THIRD_PARTY_URL.'qtip/jquery.qtip.css';
 
-		wp_register_script('qtip-map', $qtip_map, array(), '3', TRUE );
-		wp_register_script('qtip-images-loaded', $qtip_images_loaded, array(), '2.2.0', TRUE );
-		wp_register_script('qtip', $qtips_js, array('jquery'), '2.2.0', TRUE );
-		wp_register_script('ee-qtip-helper', EE_HELPERS_ASSETS . 'ee-qtip-helper.js', array('qtip', 'jquery-cookie'), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_register_script('qtip-map', $qtip_map, array(), '3', TRUE);
+		wp_register_script('qtip-images-loaded', $qtip_images_loaded, array(), '2.2.0', TRUE);
+		wp_register_script('qtip', $qtips_js, array('jquery'), '2.2.0', TRUE);
+		wp_register_script('ee-qtip-helper', EE_HELPERS_ASSETS.'ee-qtip-helper.js', array('qtip', 'jquery-cookie'), EVENT_ESPRESSO_VERSION, TRUE);
 
-		wp_register_style('qtip-css', $qtipcss, array(), '2.2' );
+		wp_register_style('qtip-css', $qtipcss, array(), '2.2');
 
 		//k now let's see if there are any registered qtips.  If there are, then we need to setup the localized script for ee-qtip-helper.js (and enqueue ee-qtip-helper.js of course!)
-		if ( !empty( $this->_qtips ) ) {
+		if ( ! empty($this->_qtips)) {
 			wp_enqueue_script('ee-qtip-helper');
 			wp_enqueue_style('qtip-css');
 			$qtips = array();
-			foreach ( $this->_qtips as $qtip ) {
+			foreach ($this->_qtips as $qtip) {
 				$qts = $qtip->get_tips();
-				foreach ( $qts as $qt ) {
-					if ( ! $qt instanceof EE_Qtip )
+				foreach ($qts as $qt) {
+					if ( ! $qt instanceof EE_Qtip)
 						continue;
 					$qtips[] = array(
 						'content_id' => $qt->content_id,
@@ -90,8 +90,8 @@ 
 						);
 				}
 			}
-			if ( !empty($qtips) )
-				wp_localize_script('ee-qtip-helper', 'EE_QTIP_HELPER', array( 'qtips' => $qtips ) );
+			if ( ! empty($qtips))
+				wp_localize_script('ee-qtip-helper', 'EE_QTIP_HELPER', array('qtips' => $qtips));
 
 		} else {
 			//qtips has been requested without any registration (so assuming its just directly used in the admin).
@@ -113,24 +113,24 @@ 
 	 * @param  string|array $configname name of the Qtip class (full class name is expected and will be used for looking for file, Qtip config classes must extend EE_Qtip_Config) [if this is an array, then we loop through the array to instantiate and setup the qtips]
 	 * @return void
 	 */
-	public function register( $configname, $paths = array() ) {
+	public function register($configname, $paths = array()) {
 
 		//let's just make sure this is instantiated in the right place.
-		if ( did_action('wp_enqueue_scripts') || did_action('admin_enqueue_scripts') ) {
-			EE_Error::doing_it_wrong( 'EEH_Qtip_Loader->register()', __('EE_Qtip_Config objects must be registered before wp_enqueue_scripts is called.', 'event_espresso' ), '4.1' );
+		if (did_action('wp_enqueue_scripts') || did_action('admin_enqueue_scripts')) {
+			EE_Error::doing_it_wrong('EEH_Qtip_Loader->register()', __('EE_Qtip_Config objects must be registered before wp_enqueue_scripts is called.', 'event_espresso'), '4.1');
 		}
 
 		$configname = (array) $configname; //typecast to array
-		foreach ( $configname as $config ) {
-			$this->_register( $config, $paths );
+		foreach ($configname as $config) {
+			$this->_register($config, $paths);
 		}
 
 		//hook into appropriate footer
 		$footer_action = is_admin() ? 'admin_footer' : 'wp_footer';
-		add_action($footer_action, array($this, 'setup_qtip'), 10 );
+		add_action($footer_action, array($this, 'setup_qtip'), 10);
 
 		//make sure we "turn on" qtip js.
-		add_filter('FHEE_load_qtip', '__return_true' );
+		add_filter('FHEE_load_qtip', '__return_true');
 	}
 
 
@@ -144,15 +144,15 @@ 
 	 * @throws EE_Error
 	 * @return void
 	 */
-	private function _register( $config, $paths ) {
+	private function _register($config, $paths) {
 		//before doing anything we have to make sure that EE_Qtip_Config parent is required.
-		EE_Registry::instance()->load_lib( 'Qtip_Config', array(), TRUE );
+		EE_Registry::instance()->load_lib('Qtip_Config', array(), TRUE);
 
-		if ( !empty( $paths ) ) {
+		if ( ! empty($paths)) {
 			$paths = (array) $paths;
-			foreach ( $paths as $path ) {
-				$path = $path . $config . '.lib.php';
-				if ( !is_readable($path ) ) {
+			foreach ($paths as $path) {
+				$path = $path.$config.'.lib.php';
+				if ( ! is_readable($path)) {
 					continue;
 				} else {
 					require_once $path;
@@ -161,26 +161,26 @@ 
 		}
 
 		//does class exist at this point?  If it does then let's instantiate.  If it doesn't then let's continue with other paths.
-		if ( !class_exists($config) ) {
-			$path = EE_LIBRARIES . 'qtips/' . $config . '.lib.php';
-			if ( !is_readable($path ) ) {
-				throw new EE_Error( sprintf( __('Unable to load the Qtip Config registered for this page (%s) because none of the file paths attempted are readable.  Please check the spelling of the paths you\'ve used in the registration', 'event_espresso'), $config ) );
+		if ( ! class_exists($config)) {
+			$path = EE_LIBRARIES.'qtips/'.$config.'.lib.php';
+			if ( ! is_readable($path)) {
+				throw new EE_Error(sprintf(__('Unable to load the Qtip Config registered for this page (%s) because none of the file paths attempted are readable.  Please check the spelling of the paths you\'ve used in the registration', 'event_espresso'), $config));
 			} else {
 				require_once $path;
 			}
 		}
 
 		//now we attempt a class_exists one more time.
-		if ( !class_exists( $config ) )
-			throw new EE_Error( sprintf( __('The Qtip_Config class being registered (%s) does not exist, please check the spelling.', 'event_espresso'), $config ) );
+		if ( ! class_exists($config))
+			throw new EE_Error(sprintf(__('The Qtip_Config class being registered (%s) does not exist, please check the spelling.', 'event_espresso'), $config));
 
 		//made it HERE?  FINALLY, let's get things setup.
 		$a = new ReflectionClass($config);
 		$qtip = $a->newInstance();
 
 		//verify that $qtip is a valid object
-		if ( ! $qtip instanceof EE_Qtip_Config )
-			throw new EE_Error( sprintf( __( 'The class given for the Qtip loader (%s) is not a child of the <strong>EE_Qtip_Config</strong> class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config ) );
+		if ( ! $qtip instanceof EE_Qtip_Config)
+			throw new EE_Error(sprintf(__('The class given for the Qtip loader (%s) is not a child of the <strong>EE_Qtip_Config</strong> class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config));
 
 		$this->_qtips[] = $a->newInstance();
 
@@ -196,12 +196,12 @@ 
 	 * @return void
 	 */
 	public function setup_qtip() {
-		if ( empty( $this->_qtips ) )
+		if (empty($this->_qtips))
 			return; //no qtips!
 
 		$content = array();
 
-		foreach ( $this->_qtips as $qtip ) {
+		foreach ($this->_qtips as $qtip) {
 			$content[] = $this->_generate_content_container($qtip);
 		}
 
@@ -218,10 +218,10 @@ 
 	private function _generate_content_container($qtip) {
 		$qts = $qtip->get_tips();
 		$content = array();
-		foreach ( $qts as $qt ) {
-			if ( ! $qt instanceof EE_Qtip )
+		foreach ($qts as $qt) {
+			if ( ! $qt instanceof EE_Qtip)
 				continue;
-			$content[] = '<div class="ee-qtip-helper-content hidden" id="' . $qt->content_id . '">' . $qt->content . '</div>';
+			$content[] = '<div class="ee-qtip-helper-content hidden" id="'.$qt->content_id.'">'.$qt->content.'</div>';
 		}
 
 		return implode('<br />', $content);

Braces +19 added lines, -12 removed lines

@@ -81,8 +81,9 @@ 
 			foreach ( $this->_qtips as $qtip ) {
 				$qts = $qtip->get_tips();
 				foreach ( $qts as $qt ) {
-					if ( ! $qt instanceof EE_Qtip )
-						continue;
+					if ( ! $qt instanceof EE_Qtip ) {
+											continue;
+					}
 					$qtips[] = array(
 						'content_id' => $qt->content_id,
 						'options' => $qt->options,
@@ -90,8 +91,9 @@ 
 						);
 				}
 			}
-			if ( !empty($qtips) )
-				wp_localize_script('ee-qtip-helper', 'EE_QTIP_HELPER', array( 'qtips' => $qtips ) );
+			if ( !empty($qtips) ) {
+							wp_localize_script('ee-qtip-helper', 'EE_QTIP_HELPER', array( 'qtips' => $qtips ) );
+			}
 
 		} else {
 			//qtips has been requested without any registration (so assuming its just directly used in the admin).
@@ -171,16 +173,18 @@ 
 		}
 
 		//now we attempt a class_exists one more time.
-		if ( !class_exists( $config ) )
-			throw new EE_Error( sprintf( __('The Qtip_Config class being registered (%s) does not exist, please check the spelling.', 'event_espresso'), $config ) );
+		if ( !class_exists( $config ) ) {
+					throw new EE_Error( sprintf( __('The Qtip_Config class being registered (%s) does not exist, please check the spelling.', 'event_espresso'), $config ) );
+		}
 
 		//made it HERE?  FINALLY, let's get things setup.
 		$a = new ReflectionClass($config);
 		$qtip = $a->newInstance();
 
 		//verify that $qtip is a valid object
-		if ( ! $qtip instanceof EE_Qtip_Config )
-			throw new EE_Error( sprintf( __( 'The class given for the Qtip loader (%s) is not a child of the <strong>EE_Qtip_Config</strong> class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config ) );
+		if ( ! $qtip instanceof EE_Qtip_Config ) {
+					throw new EE_Error( sprintf( __( 'The class given for the Qtip loader (%s) is not a child of the <strong>EE_Qtip_Config</strong> class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config ) );
+		}
 
 		$this->_qtips[] = $a->newInstance();
 
@@ -196,8 +200,10 @@ 
 	 * @return void
 	 */
 	public function setup_qtip() {
-		if ( empty( $this->_qtips ) )
-			return; //no qtips!
+		if ( empty( $this->_qtips ) ) {
+					return;
+		}
+		//no qtips!
 
 		$content = array();
 
@@ -219,8 +225,9 @@ 
 		$qts = $qtip->get_tips();
 		$content = array();
 		foreach ( $qts as $qt ) {
-			if ( ! $qt instanceof EE_Qtip )
-				continue;
+			if ( ! $qt instanceof EE_Qtip ) {
+							continue;
+			}
 			$content[] = '<div class="ee-qtip-helper-content hidden" id="' . $qt->content_id . '">' . $qt->content . '</div>';
 		}
 

core/helpers/EEH_Template_Validator.helper.php

Doc Comments +2 added lines, -2 removed lines

@@ -131,7 +131,7 @@ 
 	/**
 	 * For verifying that a variable is indeed an array, else throw an EE_Error
 	 * @param type $variable_to_test
-	 * @param type $variable_name
+	 * @param string $variable_name
 	 * @param type $allow_empty one of 'allow_empty' or 'do_not_allow_empty'
 	 * @return void
 	 * @throws EE_Error
@@ -159,7 +159,7 @@ 
 	 * for verifying that a variable is one of the string optiosn supplied
 	 * @param mixed $variable_to_test
 	 * @param mixed $variable_name the name you've given the variable. Eg, '$foo'. THis helps in producing better error messages
-	 * @param array $string_options an array of acceptable values
+	 * @param string[] $string_options an array of acceptable values
 	 * @return void
 	 * @throws EE_Error
 	 */

Spacing +39 added lines, -39 removed lines

@@ -50,14 +50,14 @@ 
 	 * @return void
 	 * @throws EE_Error (indirectly)
 	 */
-	static function verify_is_array_of($variable_to_test,$name_of_variable,$class_name,$allow_null='allow_null'){
-		if(!WP_DEBUG)return;
-		self::verify_argument_is_one_of($allow_null, 'allow_null', array('allow_null','do_not_allow_null'));
-		if('allow_null' == $allow_null && is_null($variable_to_test)){
+	static function verify_is_array_of($variable_to_test, $name_of_variable, $class_name, $allow_null = 'allow_null') {
+		if ( ! WP_DEBUG)return;
+		self::verify_argument_is_one_of($allow_null, 'allow_null', array('allow_null', 'do_not_allow_null'));
+		if ('allow_null' == $allow_null && is_null($variable_to_test)) {
 			return;
 		}
 		self::verify_is_array($variable_to_test, $name_of_variable);
-		foreach($variable_to_test as $key=>$array_element){
+		foreach ($variable_to_test as $key=>$array_element) {
 			self::verify_instanceof($array_element, $key, $class_name);
 		}
 	}
@@ -73,12 +73,12 @@ 
 	 * @return void
 	 * @throws EE_Error
 	 */
-	static function verify_isnt_null($variable_to_test,$name_of_variable){
-		if(!WP_DEBUG)return;
-		if($variable_to_test==null && $variable_to_test!=0 && $variable_to_test!=FALSE){
-			$error[]=__('Variable named %s is null.','event_espresso');
-			$error[]=__("Consider looking at the stack trace to see why it wasn't set.",'event_espresso');
-			throw new EE_Error(sprintf(implode(",",$error),$name_of_variable,$name_of_variable));
+	static function verify_isnt_null($variable_to_test, $name_of_variable) {
+		if ( ! WP_DEBUG)return;
+		if ($variable_to_test == null && $variable_to_test != 0 && $variable_to_test != FALSE) {
+			$error[] = __('Variable named %s is null.', 'event_espresso');
+			$error[] = __("Consider looking at the stack trace to see why it wasn't set.", 'event_espresso');
+			throw new EE_Error(sprintf(implode(",", $error), $name_of_variable, $name_of_variable));
 		}
 	}
 	
@@ -90,12 +90,12 @@ 
 	 * @return void
 	 * @throws EE_Error
 	 */
-	static function verify_is_true($expression_to_test,$expression_string_representation){
-		if(!WP_DEBUG)return;
-		if(!$expression_to_test){
-			$error[]=__('Template error.','event_espresso');
-			$error[]=__("%s evaluated to false, but it must be true!",'event_espresso');
-			throw new EE_Error(sprintf(implode(",",$error),$expression_string_representation));
+	static function verify_is_true($expression_to_test, $expression_string_representation) {
+		if ( ! WP_DEBUG)return;
+		if ( ! $expression_to_test) {
+			$error[] = __('Template error.', 'event_espresso');
+			$error[] = __("%s evaluated to false, but it must be true!", 'event_espresso');
+			throw new EE_Error(sprintf(implode(",", $error), $expression_string_representation));
 		}
 	}
 	
@@ -111,16 +111,16 @@ 
 	 * @return void
 	 * @throws EE_Error
 	 */
-	static function verify_instanceof($variable_to_test,$name_of_variable,$class_name, $allow_null = 'do_not_allow_null'){
-		if(!WP_DEBUG)return;
-		self::verify_argument_is_one_of($allow_null, 'allow_null', array('allow_null','do_not_allow_null'));
-		if($allow_null == 'allow_null' && is_null($variable_to_test)){
+	static function verify_instanceof($variable_to_test, $name_of_variable, $class_name, $allow_null = 'do_not_allow_null') {
+		if ( ! WP_DEBUG)return;
+		self::verify_argument_is_one_of($allow_null, 'allow_null', array('allow_null', 'do_not_allow_null'));
+		if ($allow_null == 'allow_null' && is_null($variable_to_test)) {
 			return;
 		}
-		if( $variable_to_test == NULL ||  ! ( $variable_to_test instanceof $class_name )){
-			$msg[]=__('Variable %s is not of the correct type.','event_espresso');
-			$msg[]=__("It should be of type %s",'event_espresso');
-			throw new EE_Error(sprintf(implode(",",$msg),$name_of_variable,$name_of_variable,$class_name));
+		if ($variable_to_test == NULL || ! ($variable_to_test instanceof $class_name)) {
+			$msg[] = __('Variable %s is not of the correct type.', 'event_espresso');
+			$msg[] = __("It should be of type %s", 'event_espresso');
+			throw new EE_Error(sprintf(implode(",", $msg), $name_of_variable, $name_of_variable, $class_name));
 		}
 	}
 	
@@ -136,16 +136,16 @@ 
 	 * @return void
 	 * @throws EE_Error
 	 */
-	static function verify_is_array($variable_to_test,$variable_name,$allow_empty='allow_empty'){
-		if(!WP_DEBUG)return;
-		self::verify_argument_is_one_of($allow_empty, $variable_name, array('allow_empty','do_not_allow_empty'));
-		if(empty($variable_to_test) && 'allow_empty'==$allow_empty){
+	static function verify_is_array($variable_to_test, $variable_name, $allow_empty = 'allow_empty') {
+		if ( ! WP_DEBUG)return;
+		self::verify_argument_is_one_of($allow_empty, $variable_name, array('allow_empty', 'do_not_allow_empty'));
+		if (empty($variable_to_test) && 'allow_empty' == $allow_empty) {
 			return;
 		}
-		if(!is_array($variable_to_test)){
-			$error[]=__('Variable %s should be an array, but it is not.');
-			$error[]=__("Its value is, instead '%s'",'event_espresso');
-			throw new EE_Error(sprintf(implode(",",$error),$variable_name,$variable_name,$variable_to_test));
+		if ( ! is_array($variable_to_test)) {
+			$error[] = __('Variable %s should be an array, but it is not.');
+			$error[] = __("Its value is, instead '%s'", 'event_espresso');
+			throw new EE_Error(sprintf(implode(",", $error), $variable_name, $variable_name, $variable_to_test));
 		}
 	}
 	
@@ -163,12 +163,12 @@ 
 	 * @return void
 	 * @throws EE_Error
 	 */
-	static function verify_argument_is_one_of($variable_to_test,$variable_name,$string_options){
-		if(!WP_DEBUG)return;
-		if(!in_array($variable_to_test,$string_options)){
-			$msg[0]=__('Malconfigured template.','event_espresso');
-			$msg[1]=__("Variable named '%s' was set to '%s'. It can only be one of '%s'",'event_espresso');
-			throw new EE_Error(sprintf(implode("||",$msg),$variable_name,$variable_to_test, implode("', '",$string_options)));
+	static function verify_argument_is_one_of($variable_to_test, $variable_name, $string_options) {
+		if ( ! WP_DEBUG)return;
+		if ( ! in_array($variable_to_test, $string_options)) {
+			$msg[0] = __('Malconfigured template.', 'event_espresso');
+			$msg[1] = __("Variable named '%s' was set to '%s'. It can only be one of '%s'", 'event_espresso');
+			throw new EE_Error(sprintf(implode("||", $msg), $variable_name, $variable_to_test, implode("', '", $string_options)));
 		}
 	}
 

Braces +21 added lines, -7 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -51,7 +53,9 @@ 
 	 * @throws EE_Error (indirectly)
 	 */
 	static function verify_is_array_of($variable_to_test,$name_of_variable,$class_name,$allow_null='allow_null'){
-		if(!WP_DEBUG)return;
+		if(!WP_DEBUG) {
+			return;
+		}
 		self::verify_argument_is_one_of($allow_null, 'allow_null', array('allow_null','do_not_allow_null'));
 		if('allow_null' == $allow_null && is_null($variable_to_test)){
 			return;
@@ -74,7 +78,9 @@ 
 	 * @throws EE_Error
 	 */
 	static function verify_isnt_null($variable_to_test,$name_of_variable){
-		if(!WP_DEBUG)return;
+		if(!WP_DEBUG) {
+			return;
+		}
 		if($variable_to_test==null && $variable_to_test!=0 && $variable_to_test!=FALSE){
 			$error[]=__('Variable named %s is null.','event_espresso');
 			$error[]=__("Consider looking at the stack trace to see why it wasn't set.",'event_espresso');
@@ -91,7 +97,9 @@ 
 	 * @throws EE_Error
 	 */
 	static function verify_is_true($expression_to_test,$expression_string_representation){
-		if(!WP_DEBUG)return;
+		if(!WP_DEBUG) {
+			return;
+		}
 		if(!$expression_to_test){
 			$error[]=__('Template error.','event_espresso');
 			$error[]=__("%s evaluated to false, but it must be true!",'event_espresso');
@@ -112,7 +120,9 @@ 
 	 * @throws EE_Error
 	 */
 	static function verify_instanceof($variable_to_test,$name_of_variable,$class_name, $allow_null = 'do_not_allow_null'){
-		if(!WP_DEBUG)return;
+		if(!WP_DEBUG) {
+			return;
+		}
 		self::verify_argument_is_one_of($allow_null, 'allow_null', array('allow_null','do_not_allow_null'));
 		if($allow_null == 'allow_null' && is_null($variable_to_test)){
 			return;
@@ -137,7 +147,9 @@ 
 	 * @throws EE_Error
 	 */
 	static function verify_is_array($variable_to_test,$variable_name,$allow_empty='allow_empty'){
-		if(!WP_DEBUG)return;
+		if(!WP_DEBUG) {
+			return;
+		}
 		self::verify_argument_is_one_of($allow_empty, $variable_name, array('allow_empty','do_not_allow_empty'));
 		if(empty($variable_to_test) && 'allow_empty'==$allow_empty){
 			return;
@@ -164,7 +176,9 @@ 
 	 * @throws EE_Error
 	 */
 	static function verify_argument_is_one_of($variable_to_test,$variable_name,$string_options){
-		if(!WP_DEBUG)return;
+		if(!WP_DEBUG) {
+			return;
+		}
 		if(!in_array($variable_to_test,$string_options)){
 			$msg[0]=__('Malconfigured template.','event_espresso');
 			$msg[1]=__("Variable named '%s' was set to '%s'. It can only be one of '%s'",'event_espresso');

core/helpers/EEH_URL.helper.php

Doc Comments -1 removed lines

@@ -49,7 +49,6 @@
 	 * Returns whether not the remote file exists.
 	 * Checking via GET because HEAD requests are blocked on some server configurations.
 	 * @param string $url
-	 * @param boolean $sslverify whether we care if the SSL certificate for the requested site is setup properly
 	 * @return boolean
 	 */
 	public static function remote_file_exists( $url, $args = array() ){

Braces +4 added lines, -2 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * EEH_URL helper
  * Helper class for URL-related PHP functions
@@ -62,7 +64,7 @@ 
 				isset($results['response']['code']) &&
 				$results['response']['code'] == '200'){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}

Spacing +56 added lines, -56 removed lines

@@ -9,7 +9,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EEH_URL{
+class EEH_URL {
 
 	/**
 	 * _add_query_arg
@@ -21,30 +21,30 @@ 
 	 * @param bool  $exclude_nonce  If true then the nonce will be excluded from the generated url.
 	 * @return string
 	 */
-	public static function add_query_args_and_nonce( $args = array(), $url = '', $exclude_nonce = false ) {
-		if ( empty( $url ) ) {
-			$user_msg = __('An error occurred. A URL is a required parameter for the add_query_args_and_nonce method.', 'event_espresso' );
-			$dev_msg = $user_msg . "\n" . sprintf(
-					__('In order to dynamically generate nonces for your actions, you need to supply a valid URL as a second parameter for the %s::add_query_args_and_nonce method.', 'event_espresso' ),
+	public static function add_query_args_and_nonce($args = array(), $url = '', $exclude_nonce = false) {
+		if (empty($url)) {
+			$user_msg = __('An error occurred. A URL is a required parameter for the add_query_args_and_nonce method.', 'event_espresso');
+			$dev_msg = $user_msg."\n".sprintf(
+					__('In order to dynamically generate nonces for your actions, you need to supply a valid URL as a second parameter for the %s::add_query_args_and_nonce method.', 'event_espresso'),
 					__CLASS__
 				);
-			EE_Error::add_error( $user_msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($user_msg.'||'.$dev_msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 		// check that an action exists and add nonce
-		if ( ! $exclude_nonce ) {
-			if ( isset( $args['action'] ) && ! empty( $args['action'] ) ) {
-				$args = array_merge( $args, array( $args['action'] . '_nonce' => wp_create_nonce( $args['action'] . '_nonce' ) ) );
+		if ( ! $exclude_nonce) {
+			if (isset($args['action']) && ! empty($args['action'])) {
+				$args = array_merge($args, array($args['action'].'_nonce' => wp_create_nonce($args['action'].'_nonce')));
 			} else {
-				$args = array_merge( $args, array( 'action' => 'default', 'default_nonce' => wp_create_nonce( 'default_nonce' ) ) );
+				$args = array_merge($args, array('action' => 'default', 'default_nonce' => wp_create_nonce('default_nonce')));
 			}
 		}
 
 		//finally, let's always add a return address (if present) :)
-		$args = ! empty( $_REQUEST['action'] ) && ! isset( $_REQUEST[ 'return' ] )
-			? array_merge( $args, array( 'return' => $_REQUEST['action'] ) )
+		$args = ! empty($_REQUEST['action']) && ! isset($_REQUEST['return'])
+			? array_merge($args, array('return' => $_REQUEST['action']))
 			: $args;
 
-		return add_query_arg( $args, $url );
+		return add_query_arg($args, $url);
 
 	}
 
@@ -57,17 +57,17 @@ 
 	 * @param boolean $sslverify whether we care if the SSL certificate for the requested site is setup properly
 	 * @return boolean
 	 */
-	public static function remote_file_exists( $url, $args = array() ){
-		$results = wp_remote_request($url,array_merge( array(
+	public static function remote_file_exists($url, $args = array()) {
+		$results = wp_remote_request($url, array_merge(array(
 			'method'=>'GET',
 			'redirection'=>1
-		), $args ) );
-		if( ! $results instanceof WP_Error &&
+		), $args));
+		if ( ! $results instanceof WP_Error &&
 				isset($results['response']) &&
 				isset($results['response']['code']) &&
-				$results['response']['code'] == '200'){
+				$results['response']['code'] == '200') {
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -83,29 +83,29 @@ 
 	 * @param bool   $base_url_only - TRUE will only return the scheme and host with no other parameters
 	 * @return string
 	 */
-	public static function refactor_url( $url = '', $remove_query = TRUE, $base_url_only = FALSE ) {
+	public static function refactor_url($url = '', $remove_query = TRUE, $base_url_only = FALSE) {
 		// break apart incoming URL
-		$url_bits = parse_url( $url );
+		$url_bits = parse_url($url);
 		// HTTP or HTTPS ?
-		$scheme = isset( $url_bits[ 'scheme' ] ) ? $url_bits[ 'scheme' ] . '://' : 'http://';
+		$scheme = isset($url_bits['scheme']) ? $url_bits['scheme'].'://' : 'http://';
 		// domain
-		$host = isset( $url_bits[ 'host' ] ) ? $url_bits[ 'host' ] : '';
+		$host = isset($url_bits['host']) ? $url_bits['host'] : '';
 		// if only the base URL is requested, then return that now
-		if ( $base_url_only ) {
-			return $scheme . $host;
+		if ($base_url_only) {
+			return $scheme.$host;
 		}
-		$port = isset( $url_bits[ 'port' ] ) ? ':' . $url_bits[ 'port' ] : '';
-		$user = isset( $url_bits[ 'user' ] ) ? $url_bits[ 'user' ] : '';
-		$pass = isset( $url_bits[ 'pass' ] ) ? ':' . $url_bits[ 'pass' ] : '';
-		$pass = ( $user || $pass ) ? $pass . '@' : '';
-		$path = isset( $url_bits[ 'path' ] ) ? $url_bits[ 'path' ] : '';
+		$port = isset($url_bits['port']) ? ':'.$url_bits['port'] : '';
+		$user = isset($url_bits['user']) ? $url_bits['user'] : '';
+		$pass = isset($url_bits['pass']) ? ':'.$url_bits['pass'] : '';
+		$pass = ($user || $pass) ? $pass.'@' : '';
+		$path = isset($url_bits['path']) ? $url_bits['path'] : '';
 		// if the query string is not required, then return what we have so far
-		if ( $remove_query ) {
-			return $scheme . $user . $pass . $host . $port . $path;
+		if ($remove_query) {
+			return $scheme.$user.$pass.$host.$port.$path;
 		}
-		$query = isset( $url_bits[ 'query' ] ) ? '?' . $url_bits[ 'query' ] : '';
-		$fragment = isset( $url_bits[ 'fragment' ] ) ? '#' . $url_bits[ 'fragment' ] : '';
-		return $scheme . $user . $pass . $host . $port . $path . $query . $fragment;
+		$query = isset($url_bits['query']) ? '?'.$url_bits['query'] : '';
+		$fragment = isset($url_bits['fragment']) ? '#'.$url_bits['fragment'] : '';
+		return $scheme.$user.$pass.$host.$port.$path.$query.$fragment;
 	}
 
 
@@ -118,29 +118,29 @@ 
 	 * @param bool   $as_array TRUE (default) will return query params as an array of key value pairs, FALSE will simply return the query string
 	 * @return string|array
 	 */
-	public static function get_query_string( $url = '', $as_array = TRUE ) {
+	public static function get_query_string($url = '', $as_array = TRUE) {
 		// break apart incoming URL
-		$url_bits = parse_url( $url );
+		$url_bits = parse_url($url);
 		// grab query string from URL
-		$query = isset( $url_bits[ 'query' ] ) ? $url_bits[ 'query' ] : '';
+		$query = isset($url_bits['query']) ? $url_bits['query'] : '';
 		// if we don't want the query string formatted into an array of key => value pairs, then just return it as is
-		if ( ! $as_array ) {
+		if ( ! $as_array) {
 			return $query;
 		}
 		// if no query string exists then just return an empty array now
-		if ( empty( $query )) {
+		if (empty($query)) {
 			return array();
 		}
 		// empty array to hold results
 		$query_params = array();
 		// now break apart the query string into separate params
-		$query = explode( '&', $query );
+		$query = explode('&', $query);
 		// loop thru our query params
-		foreach ( $query as $query_args ) {
+		foreach ($query as $query_args) {
 			// break apart the key value pairs
-			$query_args = explode( '=', $query_args );
+			$query_args = explode('=', $query_args);
 			// and add to our results array
-			$query_params[ $query_args[0] ] = $query_args[1];
+			$query_params[$query_args[0]] = $query_args[1];
 		}
 		return $query_params;
 	}
@@ -151,7 +151,7 @@ 
 	 * prevent_prefetching
 	 * @return void
 	 */
-	public static function prevent_prefetching(){
+	public static function prevent_prefetching() {
 		// prevent browsers from prefetching of the rel='next' link, because it may contain content that interferes with the registration process
 		remove_action('wp_head', 'adjacent_posts_rel_link_wp_head');
 	}
@@ -166,9 +166,9 @@ 
 	 * @param   string $prefix Use this to prefix the string with something.
 	 * @return string
 	 */
-	public static function generate_unique_token( $prefix = '' ) {
-		$token =  md5( uniqid() . mt_rand() );
-		return $prefix ? $prefix . '_' . $token : $token;
+	public static function generate_unique_token($prefix = '') {
+		$token = md5(uniqid().mt_rand());
+		return $prefix ? $prefix.'_'.$token : $token;
 	}
 
 
@@ -177,7 +177,7 @@ 
 	 * add_nocache_headers
 	 * @return void
 	 */
-	public static function add_nocache_headers(){
+	public static function add_nocache_headers() {
 		// add no cache headers
 //		add_action( 'wp_head' , array( 'EED_Single_Page_Checkout', 'nocache_headers' ), 10 );
 		// plus a little extra for nginx
@@ -194,19 +194,19 @@ 
 	 * @param string $server_variable
 	 * @return string
 	 */
-	public static function filter_input_server_url( $server_variable = 'REQUEST_URI' ){
+	public static function filter_input_server_url($server_variable = 'REQUEST_URI') {
 		$URL = '';
 		$server_variables = array(
 			'REQUEST_URI' => 1,
 			'HTTP_HOST' => 1,
 			'PHP_SELF' => 1,
 		);
-		$server_variable = strtoupper( $server_variable );
+		$server_variable = strtoupper($server_variable);
 		// whitelist INPUT_SERVER var
-		if ( isset( $server_variables[ $server_variable ] ) ) {
-			$URL = filter_input( INPUT_SERVER, $server_variable, FILTER_SANITIZE_URL, FILTER_NULL_ON_FAILURE );
-			if ( empty( $URL ) ) {
-				$URL = esc_url( $_SERVER[ $server_variable ] );
+		if (isset($server_variables[$server_variable])) {
+			$URL = filter_input(INPUT_SERVER, $server_variable, FILTER_SANITIZE_URL, FILTER_NULL_ON_FAILURE);
+			if (empty($URL)) {
+				$URL = esc_url($_SERVER[$server_variable]);
 			}
 		}
 		return $URL;

core/libraries/form_sections/base/EE_Model_Form_Section.form.php

Doc Comments +1 added lines

@@ -348,6 +348,7 @@
 	 * Automatically finds the related model info from the form, if present, and
 	 * save the relations indicated
 	 * @type string $relation_name
+	 * @param integer $relation_name
 	 * @return bool
 	 * @throws EE_Error
 	 */

Spacing +74 added lines, -74 removed lines

@@ -11,7 +11,7 @@ 
  * @since                4.5.0
  *
  */
-class EE_Model_Form_Section extends EE_Form_Section_Proper{
+class EE_Model_Form_Section extends EE_Form_Section_Proper {
 
 	/**
 	 *
@@ -36,36 +36,36 @@ 
 	 * }
 	 * @throws EE_Error
 	 */
-	public function __construct($options_array = array()){
-		if(isset($options_array['model']) && $options_array['model'] instanceof EEM_Base){
+	public function __construct($options_array = array()) {
+		if (isset($options_array['model']) && $options_array['model'] instanceof EEM_Base) {
 			$this->_model = $options_array['model'];
 		}
-		if( ! $this->_model || ! $this->_model instanceof EEM_Base ){
+		if ( ! $this->_model || ! $this->_model instanceof EEM_Base) {
 			throw new EE_Error(sprintf(__("Model Form Sections must first specify the _model property to be a subclass of EEM_Base", "event_espresso")));
 		}
 
-		if(isset($options_array['subsection_args'])){
+		if (isset($options_array['subsection_args'])) {
 			$subsection_args = $options_array['subsection_args'];
-		}else{
+		} else {
 			$subsection_args = array();
 		}
 
 		//gather fields and relations to convert to inputs
 		//but if they're just going to exclude a field anyways, don't bother converting it to an input
 		$exclude = $this->_subsections;
-		if(isset($options_array['exclude'])){
-			$exclude = array_merge($exclude,array_flip($options_array['exclude']));
+		if (isset($options_array['exclude'])) {
+			$exclude = array_merge($exclude, array_flip($options_array['exclude']));
 		}
 		$model_fields = array_diff_key($this->_model->field_settings(), $exclude);
 		$model_relations = array_diff_key($this->_model->relation_settings(), $exclude);
 		//convert fields and relations to inputs
 		$this->_subsections = array_merge(
 			$this->_convert_model_fields_to_inputs($model_fields),
-			$this->_convert_model_relations_to_inputs($model_relations,$subsection_args),
+			$this->_convert_model_relations_to_inputs($model_relations, $subsection_args),
 			$this->_subsections
 		);
 		parent::__construct($options_array);
-		if(isset($options_array['model_object']) && $options_array['model_object'] instanceof EE_Base_Class){
+		if (isset($options_array['model_object']) && $options_array['model_object'] instanceof EE_Base_Class) {
 			$this->populate_model_obj($options_array['model_object']);
 		}
 
@@ -83,9 +83,9 @@ 
 	 * 	}
 	 * @return array
 	 */
-	protected function _convert_model_relations_to_inputs($relations,$subsection_args = array()){
+	protected function _convert_model_relations_to_inputs($relations, $subsection_args = array()) {
 		$inputs = array();
-		foreach( $relations as $relation_name => $relation_obj ) {
+		foreach ($relations as $relation_name => $relation_obj) {
 			$input_constructor_args = array(
 				array_merge(
 					array(
@@ -96,19 +96,19 @@ 
 				)
 			);
 			$input = NULL;
-			switch(get_class($relation_obj)){
+			switch (get_class($relation_obj)) {
 				case 'EE_HABTM_Relation':
-					if(isset($subsection_args[$relation_name]) &&
-							isset($subsection_args[$relation_name]['model_objects'])){
+					if (isset($subsection_args[$relation_name]) &&
+							isset($subsection_args[$relation_name]['model_objects'])) {
 						$model_objects = $subsection_args[$relation_name]['model_objects'];
-					}else{
+					} else {
 						$model_objects = $relation_obj->get_other_model()->get_all();
 					}
-					$input = new EE_Select_Multi_Model_Input($model_objects,$input_constructor_args);
+					$input = new EE_Select_Multi_Model_Input($model_objects, $input_constructor_args);
 					break;
 				default:
 			}
-			if($input){
+			if ($input) {
 				$inputs[$relation_name] = $input;
 			}
 		}
@@ -123,10 +123,10 @@ 
 	 * @throws EE_Error
 	 * @return EE_Form_Input_Base[]
 	 */
-	protected function _convert_model_fields_to_inputs( $model_fields = array() ){
+	protected function _convert_model_fields_to_inputs($model_fields = array()) {
 		$inputs = array();
-		foreach( $model_fields as $field_name=>$model_field ){
-			if ( $model_field instanceof EE_Model_Field_Base ) {
+		foreach ($model_fields as $field_name=>$model_field) {
+			if ($model_field instanceof EE_Model_Field_Base) {
 				$input_constructor_args = array(
 					array(
 						'required'=> ! $model_field->is_nullable() && $model_field->get_default_value() === NULL,
@@ -134,7 +134,7 @@ 
 						'default'=>$model_field->get_default_value(),
 					)
 				);
-				switch(get_class($model_field)){
+				switch (get_class($model_field)) {
 					case 'EE_All_Caps_Text_Field':
 					case 'EE_Any_Foreign_Model_Name_Field':
 						$input_class = 'EE_Text_Input';
@@ -143,16 +143,16 @@ 
 						$input_class = 'EE_Yes_No_Input';
 						break;
 					case 'EE_Datetime_Field':
-						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field)));
+						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field)));
 						break;
 					case 'EE_Email_Field':
 						$input_class = 'EE_Email_Input';
 						break;
 					case 'EE_Enum_Integer_Field':
-						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field)));
+						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field)));
 						break;
 					case 'EE_Enum_Text_Field':
-						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field)));
+						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field)));
 						break;
 					case 'EE_Float_Field':
 						$input_class = 'EE_Float_Input';
@@ -161,15 +161,15 @@ 
 					case 'EE_Foreign_Key_String_Field':
 					case 'EE_WP_User_Field':
 						$models_pointed_to = $model_field instanceof EE_Field_With_Model_Name ? $model_field->get_model_class_names_pointed_to() : array();
-						if(true || is_array($models_pointed_to) && count($models_pointed_to) > 1){
+						if (true || is_array($models_pointed_to) && count($models_pointed_to) > 1) {
 							$input_class = 'EE_Text_Input';
-						}else{
+						} else {
 							//so its just one model
 							$model_name = is_array($models_pointed_to) ? reset($models_pointed_to) : $models_pointed_to;
 							$model = EE_Registry::instance()->load_model($model_name);
 							$model_names = $model->get_all_names(array('limit'=>10));
-							if($model_field->is_nullable()){
-								array_unshift( $model_names, __( "Please Select", 'event_espresso' ));
+							if ($model_field->is_nullable()) {
+								array_unshift($model_names, __("Please Select", 'event_espresso'));
 							}
 							$input_constructor_args[1] = $input_constructor_args[0];
 							$input_constructor_args[0] = $model_names;
@@ -178,10 +178,10 @@ 
 						break;
 					case 'EE_Full_HTML_Field':
 						$input_class = 'EE_Text_Area_Input';
-						$input_constructor_args[ 0 ]['validation_strategies'] = array( new EE_Full_HTML_Validation_Strategy() );
+						$input_constructor_args[0]['validation_strategies'] = array(new EE_Full_HTML_Validation_Strategy());
 						break;
 					case 'EE_Infinite_Integer':
-						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field)));
+						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field)));
 						break;
 					case 'EE_Integer_Field':
 						$input_class = 'EE_Text_Input';
@@ -190,11 +190,11 @@ 
 						$input_class = 'EE_Text_Area_Input';
 						break;
 					case 'EE_Money_Field':
-						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field)));
+						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field)));
 						break;
 					case 'EE_Post_Content_Field':
 						$input_class = 'EE_Text_Area_Input';
-						$input_constructor_args[ 0 ][ 'validation_strategies' ] = array( new EE_Full_HTML_Validation_Strategy() );
+						$input_constructor_args[0]['validation_strategies'] = array(new EE_Full_HTML_Validation_Strategy());
 						break;
 					case 'EE_Plain_Text_Field':
 						$input_class = 'EE_Text_Input';
@@ -211,7 +211,7 @@ 
 						break;
 					case 'EE_Simple_HTML_Field':
 						$input_class = 'EE_Text_Area_Input';
-						$input_constructor_args[ 0 ][ 'validation_strategies' ] = array( new EE_Simple_HTML_Validation_Strategy() );
+						$input_constructor_args[0]['validation_strategies'] = array(new EE_Simple_HTML_Validation_Strategy());
 						break;
 					case 'EE_Slug_Field':
 						$input_class = 'EE_Text_Input';
@@ -220,13 +220,13 @@ 
 						$input_class = 'EE_Yes_No_Input';
 						break;
 					case 'EE_WP_Post_Status_Field':
-						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field)));
+						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field)));
 						break;
 					case 'EE_WP_Post_Type_Field':
-						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"),get_class($model_field)));
+						throw new EE_Error(sprintf(__("Model field '%s' does not yet have a known conversion to form input", "event_espresso"), get_class($model_field)));
 						break;
 					default:
-						throw new EE_Error(sprintf(__("Model field of type '%s' does not convert to any known Form Input. Please add a case to EE_Model_Form_section's _convert_model_fields_to_inputs switch statement", "event_espresso"),get_class($model_field)));
+						throw new EE_Error(sprintf(__("Model field of type '%s' does not convert to any known Form Input. Please add a case to EE_Model_Form_section's _convert_model_fields_to_inputs switch statement", "event_espresso"), get_class($model_field)));
 				}
 				$reflection = new ReflectionClass($input_class);
 				$input = $reflection->newInstanceArgs($input_constructor_args);
@@ -244,21 +244,21 @@ 
 	 * @param EE_Base_Class $model_obj
 	 * @return void
 	 */
-	public function populate_model_obj($model_obj){
+	public function populate_model_obj($model_obj) {
 		$model_obj = $this->_model->ensure_is_obj($model_obj);
 		$this->_model_object = $model_obj;
 		$defaults = $model_obj->model_field_array();
-		foreach($this->_model->relation_settings() as $relation_name => $relation_obj){
+		foreach ($this->_model->relation_settings() as $relation_name => $relation_obj) {
 			$form_inputs = $this->inputs();
-			if(isset($form_inputs[$relation_name])){
-				if($relation_obj instanceof EE_Belongs_To_Relation){
+			if (isset($form_inputs[$relation_name])) {
+				if ($relation_obj instanceof EE_Belongs_To_Relation) {
 					//then we only expect there to be one
 					$related_item = $this->_model_object->get_first_related($relation_name);
 					$defaults[$relation_name] = $related_item->ID();
-				}else{
+				} else {
 					$related_items = $this->_model_object->get_many_related($relation_name);
 					$ids = array();
-					foreach($related_items as $related_item){
+					foreach ($related_items as $related_item) {
 						$ids[] = $related_item->ID();
 					}
 					$defaults[$relation_name] = $ids;
@@ -275,8 +275,8 @@ 
 	 * values are their normalized values
 	 * @return array
 	 */
-	public function inputs_values_corresponding_to_model_fields(){
-		return array_intersect_key($this->input_values(),$this->_model->field_settings());
+	public function inputs_values_corresponding_to_model_fields() {
+		return array_intersect_key($this->input_values(), $this->_model->field_settings());
 	}
 
 
@@ -299,21 +299,21 @@ 
 	public function receive_form_submission($req_data = NULL, $validate = TRUE) {
 		parent::receive_form_submission($req_data, $validate);
 		//create or set the model object, if it isn't already
-		if( ! $this->_model_object ){
+		if ( ! $this->_model_object) {
 			//check to see if the form indicates a PK, in which case we want to only retrieve it and update it
 			$pk_name = $this->_model->primary_key_name();
 			$model_obj = $this->_model->get_one_by_ID($this->get_input_value($pk_name));
-			if($model_obj){
+			if ($model_obj) {
 				$this->_model_object = $model_obj;
-			}else{
-				$this->_model_object = EE_Registry::instance()->load_class($this->_model->get_this_model_name() );
+			} else {
+				$this->_model_object = EE_Registry::instance()->load_class($this->_model->get_this_model_name());
 			}
 		}
 		//ok so the model object is set. Just set it with the submitted form data (don't save yet though)
-		foreach($this->inputs_values_corresponding_to_model_fields() as $field_name=>$field_value){
+		foreach ($this->inputs_values_corresponding_to_model_fields() as $field_name=>$field_value) {
 			//only set the non-primary key
-			if($field_name != $this->_model->primary_key_name()){
-				$this->_model_object->set($field_name,$field_value);
+			if ($field_name != $this->_model->primary_key_name()) {
+				$this->_model_object->set($field_name, $field_value);
 			}
 		}
 
@@ -329,13 +329,13 @@ 
 	 * @return int, 1 on a successful update, the ID of
 	 *                    the new entry on insert; 0 on failure
 	 */
-	public function save(){
-		if( ! $this->_model_object){
-			throw new EE_Error(sprintf(__("Cannot save the model form's model object (model is '%s') because there is no model object set. You must either set it, or call receive_form_submission where it is set automatically", "event_espresso"),get_class($this->_model)));
+	public function save() {
+		if ( ! $this->_model_object) {
+			throw new EE_Error(sprintf(__("Cannot save the model form's model object (model is '%s') because there is no model object set. You must either set it, or call receive_form_submission where it is set automatically", "event_espresso"), get_class($this->_model)));
 		}
-		$success =  $this->_model_object->save();
-		foreach($this->_model->relation_settings() as $relation_name => $relation_obj){
-			if(isset($this->_subsections[$relation_name])){
+		$success = $this->_model_object->save();
+		foreach ($this->_model->relation_settings() as $relation_name => $relation_obj) {
+			if (isset($this->_subsections[$relation_name])) {
 				$success = $this->_save_related_info($relation_name);
 			}
 		}
@@ -351,29 +351,29 @@ 
 	 * @return bool
 	 * @throws EE_Error
 	 */
-	protected function _save_related_info($relation_name){
+	protected function _save_related_info($relation_name) {
 		$relation_obj = $this->_model->related_settings_for($relation_name);
-		if($relation_obj instanceof EE_Belongs_To_Relation){
+		if ($relation_obj instanceof EE_Belongs_To_Relation) {
 			//there is just a foreign key on this model pointing to that one
 			$this->_model_object->_add_relation_to($this->get_input_value($relation_name), $relation_name);
-		}elseif($relation_obj instanceof EE_Has_Many_Relation){
+		}elseif ($relation_obj instanceof EE_Has_Many_Relation) {
 			//then we want to consider all of its currently-related things.
 			//if they're in this list, keep them
 			//if they're not in this list, remove them
 			//and lastly add all the new items
 			throw new EE_Error(sprintf(__('Automatic saving of related info across a "has many" relation is not yet supported', "event_espresso")));
-		}elseif($relation_obj instanceof EE_HABTM_Relation){
+		}elseif ($relation_obj instanceof EE_HABTM_Relation) {
 			//delete everything NOT in this list
 			$normalized_input_value = $this->get_input_value($relation_name);
-			if($normalized_input_value && is_array($normalized_input_value)){
+			if ($normalized_input_value && is_array($normalized_input_value)) {
 				$where_query_params = array(
-					$relation_obj->get_other_model()->primary_key_name() => array('NOT_IN',$normalized_input_value));
-			}else{
+					$relation_obj->get_other_model()->primary_key_name() => array('NOT_IN', $normalized_input_value));
+			} else {
 				$where_query_params = array();
 			}
-			$this->_model_object->_remove_relations( $relation_name, $where_query_params );
-			foreach($normalized_input_value as $id){
-				$this->_model_object->_add_relation_to( $id, $relation_name );
+			$this->_model_object->_remove_relations($relation_name, $where_query_params);
+			foreach ($normalized_input_value as $id) {
+				$this->_model_object->_add_relation_to($id, $relation_name);
 			}
 		}
 		return TRUE;
@@ -385,7 +385,7 @@ 
 	 * Gets the model of this model form
 	 * @return EEM_Base
 	 */
-	public function get_model(){
+	public function get_model() {
 		return $this->_model;
 	}
 
@@ -398,7 +398,7 @@ 
 	 * when receive_form_submission($req_data) was called.
 	 * @return EE_Base_Class
 	 */
-	public function get_model_object(){
+	public function get_model_object() {
 		return $this->_model_object;
 	}
 
@@ -408,10 +408,10 @@ 
 	 * gets teh default name of this form section if none is specified
 	 * @return string
 	 */
-	protected function _set_default_name_if_empty(){
-		if( ! $this->_name ){
-			$default_name = str_replace("EEM_", "", get_class($this->_model)) . "_Model_Form";
-			$this->_name =  $default_name;
+	protected function _set_default_name_if_empty() {
+		if ( ! $this->_name) {
+			$default_name = str_replace("EEM_", "", get_class($this->_model))."_Model_Form";
+			$this->_name = $default_name;
 		}
 	}
 

Braces +8 added lines, -8 removed lines

@@ -46,7 +46,7 @@ 
 
 		if(isset($options_array['subsection_args'])){
 			$subsection_args = $options_array['subsection_args'];
-		}else{
+		} else{
 			$subsection_args = array();
 		}
 
@@ -101,7 +101,7 @@ 
 					if(isset($subsection_args[$relation_name]) &&
 							isset($subsection_args[$relation_name]['model_objects'])){
 						$model_objects = $subsection_args[$relation_name]['model_objects'];
-					}else{
+					} else{
 						$model_objects = $relation_obj->get_other_model()->get_all();
 					}
 					$input = new EE_Select_Multi_Model_Input($model_objects,$input_constructor_args);
@@ -163,7 +163,7 @@ 
 						$models_pointed_to = $model_field instanceof EE_Field_With_Model_Name ? $model_field->get_model_class_names_pointed_to() : array();
 						if(true || is_array($models_pointed_to) && count($models_pointed_to) > 1){
 							$input_class = 'EE_Text_Input';
-						}else{
+						} else{
 							//so its just one model
 							$model_name = is_array($models_pointed_to) ? reset($models_pointed_to) : $models_pointed_to;
 							$model = EE_Registry::instance()->load_model($model_name);
@@ -255,7 +255,7 @@ 
 					//then we only expect there to be one
 					$related_item = $this->_model_object->get_first_related($relation_name);
 					$defaults[$relation_name] = $related_item->ID();
-				}else{
+				} else{
 					$related_items = $this->_model_object->get_many_related($relation_name);
 					$ids = array();
 					foreach($related_items as $related_item){
@@ -305,7 +305,7 @@ 
 			$model_obj = $this->_model->get_one_by_ID($this->get_input_value($pk_name));
 			if($model_obj){
 				$this->_model_object = $model_obj;
-			}else{
+			} else{
 				$this->_model_object = EE_Registry::instance()->load_class($this->_model->get_this_model_name() );
 			}
 		}
@@ -356,19 +356,19 @@ 
 		if($relation_obj instanceof EE_Belongs_To_Relation){
 			//there is just a foreign key on this model pointing to that one
 			$this->_model_object->_add_relation_to($this->get_input_value($relation_name), $relation_name);
-		}elseif($relation_obj instanceof EE_Has_Many_Relation){
+		} elseif($relation_obj instanceof EE_Has_Many_Relation){
 			//then we want to consider all of its currently-related things.
 			//if they're in this list, keep them
 			//if they're not in this list, remove them
 			//and lastly add all the new items
 			throw new EE_Error(sprintf(__('Automatic saving of related info across a "has many" relation is not yet supported', "event_espresso")));
-		}elseif($relation_obj instanceof EE_HABTM_Relation){
+		} elseif($relation_obj instanceof EE_HABTM_Relation){
 			//delete everything NOT in this list
 			$normalized_input_value = $this->get_input_value($relation_name);
 			if($normalized_input_value && is_array($normalized_input_value)){
 				$where_query_params = array(
 					$relation_obj->get_other_model()->primary_key_name() => array('NOT_IN',$normalized_input_value));
-			}else{
+			} else{
 				$where_query_params = array();
 			}
 			$this->_model_object->_remove_relations( $relation_name, $where_query_params );

core/libraries/form_sections/payment_methods/EE_Payment_Method_Form.form.php

Doc Comments +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
 
 
 	/**
-	 * @param $payment_method_type
+	 * @param EE_PMT_Base $payment_method_type
 	 * @throws EE_Error
 	 */
 	public function set_payment_method_type( $payment_method_type ){

Spacing +35 added lines, -35 removed lines

@@ -4,7 +4,7 @@ 
  * Specialized form for payment methods, allowing for easy setting and retrieving of meta fields.
  * Uses EEM_Payment_Method as the model
  */
-class EE_Payment_Method_Form extends EE_Model_Form_Section{
+class EE_Payment_Method_Form extends EE_Model_Form_Section {
 
 	/**
 	 * All the subsection inputs that correspond ot extra meta rows
@@ -39,37 +39,37 @@ 
 	 *	@see EE_Model_Form_Section::__construct() for more
 	 * }
 	 */
-	public function __construct($options_array = array()){
+	public function __construct($options_array = array()) {
 		$this->_model = EEM_Payment_Method::instance();
 		$this->_options_array = $options_array;
-		if(isset($options_array['payment_method_type'])){
+		if (isset($options_array['payment_method_type'])) {
 			$this->_payment_method_type = $options_array['payment_method_type'];
 		}
 		$options_array = $this->_options_array;
-		if(isset($options_array['extra_meta_inputs'])){
-			$this->_extra_meta_inputs = array_merge($this->_extra_meta_inputs,$options_array['extra_meta_inputs']);
+		if (isset($options_array['extra_meta_inputs'])) {
+			$this->_extra_meta_inputs = array_merge($this->_extra_meta_inputs, $options_array['extra_meta_inputs']);
 		}
-		if($this->_extra_meta_inputs){
-			$this->_subsections = array_merge($this->_subsections,$this->_extra_meta_inputs);
+		if ($this->_extra_meta_inputs) {
+			$this->_subsections = array_merge($this->_subsections, $this->_extra_meta_inputs);
 		}
 		$this->_subsections['PMD_button_url'] = new EE_Admin_File_Uploader_Input(
-			array( 'html_label_text'=>  __( 'Button URL', 'event_espresso' ))
+			array('html_label_text'=>  __('Button URL', 'event_espresso'))
 		);
 		$this->_subsections['PMD_scope'] = new EE_Checkbox_Multi_Input(
 			EEM_Payment_Method::instance()->scopes(),
-			array( 'html_label_text' => $this->_model->field_settings_for('PMD_scope')->get_nicename() . EEH_Template::get_help_tab_link( 'payment_methods_overview' ))
+			array('html_label_text' => $this->_model->field_settings_for('PMD_scope')->get_nicename().EEH_Template::get_help_tab_link('payment_methods_overview'))
 		);
 		//setup the currency options
 		$this->_subsections['Currency'] = new EE_Select_Multi_Model_Input(
-			EEM_Currency::instance()->get_all_currencies_usable_by( $this->_payment_method_type ),
+			EEM_Currency::instance()->get_all_currencies_usable_by($this->_payment_method_type),
 			array(
-				'html_label_text'=>  __( 'Currencies Supported', 'event_espresso' ),
+				'html_label_text'=>  __('Currencies Supported', 'event_espresso'),
 				'required'=>TRUE
 			)
 		);
-		$this->_subsections['PMD_order'] = new EE_Text_Input( array(
-			'html_label_text' => __( 'Order', 'event_espresso' ),
-			'html_help_text' => __( 'Lowest numbers will be shown first', 'event_espresso' ),
+		$this->_subsections['PMD_order'] = new EE_Text_Input(array(
+			'html_label_text' => __('Order', 'event_espresso'),
+			'html_help_text' => __('Lowest numbers will be shown first', 'event_espresso'),
 			'normalization_strategy' => new EE_Int_Normalization(),
 			'validation_strategies' => array(
 				new EE_Int_Validation_Strategy()
@@ -78,9 +78,9 @@ 
 		));
 		$this->_layout_strategy = new EE_Admin_Two_Column_Layout();
 		parent::__construct($options_array);
-		$debug_mode = isset( $this->_subsections[ 'PMD_debug_mode' ] ) ? $this->_subsections[ 'PMD_debug_mode' ] : null;
-		if( $debug_mode instanceof EE_Form_Input_Base ) {
-			$debug_mode->set_html_help_text( __( 'This payment method has a Sandbox Server (also known as Testing Server, Development Server, Quality Assurance Server, etc). While in debug mode and using this sandbox server, real payments will not be processed.', 'event_espresso' ) );
+		$debug_mode = isset($this->_subsections['PMD_debug_mode']) ? $this->_subsections['PMD_debug_mode'] : null;
+		if ($debug_mode instanceof EE_Form_Input_Base) {
+			$debug_mode->set_html_help_text(__('This payment method has a Sandbox Server (also known as Testing Server, Development Server, Quality Assurance Server, etc). While in debug mode and using this sandbox server, real payments will not be processed.', 'event_espresso'));
 		}
 	}
 
@@ -92,15 +92,15 @@ 
 	 * @param string 	$name
 	 * @throws EE_Error
 	 */
-	public function _construct_finalize( $parent_form_section, $name ) {
-		if( ! $this->_payment_method_type instanceof EE_PMT_Base ){
-			throw new EE_Error( sprintf( __( 'Payment Method forms must have set their payment method type BEFORE calling _construct_finalize', 'event_espresso' )));
+	public function _construct_finalize($parent_form_section, $name) {
+		if ( ! $this->_payment_method_type instanceof EE_PMT_Base) {
+			throw new EE_Error(sprintf(__('Payment Method forms must have set their payment method type BEFORE calling _construct_finalize', 'event_espresso')));
 		}
 		//set the name of this form based on the payment method type
-		if( ! $this->_name && ! $name ){
-			$name = str_replace(" ","_",ucwords(str_replace("_"," ",($this->_payment_method_type->system_name()))))."_Settings_Form";
+		if ( ! $this->_name && ! $name) {
+			$name = str_replace(" ", "_", ucwords(str_replace("_", " ", ($this->_payment_method_type->system_name()))))."_Settings_Form";
 		}
-		parent::_construct_finalize( $parent_form_section, $name );
+		parent::_construct_finalize($parent_form_section, $name);
 	}
 
 
@@ -109,8 +109,8 @@ 
 	 * @param $payment_method_type
 	 * @throws EE_Error
 	 */
-	public function set_payment_method_type( $payment_method_type ){
-		if( ! $payment_method_type instanceof EE_PMT_Base){
+	public function set_payment_method_type($payment_method_type) {
+		if ( ! $payment_method_type instanceof EE_PMT_Base) {
 			throw new EE_Error(sprintf(__("Payment Method forms MUST set a payment method type by using _set_payment_method_type", "event_espresso")));
 		}
 		$this->_payment_method_type = $payment_method_type;
@@ -122,10 +122,10 @@ 
 	 * extends the model form section's save method to also save the extra meta field values
 	 * @return int ID of the payment method inserted, or true on update
 	 */
-	public function save(){
+	public function save() {
 		$parent_save_val = parent::save();
-		if( $this->_model_object && $this->_model_object->ID()){
-			foreach($this->_extra_meta_inputs as $input_name => $input){
+		if ($this->_model_object && $this->_model_object->ID()) {
+			foreach ($this->_extra_meta_inputs as $input_name => $input) {
 				$this->_model_object->update_extra_meta($input_name, $input->normalized_value());
 			}
 		}
@@ -142,8 +142,8 @@ 
 		$model_obj = $this->_model->ensure_is_obj($model_obj);
 		parent::populate_model_obj($model_obj);
 		$extra_meta = $model_obj->all_extra_meta_array();
-		foreach($this->_extra_meta_inputs as $input_name => $extra_meta_input){
-			if(isset($extra_meta[$input_name])){
+		foreach ($this->_extra_meta_inputs as $input_name => $extra_meta_input) {
+			if (isset($extra_meta[$input_name])) {
 				$extra_meta_input->set_default($extra_meta[$input_name]);
 			}
 		}
@@ -155,10 +155,10 @@ 
 	 * gets the default name of this form section if none is specified
 	 * @return string
 	 */
-	protected function _set_default_name_if_empty(){
-		if( ! $this->_name ){
-			$default_name = str_replace("EEM_", "", get_class($this->_model)) . "_Model_Form";
-			$this->_name =  $default_name;
+	protected function _set_default_name_if_empty() {
+		if ( ! $this->_name) {
+			$default_name = str_replace("EEM_", "", get_class($this->_model))."_Model_Form";
+			$this->_name = $default_name;
 		}
 	}
 
@@ -168,7 +168,7 @@ 
 	 * Gets all the extra meta inputs in this form
 	 * @return EE_Form_Input_Base[]
 	 */
-	public function extra_meta_inputs(){
+	public function extra_meta_inputs() {
 		return $this->_extra_meta_inputs;
 	}
 }

core/libraries/form_sections/strategies/display/EE_Select_Display_Strategy.strategy.php

Doc Comments +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 	/**
 	 * Checks if that value is the one selected
 	 * @param string|int $value unnormalized value option (string)
-	 * @return string
+	 * @return boolean
 	 */
 	protected function _check_if_option_selected( $value ){
 		return $this->_input->raw_value() == $value ? TRUE : FALSE;

Spacing +27 added lines, -27 removed lines

@@ -11,48 +11,48 @@ 
  * @since 				$VID:$
  *
  */
-class EE_Select_Display_Strategy extends EE_Display_Strategy_Base{
+class EE_Select_Display_Strategy extends EE_Display_Strategy_Base {
 
 	/**
 	 *
 	 * @throws EE_Error
 	 * @return string of html to display the field
 	 */
-	function display(){
-		if( ! $this->_input instanceof EE_Form_Input_With_Options_Base){
-			throw new EE_Error( sprintf( __( 'Cannot use Select Display Strategy with an input that doesn\'t have options', 'event_espresso' )));
+	function display() {
+		if ( ! $this->_input instanceof EE_Form_Input_With_Options_Base) {
+			throw new EE_Error(sprintf(__('Cannot use Select Display Strategy with an input that doesn\'t have options', 'event_espresso')));
 		}
 		EE_Registry::instance()->load_helper('Array');
 
-		$html = EEH_HTML::nl( 0, 'select' );
+		$html = EEH_HTML::nl(0, 'select');
 		$html .= '<select';
-		$html .= ' id="' . $this->_input->html_id() . '"';
-		$html .= ' name="' . $this->_input->html_name() . '"';
-		$class = $this->_input->required() ? $this->_input->required_css_class() . ' ' . $this->_input->html_class() : $this->_input->html_class();
-		$html .= ' class="' . $class . '"';
+		$html .= ' id="'.$this->_input->html_id().'"';
+		$html .= ' name="'.$this->_input->html_name().'"';
+		$class = $this->_input->required() ? $this->_input->required_css_class().' '.$this->_input->html_class() : $this->_input->html_class();
+		$html .= ' class="'.$class.'"';
 		// add html5 required
 
 		$html .= $this->_input->required() ? ' required' : '';
-		$html .= ' style="' . $this->_input->html_style() . '"';
-		$html .= ' ' . $this->_input->other_html_attributes();
+		$html .= ' style="'.$this->_input->html_style().'"';
+		$html .= ' '.$this->_input->other_html_attributes();
 		$html .= '>';
 
 //		EEH_HTML::indent( 1, 'select' );
-		if ( EEH_Array::is_multi_dimensional_array( $this->_input->options() )) {
-			EEH_HTML::indent( 1, 'optgroup' );
-			foreach( $this->_input->options() as $opt_group_label => $opt_group ){
-				$html .= EEH_HTML::nl( 0, 'optgroup' ) . '<optgroup label="' . esc_attr( $opt_group_label ) . '">';
-				EEH_HTML::indent( 1, 'option' );
-				$html .= $this->_display_options( $opt_group );
+		if (EEH_Array::is_multi_dimensional_array($this->_input->options())) {
+			EEH_HTML::indent(1, 'optgroup');
+			foreach ($this->_input->options() as $opt_group_label => $opt_group) {
+				$html .= EEH_HTML::nl(0, 'optgroup').'<optgroup label="'.esc_attr($opt_group_label).'">';
+				EEH_HTML::indent(1, 'option');
+				$html .= $this->_display_options($opt_group);
 				$html .= EEH_HTML::indent( -1, 'option' );
-				$html .= EEH_HTML::nl( 0, 'optgroup' ) . '</optgroup>';
+				$html .= EEH_HTML::nl(0, 'optgroup').'</optgroup>';
 			}
 			EEH_HTML::indent( -1, 'optgroup' );
 		} else {
-			$html.=$this->_display_options( $this->_input->options() );
+			$html .= $this->_display_options($this->_input->options());
 		}
 
-		$html.= EEH_HTML::nl( 0, 'select' ) . '</select>';
+		$html .= EEH_HTML::nl(0, 'select').'</select>';
 //		$html.= EEH_HTML::nl( -1, 'select' ) . '</select>';
 		return $html;
 	}
@@ -64,13 +64,13 @@ 
 	 * @param array $options
 	 * @return string
 	 */
-	protected function _display_options($options){
+	protected function _display_options($options) {
 		$html = '';
-		EEH_HTML::indent( 1, 'option' );
-		foreach( $options as $value => $display_text ){
-			$unnormalized_value = $this->_input->get_normalization_strategy()->unnormalize_one( $value );
-			$selected = $this->_check_if_option_selected( $unnormalized_value ) ? ' selected="selected"' : '';
-			$html.= EEH_HTML::nl( 0, 'option' ) . '<option value="' . esc_attr( $unnormalized_value ) . '"' . $selected . '>' . $display_text . '</option>';
+		EEH_HTML::indent(1, 'option');
+		foreach ($options as $value => $display_text) {
+			$unnormalized_value = $this->_input->get_normalization_strategy()->unnormalize_one($value);
+			$selected = $this->_check_if_option_selected($unnormalized_value) ? ' selected="selected"' : '';
+			$html .= EEH_HTML::nl(0, 'option').'<option value="'.esc_attr($unnormalized_value).'"'.$selected.'>'.$display_text.'</option>';
 		}
 		EEH_HTML::indent( -1, 'option' );
 		return $html;
@@ -83,7 +83,7 @@ 
 	 * @param string|int $value unnormalized value option (string)
 	 * @return string
 	 */
-	protected function _check_if_option_selected( $value ){
+	protected function _check_if_option_selected($value) {
 		return $this->_input->raw_value() == $value ? TRUE : FALSE;
 	}