eventespresso / event-espresso-core

core/EE_Session.core.php

Doc Comments +4 added lines, -4 removed lines

@@ -364,7 +364,7 @@ 
 	  * set session data
 	  * @access 	public
 	  * @param 	array $data
-	  * @return 	TRUE on success, FALSE on fail
+	  * @return 	boolean on success, FALSE on fail
 	  */
 	public function set_session_data( $data ) {
 
@@ -392,7 +392,7 @@ 
 	 /**
 	  * @initiate session
 	  * @access   private
-	  * @return TRUE on success, FALSE on fail
+	  * @return boolean on success, FALSE on fail
 	  * @throws \EE_Error
 	  */
 	private function _espresso_session() {
@@ -531,7 +531,7 @@ 
 	  * @update session data  prior to saving to the db
 	  * @access public
 	  * @param bool $new_session
-	  * @return TRUE on success, FALSE on fail
+	  * @return boolean on success, FALSE on fail
 	  */
 	public function update( $new_session = FALSE ) {
 		$this->_session_data = isset( $this->_session_data )
@@ -797,7 +797,7 @@ 
 	  * @access public
 	  * @param array $data_to_reset
 	  * @param bool  $show_all_notices
-	  * @return TRUE on success, FALSE on fail
+	  * @return boolean on success, FALSE on fail
 	  */
 	public function reset_data( $data_to_reset = array(), $show_all_notices = FALSE ) {
 		// if $data_to_reset is not in an array, then put it in one

Spacing +169 added lines, -169 removed lines

@@ -1,6 +1,6 @@ 
 <?php use EventEspresso\core\exceptions\InvalidSessionDataException;
 
-if (!defined( 'EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed');}
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed'); }
 /**
  *
  * EE_Session class
@@ -91,7 +91,7 @@ 
 	  * array for defining default session vars
 	  * @var array
 	  */
-	 private $_default_session_vars = array (
+	 private $_default_session_vars = array(
 		'id' => NULL,
 		'user_id' => NULL,
 		'ip_address' => NULL,
@@ -111,12 +111,12 @@ 
 	  * @throws InvalidSessionDataException
 	  * @throws \EE_Error
 	  */
-	public static function instance( EE_Encryption $encryption = null ) {
+	public static function instance(EE_Encryption $encryption = null) {
 		// check if class object is instantiated
 		// session loading is turned ON by default, but prior to the init hook, can be turned back OFF via:
 		// add_filter( 'FHEE_load_EE_Session', '__return_false' );
-		if ( ! self::$_instance instanceof EE_Session && apply_filters( 'FHEE_load_EE_Session', true ) ) {
-			self::$_instance = new self( $encryption );
+		if ( ! self::$_instance instanceof EE_Session && apply_filters('FHEE_load_EE_Session', true)) {
+			self::$_instance = new self($encryption);
 		}
 		return self::$_instance;
 	}
@@ -132,15 +132,15 @@ 
 	  * @throws \EE_Error
 	  * @throws \EventEspresso\core\exceptions\InvalidSessionDataException
 	  */
-	 protected function __construct( EE_Encryption $encryption = null ) {
+	 protected function __construct(EE_Encryption $encryption = null) {
 
 		// session loading is turned ON by default, but prior to the init hook, can be turned back OFF via: add_filter( 'FHEE_load_EE_Session', '__return_false' );
-		if ( ! apply_filters( 'FHEE_load_EE_Session', TRUE ) ) {
+		if ( ! apply_filters('FHEE_load_EE_Session', TRUE)) {
 			return;
 		}
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		if ( ! defined( 'ESPRESSO_SESSION' ) ) {
-			define( 'ESPRESSO_SESSION', true );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		if ( ! defined('ESPRESSO_SESSION')) {
+			define('ESPRESSO_SESSION', true);
 		}
 		// default session lifespan in seconds
 		$this->_lifespan = apply_filters(
@@ -154,12 +154,12 @@ 
 		 * 		}
 		 */
 		// retrieve session options from db
-		$session_settings = (array) get_option( 'ee_session_settings', array() );
-		if ( ! empty( $session_settings )) {
+		$session_settings = (array) get_option('ee_session_settings', array());
+		if ( ! empty($session_settings)) {
 			// cycle though existing session options
-			foreach ( $session_settings as $var_name => $session_setting ) {
+			foreach ($session_settings as $var_name => $session_setting) {
 				// set values for class properties
-				$var_name = '_' . $var_name;
+				$var_name = '_'.$var_name;
 				$this->{$var_name} = $session_setting;
 			}
 		}
@@ -169,16 +169,16 @@ 
         // encrypt data via: $this->encryption->encrypt();
         $this->encryption = $encryption;
 		// filter hook allows outside functions/classes/plugins to change default empty cart
-		$extra_default_session_vars = apply_filters( 'FHEE__EE_Session__construct__extra_default_session_vars', array() );
-		array_merge( $this->_default_session_vars, $extra_default_session_vars );
+		$extra_default_session_vars = apply_filters('FHEE__EE_Session__construct__extra_default_session_vars', array());
+		array_merge($this->_default_session_vars, $extra_default_session_vars);
 		// apply default session vars
 		$this->_set_defaults();
          add_action('AHEE__EE_System__initialize', array($this, 'open_session'));
          // check request for 'clear_session' param
-		add_action( 'AHEE__EE_Request_Handler__construct__complete', array( $this, 'wp_loaded' ));
+		add_action('AHEE__EE_Request_Handler__construct__complete', array($this, 'wp_loaded'));
 		// once everything is all said and done,
-		add_action( 'shutdown', array( $this, 'update' ), 100 );
-		add_action( 'shutdown', array( $this, 'garbage_collection' ), 999 );
+		add_action('shutdown', array($this, 'update'), 100);
+		add_action('shutdown', array($this, 'garbage_collection'), 999);
 	}
 
 
@@ -223,11 +223,11 @@ 
 	 */
 	private function _set_defaults() {
 		// set some defaults
-		foreach ( $this->_default_session_vars as $key => $default_var ) {
-			if ( is_array( $default_var )) {
-				$this->_session_data[ $key ] = array();
+		foreach ($this->_default_session_vars as $key => $default_var) {
+			if (is_array($default_var)) {
+				$this->_session_data[$key] = array();
 			} else {
-				$this->_session_data[ $key ] = '';
+				$this->_session_data[$key] = '';
 			}
 		}
 	}
@@ -249,7 +249,7 @@ 
 	  * @param \EE_Cart $cart
 	  * @return bool
 	  */
-	 public function set_cart( EE_Cart $cart ) {
+	 public function set_cart(EE_Cart $cart) {
 		 $this->_session_data['cart'] = $cart;
 		 return TRUE;
 	 }
@@ -269,7 +269,7 @@ 
 	  * @return \EE_Cart
 	  */
 	 public function cart() {
-		 return isset( $this->_session_data['cart'] ) ? $this->_session_data['cart'] : NULL;
+		 return isset($this->_session_data['cart']) ? $this->_session_data['cart'] : NULL;
 	 }
 
 
@@ -278,7 +278,7 @@ 
 	  * @param \EE_Checkout $checkout
 	  * @return bool
 	  */
-	 public function set_checkout( EE_Checkout $checkout ) {
+	 public function set_checkout(EE_Checkout $checkout) {
 		 $this->_session_data['checkout'] = $checkout;
 		 return TRUE;
 	 }
@@ -298,7 +298,7 @@ 
 	  * @return \EE_Checkout
 	  */
 	 public function checkout() {
-		 return isset( $this->_session_data['checkout'] ) ? $this->_session_data['checkout'] : NULL;
+		 return isset($this->_session_data['checkout']) ? $this->_session_data['checkout'] : NULL;
 	 }
 
 
@@ -308,9 +308,9 @@ 
 	  * @return bool
 	  * @throws \EE_Error
 	  */
-	 public function set_transaction( EE_Transaction $transaction ) {
+	 public function set_transaction(EE_Transaction $transaction) {
 		 // first remove the session from the transaction before we save the transaction in the session
-		 $transaction->set_txn_session_data( NULL );
+		 $transaction->set_txn_session_data(NULL);
 		 $this->_session_data['transaction'] = $transaction;
 		 return TRUE;
 	 }
@@ -330,7 +330,7 @@ 
 	  * @return \EE_Transaction
 	  */
 	 public function transaction() {
-		 return isset( $this->_session_data['transaction'] ) ? $this->_session_data['transaction'] : NULL;
+		 return isset($this->_session_data['transaction']) ? $this->_session_data['transaction'] : NULL;
 	 }
 
 
@@ -342,15 +342,15 @@ 
 	  * @param bool $reset_cache
 	  * @return    array
 	  */
-	public function get_session_data( $key = NULL, $reset_cache = FALSE ) {
-		if ( $reset_cache ) {
+	public function get_session_data($key = NULL, $reset_cache = FALSE) {
+		if ($reset_cache) {
 			$this->reset_cart();
 			$this->reset_checkout();
 			$this->reset_transaction();
 		}
-		 if ( ! empty( $key ))  {
-			return  isset( $this->_session_data[ $key ] ) ? $this->_session_data[ $key ] : NULL;
-		}  else  {
+		 if ( ! empty($key)) {
+			return  isset($this->_session_data[$key]) ? $this->_session_data[$key] : NULL;
+		} else {
 			return $this->_session_data;
 		}
 	}
@@ -363,20 +363,20 @@ 
 	  * @param 	array $data
 	  * @return 	TRUE on success, FALSE on fail
 	  */
-	public function set_session_data( $data ) {
+	public function set_session_data($data) {
 
 		// nothing ??? bad data ??? go home!
-		if ( empty( $data ) || ! is_array( $data )) {
-			EE_Error::add_error( __( 'No session data or invalid session data was provided.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($data) || ! is_array($data)) {
+			EE_Error::add_error(__('No session data or invalid session data was provided.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
-		foreach ( $data as $key =>$value ) {
-			if ( isset( $this->_default_session_vars[ $key ] )) {
-				EE_Error::add_error( sprintf( __( 'Sorry! %s is a default session datum and can not be reset.', 'event_espresso' ), $key ), __FILE__, __FUNCTION__, __LINE__ );
+		foreach ($data as $key =>$value) {
+			if (isset($this->_default_session_vars[$key])) {
+				EE_Error::add_error(sprintf(__('Sorry! %s is a default session datum and can not be reset.', 'event_espresso'), $key), __FILE__, __FUNCTION__, __LINE__);
 				return FALSE;
 			} else {
-				$this->_session_data[ $key ] = $value;
+				$this->_session_data[$key] = $value;
 			}
 		}
 
@@ -394,9 +394,9 @@ 
 	  * @throws \EE_Error
 	  */
 	private function _espresso_session() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		// check that session has started
-		if ( session_id() === '' ) {
+		if (session_id() === '') {
 			//starts a new session if one doesn't already exist, or re-initiates an existing one
 			session_start();
 		}
@@ -405,38 +405,38 @@ 
 		// and the visitors IP
 		$this->_ip_address = $this->_visitor_ip();
 		// set the "user agent"
-		$this->_user_agent = isset($_SERVER['HTTP_USER_AGENT']) ? esc_attr( $_SERVER['HTTP_USER_AGENT'] ) : FALSE;
+		$this->_user_agent = isset($_SERVER['HTTP_USER_AGENT']) ? esc_attr($_SERVER['HTTP_USER_AGENT']) : FALSE;
 		// now let's retrieve what's in the db
         $session_data = $this->_retrieve_session_data();
-        if (! empty($session_data)) {
+        if ( ! empty($session_data)) {
             // get the current time in UTC
-			$this->_time = isset( $this->_time ) ? $this->_time : time();
+			$this->_time = isset($this->_time) ? $this->_time : time();
 			// and reset the session expiration
-			$this->_expiration = isset( $session_data['expiration'] )
+			$this->_expiration = isset($session_data['expiration'])
 				? $session_data['expiration']
 				: $this->_time + $this->_lifespan;
 		} else {
             // set initial site access time and the session expiration
 			$this->_set_init_access_and_expiration();
 			// set referer
-			$this->_session_data[ 'pages_visited' ][ $this->_session_data['init_access'] ] = isset( $_SERVER['HTTP_REFERER'] )
-				? esc_attr( $_SERVER['HTTP_REFERER'] )
+			$this->_session_data['pages_visited'][$this->_session_data['init_access']] = isset($_SERVER['HTTP_REFERER'])
+				? esc_attr($_SERVER['HTTP_REFERER'])
 				: '';
 			// no previous session = go back and create one (on top of the data above)
 			return FALSE;
 		}
         // now the user agent
-		if ( $session_data['user_agent'] !== $this->_user_agent ) {
+		if ($session_data['user_agent'] !== $this->_user_agent) {
 			return FALSE;
 		}
 		// wait a minute... how old are you?
-		if ( $this->_time > $this->_expiration ) {
+		if ($this->_time > $this->_expiration) {
 			// yer too old fer me!
 			// wipe out everything that isn't a default session datum
-			$this->clear_session( __CLASS__, __FUNCTION__ );
+			$this->clear_session(__CLASS__, __FUNCTION__);
 		}
 		// make event espresso session data available to plugin
-		$this->_session_data = array_merge( $this->_session_data, $session_data );
+		$this->_session_data = array_merge($this->_session_data, $session_data);
 		return TRUE;
 
 	}
@@ -452,7 +452,7 @@ 
       */
      protected function _retrieve_session_data()
      {
-         $ssn_key = EE_Session::session_id_prefix . $this->_sid;
+         $ssn_key = EE_Session::session_id_prefix.$this->_sid;
          try {
              // we're using WP's Transient API to store session data using the PHP session ID as the option name
              $session_data = get_transient($ssn_key);
@@ -460,12 +460,12 @@ 
 		         return array();
              }
              if (apply_filters('FHEE__EE_Session___perform_session_id_hash_check', WP_DEBUG)) {
-                 $hash_check = get_transient(EE_Session::hash_check_prefix . $this->_sid);
+                 $hash_check = get_transient(EE_Session::hash_check_prefix.$this->_sid);
                  if ($hash_check && $hash_check !== md5($session_data)) {
 	                 EE_Error::add_error(
                          sprintf(
                              __('The stored data for session %1$s failed to pass a hash check and therefore appears to be invalid.', 'event_espresso'),
-                             EE_Session::session_id_prefix . $this->_sid
+                             EE_Session::session_id_prefix.$this->_sid
                          ),
                          __FILE__, __FUNCTION__, __LINE__
                      );
@@ -477,17 +477,17 @@ 
              $row = $wpdb->get_row(
                  $wpdb->prepare(
                      "SELECT option_value FROM {$wpdb->options} WHERE option_name = %s LIMIT 1",
-                     '_transient_' . $ssn_key
+                     '_transient_'.$ssn_key
                  )
              );
              $session_data = is_object($row) ? $row->option_value : null;
              if ($session_data) {
                  $session_data = preg_replace_callback(
                      '!s:(d+):"(.*?)";!',
-                     function ($match) {
+                     function($match) {
                          return $match[1] === strlen($match[2])
                              ? $match[0]
-                             : 's:' . strlen($match[2]) . ':"' . $match[2] . '";';
+                             : 's:'.strlen($match[2]).':"'.$match[2].'";';
                      },
                      $session_data
                  );
@@ -508,7 +508,7 @@ 
                      'event_espresso'
                  );
                  $msg .= WP_DEBUG
-                     ? '<br><pre>' . print_r($session_data, true) . '</pre><br>' . $this->find_serialize_error($session_data)
+                     ? '<br><pre>'.print_r($session_data, true).'</pre><br>'.$this->find_serialize_error($session_data)
                      : '';
                  throw new InvalidSessionDataException($msg, 0, $e);
              }
@@ -521,11 +521,11 @@ 
                  'event_espresso'
              );
              $msg .= WP_DEBUG
-                 ? '<br><pre>' . print_r($session_data, true) . '</pre><br>' . $this->find_serialize_error($session_data)
+                 ? '<br><pre>'.print_r($session_data, true).'</pre><br>'.$this->find_serialize_error($session_data)
                  : '';
 	         throw new InvalidSessionDataException($msg);
          }
-	     if ( isset( $this->_session_data['transaction'] ) && absint( $this->_session_data['transaction'] ) !== 0 ) {
+	     if (isset($this->_session_data['transaction']) && absint($this->_session_data['transaction']) !== 0) {
 		     $this->_session_data['transaction'] = EEM_Transaction::instance()->get_one_by_ID(
 			     $this->_session_data['transaction']
 	         );
@@ -546,12 +546,12 @@ 
 	  */
 	protected function _generate_session_id() {
 		// check if the SID was passed explicitly, otherwise get from session, then add salt and hash it to reduce length
-		if ( isset( $_REQUEST[ 'EESID' ] ) ) {
-			$session_id = sanitize_text_field( $_REQUEST[ 'EESID' ] );
+		if (isset($_REQUEST['EESID'])) {
+			$session_id = sanitize_text_field($_REQUEST['EESID']);
 		} else {
-			$session_id = md5( session_id() . get_current_blog_id() . $this->_get_sid_salt() );
+			$session_id = md5(session_id().get_current_blog_id().$this->_get_sid_salt());
 		}
-		return apply_filters( 'FHEE__EE_Session___generate_session_id__session_id', $session_id );
+		return apply_filters('FHEE__EE_Session___generate_session_id__session_id', $session_id);
 	}
 
 
@@ -563,20 +563,20 @@ 
 	  */
 	protected function _get_sid_salt() {
 		// was session id salt already saved to db ?
-		if ( empty( $this->_sid_salt ) ) {
+		if (empty($this->_sid_salt)) {
 			// no?  then maybe use WP defined constant
-			if ( defined( 'AUTH_SALT' ) ) {
+			if (defined('AUTH_SALT')) {
 				$this->_sid_salt = AUTH_SALT;
 			}
 			// if salt doesn't exist or is too short
-			if ( empty( $this->_sid_salt ) || strlen( $this->_sid_salt ) < 32 ) {
+			if (empty($this->_sid_salt) || strlen($this->_sid_salt) < 32) {
 				// create a new one
-				$this->_sid_salt = wp_generate_password( 64 );
+				$this->_sid_salt = wp_generate_password(64);
 			}
 			// and save it as a permanent session setting
-			$session_settings = get_option( 'ee_session_settings' );
-			$session_settings[ 'sid_salt' ] = $this->_sid_salt;
-			update_option( 'ee_session_settings', $session_settings );
+			$session_settings = get_option('ee_session_settings');
+			$session_settings['sid_salt'] = $this->_sid_salt;
+			update_option('ee_session_settings', $session_settings);
 		}
 		return $this->_sid_salt;
 	}
@@ -604,19 +604,19 @@ 
 	  * @param bool $new_session
 	  * @return TRUE on success, FALSE on fail
 	  */
-	public function update( $new_session = FALSE ) {
-		$this->_session_data = isset( $this->_session_data )
-			&& is_array( $this->_session_data )
-			&& isset( $this->_session_data['id'])
+	public function update($new_session = FALSE) {
+		$this->_session_data = isset($this->_session_data)
+			&& is_array($this->_session_data)
+			&& isset($this->_session_data['id'])
 			? $this->_session_data
 			: array();
-		if ( empty( $this->_session_data )) {
+		if (empty($this->_session_data)) {
 			$this->_set_defaults();
 		}
 		$session_data = array();
-		foreach ( $this->_session_data as $key => $value ) {
+		foreach ($this->_session_data as $key => $value) {
 
-			switch( $key ) {
+			switch ($key) {
 
 				case 'id' :
 					// session ID
@@ -634,7 +634,7 @@ 
 				break;
 
 				case 'init_access' :
-					$session_data['init_access'] = absint( $value );
+					$session_data['init_access'] = absint($value);
 				break;
 
 				case 'last_access' :
@@ -644,7 +644,7 @@ 
 
 				case 'expiration' :
 					// when the session expires
-					$session_data['expiration'] = ! empty( $this->_expiration )
+					$session_data['expiration'] = ! empty($this->_expiration)
 						? $this->_expiration
 						: $session_data['init_access'] + $this->_lifespan;
 				break;
@@ -656,11 +656,11 @@ 
 
 				case 'pages_visited' :
 					$page_visit = $this->_get_page_visit();
-					if ( $page_visit ) {
+					if ($page_visit) {
 						// set pages visited where the first will be the http referrer
-						$this->_session_data[ 'pages_visited' ][ $this->_time ] = $page_visit;
+						$this->_session_data['pages_visited'][$this->_time] = $page_visit;
 						// we'll only save the last 10 page visits.
-						$session_data[ 'pages_visited' ] = array_slice( $this->_session_data['pages_visited'], -10 );
+						$session_data['pages_visited'] = array_slice($this->_session_data['pages_visited'], -10);
 					}
 				break;
 
@@ -674,9 +674,9 @@ 
 
 		$this->_session_data = $session_data;
 		// creating a new session does not require saving to the db just yet
-		if ( ! $new_session ) {
+		if ( ! $new_session) {
 			// ready? let's save
-			if ( $this->_save_session_to_db() ) {
+			if ($this->_save_session_to_db()) {
 				return TRUE;
 			} else {
 				return FALSE;
@@ -695,9 +695,9 @@ 
 	 * 	@return bool
 	 */
 	private function _create_espresso_session( ) {
-		do_action( 'AHEE_log', __CLASS__, __FUNCTION__, '' );
+		do_action('AHEE_log', __CLASS__, __FUNCTION__, '');
 		// use the update function for now with $new_session arg set to TRUE
-		return  $this->update( TRUE ) ? TRUE : FALSE;
+		return  $this->update(TRUE) ? TRUE : FALSE;
 	}
 
 
@@ -723,15 +723,15 @@ 
 				// OR an admin request that is NOT AJAX
 				|| (
 					is_admin()
-					&& ! ( defined( 'DOING_AJAX' ) && DOING_AJAX )
+					&& ! (defined('DOING_AJAX') && DOING_AJAX)
 				)
 			)
 		) {
 			return false;
 		}
 		$transaction = $this->transaction();
-		if ( $transaction instanceof EE_Transaction ) {
-			if ( ! $transaction->ID() ) {
+		if ($transaction instanceof EE_Transaction) {
+			if ( ! $transaction->ID()) {
 				$transaction->save();
 			}
 			$this->_session_data['transaction'] = $transaction->ID();
@@ -739,13 +739,13 @@ 
 		// then serialize all of our session data
 		$session_data = serialize($this->_session_data);
 		// do we need to also encode it to avoid corrupted data when saved to the db?
-		$session_data = $this->_use_encryption ? $this->encryption->base64_string_encode( $session_data ) : $session_data;
+		$session_data = $this->_use_encryption ? $this->encryption->base64_string_encode($session_data) : $session_data;
 		// maybe save hash check
-		if ( apply_filters( 'FHEE__EE_Session___perform_session_id_hash_check', WP_DEBUG ) ) {
-			set_transient( EE_Session::hash_check_prefix . $this->_sid, md5( $session_data ), $this->_lifespan );
+		if (apply_filters('FHEE__EE_Session___perform_session_id_hash_check', WP_DEBUG)) {
+			set_transient(EE_Session::hash_check_prefix.$this->_sid, md5($session_data), $this->_lifespan);
 		}
 		// we're using the Transient API for storing session data, cuz it's so damn simple -> set_transient(  transient ID, data, expiry )
-		return set_transient( EE_Session::session_id_prefix . $this->_sid, $session_data, $this->_lifespan );
+		return set_transient(EE_Session::session_id_prefix.$this->_sid, $session_data, $this->_lifespan);
 	}
 
 
@@ -771,10 +771,10 @@ 
 			'HTTP_FORWARDED',
 			'REMOTE_ADDR'
 		);
-		foreach ( $server_keys as $key ){
-			if ( isset( $_SERVER[ $key ] )) {
-				foreach ( array_map( 'trim', explode( ',', $_SERVER[ $key ] )) as $ip ) {
-					if ( $ip === '127.0.0.1' || filter_var( $ip, FILTER_VALIDATE_IP ) !== FALSE ) {
+		foreach ($server_keys as $key) {
+			if (isset($_SERVER[$key])) {
+				foreach (array_map('trim', explode(',', $_SERVER[$key])) as $ip) {
+					if ($ip === '127.0.0.1' || filter_var($ip, FILTER_VALIDATE_IP) !== FALSE) {
 						$visitor_ip = $ip;
 					}
 				}
@@ -793,32 +793,32 @@ 
 	 *			@return string
 	 */
 	public function _get_page_visit() {
-		$page_visit = home_url('/') . 'wp-admin/admin-ajax.php';
+		$page_visit = home_url('/').'wp-admin/admin-ajax.php';
 		// check for request url
-		if ( isset( $_SERVER['REQUEST_URI'] )) {
+		if (isset($_SERVER['REQUEST_URI'])) {
 			$http_host = '';
 			$page_id = '?';
 			$e_reg = '';
-			$request_uri = esc_url( $_SERVER['REQUEST_URI'] );
-			$ru_bits = explode( '?', $request_uri );
+			$request_uri = esc_url($_SERVER['REQUEST_URI']);
+			$ru_bits = explode('?', $request_uri);
 			$request_uri = $ru_bits[0];
 			// check for and grab host as well
-			if ( isset( $_SERVER['HTTP_HOST'] )) {
-				$http_host = esc_url( $_SERVER['HTTP_HOST'] );
+			if (isset($_SERVER['HTTP_HOST'])) {
+				$http_host = esc_url($_SERVER['HTTP_HOST']);
 			}
 			// check for page_id in SERVER REQUEST
-			if ( isset( $_REQUEST['page_id'] )) {
+			if (isset($_REQUEST['page_id'])) {
 				// rebuild $e_reg without any of the extra parameters
-				$page_id = '?page_id=' . esc_attr( $_REQUEST['page_id'] ) . '&amp;';
+				$page_id = '?page_id='.esc_attr($_REQUEST['page_id']).'&amp;';
 			}
 			// check for $e_reg in SERVER REQUEST
-			if ( isset( $_REQUEST['ee'] )) {
+			if (isset($_REQUEST['ee'])) {
 				// rebuild $e_reg without any of the extra parameters
-				$e_reg = 'ee=' . esc_attr( $_REQUEST['ee'] );
+				$e_reg = 'ee='.esc_attr($_REQUEST['ee']);
 			}
-			$page_visit = rtrim( $http_host . $request_uri . $page_id . $e_reg, '?' );
+			$page_visit = rtrim($http_host.$request_uri.$page_id.$e_reg, '?');
 		}
-		return $page_visit !== home_url( '/wp-admin/admin-ajax.php' ) ? $page_visit : '';
+		return $page_visit !== home_url('/wp-admin/admin-ajax.php') ? $page_visit : '';
 
 	}
 
@@ -847,14 +847,14 @@ 
 	  * @param string $function
 	  * @return void
 	  */
-	public function clear_session( $class = '', $function = '' ) {
+	public function clear_session($class = '', $function = '') {
 		//echo '<h3 style="color:#999;line-height:.9em;"><span style="color:#2EA2CC">' . __CLASS__ . '</span>::<span style="color:#E76700">' . __FUNCTION__ . '( ' . $class . '::' . $function . '() )</span><br/><span style="font-size:9px;font-weight:normal;">' . __FILE__ . '</span>    <b style="font-size:10px;">  ' . __LINE__ . ' </b></h3>';
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, 'session cleared by : ' . $class . '::' .  $function . '()' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, 'session cleared by : '.$class.'::'.$function.'()');
 		$this->reset_cart();
 		$this->reset_checkout();
 		$this->reset_transaction();
 		// wipe out everything that isn't a default session datum
-		$this->reset_data( array_keys( $this->_session_data ));
+		$this->reset_data(array_keys($this->_session_data));
 		// reset initial site access time and the session expiration
 		$this->_set_init_access_and_expiration();
 		$this->_save_session_to_db();
@@ -869,42 +869,42 @@ 
 	  * @param bool  $show_all_notices
 	  * @return TRUE on success, FALSE on fail
 	  */
-	public function reset_data( $data_to_reset = array(), $show_all_notices = FALSE ) {
+	public function reset_data($data_to_reset = array(), $show_all_notices = FALSE) {
 		// if $data_to_reset is not in an array, then put it in one
-		if ( ! is_array( $data_to_reset ) ) {
-			$data_to_reset = array ( $data_to_reset );
+		if ( ! is_array($data_to_reset)) {
+			$data_to_reset = array($data_to_reset);
 		}
 		// nothing ??? go home!
-		if ( empty( $data_to_reset )) {
-			EE_Error::add_error( __( 'No session data could be reset, because no session var name was provided.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($data_to_reset)) {
+			EE_Error::add_error(__('No session data could be reset, because no session var name was provided.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		$return_value = TRUE;
 		// since $data_to_reset is an array, cycle through the values
-		foreach ( $data_to_reset as $reset ) {
+		foreach ($data_to_reset as $reset) {
 
 			// first check to make sure it is a valid session var
-			if ( isset( $this->_session_data[ $reset ] )) {
+			if (isset($this->_session_data[$reset])) {
 				// then check to make sure it is not a default var
-				if ( ! array_key_exists( $reset, $this->_default_session_vars )) {
+				if ( ! array_key_exists($reset, $this->_default_session_vars)) {
 					// remove session var
-					unset( $this->_session_data[ $reset ] );
-					if ( $show_all_notices ) {
-						EE_Error::add_success( sprintf( __( 'The session variable %s was removed.', 'event_espresso' ), $reset ), __FILE__, __FUNCTION__, __LINE__ );
+					unset($this->_session_data[$reset]);
+					if ($show_all_notices) {
+						EE_Error::add_success(sprintf(__('The session variable %s was removed.', 'event_espresso'), $reset), __FILE__, __FUNCTION__, __LINE__);
 					}
-					$return_value = !isset($return_value) ? TRUE : $return_value;
+					$return_value = ! isset($return_value) ? TRUE : $return_value;
 
 				} else {
 					// yeeeeeeeeerrrrrrrrrrr OUT !!!!
-					if ( $show_all_notices ) {
-						EE_Error::add_error( sprintf( __( 'Sorry! %s is a default session datum and can not be reset.', 'event_espresso' ), $reset ), __FILE__, __FUNCTION__, __LINE__ );
+					if ($show_all_notices) {
+						EE_Error::add_error(sprintf(__('Sorry! %s is a default session datum and can not be reset.', 'event_espresso'), $reset), __FILE__, __FUNCTION__, __LINE__);
 					}
 					$return_value = FALSE;
 				}
 
-			} else if ( $show_all_notices ) {
+			} else if ($show_all_notices) {
 				// oops! that session var does not exist!
-				EE_Error::add_error( sprintf( __( 'The session item provided, %s, is invalid or does not exist.', 'event_espresso' ), $reset ), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(sprintf(__('The session item provided, %s, is invalid or does not exist.', 'event_espresso'), $reset), __FILE__, __FUNCTION__, __LINE__);
 				$return_value = FALSE;
 			}
 
@@ -924,8 +924,8 @@ 
 	 *   @access public
 	 */
 	public function wp_loaded() {
-		if ( isset(  EE_Registry::instance()->REQ ) && EE_Registry::instance()->REQ->is_set( 'clear_session' )) {
-			$this->clear_session( __CLASS__, __FUNCTION__ );
+		if (isset(EE_Registry::instance()->REQ) && EE_Registry::instance()->REQ->is_set('clear_session')) {
+			$this->clear_session(__CLASS__, __FUNCTION__);
 		}
 	}
 
@@ -950,24 +950,24 @@ 
 	  */
 	 public function garbage_collection() {
 		 // only perform during regular requests
-		 if ( ! defined( 'DOING_AJAX') || ! DOING_AJAX ) {
+		 if ( ! defined('DOING_AJAX') || ! DOING_AJAX) {
 			 /** @type WPDB $wpdb */
 			 global $wpdb;
 			 // since transient expiration timestamps are set in the future, we can compare against NOW
 			 $expiration = time();
-			 $too_far_in_the_the_future = $expiration + ( $this->_lifespan * 2 );
+			 $too_far_in_the_the_future = $expiration + ($this->_lifespan * 2);
 			 // filter the query limit. Set to 0 to turn off garbage collection
-			 $expired_session_transient_delete_query_limit = absint( apply_filters( 'FHEE__EE_Session__garbage_collection___expired_session_transient_delete_query_limit', 50 ));
+			 $expired_session_transient_delete_query_limit = absint(apply_filters('FHEE__EE_Session__garbage_collection___expired_session_transient_delete_query_limit', 50));
 			 // non-zero LIMIT means take out the trash
-			 if ( $expired_session_transient_delete_query_limit ) {
+			 if ($expired_session_transient_delete_query_limit) {
 				 //array of transient keys that require garbage collection
 				 $session_keys = array(
 					 EE_Session::session_id_prefix,
 					 EE_Session::hash_check_prefix,
 				 );
-				 foreach ( $session_keys as $session_key ) {
-					 $session_key = str_replace( '_', '\_', $session_key );
-					 $session_key = '\_transient\_timeout\_' . $session_key . '%';
+				 foreach ($session_keys as $session_key) {
+					 $session_key = str_replace('_', '\_', $session_key);
+					 $session_key = '\_transient\_timeout\_'.$session_key.'%';
 					 $SQL = "
 					SELECT option_name
 					FROM {$wpdb->options}
@@ -977,25 +977,25 @@ 
 					OR option_value > {$too_far_in_the_the_future} )
 					LIMIT {$expired_session_transient_delete_query_limit}
 				";
-					 $expired_sessions = $wpdb->get_col( $SQL );
+					 $expired_sessions = $wpdb->get_col($SQL);
 					 // valid results?
-					 if ( ! $expired_sessions instanceof WP_Error && ! empty( $expired_sessions ) ) {
+					 if ( ! $expired_sessions instanceof WP_Error && ! empty($expired_sessions)) {
 						 // format array of results into something usable within the actual DELETE query's IN clause
 						 $expired = array();
-						 foreach ( $expired_sessions as $expired_session ) {
-							 $expired[ ] = "'" . $expired_session . "'";
-							 $expired[ ] = "'" . str_replace( 'timeout_', '', $expired_session ) . "'";
+						 foreach ($expired_sessions as $expired_session) {
+							 $expired[] = "'".$expired_session."'";
+							 $expired[] = "'".str_replace('timeout_', '', $expired_session)."'";
 						 }
-						 $expired = implode( ', ', $expired );
+						 $expired = implode(', ', $expired);
 						 $SQL = "
 						DELETE FROM {$wpdb->options}
 						WHERE option_name
 						IN ( $expired );
 					 ";
-						 $results = $wpdb->query( $SQL );
+						 $results = $wpdb->query($SQL);
 						 // if something went wrong, then notify the admin
-						 if ( $results instanceof WP_Error && is_admin() ) {
-							 EE_Error::add_error( $results->get_error_message(), __FILE__, __FUNCTION__, __LINE__ );
+						 if ($results instanceof WP_Error && is_admin()) {
+							 EE_Error::add_error($results->get_error_message(), __FILE__, __FUNCTION__, __LINE__);
 						 }
 					 }
 				 }
@@ -1016,34 +1016,34 @@ 
 	  * @param $data1
 	  * @return string
 	  */
-	 private function find_serialize_error( $data1 ) {
+	 private function find_serialize_error($data1) {
 		$error = "<pre>";
 		 $data2 = preg_replace_callback(
 			 '!s:(\d+):"(.*?)";!',
-			 function ( $match ) {
-				 return ( $match[1] === strlen( $match[2] ) )
+			 function($match) {
+				 return ($match[1] === strlen($match[2]))
 					 ? $match[0]
 					 : 's:'
-					   . strlen( $match[2] )
+					   . strlen($match[2])
 					   . ':"'
 					   . $match[2]
 					   . '";';
 			 },
 			 $data1
 		 );
-		$max = ( strlen( $data1 ) > strlen( $data2 ) ) ? strlen( $data1 ) : strlen( $data2 );
-		$error .= $data1 . PHP_EOL;
-		$error .= $data2 . PHP_EOL;
-		for ( $i = 0; $i < $max; $i++ ) {
-			if ( @$data1[ $i ] !== @$data2[ $i ] ) {
-				$error .= "Difference " . @$data1[ $i ] . " != " . @$data2[ $i ] . PHP_EOL;
-				$error .= "\t-> ORD number " . ord( @$data1[ $i ] ) . " != " . ord( @$data2[ $i ] ) . PHP_EOL;
-				$error .= "\t-> Line Number = $i" . PHP_EOL;
-				$start = ( $i - 20 );
-				$start = ( $start < 0 ) ? 0 : $start;
+		$max = (strlen($data1) > strlen($data2)) ? strlen($data1) : strlen($data2);
+		$error .= $data1.PHP_EOL;
+		$error .= $data2.PHP_EOL;
+		for ($i = 0; $i < $max; $i++) {
+			if (@$data1[$i] !== @$data2[$i]) {
+				$error .= "Difference ".@$data1[$i]." != ".@$data2[$i].PHP_EOL;
+				$error .= "\t-> ORD number ".ord(@$data1[$i])." != ".ord(@$data2[$i]).PHP_EOL;
+				$error .= "\t-> Line Number = $i".PHP_EOL;
+				$start = ($i - 20);
+				$start = ($start < 0) ? 0 : $start;
 				$length = 40;
 				$point = $max - $i;
-				if ( $point < 20 ) {
+				if ($point < 20) {
 					$rlength = 1;
 					$rpoint = -$point;
 				} else {
@@ -1052,16 +1052,16 @@ 
 				}
 				$error .= "\t-> Section Data1  = ";
 				$error .= substr_replace(
-					substr( $data1, $start, $length ),
-					"<b style=\"color:green\">{$data1[ $i ]}</b>",
+					substr($data1, $start, $length),
+					"<b style=\"color:green\">{$data1[$i]}</b>",
 					$rpoint,
 					$rlength
 				);
 				$error .= PHP_EOL;
 				$error .= "\t-> Section Data2  = ";
 				$error .= substr_replace(
-					substr( $data2, $start, $length ),
-					"<b style=\"color:red\">{$data2[ $i ]}</b>",
+					substr($data2, $start, $length),
+					"<b style=\"color:red\">{$data2[$i]}</b>",
 					$rpoint,
 					$rlength
 				);

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

Spacing +77 added lines, -77 removed lines

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

admin_pages/payments/Payments_Admin_Page.core.php

Spacing +173 added lines, -173 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -44,8 +44,8 @@ 
 	 * @param bool $routing indicate whether we want to just load the object and handle routing or just load the object.
 	 * @return \Payments_Admin_Page
 	 */
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
 	}
 
 
@@ -130,19 +130,19 @@ 
 	protected function _set_page_config() {
 		$payment_method_list_config = array(
 			'nav'           => array(
-				'label' => __( 'Payment Methods', 'event_espresso' ),
+				'label' => __('Payment Methods', 'event_espresso'),
 				'order' => 10
 			),
 			'metaboxes'     => $this->_default_espresso_metaboxes,
 			'help_tabs'     => array_merge(
 				array(
 					'payment_methods_overview_help_tab' => array(
-						'title'    => __( 'Payment Methods Overview', 'event_espresso' ),
+						'title'    => __('Payment Methods Overview', 'event_espresso'),
 						'filename' => 'payment_methods_overview'
 					)
 				),
 				$this->_add_payment_method_help_tabs() ),
-			'help_tour'     => array( 'Payment_Methods_Selection_Help_Tour' ),
+			'help_tour'     => array('Payment_Methods_Selection_Help_Tour'),
 			'require_nonce' => false
 		);
 
@@ -160,7 +160,7 @@ 
 					)
 				),
 				//'help_tour' => array( 'Payment_Methods_Settings_Help_Tour' ),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'require_nonce' => FALSE
 			),
 			'payment_log'=>array(
@@ -179,17 +179,17 @@ 
 	/**
 	 * @return array
 	 */
-	protected function _add_payment_method_help_tabs(){
+	protected function _add_payment_method_help_tabs() {
 		EE_Registry::instance()->load_lib('Payment_Method_Manager');
 		$payment_method_types = EE_Payment_Method_Manager::instance()->payment_method_types();
 		$all_pmt_help_tabs_config = array();
-		foreach( $payment_method_types as $payment_method_type ){
-			if ( ! EE_Registry::instance()->CAP->current_user_can( $payment_method_type->cap_name(), 'specific_payment_method_type_access' ) ) {
+		foreach ($payment_method_types as $payment_method_type) {
+			if ( ! EE_Registry::instance()->CAP->current_user_can($payment_method_type->cap_name(), 'specific_payment_method_type_access')) {
 				continue;
 			}
-			foreach( $payment_method_type->help_tabs_config() as $help_tab_name => $config ){
-				$template_args = isset( $config[ 'template_args' ] ) ? $config[ 'template_args' ] : array();
-				$template_args[ 'admin_page_obj' ] = $this;
+			foreach ($payment_method_type->help_tabs_config() as $help_tab_name => $config) {
+				$template_args = isset($config['template_args']) ? $config['template_args'] : array();
+				$template_args['admin_page_obj'] = $this;
 				$all_pmt_help_tabs_config[$help_tab_name] = array(
 					'title'=>$config['title'],
 					'content'=>EEH_Template::display_template(
@@ -216,9 +216,9 @@ 
 
 
 	public function load_scripts_styles() {
-		wp_enqueue_script( 'ee_admin_js' );
-		wp_enqueue_script( 'ee-text-links' );
-		wp_enqueue_script( 'espresso_payments', EE_PAYMENTS_ASSETS_URL . 'espresso_payments_admin.js', array( 'espresso-ui-theme', 'ee-datepicker' ), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_enqueue_script('ee_admin_js');
+		wp_enqueue_script('ee-text-links');
+		wp_enqueue_script('espresso_payments', EE_PAYMENTS_ASSETS_URL.'espresso_payments_admin.js', array('espresso-ui-theme', 'ee-datepicker'), EVENT_ESPRESSO_VERSION, TRUE);
 	}
 
 
@@ -227,9 +227,9 @@ 
 
 	public function load_scripts_styles_default() {
 		//styles
-		wp_register_style( 'espresso_payments', EE_PAYMENTS_ASSETS_URL . 'ee-payments.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_style( 'espresso_payments' );
-		wp_enqueue_style( 'ee-text-links' );
+		wp_register_style('espresso_payments', EE_PAYMENTS_ASSETS_URL.'ee-payments.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('espresso_payments');
+		wp_enqueue_style('ee-text-links');
 		//scripts
 	}
 
@@ -243,44 +243,44 @@ 
 		 * to the loading process.  However, people MUST setup the details for the payment method so its safe to do a
 		 * recheck here.
 		 */
-		EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
+		EE_Registry::instance()->load_lib('Payment_Method_Manager');
 		EEM_Payment_Method::instance()->verify_button_urls();
 		//setup tabs, one for each payment method type
 		$tabs = array();
 		$payment_methods = array();
-		foreach( EE_Payment_Method_Manager::instance()->payment_method_types() as $pmt_obj ) {
+		foreach (EE_Payment_Method_Manager::instance()->payment_method_types() as $pmt_obj) {
 			// we don't want to show admin-only PMTs for now
-			if ( $pmt_obj instanceof EE_PMT_Admin_Only ) {
+			if ($pmt_obj instanceof EE_PMT_Admin_Only) {
 				continue;
 			}
 			//check access
-			if ( ! EE_Registry::instance()->CAP->current_user_can( $pmt_obj->cap_name(), 'specific_payment_method_type_access' ) ) {
+			if ( ! EE_Registry::instance()->CAP->current_user_can($pmt_obj->cap_name(), 'specific_payment_method_type_access')) {
 				continue;
 			}
 			//check for any active pms of that type
-			$payment_method = EEM_Payment_Method::instance()->get_one_of_type( $pmt_obj->system_name() );
-			if ( ! $payment_method instanceof EE_Payment_Method ) {
+			$payment_method = EEM_Payment_Method::instance()->get_one_of_type($pmt_obj->system_name());
+			if ( ! $payment_method instanceof EE_Payment_Method) {
 				$payment_method = EE_Payment_Method::new_instance(
 					array(
-						'PMD_slug'					=>sanitize_key( $pmt_obj->system_name() ),
+						'PMD_slug'					=>sanitize_key($pmt_obj->system_name()),
 						'PMD_type'					=>$pmt_obj->system_name(),
 						'PMD_name'				=>$pmt_obj->pretty_name(),
 						'PMD_admin_name'	=>$pmt_obj->pretty_name()
 					)
 				);
 			}
-			$payment_methods[ $payment_method->slug() ] = $payment_method;
+			$payment_methods[$payment_method->slug()] = $payment_method;
 		}
-		$payment_methods = apply_filters( 'FHEE__Payments_Admin_Page___payment_methods_list__payment_methods', $payment_methods );
-		foreach( $payment_methods as $payment_method ) {
-			if ( $payment_method instanceof EE_Payment_Method ) {
+		$payment_methods = apply_filters('FHEE__Payments_Admin_Page___payment_methods_list__payment_methods', $payment_methods);
+		foreach ($payment_methods as $payment_method) {
+			if ($payment_method instanceof EE_Payment_Method) {
 				add_meta_box(
 					//html id
-					'espresso_' . $payment_method->slug() . '_payment_settings',
+					'espresso_'.$payment_method->slug().'_payment_settings',
 					//title
-					sprintf( __( '%s Settings', 'event_espresso' ), $payment_method->admin_name() ),
+					sprintf(__('%s Settings', 'event_espresso'), $payment_method->admin_name()),
 					//callback
-					array( $this, 'payment_method_settings_meta_box' ),
+					array($this, 'payment_method_settings_meta_box'),
 					//post type
 					null,
 					//context
@@ -288,19 +288,19 @@ 
 					//priority
 					'default',
 					//callback args
-					array( 'payment_method' => $payment_method )
+					array('payment_method' => $payment_method)
 				);
 				//setup for tabbed content
-				$tabs[ $payment_method->slug() ] = array(
+				$tabs[$payment_method->slug()] = array(
 					'label' => $payment_method->admin_name(),
 					'class' => $payment_method->active() ? 'gateway-active' : '',
-					'href'  => 'espresso_' . $payment_method->slug() . '_payment_settings',
-					'title' => __( 'Modify this Payment Method', 'event_espresso' ),
+					'href'  => 'espresso_'.$payment_method->slug().'_payment_settings',
+					'title' => __('Modify this Payment Method', 'event_espresso'),
 					'slug'  => $payment_method->slug()
 				);
 			}
 		}
-		$this->_template_args['admin_page_header'] = EEH_Tabbed_Content::tab_text_links( $tabs, 'payment_method_links', '|', $this->_get_active_payment_method_slug() );
+		$this->_template_args['admin_page_header'] = EEH_Tabbed_Content::tab_text_links($tabs, 'payment_method_links', '|', $this->_get_active_payment_method_slug());
 		$this->display_admin_page_with_sidebar();
 
 	}
@@ -311,20 +311,20 @@ 
 	 *   _get_active_payment_method_slug
 	 * 	@return string
 	 */
-	protected function _get_active_payment_method_slug(){
+	protected function _get_active_payment_method_slug() {
 		$payment_method_slug = FALSE;
 		//decide which payment method tab to open first, as dictated by the request's 'payment_method'
-		if ( isset( $this->_req_data['payment_method'] )) {
+		if (isset($this->_req_data['payment_method'])) {
 			// if they provided the current payment method, use it
-			$payment_method_slug = sanitize_key( $this->_req_data['payment_method'] );
+			$payment_method_slug = sanitize_key($this->_req_data['payment_method']);
 		}
-		$payment_method = EEM_Payment_Method::instance()->get_one( array( array( 'PMD_slug' => $payment_method_slug )));
+		$payment_method = EEM_Payment_Method::instance()->get_one(array(array('PMD_slug' => $payment_method_slug)));
 		// if that didn't work or wasn't provided, find another way to select the current pm
-		if ( ! $this->_verify_payment_method( $payment_method )) {
+		if ( ! $this->_verify_payment_method($payment_method)) {
 			// like, looking for an active one
-			$payment_method = EEM_Payment_Method::instance()->get_one_active( 'CART' );
+			$payment_method = EEM_Payment_Method::instance()->get_one_active('CART');
 			// test that one as well
-			if ( $this->_verify_payment_method( $payment_method )) {
+			if ($this->_verify_payment_method($payment_method)) {
 				$payment_method_slug = $payment_method->slug();
 			} else {
 				$payment_method_slug = 'paypal_standard';
@@ -342,11 +342,11 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return boolean
 	 */
-	protected function _verify_payment_method( $payment_method ){
+	protected function _verify_payment_method($payment_method) {
 		if (
 			$payment_method instanceof EE_Payment_Method &&
 			$payment_method->type_obj() instanceof EE_PMT_Base &&
-			EE_Registry::instance()->CAP->current_user_can( $payment_method->type_obj()->cap_name(), 'specific_payment_method_type_access' )
+			EE_Registry::instance()->CAP->current_user_can($payment_method->type_obj()->cap_name(), 'specific_payment_method_type_access')
 		) {
 			return TRUE;
 		}
@@ -363,21 +363,21 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	public function payment_method_settings_meta_box( $post_obj_which_is_null, $metabox ){
-		$payment_method = isset( $metabox['args'], $metabox['args']['payment_method'] ) ? $metabox['args']['payment_method'] : NULL;
-		if ( ! $payment_method instanceof EE_Payment_Method ){
-			throw new EE_Error( sprintf( __( 'Payment method metabox setup incorrectly. No Payment method object was supplied', 'event_espresso' )));
+	public function payment_method_settings_meta_box($post_obj_which_is_null, $metabox) {
+		$payment_method = isset($metabox['args'], $metabox['args']['payment_method']) ? $metabox['args']['payment_method'] : NULL;
+		if ( ! $payment_method instanceof EE_Payment_Method) {
+			throw new EE_Error(sprintf(__('Payment method metabox setup incorrectly. No Payment method object was supplied', 'event_espresso')));
 		}
 		$payment_method_scopes = $payment_method->active();
 		// if the payment method really exists show its form, otherwise the activation template
-		if ( $payment_method->ID() && ! empty( $payment_method_scopes )) {
-				$form = $this->_generate_payment_method_settings_form( $payment_method );
-				if ( $form->form_data_present_in( $this->_req_data )) {
-					$form->receive_form_submission( $this->_req_data );
+		if ($payment_method->ID() && ! empty($payment_method_scopes)) {
+				$form = $this->_generate_payment_method_settings_form($payment_method);
+				if ($form->form_data_present_in($this->_req_data)) {
+					$form->receive_form_submission($this->_req_data);
 				}
-				echo $form->form_open() . $form->get_html_and_js() . $form->form_close();
+				echo $form->form_open().$form->get_html_and_js().$form->form_close();
 		} else {
-			echo $this->_activate_payment_method_button( $payment_method )->get_html_and_js();
+			echo $this->_activate_payment_method_button($payment_method)->get_html_and_js();
 		}
 	}
 
@@ -390,14 +390,14 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _generate_payment_method_settings_form( EE_Payment_Method $payment_method ) {
-		if ( ! $payment_method instanceof EE_Payment_Method ){
+	protected function _generate_payment_method_settings_form(EE_Payment_Method $payment_method) {
+		if ( ! $payment_method instanceof EE_Payment_Method) {
 			return new EE_Form_Section_Proper();
 		}
 		return new EE_Form_Section_Proper(
 			array(
-				'name' 	=> $payment_method->slug() . '_settings_form',
-				'html_id' 	=> $payment_method->slug() . '_settings_form',
+				'name' 	=> $payment_method->slug().'_settings_form',
+				'html_id' 	=> $payment_method->slug().'_settings_form',
 				'action' 	=> EE_Admin_Page::add_query_args_and_nonce(
 					array(
 						'action' 						=> 'update_payment_method',
@@ -409,12 +409,12 @@ 
 				'subsections' 			=> apply_filters(
 					'FHEE__Payments_Admin_Page___generate_payment_method_settings_form__form_subsections',
 					array(
-						'pci_dss_compliance_' . $payment_method->slug() 				=> $this->_pci_dss_compliance( $payment_method ),
-						'currency_support_' . $payment_method->slug()					=> $this->_currency_support( $payment_method ),
-						'payment_method_settings_' . $payment_method->slug() 	=> $this->_payment_method_settings( $payment_method ),
-						'update_' . $payment_method->slug()										=> $this->_update_payment_method_button( $payment_method ),
-						'deactivate_' . $payment_method->slug()								=> $this->_deactivate_payment_method_button( $payment_method ),
-						'fine_print_' . $payment_method->slug()									=> $this->_fine_print()
+						'pci_dss_compliance_'.$payment_method->slug() 				=> $this->_pci_dss_compliance($payment_method),
+						'currency_support_'.$payment_method->slug()					=> $this->_currency_support($payment_method),
+						'payment_method_settings_'.$payment_method->slug() 	=> $this->_payment_method_settings($payment_method),
+						'update_'.$payment_method->slug()										=> $this->_update_payment_method_button($payment_method),
+						'deactivate_'.$payment_method->slug()								=> $this->_deactivate_payment_method_button($payment_method),
+						'fine_print_'.$payment_method->slug()									=> $this->_fine_print()
 					),
 					$payment_method
 				)
@@ -431,19 +431,19 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _pci_dss_compliance( EE_Payment_Method $payment_method ) {
-		if ( $payment_method->type_obj()->requires_https() ) {
+	protected function _pci_dss_compliance(EE_Payment_Method $payment_method) {
+		if ($payment_method->type_obj()->requires_https()) {
 			return new EE_Form_Section_HTML(
 				EEH_HTML::tr(
 					EEH_HTML::th(
 						EEH_HTML::label(
-							EEH_HTML::strong( __( 'IMPORTANT', 'event_espresso' ), '', 'important-notice' )
+							EEH_HTML::strong(__('IMPORTANT', 'event_espresso'), '', 'important-notice')
 						)
-					) .
+					).
 					EEH_HTML::td(
-						EEH_HTML::strong( __( 'You are responsible for your own website security and Payment Card Industry Data Security Standards (PCI DSS) compliance.', 'event_espresso' )) .
-						EEH_HTML::br() .
-						__( 'Learn more about ', 'event_espresso' ) . EEH_HTML::link( 'https://www.pcisecuritystandards.org/merchants/index.php', __( 'PCI DSS compliance', 'event_espresso' ))
+						EEH_HTML::strong(__('You are responsible for your own website security and Payment Card Industry Data Security Standards (PCI DSS) compliance.', 'event_espresso')).
+						EEH_HTML::br().
+						__('Learn more about ', 'event_espresso').EEH_HTML::link('https://www.pcisecuritystandards.org/merchants/index.php', __('PCI DSS compliance', 'event_espresso'))
 					)
 				)
 			);
@@ -461,19 +461,19 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _currency_support( EE_Payment_Method $payment_method ) {
-		if ( ! $payment_method->usable_for_currency( EE_Config::instance()->currency->code )) {
+	protected function _currency_support(EE_Payment_Method $payment_method) {
+		if ( ! $payment_method->usable_for_currency(EE_Config::instance()->currency->code)) {
 			return new EE_Form_Section_HTML(
 				EEH_HTML::tr(
 					EEH_HTML::th(
 						EEH_HTML::label(
-							EEH_HTML::strong( __( 'IMPORTANT', 'event_espresso' ), '', 'important-notice' )
+							EEH_HTML::strong(__('IMPORTANT', 'event_espresso'), '', 'important-notice')
 						)
-					) .
+					).
 					EEH_HTML::td(
 						EEH_HTML::strong(
 							sprintf(
-								__( 'This payment method does not support the currency set on your site (%1$s) and so will not appear as a payment option to registrants. Please activate a different payment method or change your site\'s country and associated currency.', 'event_espresso'),
+								__('This payment method does not support the currency set on your site (%1$s) and so will not appear as a payment option to registrants. Please activate a different payment method or change your site\'s country and associated currency.', 'event_espresso'),
 								EE_Config::instance()->currency->code
 							)
 						)
@@ -493,9 +493,9 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_HTML
 	 */
-	protected function _payment_method_settings( EE_Payment_Method $payment_method ) {
+	protected function _payment_method_settings(EE_Payment_Method $payment_method) {
 		//modify the form so we only have/show fields that will be implemented for this version
-		return $this->_simplify_form( $payment_method->type_obj()->settings_form(), $payment_method->name() );
+		return $this->_simplify_form($payment_method->type_obj()->settings_form(), $payment_method->name());
 	}
 
 
@@ -508,8 +508,8 @@ 
 	 * @return \EE_Payment_Method_Form
 	 * @throws \EE_Error
 	 */
-	protected function _simplify_form( $form_section, $payment_method_name = '' ){
-		if ( $form_section instanceof EE_Payment_Method_Form ) {
+	protected function _simplify_form($form_section, $payment_method_name = '') {
+		if ($form_section instanceof EE_Payment_Method_Form) {
 			$form_section->exclude(
 				array(
 					'PMD_type', //dont want them changing the type
@@ -520,7 +520,7 @@ 
 			);
 			return $form_section;
 		} else {
-			throw new EE_Error( sprintf( __( 'The EE_Payment_Method_Form for the "%1$s" payment method is missing or invalid.', 'event_espresso' ), $payment_method_name ));
+			throw new EE_Error(sprintf(__('The EE_Payment_Method_Form for the "%1$s" payment method is missing or invalid.', 'event_espresso'), $payment_method_name));
 		}
 	}
 
@@ -533,19 +533,19 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_HTML
 	 */
-	protected function _update_payment_method_button( EE_Payment_Method $payment_method ) {
+	protected function _update_payment_method_button(EE_Payment_Method $payment_method) {
 		$update_button = new EE_Submit_Input(
 			array(
 				'name' => 'submit',
-				'html_id' 		=> 'save_' . $payment_method->slug() . '_settings',
-				'default' 		=> sprintf( __( 'Update %s Payment Settings', 'event_espresso' ), $payment_method->admin_name() ),
+				'html_id' 		=> 'save_'.$payment_method->slug().'_settings',
+				'default' 		=> sprintf(__('Update %s Payment Settings', 'event_espresso'), $payment_method->admin_name()),
 				'html_label' => EEH_HTML::nbsp()
 			)
 		);
 		return new EE_Form_Section_HTML(
-			EEH_HTML::no_row( EEH_HTML::br(2) ) .
+			EEH_HTML::no_row(EEH_HTML::br(2)).
 			EEH_HTML::tr(
-				EEH_HTML::th( __( 'Update Settings', 'event_espresso') ) .
+				EEH_HTML::th(__('Update Settings', 'event_espresso')).
 				EEH_HTML::td(
 					$update_button->get_html_for_input()
 				)
@@ -562,11 +562,11 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _deactivate_payment_method_button( EE_Payment_Method $payment_method ) {
-		$link_text_and_title = sprintf( __( 'Deactivate %1$s Payments?', 'event_espresso'), $payment_method->admin_name() );
+	protected function _deactivate_payment_method_button(EE_Payment_Method $payment_method) {
+		$link_text_and_title = sprintf(__('Deactivate %1$s Payments?', 'event_espresso'), $payment_method->admin_name());
 		return new EE_Form_Section_HTML(
 			EEH_HTML::tr(
-				EEH_HTML::th( __( 'Deactivate Payment Method', 'event_espresso') ) .
+				EEH_HTML::th(__('Deactivate Payment Method', 'event_espresso')).
 				EEH_HTML::td(
 					EEH_HTML::link(
 						EE_Admin_Page::add_query_args_and_nonce(
@@ -578,7 +578,7 @@ 
 						),
 						$link_text_and_title,
 						$link_text_and_title,
-						'deactivate_' . $payment_method->slug(),
+						'deactivate_'.$payment_method->slug(),
 						'espresso-button button-secondary'
 					)
 				)
@@ -594,12 +594,12 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _activate_payment_method_button( EE_Payment_Method $payment_method ) {
-		$link_text_and_title = sprintf( __( 'Activate %1$s Payment Method?', 'event_espresso'), $payment_method->admin_name() );
+	protected function _activate_payment_method_button(EE_Payment_Method $payment_method) {
+		$link_text_and_title = sprintf(__('Activate %1$s Payment Method?', 'event_espresso'), $payment_method->admin_name());
 		return new EE_Form_Section_Proper(
 			array(
-				'name' 	=> 'activate_' . $payment_method->slug() . '_settings_form',
-				'html_id' 	=> 'activate_' . $payment_method->slug() . '_settings_form',
+				'name' 	=> 'activate_'.$payment_method->slug().'_settings_form',
+				'html_id' 	=> 'activate_'.$payment_method->slug().'_settings_form',
 				'action' 	=> '#',
 				'layout_strategy'		=> new EE_Admin_Two_Column_Layout(),
 				'subsections' 			=> apply_filters(
@@ -607,17 +607,17 @@ 
 					array(
 						new EE_Form_Section_HTML(
 							EEH_HTML::tr(
-								EEH_HTML::td( $payment_method->type_obj()->introductory_html(),
+								EEH_HTML::td($payment_method->type_obj()->introductory_html(),
 									'',
 									'',
 									'',
 									'colspan="2"' 
 								)
-							) . 
+							). 
 							EEH_HTML::tr(
 								EEH_HTML::th(
-									EEH_HTML::label( __( 'Click to Activate ', 'event_espresso' ))
-								) .
+									EEH_HTML::label(__('Click to Activate ', 'event_espresso'))
+								).
 								EEH_HTML::td(
 									EEH_HTML::link(
 										EE_Admin_Page::add_query_args_and_nonce(
@@ -629,7 +629,7 @@ 
 										),
 										$link_text_and_title,
 										$link_text_and_title,
-										'activate_' . $payment_method->slug(),
+										'activate_'.$payment_method->slug(),
 										'espresso-button-green button-primary'
 									)
 								)
@@ -651,9 +651,9 @@ 
 	protected function _fine_print() {
 		return new EE_Form_Section_HTML(
 			EEH_HTML::tr(
-				EEH_HTML::th() .
+				EEH_HTML::th().
 				EEH_HTML::td(
-					EEH_HTML::p( __( 'All fields marked with a * are required fields', 'event_espresso' ), '', 'grey-text' )
+					EEH_HTML::p(__('All fields marked with a * are required fields', 'event_espresso'), '', 'grey-text')
 				)
 			)
 		);
@@ -665,15 +665,15 @@ 
 	 * Activates a payment method of that type. Mostly assuming there is only 1 of that type (or none so far)
 	 * @global WP_User $current_user
 	 */
-	protected function _activate_payment_method(){
-		if(isset($this->_req_data['payment_method_type'])){
+	protected function _activate_payment_method() {
+		if (isset($this->_req_data['payment_method_type'])) {
 			$payment_method_type = sanitize_text_field($this->_req_data['payment_method_type']);
 			//see if one exists
-			EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
-			$payment_method = EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type( $payment_method_type );
+			EE_Registry::instance()->load_lib('Payment_Method_Manager');
+			$payment_method = EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type($payment_method_type);
 
-			$this->_redirect_after_action(1, 'Payment Method', 'activated', array('action' => 'default','payment_method'=>$payment_method->slug()));
-		}else{
+			$this->_redirect_after_action(1, 'Payment Method', 'activated', array('action' => 'default', 'payment_method'=>$payment_method->slug()));
+		} else {
 			$this->_redirect_after_action(FALSE, 'Payment Method', 'activated', array('action' => 'default'));
 		}
 	}
@@ -681,14 +681,14 @@ 
 	/**
 	 * Deactivates the payment method with the specified slug, and redirects.
 	 */
-	protected function _deactivate_payment_method(){
-		if(isset($this->_req_data['payment_method'])){
+	protected function _deactivate_payment_method() {
+		if (isset($this->_req_data['payment_method'])) {
 			$payment_method_slug = sanitize_key($this->_req_data['payment_method']);
 			//deactivate it
 			EE_Registry::instance()->load_lib('Payment_Method_Manager');
-			$count_updated = EE_Payment_Method_Manager::instance()->deactivate_payment_method( $payment_method_slug );
-			$this->_redirect_after_action($count_updated, 'Payment Method', 'deactivated', array('action' => 'default','payment_method'=>$payment_method_slug));
-		}else{
+			$count_updated = EE_Payment_Method_Manager::instance()->deactivate_payment_method($payment_method_slug);
+			$this->_redirect_after_action($count_updated, 'Payment Method', 'deactivated', array('action' => 'default', 'payment_method'=>$payment_method_slug));
+		} else {
 			$this->_redirect_after_action(FALSE, 'Payment Method', 'deactivated', array('action' => 'default'));
 		}
 	}
@@ -702,46 +702,46 @@ 
 	 * subsequently called 'headers_sent_func' which is _payment_methods_list)
 	 * @return void
 	 */
-	protected function _update_payment_method(){
-		if( $_SERVER['REQUEST_METHOD'] == 'POST'){
+	protected function _update_payment_method() {
+		if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 			//ok let's find which gateway form to use based on the form input
 			EE_Registry::instance()->load_lib('Payment_Method_Manager');
 			/** @var $correct_pmt_form_to_use EE_Payment_Method_Form */
 			$correct_pmt_form_to_use = NULL;
 			$payment_method = NULL;
-			foreach( EEM_Payment_Method::instance()->get_all() as $payment_method){
+			foreach (EEM_Payment_Method::instance()->get_all() as $payment_method) {
 				//get the form and simplify it, like what we do when we display it
-				$pmt_form = $this->_generate_payment_method_settings_form( $payment_method );
-				if($pmt_form->form_data_present_in($this->_req_data)){
+				$pmt_form = $this->_generate_payment_method_settings_form($payment_method);
+				if ($pmt_form->form_data_present_in($this->_req_data)) {
 					$correct_pmt_form_to_use = $pmt_form;
 					break;
 				}
 			}
 			//if we couldn't find the correct payment method type...
-			if( ! $correct_pmt_form_to_use ){
+			if ( ! $correct_pmt_form_to_use) {
 				EE_Error::add_error(__("We could not find which payment method type your form submission related to. Please contact support", 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				$this->_redirect_after_action(FALSE, 'Payment Method', 'activated', array('action' => 'default'));
 			}
 			$correct_pmt_form_to_use->receive_form_submission($this->_req_data);
-			if($correct_pmt_form_to_use->is_valid()){
-				$subsection_name = 'payment_method_settings_' . $payment_method->slug();
-				$payment_settings_subform = $correct_pmt_form_to_use->get_subsection( $subsection_name );
-				if( ! $payment_settings_subform instanceof EE_Payment_Method_Form ) {
+			if ($correct_pmt_form_to_use->is_valid()) {
+				$subsection_name = 'payment_method_settings_'.$payment_method->slug();
+				$payment_settings_subform = $correct_pmt_form_to_use->get_subsection($subsection_name);
+				if ( ! $payment_settings_subform instanceof EE_Payment_Method_Form) {
 					throw new EE_Error( 
 						sprintf(
-							__( 'The payment method could not be saved because the form sections were misnamed. We expected to find %1$s, but did not.','event_espresso' ),
+							__('The payment method could not be saved because the form sections were misnamed. We expected to find %1$s, but did not.', 'event_espresso'),
 							$subsection_name
 						)
 					);
 				}
 				$payment_settings_subform->save();
 				/** @var $pm EE_Payment_Method */
-				$this->_redirect_after_action(TRUE, 'Payment Method', 'updated', array('action' => 'default','payment_method'=>$payment_method->slug()));
-			}else{
+				$this->_redirect_after_action(TRUE, 'Payment Method', 'updated', array('action' => 'default', 'payment_method'=>$payment_method->slug()));
+			} else {
 				EE_Error::add_error(
 					sprintf(
 						__('Payment method of type %s was not saved because there were validation errors. They have been marked in the form', 'event_espresso'),
-						$payment_method instanceof EE_PMT_Base ? $payment_method->pretty_name() : __( '"(unknown)"', 'event_espresso' )
+						$payment_method instanceof EE_PMT_Base ? $payment_method->pretty_name() : __('"(unknown)"', 'event_espresso')
 					),
 					__FILE__,
 					__FUNCTION__,
@@ -758,11 +758,11 @@ 
 	protected function _payment_settings() {
 
 		$this->_template_args['values'] = $this->_yes_no_values;
-		$this->_template_args['show_pending_payment_options'] = isset( EE_Registry::instance()->CFG->registration->show_pending_payment_options ) ? absint( EE_Registry::instance()->CFG->registration->show_pending_payment_options ) : FALSE;
+		$this->_template_args['show_pending_payment_options'] = isset(EE_Registry::instance()->CFG->registration->show_pending_payment_options) ? absint(EE_Registry::instance()->CFG->registration->show_pending_payment_options) : FALSE;
 
-		$this->_set_add_edit_form_tags( 'update_payment_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( EE_PAYMENTS_TEMPLATE_PATH . 'payment_settings.template.php', $this->_template_args, TRUE );
+		$this->_set_add_edit_form_tags('update_payment_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(EE_PAYMENTS_TEMPLATE_PATH.'payment_settings.template.php', $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
 
 	}
@@ -776,8 +776,8 @@ 
 	*		@return array
 	*/
 	protected function _update_payment_settings() {
-		EE_Registry::instance()->CFG->registration->show_pending_payment_options = isset( $this->_req_data['show_pending_payment_options'] ) ? $this->_req_data['show_pending_payment_options'] : FALSE;
-		EE_Registry::instance()->CFG = apply_filters( 'FHEE__Payments_Admin_Page___update_payment_settings__CFG', EE_Registry::instance()->CFG );
+		EE_Registry::instance()->CFG->registration->show_pending_payment_options = isset($this->_req_data['show_pending_payment_options']) ? $this->_req_data['show_pending_payment_options'] : FALSE;
+		EE_Registry::instance()->CFG = apply_filters('FHEE__Payments_Admin_Page___update_payment_settings__CFG', EE_Registry::instance()->CFG);
 
 //		 $superform = new EE_Form_Section_Proper(
 //		 	array(
@@ -797,9 +797,9 @@ 
 //		 	$this->_redirect_after_action( 0, 'settings', 'updated', array( 'action' => 'payment_settings' ) );
 //		 }
 
-		$what = __('Payment Settings','event_espresso');
-		$success = $this->_update_espresso_configuration( $what, EE_Registry::instance()->CFG, __FILE__, __FUNCTION__, __LINE__ );
-		$this->_redirect_after_action( $success, $what, __('updated','event_espresso'), array( 'action' => 'payment_settings' ) );
+		$what = __('Payment Settings', 'event_espresso');
+		$success = $this->_update_espresso_configuration($what, EE_Registry::instance()->CFG, __FILE__, __FUNCTION__, __LINE__);
+		$this->_redirect_after_action($success, $what, __('updated', 'event_espresso'), array('action' => 'payment_settings'));
 
 	}
 	protected function _payment_log_overview_list_table() {
@@ -825,18 +825,18 @@ 
 	 * @param bool $count
 	 * @return array
 	 */
-	public function get_payment_logs($per_page = 50, $current_page = 0, $count = false){
-		EE_Registry::instance()->load_model( 'Change_Log' );
+	public function get_payment_logs($per_page = 50, $current_page = 0, $count = false) {
+		EE_Registry::instance()->load_model('Change_Log');
 		//we may need to do multiple queries (joining differently), so we actually wan tan array of query params
-		$query_params =  array(array('LOG_type'=>  EEM_Change_Log::type_gateway));
+		$query_params = array(array('LOG_type'=>  EEM_Change_Log::type_gateway));
 		//check if they've selected a specific payment method
-		if( isset($this->_req_data['_payment_method']) && $this->_req_data['_payment_method'] !== 'all'){
+		if (isset($this->_req_data['_payment_method']) && $this->_req_data['_payment_method'] !== 'all') {
 			$query_params[0]['OR*pm_or_pay_pm'] = array('Payment.Payment_Method.PMD_ID'=>$this->_req_data['_payment_method'],
 				'Payment_Method.PMD_ID'=>$this->_req_data['_payment_method']);
 		}
 		//take into account search
-		if(isset($this->_req_data['s']) && $this->_req_data['s']){
-			$similarity_string = array('LIKE','%'.str_replace("","%",$this->_req_data['s']) .'%');
+		if (isset($this->_req_data['s']) && $this->_req_data['s']) {
+			$similarity_string = array('LIKE', '%'.str_replace("", "%", $this->_req_data['s']).'%');
 			$query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_fname'] = $similarity_string;
 			$query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_lname'] = $similarity_string;
 			$query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_email'] = $similarity_string;
@@ -851,48 +851,48 @@ 
 			$query_params[0]['OR*s']['LOG_message'] = $similarity_string;
 
 		}
-		if(isset( $this->_req_data['payment-filter-start-date'] ) && isset( $this->_req_data['payment-filter-end-date'] )){
+		if (isset($this->_req_data['payment-filter-start-date']) && isset($this->_req_data['payment-filter-end-date'])) {
 			//add date
-			$start_date =wp_strip_all_tags( $this->_req_data['payment-filter-start-date'] );
-			$end_date = wp_strip_all_tags( $this->_req_data['payment-filter-end-date'] );
+			$start_date = wp_strip_all_tags($this->_req_data['payment-filter-start-date']);
+			$end_date = wp_strip_all_tags($this->_req_data['payment-filter-end-date']);
 			//make sure our timestamps start and end right at the boundaries for each day
-			$start_date = date( 'Y-m-d', strtotime( $start_date ) ) . ' 00:00:00';
-			$end_date = date( 'Y-m-d', strtotime( $end_date ) ) . ' 23:59:59';
+			$start_date = date('Y-m-d', strtotime($start_date)).' 00:00:00';
+			$end_date = date('Y-m-d', strtotime($end_date)).' 23:59:59';
 
 			//convert to timestamps
-			$start_date = strtotime( $start_date );
-			$end_date = strtotime( $end_date );
+			$start_date = strtotime($start_date);
+			$end_date = strtotime($end_date);
 
 			//makes sure start date is the lowest value and vice versa
-			$start_date = min( $start_date, $end_date );
-			$end_date = max( $start_date, $end_date );
+			$start_date = min($start_date, $end_date);
+			$end_date = max($start_date, $end_date);
 
 			//convert for query
-			$start_date = EEM_Change_Log::instance()->convert_datetime_for_query( 'LOG_time', date( 'Y-m-d H:i:s', $start_date ), 'Y-m-d H:i:s' );
-			$end_date = EEM_Change_Log::instance()->convert_datetime_for_query( 'LOG_time', date( 'Y-m-d H:i:s', $end_date ), 'Y-m-d H:i:s' );
+			$start_date = EEM_Change_Log::instance()->convert_datetime_for_query('LOG_time', date('Y-m-d H:i:s', $start_date), 'Y-m-d H:i:s');
+			$end_date = EEM_Change_Log::instance()->convert_datetime_for_query('LOG_time', date('Y-m-d H:i:s', $end_date), 'Y-m-d H:i:s');
 
-			$query_params[0]['LOG_time'] = array('BETWEEN',array($start_date,$end_date));
+			$query_params[0]['LOG_time'] = array('BETWEEN', array($start_date, $end_date));
 
 		}
-		if($count){
+		if ($count) {
 			return EEM_Change_Log::instance()->count($query_params);
 		}
-		if(isset($this->_req_data['order'])){
-			$sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'DESC';
+		if (isset($this->_req_data['order'])) {
+			$sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'DESC';
 			$query_params['order_by'] = array('LOG_time' => $sort);
-		}else{
+		} else {
 				$query_params['order_by'] = array('LOG_time' => 'DESC');
 		}
-		$offset = ($current_page-1)*$per_page;
+		$offset = ($current_page - 1) * $per_page;
 
-		if( ! isset($this->_req_data['download_results'])){
-			$query_params['limit'] = array( $offset, $per_page );
+		if ( ! isset($this->_req_data['download_results'])) {
+			$query_params['limit'] = array($offset, $per_page);
 		}
 
 
 
 		//now they've requested to instead just download the file instead of viewing it.
-		if(isset($this->_req_data['download_results'])){
+		if (isset($this->_req_data['download_results'])) {
 			$wpdb_results = EEM_Change_Log::instance()->get_all_efficiently($query_params);
 			header('Content-Disposition: attachment');
 			header("Content-Disposition: attachment; filename=ee_payment_logs_for_".sanitize_key(site_url()));
@@ -914,36 +914,36 @@ 
 	 * @param EE_Change_Log $logB
 	 * @return int
 	 */
-	protected function _sort_logs_again($logA,$logB){
+	protected function _sort_logs_again($logA, $logB) {
 		$timeA = $logA->get_raw('LOG_time');
 		$timeB = $logB->get_raw('LOG_time');
-		if($timeA == $timeB){
+		if ($timeA == $timeB) {
 			return 0;
 		}
 		$comparison = $timeA < $timeB ? -1 : 1;
-		if(strtoupper($this->_sort_logs_again_direction) == 'DESC'){
+		if (strtoupper($this->_sort_logs_again_direction) == 'DESC') {
 			return $comparison * -1;
-		}else{
+		} else {
 			return $comparison;
 		}
 	}
 
 	protected function _payment_log_details() {
-		EE_Registry::instance()->load_model( 'Change_Log' );
+		EE_Registry::instance()->load_model('Change_Log');
 		/** @var $payment_log EE_Change_Log */
 		$payment_log = EEM_Change_Log::instance()->get_one_by_ID($this->_req_data['ID']);
 		$payment_method = NULL;
 		$transaction = NULL;
-		if( $payment_log instanceof EE_Change_Log ){
-			if( $payment_log->object() instanceof EE_Payment ){
+		if ($payment_log instanceof EE_Change_Log) {
+			if ($payment_log->object() instanceof EE_Payment) {
 				$payment_method = $payment_log->object()->payment_method();
 				$transaction = $payment_log->object()->transaction();
-			}elseif($payment_log->object() instanceof EE_Payment_Method){
+			}elseif ($payment_log->object() instanceof EE_Payment_Method) {
 				$payment_method = $payment_log->object();
 			}
 		}
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
-			EE_PAYMENTS_TEMPLATE_PATH . 'payment_log_details.template.php',
+			EE_PAYMENTS_TEMPLATE_PATH.'payment_log_details.template.php',
 			array(
 				'payment_log'=>$payment_log,
 				'payment_method'=>$payment_method,

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

Spacing +57 added lines, -57 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION')){
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 /**
@@ -79,12 +79,12 @@ 
 	 *	@type $name string the name for this form section, if you want to explicitly define it
 	 * }
 	 */
-	public function __construct( $options_array = array() ) {
+	public function __construct($options_array = array()) {
 		// used by display strategies
 		// assign incoming values to properties
-		foreach( $options_array as $key => $value ) {
-			$key = '_' . $key;
-			if ( property_exists( $this, $key ) && empty( $this->{$key} )) {
+		foreach ($options_array as $key => $value) {
+			$key = '_'.$key;
+			if (property_exists($this, $key) && empty($this->{$key} )) {
 				$this->{$key} = $value;
 			}
 		}
@@ -97,10 +97,10 @@ 
 	 * @param $name
 	 * @throws \EE_Error
 	 */
-	protected function _construct_finalize( $parent_form_section, $name ){
+	protected function _construct_finalize($parent_form_section, $name) {
 		$this->_construction_finalized = TRUE;
 		$this->_parent_section = $parent_form_section;
-		if( $name !== null ) {
+		if ($name !== null) {
 			$this->_name = $name;
 		}
 	}
@@ -111,9 +111,9 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function ensure_construct_finalized_called(){
-		if( ! $this->_construction_finalized ){
-			$this->_construct_finalize($this->_parent_section, $this->_name );
+	public function ensure_construct_finalized_called() {
+		if ( ! $this->_construction_finalized) {
+			$this->_construct_finalize($this->_parent_section, $this->_name);
 		}
 	}
 
@@ -131,7 +131,7 @@ 
 	/**
 	 * @param string $action
 	 */
-	public function set_action( $action ) {
+	public function set_action($action) {
 		$this->_action = $action;
 	}
 
@@ -141,7 +141,7 @@ 
 	 * @return string
 	 */
 	public function method() {
-		return ! empty( $this->_method ) ? $this->_method : 'POST';
+		return ! empty($this->_method) ? $this->_method : 'POST';
 	}
 
 
@@ -149,8 +149,8 @@ 
 	/**
 	 * @param string $method
 	 */
-	public function set_method( $method ) {
-		switch ( $method ) {
+	public function set_method($method) {
+		switch ($method) {
 			case 'get' :
 			case 'GET' :
 				$this->_method = 'GET';
@@ -169,12 +169,12 @@ 
 	 *
 	 * @throws \EE_Error
 	 */
-	protected function _set_default_html_id_if_empty(){
-		if( ! $this->_html_id ){
-			if( $this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper ){
-				$this->_html_id = $this->_parent_section->html_id() . '-' . $this->_prep_name_for_html_id( $this->name() );
-			}else{
-				$this->_html_id = $this->_prep_name_for_html_id( $this->name() );
+	protected function _set_default_html_id_if_empty() {
+		if ( ! $this->_html_id) {
+			if ($this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper) {
+				$this->_html_id = $this->_parent_section->html_id().'-'.$this->_prep_name_for_html_id($this->name());
+			} else {
+				$this->_html_id = $this->_prep_name_for_html_id($this->name());
 			}
 		}
 	}
@@ -186,8 +186,8 @@ 
 	 * @param $name
 	 * @return string
 	 */
-	private function _prep_name_for_html_id( $name ) {
-		return sanitize_key( str_replace( array( '&nbsp;', ' ', '_' ), '-', $name ));
+	private function _prep_name_for_html_id($name) {
+		return sanitize_key(str_replace(array('&nbsp;', ' ', '_'), '-', $name));
 	}
 
 
@@ -201,7 +201,7 @@ 
 	 * and so might stop working anytime.
 	 * @return string
 	 */
-	public function get_html_and_js(){
+	public function get_html_and_js() {
 		return $this->get_html();
 	}
 	
@@ -217,9 +217,9 @@ 
 	 * @param bool $add_pound_sign
 	 * @return string
 	 */
-	public function html_id( $add_pound_sign = FALSE ){
+	public function html_id($add_pound_sign = FALSE) {
 		$this->_set_default_html_id_if_empty();
-		return $add_pound_sign ? '#' . $this->_html_id : $this->_html_id;
+		return $add_pound_sign ? '#'.$this->_html_id : $this->_html_id;
 	}
 
 
@@ -227,7 +227,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_class(){
+	public function html_class() {
 		return $this->_html_class;
 	}
 
@@ -236,7 +236,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_style(){
+	public function html_style() {
 		return $this->_html_style;
 	}
 
@@ -245,7 +245,7 @@ 
 	/**
 	 * @param mixed $html_class
 	 */
-	public function set_html_class( $html_class ) {
+	public function set_html_class($html_class) {
 		$this->_html_class = $html_class;
 	}
 
@@ -254,7 +254,7 @@ 
 	/**
 	 * @param mixed $html_id
 	 */
-	public function set_html_id( $html_id ) {
+	public function set_html_id($html_id) {
 		$this->_html_id = $html_id;
 	}
 
@@ -263,7 +263,7 @@ 
 	/**
 	 * @param mixed $html_style
 	 */
-	public function set_html_style( $html_style ) {
+	public function set_html_style($html_style) {
 		$this->_html_style = $html_style;
 	}
 
@@ -272,7 +272,7 @@ 
 	/**
 	 * @param string $other_html_attributes
 	 */
-	public function set_other_html_attributes( $other_html_attributes ) {
+	public function set_other_html_attributes($other_html_attributes) {
 		$this->_other_html_attributes = $other_html_attributes;
 	}
 
@@ -292,9 +292,9 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	public function name(){
-		if( ! $this->_construction_finalized ){
-			throw new EE_Error(sprintf( __( 'You cannot use the form section\s name until _construct_finalize has been called on it (when we set the name). It was called on a form section of type \'s\'', 'event_espresso' ), get_class($this) ) );
+	public function name() {
+		if ( ! $this->_construction_finalized) {
+			throw new EE_Error(sprintf(__('You cannot use the form section\s name until _construct_finalize has been called on it (when we set the name). It was called on a form section of type \'s\'', 'event_espresso'), get_class($this)));
 		}
 		return $this->_name;
 	}
@@ -305,7 +305,7 @@ 
 	 * Gets the parent section
 	 * @return EE_Form_Section_Proper
 	 */
-	public function parent_section(){
+	public function parent_section() {
 		return $this->_parent_section;
 	}
 
@@ -318,18 +318,18 @@ 
 	 * @param string $other_attributes anything else added to the form open tag, MUST BE VALID HTML
 	 * @return string
 	 */
-	public function form_open( $action = '', $method = '', $other_attributes = '' ) {
-		if ( ! empty( $action )) {
-			$this->set_action( $action );
+	public function form_open($action = '', $method = '', $other_attributes = '') {
+		if ( ! empty($action)) {
+			$this->set_action($action);
 		}
-		if ( ! empty( $method )) {
-			$this->set_method( $method );
+		if ( ! empty($method)) {
+			$this->set_method($method);
 		}
-		$html = EEH_HTML::nl( 1, 'form' ) . '<form';
-		$html .= $this->html_id() !== '' ? ' id="' . $this->html_id() . '"' : '';
-		$html .= ' action="' . $this->action() . '"';
-		$html .= ' method="' . $this->method() . '"';
-		$html .= $other_attributes . '>';
+		$html = EEH_HTML::nl(1, 'form').'<form';
+		$html .= $this->html_id() !== '' ? ' id="'.$this->html_id().'"' : '';
+		$html .= ' action="'.$this->action().'"';
+		$html .= ' method="'.$this->method().'"';
+		$html .= $other_attributes.'>';
 		return $html;
 	}
 
@@ -340,7 +340,7 @@ 
 	 * @return string
 	 */
 	public function form_close() {
-		return EEH_HTML::nl( -1, 'form' ) . '</form>' . EEH_HTML::nl() . '<!-- end of ee-' . $this->html_id() . '-form -->' . EEH_HTML::nl();
+		return EEH_HTML::nl( -1, 'form' ).'</form>'.EEH_HTML::nl().'<!-- end of ee-'.$this->html_id().'-form -->'.EEH_HTML::nl();
 	}
 	
 	/**
@@ -349,7 +349,7 @@ 
 	 * Default does nothing, but child classes can override
 	 * @return void
 	 */
-	public function enqueue_js(){
+	public function enqueue_js() {
 		//defaults to enqueue NO js or css
 	}
 
@@ -365,7 +365,7 @@ 
 	 * @param array $form_other_js_data
 	 * @return array
 	 */
-	public function get_other_js_data( $form_other_js_data = array() ) {
+	public function get_other_js_data($form_other_js_data = array()) {
 		return $form_other_js_data;
 	}
 
@@ -383,20 +383,20 @@ 
 	 * @param string|false $form_section_path we accept false also because substr( '../', '../' ) = false
 	 * @return EE_Form_Section_Base
 	 */
-	public function find_section_from_path( $form_section_path ) {		
-		if( strpos( $form_section_path, '/' ) === 0 ) {
-			$form_section_path = substr( $form_section_path, strlen( '/' ) );
+	public function find_section_from_path($form_section_path) {		
+		if (strpos($form_section_path, '/') === 0) {
+			$form_section_path = substr($form_section_path, strlen('/'));
 		}
-		if( empty( $form_section_path ) ) {
+		if (empty($form_section_path)) {
 			return $this;
 		}
-		if( strpos( $form_section_path, '../' ) === 0 ) {
+		if (strpos($form_section_path, '../') === 0) {
 			$parent = $this->parent_section();
 			
-			$form_section_path = substr( $form_section_path, strlen( '../' ) );
-			if( $parent instanceof EE_Form_Section_Base ) {
-				return $parent->find_section_from_path( $form_section_path );
-			} elseif( empty( $form_section_path ) ) {
+			$form_section_path = substr($form_section_path, strlen('../'));
+			if ($parent instanceof EE_Form_Section_Base) {
+				return $parent->find_section_from_path($form_section_path);
+			} elseif (empty($form_section_path)) {
 				return $this;
 			}
 		}

payment_methods/Paypal_Standard/EE_Paypal_Standard_Form.form.php

Indentation +5 added lines, -5 removed lines

@@ -57,11 +57,11 @@
 
 
 
-    /**
-     * @param array $req_data
-     * @throws EE_Error
-     */
-    public function _normalize( $req_data ) {
+	/**
+	 * @param array $req_data
+	 * @throws EE_Error
+	 */
+	public function _normalize( $req_data ) {
 		parent::_normalize( $req_data );
 		$paypal_calculates_shipping = $this->get_input_value( 'paypal_shipping' );
 		$paypal_calculates_taxes = $this->get_input_value( 'paypal_taxes' );

Spacing +37 added lines, -37 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -21,35 +21,35 @@ 
 	/**
 	 * @param EE_PMT_Paypal_Standard $payment_method_type
 	 */
-	public function __construct( $payment_method_type ){
+	public function __construct($payment_method_type) {
 		parent::__construct(
 			array(
 				'payment_method_type'          => $payment_method_type,
 				'extra_meta_inputs'            => array(
-					'paypal_id'        => new EE_Text_Input( array(
-						'html_label_text' => sprintf( __( "Paypal Email %s", 'event_espresso' ), $payment_method_type->get_help_tab_link() ),
-						'html_help_text'  => __( "Typically payment@example-domain.com", 'event_espresso' ),
+					'paypal_id'        => new EE_Text_Input(array(
+						'html_label_text' => sprintf(__("Paypal Email %s", 'event_espresso'), $payment_method_type->get_help_tab_link()),
+						'html_help_text'  => __("Typically payment@example-domain.com", 'event_espresso'),
 						'required'        => true
-					) ),
-					'image_url'        => new EE_Admin_File_Uploader_Input( array(
-						'html_help_text'  => __( "Used for your business/personal logo on the PayPal page", 'event_espresso' ),
-						'html_label_text' => __( 'Image URL', 'event_espresso' )
-					) ),
-					'paypal_taxes'     => new EE_Yes_No_Input( array(
-						'html_label_text' => sprintf( __( 'Paypal Calculates Taxes %s', 'event_espresso' ), $payment_method_type->get_help_tab_link() ),
-						'html_help_text'  => __( 'Whether Paypal should add taxes to the order', 'event_espresso' ),
+					)),
+					'image_url'        => new EE_Admin_File_Uploader_Input(array(
+						'html_help_text'  => __("Used for your business/personal logo on the PayPal page", 'event_espresso'),
+						'html_label_text' => __('Image URL', 'event_espresso')
+					)),
+					'paypal_taxes'     => new EE_Yes_No_Input(array(
+						'html_label_text' => sprintf(__('Paypal Calculates Taxes %s', 'event_espresso'), $payment_method_type->get_help_tab_link()),
+						'html_help_text'  => __('Whether Paypal should add taxes to the order', 'event_espresso'),
 						'default'         => false
-					) ),
-					'paypal_shipping'  => new EE_Yes_No_Input( array(
-						'html_label_text' => sprintf( __( 'Paypal Calculates Shipping %s', 'event_espresso' ), $payment_method_type->get_help_tab_link() ),
-						'html_help_text'  => __( 'Whether Paypal should add shipping surcharges', 'event_espresso' ),
+					)),
+					'paypal_shipping'  => new EE_Yes_No_Input(array(
+						'html_label_text' => sprintf(__('Paypal Calculates Shipping %s', 'event_espresso'), $payment_method_type->get_help_tab_link()),
+						'html_help_text'  => __('Whether Paypal should add shipping surcharges', 'event_espresso'),
 						'default'         => false
-					) ),
-					'shipping_details' => new EE_Select_Input( array(
-						EE_PMT_Paypal_Standard::shipping_info_none     => __( "Do not prompt for an address", 'event_espresso' ),
-						EE_PMT_Paypal_Standard::shipping_info_optional => __( "Prompt for an address, but do not require it", 'event_espresso' ),
-						EE_PMT_Paypal_Standard::shipping_info_required => __( "Prompt for an address, and require it", 'event_espresso' )
-					) )
+					)),
+					'shipping_details' => new EE_Select_Input(array(
+						EE_PMT_Paypal_Standard::shipping_info_none     => __("Do not prompt for an address", 'event_espresso'),
+						EE_PMT_Paypal_Standard::shipping_info_optional => __("Prompt for an address, but do not require it", 'event_espresso'),
+						EE_PMT_Paypal_Standard::shipping_info_required => __("Prompt for an address, and require it", 'event_espresso')
+					))
 				)
 			)
 		);
@@ -61,28 +61,28 @@ 
      * @param array $req_data
      * @throws EE_Error
      */
-    public function _normalize( $req_data ) {
-		parent::_normalize( $req_data );
-		$paypal_calculates_shipping = $this->get_input_value( 'paypal_shipping' );
-		$paypal_calculates_taxes = $this->get_input_value( 'paypal_taxes' );
-		$paypal_requests_address_info = $this->get_input_value( 'shipping_details' );
+    public function _normalize($req_data) {
+		parent::_normalize($req_data);
+		$paypal_calculates_shipping = $this->get_input_value('paypal_shipping');
+		$paypal_calculates_taxes = $this->get_input_value('paypal_taxes');
+		$paypal_requests_address_info = $this->get_input_value('shipping_details');
 		if (
-			( $paypal_calculates_shipping || $paypal_calculates_taxes ) &&
+			($paypal_calculates_shipping || $paypal_calculates_taxes) &&
 			$paypal_requests_address_info == EE_PMT_Paypal_Standard::shipping_info_none
 		) {
 			//they want paypal to calculate taxes or shipping. They need to ask for
 			//address info, otherwise paypal can't calculate taxes or shipping
 			/** @type EE_Select_Input $shipping_details_input */
-			$shipping_details_input = $this->get_input( 'shipping_details' );
-			$shipping_details_input->set_default( EE_PMT_Paypal_Standard::shipping_info_optional );
+			$shipping_details_input = $this->get_input('shipping_details');
+			$shipping_details_input->set_default(EE_PMT_Paypal_Standard::shipping_info_optional);
 			$shipping_details_input_options = $shipping_details_input->options();
 			EE_Error::add_attention(
 				sprintf(
-					__( 'Automatically set "%s" to "%s" because Paypal requires address info in order to calculate shipping or taxes.', 'event_espresso' ),
-					strip_tags( $shipping_details_input->html_label_text() ),
-					isset( $shipping_details_input_options[ EE_PMT_Paypal_Standard::shipping_info_optional ] )
-						? $shipping_details_input_options[ EE_PMT_Paypal_Standard::shipping_info_optional ]
-						: __( 'Unknown', 'event_espresso' )
+					__('Automatically set "%s" to "%s" because Paypal requires address info in order to calculate shipping or taxes.', 'event_espresso'),
+					strip_tags($shipping_details_input->html_label_text()),
+					isset($shipping_details_input_options[EE_PMT_Paypal_Standard::shipping_info_optional])
+						? $shipping_details_input_options[EE_PMT_Paypal_Standard::shipping_info_optional]
+						: __('Unknown', 'event_espresso')
 				),
 				__FILE__, __FUNCTION__, __LINE__
 			);

modules/add_new_state/EED_Add_New_State.module.php

Spacing +165 added lines, -165 removed lines

@@ -16,7 +16,7 @@ 
 	 * @return EED_Add_New_State
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -27,16 +27,16 @@ 
 	 *  	@return 		void
 	 */
 	public static function set_hooks() {
-		add_action( 'wp_loaded', array( 'EED_Add_New_State', 'set_definitions' ), 2 );
-		add_action( 'wp_enqueue_scripts', array( 'EED_Add_New_State', 'translate_js_strings' ), 0 );
-		add_action( 'wp_enqueue_scripts', array( 'EED_Add_New_State', 'wp_enqueue_scripts' ), 10 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', array( 'EED_Add_New_State', 'display_add_new_state_micro_form' ), 1, 1 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form', array( 'EED_Add_New_State', 'display_add_new_state_micro_form' ), 1, 1 );
-		add_filter( 'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', array( 'EED_Add_New_State', 'unset_new_state_request_params' ), 10, 1 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', array( 'EED_Add_New_State', 'inject_new_reg_state_into_options' ), 10, 5 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', array( 'EED_Add_New_State', 'inject_new_reg_country_into_options' ), 10, 5 );
-		add_filter( 'FHEE__EE_State_Select_Input____construct__state_options', array( 'EED_Add_New_State', 'state_options' ), 10, 1 );
-		add_filter( 'FHEE__EE_Country_Select_Input____construct__country_options', array( 'EED_Add_New_State', 'country_options' ), 10, 1 );
+		add_action('wp_loaded', array('EED_Add_New_State', 'set_definitions'), 2);
+		add_action('wp_enqueue_scripts', array('EED_Add_New_State', 'translate_js_strings'), 0);
+		add_action('wp_enqueue_scripts', array('EED_Add_New_State', 'wp_enqueue_scripts'), 10);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', array('EED_Add_New_State', 'display_add_new_state_micro_form'), 1, 1);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form', array('EED_Add_New_State', 'display_add_new_state_micro_form'), 1, 1);
+		add_filter('FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', array('EED_Add_New_State', 'unset_new_state_request_params'), 10, 1);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', array('EED_Add_New_State', 'inject_new_reg_state_into_options'), 10, 5);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', array('EED_Add_New_State', 'inject_new_reg_country_into_options'), 10, 5);
+		add_filter('FHEE__EE_State_Select_Input____construct__state_options', array('EED_Add_New_State', 'state_options'), 10, 1);
+		add_filter('FHEE__EE_Country_Select_Input____construct__country_options', array('EED_Add_New_State', 'country_options'), 10, 1);
 	}
 
 	/**
@@ -46,20 +46,20 @@ 
 	 *  	@return 		void
 	 */
 	public static function set_hooks_admin() {
-		add_action( 'wp_loaded', array( 'EED_Add_New_State', 'set_definitions' ), 2 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', array( 'EED_Add_New_State', 'display_add_new_state_micro_form' ), 1, 1 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form', array( 'EED_Add_New_State', 'display_add_new_state_micro_form' ), 1, 1 );
-		add_action( 'wp_ajax_espresso_add_new_state', array( 'EED_Add_New_State', 'add_new_state' ));
-		add_action( 'wp_ajax_nopriv_espresso_add_new_state', array( 'EED_Add_New_State', 'add_new_state' ));
-		add_filter( 'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', array( 'EED_Add_New_State', 'unset_new_state_request_params' ), 10, 1 );
-		add_action( 'AHEE__General_Settings_Admin_Page__update_country_settings__state_saved', array( 'EED_Add_New_State', 'update_country_settings' ), 10, 3 );
-		add_action( 'AHEE__General_Settings_Admin_Page__delete_state__state_deleted', array( 'EED_Add_New_State', 'update_country_settings' ), 10, 3 );
-		add_filter( 'FHEE__EE_State_Select_Input____construct__state_options', array( 'EED_Add_New_State', 'state_options' ), 10, 1 );
-		add_filter( 'FHEE__EE_Country_Select_Input____construct__country_options', array( 'EED_Add_New_State', 'country_options' ), 10, 1 );
+		add_action('wp_loaded', array('EED_Add_New_State', 'set_definitions'), 2);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', array('EED_Add_New_State', 'display_add_new_state_micro_form'), 1, 1);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form', array('EED_Add_New_State', 'display_add_new_state_micro_form'), 1, 1);
+		add_action('wp_ajax_espresso_add_new_state', array('EED_Add_New_State', 'add_new_state'));
+		add_action('wp_ajax_nopriv_espresso_add_new_state', array('EED_Add_New_State', 'add_new_state'));
+		add_filter('FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', array('EED_Add_New_State', 'unset_new_state_request_params'), 10, 1);
+		add_action('AHEE__General_Settings_Admin_Page__update_country_settings__state_saved', array('EED_Add_New_State', 'update_country_settings'), 10, 3);
+		add_action('AHEE__General_Settings_Admin_Page__delete_state__state_deleted', array('EED_Add_New_State', 'update_country_settings'), 10, 3);
+		add_filter('FHEE__EE_State_Select_Input____construct__state_options', array('EED_Add_New_State', 'state_options'), 10, 1);
+		add_filter('FHEE__EE_Country_Select_Input____construct__country_options', array('EED_Add_New_State', 'country_options'), 10, 1);
 		//add_filter( 'FHEE__Single_Page_Checkout___check_form_submission__request_params', array( 'EED_Add_New_State', 'filter_checkout_request_params' ), 10, 1 );
-		add_filter( 'FHEE__EE_Form_Section_Proper__receive_form_submission__request_data', array( 'EED_Add_New_State', 'filter_checkout_request_params' ), 10, 1 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', array( 'EED_Add_New_State', 'inject_new_reg_state_into_options' ), 10, 5 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', array( 'EED_Add_New_State', 'inject_new_reg_country_into_options' ), 10, 5 );
+		add_filter('FHEE__EE_Form_Section_Proper__receive_form_submission__request_data', array('EED_Add_New_State', 'filter_checkout_request_params'), 10, 1);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', array('EED_Add_New_State', 'inject_new_reg_state_into_options'), 10, 5);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', array('EED_Add_New_State', 'inject_new_reg_country_into_options'), 10, 5);
 	}
 
 
@@ -71,8 +71,8 @@ 
 	 *  	@return 		void
 	 */
 	public static function set_definitions() {
-		define( 'ANS_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
-		define( 'ANS_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
+		define('ANS_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
+		define('ANS_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
 	}
 
 
@@ -84,7 +84,7 @@ 
 	 * @param \WP $WP
 	 * @return        void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 	}
 
 
@@ -112,9 +112,9 @@ 
 	 * 	@return 		void
 	 */
 	public static function wp_enqueue_scripts() {
-		if ( apply_filters( 'EED_Single_Page_Checkout__SPCO_active', false ) ) {
-			wp_register_script( 'add_new_state', ANS_ASSETS_URL . 'add_new_state.js', array( 'espresso_core', 'single_page_checkout' ), EVENT_ESPRESSO_VERSION, true );
-			wp_enqueue_script( 'add_new_state' );
+		if (apply_filters('EED_Single_Page_Checkout__SPCO_active', false)) {
+			wp_register_script('add_new_state', ANS_ASSETS_URL.'add_new_state.js', array('espresso_core', 'single_page_checkout'), EVENT_ESPRESSO_VERSION, true);
+			wp_enqueue_script('add_new_state');
 		}
 	}
 
@@ -128,34 +128,34 @@ 
 	 * @return 	string
 	 */
 //	public static function display_add_new_state_micro_form( $html, EE_Form_Input_With_Options_Base $input ){
-	public static function display_add_new_state_micro_form( EE_Form_Section_Proper $question_group_reg_form ){
+	public static function display_add_new_state_micro_form(EE_Form_Section_Proper $question_group_reg_form) {
 		// only add the 'new_state_micro_form' when displaying reg forms,
 		// not during processing since we process the 'new_state_micro_form' in it's own AJAX request
-		$action = EE_Registry::instance()->REQ->get( 'action', '' );
+		$action = EE_Registry::instance()->REQ->get('action', '');
 		// is the "state" question in this form section?
-		$input = $question_group_reg_form->get_subsection( 'state' );
-		if ( $action === 'process_reg_step' || $action === 'update_reg_step' ) {
+		$input = $question_group_reg_form->get_subsection('state');
+		if ($action === 'process_reg_step' || $action === 'update_reg_step') {
 			//ok then all we need to do is make sure the input's HTML name is consistent
 			//by forcing it to set it now, like it did while getting the form for display
-			if( $input instanceof EE_State_Select_Input ) {
+			if ($input instanceof EE_State_Select_Input) {
 				$input->html_name();
 			}
 			return $question_group_reg_form;
 		}
 		
 		// we're only doing this for state select inputs
-		if ( $input instanceof EE_State_Select_Input ) {
+		if ($input instanceof EE_State_Select_Input) {
 			// grab any set values from the request
-			$country_name = str_replace( 'state', 'nsmf_new_state_country', $input->html_name() );
-			$state_name = str_replace( 'state', 'nsmf_new_state_name', $input->html_name() );
-			$abbrv_name = str_replace( 'state', 'nsmf_new_state_abbrv', $input->html_name() );
-			$new_state_submit_id = str_replace( 'state', 'new_state', $input->html_id() );
+			$country_name = str_replace('state', 'nsmf_new_state_country', $input->html_name());
+			$state_name = str_replace('state', 'nsmf_new_state_name', $input->html_name());
+			$abbrv_name = str_replace('state', 'nsmf_new_state_abbrv', $input->html_name());
+			$new_state_submit_id = str_replace('state', 'new_state', $input->html_id());
 			$country_options = array();
 			$countries = EEM_Country::instance()->get_all_countries();
-			if ( ! empty( $countries )) {
-				foreach( $countries as $country ){
-					if ( $country instanceof EE_Country ) {
-						$country_options[ $country->ID() ] = $country->name();
+			if ( ! empty($countries)) {
+				foreach ($countries as $country) {
+					if ($country instanceof EE_Country) {
+						$country_options[$country->ID()] = $country->name();
 					}
 				}
 			}
@@ -168,8 +168,8 @@ 
 						// add hidden input to indicate that a new state is being added
 						'add_new_state' 	=> new EE_Hidden_Input(
 							array(
-								'html_name' 	=> str_replace( 'state', 'nsmf_add_new_state', $input->html_name() ),
-								'html_id' 			=> str_replace( 'state', 'nsmf_add_new_state', $input->html_id() ),
+								'html_name' 	=> str_replace('state', 'nsmf_add_new_state', $input->html_name()),
+								'html_id' 			=> str_replace('state', 'nsmf_add_new_state', $input->html_id()),
 								'default'			=> 0
 							)
 						),
@@ -181,10 +181,10 @@ 
 									'',
 									__('click here to add a new state/province', 'event_espresso'),
 									'',
-									'display-' . $input->html_id(),
+									'display-'.$input->html_id(),
 									'ee-form-add-new-state-lnk display-the-hidden smaller-text hide-if-no-js',
 									'',
-									'data-target="' . $input->html_id() . '"'
+									'data-target="'.$input->html_id().'"'
 								)
 							)
 						),
@@ -192,13 +192,13 @@ 
 						'add_new_state_micro_form' =>new EE_Form_Section_HTML(
 							apply_filters(
 								'FHEE__EED_Add_New_State__display_add_new_state_micro_form__add_new_state_micro_form',
-								EEH_HTML::div( '', $input->html_id() . '-dv', 'ee-form-add-new-state-dv', 'display: none;' ) .
-								EEH_HTML::h6( __('If your State/Province does not appear in the list above, you can easily add it by doing the following:', 'event_espresso')) .
-								EEH_HTML::ul() .
-								EEH_HTML::li( __('first select the Country that your State/Province belongs to', 'event_espresso') ) .
-								EEH_HTML::li( __('enter the name of your State/Province', 'event_espresso') ) .
-								EEH_HTML::li( __('enter a two to six letter abbreviation for the name of your State/Province', 'event_espresso') ) .
-								EEH_HTML::li( __('click the ADD button', 'event_espresso') ) .
+								EEH_HTML::div('', $input->html_id().'-dv', 'ee-form-add-new-state-dv', 'display: none;').
+								EEH_HTML::h6(__('If your State/Province does not appear in the list above, you can easily add it by doing the following:', 'event_espresso')).
+								EEH_HTML::ul().
+								EEH_HTML::li(__('first select the Country that your State/Province belongs to', 'event_espresso')).
+								EEH_HTML::li(__('enter the name of your State/Province', 'event_espresso')).
+								EEH_HTML::li(__('enter a two to six letter abbreviation for the name of your State/Province', 'event_espresso')).
+								EEH_HTML::li(__('click the ADD button', 'event_espresso')).
 								EEH_HTML::ulx()
 							)
 						),
@@ -207,10 +207,10 @@ 
 							$country_options,
 							array(
 								'html_name' 			=> $country_name,
-								'html_id' 					=> str_replace( 'state', 'nsmf_new_state_country', $input->html_id() ),
-								'html_class' 			=> $input->html_class() . ' new-state-country',
+								'html_id' 					=> str_replace('state', 'nsmf_new_state_country', $input->html_id()),
+								'html_class' 			=> $input->html_class().' new-state-country',
 								'html_label_text'		=> __('New State/Province Country', 'event_espresso'),
-								'default'					=> EE_Registry::instance()->REQ->get( $country_name, '' ),
+								'default'					=> EE_Registry::instance()->REQ->get($country_name, ''),
 								'required' 				=> false
 							)
 						),
@@ -218,23 +218,23 @@ 
 						'new_state_name' => new EE_Text_Input(
 							array(
 								'html_name' 			=> $state_name,
-								'html_id' 					=> str_replace( 'state', 'nsmf_new_state_name', $input->html_id() ),
-								'html_class' 			=> $input->html_class() . ' new-state-state',
+								'html_id' 					=> str_replace('state', 'nsmf_new_state_name', $input->html_id()),
+								'html_class' 			=> $input->html_class().' new-state-state',
 								'html_label_text'		=> __('New State/Province Name', 'event_espresso'),
-								'default'					=> EE_Registry::instance()->REQ->get( $state_name, '' ),
+								'default'					=> EE_Registry::instance()->REQ->get($state_name, ''),
 								'required' 				=> false
 							)
 						),
-						'spacer' => new EE_Form_Section_HTML( EEH_HTML::br() ),
+						'spacer' => new EE_Form_Section_HTML(EEH_HTML::br()),
 						// NEW STATE NAME
 						'new_state_abbrv' => new EE_Text_Input(
 							array(
 								'html_name' 					=> $abbrv_name,
-								'html_id' 							=> str_replace( 'state', 'nsmf_new_state_abbrv', $input->html_id() ),
-								'html_class' 					=> $input->html_class() . ' new-state-abbrv',
+								'html_id' 							=> str_replace('state', 'nsmf_new_state_abbrv', $input->html_id()),
+								'html_class' 					=> $input->html_class().' new-state-abbrv',
 								'html_label_text'				=> __('New State/Province Abbreviation', 'event_espresso'),
 								'html_other_attributes'	=> 'size="24"',
-								'default'							=> EE_Registry::instance()->REQ->get( $abbrv_name, '' ),
+								'default'							=> EE_Registry::instance()->REQ->get($abbrv_name, ''),
 								'required' 						=> false
 							)
 						),
@@ -242,15 +242,15 @@ 
 						'add_new_state_submit_button' => new EE_Form_Section_HTML(
 							apply_filters(
 								'FHEE__EED_Add_New_State__display_add_new_state_micro_form__add_new_state_submit_button',
-								EEH_HTML::nbsp(3) .
+								EEH_HTML::nbsp(3).
 								EEH_HTML::link(
 									'',
 									__('ADD', 'event_espresso'),
 									'',
-									'submit-' . $new_state_submit_id,
+									'submit-'.$new_state_submit_id,
 									'ee-form-add-new-state-submit button button-secondary',
 									'',
-									'data-target="' . $new_state_submit_id . '"'
+									'data-target="'.$new_state_submit_id.'"'
 								)
 							)
 						),
@@ -258,18 +258,18 @@ 
 						'add_new_state_extra' => new EE_Form_Section_HTML(
 							apply_filters(
 								'FHEE__EED_Add_New_State__display_add_new_state_micro_form__add_new_state_extra',
-								EEH_HTML::br(2) .
-								EEH_HTML::div( '', '', 'small-text' ) .
-								EEH_HTML::strong( __('Don\'t know your State/Province Abbreviation?', 'event_espresso') ) .
-								EEH_HTML::br() .
+								EEH_HTML::br(2).
+								EEH_HTML::div('', '', 'small-text').
+								EEH_HTML::strong(__('Don\'t know your State/Province Abbreviation?', 'event_espresso')).
+								EEH_HTML::br().
 								sprintf(
 									__('You can look here: %s, for a list of Countries and links to their State/Province Abbreviations ("Subdivisions assigned codes" column).', 'event_espresso'),
-									EEH_HTML::link( 'http://en.wikipedia.org/wiki/ISO_3166-2', 'http://en.wikipedia.org/wiki/ISO_3166-2', '', '', 'ee-form-add-new-state-wiki-lnk' )
-								) .
-								EEH_HTML::divx() .
-								EEH_HTML::br() .
-								EEH_HTML::link( '', __('cancel new state/province', 'event_espresso'), '', 'hide-' . $input->html_id(), 'ee-form-cancel-new-state-lnk smaller-text', '', 'data-target="' . $input->html_id() . '"' ) .
-								EEH_HTML::divx() .
+									EEH_HTML::link('http://en.wikipedia.org/wiki/ISO_3166-2', 'http://en.wikipedia.org/wiki/ISO_3166-2', '', '', 'ee-form-add-new-state-wiki-lnk')
+								).
+								EEH_HTML::divx().
+								EEH_HTML::br().
+								EEH_HTML::link('', __('cancel new state/province', 'event_espresso'), '', 'hide-'.$input->html_id(), 'ee-form-cancel-new-state-lnk smaller-text', '', 'data-target="'.$input->html_id().'"').
+								EEH_HTML::divx().
 								EEH_HTML::br()
 							)
 						)
@@ -277,7 +277,7 @@ 
 					)
 				)
 			);
-			$question_group_reg_form->add_subsections( array( 'new_state_micro_form' => $new_state_micro_form ), 'state', false );
+			$question_group_reg_form->add_subsections(array('new_state_micro_form' => $new_state_micro_form), 'state', false);
 		}
 		return $question_group_reg_form;
 	}
@@ -295,50 +295,50 @@ 
 	public static function add_new_state() {
 		$REQ = EE_Registry::instance()->load_core('Request_Handler');
 		if (
-			$REQ->is_set( 'nsmf_add_new_state' )
-			&& $REQ->get( 'nsmf_add_new_state' ) == 1
+			$REQ->is_set('nsmf_add_new_state')
+			&& $REQ->get('nsmf_add_new_state') == 1
 		) {
 			EE_Registry::instance()->load_model('State');
 			// grab country ISO code, new state name, and new state abbreviation
-			$state_country = $REQ->is_set( 'nsmf_new_state_country' )
-				? sanitize_text_field( $REQ->get( 'nsmf_new_state_country' ) )
+			$state_country = $REQ->is_set('nsmf_new_state_country')
+				? sanitize_text_field($REQ->get('nsmf_new_state_country'))
 				: false;
-			$state_name = $REQ->is_set( 'nsmf_new_state_name' )
-				? sanitize_text_field( $REQ->get( 'nsmf_new_state_name' ) )
+			$state_name = $REQ->is_set('nsmf_new_state_name')
+				? sanitize_text_field($REQ->get('nsmf_new_state_name'))
 				: false;
-			$state_abbr = $REQ->is_set( 'nsmf_new_state_abbrv' )
-				? sanitize_text_field( $REQ->get( 'nsmf_new_state_abbrv' ) )
+			$state_abbr = $REQ->is_set('nsmf_new_state_abbrv')
+				? sanitize_text_field($REQ->get('nsmf_new_state_abbrv'))
 				: false;
 //echo '<h4>$state_country : ' . $state_country . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 //echo '<h4>$state_name : ' . $state_name . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 //echo '<h4>$state_abbr : ' . $state_abbr . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 
-			if ( $state_country && $state_name && $state_abbr ) {
-				$new_state = EED_Add_New_State::save_new_state_to_db( array(
-					'CNT_ISO'=> strtoupper( $state_country ),
-					'STA_abbrev' => strtoupper( $state_abbr ),
-					'STA_name' => ucwords( $state_name ),
+			if ($state_country && $state_name && $state_abbr) {
+				$new_state = EED_Add_New_State::save_new_state_to_db(array(
+					'CNT_ISO'=> strtoupper($state_country),
+					'STA_abbrev' => strtoupper($state_abbr),
+					'STA_name' => ucwords($state_name),
 					'STA_active' => FALSE
 				));
 
-				if ( $new_state instanceof EE_State ) {
+				if ($new_state instanceof EE_State) {
 					// clean house
-					EE_Registry::instance()->REQ->un_set( 'nsmf_add_new_state' );
-					EE_Registry::instance()->REQ->un_set( 'nsmf_new_state_country' );
-					EE_Registry::instance()->REQ->un_set( 'nsmf_new_state_name' );
-					EE_Registry::instance()->REQ->un_set( 'nsmf_new_state_abbrv' );
+					EE_Registry::instance()->REQ->un_set('nsmf_add_new_state');
+					EE_Registry::instance()->REQ->un_set('nsmf_new_state_country');
+					EE_Registry::instance()->REQ->un_set('nsmf_new_state_name');
+					EE_Registry::instance()->REQ->un_set('nsmf_new_state_abbrv');
 
 					// get any existing new states
 					$new_states = EE_Registry::instance()->SSN->get_session_data(
 						'nsmf_new_states'
 					);
-					$new_states[ $new_state->ID() ] = $new_state;
+					$new_states[$new_state->ID()] = $new_state;
 					EE_Registry::instance()->SSN->set_session_data(
-						array( 'nsmf_new_states' => $new_states )
+						array('nsmf_new_states' => $new_states)
 					);
 
-					if ( EE_Registry::instance()->REQ->ajax ) {
-						echo json_encode( array(
+					if (EE_Registry::instance()->REQ->ajax) {
+						echo json_encode(array(
 							'success' => TRUE,
 							'id' => $new_state->ID(),
 							'name' => $new_state->name(),
@@ -353,12 +353,12 @@ 
 				}
 
 			} else {
-				$error = __( 'A new State/Province could not be added because invalid or missing data was received.', 'event_espresso' );
-				if ( EE_Registry::instance()->REQ->ajax ) {
-					echo json_encode( array( 'error' => $error ));
+				$error = __('A new State/Province could not be added because invalid or missing data was received.', 'event_espresso');
+				if (EE_Registry::instance()->REQ->ajax) {
+					echo json_encode(array('error' => $error));
 					exit();
 				} else {
-					EE_Error::add_error( $error, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__);
 				}
 			}
 		}
@@ -376,11 +376,11 @@ 
 	 * @param array $request_params
 	 * @return array
 	 */
-	public static function filter_checkout_request_params ( $request_params ) {
-		foreach ( $request_params as $form_section ) {
-			if ( is_array( $form_section )) {
-				EED_Add_New_State::unset_new_state_request_params( $form_section );
-				EED_Add_New_State::filter_checkout_request_params( $form_section );
+	public static function filter_checkout_request_params($request_params) {
+		foreach ($request_params as $form_section) {
+			if (is_array($form_section)) {
+				EED_Add_New_State::unset_new_state_request_params($form_section);
+				EED_Add_New_State::filter_checkout_request_params($form_section);
 			}
 		}
 		return $request_params;
@@ -395,12 +395,12 @@ 
 	 * @param array $request_params
 	 * @return        boolean
 	 */
-	public static function unset_new_state_request_params ( $request_params ) {
-		unset( $request_params[ 'new_state_micro_form' ] );
-		unset( $request_params[ 'new_state_micro_add_new_state' ] );
-		unset( $request_params[ 'new_state_micro_new_state_country' ] );
-		unset( $request_params[ 'new_state_micro_new_state_name' ] );
-		unset( $request_params[ 'new_state_micro_new_state_abbrv' ] );
+	public static function unset_new_state_request_params($request_params) {
+		unset($request_params['new_state_micro_form']);
+		unset($request_params['new_state_micro_add_new_state']);
+		unset($request_params['new_state_micro_new_state_country']);
+		unset($request_params['new_state_micro_new_state_name']);
+		unset($request_params['new_state_micro_new_state_abbrv']);
 		return $request_params;
 	}
 
@@ -413,25 +413,25 @@ 
 	 * @param array $props_n_values
 	 * @return        boolean
 	 */
-	public static function save_new_state_to_db ( $props_n_values = array() ) {
+	public static function save_new_state_to_db($props_n_values = array()) {
 //		EEH_Debug_Tools::printr( $props_n_values, '$props_n_values  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		$existing_state = EEM_State::instance()->get_all( array( $props_n_values, 'limit' => 1 ));
-		if ( ! empty( $existing_state )) {
-			return array_pop( $existing_state );
+		$existing_state = EEM_State::instance()->get_all(array($props_n_values, 'limit' => 1));
+		if ( ! empty($existing_state)) {
+			return array_pop($existing_state);
 		}
-		$new_state = EE_State::new_instance( $props_n_values );
-		if ( $new_state instanceof EE_State ) {
+		$new_state = EE_State::new_instance($props_n_values);
+		if ($new_state instanceof EE_State) {
 			// if not non-ajax admin
-			$new_state_key = 'new-state-added-' . $new_state->country_iso() . '-' . $new_state->abbrev();
+			$new_state_key = 'new-state-added-'.$new_state->country_iso().'-'.$new_state->abbrev();
 			$new_state_notice = sprintf(
-					__( 'A new State named "%1$s (%2$s)" was dynamically added from an Event Espresso form for the Country of "%3$s".%5$sTo verify, edit, and/or delete this new State, please go to the %4$s and update the States / Provinces section.%5$sCheck "Yes" to have this new State added to dropdown select lists in forms.', 'event_espresso' ),
-					'<b>' . $new_state->name() . '</b>',
-					'<b>' . $new_state->abbrev() . '</b>',
-					'<b>' . $new_state->country()->name() . '</b>',
-					'<a href="' . add_query_arg( array( 'page' => 'espresso_general_settings', 'action' => 'country_settings', 'country' => $new_state->country_iso() ), admin_url( 'admin.php' )) . '">' . __( 'Event Espresso - General Settings > Countries Tab', 'event_espresso' ) . '</a>',
+					__('A new State named "%1$s (%2$s)" was dynamically added from an Event Espresso form for the Country of "%3$s".%5$sTo verify, edit, and/or delete this new State, please go to the %4$s and update the States / Provinces section.%5$sCheck "Yes" to have this new State added to dropdown select lists in forms.', 'event_espresso'),
+					'<b>'.$new_state->name().'</b>',
+					'<b>'.$new_state->abbrev().'</b>',
+					'<b>'.$new_state->country()->name().'</b>',
+					'<a href="'.add_query_arg(array('page' => 'espresso_general_settings', 'action' => 'country_settings', 'country' => $new_state->country_iso()), admin_url('admin.php')).'">'.__('Event Espresso - General Settings > Countries Tab', 'event_espresso').'</a>',
 					'<br />'
 			);
-			EE_Error::add_persistent_admin_notice( $new_state_key, $new_state_notice );
+			EE_Error::add_persistent_admin_notice($new_state_key, $new_state_notice);
 			$new_state->save();
 			EEM_State::instance()->reset_cached_states();
 			return $new_state;
@@ -450,22 +450,22 @@ 
 	 * @param array  $cols_n_values
 	 * @return        boolean
 	 */
-	public static function update_country_settings( $CNT_ISO = '', $STA_ID = '', $cols_n_values = array() ) {
-		$CNT_ISO = ! empty( $CNT_ISO ) ? $CNT_ISO : FALSE;
-		if ( ! $CNT_ISO ) {
-			EE_Error::add_error( __( 'An invalid or missing Country ISO Code was received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+	public static function update_country_settings($CNT_ISO = '', $STA_ID = '', $cols_n_values = array()) {
+		$CNT_ISO = ! empty($CNT_ISO) ? $CNT_ISO : FALSE;
+		if ( ! $CNT_ISO) {
+			EE_Error::add_error(__('An invalid or missing Country ISO Code was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
-		$STA_abbrev = is_array( $cols_n_values ) && isset( $cols_n_values['STA_abbrev'] ) ? $cols_n_values['STA_abbrev'] : FALSE;
-		if (  ! $STA_abbrev && ! empty( $STA_ID )) {
-			$state = EEM_State::instance()->get_one_by_ID( $STA_ID );
-			if ( $state instanceof EE_State ) {
+		$STA_abbrev = is_array($cols_n_values) && isset($cols_n_values['STA_abbrev']) ? $cols_n_values['STA_abbrev'] : FALSE;
+		if ( ! $STA_abbrev && ! empty($STA_ID)) {
+			$state = EEM_State::instance()->get_one_by_ID($STA_ID);
+			if ($state instanceof EE_State) {
 				$STA_abbrev = $state->abbrev();
 			}
 		}
-		if ( ! $STA_abbrev ) {
-			EE_Error::add_error( __( 'An invalid or missing State Abbreviation was received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $STA_abbrev) {
+			EE_Error::add_error(__('An invalid or missing State Abbreviation was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
-		EE_Error::dismiss_persistent_admin_notice( $CNT_ISO . '-' . $STA_abbrev, TRUE, TRUE );
+		EE_Error::dismiss_persistent_admin_notice($CNT_ISO.'-'.$STA_abbrev, TRUE, TRUE);
 	}
 
 
@@ -481,19 +481,19 @@ 
 	 * @param $answer
 	 * @return bool
 	 */
-	public static function inject_new_reg_state_into_options( $state_options = array(), EE_SPCO_Reg_Step_Attendee_Information $reg_step, EE_Registration $registration, EE_Question $question, $answer ) {
-		if ( $answer instanceof EE_Answer  && $question instanceof EE_Question && $question->type() === EEM_Question::QST_type_state ) {
+	public static function inject_new_reg_state_into_options($state_options = array(), EE_SPCO_Reg_Step_Attendee_Information $reg_step, EE_Registration $registration, EE_Question $question, $answer) {
+		if ($answer instanceof EE_Answer && $question instanceof EE_Question && $question->type() === EEM_Question::QST_type_state) {
 			$STA_ID = $answer->value();
-			if ( ! empty( $STA_ID ) ) {
-				$state = EEM_State::instance()->get_one_by_ID( $STA_ID );
-				if ( $state instanceof EE_State ) {
+			if ( ! empty($STA_ID)) {
+				$state = EEM_State::instance()->get_one_by_ID($STA_ID);
+				if ($state instanceof EE_State) {
 					$country = $state->country();
-					if ( $country instanceof EE_Country ) {
-						if ( ! isset( $state_options[ $country->name() ] )) {
-							$state_options[ $country->name() ] = array();
+					if ($country instanceof EE_Country) {
+						if ( ! isset($state_options[$country->name()])) {
+							$state_options[$country->name()] = array();
 						}
-						if ( ! isset( $state_options[ $country->name() ][ $STA_ID ] )) {
-							$state_options[ $country->name() ][ $STA_ID ] = $state->name();
+						if ( ! isset($state_options[$country->name()][$STA_ID])) {
+							$state_options[$country->name()][$STA_ID] = $state->name();
 						}
 					}
 				}
@@ -515,14 +515,14 @@ 
 	 * @param $answer
 	 * @return bool
 	 */
-	public static function inject_new_reg_country_into_options( $country_options = array(), EE_SPCO_Reg_Step_Attendee_Information $reg_step, EE_Registration $registration, EE_Question $question, $answer ) {
-		if ( $answer instanceof EE_Answer && $question instanceof EE_Question && $question->type() === EEM_Question::QST_type_country ) {
+	public static function inject_new_reg_country_into_options($country_options = array(), EE_SPCO_Reg_Step_Attendee_Information $reg_step, EE_Registration $registration, EE_Question $question, $answer) {
+		if ($answer instanceof EE_Answer && $question instanceof EE_Question && $question->type() === EEM_Question::QST_type_country) {
 			$CNT_ISO = $answer->value();
-			if ( ! empty( $CNT_ISO ) ) {
-				$country = EEM_Country::instance()->get_one_by_ID( $CNT_ISO );
-				if ( $country instanceof EE_Country ) {
-					if ( ! isset( $country_options[ $CNT_ISO ] ) ) {
-						$country_options[ $CNT_ISO ] = $country->name();
+			if ( ! empty($CNT_ISO)) {
+				$country = EEM_Country::instance()->get_one_by_ID($CNT_ISO);
+				if ($country instanceof EE_Country) {
+					if ( ! isset($country_options[$CNT_ISO])) {
+						$country_options[$CNT_ISO] = $country->name();
 					}
 				}
 			}
@@ -539,14 +539,14 @@ 
 	 * @param EE_State[]  $state_options
 	 * @return        boolean
 	 */
-	public static function state_options( $state_options = array() ) {
+	public static function state_options($state_options = array()) {
 		$new_states = EED_Add_New_State::_get_new_states();
-		foreach ( $new_states as $new_state ) {
+		foreach ($new_states as $new_state) {
 			if (
 				$new_state instanceof EE_State
 				&& $new_state->country() instanceof EE_Country
 			) {
-				$state_options[ $new_state->country()->name() ][ $new_state->ID() ] = $new_state->name();
+				$state_options[$new_state->country()->name()][$new_state->ID()] = $new_state->name();
 			}
 		}
 		return $state_options;
@@ -562,12 +562,12 @@ 
 	 */
 	protected static function _get_new_states() {
 		$new_states = array();
-		if ( EE_Registry::instance()->SSN instanceof EE_Session ) {
+		if (EE_Registry::instance()->SSN instanceof EE_Session) {
 			$new_states = EE_Registry::instance()->SSN->get_session_data(
 				'nsmf_new_states'
 			);
 		}
-		return is_array( $new_states ) ? $new_states : array();
+		return is_array($new_states) ? $new_states : array();
 	}
 
 
@@ -579,14 +579,14 @@ 
 	 * @param EE_Country[]  $country_options
 	 * @return        boolean
 	 */
-	public static function country_options( $country_options = array() ) {
+	public static function country_options($country_options = array()) {
 		$new_states = EED_Add_New_State::_get_new_states();
-		foreach ( $new_states as $new_state ) {
+		foreach ($new_states as $new_state) {
 			if (
 				$new_state instanceof EE_State
 				&& $new_state->country() instanceof EE_Country
 			) {
-				$country_options[ $new_state->country()->ID() ] = $new_state->country()->name();
+				$country_options[$new_state->country()->ID()] = $new_state->country()->name();
 			}
 		}
 		return $country_options;

core/libraries/form_sections/inputs/EE_Form_Input_Base.input.php

Spacing +148 added lines, -148 removed lines

@@ -8,7 +8,7 @@ 
  * @subpackage
  * @author				Mike Nelson
  */
-abstract class EE_Form_Input_Base extends EE_Form_Section_Validatable{
+abstract class EE_Form_Input_Base extends EE_Form_Section_Validatable {
 
 	/**
 	 * the input's name attribute
@@ -143,54 +143,54 @@ 
 	 *  @type EE_Validation_Strategy_Base[]  $validation_strategies
 	 * }
 	 */
-	public function __construct( $input_args = array() ){
-		$input_args = (array) apply_filters( 'FHEE__EE_Form_Input_Base___construct__input_args', $input_args, $this );
+	public function __construct($input_args = array()) {
+		$input_args = (array) apply_filters('FHEE__EE_Form_Input_Base___construct__input_args', $input_args, $this);
 		// the following properties must be cast as arrays
-		if ( isset( $input_args['validation_strategies'] ) ) {
-			foreach ( (array) $input_args['validation_strategies'] as $validation_strategy ) {
-				if ( $validation_strategy instanceof EE_Validation_Strategy_Base ) {
-					$this->_validation_strategies[ get_class( $validation_strategy ) ] = $validation_strategy;
+		if (isset($input_args['validation_strategies'])) {
+			foreach ((array) $input_args['validation_strategies'] as $validation_strategy) {
+				if ($validation_strategy instanceof EE_Validation_Strategy_Base) {
+					$this->_validation_strategies[get_class($validation_strategy)] = $validation_strategy;
 				}
 			}
-			unset( $input_args['validation_strategies'] );
+			unset($input_args['validation_strategies']);
 		}
 		// loop thru incoming options
-		foreach( $input_args as $key => $value ) {
+		foreach ($input_args as $key => $value) {
 			// add underscore to $key to match property names
-			$_key = '_' . $key;
-			if ( property_exists( $this, $_key )) {
+			$_key = '_'.$key;
+			if (property_exists($this, $_key)) {
 				$this->{$_key} = $value;
 			}
 		}
 		// ensure that "required" is set correctly
 		$this->set_required(
-			$this->_required, isset( $input_args[ 'required_validation_error_message' ] )
-				? $input_args[ 'required_validation_error_message' ]
+			$this->_required, isset($input_args['required_validation_error_message'])
+				? $input_args['required_validation_error_message']
 				: null
 		);
 
 		//$this->_html_name_specified = isset( $input_args['html_name'] ) ? TRUE : FALSE;
 
 		$this->_display_strategy->_construct_finalize($this);
-		foreach( $this->_validation_strategies as $validation_strategy ){
+		foreach ($this->_validation_strategies as $validation_strategy) {
 			$validation_strategy->_construct_finalize($this);
 		}
 
-		if( ! $this->_normalization_strategy){
+		if ( ! $this->_normalization_strategy) {
 			$this->_normalization_strategy = new EE_Text_Normalization();
 		}
 		$this->_normalization_strategy->_construct_finalize($this);
 
 		//at least we can use the normalization strategy to populate the default
-		if( isset( $input_args[ 'default' ] ) ) {
-			$this->set_default( $input_args[ 'default' ] );
+		if (isset($input_args['default'])) {
+			$this->set_default($input_args['default']);
 		}
 
-		if( ! $this->_sensitive_data_removal_strategy){
+		if ( ! $this->_sensitive_data_removal_strategy) {
 			$this->_sensitive_data_removal_strategy = new EE_No_Sensitive_Data_Removal();
 		}
 		$this->_sensitive_data_removal_strategy->_construct_finalize($this);
-		parent::__construct( $input_args );
+		parent::__construct($input_args);
 	}
 
 
@@ -201,11 +201,11 @@ 
 	 *
 	 * @throws \EE_Error
 	 */
-	protected function _set_default_html_name_if_empty(){
-		if( ! $this->_html_name){
+	protected function _set_default_html_name_if_empty() {
+		if ( ! $this->_html_name) {
 			$this->_html_name = $this->name();
-			if( $this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper){
-				$this->_html_name = $this->_parent_section->html_name_prefix() . "[{$this->name()}]";
+			if ($this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper) {
+				$this->_html_name = $this->_parent_section->html_name_prefix()."[{$this->name()}]";
 			}
 		}
 	}
@@ -219,10 +219,10 @@ 
 	 */
 	public function _construct_finalize($parent_form_section, $name) {
 		parent::_construct_finalize($parent_form_section, $name);
-		if( $this->_html_label === null && $this->_html_label_text === null ){
-			$this->_html_label_text = ucwords( str_replace("_"," ",$name));
+		if ($this->_html_label === null && $this->_html_label_text === null) {
+			$this->_html_label_text = ucwords(str_replace("_", " ", $name));
 		}
-		do_action( 'AHEE__EE_Form_Input_Base___construct_finalize__end', $this, $parent_form_section, $name );
+		do_action('AHEE__EE_Form_Input_Base___construct_finalize__end', $this, $parent_form_section, $name);
 	}
 
 	 /**
@@ -230,9 +230,9 @@ 
 	  * @return EE_Display_Strategy_Base
 	  * @throws EE_Error
 	  */
-	protected function _get_display_strategy(){
+	protected function _get_display_strategy() {
 		$this->ensure_construct_finalized_called();
-		if( ! $this->_display_strategy || ! $this->_display_strategy instanceof EE_Display_Strategy_Base){
+		if ( ! $this->_display_strategy || ! $this->_display_strategy instanceof EE_Display_Strategy_Base) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -243,7 +243,7 @@ 
 					$this->html_id()
 				)
 			);
-		}else{
+		} else {
 			return $this->_display_strategy;
 		}
 	}
@@ -251,7 +251,7 @@ 
 	 * Sets the display strategy.
 	 * @param EE_Display_Strategy_Base $strategy
 	 */
-	protected function _set_display_strategy(EE_Display_Strategy_Base $strategy){
+	protected function _set_display_strategy(EE_Display_Strategy_Base $strategy) {
 		$this->_display_strategy = $strategy;
 	}
 
@@ -259,7 +259,7 @@ 
 	 * Sets the sanitization strategy
 	 * @param EE_Normalization_Strategy_Base $strategy
 	 */
-	protected function _set_normalization_strategy(EE_Normalization_Strategy_Base $strategy){
+	protected function _set_normalization_strategy(EE_Normalization_Strategy_Base $strategy) {
 		$this->_normalization_strategy = $strategy;
 	}
 
@@ -285,14 +285,14 @@ 
 	 * Gets the display strategy for this input
 	 * @return EE_Display_Strategy_Base
 	 */
-	public function get_display_strategy(){
+	public function get_display_strategy() {
 		return $this->_display_strategy;
 	}
 	/**
 	 * Overwrites the display strategy
 	 * @param EE_Display_Strategy_Base $display_strategy
 	 */
-	public function set_display_strategy($display_strategy){
+	public function set_display_strategy($display_strategy) {
 		$this->_display_strategy = $display_strategy;
 		$this->_display_strategy->_construct_finalize($this);
 	}
@@ -300,14 +300,14 @@ 
 	 * Gets the normalization strategy set on this input
 	 * @return EE_Normalization_Strategy_Base
 	 */
-	public function get_normalization_strategy(){
+	public function get_normalization_strategy() {
 		return $this->_normalization_strategy;
 	}
 	/**
 	 * Overwrites the normalization strategy
 	 * @param EE_Normalization_Strategy_Base $normalization_strategy
 	 */
-	public function set_normalization_strategy($normalization_strategy){
+	public function set_normalization_strategy($normalization_strategy) {
 		$this->_normalization_strategy = $normalization_strategy;
 		$this->_normalization_strategy->_construct_finalize($this);
 	}
@@ -316,7 +316,7 @@ 
 	 * Returns all teh validation strategies which apply to this field, numerically indexed
 	 * @return EE_Validation_Strategy_Base[]
 	 */
-	public function get_validation_strategies(){
+	public function get_validation_strategies() {
 		return $this->_validation_strategies;
 	}
 
@@ -327,8 +327,8 @@ 
 	 * @param EE_Validation_Strategy_Base $validation_strategy
 	 * @return void
 	 */
-	protected function _add_validation_strategy( EE_Validation_Strategy_Base $validation_strategy ){
-		$validation_strategy->_construct_finalize( $this );
+	protected function _add_validation_strategy(EE_Validation_Strategy_Base $validation_strategy) {
+		$validation_strategy->_construct_finalize($this);
 		$this->_validation_strategies[] = $validation_strategy;
 	}
 
@@ -339,8 +339,8 @@ 
 	 * @param EE_Validation_Strategy_Base $validation_strategy
 	 * @return void
 	 */
-	public function add_validation_strategy( EE_Validation_Strategy_Base $validation_strategy ) {
-		$this->_add_validation_strategy( $validation_strategy );
+	public function add_validation_strategy(EE_Validation_Strategy_Base $validation_strategy) {
+		$this->_add_validation_strategy($validation_strategy);
 	}
 
 
@@ -350,13 +350,13 @@ 
 	 *
 	 * @param string $validation_strategy_classname
 	 */
-	public function remove_validation_strategy( $validation_strategy_classname ) {
-		foreach( $this->_validation_strategies as $key => $validation_strategy ){
-			if(
+	public function remove_validation_strategy($validation_strategy_classname) {
+		foreach ($this->_validation_strategies as $key => $validation_strategy) {
+			if (
 				$validation_strategy instanceof $validation_strategy_classname
-				|| is_subclass_of( $validation_strategy, $validation_strategy_classname )
+				|| is_subclass_of($validation_strategy, $validation_strategy_classname)
 			) {
-				unset( $this->_validation_strategies[ $key ] );
+				unset($this->_validation_strategies[$key]);
 			}
 		}
 	}
@@ -369,12 +369,12 @@ 
 	 * @param array $validation_strategy_classnames
 	 * @return bool
 	 */
-	public function has_validation_strategy( $validation_strategy_classnames ) {
-		$validation_strategy_classnames = is_array( $validation_strategy_classnames )
+	public function has_validation_strategy($validation_strategy_classnames) {
+		$validation_strategy_classnames = is_array($validation_strategy_classnames)
 			? $validation_strategy_classnames
-			: array( $validation_strategy_classnames );
-		foreach( $this->_validation_strategies as $key => $validation_strategy ){
-			if( in_array( $key, $validation_strategy_classnames ) ) {
+			: array($validation_strategy_classnames);
+		foreach ($this->_validation_strategies as $key => $validation_strategy) {
+			if (in_array($key, $validation_strategy_classnames)) {
 				return true;
 			}
 		}
@@ -387,7 +387,7 @@ 
 	 * Gets the HTML
 	 * @return string
 	 */
-	public function get_html(){
+	public function get_html() {
 		return $this->_parent_section->get_html_for_input($this);
 	}
 
@@ -401,7 +401,7 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function get_html_for_input(){
+	public function get_html_for_input() {
 		
 		return  $this->_get_display_strategy()->display();
 	}
@@ -412,7 +412,7 @@ 
 	 * @return string
 	 */
 	public function html_other_attributes() {
-		return ! empty( $this->_html_other_attributes ) ? ' ' . $this->_html_other_attributes : '';
+		return ! empty($this->_html_other_attributes) ? ' '.$this->_html_other_attributes : '';
 	}
 
 
@@ -420,7 +420,7 @@ 
 	/**
 	 * @param string $html_other_attributes
 	 */
-	public function set_html_other_attributes( $html_other_attributes ) {
+	public function set_html_other_attributes($html_other_attributes) {
 		$this->_html_other_attributes = $html_other_attributes;
 	}
 
@@ -429,7 +429,7 @@ 
 	 * according to the form section's layout strategy
 	 * @return string
 	 */
-	public function get_html_for_label(){
+	public function get_html_for_label() {
 		return $this->_parent_section->get_layout_strategy()->display_label($this);
 	}
 	/**
@@ -437,7 +437,7 @@ 
 	 * according to the form section's layout strategy
 	 * @return string
 	 */
-	public function get_html_for_errors(){
+	public function get_html_for_errors() {
 		return $this->_parent_section->get_layout_strategy()->display_errors($this);
 	}
 	/**
@@ -445,7 +445,7 @@ 
 	 * according to the form section's layout strategy
 	 * @return string
 	 */
-	public function get_html_for_help(){
+	public function get_html_for_help() {
 		return $this->_parent_section->get_layout_strategy()->display_help_text($this);
 	}
 	/**
@@ -454,18 +454,18 @@ 
 	 * @return boolean
 	 */
 	protected function _validate() {
-		foreach($this->_validation_strategies as $validation_strategy){
-			if ( $validation_strategy instanceof EE_Validation_Strategy_Base ) {
-				try{
+		foreach ($this->_validation_strategies as $validation_strategy) {
+			if ($validation_strategy instanceof EE_Validation_Strategy_Base) {
+				try {
 					$validation_strategy->validate($this->normalized_value());
-				}catch(EE_Validation_Error $e){
+				} catch (EE_Validation_Error $e) {
 					$this->add_validation_error($e);
 				}
 			}
 		}
-		if( $this->get_validation_errors()){
+		if ($this->get_validation_errors()) {
 			return false;
-		}else{
+		} else {
 			return true;
 		}
 	}
@@ -479,8 +479,8 @@ 
 	 * @param string $value
 	 * @return null|string
 	 */
-	private function _sanitize( $value ) {
-		return $value !== null ? stripslashes( html_entity_decode( trim( $value ) ) ) : null;
+	private function _sanitize($value) {
+		return $value !== null ? stripslashes(html_entity_decode(trim($value))) : null;
 	}
 
 
@@ -494,25 +494,25 @@ 
 	 * @return boolean whether or not there was an error
 	 * @throws \EE_Error
 	 */
-	protected function _normalize( $req_data ) {
+	protected function _normalize($req_data) {
 		//any existing validation errors don't apply so clear them
 		$this->_validation_errors = array();
 		try {
-			$raw_input = $this->find_form_data_for_this_section( $req_data );
+			$raw_input = $this->find_form_data_for_this_section($req_data);
 			//super simple sanitization for now
-			if ( is_array( $raw_input )) {
+			if (is_array($raw_input)) {
 				$raw_value = array();
-				foreach( $raw_input as $key => $value ) {
-					$raw_value[ $key ] = $this->_sanitize( $value );
+				foreach ($raw_input as $key => $value) {
+					$raw_value[$key] = $this->_sanitize($value);
 				}
-				$this->_set_raw_value( $raw_value );
+				$this->_set_raw_value($raw_value);
 			} else {
-				$this->_set_raw_value( $this->_sanitize( $raw_input ) );
+				$this->_set_raw_value($this->_sanitize($raw_input));
 			}
 			//we want to mostly leave the input alone in case we need to re-display it to the user
-			$this->_set_normalized_value( $this->_normalization_strategy->normalize( $this->raw_value() ) );
-		} catch ( EE_Validation_Error $e ) {
-			$this->add_validation_error( $e );
+			$this->_set_normalized_value($this->_normalization_strategy->normalize($this->raw_value()));
+		} catch (EE_Validation_Error $e) {
+			$this->add_validation_error($e);
 		}
 	}
 
@@ -521,7 +521,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_name(){
+	public function html_name() {
 		$this->_set_default_html_name_if_empty();
 		return $this->_html_name;
 	}
@@ -531,8 +531,8 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_label_id(){
-		return ! empty( $this->_html_label_id ) ? $this->_html_label_id : $this->_html_id . '-lbl';
+	public function html_label_id() {
+		return ! empty($this->_html_label_id) ? $this->_html_label_id : $this->_html_id.'-lbl';
 	}
 
 
@@ -540,7 +540,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_label_class(){
+	public function html_label_class() {
 		return $this->_html_label_class;
 	}
 
@@ -549,7 +549,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_label_style(){
+	public function html_label_style() {
 		return $this->_html_label_style;
 	}
 
@@ -558,7 +558,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_label_text(){
+	public function html_label_text() {
 		return $this->_html_label_text;
 	}
 
@@ -567,7 +567,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_help_text(){
+	public function html_help_text() {
 		return $this->_html_help_text;
 	}
 
@@ -576,7 +576,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_help_class(){
+	public function html_help_class() {
 		return $this->_html_help_class;
 	}
 
@@ -585,7 +585,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_help_style(){
+	public function html_help_style() {
 		return $this->_html_style;
 	}
 	/**
@@ -598,7 +598,7 @@ 
 	 * in which case, we would have stored the malicious content to our database.
 	 * @return string
 	 */
-	public function raw_value(){
+	public function raw_value() {
 		return $this->_raw_value;
 	}
 	/**
@@ -606,15 +606,15 @@ 
 	 * it escapes all html entities
 	 * @return string
 	 */
-	public function raw_value_in_form(){
-		return htmlentities($this->raw_value(),ENT_QUOTES, 'UTF-8');
+	public function raw_value_in_form() {
+		return htmlentities($this->raw_value(), ENT_QUOTES, 'UTF-8');
 	}
 	/**
 	 * returns the value after it's been sanitized, and then converted into it's proper type
 	 * in PHP. Eg, a string, an int, an array,
 	 * @return mixed
 	 */
-	public function normalized_value(){
+	public function normalized_value() {
 		return $this->_normalized_value;
 	}
 
@@ -624,7 +624,7 @@ 
 	 * the best thing to display
 	 * @return string
 	 */
-	public function pretty_value(){
+	public function pretty_value() {
 		return $this->_normalized_value;
 	}
 	/**
@@ -643,19 +643,19 @@ 
 		  }</code>
 	 * @return array
 	 */
-	public function get_jquery_validation_rules(){
+	public function get_jquery_validation_rules() {
 		$jquery_validation_js = array();
 		$jquery_validation_rules = array();
-		foreach($this->get_validation_strategies() as $validation_strategy){
+		foreach ($this->get_validation_strategies() as $validation_strategy) {
 			$jquery_validation_rules = array_replace_recursive(
 				$jquery_validation_rules,
 				$validation_strategy->get_jquery_validation_rule_array()
 			);
 		}
 
-		if(! empty($jquery_validation_rules)){
-			foreach( $this->get_display_strategy()->get_html_input_ids( true ) as $html_id_with_pound_sign ) {
-				$jquery_validation_js[ $html_id_with_pound_sign ] = $jquery_validation_rules;
+		if ( ! empty($jquery_validation_rules)) {
+			foreach ($this->get_display_strategy()->get_html_input_ids(true) as $html_id_with_pound_sign) {
+				$jquery_validation_js[$html_id_with_pound_sign] = $jquery_validation_rules;
 			}
 		}
 		return $jquery_validation_js;
@@ -667,16 +667,16 @@ 
 	 * @param mixed $value
 	 * @return void
 	 */
-	public function set_default($value){
-		$this->_set_normalized_value( $value );
-		$this->_set_raw_value( $value );
+	public function set_default($value) {
+		$this->_set_normalized_value($value);
+		$this->_set_raw_value($value);
 	}
 	
 	/**
 	 * Sets the normalized value on this input
 	 * @param mixed $value
 	 */
-	protected function _set_normalized_value( $value ) {
+	protected function _set_normalized_value($value) {
 		$this->_normalized_value = $value;
 	}
 	
@@ -684,8 +684,8 @@ 
 	 * Sets the raw value on this input (ie, exactly as the user submitted it)
 	 * @param mixed $value
 	 */
-	protected function _set_raw_value( $value ) {
-		$this->_raw_value = $this->_normalization_strategy->unnormalize( $value );
+	protected function _set_raw_value($value) {
+		$this->_raw_value = $this->_normalization_strategy->unnormalize($value);
 	}
 
 	/**
@@ -693,7 +693,7 @@ 
 	 * @param string $label
 	 * @return void
 	 */
-	public function set_html_label_text($label){
+	public function set_html_label_text($label) {
 		$this->_html_label_text = $label;
 	}
 
@@ -707,13 +707,13 @@ 
 	 * @param boolean $required boolean
 	 * @param null    $required_text
 	 */
-	public function set_required($required = true, $required_text = NULL ){
-		$required = filter_var( $required, FILTER_VALIDATE_BOOLEAN  );
+	public function set_required($required = true, $required_text = NULL) {
+		$required = filter_var($required, FILTER_VALIDATE_BOOLEAN);
 		//whether $required is a string or a boolean, we want to add a required validation strategy
-		if ( $required ) {
-			$this->_add_validation_strategy( new EE_Required_Validation_Strategy( $required_text ) );
+		if ($required) {
+			$this->_add_validation_strategy(new EE_Required_Validation_Strategy($required_text));
 		} else {
-			$this->remove_validation_strategy( 'EE_Required_Validation_Strategy' );
+			$this->remove_validation_strategy('EE_Required_Validation_Strategy');
 		}
 		$this->_required = $required;
 	}
@@ -721,7 +721,7 @@ 
 	 * Returns whether or not this field is required
 	 * @return boolean
 	 */
-	public function required(){
+	public function required() {
 		return $this->_required;
 	}
 
@@ -730,7 +730,7 @@ 
 	/**
 	 * @param string $required_css_class
 	 */
-	public function set_required_css_class( $required_css_class ) {
+	public function set_required_css_class($required_css_class) {
 		$this->_required_css_class = $required_css_class;
 	}
 
@@ -749,7 +749,7 @@ 
 	 * Sets the help text, in case
 	 * @param string $text
 	 */
-	public function set_html_help_text($text){
+	public function set_html_help_text($text) {
 		$this->_html_help_text = $text;
 	}
 	/**
@@ -761,9 +761,9 @@ 
 	public function clean_sensitive_data() {
 		//if we do ANY kind of sensitive data removal on this, then just clear out the raw value
 		//if we need more logic than this we'll make a strategy for it
-		if( $this->_sensitive_data_removal_strategy &&
-				! $this->_sensitive_data_removal_strategy instanceof EE_No_Sensitive_Data_Removal ){
-			$this->_set_raw_value( null );
+		if ($this->_sensitive_data_removal_strategy &&
+				! $this->_sensitive_data_removal_strategy instanceof EE_No_Sensitive_Data_Removal) {
+			$this->_set_raw_value(null);
 		}
 		//and clean the normalized value according to the appropriate strategy
 		$this->_set_normalized_value(
@@ -780,10 +780,10 @@ 
 	 * @param string $button_size
 	 * @param string $other_attributes
 	 */
-	public function set_button_css_attributes( $primary = TRUE, $button_size = '', $other_attributes = '' ) {
+	public function set_button_css_attributes($primary = TRUE, $button_size = '', $other_attributes = '') {
 		$button_css_attributes = 'button';
 		$button_css_attributes .= $primary === TRUE ? ' button-primary' : ' button-secondary';
-		switch ( $button_size ) {
+		switch ($button_size) {
 			case 'xs' :
 			case 'extra-small' :
 				$button_css_attributes .= ' button-xs';
@@ -804,8 +804,8 @@ 
 			default :
 				$button_css_attributes .= '';
 		}
-		$this->_button_css_attributes .= ! empty( $other_attributes )
-			? $button_css_attributes . ' ' . $other_attributes
+		$this->_button_css_attributes .= ! empty($other_attributes)
+			? $button_css_attributes.' '.$other_attributes
 			: $button_css_attributes;
 	}
 
@@ -815,7 +815,7 @@ 
 	 * @return string
 	 */
 	public function button_css_attributes() {
-		if ( empty( $this->_button_css_attributes )) {
+		if (empty($this->_button_css_attributes)) {
 			$this->set_button_css_attributes();
 		}
 		return $this->_button_css_attributes;
@@ -837,26 +837,26 @@ 
 	 * @return mixed whatever the raw value of this form section is in the request data
 	 * @throws \EE_Error
 	 */
-	public function find_form_data_for_this_section( $req_data ){
+	public function find_form_data_for_this_section($req_data) {
 		// break up the html name by "[]"
-		if ( strpos( $this->html_name(), '[' ) !== FALSE ) {
-			$before_any_brackets = substr( $this->html_name(), 0, strpos($this->html_name(), '[') );
+		if (strpos($this->html_name(), '[') !== FALSE) {
+			$before_any_brackets = substr($this->html_name(), 0, strpos($this->html_name(), '['));
 		} else {
 			$before_any_brackets = $this->html_name();
 		}
 		// grab all of the segments
-		preg_match_all('~\[([^]]*)\]~',$this->html_name(), $matches);
-		if( isset( $matches[ 1 ] ) && is_array( $matches[ 1 ] ) ){
-			$name_parts = $matches[ 1 ];
+		preg_match_all('~\[([^]]*)\]~', $this->html_name(), $matches);
+		if (isset($matches[1]) && is_array($matches[1])) {
+			$name_parts = $matches[1];
 			array_unshift($name_parts, $before_any_brackets);
-		}else{
-			$name_parts = array( $before_any_brackets );
+		} else {
+			$name_parts = array($before_any_brackets);
 		}
 		// now get the value for the input
 		$value = $this->_find_form_data_for_this_section_using_name_parts($name_parts, $req_data);
 		// check if this thing's name is at the TOP level of the request data
-		if( $value === null && isset( $req_data[ $this->name() ] ) ){
-			$value = $req_data[ $this->name() ];
+		if ($value === null && isset($req_data[$this->name()])) {
+			$value = $req_data[$this->name()];
 		}
 		return $value;
 	}
@@ -869,18 +869,18 @@ 
 	 * @param array $req_data
 	 * @return array | NULL
 	 */
-	public function _find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data){
-		$first_part_to_consider = array_shift( $html_name_parts );
-		if( isset( $req_data[ $first_part_to_consider ] ) ){
-			if( empty($html_name_parts ) ){
-				return $req_data[ $first_part_to_consider ];
-			}else{
+	public function _find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data) {
+		$first_part_to_consider = array_shift($html_name_parts);
+		if (isset($req_data[$first_part_to_consider])) {
+			if (empty($html_name_parts)) {
+				return $req_data[$first_part_to_consider];
+			} else {
 				return $this->_find_form_data_for_this_section_using_name_parts(
 					$html_name_parts,
-					$req_data[ $first_part_to_consider ]
+					$req_data[$first_part_to_consider]
 				);
 			}
-		}else{
+		} else {
 			return NULL;
 		}
 	}
@@ -894,14 +894,14 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function form_data_present_in($req_data = NULL){
-		if( $req_data === NULL ){
+	public function form_data_present_in($req_data = NULL) {
+		if ($req_data === NULL) {
 			$req_data = $_POST;
 		}
-		$checked_value = $this->find_form_data_for_this_section( $req_data );
-		if( $checked_value !== null ){
+		$checked_value = $this->find_form_data_for_this_section($req_data);
+		if ($checked_value !== null) {
 			return TRUE;
-		}else{
+		} else {
 			return FALSE;
 		}
 	}
@@ -912,8 +912,8 @@ 
 	 * @param array $form_other_js_data
 	 * @return array
 	 */
-	public function get_other_js_data( $form_other_js_data = array() ) {
-		$form_other_js_data = $this->get_other_js_data_from_strategies( $form_other_js_data );
+	public function get_other_js_data($form_other_js_data = array()) {
+		$form_other_js_data = $this->get_other_js_data_from_strategies($form_other_js_data);
 		return $form_other_js_data;
 	}
 
@@ -926,10 +926,10 @@ 
 	 * @param array $form_other_js_data
 	 * @return array
 	 */
-	public function get_other_js_data_from_strategies( $form_other_js_data = array() ) {
-		$form_other_js_data = $this->get_display_strategy()->get_other_js_data( $form_other_js_data );
-		foreach( $this->get_validation_strategies() as $validation_strategy ) {
-			$form_other_js_data = $validation_strategy->get_other_js_data( $form_other_js_data );
+	public function get_other_js_data_from_strategies($form_other_js_data = array()) {
+		$form_other_js_data = $this->get_display_strategy()->get_other_js_data($form_other_js_data);
+		foreach ($this->get_validation_strategies() as $validation_strategy) {
+			$form_other_js_data = $validation_strategy->get_other_js_data($form_other_js_data);
 		}
 		return $form_other_js_data;
 	}
@@ -938,7 +938,7 @@ 
 	 * Override parent because we want to give our strategies an opportunity to enqueue some js and css
 	 * @return void
 	 */
-	public function enqueue_js(){
+	public function enqueue_js() {
 		//ask our display strategy and validation strategies if they have js to enqueue
 		$this->enqueue_js_from_strategies();
 	}
@@ -949,7 +949,7 @@ 
 	 */
 	public function enqueue_js_from_strategies() {
 		$this->get_display_strategy()->enqueue_js();
-		foreach( $this->get_validation_strategies() as $validation_strategy ) {
+		foreach ($this->get_validation_strategies() as $validation_strategy) {
 			$validation_strategy->enqueue_js();
 		}
 	}

core/CPTs/EE_Register_CPTs.core.php

Indentation +4 added lines, -4 removed lines

@@ -472,13 +472,13 @@
 
 	function set_must_use_event_types() {
 		$term_details = array(
-		    //Attendee's register for the first date-time only
+			//Attendee's register for the first date-time only
 			'single-event' => array( __('Single Event', 'event_espresso'), __('A single event that spans one or more consecutive days.', 'event_espresso') ), //example: a party or two-day long workshop
-            //Attendee's can register for any of the date-times
+			//Attendee's can register for any of the date-times
 			'multi-event' => array( __('Multi Event', 'event_espresso'), __('Multiple, separate, but related events that occur on consecutive days.', 'event_espresso') ), //example: a three day music festival or week long conference
-            //Attendee's register for the first date-time only
+			//Attendee's register for the first date-time only
 			'event-series' => array( __('Event Series', 'event_espresso'), __(' Multiple events that occur over multiple non-consecutive days.', 'event_espresso') ), //example: an 8 week introduction to basket weaving course
-            //Attendee's can register for any of the date-times.
+			//Attendee's can register for any of the date-times.
 			'recurring-event' => array( __('Recurring Event', 'event_espresso'), __('Multiple events that occur over multiple non-consecutive days.', 'event_espresso') ), //example: a yoga class
             
 			'ongoing' => array( __('Ongoing Event', 'event_espresso'), __('An "event" that people can purchase tickets to gain access for anytime for this event regardless of date times on the event', 'event_espresso') ) //example: access to a museum

Spacing +94 added lines, -94 removed lines

@@ -23,37 +23,37 @@ 
 	 * 	constructor
 	 * instantiated at init priority 5
 	 */
-	function __construct(){
+	function __construct() {
 		// register taxonomies
 		$taxonomies = self::get_taxonomies();
-		foreach ( $taxonomies as $taxonomy =>  $tax ) {
-			$this->register_taxonomy( $taxonomy, $tax['singular_name'], $tax['plural_name'], $tax['args'] );
+		foreach ($taxonomies as $taxonomy =>  $tax) {
+			$this->register_taxonomy($taxonomy, $tax['singular_name'], $tax['plural_name'], $tax['args']);
 		}
 		// register CPTs
-		$CPTs =self::get_CPTs();
-		foreach ( $CPTs as $CPT_name =>  $CPT ) {
-			$this->register_CPT( $CPT_name, $CPT['singular_name'], $CPT['plural_name'], $CPT['args'], $CPT['singular_slug'], $CPT['plural_slug'] );
+		$CPTs = self::get_CPTs();
+		foreach ($CPTs as $CPT_name =>  $CPT) {
+			$this->register_CPT($CPT_name, $CPT['singular_name'], $CPT['plural_name'], $CPT['args'], $CPT['singular_slug'], $CPT['plural_slug']);
 		}
 		// setup default terms in any of our taxonomies (but only if we're in admin).
 		// Why not added via register_activation_hook?
 		// Because it's possible that in future iterations of EE we may add new defaults for specialized taxonomies (think event_types) and register_activation_hook only reliably runs when a user manually activates the plugin.
 		// Keep in mind that this will READ these terms if they are deleted by the user.  Hence MUST use terms.
-		if ( is_admin() ) {
+		if (is_admin()) {
 			$this->set_must_use_event_types();
 		}
 		//set default terms
-		$this->set_default_term( 'espresso_event_type', 'single-event', array('espresso_events') );
+		$this->set_default_term('espresso_event_type', 'single-event', array('espresso_events'));
 
 
-		add_action( 'AHEE__EE_System__initialize_last', array( __CLASS__,  'maybe_flush_rewrite_rules' ), 10 );
+		add_action('AHEE__EE_System__initialize_last', array(__CLASS__, 'maybe_flush_rewrite_rules'), 10);
 
 		//hook into save_post so that we can make sure that the default terms get saved on publish of registered cpts IF they don't have a term for that taxonomy set.
-		add_action('save_post', array( $this, 'save_default_term' ), 100, 2 );
+		add_action('save_post', array($this, 'save_default_term'), 100, 2);
 
 		//remove no html restrictions from core wp saving of term descriptions.  Note. this will affect only registered EE taxonomies.
 		$this->_allow_html_descriptions_for_ee_taxonomies();
 
-		do_action( 'AHEE__EE_Register_CPTs__construct_end', $this );
+		do_action('AHEE__EE_Register_CPTs__construct_end', $this);
 	}
 
 
@@ -66,9 +66,9 @@ 
 	 * @return void
 	 */
 	public static function  maybe_flush_rewrite_rules() {
-		if ( get_option( 'ee_flush_rewrite_rules', TRUE )) {
+		if (get_option('ee_flush_rewrite_rules', TRUE)) {
 			flush_rewrite_rules();
-			update_option( 'ee_flush_rewrite_rules', FALSE );
+			update_option('ee_flush_rewrite_rules', FALSE);
 		}
 	}
 
@@ -83,7 +83,7 @@ 
 	protected function _allow_html_descriptions_for_ee_taxonomies() {
 		//first remove default filter for term description but we have to do this earlier before wp sets their own filter
 		//because they just set a global filter on all term descriptions before the custom term description filter. Really sux.
-		add_filter( 'pre_term_description', array( $this, 'ee_filter_ee_term_description_not_wp' ), 1, 2 );
+		add_filter('pre_term_description', array($this, 'ee_filter_ee_term_description_not_wp'), 1, 2);
 	}
 
 
@@ -93,16 +93,16 @@ 
 	 * @param string $taxonomy      The taxonomy name for the taxonomy being filtered.
 	 * @return string
 	 */
-	public function ee_filter_ee_term_description_not_wp( $description, $taxonomy ) {
+	public function ee_filter_ee_term_description_not_wp($description, $taxonomy) {
 		//get a list of EE taxonomies
-		$ee_taxonomies = array_keys( self::get_taxonomies() );
+		$ee_taxonomies = array_keys(self::get_taxonomies());
 
 		//only do our own thing if the taxonomy listed is an ee taxonomy.
-		if ( in_array( $taxonomy, $ee_taxonomies ) ) {
+		if (in_array($taxonomy, $ee_taxonomies)) {
 			//remove default wp filter
-			remove_filter( 'pre_term_description', 'wp_filter_kses' );
+			remove_filter('pre_term_description', 'wp_filter_kses');
 			//sanitize THIS content.
-			$description = wp_kses( $description, wp_kses_allowed_html( 'post' ) );
+			$description = wp_kses($description, wp_kses_allowed_html('post'));
 		}
 		return $description;
 	}
@@ -116,9 +116,9 @@ 
 	 *  @access 	public
 	 *  @return 	array
 	 */
-	public static function get_taxonomies(){
+	public static function get_taxonomies() {
 		// define taxonomies
-		return apply_filters( 'FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', array(
+		return apply_filters('FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', array(
 			'espresso_event_categories' => array(
 				'singular_name' => __("Event Category", "event_espresso"),
 				'plural_name' => __("Event Categories", "event_espresso"),
@@ -132,7 +132,7 @@ 
 						'delete_terms' => 'ee_delete_event_category',
 						'assign_terms' => 'ee_assign_event_category'
 						),
-					'rewrite' => array( 'slug' => __( 'event-category', 'event_espresso' ))
+					'rewrite' => array('slug' => __('event-category', 'event_espresso'))
 				)),
 			'espresso_venue_categories' => array(
 				'singular_name' => __("Venue Category", "event_espresso"),
@@ -147,7 +147,7 @@ 
 						'delete_terms' => 'ee_delete_venue_category',
 						'assign_terms' => 'ee_assign_venue_category'
 						),
-					'rewrite' => array( 'slug' => __( 'venue-category', 'event_espresso' ))
+					'rewrite' => array('slug' => __('venue-category', 'event_espresso'))
 				)),
 			'espresso_event_type' => array(
 				'singular_name' => __("Event Type", "event_espresso"),
@@ -162,10 +162,10 @@ 
 						'delete_terms' => 'ee_delete_event_type',
 						'assign_terms' => 'ee_assign_event_type'
 						),
-					'rewrite' => array( 'slug' => __( 'event-type', 'event_espresso' )),
+					'rewrite' => array('slug' => __('event-type', 'event_espresso')),
 					'hierarchical'=>true
 				))
-			) );
+			));
 	}
 
 
@@ -183,26 +183,26 @@ 
 	 * @return array 	       Empty array if no matching model names for the given slug or an array of model
 	 *                                         names indexed by post type slug.
 	 */
-	public static function get_cpt_model_names( $post_type_slug = '' ) {
+	public static function get_cpt_model_names($post_type_slug = '') {
 		$cpts = self::get_CPTs();
 
 		//first if slug passed in...
-		if ( ! empty( $post_type_slug )  ) {
+		if ( ! empty($post_type_slug)) {
 			//match?
-			if ( ! isset( $cpts[$post_type_slug] ) || ( isset( $cpts[$post_type_slug] ) && empty( $cpts[$post_type_slug]['class_name'] ) ) ) {
+			if ( ! isset($cpts[$post_type_slug]) || (isset($cpts[$post_type_slug]) && empty($cpts[$post_type_slug]['class_name']))) {
 				return array();
 			}
 
 			//k let's get the model name for this cpt.
-			return array( $post_type_slug => str_replace( 'EE', 'EEM', $cpts[$post_type_slug]['class_name'] ) );
+			return array($post_type_slug => str_replace('EE', 'EEM', $cpts[$post_type_slug]['class_name']));
 		}
 
 
 		//if we made it here then we're returning an array of cpt model names indexed by post_type_slug.
 		$cpt_models = array();
-		foreach ( $cpts as $slug => $args ) {
-			if ( ! empty( $args['class_name'] ) ) {
-				$cpt_models[$slug] = str_replace( 'EE', 'EEM', $args['class_name'] );
+		foreach ($cpts as $slug => $args) {
+			if ( ! empty($args['class_name'])) {
+				$cpt_models[$slug] = str_replace('EE', 'EEM', $args['class_name']);
 			}
 		}
 		return $cpt_models;
@@ -223,12 +223,12 @@ 
 	 * @return EEM_CPT_Base[]   successful instantiation will return an array of successfully instantiated EEM
 	 *                                     	  models  indexed by post slug.
 	 */
-	public static function instantiate_cpt_models( $post_type_slug = '' ) {
-		$cpt_model_names = self::get_cpt_model_names( $post_type_slug );
+	public static function instantiate_cpt_models($post_type_slug = '') {
+		$cpt_model_names = self::get_cpt_model_names($post_type_slug);
 		$instantiated = array();
-		foreach ( $cpt_model_names as $slug => $model_name ) {
-			$instance = EE_Registry::instance()->load_model( str_replace( 'EEM_', '', $model_name ) );
-			if ( $instance instanceof EEM_CPT_Base ) {
+		foreach ($cpt_model_names as $slug => $model_name) {
+			$instance = EE_Registry::instance()->load_model(str_replace('EEM_', '', $model_name));
+			if ($instance instanceof EEM_CPT_Base) {
 				$instantiated[$slug] = $instance;
 			}
 		}
@@ -245,10 +245,10 @@ 
 	 *  @access 	public
 	 *  @return 	array
 	 */
-	public static function get_CPTs(){
+	public static function get_CPTs() {
 		// define CPTs
 		// NOTE the ['args']['page_templates'] array index is something specific to our CPTs and not part of the WP custom post type api.
-		return apply_filters( 'FHEE__EE_Register_CPTs__get_CPTs__cpts', array(
+		return apply_filters('FHEE__EE_Register_CPTs__get_CPTs__cpts', array(
 			'espresso_events' => array(
 				'singular_name' => __("Event", "event_espresso"),
 				'plural_name' => __("Events", "event_espresso"),
@@ -323,7 +323,7 @@ 
 					'publicly_queryable'=> FALSE,
 					'hierarchical'=> FALSE,
 					'has_archive' => FALSE,
-					'taxonomies' => array( 'post_tag' ),
+					'taxonomies' => array('post_tag'),
 					'capability_type' => 'contact',
 					'capabilities' => array(
 						'edit_post' => 'ee_edit_contact',
@@ -340,9 +340,9 @@ 
 						'edit_private_posts' => 'ee_edit_contacts',
 						'edit_published_posts' => 'ee_edit_contacts'
 						),
-					'supports' => array( 'editor', 'thumbnail', 'excerpt', 'custom-fields', 'comments' ),
+					'supports' => array('editor', 'thumbnail', 'excerpt', 'custom-fields', 'comments'),
 				))
-			) );
+			));
 	}
 
 
@@ -355,9 +355,9 @@ 
 	public static function get_private_CPTs() {
 		$CPTs = self::get_CPTs();
 		$private_CPTs = array();
-		foreach ( $CPTs as $CPT => $details ) {
-			if ( empty( $details['args']['public'] ) )
-				$private_CPTs[ $CPT ] = $details;
+		foreach ($CPTs as $CPT => $details) {
+			if (empty($details['args']['public']))
+				$private_CPTs[$CPT] = $details;
 		}
 		return $private_CPTs;
 	}
@@ -375,7 +375,7 @@ 
 	 * @param string $plural_name internationalized plural name
 	 * @param array $override_args like $args on http://codex.wordpress.org/Function_Reference/register_taxonomy
 	 */
-	function register_taxonomy( $taxonomy_name, $singular_name, $plural_name, $override_args = array() ){
+	function register_taxonomy($taxonomy_name, $singular_name, $plural_name, $override_args = array()) {
 
 		$args = array(
 			'hierarchical'      => true,
@@ -392,15 +392,15 @@ 
 			//'rewrite'           => array( 'slug' => 'genre' ),
 		);
 
-	  if($override_args){
-		  if(isset($override_args['labels'])){
-			  $labels = array_merge($args['labels'],$override_args['labels']);
+	  if ($override_args) {
+		  if (isset($override_args['labels'])) {
+			  $labels = array_merge($args['labels'], $override_args['labels']);
 			  $args['labels'] = $labels;
 		  }
-		  $args = array_merge($args,$override_args);
+		  $args = array_merge($args, $override_args);
 
 	  }
-		register_taxonomy($taxonomy_name,null, $args);
+		register_taxonomy($taxonomy_name, null, $args);
 	}
 
 
@@ -414,27 +414,27 @@ 
 	 * The default values set in this function will be overridden by whatever you set in $override_args
 	 * @return void, but registers the custom post type
 	 */
-	function register_CPT($post_type, $singular_name,$plural_name,$override_args = array(), $singular_slug = '', $plural_slug = '' ) {
+	function register_CPT($post_type, $singular_name, $plural_name, $override_args = array(), $singular_slug = '', $plural_slug = '') {
 
 	  $labels = array(
 		'name' => $plural_name,
 		'singular_name' => $singular_name,
-		'add_new' => sprintf(__("Add %s", "event_espresso"),$singular_name),
-		'add_new_item' => sprintf(__("Add New %s", "event_espresso"),$singular_name),
-		'edit_item' => sprintf(__("Edit %s", "event_espresso"),$singular_name),
-		'new_item' => sprintf(__("New %s", "event_espresso"),$singular_name),
-		'all_items' => sprintf(__("All %s", "event_espresso"),$plural_name),
-		'view_item' => sprintf(__("View %s", "event_espresso"),$singular_name),
-		'search_items' => sprintf(__("Search %s", "event_espresso"),$plural_name),
-		'not_found' => sprintf(__("No %s found", "event_espresso"),$plural_name),
-		'not_found_in_trash' => sprintf(__("No %s found in Trash", "event_espresso"),$plural_name),
+		'add_new' => sprintf(__("Add %s", "event_espresso"), $singular_name),
+		'add_new_item' => sprintf(__("Add New %s", "event_espresso"), $singular_name),
+		'edit_item' => sprintf(__("Edit %s", "event_espresso"), $singular_name),
+		'new_item' => sprintf(__("New %s", "event_espresso"), $singular_name),
+		'all_items' => sprintf(__("All %s", "event_espresso"), $plural_name),
+		'view_item' => sprintf(__("View %s", "event_espresso"), $singular_name),
+		'search_items' => sprintf(__("Search %s", "event_espresso"), $plural_name),
+		'not_found' => sprintf(__("No %s found", "event_espresso"), $plural_name),
+		'not_found_in_trash' => sprintf(__("No %s found in Trash", "event_espresso"), $plural_name),
 		'parent_item_colon' => '',
-		'menu_name' => sprintf(__("%s", "event_espresso"),$plural_name)
+		'menu_name' => sprintf(__("%s", "event_espresso"), $plural_name)
 	  );
 
 	  //verify plural slug and singular slug, if they aren't we'll use $singular_name and $plural_name
-	  $singular_slug = ! empty( $singular_slug ) ? $singular_slug : $singular_name;
-	  $plural_slug = ! empty( $plural_slug ) ? $plural_slug : $plural_name;
+	  $singular_slug = ! empty($singular_slug) ? $singular_slug : $singular_name;
+	  $plural_slug = ! empty($plural_slug) ? $plural_slug : $plural_name;
 
 
 	  //note the page_templates arg in the supports index is something specific to EE.  WordPress doesn't actually have that in their register_post_type api.
@@ -447,24 +447,24 @@ 
 		'show_in_menu' => false,
 		'show_in_nav_menus' => false,
 		'query_var' => true,
-		'rewrite' => apply_filters( 'FHEE__EE_Register_CPTs__register_CPT__rewrite', array( 'slug' => $plural_slug ), $post_type ),
+		'rewrite' => apply_filters('FHEE__EE_Register_CPTs__register_CPT__rewrite', array('slug' => $plural_slug), $post_type),
 		'capability_type' => 'post',
 		'map_meta_cap' => true,
 		'has_archive' => true,
 		'hierarchical' => true,
 		'menu_position' => null,
-		'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments' )
+		'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments')
 	  );
 
-	  if($override_args){
-		  if(isset($override_args['labels'])){
-			  $labels = array_merge($args['labels'],$override_args['labels']);
+	  if ($override_args) {
+		  if (isset($override_args['labels'])) {
+			  $labels = array_merge($args['labels'], $override_args['labels']);
 		  }
-		  $args = array_merge($args,$override_args);
+		  $args = array_merge($args, $override_args);
 		  $args['labels'] = $labels;
 	  }
 
-	  register_post_type( $post_type, $args );
+	  register_post_type($post_type, $args);
 	}
 
 
@@ -473,15 +473,15 @@ 
 	function set_must_use_event_types() {
 		$term_details = array(
 		    //Attendee's register for the first date-time only
-			'single-event' => array( __('Single Event', 'event_espresso'), __('A single event that spans one or more consecutive days.', 'event_espresso') ), //example: a party or two-day long workshop
+			'single-event' => array(__('Single Event', 'event_espresso'), __('A single event that spans one or more consecutive days.', 'event_espresso')), //example: a party or two-day long workshop
             //Attendee's can register for any of the date-times
-			'multi-event' => array( __('Multi Event', 'event_espresso'), __('Multiple, separate, but related events that occur on consecutive days.', 'event_espresso') ), //example: a three day music festival or week long conference
+			'multi-event' => array(__('Multi Event', 'event_espresso'), __('Multiple, separate, but related events that occur on consecutive days.', 'event_espresso')), //example: a three day music festival or week long conference
             //Attendee's register for the first date-time only
-			'event-series' => array( __('Event Series', 'event_espresso'), __(' Multiple events that occur over multiple non-consecutive days.', 'event_espresso') ), //example: an 8 week introduction to basket weaving course
+			'event-series' => array(__('Event Series', 'event_espresso'), __(' Multiple events that occur over multiple non-consecutive days.', 'event_espresso')), //example: an 8 week introduction to basket weaving course
             //Attendee's can register for any of the date-times.
-			'recurring-event' => array( __('Recurring Event', 'event_espresso'), __('Multiple events that occur over multiple non-consecutive days.', 'event_espresso') ), //example: a yoga class
+			'recurring-event' => array(__('Recurring Event', 'event_espresso'), __('Multiple events that occur over multiple non-consecutive days.', 'event_espresso')), //example: a yoga class
             
-			'ongoing' => array( __('Ongoing Event', 'event_espresso'), __('An "event" that people can purchase tickets to gain access for anytime for this event regardless of date times on the event', 'event_espresso') ) //example: access to a museum
+			'ongoing' => array(__('Ongoing Event', 'event_espresso'), __('An "event" that people can purchase tickets to gain access for anytime for this event regardless of date times on the event', 'event_espresso')) //example: access to a museum
 
 			//'walk-in' => array( __('Walk In', 'event_espresso'), __('Single datetime and single entry recurring events. Attendees register for one or multiple datetimes individually.', 'event_espresso') ),
 			//'reservation' => array( __('Reservation', 'event_espresso'), __('Reservations are created by specifying available datetimes and quantities. Attendees choose from the available datetimes and specify the quantity available (if the maximum is greater than 1)') ), //@TODO to avoid confusion we'll implement this in a later iteration > EE4.1
@@ -489,7 +489,7 @@ 
 			//'appointment' => array( __('Appointments', 'event_espresso'), __('Time slotted events where datetimes are generally in hours or minutes. For example, attendees can register for a single 15 minute or 1 hour time slot and this type of availability frequently reoccurs.', 'event_espresso') )
 
 			);
-		$this->set_must_use_terms( 'espresso_event_type', $term_details );
+		$this->set_must_use_terms('espresso_event_type', $term_details);
 	}
 
 
@@ -503,16 +503,16 @@ 
 	 *
 	 * @return void
 	 */
-	function set_must_use_terms( $taxonomy, $term_details ) {
+	function set_must_use_terms($taxonomy, $term_details) {
 		$term_details = (array) $term_details;
 
-		foreach ( $term_details as $slug => $details ) {
-			if ( !term_exists( $slug, $taxonomy ) ) {
+		foreach ($term_details as $slug => $details) {
+			if ( ! term_exists($slug, $taxonomy)) {
 				$insert_arr = array(
 					'slug' => $slug,
 					'description' => $details[1]
 					);
-				wp_insert_term( $details[0], $taxonomy, $insert_arr );
+				wp_insert_term($details[0], $taxonomy, $insert_arr);
 			}
 		}
 	}
@@ -526,8 +526,8 @@ 
 	 * @param string $term_slug The slug of the term that will be the default.
 	 * @param array $cpt_slugs  An array of custom post types we want the default assigned to
 	 */
-	function set_default_term( $taxonomy, $term_slug, $cpt_slugs = array() ) {
-		$this->_default_terms[][$term_slug] = new EE_Default_Term( $taxonomy, $term_slug, $cpt_slugs );
+	function set_default_term($taxonomy, $term_slug, $cpt_slugs = array()) {
+		$this->_default_terms[][$term_slug] = new EE_Default_Term($taxonomy, $term_slug, $cpt_slugs);
 	}
 
 
@@ -539,20 +539,20 @@ 
 	 * @param  object $post    Post object
 	 * @return void
 	 */
-	function save_default_term( $post_id, $post ) {
-		if ( empty( $this->_default_terms ) )
+	function save_default_term($post_id, $post) {
+		if (empty($this->_default_terms))
 			return; //no default terms set so lets just exit.
 
-		foreach ( $this->_default_terms as $defaults ) {
-			foreach ( $defaults as $default_obj ) {
-				if ( $post->post_status == 'publish' && in_array( $post->post_type, $default_obj->cpt_slugs ) ) {
+		foreach ($this->_default_terms as $defaults) {
+			foreach ($defaults as $default_obj) {
+				if ($post->post_status == 'publish' && in_array($post->post_type, $default_obj->cpt_slugs)) {
 
 					//note some error proofing going on here to save unnecessary db queries
-					$taxonomies = get_object_taxonomies( $post->post_type );
-					foreach ( (array) $taxonomies as $taxonomy ) {
-						$terms = wp_get_post_terms( $post_id, $taxonomy);
-						if ( empty( $terms ) && $taxonomy == $default_obj->taxonomy ) {
-							wp_set_object_terms( $post_id, array( $default_obj->term_slug ), $taxonomy );
+					$taxonomies = get_object_taxonomies($post->post_type);
+					foreach ((array) $taxonomies as $taxonomy) {
+						$terms = wp_get_post_terms($post_id, $taxonomy);
+						if (empty($terms) && $taxonomy == $default_obj->taxonomy) {
+							wp_set_object_terms($post_id, array($default_obj->term_slug), $taxonomy);
 						}
 					}
 				}
@@ -584,7 +584,7 @@ 
 	 * @param string $term_slug The slug of the term that will be the default.
 	 * @param array $cpt_slugs  The custom post type the default term gets saved with
 	 */
-	public function __construct( $taxonomy, $term_slug, $cpt_slugs = array() ) {
+	public function __construct($taxonomy, $term_slug, $cpt_slugs = array()) {
 		$this->taxonomy = $taxonomy;
 		$this->cpt_slugs = (array) $cpt_slugs;
 		$this->term_slug = $term_slug;

admin_pages/maintenance/Maintenance_Admin_Page.core.php

Spacing +12 added lines, -12 removed lines

@@ -233,13 +233,13 @@ 
                 && $most_recent_migration->is_broken()
             )
         ) {
-            $this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_migration_was_borked_page.template.php';
+            $this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH.'ee_migration_was_borked_page.template.php';
             $this->_template_args['support_url'] = 'http://eventespresso.com/support/forums/';
             $this->_template_args['next_url'] = EEH_URL::add_query_args_and_nonce(array('action'  => 'confirm_migration_crash_report_sent',
                                                                                         'success' => '0',
             ), EE_MAINTENANCE_ADMIN_URL);
         } elseif ($addons_should_be_upgraded_first) {
-            $this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_upgrade_addons_before_migrating.template.php';
+            $this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH.'ee_upgrade_addons_before_migrating.template.php';
         } else {
             if ($most_recent_migration
                 && $most_recent_migration instanceof EE_Data_Migration_Script_Base
@@ -266,7 +266,7 @@ 
                         $new_version, $plugin_slug) : null,
                 ));
             }
-            $this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_migration_page.template.php';
+            $this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH.'ee_migration_page.template.php';
             $this->_template_args = array_merge(
                 $this->_template_args,
                 array(
@@ -303,13 +303,13 @@ 
                 'status_completed'                 => EE_Data_Migration_Manager::status_completed,
             ));
         }
-        $this->_template_args['most_recent_migration'] = $most_recent_migration;//the actual most recently ran migration
+        $this->_template_args['most_recent_migration'] = $most_recent_migration; //the actual most recently ran migration
         //now render the migration options part, and put it in a variable
         $migration_options_template_file = apply_filters(
             'FHEE__ee_migration_page__migration_options_template',
-            EE_MAINTENANCE_TEMPLATE_PATH . 'migration_options_from_ee4.template.php'
+            EE_MAINTENANCE_TEMPLATE_PATH.'migration_options_from_ee4.template.php'
         );
-        $migration_options_html = EEH_Template::display_template($migration_options_template_file, $this->_template_args,true);
+        $migration_options_html = EEH_Template::display_template($migration_options_template_file, $this->_template_args, true);
         $this->_template_args['migration_options_html'] = $migration_options_html;
         $this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_template_path,
             $this->_template_args, true);
@@ -367,7 +367,7 @@ 
      */
     public function _data_reset_and_delete()
     {
-        $this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_data_reset_and_delete.template.php';
+        $this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH.'ee_data_reset_and_delete.template.php';
         $this->_template_args['reset_capabilities_button'] = $this->get_action_link_or_button(
             'reset_capabilities',
             'reset_capabilities',
@@ -422,7 +422,7 @@ 
      */
     public function _system_status()
     {
-        $this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_system_stati_page.template.php';
+        $this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH.'ee_system_stati_page.template.php';
         $this->_template_args['system_stati'] = EEM_System_Status::instance()->get_system_stati();
         $this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_template_path,
             $this->_template_args, true);
@@ -439,7 +439,7 @@ 
         try {
             $success = wp_mail(EE_SUPPORT_EMAIL,
                 'Migration Crash Report',
-                $body . "/r/n<br>" . print_r(EEM_System_Status::instance()->get_system_stati(), true),
+                $body."/r/n<br>".print_r(EEM_System_Status::instance()->get_system_stati(), true),
                 array(
                     "from:$from_name<$from>",
                     //					'content-type:text/html charset=UTF-8'
@@ -474,7 +474,7 @@ 
             EE_MAINTENANCE_ADMIN_URL);
         $this->_template_args['reattempt_action_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'reattempt_migration'),
             EE_MAINTENANCE_ADMIN_URL);
-        $this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_confirm_migration_crash_report_sent.template.php';
+        $this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH.'ee_confirm_migration_crash_report_sent.template.php';
         $this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_template_path,
             $this->_template_args, true);
         $this->display_admin_page_with_sidebar();
@@ -575,9 +575,9 @@ 
         wp_enqueue_script('ee_admin_js');
 //		wp_enqueue_media();
 //		wp_enqueue_script('media-upload');
-        wp_enqueue_script('ee-maintenance', EE_MAINTENANCE_ASSETS_URL . '/ee-maintenance.js', array('jquery'),
+        wp_enqueue_script('ee-maintenance', EE_MAINTENANCE_ASSETS_URL.'/ee-maintenance.js', array('jquery'),
             EVENT_ESPRESSO_VERSION, true);
-        wp_register_style('espresso_maintenance', EE_MAINTENANCE_ASSETS_URL . 'ee-maintenance.css', array(),
+        wp_register_style('espresso_maintenance', EE_MAINTENANCE_ASSETS_URL.'ee-maintenance.css', array(),
             EVENT_ESPRESSO_VERSION);
         wp_enqueue_style('espresso_maintenance');
     }

Indentation +551 added lines, -551 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('NO direct script access allowed');
+	exit('NO direct script access allowed');
 }
 
 
@@ -28,571 +28,571 @@ 
 {
 
 
-    public function __construct($routing = true)
-    {
-        parent::__construct($routing);
-    }
-
-
-
-    protected function _init_page_props()
-    {
-        $this->page_slug = EE_MAINTENANCE_PG_SLUG;
-        $this->page_label = EE_MAINTENANCE_LABEL;
-        $this->_admin_base_url = EE_MAINTENANCE_ADMIN_URL;
-        $this->_admin_base_path = EE_MAINTENANCE_ADMIN;
-    }
-
-
-
-    protected function _ajax_hooks()
-    {
-        add_action('wp_ajax_migration_step', array($this, 'migration_step'));
-        add_action('wp_ajax_add_error_to_migrations_ran', array($this, 'add_error_to_migrations_ran'));
-    }
-
-
-
-    protected function _define_page_props()
-    {
-        $this->_admin_page_title = EE_MAINTENANCE_LABEL;
-        $this->_labels = array(
-            'buttons' => array(
-                'reset_capabilities' => esc_html__('Reset Event Espresso Capabilities', 'event_espresso'),
-            ),
-        );
-    }
-
-
-
-    protected function _set_page_routes()
-    {
-        $this->_page_routes = array(
-            'default'                             => array(
-                'func'       => '_maintenance',
-                'capability' => 'manage_options',
-            ),
-            'change_maintenance_level'            => array(
-                'func'       => '_change_maintenance_level',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ),
-            'system_status'                       => array(
-                'func'       => '_system_status',
-                'capability' => 'manage_options',
-            ),
-            'send_migration_crash_report'         => array(
-                'func'       => '_send_migration_crash_report',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ),
-            'confirm_migration_crash_report_sent' => array(
-                'func'       => '_confirm_migration_crash_report_sent',
-                'capability' => 'manage_options',
-            ),
-            'data_reset'                          => array(
-                'func'       => '_data_reset_and_delete',
-                'capability' => 'manage_options',
-            ),
-            'reset_db'                            => array(
-                'func'       => '_reset_db',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-                'args'       => array('nuke_old_ee4_data' => true),
-            ),
-            'start_with_fresh_ee4_db'             => array(
-                'func'       => '_reset_db',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-                'args'       => array('nuke_old_ee4_data' => false),
-            ),
-            'delete_db'                           => array(
-                'func'       => '_delete_db',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ),
-            'rerun_migration_from_ee3'            => array(
-                'func'       => '_rerun_migration_from_ee3',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ),
-            'reset_capabilities'                  => array(
-                'func'       => '_reset_capabilities',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ),
-            'reattempt_migration'                 => array(
-                'func'       => '_reattempt_migration',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ),
-        );
-    }
-
-
-
-    protected function _set_page_config()
-    {
-        $this->_page_config = array(
-            'default'       => array(
-                'nav'           => array(
-                    'label' => esc_html__('Maintenance', 'event_espresso'),
-                    'order' => 10,
-                ),
-                'require_nonce' => false,
-            ),
-            'data_reset'    => array(
-                'nav'           => array(
-                    'label' => esc_html__('Reset/Delete Data', 'event_espresso'),
-                    'order' => 20,
-                ),
-                'require_nonce' => false,
-            ),
-            'system_status' => array(
-                'nav'           => array(
-                    'label' => esc_html__("System Information", "event_espresso"),
-                    'order' => 30,
-                ),
-                'require_nonce' => false,
-            ),
-        );
-    }
-
-
-
-    /**
-     * default maintenance page. If we're in maintenance mode level 2, then we need to show
-     * the migration scripts and all that UI.
-     */
-    public function _maintenance()
-    {
-        //it all depends if we're in maintenance model level 1 (frontend-only) or
-        //level 2 (everything except maintenance page)
-        try {
-            //get the current maintenance level and check if
-            //we are removed
-            $mm = EE_Maintenance_Mode::instance()->level();
-            $placed_in_mm = EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
-            if ($mm == EE_Maintenance_Mode::level_2_complete_maintenance && ! $placed_in_mm) {
-                //we just took the site out of maintenance mode, so notify the user.
-                //unfortunately this message appears to be echoed on the NEXT page load...
-                //oh well, we should really be checking for this on addon deactivation anyways
-                EE_Error::add_attention(__('Site taken out of maintenance mode because no data migration scripts are required',
-                    'event_espresso'));
-                $this->_process_notices(array('page' => 'espresso_maintenance_settings'), false);
-            }
-            //in case an exception is thrown while trying to handle migrations
-            switch (EE_Maintenance_Mode::instance()->level()) {
-                case EE_Maintenance_Mode::level_0_not_in_maintenance:
-                case EE_Maintenance_Mode::level_1_frontend_only_maintenance:
-                    $show_maintenance_switch = true;
-                    $show_backup_db_text = false;
-                    $show_migration_progress = false;
-                    $script_names = array();
-                    $addons_should_be_upgraded_first = false;
-                    break;
-                case EE_Maintenance_Mode::level_2_complete_maintenance:
-                    $show_maintenance_switch = false;
-                    $show_migration_progress = true;
-                    if (isset($this->_req_data['continue_migration'])) {
-                        $show_backup_db_text = false;
-                    } else {
-                        $show_backup_db_text = true;
-                    }
-                    $scripts_needing_to_run = EE_Data_Migration_Manager::instance()
-                                                                       ->check_for_applicable_data_migration_scripts();
-                    $addons_should_be_upgraded_first = EE_Data_Migration_Manager::instance()->addons_need_updating();
-                    $script_names = array();
-                    $current_script = null;
-                    foreach ($scripts_needing_to_run as $script) {
-                        if ($script instanceof EE_Data_Migration_Script_Base) {
-                            if ( ! $current_script) {
-                                $current_script = $script;
-                                $current_script->migration_page_hooks();
-                            }
-                            $script_names[] = $script->pretty_name();
-                        }
-                    }
-                    break;
-            }
-            $most_recent_migration = EE_Data_Migration_Manager::instance()->get_last_ran_script(true);
-            $exception_thrown = false;
-        } catch (EE_Error $e) {
-            EE_Data_Migration_Manager::instance()->add_error_to_migrations_ran($e->getMessage());
-            //now, just so we can display the page correctly, make a error migration script stage object
-            //and also put the error on it. It only persists for the duration of this request
-            $most_recent_migration = new EE_DMS_Unknown_1_0_0();
-            $most_recent_migration->add_error($e->getMessage());
-            $exception_thrown = true;
-        }
-        $current_db_state = EE_Data_Migration_Manager::instance()->ensure_current_database_state_is_set();
-        $current_db_state = str_replace('.decaf', '', $current_db_state);
-        if ($exception_thrown
-            || ($most_recent_migration
-                && $most_recent_migration instanceof EE_Data_Migration_Script_Base
-                && $most_recent_migration->is_broken()
-            )
-        ) {
-            $this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_migration_was_borked_page.template.php';
-            $this->_template_args['support_url'] = 'http://eventespresso.com/support/forums/';
-            $this->_template_args['next_url'] = EEH_URL::add_query_args_and_nonce(array('action'  => 'confirm_migration_crash_report_sent',
-                                                                                        'success' => '0',
-            ), EE_MAINTENANCE_ADMIN_URL);
-        } elseif ($addons_should_be_upgraded_first) {
-            $this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_upgrade_addons_before_migrating.template.php';
-        } else {
-            if ($most_recent_migration
-                && $most_recent_migration instanceof EE_Data_Migration_Script_Base
-                && $most_recent_migration->can_continue()
-            ) {
-                $show_backup_db_text = false;
-                $show_continue_current_migration_script = true;
-                $show_most_recent_migration = true;
-            } elseif (isset($this->_req_data['continue_migration'])) {
-                $show_most_recent_migration = true;
-                $show_continue_current_migration_script = false;
-            } else {
-                $show_most_recent_migration = false;
-                $show_continue_current_migration_script = false;
-            }
-            if (isset($current_script)) {
-                $migrates_to = $current_script->migrates_to_version();
-                $plugin_slug = $migrates_to['slug'];
-                $new_version = $migrates_to['version'];
-                $this->_template_args = array_merge($this->_template_args, array(
-                    'current_db_state' => sprintf(__("EE%s (%s)", "event_espresso"),
-                        isset($current_db_state[$plugin_slug]) ? $current_db_state[$plugin_slug] : 3, $plugin_slug),
-                    'next_db_state'    => isset($current_script) ? sprintf(__("EE%s (%s)", 'event_espresso'),
-                        $new_version, $plugin_slug) : null,
-                ));
-            }
-            $this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_migration_page.template.php';
-            $this->_template_args = array_merge(
-                $this->_template_args,
-                array(
-                    'show_most_recent_migration'             => $show_most_recent_migration,
-                    //flag for showing the most recent migration's status and/or errors
-                    'show_migration_progress'                => $show_migration_progress,
-                    //flag for showing the option to run migrations and see their progress
-                    'show_backup_db_text'                    => $show_backup_db_text,
-                    //flag for showing text telling the user to backup their DB
-                    'show_maintenance_switch'                => $show_maintenance_switch,
-                    //flag for showing the option to change maintenance mode between levels 0 and 1
-                    'script_names'                           => $script_names,
-                    //array of names of scripts that have run
-                    'show_continue_current_migration_script' => $show_continue_current_migration_script,
-                    //flag to change wording to indicating that we're only CONTINUING a migration script (somehow it got interrupted0
-                    'reset_db_page_link'                     => EE_Admin_Page::add_query_args_and_nonce(array('action' => 'reset_db'),
-                        EE_MAINTENANCE_ADMIN_URL),
-                    'data_reset_page'                        => EE_Admin_Page::add_query_args_and_nonce(array('action' => 'data_reset'),
-                        EE_MAINTENANCE_ADMIN_URL),
-                    'update_migration_script_page_link'      => EE_Admin_Page::add_query_args_and_nonce(array('action' => 'change_maintenance_level'),
-                        EE_MAINTENANCE_ADMIN_URL),
-                    'ultimate_db_state'                      => sprintf(__("EE%s", 'event_espresso'),
-                        espresso_version()),
-                )
-            );
-            //make sure we have the form fields helper available. It usually is, but sometimes it isn't
-            //localize script stuff
-            wp_localize_script('ee-maintenance', 'ee_maintenance', array(
-                'migrating'                        => esc_html__("Updating Database...", "event_espresso"),
-                'next'                             => esc_html__("Next", "event_espresso"),
-                'fatal_error'                      => esc_html__("A Fatal Error Has Occurred", "event_espresso"),
-                'click_next_when_ready'            => esc_html__("The current Database Update has ended. Click 'next' when ready to proceed",
-                    "event_espresso"),
-                'status_no_more_migration_scripts' => EE_Data_Migration_Manager::status_no_more_migration_scripts,
-                'status_fatal_error'               => EE_Data_Migration_Manager::status_fatal_error,
-                'status_completed'                 => EE_Data_Migration_Manager::status_completed,
-            ));
-        }
-        $this->_template_args['most_recent_migration'] = $most_recent_migration;//the actual most recently ran migration
-        //now render the migration options part, and put it in a variable
-        $migration_options_template_file = apply_filters(
-            'FHEE__ee_migration_page__migration_options_template',
-            EE_MAINTENANCE_TEMPLATE_PATH . 'migration_options_from_ee4.template.php'
-        );
-        $migration_options_html = EEH_Template::display_template($migration_options_template_file, $this->_template_args,true);
-        $this->_template_args['migration_options_html'] = $migration_options_html;
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_template_path,
-            $this->_template_args, true);
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-
-    /**
-     * returns JSON and executes another step of the currently-executing data migration (called via ajax)
-     */
-    public function migration_step()
-    {
-        $this->_template_args['data'] = EE_Data_Migration_Manager::instance()->response_to_migration_ajax_request();
-        $this->_return_json();
-    }
-
-
-
-    /**
-     * Can be used by js when it notices a response with HTML in it in order
-     * to log the malformed response
-     */
-    public function add_error_to_migrations_ran()
-    {
-        EE_Data_Migration_Manager::instance()->add_error_to_migrations_ran($this->_req_data['message']);
-        $this->_template_args['data'] = array('ok' => true);
-        $this->_return_json();
-    }
-
-
-
-    /**
-     * changes the maintenance level, provided there are still no migration scripts that shoudl run
-     */
-    public function _change_maintenance_level()
-    {
-        $new_level = intval($this->_req_data['maintenance_mode_level']);
-        if ( ! EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts()) {
-            EE_Maintenance_Mode::instance()->set_maintenance_level($new_level);
-            $success = true;
-        } else {
-            EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
-            $success = false;
-        }
-        $this->_redirect_after_action($success, 'Maintenance Mode', esc_html__("Updated", "event_espresso"));
-    }
-
-
-
-    /**
-     * a tab with options for resetting and/or deleting EE data
-     *
-     * @throws \EE_Error
-     */
-    public function _data_reset_and_delete()
-    {
-        $this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_data_reset_and_delete.template.php';
-        $this->_template_args['reset_capabilities_button'] = $this->get_action_link_or_button(
-            'reset_capabilities',
-            'reset_capabilities',
-            array(),
-            'button button-primary',
-            '',
-            false
-        );
-        $this->_template_args['delete_db_url'] = EE_Admin_Page::add_query_args_and_nonce(
-            array('action' => 'delete_db'),
-            EE_MAINTENANCE_ADMIN_URL
-        );
-        $this->_template_args['reset_db_url'] = EE_Admin_Page::add_query_args_and_nonce(
-            array('action' => 'reset_db'),
-            EE_MAINTENANCE_ADMIN_URL
-        );
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            $this->_template_path,
-            $this->_template_args,
-            true
-        );
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-
-    protected function _reset_capabilities()
-    {
-        EE_Registry::instance()->CAP->init_caps(true);
-        EE_Error::add_success(__('Default Event Espresso capabilities have been restored for all current roles.',
-            'event_espresso'));
-        $this->_redirect_after_action(false, '', '', array('action' => 'data_reset'), true);
-    }
-
-
-
-    /**
-     * resets the DMSs so we can attempt to continue migrating after a fatal error
-     * (only a good idea when someone has somehow tried ot fix whatever caused
-     * the fatal error in teh first place)
-     */
-    protected function _reattempt_migration()
-    {
-        EE_Data_Migration_Manager::instance()->reattempt();
-        $this->_redirect_after_action(false, '', '', array('action' => 'default'), true);
-    }
-
-
-
-    /**
-     * shows the big ol' System Information page
-     */
-    public function _system_status()
-    {
-        $this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_system_stati_page.template.php';
-        $this->_template_args['system_stati'] = EEM_System_Status::instance()->get_system_stati();
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_template_path,
-            $this->_template_args, true);
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-
-    public function _send_migration_crash_report()
-    {
-        $from = $this->_req_data['from'];
-        $from_name = $this->_req_data['from_name'];
-        $body = $this->_req_data['body'];
-        try {
-            $success = wp_mail(EE_SUPPORT_EMAIL,
-                'Migration Crash Report',
-                $body . "/r/n<br>" . print_r(EEM_System_Status::instance()->get_system_stati(), true),
-                array(
-                    "from:$from_name<$from>",
-                    //					'content-type:text/html charset=UTF-8'
-                ));
-        } catch (Exception $e) {
-            $success = false;
-        }
-        $this->_redirect_after_action($success, esc_html__("Migration Crash Report", "event_espresso"),
-            esc_html__("sent", "event_espresso"),
-            array('success' => $success, 'action' => 'confirm_migration_crash_report_sent'));
-    }
-
-
-
-    public function _confirm_migration_crash_report_sent()
-    {
-        try {
-            $most_recent_migration = EE_Data_Migration_Manager::instance()->get_last_ran_script(true);
-        } catch (EE_Error $e) {
-            EE_Data_Migration_Manager::instance()->add_error_to_migrations_ran($e->getMessage());
-            //now, just so we can display the page correctly, make a error migration script stage object
-            //and also put the error on it. It only persists for the duration of this request
-            $most_recent_migration = new EE_DMS_Unknown_1_0_0();
-            $most_recent_migration->add_error($e->getMessage());
-        }
-        $success = $this->_req_data['success'] == '1' ? true : false;
-        $this->_template_args['success'] = $success;
-        $this->_template_args['most_recent_migration'] = $most_recent_migration;
-        $this->_template_args['reset_db_action_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'reset_db'),
-            EE_MAINTENANCE_ADMIN_URL);
-        $this->_template_args['reset_db_page_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'data_reset'),
-            EE_MAINTENANCE_ADMIN_URL);
-        $this->_template_args['reattempt_action_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'reattempt_migration'),
-            EE_MAINTENANCE_ADMIN_URL);
-        $this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_confirm_migration_crash_report_sent.template.php';
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_template_path,
-            $this->_template_args, true);
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-
-    /**
-     * Resets the entire EE4 database.
-     * Currently basically only sets up ee4 database for a fresh install- doesn't
-     * actually clean out the old wp options, or cpts (although does erase old ee table data)
-     *
-     * @param boolean $nuke_old_ee4_data controls whether or not we
-     *                                   destroy the old ee4 data, or just try initializing ee4 default data
-     */
-    public function _reset_db($nuke_old_ee4_data = true)
-    {
-        EE_Maintenance_Mode::instance()->set_maintenance_level(EE_Maintenance_Mode::level_0_not_in_maintenance);
-        if ($nuke_old_ee4_data) {
-            EEH_Activation::delete_all_espresso_cpt_data();
-            EEH_Activation::delete_all_espresso_tables_and_data(false);
-            EEH_Activation::remove_cron_tasks();
-        }
-        //make sure when we reset the registry's config that it
-        //switches to using the new singleton
-        EE_Registry::instance()->CFG = EE_Registry::instance()->CFG->reset(true);
-        EE_System::instance()->initialize_db_if_no_migrations_required(true);
-        EE_System::instance()->redirect_to_about_ee();
-    }
-
-
-
-    /**
-     * Deletes ALL EE tables, Records, and Options from the database.
-     */
-    public function _delete_db()
-    {
-        EE_Maintenance_Mode::instance()->set_maintenance_level(EE_Maintenance_Mode::level_0_not_in_maintenance);
-        EEH_Activation::delete_all_espresso_cpt_data();
-        EEH_Activation::delete_all_espresso_tables_and_data();
-        EEH_Activation::remove_cron_tasks();
-        EEH_Activation::deactivate_event_espresso();
-        wp_safe_redirect(admin_url('plugins.php'));
-        exit;
-    }
-
-
-
-    /**
-     * sets up EE4 to rerun the migrations from ee3 to ee4
-     */
-    public function _rerun_migration_from_ee3()
-    {
-        EE_Maintenance_Mode::instance()->set_maintenance_level(EE_Maintenance_Mode::level_0_not_in_maintenance);
-        EEH_Activation::delete_all_espresso_cpt_data();
-        EEH_Activation::delete_all_espresso_tables_and_data(false);
-        //set the db state to something that will require migrations
-        update_option(EE_Data_Migration_Manager::current_database_state, '3.1.36.0');
-        EE_Maintenance_Mode::instance()->set_maintenance_level(EE_Maintenance_Mode::level_2_complete_maintenance);
-        $this->_redirect_after_action(true, esc_html__("Database", 'event_espresso'), esc_html__("reset", 'event_espresso'));
-    }
-
-
-
-    //none of the below group are currently used for Gateway Settings
-    protected function _add_screen_options()
-    {
-    }
-
-
-
-    protected function _add_feature_pointers()
-    {
-    }
-
+	public function __construct($routing = true)
+	{
+		parent::__construct($routing);
+	}
+
+
+
+	protected function _init_page_props()
+	{
+		$this->page_slug = EE_MAINTENANCE_PG_SLUG;
+		$this->page_label = EE_MAINTENANCE_LABEL;
+		$this->_admin_base_url = EE_MAINTENANCE_ADMIN_URL;
+		$this->_admin_base_path = EE_MAINTENANCE_ADMIN;
+	}
+
+
+
+	protected function _ajax_hooks()
+	{
+		add_action('wp_ajax_migration_step', array($this, 'migration_step'));
+		add_action('wp_ajax_add_error_to_migrations_ran', array($this, 'add_error_to_migrations_ran'));
+	}
+
+
+
+	protected function _define_page_props()
+	{
+		$this->_admin_page_title = EE_MAINTENANCE_LABEL;
+		$this->_labels = array(
+			'buttons' => array(
+				'reset_capabilities' => esc_html__('Reset Event Espresso Capabilities', 'event_espresso'),
+			),
+		);
+	}
+
+
+
+	protected function _set_page_routes()
+	{
+		$this->_page_routes = array(
+			'default'                             => array(
+				'func'       => '_maintenance',
+				'capability' => 'manage_options',
+			),
+			'change_maintenance_level'            => array(
+				'func'       => '_change_maintenance_level',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			),
+			'system_status'                       => array(
+				'func'       => '_system_status',
+				'capability' => 'manage_options',
+			),
+			'send_migration_crash_report'         => array(
+				'func'       => '_send_migration_crash_report',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			),
+			'confirm_migration_crash_report_sent' => array(
+				'func'       => '_confirm_migration_crash_report_sent',
+				'capability' => 'manage_options',
+			),
+			'data_reset'                          => array(
+				'func'       => '_data_reset_and_delete',
+				'capability' => 'manage_options',
+			),
+			'reset_db'                            => array(
+				'func'       => '_reset_db',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+				'args'       => array('nuke_old_ee4_data' => true),
+			),
+			'start_with_fresh_ee4_db'             => array(
+				'func'       => '_reset_db',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+				'args'       => array('nuke_old_ee4_data' => false),
+			),
+			'delete_db'                           => array(
+				'func'       => '_delete_db',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			),
+			'rerun_migration_from_ee3'            => array(
+				'func'       => '_rerun_migration_from_ee3',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			),
+			'reset_capabilities'                  => array(
+				'func'       => '_reset_capabilities',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			),
+			'reattempt_migration'                 => array(
+				'func'       => '_reattempt_migration',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			),
+		);
+	}
+
+
+
+	protected function _set_page_config()
+	{
+		$this->_page_config = array(
+			'default'       => array(
+				'nav'           => array(
+					'label' => esc_html__('Maintenance', 'event_espresso'),
+					'order' => 10,
+				),
+				'require_nonce' => false,
+			),
+			'data_reset'    => array(
+				'nav'           => array(
+					'label' => esc_html__('Reset/Delete Data', 'event_espresso'),
+					'order' => 20,
+				),
+				'require_nonce' => false,
+			),
+			'system_status' => array(
+				'nav'           => array(
+					'label' => esc_html__("System Information", "event_espresso"),
+					'order' => 30,
+				),
+				'require_nonce' => false,
+			),
+		);
+	}
+
+
+
+	/**
+	 * default maintenance page. If we're in maintenance mode level 2, then we need to show
+	 * the migration scripts and all that UI.
+	 */
+	public function _maintenance()
+	{
+		//it all depends if we're in maintenance model level 1 (frontend-only) or
+		//level 2 (everything except maintenance page)
+		try {
+			//get the current maintenance level and check if
+			//we are removed
+			$mm = EE_Maintenance_Mode::instance()->level();
+			$placed_in_mm = EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
+			if ($mm == EE_Maintenance_Mode::level_2_complete_maintenance && ! $placed_in_mm) {
+				//we just took the site out of maintenance mode, so notify the user.
+				//unfortunately this message appears to be echoed on the NEXT page load...
+				//oh well, we should really be checking for this on addon deactivation anyways
+				EE_Error::add_attention(__('Site taken out of maintenance mode because no data migration scripts are required',
+					'event_espresso'));
+				$this->_process_notices(array('page' => 'espresso_maintenance_settings'), false);
+			}
+			//in case an exception is thrown while trying to handle migrations
+			switch (EE_Maintenance_Mode::instance()->level()) {
+				case EE_Maintenance_Mode::level_0_not_in_maintenance:
+				case EE_Maintenance_Mode::level_1_frontend_only_maintenance:
+					$show_maintenance_switch = true;
+					$show_backup_db_text = false;
+					$show_migration_progress = false;
+					$script_names = array();
+					$addons_should_be_upgraded_first = false;
+					break;
+				case EE_Maintenance_Mode::level_2_complete_maintenance:
+					$show_maintenance_switch = false;
+					$show_migration_progress = true;
+					if (isset($this->_req_data['continue_migration'])) {
+						$show_backup_db_text = false;
+					} else {
+						$show_backup_db_text = true;
+					}
+					$scripts_needing_to_run = EE_Data_Migration_Manager::instance()
+																	   ->check_for_applicable_data_migration_scripts();
+					$addons_should_be_upgraded_first = EE_Data_Migration_Manager::instance()->addons_need_updating();
+					$script_names = array();
+					$current_script = null;
+					foreach ($scripts_needing_to_run as $script) {
+						if ($script instanceof EE_Data_Migration_Script_Base) {
+							if ( ! $current_script) {
+								$current_script = $script;
+								$current_script->migration_page_hooks();
+							}
+							$script_names[] = $script->pretty_name();
+						}
+					}
+					break;
+			}
+			$most_recent_migration = EE_Data_Migration_Manager::instance()->get_last_ran_script(true);
+			$exception_thrown = false;
+		} catch (EE_Error $e) {
+			EE_Data_Migration_Manager::instance()->add_error_to_migrations_ran($e->getMessage());
+			//now, just so we can display the page correctly, make a error migration script stage object
+			//and also put the error on it. It only persists for the duration of this request
+			$most_recent_migration = new EE_DMS_Unknown_1_0_0();
+			$most_recent_migration->add_error($e->getMessage());
+			$exception_thrown = true;
+		}
+		$current_db_state = EE_Data_Migration_Manager::instance()->ensure_current_database_state_is_set();
+		$current_db_state = str_replace('.decaf', '', $current_db_state);
+		if ($exception_thrown
+			|| ($most_recent_migration
+				&& $most_recent_migration instanceof EE_Data_Migration_Script_Base
+				&& $most_recent_migration->is_broken()
+			)
+		) {
+			$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_migration_was_borked_page.template.php';
+			$this->_template_args['support_url'] = 'http://eventespresso.com/support/forums/';
+			$this->_template_args['next_url'] = EEH_URL::add_query_args_and_nonce(array('action'  => 'confirm_migration_crash_report_sent',
+																						'success' => '0',
+			), EE_MAINTENANCE_ADMIN_URL);
+		} elseif ($addons_should_be_upgraded_first) {
+			$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_upgrade_addons_before_migrating.template.php';
+		} else {
+			if ($most_recent_migration
+				&& $most_recent_migration instanceof EE_Data_Migration_Script_Base
+				&& $most_recent_migration->can_continue()
+			) {
+				$show_backup_db_text = false;
+				$show_continue_current_migration_script = true;
+				$show_most_recent_migration = true;
+			} elseif (isset($this->_req_data['continue_migration'])) {
+				$show_most_recent_migration = true;
+				$show_continue_current_migration_script = false;
+			} else {
+				$show_most_recent_migration = false;
+				$show_continue_current_migration_script = false;
+			}
+			if (isset($current_script)) {
+				$migrates_to = $current_script->migrates_to_version();
+				$plugin_slug = $migrates_to['slug'];
+				$new_version = $migrates_to['version'];
+				$this->_template_args = array_merge($this->_template_args, array(
+					'current_db_state' => sprintf(__("EE%s (%s)", "event_espresso"),
+						isset($current_db_state[$plugin_slug]) ? $current_db_state[$plugin_slug] : 3, $plugin_slug),
+					'next_db_state'    => isset($current_script) ? sprintf(__("EE%s (%s)", 'event_espresso'),
+						$new_version, $plugin_slug) : null,
+				));
+			}
+			$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_migration_page.template.php';
+			$this->_template_args = array_merge(
+				$this->_template_args,
+				array(
+					'show_most_recent_migration'             => $show_most_recent_migration,
+					//flag for showing the most recent migration's status and/or errors
+					'show_migration_progress'                => $show_migration_progress,
+					//flag for showing the option to run migrations and see their progress
+					'show_backup_db_text'                    => $show_backup_db_text,
+					//flag for showing text telling the user to backup their DB
+					'show_maintenance_switch'                => $show_maintenance_switch,
+					//flag for showing the option to change maintenance mode between levels 0 and 1
+					'script_names'                           => $script_names,
+					//array of names of scripts that have run
+					'show_continue_current_migration_script' => $show_continue_current_migration_script,
+					//flag to change wording to indicating that we're only CONTINUING a migration script (somehow it got interrupted0
+					'reset_db_page_link'                     => EE_Admin_Page::add_query_args_and_nonce(array('action' => 'reset_db'),
+						EE_MAINTENANCE_ADMIN_URL),
+					'data_reset_page'                        => EE_Admin_Page::add_query_args_and_nonce(array('action' => 'data_reset'),
+						EE_MAINTENANCE_ADMIN_URL),
+					'update_migration_script_page_link'      => EE_Admin_Page::add_query_args_and_nonce(array('action' => 'change_maintenance_level'),
+						EE_MAINTENANCE_ADMIN_URL),
+					'ultimate_db_state'                      => sprintf(__("EE%s", 'event_espresso'),
+						espresso_version()),
+				)
+			);
+			//make sure we have the form fields helper available. It usually is, but sometimes it isn't
+			//localize script stuff
+			wp_localize_script('ee-maintenance', 'ee_maintenance', array(
+				'migrating'                        => esc_html__("Updating Database...", "event_espresso"),
+				'next'                             => esc_html__("Next", "event_espresso"),
+				'fatal_error'                      => esc_html__("A Fatal Error Has Occurred", "event_espresso"),
+				'click_next_when_ready'            => esc_html__("The current Database Update has ended. Click 'next' when ready to proceed",
+					"event_espresso"),
+				'status_no_more_migration_scripts' => EE_Data_Migration_Manager::status_no_more_migration_scripts,
+				'status_fatal_error'               => EE_Data_Migration_Manager::status_fatal_error,
+				'status_completed'                 => EE_Data_Migration_Manager::status_completed,
+			));
+		}
+		$this->_template_args['most_recent_migration'] = $most_recent_migration;//the actual most recently ran migration
+		//now render the migration options part, and put it in a variable
+		$migration_options_template_file = apply_filters(
+			'FHEE__ee_migration_page__migration_options_template',
+			EE_MAINTENANCE_TEMPLATE_PATH . 'migration_options_from_ee4.template.php'
+		);
+		$migration_options_html = EEH_Template::display_template($migration_options_template_file, $this->_template_args,true);
+		$this->_template_args['migration_options_html'] = $migration_options_html;
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_template_path,
+			$this->_template_args, true);
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+
+	/**
+	 * returns JSON and executes another step of the currently-executing data migration (called via ajax)
+	 */
+	public function migration_step()
+	{
+		$this->_template_args['data'] = EE_Data_Migration_Manager::instance()->response_to_migration_ajax_request();
+		$this->_return_json();
+	}
+
+
+
+	/**
+	 * Can be used by js when it notices a response with HTML in it in order
+	 * to log the malformed response
+	 */
+	public function add_error_to_migrations_ran()
+	{
+		EE_Data_Migration_Manager::instance()->add_error_to_migrations_ran($this->_req_data['message']);
+		$this->_template_args['data'] = array('ok' => true);
+		$this->_return_json();
+	}
+
+
+
+	/**
+	 * changes the maintenance level, provided there are still no migration scripts that shoudl run
+	 */
+	public function _change_maintenance_level()
+	{
+		$new_level = intval($this->_req_data['maintenance_mode_level']);
+		if ( ! EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts()) {
+			EE_Maintenance_Mode::instance()->set_maintenance_level($new_level);
+			$success = true;
+		} else {
+			EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
+			$success = false;
+		}
+		$this->_redirect_after_action($success, 'Maintenance Mode', esc_html__("Updated", "event_espresso"));
+	}
+
+
+
+	/**
+	 * a tab with options for resetting and/or deleting EE data
+	 *
+	 * @throws \EE_Error
+	 */
+	public function _data_reset_and_delete()
+	{
+		$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_data_reset_and_delete.template.php';
+		$this->_template_args['reset_capabilities_button'] = $this->get_action_link_or_button(
+			'reset_capabilities',
+			'reset_capabilities',
+			array(),
+			'button button-primary',
+			'',
+			false
+		);
+		$this->_template_args['delete_db_url'] = EE_Admin_Page::add_query_args_and_nonce(
+			array('action' => 'delete_db'),
+			EE_MAINTENANCE_ADMIN_URL
+		);
+		$this->_template_args['reset_db_url'] = EE_Admin_Page::add_query_args_and_nonce(
+			array('action' => 'reset_db'),
+			EE_MAINTENANCE_ADMIN_URL
+		);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
+			$this->_template_path,
+			$this->_template_args,
+			true
+		);
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+
+	protected function _reset_capabilities()
+	{
+		EE_Registry::instance()->CAP->init_caps(true);
+		EE_Error::add_success(__('Default Event Espresso capabilities have been restored for all current roles.',
+			'event_espresso'));
+		$this->_redirect_after_action(false, '', '', array('action' => 'data_reset'), true);
+	}
+
+
+
+	/**
+	 * resets the DMSs so we can attempt to continue migrating after a fatal error
+	 * (only a good idea when someone has somehow tried ot fix whatever caused
+	 * the fatal error in teh first place)
+	 */
+	protected function _reattempt_migration()
+	{
+		EE_Data_Migration_Manager::instance()->reattempt();
+		$this->_redirect_after_action(false, '', '', array('action' => 'default'), true);
+	}
+
+
+
+	/**
+	 * shows the big ol' System Information page
+	 */
+	public function _system_status()
+	{
+		$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_system_stati_page.template.php';
+		$this->_template_args['system_stati'] = EEM_System_Status::instance()->get_system_stati();
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_template_path,
+			$this->_template_args, true);
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+
+	public function _send_migration_crash_report()
+	{
+		$from = $this->_req_data['from'];
+		$from_name = $this->_req_data['from_name'];
+		$body = $this->_req_data['body'];
+		try {
+			$success = wp_mail(EE_SUPPORT_EMAIL,
+				'Migration Crash Report',
+				$body . "/r/n<br>" . print_r(EEM_System_Status::instance()->get_system_stati(), true),
+				array(
+					"from:$from_name<$from>",
+					//					'content-type:text/html charset=UTF-8'
+				));
+		} catch (Exception $e) {
+			$success = false;
+		}
+		$this->_redirect_after_action($success, esc_html__("Migration Crash Report", "event_espresso"),
+			esc_html__("sent", "event_espresso"),
+			array('success' => $success, 'action' => 'confirm_migration_crash_report_sent'));
+	}
+
+
+
+	public function _confirm_migration_crash_report_sent()
+	{
+		try {
+			$most_recent_migration = EE_Data_Migration_Manager::instance()->get_last_ran_script(true);
+		} catch (EE_Error $e) {
+			EE_Data_Migration_Manager::instance()->add_error_to_migrations_ran($e->getMessage());
+			//now, just so we can display the page correctly, make a error migration script stage object
+			//and also put the error on it. It only persists for the duration of this request
+			$most_recent_migration = new EE_DMS_Unknown_1_0_0();
+			$most_recent_migration->add_error($e->getMessage());
+		}
+		$success = $this->_req_data['success'] == '1' ? true : false;
+		$this->_template_args['success'] = $success;
+		$this->_template_args['most_recent_migration'] = $most_recent_migration;
+		$this->_template_args['reset_db_action_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'reset_db'),
+			EE_MAINTENANCE_ADMIN_URL);
+		$this->_template_args['reset_db_page_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'data_reset'),
+			EE_MAINTENANCE_ADMIN_URL);
+		$this->_template_args['reattempt_action_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'reattempt_migration'),
+			EE_MAINTENANCE_ADMIN_URL);
+		$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_confirm_migration_crash_report_sent.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_template_path,
+			$this->_template_args, true);
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+
+	/**
+	 * Resets the entire EE4 database.
+	 * Currently basically only sets up ee4 database for a fresh install- doesn't
+	 * actually clean out the old wp options, or cpts (although does erase old ee table data)
+	 *
+	 * @param boolean $nuke_old_ee4_data controls whether or not we
+	 *                                   destroy the old ee4 data, or just try initializing ee4 default data
+	 */
+	public function _reset_db($nuke_old_ee4_data = true)
+	{
+		EE_Maintenance_Mode::instance()->set_maintenance_level(EE_Maintenance_Mode::level_0_not_in_maintenance);
+		if ($nuke_old_ee4_data) {
+			EEH_Activation::delete_all_espresso_cpt_data();
+			EEH_Activation::delete_all_espresso_tables_and_data(false);
+			EEH_Activation::remove_cron_tasks();
+		}
+		//make sure when we reset the registry's config that it
+		//switches to using the new singleton
+		EE_Registry::instance()->CFG = EE_Registry::instance()->CFG->reset(true);
+		EE_System::instance()->initialize_db_if_no_migrations_required(true);
+		EE_System::instance()->redirect_to_about_ee();
+	}
+
+
+
+	/**
+	 * Deletes ALL EE tables, Records, and Options from the database.
+	 */
+	public function _delete_db()
+	{
+		EE_Maintenance_Mode::instance()->set_maintenance_level(EE_Maintenance_Mode::level_0_not_in_maintenance);
+		EEH_Activation::delete_all_espresso_cpt_data();
+		EEH_Activation::delete_all_espresso_tables_and_data();
+		EEH_Activation::remove_cron_tasks();
+		EEH_Activation::deactivate_event_espresso();
+		wp_safe_redirect(admin_url('plugins.php'));
+		exit;
+	}
+
+
+
+	/**
+	 * sets up EE4 to rerun the migrations from ee3 to ee4
+	 */
+	public function _rerun_migration_from_ee3()
+	{
+		EE_Maintenance_Mode::instance()->set_maintenance_level(EE_Maintenance_Mode::level_0_not_in_maintenance);
+		EEH_Activation::delete_all_espresso_cpt_data();
+		EEH_Activation::delete_all_espresso_tables_and_data(false);
+		//set the db state to something that will require migrations
+		update_option(EE_Data_Migration_Manager::current_database_state, '3.1.36.0');
+		EE_Maintenance_Mode::instance()->set_maintenance_level(EE_Maintenance_Mode::level_2_complete_maintenance);
+		$this->_redirect_after_action(true, esc_html__("Database", 'event_espresso'), esc_html__("reset", 'event_espresso'));
+	}
+
+
+
+	//none of the below group are currently used for Gateway Settings
+	protected function _add_screen_options()
+	{
+	}
+
+
+
+	protected function _add_feature_pointers()
+	{
+	}
+
 
 
-    public function admin_init()
-    {
-    }
-
-
-
-    public function admin_notices()
-    {
-    }
-
+	public function admin_init()
+	{
+	}
+
+
+
+	public function admin_notices()
+	{
+	}
+
 
 
-    public function admin_footer_scripts()
-    {
-    }
+	public function admin_footer_scripts()
+	{
+	}
 
 
 
-    public function load_scripts_styles()
-    {
-        wp_enqueue_script('ee_admin_js');
+	public function load_scripts_styles()
+	{
+		wp_enqueue_script('ee_admin_js');
 //		wp_enqueue_media();
 //		wp_enqueue_script('media-upload');
-        wp_enqueue_script('ee-maintenance', EE_MAINTENANCE_ASSETS_URL . '/ee-maintenance.js', array('jquery'),
-            EVENT_ESPRESSO_VERSION, true);
-        wp_register_style('espresso_maintenance', EE_MAINTENANCE_ASSETS_URL . 'ee-maintenance.css', array(),
-            EVENT_ESPRESSO_VERSION);
-        wp_enqueue_style('espresso_maintenance');
-    }
+		wp_enqueue_script('ee-maintenance', EE_MAINTENANCE_ASSETS_URL . '/ee-maintenance.js', array('jquery'),
+			EVENT_ESPRESSO_VERSION, true);
+		wp_register_style('espresso_maintenance', EE_MAINTENANCE_ASSETS_URL . 'ee-maintenance.css', array(),
+			EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('espresso_maintenance');
+	}
 
 
 
-    public function load_scripts_styles_default()
-    {
-        //styles
+	public function load_scripts_styles_default()
+	{
+		//styles
 //		wp_enqueue_style('ee-text-links');
 //		//scripts
 //		wp_enqueue_script('ee-text-links');
-    }
+	}