eventespresso / event-espresso-core

core/db_models/EEM_State.model.php

Doc Comments +1 added lines, -1 removed lines

@@ -165,7 +165,7 @@
 	*
 	* 		@access		public
 	* 		@param		$STA_ID
-	*		@return 		mixed		array on success, FALSE on fail
+	*		@return 		boolean		array on success, FALSE on fail
 	*/
 	public function delete_by_ID( $STA_ID = FALSE ) {
 

Indentation +16 added lines, -16 removed lines

@@ -64,11 +64,11 @@ 
 
 
 	/**
-	*	reset_cached_states
-	*
-	* 	@access		private
-	*	@return 		void
-	*/
+	 *	reset_cached_states
+	 *
+	 * 	@access		private
+	 *	@return 		void
+	 */
 	public function reset_cached_states() {
 		EEM_State::$_active_states = array();
 		EEM_State::$_all_states = array();
@@ -78,11 +78,11 @@ 
 
 
 	/**
-	*		_get_states
-	*
-	* 		@access		private
-	*		@return 		array
-	*/
+	 *		_get_states
+	 *
+	 * 		@access		private
+	 *		@return 		array
+	 */
 	public function get_all_states() {
 		if ( ! self::$_all_states ) {
 			self::$_all_states = $this->get_all( array( 'order_by'=>array( 'STA_name'=>'ASC' ), 'limit'=> array( 0, 99999 )));
@@ -161,12 +161,12 @@ 
 
 
 	/**
-	*		delete  a single state from db via their ID
-	*
-	* 		@access		public
-	* 		@param		$STA_ID
-	*		@return 		mixed		array on success, FALSE on fail
-	*/
+	 *		delete  a single state from db via their ID
+	 *
+	 * 		@access		public
+	 * 		@param		$STA_ID
+	 *		@return 		mixed		array on success, FALSE on fail
+	 */
 	public function delete_by_ID( $STA_ID = FALSE ) {
 
 		if ( ! $STA_ID ) {

Spacing +41 added lines, -41 removed lines

@@ -21,8 +21,8 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
-require_once ( EE_CLASSES . 'EE_State.class.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
+require_once (EE_CLASSES.'EE_State.class.php');
 
 class EEM_State extends EEM_Base {
 
@@ -33,9 +33,9 @@ 
   	// array of all active states
 	private static $_active_states = FALSE;
 
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('State/Province','event_espresso');
-		$this->plural_item = __('States/Provinces','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('State/Province', 'event_espresso');
+		$this->plural_item = __('States/Provinces', 'event_espresso');
 
 		$this->_tables = array(
 			'State'=> new EE_Primary_Table('esp_state', 'STA_ID')
@@ -43,10 +43,10 @@ 
 
 		$this->_fields = array(
 			'State'=>array(
-				'STA_ID'=> new EE_Primary_Key_Int_Field('STA_ID', __('State ID','event_espresso')),
-				'CNT_ISO'=> new EE_Foreign_Key_String_Field('CNT_ISO', __('Country ISO Code','event_espresso'), false, NULL, 'Country'),
-				'STA_abbrev' => new EE_Plain_Text_Field('STA_abbrev', __('State Abbreviation','event_espresso'), false, ''),
-				'STA_name' => new EE_Plain_Text_Field('STA_name', __('State Name','event_espresso'), false, ''),
+				'STA_ID'=> new EE_Primary_Key_Int_Field('STA_ID', __('State ID', 'event_espresso')),
+				'CNT_ISO'=> new EE_Foreign_Key_String_Field('CNT_ISO', __('Country ISO Code', 'event_espresso'), false, NULL, 'Country'),
+				'STA_abbrev' => new EE_Plain_Text_Field('STA_abbrev', __('State Abbreviation', 'event_espresso'), false, ''),
+				'STA_name' => new EE_Plain_Text_Field('STA_name', __('State Name', 'event_espresso'), false, ''),
 				'STA_active'=> new EE_Boolean_Field('STA_active', __('State Active Flag', 'event_espresso'), false, false)
 				));
 		$this->_model_relations = array(
@@ -55,9 +55,9 @@ 
 			'Venue'=>new EE_Has_Many_Relation(),
 		);
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
 		//@todo: only show STA_active 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -84,8 +84,8 @@ 
 	*		@return 		array
 	*/
 	public function get_all_states() {
-		if ( ! self::$_all_states ) {
-			self::$_all_states = $this->get_all( array( 'order_by'=>array( 'STA_name'=>'ASC' ), 'limit'=> array( 0, 99999 )));
+		if ( ! self::$_all_states) {
+			self::$_all_states = $this->get_all(array('order_by'=>array('STA_name'=>'ASC'), 'limit'=> array(0, 99999)));
 		}
 		return self::$_all_states;
 	}
@@ -100,14 +100,14 @@ 
 	 * @param bool  $flush_cache
 	 * @return        array
 	 */
-	public function get_all_active_states( $countries = array(), $flush_cache = FALSE ) {
-		if ( ! self::$_active_states || $flush_cache ) {
-			$countries = is_array( $countries ) && ! empty( $countries ) ? $countries : EEM_Country::instance()->get_all_active_countries();
-			self::$_active_states =  $this->get_all( array(
-				array( 'STA_active' => TRUE, 'CNT_ISO' => array( 'IN', array_keys( $countries ))),
-				'order_by' => array( 'STA_name'=>'ASC' ),
-				'limit' => array( 0, 99999 ),
-				'force_join' => array( 'Country' )
+	public function get_all_active_states($countries = array(), $flush_cache = FALSE) {
+		if ( ! self::$_active_states || $flush_cache) {
+			$countries = is_array($countries) && ! empty($countries) ? $countries : EEM_Country::instance()->get_all_active_countries();
+			self::$_active_states = $this->get_all(array(
+				array('STA_active' => TRUE, 'CNT_ISO' => array('IN', array_keys($countries))),
+				'order_by' => array('STA_name'=>'ASC'),
+				'limit' => array(0, 99999),
+				'force_join' => array('Country')
 			));
 		}
 		return self::$_active_states;
@@ -119,8 +119,8 @@ 
 	 * 	get_all_states_of_active_countries
 	 * @return array
 	 */
-	public function get_all_states_of_active_countries(){
-		if ( $states = $this->get_all( array( array( 'Country.CNT_active' => TRUE, 'STA_active' => TRUE ),  'order_by' => array( 'Country.CNT_name' => 'ASC', 'STA_name' => 'ASC' )))) {
+	public function get_all_states_of_active_countries() {
+		if ($states = $this->get_all(array(array('Country.CNT_active' => TRUE, 'STA_active' => TRUE), 'order_by' => array('Country.CNT_name' => 'ASC', 'STA_name' => 'ASC')))) {
 			return $states;
 		}
 		return FALSE;
@@ -132,11 +132,11 @@ 
 	 * 	get_all_states_of_active_countries
 	 * @return array
 	 */
-	public function get_all_active_states_for_these_countries( $countries ){
-		if ( ! $countries ) {
+	public function get_all_active_states_for_these_countries($countries) {
+		if ( ! $countries) {
 			return FALSE;
 		}
-		if ( $states = $this->get_all( array(  array( 'Country.CNT_ISO' => array( 'IN', array_keys( $countries )), 'STA_active' => TRUE ),  'order_by' => array( 'Country.CNT_name' => 'ASC', 'STA_name' => 'ASC' )))) {
+		if ($states = $this->get_all(array(array('Country.CNT_ISO' => array('IN', array_keys($countries)), 'STA_active' => TRUE), 'order_by' => array('Country.CNT_name' => 'ASC', 'STA_name' => 'ASC')))) {
 			return $states;
 		}
 		return FALSE;
@@ -148,11 +148,11 @@ 
 	 * 	get_all_states_of_active_countries
 	 * @return array
 	 */
-	public function get_all_states_for_these_countries( $countries ){
-		if ( ! $countries ) {
+	public function get_all_states_for_these_countries($countries) {
+		if ( ! $countries) {
 			return FALSE;
 		}
-		if ( $states = $this->get_all( array( array( 'Country.CNT_ISO' => array( 'IN', array_keys( $countries ))),  'order_by' => array( 'Country.CNT_name' => 'ASC', 'STA_name' => 'ASC' )))) {
+		if ($states = $this->get_all(array(array('Country.CNT_ISO' => array('IN', array_keys($countries))), 'order_by' => array('Country.CNT_name' => 'ASC', 'STA_name' => 'ASC')))) {
 			return $states;
 		}
 		return FALSE;
@@ -167,15 +167,15 @@ 
 	* 		@param		$STA_ID
 	*		@return 		mixed		array on success, FALSE on fail
 	*/
-	public function delete_by_ID( $STA_ID = FALSE ) {
+	public function delete_by_ID($STA_ID = FALSE) {
 
-		if ( ! $STA_ID ) {
+		if ( ! $STA_ID) {
 			return FALSE;
 		}
 
 		// retrieve a particular transaction
-		$where_cols_n_values = array( array( 'STA_ID' => $STA_ID ));
-		if ( $answer = $this->delete ( $where_cols_n_values )) {
+		$where_cols_n_values = array(array('STA_ID' => $STA_ID));
+		if ($answer = $this->delete($where_cols_n_values)) {
 			return TRUE;
 		} else {
 			return FALSE;
@@ -188,15 +188,15 @@ 
 	 * @param string $state_ID
 	 * @return string
 	 */
-	public function get_state_name_by_ID( $state_ID ){
-		if( isset( self::$_all_states[ $state_ID ] ) &&
-				self::$_all_states[ $state_ID ] instanceof EE_State ){
-			return self::$_all_states[ $state_ID ]->name();
+	public function get_state_name_by_ID($state_ID) {
+		if (isset(self::$_all_states[$state_ID]) &&
+				self::$_all_states[$state_ID] instanceof EE_State) {
+			return self::$_all_states[$state_ID]->name();
 		}
-		$names = $this->get_col( array( array( 'STA_ID' => $state_ID ), 'limit' => 1), 'STA_name' );
-		if( is_array( $names ) && ! empty( $names ) ){
-			return reset( $names );
-		}else{
+		$names = $this->get_col(array(array('STA_ID' => $state_ID), 'limit' => 1), 'STA_name');
+		if (is_array($names) && ! empty($names)) {
+			return reset($names);
+		} else {
 			return '';
 		}
 	}

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');
+}
 /**
  * Event Espresso
  *
@@ -196,7 +198,7 @@ 
 		$names = $this->get_col( array( array( 'STA_ID' => $state_ID ), 'limit' => 1), 'STA_name' );
 		if( is_array( $names ) && ! empty( $names ) ){
 			return reset( $names );
-		}else{
+		} else{
 			return '';
 		}
 	}

core/db_models/EEM_System_Status.model.php

Doc Comments +2 added lines, -4 removed lines

@@ -14,8 +14,6 @@ 
 	 * 		This function is a singleton method used to instantiate the EEM_Attendee object
 	 *
 	 * 		@access public
-	 * 		@param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
-	 * 		@return EEM_System_Status
 	 */
 	public static function instance() {
 
@@ -147,7 +145,7 @@ 
 
 	/**
 	 *
-	 * @return array like EE_Config class
+	 * @return EE_Config like EE_Config class
 	 */
 	function get_ee_config(){
 		return EE_Config::instance();
@@ -197,7 +195,7 @@ 
 
 	/**
 	 * Checks if site responds ot HTTPS
-	 * @return boolean
+	 * @return string
 	 */
 	function get_https_enabled(){
 		$home = str_replace("http://", "https://", home_url());

Braces +7 added lines, -5 removed lines

@@ -81,8 +81,9 @@ 
 	 */
 	function get_active_plugins(){
 		$active_plugins = (array) get_option( 'active_plugins', array() );
-		if ( is_multisite() )
-			$active_plugins = array_merge( $active_plugins, get_site_option( 'active_sitewide_plugins', array() ) );
+		if ( is_multisite() ) {
+					$active_plugins = array_merge( $active_plugins, get_site_option( 'active_sitewide_plugins', array() ) );
+		}
 		$active_plugins = array_map( 'strtolower', $active_plugins );
 		$plugin_info = array();
 		foreach ( $active_plugins as $plugin ) {
@@ -187,8 +188,9 @@ 
 		  preg_match_all(
 		  '#%S%(?:<td>(.*?)</td>)?(?:<td>(.*?)</td>)?(?:<td>(.*?)</td>)?%E%#',
 			$section, $askapache, PREG_SET_ORDER);
-		  foreach($askapache as $m)
-			  $m2 = isset($m[2]) ? $m[2] : null;
+		  foreach($askapache as $m) {
+		  			  $m2 = isset($m[2]) ? $m[2] : null;
+		  }
 			  $pi[$n][$m[1]]=(!isset($m[3])||$m2==$m[3]) ? $m2 : array_slice($m,2);
 		}
 
@@ -232,7 +234,7 @@ 
 			$status = __('Your server has fsockopen enabled, cURL is disabled.', 'event_espresso');
 		} elseif( $curl_works ) {
 			$status = __('Your server has cURL enabled, fsockopen is disabled.', 'event_espresso');
-		}else{
+		} else{
 			$status = __('Your server does not have fsockopen or cURL enabled - PayPal IPN and other scripts which communicate with other servers will not work. Contact your hosting provider.', 'event_espresso'). '</mark>';
 		}
 		return $status;

Indentation +6 added lines, -6 removed lines

@@ -215,17 +215,17 @@
 	 * Whether or not a .maintenance file is detected
 	 * @return string descripting wp_maintenance_mode status
 	 */
-    function get_wp_maintenance_mode() {
-        $opened = file_exists( ABSPATH . '.maintenance' );
-        return $opened ? sprintf( __('%s.maintenance file detected.%s Wordpress may have a failed auto-update which could prevent Event Espresso from updating the database correctly.', 'event_espresso'), '<strong>','</strong>' ) : __('.maintenance file not detected. WordPress is not in maintenance mode.', 'event_espresso')  ;
-    }
+	function get_wp_maintenance_mode() {
+		$opened = file_exists( ABSPATH . '.maintenance' );
+		return $opened ? sprintf( __('%s.maintenance file detected.%s Wordpress may have a failed auto-update which could prevent Event Espresso from updating the database correctly.', 'event_espresso'), '<strong>','</strong>' ) : __('.maintenance file not detected. WordPress is not in maintenance mode.', 'event_espresso')  ;
+	}
 	/**
 	 * Whether or not logging is enabled
 	 * @return string descripting logging's status
 	 */
 	function get_logging_enabled(){
-            $opened = @fopen( EVENT_ESPRESSO_UPLOAD_DIR . '/logs/espresso_log.txt', 'a' );
-            return $opened ? __('Log Directory is writable', 'event_espresso') : sprintf( __('%sLog directory is NOT writable%s', 'event_espresso'), '<mark class="error"','</mark>' ) ;
+			$opened = @fopen( EVENT_ESPRESSO_UPLOAD_DIR . '/logs/espresso_log.txt', 'a' );
+			return $opened ? __('Log Directory is writable', 'event_espresso') : sprintf( __('%sLog directory is NOT writable%s', 'event_espresso'), '<mark class="error"','</mark>' ) ;
 	}
 	/**
 	 *  Whether curl ro fsock works

Spacing +56 added lines, -56 removed lines

@@ -3,7 +3,7 @@ 
 /**
  * Model for retrieving Information about the Event Espresso status.
  */
-class EEM_System_Status{
+class EEM_System_Status {
 
 	// private instance of the EEM_System_Status object
 	protected static $_instance = NULL;
@@ -26,7 +26,7 @@ 
 		}
 		return self::$_instance;
 	}
-	private function __construct(){
+	private function __construct() {
 
 	}
 	/**
@@ -34,7 +34,7 @@ 
 	 * @return array where each key is a function name on this class, and each value is SOMETHING--
 	 * it might be a value, an array, or an object
 	 */
-	function get_system_stati(){
+	function get_system_stati() {
 		return array(
 				'ee_version'=>$this->get_ee_version(),
 				'ee_activation_history'=>$this->get_ee_activation_history(),
@@ -55,14 +55,14 @@ 
 	 *
 	 * @return string
 	 */
-	function get_ee_version(){
+	function get_ee_version() {
 		return espresso_version();
 	}
 	/**
 	 *
 	 * @return string
 	 */
-	function php_version(){
+	function php_version() {
 		return phpversion();
 	}
 	/**
@@ -79,16 +79,16 @@ 
 		'DomainPath' => 'Domain Path',
 		'Network' => 'Network',
 	 */
-	function get_active_plugins(){
-		$active_plugins = (array) get_option( 'active_plugins', array() );
-		if ( is_multisite() )
-			$active_plugins = array_merge( $active_plugins, get_site_option( 'active_sitewide_plugins', array() ) );
-		$active_plugins = array_map( 'strtolower', $active_plugins );
+	function get_active_plugins() {
+		$active_plugins = (array) get_option('active_plugins', array());
+		if (is_multisite())
+			$active_plugins = array_merge($active_plugins, get_site_option('active_sitewide_plugins', array()));
+		$active_plugins = array_map('strtolower', $active_plugins);
 		$plugin_info = array();
-		foreach ( $active_plugins as $plugin ) {
-				$plugin_data = @get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
+		foreach ($active_plugins as $plugin) {
+				$plugin_data = @get_plugin_data(WP_PLUGIN_DIR.'/'.$plugin);
 
-				$plugin_info[ $plugin ] = $plugin_data;
+				$plugin_info[$plugin] = $plugin_data;
 		}
 		return $plugin_info;
 	}
@@ -97,17 +97,17 @@ 
 	 *
 	 * @return array with keys 'home_url' and 'site_url'
 	 */
-	function get_wp_settings(){
-		$wp_memory_int = $this->let_to_num( WP_MEMORY_LIMIT );
-		if ( $wp_memory_int < 67108864 ) {
-			$wp_memory_to_display = '<mark class="error">' . sprintf( __('%s - We recommend setting memory to at least 64MB. See: %s Increasing memory allocated to PHP %s', 'event_espresso'), WP_MEMORY_LIMIT, '<a href="http://codex.wordpress.org/Editing_wp-config.php#Increasing_memory_allocated_to_PHP">', '</a>"' ) . '</mark>';
+	function get_wp_settings() {
+		$wp_memory_int = $this->let_to_num(WP_MEMORY_LIMIT);
+		if ($wp_memory_int < 67108864) {
+			$wp_memory_to_display = '<mark class="error">'.sprintf(__('%s - We recommend setting memory to at least 64MB. See: %s Increasing memory allocated to PHP %s', 'event_espresso'), WP_MEMORY_LIMIT, '<a href="http://codex.wordpress.org/Editing_wp-config.php#Increasing_memory_allocated_to_PHP">', '</a>"').'</mark>';
 		} else {
-			$wp_memory_to_display = '<mark class="yes">' . size_format( $wp_memory_int ) . '</mark>';
+			$wp_memory_to_display = '<mark class="yes">'.size_format($wp_memory_int).'</mark>';
 		}
 		return array(
-			'name'=>get_bloginfo('name','display'),
+			'name'=>get_bloginfo('name', 'display'),
 			'is_multisite'=>is_multisite(),
-			'version'=>  get_bloginfo( 'version', 'display' ),
+			'version'=>  get_bloginfo('version', 'display'),
 			'home_url'=>home_url(),
 			'site_url'=>site_url(),
 			'WP_DEBUG'=>WP_DEBUG,
@@ -116,8 +116,8 @@ 
 			'gmt_offset'=>get_option('gmt_offset'),
 			'timezone_string'=>get_option('timezone_string'),
 			'admin_email'=>  get_bloginfo('admin_email', 'display'),
-			'language'=>get_bloginfo('language','display'),
-			'wp_max_upload_size' => size_format( wp_max_upload_size() ),
+			'language'=>get_bloginfo('language', 'display'),
+			'wp_max_upload_size' => size_format(wp_max_upload_size()),
 			'wp_memory' => $wp_memory_to_display
 			);
 	}
@@ -126,7 +126,7 @@ 
 	 * Gets an array of information about the history of ee versions installed
 	 * @return array
 	 */
-	function get_ee_activation_history(){
+	function get_ee_activation_history() {
 		return get_option('espresso_db_update');
 	}
 
@@ -135,11 +135,11 @@ 
 	 * Gets an array where keys are ee versions, and their values are arrays indicating all the different times that version was installed
 	 * @return EE_Data_Migration_Script_Base[]
 	 */
-	function get_ee_migration_history(){
+	function get_ee_migration_history() {
 		$options = EE_Data_Migration_Manager::instance()->get_all_migration_script_options();
 		$presentable_migration_scripts = array();
-		foreach($options as $option_array){
-			$presentable_migration_scripts[str_replace(EE_Data_Migration_Manager::data_migration_script_option_prefix,"",$option_array['option_name'])] = maybe_unserialize($option_array['option_value']);
+		foreach ($options as $option_array) {
+			$presentable_migration_scripts[str_replace(EE_Data_Migration_Manager::data_migration_script_option_prefix, "", $option_array['option_name'])] = maybe_unserialize($option_array['option_value']);
 		}
 		return $presentable_migration_scripts;
 //		return get_option(EE_Data_Migration_Manager::data_migrations_option_name);//EE_Data_Migration_Manager::instance()->get_data_migrations_ran();
@@ -149,7 +149,7 @@ 
 	 *
 	 * @return array like EE_Config class
 	 */
-	function get_ee_config(){
+	function get_ee_config() {
 		return EE_Config::instance();
 	}
 
@@ -157,24 +157,24 @@ 
 	 * Gets an array of php setup info, pilfered from http://www.php.net/manual/en/function.phpinfo.php#87463
 	 * @return array like the output of phpinfo(), but in an array
 	 */
-	function get_php_info(){
+	function get_php_info() {
 		ob_start();
 		phpinfo(-1);
 
 		$pi = preg_replace(
 		array('#^.*<body>(.*)</body>.*$#ms', '#<h2>PHP License</h2>.*$#ms',
-		'#<h1>Configuration</h1>#',  "#\r?\n#", "#</(h1|h2|h3|tr)>#", '# +<#',
+		'#<h1>Configuration</h1>#', "#\r?\n#", "#</(h1|h2|h3|tr)>#", '# +<#',
 		"#[ \t]+#", '#&nbsp;#', '#  +#', '# class=".*?"#', '%&#039;%',
 		 '#<tr>(?:.*?)" src="(?:.*?)=(.*?)" alt="PHP Logo" /></a>'
 		 .'<h1>PHP Version (.*?)</h1>(?:\n+?)</td></tr>#',
 		 '#<h1><a href="(?:.*?)\?=(.*?)">PHP Credits</a></h1>#',
 		 '#<tr>(?:.*?)" src="(?:.*?)=(.*?)"(?:.*?)Zend Engine (.*?),(?:.*?)</tr>#',
 		 "# +#", '#<tr>#', '#</tr>#'),
-		array('$1', '', '', '', '</$1>' . "\n", '<', ' ', ' ', ' ', '', ' ',
+		array('$1', '', '', '', '</$1>'."\n", '<', ' ', ' ', ' ', '', ' ',
 		 '<h2>PHP Configuration</h2>'."\n".'<tr><td>PHP Version</td><td>$2</td></tr>'.
 		 "\n".'<tr><td>PHP Egg</td><td>$1</td></tr>',
 		 '<tr><td>PHP Credits Egg</td><td>$1</td></tr>',
-		 '<tr><td>Zend Engine</td><td>$2</td></tr>' . "\n" .
+		 '<tr><td>Zend Engine</td><td>$2</td></tr>'."\n".
 		 '<tr><td>Zend Egg</td><td>$1</td></tr>', ' ', '%S%', '%E%'),
 		ob_get_clean());
 
@@ -182,14 +182,14 @@ 
 		unset($sections[0]);
 
 		$pi = array();
-		foreach($sections as $section){
+		foreach ($sections as $section) {
 		  $n = substr($section, 0, strpos($section, '</h2>'));
 		  preg_match_all(
 		  '#%S%(?:<td>(.*?)</td>)?(?:<td>(.*?)</td>)?(?:<td>(.*?)</td>)?%E%#',
 			$section, $askapache, PREG_SET_ORDER);
-		  foreach($askapache as $m)
+		  foreach ($askapache as $m)
 			  $m2 = isset($m[2]) ? $m[2] : null;
-			  $pi[$n][$m[1]]=(!isset($m[3])||$m2==$m[3]) ? $m2 : array_slice($m,2);
+			  $pi[$n][$m[1]] = ( ! isset($m[3]) || $m2 == $m[3]) ? $m2 : array_slice($m, 2);
 		}
 
 		return $pi;
@@ -199,13 +199,13 @@ 
 	 * Checks if site responds ot HTTPS
 	 * @return boolean
 	 */
-	function get_https_enabled(){
+	function get_https_enabled() {
 		$home = str_replace("http://", "https://", home_url());
 		$response = wp_remote_get($home);
-		if($response instanceof WP_Error){
+		if ($response instanceof WP_Error) {
 			$error_string = '';
-			foreach($response->errors as $short_name => $description_array){
-				$error_string .= "<b>$short_name</b>: ".implode(", ",$description_array);
+			foreach ($response->errors as $short_name => $description_array) {
+				$error_string .= "<b>$short_name</b>: ".implode(", ", $description_array);
 			}
 			return $error_string;
 		}
@@ -216,32 +216,32 @@ 
 	 * @return string descripting wp_maintenance_mode status
 	 */
     function get_wp_maintenance_mode() {
-        $opened = file_exists( ABSPATH . '.maintenance' );
-        return $opened ? sprintf( __('%s.maintenance file detected.%s Wordpress may have a failed auto-update which could prevent Event Espresso from updating the database correctly.', 'event_espresso'), '<strong>','</strong>' ) : __('.maintenance file not detected. WordPress is not in maintenance mode.', 'event_espresso')  ;
+        $opened = file_exists(ABSPATH.'.maintenance');
+        return $opened ? sprintf(__('%s.maintenance file detected.%s Wordpress may have a failed auto-update which could prevent Event Espresso from updating the database correctly.', 'event_espresso'), '<strong>', '</strong>') : __('.maintenance file not detected. WordPress is not in maintenance mode.', 'event_espresso');
     }
 	/**
 	 * Whether or not logging is enabled
 	 * @return string descripting logging's status
 	 */
-	function get_logging_enabled(){
-            $opened = @fopen( EVENT_ESPRESSO_UPLOAD_DIR . '/logs/espresso_log.txt', 'a' );
-            return $opened ? __('Log Directory is writable', 'event_espresso') : sprintf( __('%sLog directory is NOT writable%s', 'event_espresso'), '<mark class="error"','</mark>' ) ;
+	function get_logging_enabled() {
+            $opened = @fopen(EVENT_ESPRESSO_UPLOAD_DIR.'/logs/espresso_log.txt', 'a');
+            return $opened ? __('Log Directory is writable', 'event_espresso') : sprintf(__('%sLog directory is NOT writable%s', 'event_espresso'), '<mark class="error"', '</mark>');
 	}
 	/**
 	 *  Whether curl ro fsock works
 	 * @return string describing posting's status
 	 */
-	function get_remote_posting(){
-		$fsock_works = function_exists( 'fsockopen' );
-		$curl_works = function_exists( 'curl_init' );
-		if ( $fsock_works && $curl_works ) {
+	function get_remote_posting() {
+		$fsock_works = function_exists('fsockopen');
+		$curl_works = function_exists('curl_init');
+		if ($fsock_works && $curl_works) {
 			$status = __('Your server has fsockopen and cURL enabled.', 'event_espresso');
-		} elseif ( $fsock_works ) {
+		} elseif ($fsock_works) {
 			$status = __('Your server has fsockopen enabled, cURL is disabled.', 'event_espresso');
-		} elseif( $curl_works ) {
+		} elseif ($curl_works) {
 			$status = __('Your server has cURL enabled, fsockopen is disabled.', 'event_espresso');
-		}else{
-			$status = __('Your server does not have fsockopen or cURL enabled - PayPal IPN and other scripts which communicate with other servers will not work. Contact your hosting provider.', 'event_espresso'). '</mark>';
+		} else {
+			$status = __('Your server does not have fsockopen or cURL enabled - PayPal IPN and other scripts which communicate with other servers will not work. Contact your hosting provider.', 'event_espresso').'</mark>';
 		}
 		return $status;
 
@@ -250,7 +250,7 @@ 
 	 * Gets all the php.ini settings
 	 * @return array
 	 */
-	function get_php_ini_all(){
+	function get_php_ini_all() {
 		return ini_get_all();
 	}
 	/**
@@ -259,10 +259,10 @@ 
 	 * @param type $size
 	 * @return int
 	 */
-	function let_to_num( $size ) {
-		$l 		= substr( $size, -1 );
-		$ret 	= substr( $size, 0, -1 );
-		switch( strtoupper( $l ) ) {
+	function let_to_num($size) {
+		$l = substr($size, -1);
+		$ret = substr($size, 0, -1);
+		switch (strtoupper($l)) {
 			case 'P':
 				$ret *= 1024;
 			case 'T':

core/db_models/helpers/EE_Model_Query_Info_Carrier.php

Doc Comments +14 added lines, -1 removed lines

@@ -43,16 +43,30 @@ 
    
    private $_group_by_sql;
    
+   /**
+    * @param string $limit_sql
+    */
    function set_limit_sql($limit_sql){
 	   $this->_limit_sql = $limit_sql;
 	}
 	
+	/**
+	 * @param string $order_by_sql
+	 */
 	function set_order_by_sql($order_by_sql){
 		$this->_order_by_sql = $order_by_sql;
 	}
+
+	/**
+	 * @param string $group_by_sql
+	 */
 	function set_group_by_sql($group_by_sql){
 		$this->_group_by_sql = $group_by_sql;
 	}
+
+	/**
+	 * @param string $having_sql
+	 */
 	function set_having_sql($having_sql){
 		$this->_having_sql = $having_sql;
 	}
@@ -72,7 +86,6 @@ 
     * 
     * @param type $model_included_name
     * @param type $join_sql
-    * @param type $data_types
     */
    public function __construct($model_included_name= array(), $join_sql = ''){
 	   $this->_models_included = $model_included_name;

Indentation +3 added lines, -3 removed lines

@@ -11,8 +11,8 @@ 
 */
 class EE_Model_Query_Info_Carrier extends EE_Base{
    /**
-	* @var string SQL for performing joins (Eg, "INNER JOIN blah ON blah=blah INNER JOIN FOO ON foo=foo...")
-	*/
+    * @var string SQL for performing joins (Eg, "INNER JOIN blah ON blah=blah INNER JOIN FOO ON foo=foo...")
+    */
    private $_join_sql;
    /**
     *
@@ -132,7 +132,7 @@ 
     * @return string
     */
   public function get_main_model_join_sql() {
-    return $this->_main_join_sql;
+	return $this->_main_join_sql;
   }
 
 

Spacing +23 added lines, -23 removed lines

@@ -9,7 +9,7 @@ 
 * We could have returned an array
 * with two keys 'join_sql' and 'data_types', but this better-defines the data being passed around
 */
-class EE_Model_Query_Info_Carrier extends EE_Base{
+class EE_Model_Query_Info_Carrier extends EE_Base {
    /**
 	* @var string SQL for performing joins (Eg, "INNER JOIN blah ON blah=blah INNER JOIN FOO ON foo=foo...")
 	*/
@@ -43,29 +43,29 @@ 
    
    private $_group_by_sql;
    
-   function set_limit_sql($limit_sql){
+   function set_limit_sql($limit_sql) {
 	   $this->_limit_sql = $limit_sql;
 	}
 	
-	function set_order_by_sql($order_by_sql){
+	function set_order_by_sql($order_by_sql) {
 		$this->_order_by_sql = $order_by_sql;
 	}
-	function set_group_by_sql($group_by_sql){
+	function set_group_by_sql($group_by_sql) {
 		$this->_group_by_sql = $group_by_sql;
 	}
-	function set_having_sql($having_sql){
+	function set_having_sql($having_sql) {
 		$this->_having_sql = $having_sql;
 	}
-	function get_limit_sql(){
+	function get_limit_sql() {
 		return $this->_limit_sql;
 	}
-	function get_order_by_sql(){
+	function get_order_by_sql() {
 		return $this->_order_by_sql;
 	}
-	function get_group_by_sql(){
+	function get_group_by_sql() {
 		return $this->_group_by_sql;
 	}
-	function get_having_sql(){
+	function get_having_sql() {
 		return $this->_having_sql;
 	}
    /**
@@ -74,7 +74,7 @@ 
     * @param type $join_sql
     * @param type $data_types
     */
-   public function __construct($model_included_name= array(), $join_sql = ''){
+   public function __construct($model_included_name = array(), $join_sql = '') {
 	   $this->_models_included = $model_included_name;
 	   $this->_join_sql = $join_sql;
    }
@@ -83,10 +83,10 @@ 
     * Merges info from the other EEM_Related_Model_Info_Carrier into this one.
     * @param EE_Model_Query_Info_Carrier $other_model_query_info_carrier
     */
-   public function merge( $other_model_query_info_carrier ){
-	   if( $other_model_query_info_carrier && ! $this->_have_already_included_one_of_these_models($other_model_query_info_carrier->get_model_names_included())){
-			$model_included_on_other_join_sql_and_data_types_carrier =  $other_model_query_info_carrier->get_model_names_included();
-			$this->_models_included = array_merge( $this->_models_included, $model_included_on_other_join_sql_and_data_types_carrier );
+   public function merge($other_model_query_info_carrier) {
+	   if ($other_model_query_info_carrier && ! $this->_have_already_included_one_of_these_models($other_model_query_info_carrier->get_model_names_included())) {
+			$model_included_on_other_join_sql_and_data_types_carrier = $other_model_query_info_carrier->get_model_names_included();
+			$this->_models_included = array_merge($this->_models_included, $model_included_on_other_join_sql_and_data_types_carrier);
 			$this->_join_sql .= $other_model_query_info_carrier->_join_sql;
 	   }
 	   //otherwise don't merge our data.
@@ -100,9 +100,9 @@ 
     * @param array $model_names just like EE_MOdel_QUery_Info_Carrier::_models_included: keys are model chain paths, values are the model names only
     * @return boolean
     */
-   protected function  _have_already_included_one_of_these_models($model_names){
-	   foreach($this->_models_included as $model_relation_path=>$model_included){
-		   if(array_key_exists($model_relation_path, $model_names)){
+   protected function  _have_already_included_one_of_these_models($model_names) {
+	   foreach ($this->_models_included as $model_relation_path=>$model_included) {
+		   if (array_key_exists($model_relation_path, $model_names)) {
 			   return true;
 		   }
 	   }
@@ -112,17 +112,17 @@ 
     * Array keys are model names, values are "model relation paths". See EE_Model_Query_Info_Carrier::_models_included for details
     * @return array like EE_Model_Query_Info_Carrier::_models_included
     */
-   public function get_model_names_included(){
+   public function get_model_names_included() {
 	   return $this->_models_included;
    }
    /**
     * sets the $where_sql for later use from client code
     * @param string $where_sql
     */
-   public function set_where_sql($where_sql){
+   public function set_where_sql($where_sql) {
 	   $this->_where_sql = $where_sql;
    }
-   public function get_where_sql(){
+   public function get_where_sql() {
 	   return $this->_where_sql;
    }
 
@@ -143,10 +143,10 @@ 
     * after the FROM and before the WHERE.)
     * @param string $join_sql
     */
-   public function set_main_model_join_sql($join_sql){
+   public function set_main_model_join_sql($join_sql) {
 	   $this->_main_join_sql = $join_sql;
    }
-   public function get_full_join_sql(){
-	   return $this->_main_join_sql . $this->_join_sql;
+   public function get_full_join_sql() {
+	   return $this->_main_join_sql.$this->_join_sql;
    }
 }
\ No newline at end of file

core/db_models/helpers/EE_Secondary_Table.php

Doc Comments +2 added lines, -1 removed lines

@@ -49,7 +49,7 @@ 
 	 * creates join statement FROM primary table
 	 * gets SQL like "LEFT JOIN table_name AS table_alias ON other_table_alias.pk = table_alias.fk
 	 *
-	 * @param string $table allows us to set special conditions on the $table_name portion of the join query (i.e. doing a subquery)
+	 * @param string $primary_table_alias_with_model_chain_prefix
 	 * @return string of SQL
 	 */
 	function get_join_sql( $primary_table_alias_with_model_chain_prefix  ){
@@ -72,6 +72,7 @@ 
 	 * " LEFT JOIN secondary_table_table AS Secondary ON ..." like get_join_sql, this function returns
 	 * " LEFT JOIN primary_table AS Primary ON ...".
 	 * This is useful if the secondary table is already included in the SQL, but the primary table is not yet.
+	 * @param string $secondary_table_alias_with_model_chain_prefix
 	 * @return string
 	 */
 	function get_inverse_join_sql($secondary_table_alias_with_model_chain_prefix){

Spacing +21 added lines, -21 removed lines

@@ -5,8 +5,8 @@ 
  * table's rows. Ie, it can't have many rows in the secondary table that point to
  * a single row in the primary table
  */
-require_once( EE_MODELS . 'helpers/EE_Table_Base.php');
-class EE_Secondary_Table extends EE_Table_Base{
+require_once(EE_MODELS.'helpers/EE_Table_Base.php');
+class EE_Secondary_Table extends EE_Table_Base {
 	protected $_extra_join_conditions;
 
 	/**
@@ -19,15 +19,15 @@ 
 	 * @param boolean $global whether the table is "global" as in there is only 1 table on an entire multisite install,
 	 *					or whether each site on a multisite install has a copy of this table
 	 */
-	function __construct($table_name, $pk_column,  $fk_column = null, $extra_join_conditions = null, $global = false ){
+	function __construct($table_name, $pk_column, $fk_column = null, $extra_join_conditions = null, $global = false) {
 		$this->_fk_on_table = $fk_column;
 		$this->_extra_join_conditions = $extra_join_conditions;
-		parent::__construct( $table_name, $pk_column, $global );
+		parent::__construct($table_name, $pk_column, $global);
 	}
-	function get_fk_on_table(){
+	function get_fk_on_table() {
 		return $this->_fk_on_table;
 	}
-	function _construct_finalize_set_table_to_join_with(EE_Table_Base $table){
+	function _construct_finalize_set_table_to_join_with(EE_Table_Base $table) {
 		$this->_table_to_join_with = $table;
 	}
 	/**
@@ -35,14 +35,14 @@ 
 	 * @return string of sql like "Event.post_type = 'event'", which gets added to
 	 * the end of the join statement with the primary table
 	 */
-	function get_extra_join_conditions(){
+	function get_extra_join_conditions() {
 		return $this->_extra_join_conditions;
 	}
 	/**
 	 *
 	 * @return EE_Primary_Table
 	 */
-	function get_table_to_join_with(){
+	function get_table_to_join_with() {
 		return $this->_table_to_join_with;
 	}
 	/**
@@ -52,15 +52,15 @@ 
 	 * @param string $table allows us to set special conditions on the $table_name portion of the join query (i.e. doing a subquery)
 	 * @return string of SQL
 	 */
-	function get_join_sql( $primary_table_alias_with_model_chain_prefix  ){
+	function get_join_sql($primary_table_alias_with_model_chain_prefix) {
 
 		$table_name = $this->get_table_name();
-		$secondary_table_alias = EE_Model_Parser::get_prefix_from_table_alias_with_model_relation_chain_prefix($primary_table_alias_with_model_chain_prefix) . $this->get_table_alias();
+		$secondary_table_alias = EE_Model_Parser::get_prefix_from_table_alias_with_model_relation_chain_prefix($primary_table_alias_with_model_chain_prefix).$this->get_table_alias();
 		$other_table_pk = $this->get_table_to_join_with()->get_pk_column();
 		$fk = $this->get_fk_on_table();
 		$join_sql = " LEFT JOIN $table_name AS $secondary_table_alias ON $primary_table_alias_with_model_chain_prefix.$other_table_pk = $secondary_table_alias.$fk ";
-		if($this->get_extra_join_conditions()){
-			$join_sql.="AND ".$this->get_extra_join_conditions();
+		if ($this->get_extra_join_conditions()) {
+			$join_sql .= "AND ".$this->get_extra_join_conditions();
 		}
 		return $join_sql;
 	}
@@ -74,14 +74,14 @@ 
 	 * This is useful if the secondary table is already included in the SQL, but the primary table is not yet.
 	 * @return string
 	 */
-	function get_inverse_join_sql($secondary_table_alias_with_model_chain_prefix){
-		$primary_table_name =$this->get_table_to_join_with()->get_table_name();
-		$primary_table_alias = EE_Model_Parser::get_prefix_from_table_alias_with_model_relation_chain_prefix($secondary_table_alias_with_model_chain_prefix) . $this->get_table_to_join_with()->get_table_alias();
-		$primary_table_pk = $this->get_table_to_join_with()->get_pk_column();//$this->get_pk_column();
+	function get_inverse_join_sql($secondary_table_alias_with_model_chain_prefix) {
+		$primary_table_name = $this->get_table_to_join_with()->get_table_name();
+		$primary_table_alias = EE_Model_Parser::get_prefix_from_table_alias_with_model_relation_chain_prefix($secondary_table_alias_with_model_chain_prefix).$this->get_table_to_join_with()->get_table_alias();
+		$primary_table_pk = $this->get_table_to_join_with()->get_pk_column(); //$this->get_pk_column();
 		$fk = $this->get_fk_on_table();
 		$join_sql = " LEFT JOIN $primary_table_name AS $primary_table_alias ON $primary_table_alias.$primary_table_pk = $secondary_table_alias_with_model_chain_prefix.$fk ";
-		if($this->get_extra_join_conditions()){
-			$join_sql.="AND ".$this->get_extra_join_conditions();
+		if ($this->get_extra_join_conditions()) {
+			$join_sql .= "AND ".$this->get_extra_join_conditions();
 		}
 		return $join_sql;
 	}
@@ -94,7 +94,7 @@ 
 	public function get_select_join_limit_join($limit) {
 		//first get the select
 		$select = $this->get_select_join_limit($limit);
-		$join_sql = $this->get_join_sql( $select );
+		$join_sql = $this->get_join_sql($select);
 		return $join_sql;
 	}
 
@@ -103,12 +103,12 @@ 
 	function get_fully_qualified_fk_column() {
 		$table_alias = $this->get_table_alias();
 		$fk = $this->get_fk_on_table();
-		return $table_alias . '.' . $fk;
+		return $table_alias.'.'.$fk;
 	}
 
 	function get_fully_qualified_pk_on_fk_table() {
 		$table_alias = $this->get_table_to_join_with()->get_table_alias();
 		$pk = $this->get_table_to_join_with()->get_pk_column();
-		return $table_alias . '.' . $pk;
+		return $table_alias.'.'.$pk;
 	}
 }
\ No newline at end of file

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_Event_Query.helper.php

Doc Comments +1 added lines, -1 removed lines

@@ -204,7 +204,7 @@
 	 *
 	 * @access    private
 	 * @param string $sort
-	 * @return    array
+	 * @return    string
 	 */
 	private static function _sort( $sort = 'ASC' ) {
 		$sort = EE_Registry::instance()->REQ->is_set( 'event_query_sort' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'event_query_sort' ) ) : $sort;

Spacing +118 added lines, -118 removed lines

@@ -1,5 +1,5 @@ 
-<?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
@@ -85,7 +85,7 @@ 
 	 */
 	public static function add_query_filters() {
 		//add query filters
-		add_action( 'pre_get_posts', array( 'EEH_Event_Query', 'filter_query_parts' ), 10, 1 );
+		add_action('pre_get_posts', array('EEH_Event_Query', 'filter_query_parts'), 10, 1);
 	}
 
 
@@ -97,8 +97,8 @@ 
 	 * @param \WP_Query $WP_Query
 	 * @return bool
 	 */
-	public static function apply_query_filters( WP_Query $WP_Query ) {
-		return ( isset( $WP_Query->query, $WP_Query->query['post_type'] ) && $WP_Query->query['post_type'] == 'espresso_events' ) ||  apply_filters( 'FHEE__EEH_Event_Query__apply_query_filters', false ) ? true : false;
+	public static function apply_query_filters(WP_Query $WP_Query) {
+		return (isset($WP_Query->query, $WP_Query->query['post_type']) && $WP_Query->query['post_type'] == 'espresso_events') || apply_filters('FHEE__EEH_Event_Query__apply_query_filters', false) ? true : false;
 	}
 
 
@@ -108,15 +108,15 @@ 
 	 * @access    public
 	 * @param \WP_Query $WP_Query
 	 */
-	public static function filter_query_parts( WP_Query $WP_Query ) {
+	public static function filter_query_parts(WP_Query $WP_Query) {
 		//ONLY add our filters if this isn't the main wp_query, because if this is the main wp_query we already have our cpt strategies take care of adding things in.
-		if ( $WP_Query instanceof WP_Query && ! $WP_Query->is_main_query() ) {
+		if ($WP_Query instanceof WP_Query && ! $WP_Query->is_main_query()) {
 			// build event list query
-			add_filter( 'posts_fields', array( 'EEH_Event_Query', 'posts_fields' ), 10, 2 );
-			add_filter( 'posts_join', array( 'EEH_Event_Query', 'posts_join' ), 10, 2 );
-			add_filter( 'posts_where', array( 'EEH_Event_Query', 'posts_where' ), 10, 2 );
-			add_filter( 'posts_orderby', array( 'EEH_Event_Query', 'posts_orderby' ), 10, 2 );
-			add_filter( 'posts_clauses_request', array( 'EEH_Event_Query', 'posts_clauses' ), 10, 2 );
+			add_filter('posts_fields', array('EEH_Event_Query', 'posts_fields'), 10, 2);
+			add_filter('posts_join', array('EEH_Event_Query', 'posts_join'), 10, 2);
+			add_filter('posts_where', array('EEH_Event_Query', 'posts_where'), 10, 2);
+			add_filter('posts_orderby', array('EEH_Event_Query', 'posts_orderby'), 10, 2);
+			add_filter('posts_clauses_request', array('EEH_Event_Query', 'posts_clauses'), 10, 2);
 		}
 	}
 
@@ -131,13 +131,13 @@ 
 	 * @param string $orderby
 	 * @param string $sort
 	 */
-	public static function set_query_params( $month = '', $category = '', $show_expired = FALSE, $orderby = 'start_date', $sort = 'ASC' ) {
+	public static function set_query_params($month = '', $category = '', $show_expired = FALSE, $orderby = 'start_date', $sort = 'ASC') {
 		self::$_query_params = array();
-		EEH_Event_Query::$_event_query_month = EEH_Event_Query::_display_month( $month );
-		EEH_Event_Query::$_event_query_category = EEH_Event_Query::_event_category_slug( $category );
-		EEH_Event_Query::$_event_query_show_expired = EEH_Event_Query::_show_expired( $show_expired );
-		EEH_Event_Query::$_event_query_orderby = EEH_Event_Query::_orderby( $orderby );
-		EEH_Event_Query::$_event_query_sort = EEH_Event_Query::_sort( $sort );
+		EEH_Event_Query::$_event_query_month = EEH_Event_Query::_display_month($month);
+		EEH_Event_Query::$_event_query_category = EEH_Event_Query::_event_category_slug($category);
+		EEH_Event_Query::$_event_query_show_expired = EEH_Event_Query::_show_expired($show_expired);
+		EEH_Event_Query::$_event_query_orderby = EEH_Event_Query::_orderby($orderby);
+		EEH_Event_Query::$_event_query_sort = EEH_Event_Query::_sort($sort);
 	}
 
 
@@ -149,8 +149,8 @@ 
 	 * @param string $month
 	 * @return    string
 	 */
-	private static function _display_month( $month = '' ) {
-		return EE_Registry::instance()->REQ->is_set( 'event_query_month' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'event_query_month' ) ) : $month;
+	private static function _display_month($month = '') {
+		return EE_Registry::instance()->REQ->is_set('event_query_month') ? sanitize_text_field(EE_Registry::instance()->REQ->get('event_query_month')) : $month;
 	}
 
 
@@ -162,8 +162,8 @@ 
 	 * @param string $category
 	 * @return    string
 	 */
-	private static function _event_category_slug( $category = '' ) {
-		return EE_Registry::instance()->REQ->is_set( 'event_query_category' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'event_query_category' ) ) : $category;
+	private static function _event_category_slug($category = '') {
+		return EE_Registry::instance()->REQ->is_set('event_query_category') ? sanitize_text_field(EE_Registry::instance()->REQ->get('event_query_category')) : $category;
 	}
 
 
@@ -175,10 +175,10 @@ 
 	 * @param bool $show_expired
 	 * @return    boolean
 	 */
-	private static function _show_expired( $show_expired = FALSE ) {
+	private static function _show_expired($show_expired = FALSE) {
 		// override default expired option if set via filter
-		$_event_query_show_expired =EE_Registry::instance()->REQ->is_set( 'event_query_show_expired' ) ? EE_Registry::instance()->REQ->get( 'event_query_show_expired' ) : $show_expired;
-		return filter_var( $_event_query_show_expired, FILTER_VALIDATE_BOOLEAN );
+		$_event_query_show_expired = EE_Registry::instance()->REQ->is_set('event_query_show_expired') ? EE_Registry::instance()->REQ->get('event_query_show_expired') : $show_expired;
+		return filter_var($_event_query_show_expired, FILTER_VALIDATE_BOOLEAN);
 	}
 
 
@@ -190,10 +190,10 @@ 
 	 * @param    string $orderby
 	 * @return    array
 	 */
-	private static function _orderby( $orderby = 'start_date' ) {
-		$event_query_orderby = EE_Registry::instance()->REQ->is_set( 'event_query_orderby' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'event_query_orderby' ) ) : $orderby;
-		$event_query_orderby = is_array( $event_query_orderby ) ? $event_query_orderby : explode( ',', $event_query_orderby );
-		$event_query_orderby = array_map( 'trim', $event_query_orderby );
+	private static function _orderby($orderby = 'start_date') {
+		$event_query_orderby = EE_Registry::instance()->REQ->is_set('event_query_orderby') ? sanitize_text_field(EE_Registry::instance()->REQ->get('event_query_orderby')) : $orderby;
+		$event_query_orderby = is_array($event_query_orderby) ? $event_query_orderby : explode(',', $event_query_orderby);
+		$event_query_orderby = array_map('trim', $event_query_orderby);
 		return $event_query_orderby;
 	}
 
@@ -206,9 +206,9 @@ 
 	 * @param string $sort
 	 * @return    array
 	 */
-	private static function _sort( $sort = 'ASC' ) {
-		$sort = EE_Registry::instance()->REQ->is_set( 'event_query_sort' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'event_query_sort' ) ) : $sort;
-		return in_array( $sort, array( 'ASC', 'asc', 'DESC', 'desc' )) ? strtoupper( $sort ) : 'ASC';
+	private static function _sort($sort = 'ASC') {
+		$sort = EE_Registry::instance()->REQ->is_set('event_query_sort') ? sanitize_text_field(EE_Registry::instance()->REQ->get('event_query_sort')) : $sort;
+		return in_array($sort, array('ASC', 'asc', 'DESC', 'desc')) ? strtoupper($sort) : 'ASC';
 	}
 
 
@@ -221,10 +221,10 @@ 
 	 *
 	 * @return array   array of clauses
 	 */
-	public static function posts_clauses( $clauses, WP_Query $wp_query ) {
-		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
+	public static function posts_clauses($clauses, WP_Query $wp_query) {
+		if (EEH_Event_Query::apply_query_filters($wp_query)) {
 			global $wpdb;
-			$clauses['groupby'] = $wpdb->posts . '.ID ';
+			$clauses['groupby'] = $wpdb->posts.'.ID ';
 		}
 		return $clauses;
 	}
@@ -239,10 +239,10 @@ 
 	 * @param WP_Query $wp_query
 	 * @return    string
 	 */
-	public static function posts_fields( $SQL, WP_Query $wp_query ) {
-		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
+	public static function posts_fields($SQL, WP_Query $wp_query) {
+		if (EEH_Event_Query::apply_query_filters($wp_query)) {
 			// adds something like ", wp_esp_datetime.* " to WP Query SELECT statement
-			$SQL .= EEH_Event_Query::posts_fields_sql_for_orderby( EEH_Event_Query::$_event_query_orderby );
+			$SQL .= EEH_Event_Query::posts_fields_sql_for_orderby(EEH_Event_Query::$_event_query_orderby);
 		}
 		return $SQL;
 	}
@@ -257,29 +257,29 @@ 
 	 * @internal  param bool|string $mixed $join_terms pass TRUE or term string, doesn't really matter since this value doesn't really get used for anything yet
 	 * @return    string
 	 */
-	public static function posts_fields_sql_for_orderby( $orderby_params = array() ) {
-		$SQL = ', MIN( ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start ) as event_start_date ' ;
-		foreach( (array)$orderby_params as $orderby ) {
-			switch ( $orderby ) {
+	public static function posts_fields_sql_for_orderby($orderby_params = array()) {
+		$SQL = ', MIN( '.EEM_Datetime::instance()->table().'.DTT_EVT_start ) as event_start_date ';
+		foreach ((array) $orderby_params as $orderby) {
+			switch ($orderby) {
 
 				case 'ticket_start' :
-					$SQL .= ', ' . EEM_Ticket::instance()->table() . '.TKT_start_date' ;
+					$SQL .= ', '.EEM_Ticket::instance()->table().'.TKT_start_date';
 					break;
 
 				case 'ticket_end' :
-					$SQL .= ', ' . EEM_Ticket::instance()->table() . '.TKT_end_date' ;
+					$SQL .= ', '.EEM_Ticket::instance()->table().'.TKT_end_date';
 					break;
 
 				case 'venue_title' :
-					$SQL .= ', Venue.post_title AS venue_title' ;
+					$SQL .= ', Venue.post_title AS venue_title';
 					break;
 
 				case 'city' :
-					$SQL .= ', ' . EEM_Venue::instance()->second_table() . '.VNU_city' ;
+					$SQL .= ', '.EEM_Venue::instance()->second_table().'.VNU_city';
 					break;
 
 				case 'state' :
-					$SQL .= ', ' . EEM_State::instance()->table() . '.STA_name' ;
+					$SQL .= ', '.EEM_State::instance()->table().'.STA_name';
 					break;
 
 			}
@@ -297,12 +297,12 @@ 
 	 * @param WP_Query $wp_query
 	 * @return    string
 	 */
-	public static function posts_join( $SQL = '', WP_Query $wp_query ) {
-		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
+	public static function posts_join($SQL = '', WP_Query $wp_query) {
+		if (EEH_Event_Query::apply_query_filters($wp_query)) {
 			// Category
-			$SQL = EEH_Event_Query::posts_join_sql_for_show_expired( $SQL, EEH_Event_Query::$_event_query_show_expired );
-			$SQL = EEH_Event_Query::posts_join_sql_for_terms( $SQL, EEH_Event_Query::$_event_query_category );
-			$SQL = EEH_Event_Query::posts_join_for_orderby( $SQL, EEH_Event_Query::$_event_query_orderby );
+			$SQL = EEH_Event_Query::posts_join_sql_for_show_expired($SQL, EEH_Event_Query::$_event_query_show_expired);
+			$SQL = EEH_Event_Query::posts_join_sql_for_terms($SQL, EEH_Event_Query::$_event_query_category);
+			$SQL = EEH_Event_Query::posts_join_for_orderby($SQL, EEH_Event_Query::$_event_query_orderby);
 		}
 		return $SQL;
 	}
@@ -317,11 +317,11 @@ 
 	 * @param    boolean $show_expired if TRUE, then displayed past events
 	 * @return string
 	 */
-	public static function posts_join_sql_for_show_expired( $SQL = '', $show_expired = FALSE ) {
-		if ( ! $show_expired ) {
-			$join = EEM_Event::instance()->table() . '.ID = ' . EEM_Datetime::instance()->table() . '.' . EEM_Event::instance()->primary_key_name();
-			if ( strpos( $SQL, $join ) === FALSE ) {
-				$SQL .= ' INNER JOIN ' . EEM_Datetime::instance()->table() . ' ON ( ' . $join . ' ) ';
+	public static function posts_join_sql_for_show_expired($SQL = '', $show_expired = FALSE) {
+		if ( ! $show_expired) {
+			$join = EEM_Event::instance()->table().'.ID = '.EEM_Datetime::instance()->table().'.'.EEM_Event::instance()->primary_key_name();
+			if (strpos($SQL, $join) === FALSE) {
+				$SQL .= ' INNER JOIN '.EEM_Datetime::instance()->table().' ON ( '.$join.' ) ';
 			}
 		}
 		return $SQL;
@@ -337,8 +337,8 @@ 
 	 * @param 	string $join_terms pass TRUE or term string, doesn't really matter since this value doesn't really get used for anything yet
 	 * @return 	string
 	 */
-	public static function posts_join_sql_for_terms( $SQL = '', $join_terms = '' ) {
-		if ( ! empty( $join_terms ) ) {
+	public static function posts_join_sql_for_terms($SQL = '', $join_terms = '') {
+		if ( ! empty($join_terms)) {
 			global $wpdb;
 			$SQL .= " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id)";
 			$SQL .= " LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id)";
@@ -358,25 +358,25 @@ 
 	 * @param 	array $orderby_params
 	 * @return 	string
 	 */
-	public static function posts_join_for_orderby( $SQL = '', $orderby_params = array() ) {
-		foreach ( (array)$orderby_params as $orderby ) {
-			switch ( $orderby ) {
+	public static function posts_join_for_orderby($SQL = '', $orderby_params = array()) {
+		foreach ((array) $orderby_params as $orderby) {
+			switch ($orderby) {
 				case 'ticket_start' :
 				case 'ticket_end' :
-					$SQL .= EEH_Event_Query::_posts_join_for_datetime( $SQL, EEM_Datetime_Ticket::instance()->table() . '.' . EEM_Datetime::instance()->primary_key_name() );
-					$SQL .= ' LEFT JOIN ' . EEM_Ticket::instance()->table() . ' ON (' . EEM_Datetime_Ticket::instance()->table() . '.' . EEM_Ticket::instance()->primary_key_name() . ' = ' . EEM_Ticket::instance()->table() . '.' . EEM_Ticket::instance()->primary_key_name() . ' )';
+					$SQL .= EEH_Event_Query::_posts_join_for_datetime($SQL, EEM_Datetime_Ticket::instance()->table().'.'.EEM_Datetime::instance()->primary_key_name());
+					$SQL .= ' LEFT JOIN '.EEM_Ticket::instance()->table().' ON ('.EEM_Datetime_Ticket::instance()->table().'.'.EEM_Ticket::instance()->primary_key_name().' = '.EEM_Ticket::instance()->table().'.'.EEM_Ticket::instance()->primary_key_name().' )';
 					break;
 				case 'venue_title' :
 				case 'city' :
-					$SQL .= EEH_Event_Query::_posts_join_for_event_venue( $SQL );
+					$SQL .= EEH_Event_Query::_posts_join_for_event_venue($SQL);
 					break;
 				case 'state' :
-					$SQL .= EEH_Event_Query::_posts_join_for_event_venue( $SQL );
-					$SQL .= EEH_Event_Query::_posts_join_for_venue_state( $SQL );
+					$SQL .= EEH_Event_Query::_posts_join_for_event_venue($SQL);
+					$SQL .= EEH_Event_Query::_posts_join_for_venue_state($SQL);
 					break;
 				case 'start_date' :
 				default :
-					$SQL .= EEH_Event_Query::_posts_join_for_datetime( $SQL, EEM_Event::instance()->table() . '.ID' );
+					$SQL .= EEH_Event_Query::_posts_join_for_datetime($SQL, EEM_Event::instance()->table().'.ID');
 					break;
 
 			}
@@ -394,11 +394,11 @@ 
 	 * @param string $join
 	 * @return string
 	 */
-	protected static function _posts_join_for_datetime( $SQL = '', $join = '' ) {
-		if ( ! empty( $join )) {
-			$join .= ' = ' . EEM_Datetime::instance()->table() . '.' . EEM_Event::instance()->primary_key_name();
-			if ( strpos( $SQL, $join ) === FALSE ) {
-				return ' INNER JOIN ' . EEM_Datetime::instance()->table() . ' ON ( ' . $join . ' )';
+	protected static function _posts_join_for_datetime($SQL = '', $join = '') {
+		if ( ! empty($join)) {
+			$join .= ' = '.EEM_Datetime::instance()->table().'.'.EEM_Event::instance()->primary_key_name();
+			if (strpos($SQL, $join) === FALSE) {
+				return ' INNER JOIN '.EEM_Datetime::instance()->table().' ON ( '.$join.' )';
 			}
 		}
 		return '';
@@ -413,13 +413,13 @@ 
 	 * @param string $SQL
 	 * @return string
 	 */
-	protected static function _posts_join_for_event_venue( $SQL = '' ) {
+	protected static function _posts_join_for_event_venue($SQL = '') {
 		// Event Venue table name
 		$event_venue_table = EEM_Event_Venue::instance()->table();
 		// generate conditions for:  Event <=> Event Venue  JOIN clause
-		$event_to_event_venue_join = EEM_Event::instance()->table() . '.ID = ' . $event_venue_table . '.' . EEM_Event::instance()->primary_key_name();
+		$event_to_event_venue_join = EEM_Event::instance()->table().'.ID = '.$event_venue_table.'.'.EEM_Event::instance()->primary_key_name();
 		// don't add joins if they have already been added
-		if ( strpos( $SQL, $event_to_event_venue_join ) === FALSE ) {
+		if (strpos($SQL, $event_to_event_venue_join) === FALSE) {
 			// Venue table name
 			$venue_table = EEM_Venue::instance()->table();
 			// Venue table pk
@@ -432,10 +432,10 @@ 
 			$venue_SQL .= " LEFT JOIN $venue_table as Venue ON ( $event_venue_table.$venue_table_pk = Venue.ID )";
 			// generate JOIN clause for: Venue <=> Venue Meta
 			$venue_SQL .= " LEFT JOIN $venue_meta_table ON ( Venue.ID = $venue_meta_table.$venue_table_pk )";
-			unset( $event_venue_table, $event_to_event_venue_join, $venue_table, $venue_table_pk, $venue_meta_table );
+			unset($event_venue_table, $event_to_event_venue_join, $venue_table, $venue_table_pk, $venue_meta_table);
 			return $venue_SQL;
 		}
-		unset( $event_venue_table, $event_to_event_venue_join );
+		unset($event_venue_table, $event_to_event_venue_join);
 		return '';
 	}
 
@@ -448,7 +448,7 @@ 
 	 * @param string $SQL
 	 * @return string
 	 */
-	protected static function _posts_join_for_venue_state( $SQL = '' ) {
+	protected static function _posts_join_for_venue_state($SQL = '') {
 		// Venue Meta table name
 		$venue_meta_table = EEM_Venue::instance()->second_table();
 		// State table name
@@ -456,16 +456,16 @@ 
 		// State table pk
 		$state_table_pk = EEM_State::instance()->primary_key_name();
 		// verify vars
-		if ( $venue_meta_table && $state_table && $state_table_pk ) {
+		if ($venue_meta_table && $state_table && $state_table_pk) {
 			// like: wp_esp_venue_meta.STA_ID = wp_esp_state.STA_ID
 			$join = "$venue_meta_table.$state_table_pk = $state_table.$state_table_pk";
 			// don't add join if it has already been added
-			if ( strpos( $SQL, $join ) === FALSE ) {
-				unset( $state_table_pk, $venue_meta_table, $venue_table_pk );
+			if (strpos($SQL, $join) === FALSE) {
+				unset($state_table_pk, $venue_meta_table, $venue_table_pk);
 				return " LEFT JOIN $state_table ON ( $join )";
 			}
 		}
-		unset( $join, $state_table, $state_table_pk, $venue_meta_table, $venue_table_pk );
+		unset($join, $state_table, $state_table_pk, $venue_meta_table, $venue_table_pk);
 		return '';
 	}
 
@@ -479,14 +479,14 @@ 
 	 * @param WP_Query $wp_query
 	 * @return    string
 	 */
-	public static function posts_where( $SQL = '', WP_Query $wp_query ) {
-		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
+	public static function posts_where($SQL = '', WP_Query $wp_query) {
+		if (EEH_Event_Query::apply_query_filters($wp_query)) {
 			// Show Expired ?
-			$SQL .= EEH_Event_Query::posts_where_sql_for_show_expired( EEH_Event_Query::$_event_query_show_expired  );
+			$SQL .= EEH_Event_Query::posts_where_sql_for_show_expired(EEH_Event_Query::$_event_query_show_expired);
 			// Category
-			$SQL .= EEH_Event_Query::posts_where_sql_for_event_category_slug( EEH_Event_Query::$_event_query_category  );
+			$SQL .= EEH_Event_Query::posts_where_sql_for_event_category_slug(EEH_Event_Query::$_event_query_category);
 			// Start Date
-			$SQL .= EEH_Event_Query::posts_where_sql_for_event_list_month( EEH_Event_Query::$_event_query_month );
+			$SQL .= EEH_Event_Query::posts_where_sql_for_event_list_month(EEH_Event_Query::$_event_query_month);
 		}
 		return $SQL;
 	}
@@ -500,8 +500,8 @@ 
 	 * @param    boolean $show_expired if TRUE, then displayed past events
 	 * @return    string
 	 */
-	public static function posts_where_sql_for_show_expired( $show_expired = FALSE ) {
-		return ! $show_expired ? ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end > \'' . current_time( 'mysql', TRUE ) . '\' ' : '';
+	public static function posts_where_sql_for_show_expired($show_expired = FALSE) {
+		return ! $show_expired ? ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_end > \''.current_time('mysql', TRUE).'\' ' : '';
 	}
 
 
@@ -513,9 +513,9 @@ 
 	 * @param    boolean $event_category_slug
 	 * @return    string
 	 */
-	public static function posts_where_sql_for_event_category_slug( $event_category_slug = NULL ) {
+	public static function posts_where_sql_for_event_category_slug($event_category_slug = NULL) {
 		global $wpdb;
-		return ! empty( $event_category_slug ) ? " AND {$wpdb->terms}.slug = '{$event_category_slug}' " : '';
+		return ! empty($event_category_slug) ? " AND {$wpdb->terms}.slug = '{$event_category_slug}' " : '';
 	}
 
 
@@ -527,14 +527,14 @@ 
 	 * @param    boolean $month
 	 * @return    string
 	 */
-	public static function posts_where_sql_for_event_list_month( $month = NULL ) {
+	public static function posts_where_sql_for_event_list_month($month = NULL) {
 		$SQL = '';
-		if ( ! empty( $month ) ) {
+		if ( ! empty($month)) {
 			$datetime_table = EEM_Datetime::instance()->table();
 			// event start date is LESS than the end of the month ( so nothing that doesn't start until next month )
-			$SQL = " AND {$datetime_table}.DTT_EVT_start <= '" . date( 'Y-m-t 23:59:59', strtotime( $month ) ) . "'";
+			$SQL = " AND {$datetime_table}.DTT_EVT_start <= '".date('Y-m-t 23:59:59', strtotime($month))."'";
 			// event end date is GREATER than the start of the month ( so nothing that ended before this month )
-			$SQL .= " AND {$datetime_table}.DTT_EVT_end >= '" . date( 'Y-m-01 0:0:00', strtotime( $month ) ) . "' ";
+			$SQL .= " AND {$datetime_table}.DTT_EVT_end >= '".date('Y-m-01 0:0:00', strtotime($month))."' ";
 		}
 		return $SQL;
 	}
@@ -549,9 +549,9 @@ 
 	 * @param WP_Query $wp_query
 	 * @return    string
 	 */
-	public static function posts_orderby( $SQL = '', WP_Query $wp_query ) {
-		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
-			$SQL = EEH_Event_Query::posts_orderby_sql( EEH_Event_Query::$_event_query_orderby, EEH_Event_Query::$_event_query_sort );
+	public static function posts_orderby($SQL = '', WP_Query $wp_query) {
+		if (EEH_Event_Query::apply_query_filters($wp_query)) {
+			$SQL = EEH_Event_Query::posts_orderby_sql(EEH_Event_Query::$_event_query_orderby, EEH_Event_Query::$_event_query_sort);
 		}
 		return $SQL;
 	}
@@ -582,63 +582,63 @@ 
 	 * @param string     $sort
 	 * @return string
 	 */
-	public static function posts_orderby_sql( $orderby_params = array(), $sort = 'ASC' ) {
+	public static function posts_orderby_sql($orderby_params = array(), $sort = 'ASC') {
 		global $wpdb;
 		$SQL = '';
 		$counter = 0;
 		//make sure 'orderby' is set in query params
-		if ( ! isset( self::$_query_params['orderby'] )) {
+		if ( ! isset(self::$_query_params['orderby'])) {
 			self::$_query_params['orderby'] = array();
 		}
 		// loop thru $orderby_params (type cast as array)
-		foreach ( (array)$orderby_params as $orderby ) {
+		foreach ((array) $orderby_params as $orderby) {
 			// check if we have already added this param
-			if ( isset( self::$_query_params['orderby'][ $orderby ] )) {
+			if (isset(self::$_query_params['orderby'][$orderby])) {
 				// if so then remove from the $orderby_params so that the count() method below is accurate
-				unset( $orderby_params[ $orderby ] );
+				unset($orderby_params[$orderby]);
 				// then bump ahead to the next param
 				continue;
 			}
 			// this will ad a comma depending on whether this is the first or last param
-			$glue = $counter == 0 || $counter == count( $orderby_params ) ? ' ' : ', ';
+			$glue = $counter == 0 || $counter == count($orderby_params) ? ' ' : ', ';
 			// ok what's we dealing with?
-			switch ( $orderby ) {
+			switch ($orderby) {
 				case 'id' :
 				case 'ID' :
-					$SQL .= $glue . $wpdb->posts . '.ID ' . $sort;
+					$SQL .= $glue.$wpdb->posts.'.ID '.$sort;
 					break;
 				case 'end_date' :
-					$SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_end ' . $sort;
+					$SQL .= $glue.EEM_Datetime::instance()->table().'.DTT_EVT_end '.$sort;
 					break;
 				case 'event_name' :
-					$SQL .= $glue . $wpdb->posts . '.post_title ' . $sort;
+					$SQL .= $glue.$wpdb->posts.'.post_title '.$sort;
 					break;
 				case 'category_slug' :
-					$SQL .= $glue . $wpdb->terms . '.slug ' . $sort;
+					$SQL .= $glue.$wpdb->terms.'.slug '.$sort;
 					break;
 				case 'ticket_start' :
-					$SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_start_date ' . $sort;
+					$SQL .= $glue.EEM_Ticket::instance()->table().'.TKT_start_date '.$sort;
 					break;
 				case 'ticket_end' :
-					$SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_end_date ' . $sort;
+					$SQL .= $glue.EEM_Ticket::instance()->table().'.TKT_end_date '.$sort;
 					break;
 				case 'venue_title' :
-					$SQL .= $glue . 'venue_title ' . $sort;
+					$SQL .= $glue.'venue_title '.$sort;
 					break;
 				case 'city' :
-					$SQL .= $glue . EEM_Venue::instance()->second_table() . '.VNU_city ' . $sort;
+					$SQL .= $glue.EEM_Venue::instance()->second_table().'.VNU_city '.$sort;
 					break;
 				case 'state' :
-					$SQL .= $glue . EEM_State::instance()->table() . '.STA_name ' . $sort;
+					$SQL .= $glue.EEM_State::instance()->table().'.STA_name '.$sort;
 					break;
 				case 'start_date' :
 				default :
-					$SQL .= $glue . ' event_start_date ' . $sort;
+					$SQL .= $glue.' event_start_date '.$sort;
 					break;
 			}
 			// add to array of orderby params that have been added
-			self::$_query_params['orderby'][ $orderby ] = TRUE;
-			$counter ++;
+			self::$_query_params['orderby'][$orderby] = TRUE;
+			$counter++;
 		}
 		return $SQL;
 	}

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( esc_html__( 'The class given for the Qtip loader (%1$s) is not a child of the %2$sEE_Qtip_Config%3$s class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config, '<strong>', '</strong>' ) );
+		if ( ! $qtip instanceof EE_Qtip_Config)
+			throw new EE_Error(sprintf(esc_html__('The class given for the Qtip loader (%1$s) is not a child of the %2$sEE_Qtip_Config%3$s class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config, '<strong>', '</strong>'));
 
 		$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( esc_html__( 'The class given for the Qtip loader (%1$s) is not a child of the %2$sEE_Qtip_Config%3$s class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config, '<strong>', '</strong>' ) );
+		if ( ! $qtip instanceof EE_Qtip_Config ) {
+					throw new EE_Error( sprintf( esc_html__( 'The class given for the Qtip loader (%1$s) is not a child of the %2$sEE_Qtip_Config%3$s class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config, '<strong>', '</strong>' ) );
+		}
 
 		$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;
 		}
 	}

Indentation +4 added lines, -4 removed lines

@@ -139,7 +139,7 @@ 
 		foreach ( $query as $query_args ) {
 			// break apart the key value pairs
 			$query_args = explode( '=', $query_args );
-            // and add to our results array
+			// and add to our results array
 			$query_params[ $query_args[0] ] = $query_args[1];
 		}
 		return $query_params;
@@ -204,9 +204,9 @@ 
 		$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 ) ) {
-                 // fallback sanitization if the above fails
+			$URL = filter_input( INPUT_SERVER, $server_variable, FILTER_SANITIZE_URL, FILTER_NULL_ON_FAILURE );
+			if ( empty( $URL ) ) {
+				 // fallback sanitization if the above fails
 				$URL = wp_sanitize_redirect( $_SERVER[ $server_variable ] );
 			}
 		}

Spacing +59 added lines, -59 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) {
 		// decode, then break apart incoming URL
-		$url_bits = parse_url( html_entity_decode( $url ) );
+		$url_bits = parse_url(html_entity_decode($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,20 +194,20 @@ 
 	 * @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 ) ) {
+		if (isset($server_variables[$server_variable])) {
+            $URL = filter_input(INPUT_SERVER, $server_variable, FILTER_SANITIZE_URL, FILTER_NULL_ON_FAILURE);
+            if (empty($URL)) {
                  // fallback sanitization if the above fails
-				$URL = wp_sanitize_redirect( $_SERVER[ $server_variable ] );
+				$URL = wp_sanitize_redirect($_SERVER[$server_variable]);
 			}
 		}
 		return $URL;
@@ -220,10 +220,10 @@ 
 	 * @return string
 	 */
 	public static function current_url() {
-		if ( isset( $_SERVER[ 'HTTP_HOST' ], $_SERVER[ 'REQUEST_URI' ] ) ) {
+		if (isset($_SERVER['HTTP_HOST'], $_SERVER['REQUEST_URI'])) {
 			$url = is_ssl() ? 'https://' : 'http://';
-			$url .= \EEH_URL::filter_input_server_url( 'HTTP_HOST' );
-			$url .= \EEH_URL::filter_input_server_url( 'REQUEST_URI' );
+			$url .= \EEH_URL::filter_input_server_url('HTTP_HOST');
+			$url .= \EEH_URL::filter_input_server_url('REQUEST_URI');
 		} else {
 			$url = 'unknown';
 		}