eventespresso / event-espresso-core

core/data_migration_scripts/EE_DMS_Core_4_1_0.dms.php

Spacing +200 added lines, -200 removed lines

@@ -17,7 +17,7 @@ 
  * really, you're best off copying the whole thing when 4.1 is released into this file
  * and wrapping its declaration in if( ! class_exists()){...}
  */
-class EE_DMS_Core_4_1_0 extends EE_Data_Migration_Script_Base{
+class EE_DMS_Core_4_1_0 extends EE_Data_Migration_Script_Base {
 
 
 
@@ -59,26 +59,26 @@ 
 	 * @global type $wpdb
 	 * @return boolean
 	 */
-	private function _checkin_table_exists(){
+	private function _checkin_table_exists() {
 		global $wpdb;
 		$results = $wpdb->get_results("SHOW TABLES LIKE '".$wpdb->prefix."events_attendee_checkin"."'");
-		if($results){
+		if ($results) {
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
 	public function can_migrate_from_version($version_array) {
 		$version_string = $version_array['Core'];
-		if($version_string < '4.0.0' && $version_string > '3.1.26' ){
+		if ($version_string < '4.0.0' && $version_string > '3.1.26') {
 //			echo "$version_string can be migrated fro";
 			return true;
-		}elseif( ! $version_string ){
+		}elseif ( ! $version_string) {
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.1
 			//because since 4.1 we're
-			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+			return false; //changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
 //			echo "$version_string doesnt apply";
 			return false;
 		}
@@ -88,15 +88,15 @@ 
 	}
 	public function schema_changes_before_migration() {
 		//relies on 4.1's EEH_Activation::create_table
-		require_once( EE_HELPERS . 'EEH_Activation.helper.php' );
+		require_once(EE_HELPERS.'EEH_Activation.helper.php');
 
-		$table_name='esp_answer';
-		$sql=" ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_answer';
+		$sql = " ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					ANS_value TEXT NOT NULL,
 					PRIMARY KEY  (ANS_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_attendee_meta';
 		$sql = "ATTM_ID INT(10) UNSIGNED NOT	NULL AUTO_INCREMENT,
@@ -136,7 +136,7 @@ 
 					  CNT_is_EU TINYINT(1) DEFAULT '0',
 					  CNT_active TINYINT(1) DEFAULT '0',
 					  PRIMARY KEY  (CNT_ISO)";
-		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -157,7 +157,7 @@ 
 
 
 
-		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 		$table_name = 'esp_event_meta';
 		$sql = "
 			EVTM_ID INT NOT NULL AUTO_INCREMENT,
@@ -174,41 +174,41 @@ 
 			EVT_external_URL VARCHAR(200) NULL,
 			EVT_donations TINYINT(1) NULL,
 			PRIMARY KEY  (EVTM_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_question_group';
-		$sql="EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_question_group';
+		$sql = "EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 					QSG_ID INT UNSIGNED NOT NULL,
 					EQG_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (EQG_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_venue';
-		$sql="EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_venue';
+		$sql = "EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
 				EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 				VNU_ID BIGINT(20) UNSIGNED NOT NULL,
 				EVV_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EVV_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_extra_meta';
-		$sql="EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_extra_meta';
+		$sql = "EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
 				OBJ_ID INT(11) DEFAULT NULL,
 				EXM_type VARCHAR(45) DEFAULT NULL,
 				EXM_key VARCHAR(45) DEFAULT NULL,
 				EXM_value TEXT,
 				PRIMARY KEY  (EXM_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_line_item';
-		$sql="LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_line_item';
+		$sql = "LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
 				LIN_code VARCHAR(245) NOT NULL DEFAULT '',
 				TXN_ID INT(11) DEFAULT NULL,
 				LIN_name VARCHAR(245) NOT NULL DEFAULT '',
@@ -224,7 +224,7 @@ 
 				OBJ_ID INT(11) DEFAULT NULL,
 				OBJ_type VARCHAR(45)DEFAULT NULL,
 				PRIMARY KEY  (LIN_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB' );
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_message_template';
 		$sql = "MTP_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -251,7 +251,7 @@ 
 					PRIMARY KEY  (GRP_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY MTP_user_id (MTP_user_id)";
-		$this->_table_is_new_in_this_version( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -359,8 +359,8 @@ 
 
 
 
-		$table_name='esp_question';
-		$sql='QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question';
+		$sql = 'QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QST_display_text TEXT NOT NULL,
 					QST_admin_label VARCHAR(255) NOT NULL,
 					QST_system VARCHAR(25) DEFAULT NULL,
@@ -372,12 +372,12 @@ 
 					QST_wp_user BIGINT UNSIGNED NULL,
 					QST_deleted TINYINT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QST_ID)';
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
-		EEH_Activation::drop_index( 'esp_question_group', 'QSG_identifier_UNIQUE' );
+		EEH_Activation::drop_index('esp_question_group', 'QSG_identifier_UNIQUE');
 
 		$table_name = 'esp_question_group';
-		$sql='QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$sql = 'QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_name VARCHAR(255) NOT NULL,
 					QSG_identifier VARCHAR(100) NOT NULL,
 					QSG_desc TEXT NULL,
@@ -388,27 +388,27 @@ 
 					QSG_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSG_ID),
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier ASC)';
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_group_question';
-		$sql="QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_group_question';
+		$sql = "QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					PRIMARY KEY  (QGQ_ID) ";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_option';
-		$sql="QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_option';
+		$sql = "QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSO_value VARCHAR(255) NOT NULL,
 					QSO_desc TEXT NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					QSO_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSO_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -441,8 +441,8 @@ 
 
 
 
-		$table_name='esp_checkin';
-		$sql="CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_checkin';
+		$sql = "CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT(10) UNSIGNED NOT NULL,
 					DTT_ID INT(10) UNSIGNED NOT NULL,
 					CHK_in TINYINT(1) UNSIGNED NOT NULL DEFAULT 1,
@@ -549,12 +549,12 @@ 
 
 		global $wpdb;
 		$state_table = $wpdb->prefix."esp_state";
-		if ( EEH_Activation::table_exists( $state_table ) ) {
+		if (EEH_Activation::table_exists($state_table)) {
 
-			$SQL = "SELECT COUNT('STA_ID') FROM " . $state_table;
+			$SQL = "SELECT COUNT('STA_ID') FROM ".$state_table;
 			$states = $wpdb->get_var($SQL);
-			if ( ! $states ) {
-				$SQL = "INSERT INTO " . $state_table . "
+			if ( ! $states) {
+				$SQL = "INSERT INTO ".$state_table."
 				(STA_ID, CNT_ISO, STA_abbrev, STA_name, STA_active) VALUES
 				(1, 'US', 'AK', 'Alaska', 1),
 				(2, 'US', 'AL', 'Alabama', 1),
@@ -641,12 +641,12 @@ 
 
 		global $wpdb;
 		$country_table = $wpdb->prefix."esp_country";
-		if ( EEH_Activation::table_exists( $country_table ) ) {
+		if (EEH_Activation::table_exists($country_table)) {
 
-			$SQL = "SELECT COUNT('CNT_ISO') FROM " . $country_table;
+			$SQL = "SELECT COUNT('CNT_ISO') FROM ".$country_table;
 			$countries = $wpdb->get_var($SQL);
-			if ( ! $countries ) {
-				$SQL = "INSERT INTO " . $country_table . "
+			if ( ! $countries) {
+				$SQL = "INSERT INTO ".$country_table."
 				(CNT_ISO, CNT_ISO3, RGN_ID, CNT_name, CNT_cur_code, CNT_cur_single, CNT_cur_plural, CNT_cur_sign, CNT_cur_sign_b4, CNT_cur_dec_plc, CNT_tel_code, CNT_is_EU, CNT_active) VALUES
 				('AD', 'AND', 0, 'Andorra', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+376', 0, 0),
 				('AE', 'ARE', 0, 'United Arab Emirates', 'AED', 'Dirham', 'Dirhams', 'د.إ', 1, 2, '+971', 0, 0),
@@ -893,20 +893,20 @@ 
 		global $wpdb;
 		$price_type_table = $wpdb->prefix."esp_price_type";
 
-		if ( EEH_Activation::table_exists( $price_type_table ) ) {
+		if (EEH_Activation::table_exists($price_type_table)) {
 
-			$SQL = 'SELECT COUNT(PRT_ID) FROM ' . $price_type_table;
-			$price_types_exist = $wpdb->get_var( $SQL );
+			$SQL = 'SELECT COUNT(PRT_ID) FROM '.$price_type_table;
+			$price_types_exist = $wpdb->get_var($SQL);
 
-			if ( ! $price_types_exist ) {
+			if ( ! $price_types_exist) {
 				$SQL = "INSERT INTO $price_type_table ( PRT_ID, PRT_name, PBT_ID, PRT_is_percent, PRT_order, PRT_deleted ) VALUES
-							(1, '" . __('Base Price', 'event_espresso') . "', 1,  0, 0, 0),
-							(2, '" . __('Percent Discount', 'event_espresso') . "', 2,  1, 20, 0),
-							(3, '" . __('Fixed Discount', 'event_espresso') . "', 2,  0, 30, 0),
-							(4, '" . __('Percent Surcharge', 'event_espresso') . "', 3,  1, 40, 0),
-							(5, '" . __('Fixed Surcharge', 'event_espresso') . "', 3,  0, 50, 0);";
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_1_0__insert_default_price_types__SQL', $SQL );
-				$wpdb->query( $SQL );
+							(1, '".__('Base Price', 'event_espresso')."', 1,  0, 0, 0),
+							(2, '" . __('Percent Discount', 'event_espresso')."', 2,  1, 20, 0),
+							(3, '" . __('Fixed Discount', 'event_espresso')."', 2,  0, 30, 0),
+							(4, '" . __('Percent Surcharge', 'event_espresso')."', 3,  1, 40, 0),
+							(5, '" . __('Fixed Surcharge', 'event_espresso')."', 3,  0, 50, 0);";
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_price_types__SQL', $SQL);
+				$wpdb->query($SQL);
 			}
 		}
 	}
@@ -926,16 +926,16 @@ 
 		global $wpdb;
 		$price_table = $wpdb->prefix."esp_price";
 
-		if ( EEH_Activation::table_exists(  $price_table ) ) {
+		if (EEH_Activation::table_exists($price_table)) {
 
-			$SQL = 'SELECT COUNT(PRC_ID) FROM ' .$price_table;
-			$prices_exist = $wpdb->get_var( $SQL );
+			$SQL = 'SELECT COUNT(PRC_ID) FROM '.$price_table;
+			$prices_exist = $wpdb->get_var($SQL);
 
-			if ( ! $prices_exist ) {
+			if ( ! $prices_exist) {
 				$SQL = "INSERT INTO $price_table
 							(PRC_ID, PRT_ID, PRC_amount, PRC_name, PRC_desc,  PRC_is_default, PRC_overrides, PRC_order, PRC_deleted, PRC_parent ) VALUES
 							(1, 1, '0.00', 'Free Admission', '', 1, NULL, 0, 0, 0);";
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_1_0__insert_default_prices__SQL', $SQL );
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_prices__SQL', $SQL);
 				$wpdb->query($SQL);
 			}
 		}
@@ -952,34 +952,34 @@ 
 
 		global $wpdb;
 		$ticket_table = $wpdb->prefix."esp_ticket";
-		if ( EEH_Activation::table_exists( $ticket_table ) ) {
+		if (EEH_Activation::table_exists($ticket_table)) {
 
-			$SQL = 'SELECT COUNT(TKT_ID) FROM ' . $ticket_table;
+			$SQL = 'SELECT COUNT(TKT_ID) FROM '.$ticket_table;
 			$tickets_exist = $wpdb->get_var($SQL);
 
-			if ( ! $tickets_exist ) {
+			if ( ! $tickets_exist) {
 				$SQL = "INSERT INTO $ticket_table
 					( TKT_ID, TTM_ID, TKT_name, TKT_description, TKT_qty, TKT_sold, TKT_uses, TKT_min, TKT_max, TKT_price, TKT_start_date, TKT_end_date, TKT_taxable, TKT_order, TKT_row, TKT_is_default, TKT_parent, TKT_deleted ) VALUES
-					( 1, 0, '" . __("Free Ticket", "event_espresso") . "', '', 100, 0, -1, 0, -1, 0.00, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 0, 1, 1, 0, 0);";
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL', $SQL );
+					( 1, 0, '".__("Free Ticket", "event_espresso")."', '', 100, 0, -1, 0, -1, 0.00, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 0, 1, 1, 0, 0);";
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL', $SQL);
 				$wpdb->query($SQL);
 			}
 		}
 		$ticket_price_table = $wpdb->prefix."esp_ticket_price";
 
-		if ( EEH_Activation::table_exists( $ticket_price_table ) ) {
+		if (EEH_Activation::table_exists($ticket_price_table)) {
 
-			$SQL = 'SELECT COUNT(TKP_ID) FROM ' . $ticket_price_table;
+			$SQL = 'SELECT COUNT(TKP_ID) FROM '.$ticket_price_table;
 			$ticket_prc_exist = $wpdb->get_var($SQL);
 
-			if ( ! $ticket_prc_exist ) {
+			if ( ! $ticket_prc_exist) {
 
 				$SQL = "INSERT INTO $ticket_price_table
 				( TKP_ID, TKT_ID, PRC_ID ) VALUES
 				( 1, 1, 1 )
 				";
 
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL__ticket_price', $SQL );
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL__ticket_price', $SQL);
 				$wpdb->query($SQL);
 			}
 		}
@@ -992,20 +992,20 @@ 
 	 * @param string $country_name
 	 * @return array where keys are columns, values are column values
 	 */
-	public function get_or_create_country($country_name){
-		if( ! $country_name ){
+	public function get_or_create_country($country_name) {
+		if ( ! $country_name) {
 			throw new EE_Error(__("Could not get a country because country name is blank", "event_espresso"));
 		}
 		global $wpdb;
 		$country_table = $wpdb->prefix."esp_country";
-		if(is_int($country_name)){
+		if (is_int($country_name)) {
 			$country_name = $this->get_iso_from_3_1_country_id($country_name);
 		}
 		$country = $wpdb->get_row($wpdb->prepare("SELECT * FROM $country_table WHERE
 			CNT_ISO LIKE %s OR
 			CNT_ISO3 LIKE %s OR
-			CNT_name LIKE %s LIMIT 1",$country_name,$country_name,$country_name),ARRAY_A);
-		if( ! $country ){
+			CNT_name LIKE %s LIMIT 1", $country_name, $country_name, $country_name), ARRAY_A);
+		if ( ! $country) {
 			//insert a new one then
 			$cols_n_values = array(
 				'CNT_ISO'=> $this->_find_available_country_iso(2),
@@ -1025,26 +1025,26 @@ 
 				'CNT_active'=>true
 			);
 			$data_types = array(
-				'%s',//CNT_ISO
-				'%s',//CNT_ISO3
-				'%d',//RGN_ID
-				'%s',//CNT_name
-				'%s',//CNT_cur_code
-				'%s',//CNT_cur_single
-				'%s',//CNT_cur_plural
-				'%s',//CNT_cur_sign
-				'%d',//CNT_cur_sign_b4
-				'%d',//CNT_cur_dec_plc
-				'%s',//CNT_cur_dec_mrk
-				'%s',//CNT_cur_thsnds
-				'%s',//CNT_tel_code
-				'%d',//CNT_is_EU
-				'%d',//CNT_active
+				'%s', //CNT_ISO
+				'%s', //CNT_ISO3
+				'%d', //RGN_ID
+				'%s', //CNT_name
+				'%s', //CNT_cur_code
+				'%s', //CNT_cur_single
+				'%s', //CNT_cur_plural
+				'%s', //CNT_cur_sign
+				'%d', //CNT_cur_sign_b4
+				'%d', //CNT_cur_dec_plc
+				'%s', //CNT_cur_dec_mrk
+				'%s', //CNT_cur_thsnds
+				'%s', //CNT_tel_code
+				'%d', //CNT_is_EU
+				'%d', //CNT_active
 			);
 			$success = $wpdb->insert($country_table,
 					$cols_n_values,
 					$data_types);
-			if( ! $success){
+			if ( ! $success) {
 				throw new EE_Error($this->_create_error_message_for_db_insertion('N/A', array('country_id'=>$country_name), $country_table, $cols_n_values, $data_types));
 			}
 			$country = $cols_n_values;
@@ -1056,13 +1056,13 @@ 
 	 * @global type $wpdb
 	 * @return string
 	 */
-	private function _find_available_country_iso($num_letters = 2){
+	private function _find_available_country_iso($num_letters = 2) {
 		global $wpdb;
 		$country_table = $wpdb->prefix."esp_country";
-		do{
+		do {
 			$current_iso = strtoupper(wp_generate_password($num_letters, false));
-			$country_with_that_iso = $wpdb->get_var($wpdb->prepare("SELECT count(CNT_ISO) FROM ".$country_table." WHERE CNT_ISO=%s",$current_iso));
-		}while(intval($country_with_that_iso));
+			$country_with_that_iso = $wpdb->get_var($wpdb->prepare("SELECT count(CNT_ISO) FROM ".$country_table." WHERE CNT_ISO=%s", $current_iso));
+		}while (intval($country_with_that_iso));
 		return $current_iso;
 	}
 
@@ -1073,14 +1073,14 @@ 
 	 * @param string $state_name
 	 * @return array where keys are columns, values are column values
 	 */
-	public function get_or_create_state($state_name,$country_name = ''){
-		if( ! $state_name ){
+	public function get_or_create_state($state_name, $country_name = '') {
+		if ( ! $state_name) {
 			throw new EE_Error(__("Could not get-or-create state because no state name was provided", "event_espresso"));
 		}
-		try{
+		try {
 			$country = $this->get_or_create_country($country_name);
 			$country_iso = $country['CNT_ISO'];
-		}catch(EE_Error $e){
+		} catch (EE_Error $e) {
 			$country_iso = $this->get_default_country_iso();
 		}
 		global $wpdb;
@@ -1088,24 +1088,24 @@ 
 		$state = $wpdb->get_row($wpdb->prepare("SELECT * FROM $state_table WHERE
 			(STA_abbrev LIKE %s OR
 			STA_name LIKE %s) AND
-			CNT_ISO LIKE %s LIMIT 1",$state_name,$state_name,$country_iso),ARRAY_A);
-		if ( ! $state){
+			CNT_ISO LIKE %s LIMIT 1", $state_name, $state_name, $country_iso), ARRAY_A);
+		if ( ! $state) {
 			//insert a new one then
 			$cols_n_values = array(
 				'CNT_ISO'=>$country_iso,
-				'STA_abbrev'=>substr($state_name,0,6),
+				'STA_abbrev'=>substr($state_name, 0, 6),
 				'STA_name'=>$state_name,
 				'STA_active'=>true
 			);
 			$data_types = array(
-				'%s',//CNT_ISO
-				'%s',//STA_abbrev
-				'%s',//STA_name
-				'%d',//STA_active
+				'%s', //CNT_ISO
+				'%s', //STA_abbrev
+				'%s', //STA_name
+				'%d', //STA_active
 			);
-			$success = $wpdb->insert($state_table,$cols_n_values,$data_types);
-			if ( ! $success ){
-				throw new EE_Error($this->_create_error_message_for_db_insertion('N/A', array('state'=>$state_name,'country_id'=>$country_name), $state_table, $cols_n_values, $data_types));
+			$success = $wpdb->insert($state_table, $cols_n_values, $data_types);
+			if ( ! $success) {
+				throw new EE_Error($this->_create_error_message_for_db_insertion('N/A', array('state'=>$state_name, 'country_id'=>$country_name), $state_table, $cols_n_values, $data_types));
 			}
 			$state = $cols_n_values;
 			$state['STA_ID'] = $wpdb->insert_id;
@@ -1118,21 +1118,21 @@ 
 	 * @param type $timeString
 	 * @return string in the php DATETIME format: "G:i" (24-hour format hour with leading zeros, a colon, and minutes with leading zeros)
 	 */
-	public function convertTimeFromAMPM($timeString){
+	public function convertTimeFromAMPM($timeString) {
 		$matches = array();
-		preg_match("~(\\d*):(\\d*)~",$timeString,$matches);
-		if( ! $matches || count($matches)<3){
+		preg_match("~(\\d*):(\\d*)~", $timeString, $matches);
+		if ( ! $matches || count($matches) < 3) {
 			$hour = '00';
 			$minutes = '00';
-		}else{
+		} else {
 			$hour = intval($matches[1]);
 			$minutes = $matches[2];
 		}
-		if(strpos($timeString, 'PM') || strpos($timeString, 'pm')){
+		if (strpos($timeString, 'PM') || strpos($timeString, 'pm')) {
 			$hour = intval($hour) + 12;
 		}
-		$hour = str_pad( "$hour", 2, '0',STR_PAD_LEFT);
-		$minutes = str_pad( "$minutes", 2, '0',STR_PAD_LEFT);
+		$hour = str_pad("$hour", 2, '0', STR_PAD_LEFT);
+		$minutes = str_pad("$minutes", 2, '0', STR_PAD_LEFT);
 		return "$hour:$minutes";
 	}
 
@@ -1141,7 +1141,7 @@ 
 	 * @param int $country_id
 	 * @return string the country's ISO3 code
 	 */
-	public function get_iso_from_3_1_country_id($country_id){
+	public function get_iso_from_3_1_country_id($country_id) {
 		$old_countries = array(
 			array(64, 'United States', 'US', 'USA', 1),
 			array(15, 'Australia', 'AU', 'AUS', 1),
@@ -1367,9 +1367,9 @@ 
 			array(226, 'Zimbabwe', 'ZW', 'ZWE', 1));
 
 		$country_iso = 'US';
-		foreach($old_countries as $country_array){
+		foreach ($old_countries as $country_array) {
 			//note: index 0 is the 3.1 country ID
-			if($country_array[0] == $country_id){
+			if ($country_array[0] == $country_id) {
 				//note: index 2 is the ISO
 				$country_iso = $country_array[2];
 				break;
@@ -1382,8 +1382,8 @@ 
 	 * Gets the ISO3 for the
 	 * @return string
 	 */
-	public function get_default_country_iso(){
-		$old_org_options= get_option('events_organization_settings');
+	public function get_default_country_iso() {
+		$old_org_options = get_option('events_organization_settings');
 		$iso = $this->get_iso_from_3_1_country_id($old_org_options['organization_country']);
 		return $iso;
 	}
@@ -1395,13 +1395,13 @@ 
 	 * the event's DEFAULT payment status, or the attendee's payment status) required pre-approval.
 	 * @return string STS_ID for use in 4.1
 	 */
-	public function convert_3_1_payment_status_to_4_1_STS_ID($payment_status, $this_thing_required_pre_approval = false){
+	public function convert_3_1_payment_status_to_4_1_STS_ID($payment_status, $this_thing_required_pre_approval = false) {
 
 		//EE team can read the related discussion: https://app.asana.com/0/2400967562914/9418495544455
-		if($this_thing_required_pre_approval){
+		if ($this_thing_required_pre_approval) {
 				return 'RNA';
-		}else{
-				$mapping = $default_reg_stati_conversions=array(
+		} else {
+				$mapping = $default_reg_stati_conversions = array(
 			'Completed'=>'RAP',
 			''=>'RPP',
 			'Incomplete'=>'RPP',
@@ -1431,22 +1431,22 @@ 
 	 * @param  EE_Data_Migration_Script_Stage $migration_stage the stage which called this, where errors should be added
 	 * @return boolean whether or not we had to do the big job of creating an image attachment
 	 */
-	public function convert_image_url_to_attachment_and_attach_to_post($guid,$new_cpt_id,  EE_Data_Migration_Script_Stage $migration_stage){
+	public function convert_image_url_to_attachment_and_attach_to_post($guid, $new_cpt_id, EE_Data_Migration_Script_Stage $migration_stage) {
 		$created_attachment_post = false;
 		$guid = $this->_get_original_guid($guid);
-		if($guid){
+		if ($guid) {
 			//check for an existing attachment post with this guid
 			$attachment_post_id = $this->_get_image_attachment_id_by_GUID($guid);
-			if( ! $attachment_post_id){
+			if ( ! $attachment_post_id) {
 				//post thumbnail with that GUID doesn't exist, we should create one
 				$attachment_post_id = $this->_create_image_attachment_from_GUID($guid, $migration_stage);
 				$created_attachment_post = true;
 			}
 			//double-check we actually have an attachment post
-			if( $attachment_post_id){
-				update_post_meta($new_cpt_id,'_thumbnail_id',$attachment_post_id);
-			}else{
-				$migration_stage->add_error(sprintf(__("Could not update event image %s for CPT with ID %d, but attachments post ID is %d", "event_espresso"),$guid,$new_cpt_id,$attachment_post_id));
+			if ($attachment_post_id) {
+				update_post_meta($new_cpt_id, '_thumbnail_id', $attachment_post_id);
+			} else {
+				$migration_stage->add_error(sprintf(__("Could not update event image %s for CPT with ID %d, but attachments post ID is %d", "event_espresso"), $guid, $new_cpt_id, $attachment_post_id));
 			}
 		}
 		return $created_attachment_post;
@@ -1460,13 +1460,13 @@ 
 	 * @param string $guid_in_old_event
 	 * @return string either the original guid, or $guid_in_old_event if we couldn't figure out what the original was
 	 */
-	private function _get_original_guid($guid_in_old_event){
-		$original_guid = preg_replace('~-\d*x\d*\.~','.',$guid_in_old_event,1);
+	private function _get_original_guid($guid_in_old_event) {
+		$original_guid = preg_replace('~-\d*x\d*\.~', '.', $guid_in_old_event, 1);
 		//do a head request to verify the file exists
 		$head_response = wp_remote_head($original_guid);
-		if( ! $head_response instanceof WP_Error && $head_response['response']['message'] == 'OK'){
+		if ( ! $head_response instanceof WP_Error && $head_response['response']['message'] == 'OK') {
 			return $original_guid;
-		}else{
+		} else {
 			return $guid_in_old_event;
 		}
 	}
@@ -1478,32 +1478,32 @@ 
 	 * @param EE_Data_Migration_Script_Stage $migration_stage
 	 * @return int
 	 */
-	private function _create_image_attachment_from_GUID($guid, EE_Data_Migration_Script_Stage $migration_stage){
-		if ( ! $guid){
+	private function _create_image_attachment_from_GUID($guid, EE_Data_Migration_Script_Stage $migration_stage) {
+		if ( ! $guid) {
 			$migration_stage->add_error(sprintf(__("Cannot create image attachment for a blank GUID!", "event_espresso")));
 			return 0;
 		}
-		$wp_filetype = wp_check_filetype(basename($guid), null );
+		$wp_filetype = wp_check_filetype(basename($guid), null);
 		$wp_upload_dir = wp_upload_dir();
 		//if the file is located remotely, download it to our uploads DIR, because wp_genereate_attachmnet_metadata needs the file to be local
-		if(strpos($guid,$wp_upload_dir['url']) === FALSE){
+		if (strpos($guid, $wp_upload_dir['url']) === FALSE) {
 			//image is located remotely. download it and place it in the uploads directory
-			if( ! is_readable($guid)){
-				$migration_stage->add_error(sprintf(__("Could not create image attachment from non-existent file: %s", "event_espresso"),$guid));
+			if ( ! is_readable($guid)) {
+				$migration_stage->add_error(sprintf(__("Could not create image attachment from non-existent file: %s", "event_espresso"), $guid));
 				return 0;
 			}
-			$contents= file_get_contents($guid);
-			if($contents === FALSE){
-				$migration_stage->add_error(sprintf(__("Could not read image at %s, and therefore couldnt create an attachment post for it.", "event_espresso"),$guid));
+			$contents = file_get_contents($guid);
+			if ($contents === FALSE) {
+				$migration_stage->add_error(sprintf(__("Could not read image at %s, and therefore couldnt create an attachment post for it.", "event_espresso"), $guid));
 				return false;
 			}
-			$local_filepath  = $wp_upload_dir['path'].DS.basename($guid);
+			$local_filepath = $wp_upload_dir['path'].DS.basename($guid);
 			$savefile = fopen($local_filepath, 'w');
 			fwrite($savefile, $contents);
 			fclose($savefile);
-			$guid = str_replace($wp_upload_dir['path'],$wp_upload_dir['url'],$local_filepath);
-		}else{
-			$local_filepath = str_replace($wp_upload_dir['url'],$wp_upload_dir['path'],$guid);
+			$guid = str_replace($wp_upload_dir['path'], $wp_upload_dir['url'], $local_filepath);
+		} else {
+			$local_filepath = str_replace($wp_upload_dir['url'], $wp_upload_dir['path'], $guid);
 		}
 
 		$attachment = array(
@@ -1513,24 +1513,24 @@ 
 		   'post_content' => '',
 		   'post_status' => 'inherit'
 		);
-		$attach_id = wp_insert_attachment( $attachment, $guid );
-		if( ! $attach_id ){
-			$migration_stage->add_error(sprintf(__("Could not create image attachment post from image '%s'. Attachment data was %s.", "event_espresso"),$guid,$this->_json_encode($attachment)));
+		$attach_id = wp_insert_attachment($attachment, $guid);
+		if ( ! $attach_id) {
+			$migration_stage->add_error(sprintf(__("Could not create image attachment post from image '%s'. Attachment data was %s.", "event_espresso"), $guid, $this->_json_encode($attachment)));
 			return $attach_id;
 		}
 
 		// you must first include the image.php file
 		// for the function wp_generate_attachment_metadata() to work
-		require_once(ABSPATH . 'wp-admin/includes/image.php');
+		require_once(ABSPATH.'wp-admin/includes/image.php');
 
-		$attach_data = wp_generate_attachment_metadata( $attach_id, $local_filepath );
-		if( ! $attach_data){
-			$migration_stage->add_error(sprintf(__("Coudl not genereate attachment metadata for attachment post %d with filepath %s and GUID %s. Please check the file was downloaded properly.", "event_espresso"),$attach_id,$local_filepath,$guid));
+		$attach_data = wp_generate_attachment_metadata($attach_id, $local_filepath);
+		if ( ! $attach_data) {
+			$migration_stage->add_error(sprintf(__("Coudl not genereate attachment metadata for attachment post %d with filepath %s and GUID %s. Please check the file was downloaded properly.", "event_espresso"), $attach_id, $local_filepath, $guid));
 			return $attach_id;
 		}
-		$metadata_save_result = wp_update_attachment_metadata( $attach_id, $attach_data );
-		if( ! $metadata_save_result ){
-			$migration_stage->add_error(sprintf(__("Could not update attachment metadata for attachment %d with data %s", "event_espresso"),$attach_id,$this->_json_encode($attach_data)));
+		$metadata_save_result = wp_update_attachment_metadata($attach_id, $attach_data);
+		if ( ! $metadata_save_result) {
+			$migration_stage->add_error(sprintf(__("Could not update attachment metadata for attachment %d with data %s", "event_espresso"), $attach_id, $this->_json_encode($attach_data)));
 		}
 		return $attach_id;
 	}
@@ -1542,9 +1542,9 @@ 
 	 * @param string $guid
 	 * @return int
 	 */
-	private function _get_image_attachment_id_by_GUID($guid){
+	private function _get_image_attachment_id_by_GUID($guid) {
 		global $wpdb;
-		$attachment_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE guid=%s LIMIT 1",$guid));
+		$attachment_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE guid=%s LIMIT 1", $guid));
 		return $attachment_id;
 	}
 	/**
@@ -1556,20 +1556,20 @@ 
 	 * @param string $timezone
 	 * @return string
 	 */
-	public function convert_date_string_to_utc(EE_Data_Migration_Script_Stage $stage, $row_of_data, $DATETIME_string,$timezone = null){
+	public function convert_date_string_to_utc(EE_Data_Migration_Script_Stage $stage, $row_of_data, $DATETIME_string, $timezone = null) {
 		$original_tz = $timezone;
-		if( ! $timezone){
+		if ( ! $timezone) {
 			$timezone = $this->_get_wp_timezone();
 		}
-		if( ! $timezone){
-			$stage->add_error(sprintf(__("Could not find timezone given %s for %s", "event_espresso"),$original_tz,$row_of_data));
+		if ( ! $timezone) {
+			$stage->add_error(sprintf(__("Could not find timezone given %s for %s", "event_espresso"), $original_tz, $row_of_data));
 			$timezone = 'UTC';
 		}
-		try{
-			$date_obj = new DateTime( $DATETIME_string, new DateTimeZone( $timezone ) );
+		try {
+			$date_obj = new DateTime($DATETIME_string, new DateTimeZone($timezone));
 			$date_obj->setTimezone(new DateTimeZone('UTC'));
-		}catch(Exception $e){
-			$stage->add_error(sprintf(__("Could not convert time string '%s' using timezone '%s' into a proper DATETIME. Using current time instead.", "event_espresso"),$DATETIME_string,$timezone));
+		} catch (Exception $e) {
+			$stage->add_error(sprintf(__("Could not convert time string '%s' using timezone '%s' into a proper DATETIME. Using current time instead.", "event_espresso"), $DATETIME_string, $timezone));
 			$date_obj = new DateTime();
 		}
 
@@ -1580,14 +1580,14 @@ 
 	 * Gets the DEFAULT timezone string from wordpress (even if they set a gmt offset)
 	 * @return string
 	 */
-	private function _get_wp_timezone(){
-		$timezone = empty( $timezone ) ? get_option('timezone_string') : $timezone;
+	private function _get_wp_timezone() {
+		$timezone = empty($timezone) ? get_option('timezone_string') : $timezone;
 
 		//if timezone is STILL empty then let's get the GMT offset and then set the timezone_string using our converter
-		if ( empty( $timezone ) ) {
+		if (empty($timezone)) {
 			//let's get a the WordPress UTC offset
 			$offset = get_option('gmt_offset');
-			$timezone = $this->timezone_convert_to_string_from_offset( $offset );
+			$timezone = $this->timezone_convert_to_string_from_offset($offset);
 		}
 		return $timezone;
 	}
@@ -1596,11 +1596,11 @@ 
 	 * @param int $offset
 	 * @return boolean
 	 */
-	private function timezone_convert_to_string_from_offset($offset){
+	private function timezone_convert_to_string_from_offset($offset) {
 		//shamelessly taken from bottom comment at http://ca1.php.net/manual/en/function.timezone-name-from-abbr.php because timezone_name_from_abbr() did NOT work as expected - its not reliable
 		$offset *= 3600; // convert hour offset to seconds
         $abbrarray = timezone_abbreviations_list();
-        foreach ($abbrarray as $abbr){
+        foreach ($abbrarray as $abbr) {
                 foreach ($abbr as $city)
                 {
                         if ($city['offset'] == $offset)
@@ -1614,32 +1614,32 @@ 
         return FALSE;
 	}
 
-	public function migration_page_hooks(){
-		add_filter('FHEE__ee_migration_page__header',array($this,'_migrate_page_hook_simplify_version_strings'),10,3);
-		add_filter('FHEE__ee_migration_page__p_after_header',array($this,'_migration_page_hook_simplify_next_db_state'),10,2);
-		add_filter('FHEE__ee_migration_page__option_1_main',array($this,'_migrate_page_hook_simplify_version_strings'),10,3);
-		add_filter('FHEE__ee_migration_page__option_1_button_text',array($this,'_migrate_page_hook_simplify_version_strings'),10,3);
-		add_action('AHEE__ee_migration_page__option_1_extra_details',array($this,'_migration_page_hook_option_1_extra_details'),10,3);
-		add_filter('FHEE__ee_migration_page__option_2_main',array($this,'_migrate_page_hook_simplify_version_strings'),10,4);
-		add_filter('FHEE__ee_migration_page__option_2_button_text',array($this,'_migration_page_hook_simplify_next_db_state'),10,2);
-		add_filter('FHEE__ee_migration_page__option_2_details',array($this,'_migration_page_hook_simplify_next_db_state'),10,2);
-		add_action('AHEE__ee_migration_page__after_migration_options_table',array($this,'_migration_page_hook_after_migration_options_table'));
-		add_filter('FHEE__ee_migration_page__done_migration_header',array($this,'_migration_page_hook_simplify_next_db_state'),10,2);
-		add_filter('FHEE__ee_migration_page__p_after_done_migration_header',array($this,'_migration_page_hook_simplify_next_db_state'),10,2);
+	public function migration_page_hooks() {
+		add_filter('FHEE__ee_migration_page__header', array($this, '_migrate_page_hook_simplify_version_strings'), 10, 3);
+		add_filter('FHEE__ee_migration_page__p_after_header', array($this, '_migration_page_hook_simplify_next_db_state'), 10, 2);
+		add_filter('FHEE__ee_migration_page__option_1_main', array($this, '_migrate_page_hook_simplify_version_strings'), 10, 3);
+		add_filter('FHEE__ee_migration_page__option_1_button_text', array($this, '_migrate_page_hook_simplify_version_strings'), 10, 3);
+		add_action('AHEE__ee_migration_page__option_1_extra_details', array($this, '_migration_page_hook_option_1_extra_details'), 10, 3);
+		add_filter('FHEE__ee_migration_page__option_2_main', array($this, '_migrate_page_hook_simplify_version_strings'), 10, 4);
+		add_filter('FHEE__ee_migration_page__option_2_button_text', array($this, '_migration_page_hook_simplify_next_db_state'), 10, 2);
+		add_filter('FHEE__ee_migration_page__option_2_details', array($this, '_migration_page_hook_simplify_next_db_state'), 10, 2);
+		add_action('AHEE__ee_migration_page__after_migration_options_table', array($this, '_migration_page_hook_after_migration_options_table'));
+		add_filter('FHEE__ee_migration_page__done_migration_header', array($this, '_migration_page_hook_simplify_next_db_state'), 10, 2);
+		add_filter('FHEE__ee_migration_page__p_after_done_migration_header', array($this, '_migration_page_hook_simplify_next_db_state'), 10, 2);
 	}
 
-	public function _migrate_page_hook_simplify_version_strings($old_content,$current_db_state,$next_db_state,$ultimate_db_state = NULL){
-		return str_replace(array($current_db_state,$next_db_state,$ultimate_db_state),array(__('EE3','event_espresso'),__('EE4','event_espresso'),  __("EE4", 'event_espresso')),$old_content);
+	public function _migrate_page_hook_simplify_version_strings($old_content, $current_db_state, $next_db_state, $ultimate_db_state = NULL) {
+		return str_replace(array($current_db_state, $next_db_state, $ultimate_db_state), array(__('EE3', 'event_espresso'), __('EE4', 'event_espresso'), __("EE4", 'event_espresso')), $old_content);
 	}
-	public function _migration_page_hook_simplify_next_db_state($old_content,$next_db_state){
-		return str_replace($next_db_state,  __("EE4", 'event_espresso'),$old_content);
+	public function _migration_page_hook_simplify_next_db_state($old_content, $next_db_state) {
+		return str_replace($next_db_state, __("EE4", 'event_espresso'), $old_content);
 	}
-	public function _migration_page_hook_option_1_extra_details(){
-		?><p><?php	printf(__("Note: many of your EE3 shortcodes will be changed to EE4 shortcodes during this migration (among many other things). Should you revert to EE3, then you should restore to your backup or manually change the EE4 shortcodes back to their EE3 equivalents", "event_espresso"));?></p><?php
+	public function _migration_page_hook_option_1_extra_details() {
+		?><p><?php	printf(__("Note: many of your EE3 shortcodes will be changed to EE4 shortcodes during this migration (among many other things). Should you revert to EE3, then you should restore to your backup or manually change the EE4 shortcodes back to their EE3 equivalents", "event_espresso")); ?></p><?php
 	}
-	public function _migration_page_hook_after_migration_options_table(){
+	public function _migration_page_hook_after_migration_options_table() {
 		?><p class="ee-attention">
-				<strong><span class="reminder-spn"><?php _e("Important note to those using Event Espresso 3 addons: ", "event_espresso");?></span></strong><br/><?php _e("Unless an addon's description on our website explicitly states that it is compatible with EE4, you should consider it incompatible and know that it WILL NOT WORK correctly with this new version of Event Espresso 4 (EE4). As well, any data for incompatible addons will NOT BE MIGRATED until an updated EE4 compatible version of the addon is available. If you want, or need to keep using your EE3 addons, you should simply continue using EE3 until EE4 compatible versions of your addons become available. To continue using EE3 for now, just deactivate EE4 and reactivate EE3.", "event_espresso");	?>
+				<strong><span class="reminder-spn"><?php _e("Important note to those using Event Espresso 3 addons: ", "event_espresso"); ?></span></strong><br/><?php _e("Unless an addon's description on our website explicitly states that it is compatible with EE4, you should consider it incompatible and know that it WILL NOT WORK correctly with this new version of Event Espresso 4 (EE4). As well, any data for incompatible addons will NOT BE MIGRATED until an updated EE4 compatible version of the addon is available. If you want, or need to keep using your EE3 addons, you should simply continue using EE3 until EE4 compatible versions of your addons become available. To continue using EE3 for now, just deactivate EE4 and reactivate EE3.", "event_espresso"); ?>
 			</p><?php
 	}
 }

core/data_migration_scripts/4_10_0_stages/EE_DMS_4_10_0_Questions_Refactor.dmsstage.php

Spacing +13 added lines, -13 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 
 
@@ -15,8 +15,8 @@ 
 
 	public function __construct() {
 		global $wpdb;
-		$this->_pretty_name = __( 'Registration Form Questions Refactor', 'event_espresso' );
-		$this->_old_table = $wpdb->prefix . 'esp_question';
+		$this->_pretty_name = __('Registration Form Questions Refactor', 'event_espresso');
+		$this->_old_table = $wpdb->prefix.'esp_question';
 		parent::__construct();
 	}
 
@@ -26,11 +26,11 @@ 
 	 * @param array $question an associative array where keys are column names and values are their values.
 	 * @return void
 	 */
-	protected function _migrate_old_row( $question ) {
+	protected function _migrate_old_row($question) {
 		global $wpdb;
-		if ( $question['QST_ID'] ) {
-			$html_class = sanitize_key( $question['QST_type'] );
-			$identifier = $html_class . '-' . time();
+		if ($question['QST_ID']) {
+			$html_class = sanitize_key($question['QST_type']);
+			$identifier = $html_class.'-'.time();
 			$success = $wpdb->update(
 				$this->_old_table,
 				// data
@@ -56,29 +56,29 @@ 
 					'QST_html_label_class' => "{$html_class}-lbl",
 					//QST_default_value
 					'QST_validation_strategies' => $question['QST_required']
-						? array( 'required' )
+						? array('required')
 						: array(),
 					'QST_validation_message' => $question['QST_required']
-						? array( 'required' => $question['QST_required_text'] )
+						? array('required' => $question['QST_required_text'])
 						: array(),
 				),
 				// where
-				array( 'QST_ID' => $question['QST_ID'] ),
+				array('QST_ID' => $question['QST_ID']),
 				// data format
 				array(
 					'%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s',
 				),
 				// where format
-				array( '%d' )
+				array('%d')
 			);
-			if ( ! $success ) {
+			if ( ! $success) {
 				$this->add_error(
 					sprintf(
 						__(
 							'Could not update the "%1$s" question (ID:%2$d) because "%3$s"',
 							'event_espresso'
 						),
-						json_encode( $question['QST_admin_label'] ),
+						json_encode($question['QST_admin_label']),
 						$question['QST_ID'],
 						$wpdb->last_error
 					)

core/data_migration_scripts/EE_DMS_Core_4_8_0.dms.php

Spacing +75 added lines, -75 removed lines

@@ -13,7 +13,7 @@ 
  * @author     Mike Nelson
  * @since      4.6.0
  */
-class EE_DMS_Core_4_8_0 extends EE_Data_Migration_Script_Base{
+class EE_DMS_Core_4_8_0 extends EE_Data_Migration_Script_Base {
 
 	/**
 	 * return EE_DMS_Core_4_8_0
@@ -43,14 +43,14 @@ 
 	 */
 	public function can_migrate_from_version($version_array) {
 		$version_string = $version_array['Core'];
-		if( $version_string <= '4.8.0' && $version_string >= '4.7.0' ){
+		if ($version_string <= '4.8.0' && $version_string >= '4.7.0') {
 //			echo "$version_string can be migrated from";
 			return true;
-		}elseif( ! $version_string ){
+		}elseif ( ! $version_string) {
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.3
-			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+			return false; //changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
 //			echo "$version_string doesnt apply";
 			return false;
 		}
@@ -71,19 +71,19 @@ 
 	 * @return bool
 	 */
 	public function schema_changes_before_migration() {
-		require_once( EE_HELPERS . 'EEH_Activation.helper.php' );
-		$now_in_mysql = current_time( 'mysql', true );
+		require_once(EE_HELPERS.'EEH_Activation.helper.php');
+		$now_in_mysql = current_time('mysql', true);
 
-		require_once( EE_HELPERS . 'EEH_Activation.helper.php' );
-		$table_name='esp_answer';
-		$sql=" ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		require_once(EE_HELPERS.'EEH_Activation.helper.php');
+		$table_name = 'esp_answer';
+		$sql = " ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					REG_ID int(10) unsigned NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
 					ANS_value text NOT NULL,
 					PRIMARY KEY  (ANS_ID),
 					KEY REG_ID (REG_ID),
 					KEY QST_ID (QST_ID)";
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_attendee_meta';
 		$sql = "ATTM_ID int(10) unsigned NOT	NULL AUTO_INCREMENT,
@@ -123,7 +123,7 @@ 
 					  CNT_is_EU tinyint(1) DEFAULT '0',
 					  CNT_active tinyint(1) DEFAULT '0',
 					  PRIMARY KEY  (CNT_ISO)";
-		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_currency';
 		$sql = "CUR_code varchar(6) collate utf8_bin NOT NULL,
@@ -133,7 +133,7 @@ 
 				CUR_dec_plc varchar(1) collate utf8_bin NOT NULL DEFAULT '2',
 				CUR_active tinyint(1) DEFAULT '0',
 				PRIMARY KEY  (CUR_code)";
-		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 
 		$table_name = 'esp_currency_payment_method';
@@ -163,7 +163,7 @@ 
 						KEY EVT_ID (EVT_ID),
 						KEY DTT_is_primary (DTT_is_primary)";
 
-		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_event_meta';
 		$sql = "
@@ -182,41 +182,41 @@ 
 			EVT_donations tinyint(1) NULL,
 			PRIMARY KEY  (EVTM_ID),
 			KEY EVT_ID (EVT_ID)";
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_question_group';
-		$sql="EQG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_question_group';
+		$sql = "EQG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					EVT_ID bigint(20) unsigned NOT NULL,
 					QSG_ID int(10) unsigned NOT NULL,
 					EQG_primary tinyint(1) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (EQG_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY QSG_ID (QSG_ID)";
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_venue';
-		$sql="EVV_ID int(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_venue';
+		$sql = "EVV_ID int(11) NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				VNU_ID bigint(20) unsigned NOT NULL,
 				EVV_primary tinyint(1) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EVV_ID)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_extra_meta';
-		$sql="EXM_ID int(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_extra_meta';
+		$sql = "EXM_ID int(11) NOT NULL AUTO_INCREMENT,
 				OBJ_ID int(11) DEFAULT NULL,
 				EXM_type varchar(45) DEFAULT NULL,
 				EXM_key varchar(45) DEFAULT NULL,
 				EXM_value text,
 				PRIMARY KEY  (EXM_ID),
 				KEY EXM_type (EXM_type,OBJ_ID,EXM_key)";
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_extra_join';
 		$sql = "EXJ_ID int(11) NOT NULL AUTO_INCREMENT,
@@ -229,8 +229,8 @@ 
 				KEY second_model (EXJ_second_model_name,EXJ_second_model_id)";
 		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB ');
 
-		$table_name='esp_line_item';
-		$sql="LIN_ID int(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_line_item';
+		$sql = "LIN_ID int(11) NOT NULL AUTO_INCREMENT,
 				LIN_code varchar(245) NOT NULL DEFAULT '',
 				TXN_ID int(11) DEFAULT NULL,
 				LIN_name varchar(245) NOT NULL DEFAULT '',
@@ -249,7 +249,7 @@ 
 				PRIMARY KEY  (LIN_ID),
 				KEY LIN_code (LIN_code(191)),
 				KEY TXN_ID (TXN_ID)";
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB' );
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_log';
 		$sql = "LOG_ID int(11) NOT NULL AUTO_INCREMENT,
@@ -288,7 +288,7 @@ 
 					MTP_is_active tinyint(1) NOT NULL DEFAULT '1',
 					PRIMARY KEY  (GRP_ID),
 					KEY MTP_user_id (MTP_user_id)";
-		$this->_table_has_not_changed_since_previous( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_event_message_template';
 		$sql = "EMT_ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
@@ -297,7 +297,7 @@ 
 					PRIMARY KEY  (EMT_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY GRP_ID (GRP_ID)";
-		$this->_table_has_not_changed_since_previous( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 
 		$table_name = 'esp_payment';
@@ -370,8 +370,8 @@ 
 					  PRIMARY KEY  (TTM_ID)";
 		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_question';
-		$sql='QST_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question';
+		$sql = 'QST_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QST_display_text text NOT NULL,
 					QST_admin_label varchar(255) NOT NULL,
 					QST_system varchar(25) NOT NULL DEFAULT "",
@@ -385,22 +385,22 @@ 
 					QST_deleted tinyint(2) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QST_ID),
 					KEY QST_order (QST_order)';
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_question_group_question';
-		$sql="QGQ_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_group_question';
+		$sql = "QGQ_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QSG_ID int(10) unsigned NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
 					QGQ_order int(10) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QGQ_ID),
 					KEY QST_ID (QST_ID),
 					KEY QSG_ID_order (QSG_ID,QGQ_order)";
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_option';
-		$sql="QSO_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_option';
+		$sql = "QSO_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QSO_value varchar(255) NOT NULL,
 					QSO_desc text NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
@@ -410,7 +410,7 @@ 
 					PRIMARY KEY  (QSO_ID),
 					KEY QST_ID (QST_ID),
 					KEY QSO_order (QSO_order)";
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -456,8 +456,8 @@ 
 
 
 
-		$table_name='esp_checkin';
-		$sql="CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_checkin';
+		$sql = "CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					REG_ID int(10) unsigned NOT NULL,
 					DTT_ID int(10) unsigned NOT NULL,
 					CHK_in tinyint(1) unsigned NOT NULL DEFAULT 1,
@@ -552,7 +552,7 @@ 
 					  PRC_parent int(10) unsigned DEFAULT 0,
 					  PRIMARY KEY  (PRC_ID),
 					  KEY PRT_ID (PRT_ID)";
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = "esp_price_type";
 		$sql = "PRT_ID tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
@@ -590,10 +590,10 @@ 
 					  TKT_deleted tinyint(1) NOT NULL DEFAULT '0',
 					  PRIMARY KEY  (TKT_ID),
 					  KEY TKT_start_date (TKT_start_date)";
-		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_question_group';
-		$sql='QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$sql = 'QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QSG_name varchar(255) NOT NULL,
 					QSG_identifier varchar(100) NOT NULL,
 					QSG_desc text NULL,
@@ -606,7 +606,7 @@ 
 					PRIMARY KEY  (QSG_ID),
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier),
 					KEY QSG_order (QSG_order)';
-		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 		/** @var EE_DMS_Core_4_1_0 $script_4_1_defaults */
 		$script_4_1_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
@@ -642,7 +642,7 @@ 
 		return $script_4_7_defaults->schema_changes_after_migration();
 	}
 
-	public function migration_page_hooks(){
+	public function migration_page_hooks() {
 
 	}
 
@@ -656,19 +656,19 @@ 
 		//CNT_ISO, CNT_ISO3, RGN_ID, CNT_name, CNT_cur_code, CNT_cur_single, CNT_cur_plural, CNT_cur_sign, CNT_cur_sign_b4, CNT_cur_dec_plc, CNT_tel_code, CNT_is_EU, CNT_active
 		//('AD', 'AND', 0, 'Andorra', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+376', 0, 0),
 		$newer_countries = array(
-			array( 'AX', 'ALA', 0, 'Alan Islands', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+358', 1, 0 ),
-			array( 'BL', 'BLM', 0, 'Saint Barthelemy', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+590', 1, 0 ),
-			array( 'CW', 'CUW', 0, 'Curacao', 'ANG', 'Guilder', 'Guilders', 'ƒ', 1, 2, '+599', 1, 0 ),
-			array( 'GG', 'GGY', 0, 'Guernsey', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+44', 0, 0 ),
-			array( 'IM', 'IMN', 0, 'Isle of Man', 'GBP', 'Pound', 'Pounds', '£', 1, 2,  '+44', 0, 0  ),
-			array( 'JE', 'JEY', 0, 'Jersey', 'GBP', 'Pound', 'Pounds', '£', 1, 2, '+44', 0, 0 ),
-			array( 'MF', 'MAF', 0, 'Saint Martin', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+590', 1, 0 ),
-			array( 'MN', 'MNE', 0, 'Montenegro', 'EUR', 'Euro', 'Euros', '€', 1,  2, '+382', 0, 0 ),
-			array( 'RS', 'SRB', 0, 'Serbia', 'RSD', 'Dinar', 'Dinars', '', 0, 2, '+941', 1, 0 ),
-			array( 'SS', 'SSD', 0, 'South Sudan', 'SSP', 'Pound', 'Pounds', '£', 1, 2, '+211', 0, 0 ),
-			array( 'SX', 'SXM', 0, 'Sint Maarten', 'ANG', 'Guilder', 'Guilders', 'ƒ', 1, 2, '+1', 1, 0 ),
-			array( 'XK', 'XKX', 0, 'Kosovo', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+381', 0, 0 ),
-			array( 'YT', 'MYT', 0, 'Mayotte', 'EUR', 'Euro', 'Euros', '€', 0, 2, '+262', 1, 0 ),
+			array('AX', 'ALA', 0, 'Alan Islands', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+358', 1, 0),
+			array('BL', 'BLM', 0, 'Saint Barthelemy', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+590', 1, 0),
+			array('CW', 'CUW', 0, 'Curacao', 'ANG', 'Guilder', 'Guilders', 'ƒ', 1, 2, '+599', 1, 0),
+			array('GG', 'GGY', 0, 'Guernsey', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+44', 0, 0),
+			array('IM', 'IMN', 0, 'Isle of Man', 'GBP', 'Pound', 'Pounds', '£', 1, 2, '+44', 0, 0),
+			array('JE', 'JEY', 0, 'Jersey', 'GBP', 'Pound', 'Pounds', '£', 1, 2, '+44', 0, 0),
+			array('MF', 'MAF', 0, 'Saint Martin', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+590', 1, 0),
+			array('MN', 'MNE', 0, 'Montenegro', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+382', 0, 0),
+			array('RS', 'SRB', 0, 'Serbia', 'RSD', 'Dinar', 'Dinars', '', 0, 2, '+941', 1, 0),
+			array('SS', 'SSD', 0, 'South Sudan', 'SSP', 'Pound', 'Pounds', '£', 1, 2, '+211', 0, 0),
+			array('SX', 'SXM', 0, 'Sint Maarten', 'ANG', 'Guilder', 'Guilders', 'ƒ', 1, 2, '+1', 1, 0),
+			array('XK', 'XKX', 0, 'Kosovo', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+381', 0, 0),
+			array('YT', 'MYT', 0, 'Mayotte', 'EUR', 'Euro', 'Euros', '€', 0, 2, '+262', 1, 0),
 		);
 		global $wpdb;
 		$country_table = $wpdb->prefix."esp_country";
@@ -687,14 +687,14 @@ 
 							"CNT_is_EU" => '%d',
 							"CNT_active" => '%d',
 						);
-		if ( EEH_Activation::table_exists( $country_table ) ) {
-			foreach( $newer_countries as $country ) {
-				$SQL = "SELECT COUNT('CNT_ISO') FROM {$country_table} WHERE CNT_ISO='{$country[0]}' LIMIT 1" ;
+		if (EEH_Activation::table_exists($country_table)) {
+			foreach ($newer_countries as $country) {
+				$SQL = "SELECT COUNT('CNT_ISO') FROM {$country_table} WHERE CNT_ISO='{$country[0]}' LIMIT 1";
 				$countries = $wpdb->get_var($SQL);
-				if ( ! $countries ) {
+				if ( ! $countries) {
 
-					$wpdb->insert( $country_table,
-							array_combine( array_keys( $country_format), $country ),
+					$wpdb->insert($country_table,
+							array_combine(array_keys($country_format), $country),
 							$country_format
 							);
 				}
@@ -712,7 +712,7 @@ 
 		// CUR_code, CUR_single, CUR_plural, CUR_sign, CUR_dec_plc, CUR_active
 		//( 'EUR',  'Euro',  'Euros',  '€',  2,1),
 		$newer_currencies = array(
-			array( 'RSD', 'Dinar', 'Dinars', '', 3, 1 ),
+			array('RSD', 'Dinar', 'Dinars', '', 3, 1),
 		);
 		global $wpdb;
 		$currency_table = $wpdb->prefix."esp_currency";
@@ -724,14 +724,14 @@ 
 							"CUR_dec_plc" => '%d',
 							"CUR_active" => '%d',
 						);
-		if ( EEH_Activation::table_exists( $currency_table ) ) {
-			foreach( $newer_currencies as $currency ) {
-				$SQL = "SELECT COUNT('CUR_code') FROM {$currency_table} WHERE CUR_code='{$currency[0]}' LIMIT 1" ;
+		if (EEH_Activation::table_exists($currency_table)) {
+			foreach ($newer_currencies as $currency) {
+				$SQL = "SELECT COUNT('CUR_code') FROM {$currency_table} WHERE CUR_code='{$currency[0]}' LIMIT 1";
 				$countries = $wpdb->get_var($SQL);
-				if ( ! $countries ) {
+				if ( ! $countries) {
 
-					$wpdb->insert( $currency_table,
-							array_combine( array_keys( $currency_format), $currency ),
+					$wpdb->insert($currency_table,
+							array_combine(array_keys($currency_format), $currency),
 							$currency_format
 							);
 				}
@@ -743,9 +743,9 @@ 
 	 * which should just be a temporary issue for folks who installed 4.8.0-4.8.5;
 	 * we should be able to stop doing this in 4.9
 	 */
-	public function fix_non_default_taxes(){
+	public function fix_non_default_taxes() {
 		global $wpdb;
-		$query = $wpdb->prepare( "UPDATE
+		$query = $wpdb->prepare("UPDATE
 				{$wpdb->prefix}esp_price p INNER JOIN
 				{$wpdb->prefix}esp_price_type pt ON p.PRT_ID = pt.PRT_ID
 			SET
@@ -753,7 +753,7 @@ 
 			WHERE
 				p.PRC_is_default = 0 AND
 				pt.PBT_ID = %d
-					", EEM_Price_Type::base_type_tax );
-		$wpdb->query( $query );
+					", EEM_Price_Type::base_type_tax);
+		$wpdb->query($query);
 	}
 }

core/db_classes/EE_Question.class.php

Spacing +137 added lines, -137 removed lines

@@ -2,8 +2,8 @@ 
 
 use EventEspresso\core\libraries\form_sections\strategies\validation\ValidationStrategiesLoader;
 
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -41,9 +41,9 @@ 
 	 * @return EE_Question
 	 * @throws \EE_Error
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -55,8 +55,8 @@ 
 	 * @return EE_Question
 	 * @throws \EE_Error
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -68,8 +68,8 @@ 
 	 * @param string $QST_display_text
 	 * @throws \EE_Error
 	 */
-	public function set_display_text( $QST_display_text = '' ) {
-		$this->set( 'QST_display_text', $QST_display_text );
+	public function set_display_text($QST_display_text = '') {
+		$this->set('QST_display_text', $QST_display_text);
 	}
 
 
@@ -81,8 +81,8 @@ 
 	 * @param        string $QST_admin_label
 	 * @throws \EE_Error
 	 */
-	public function set_admin_label( $QST_admin_label = '' ) {
-		$this->set( 'QST_admin_label', $QST_admin_label );
+	public function set_admin_label($QST_admin_label = '') {
+		$this->set('QST_admin_label', $QST_admin_label);
 	}
 
 
@@ -94,8 +94,8 @@ 
 	 * @param        mixed $QST_system
 	 * @throws \EE_Error
 	 */
-	public function set_system_ID( $QST_system = '' ) {
-		$this->set( 'QST_system', $QST_system );
+	public function set_system_ID($QST_system = '') {
+		$this->set('QST_system', $QST_system);
 	}
 
 
@@ -107,8 +107,8 @@ 
 	 * @param        string $QST_type
 	 * @throws \EE_Error
 	 */
-	public function set_question_type( $QST_type = '' ) {
-		$this->set( 'QST_type', $QST_type );
+	public function set_question_type($QST_type = '') {
+		$this->set('QST_type', $QST_type);
 	}
 
 
@@ -120,8 +120,8 @@ 
 	 * @param string $QST_html_name
 	 * @throws \EE_Error
 	 */
-	public function set_html_name( $QST_html_name = '' ) {
-		$this->set( 'QST_html_name', $QST_html_name );
+	public function set_html_name($QST_html_name = '') {
+		$this->set('QST_html_name', $QST_html_name);
 	}
 
 
@@ -133,8 +133,8 @@ 
 	 * @param string $QST_html_id
 	 * @throws \EE_Error
 	 */
-	public function set_html_id( $QST_html_id = '' ) {
-		$this->set( 'QST_html_id', $QST_html_id );
+	public function set_html_id($QST_html_id = '') {
+		$this->set('QST_html_id', $QST_html_id);
 	}
 
 
@@ -146,8 +146,8 @@ 
 	 * @param string $QST_html_class
 	 * @throws \EE_Error
 	 */
-	public function set_html_class( $QST_html_class = '' ) {
-		$this->set( 'QST_html_class', $QST_html_class );
+	public function set_html_class($QST_html_class = '') {
+		$this->set('QST_html_class', $QST_html_class);
 	}
 
 
@@ -159,8 +159,8 @@ 
 	 * @param string $QST_html_label_id
 	 * @throws \EE_Error
 	 */
-	public function set_html_label_id( $QST_html_label_id = '' ) {
-		$this->set( 'QST_html_label_id', $QST_html_label_id );
+	public function set_html_label_id($QST_html_label_id = '') {
+		$this->set('QST_html_label_id', $QST_html_label_id);
 	}
 
 
@@ -172,8 +172,8 @@ 
 	 * @param string $QST_html_label_class
 	 * @throws \EE_Error
 	 */
-	public function set_html_label_class( $QST_html_label_class = '' ) {
-		$this->set( 'QST_html_label_class', $QST_html_label_class );
+	public function set_html_label_class($QST_html_label_class = '') {
+		$this->set('QST_html_label_class', $QST_html_label_class);
 	}
 
 
@@ -186,15 +186,15 @@ 
 	 * @param string|array $validation_strategies
 	 * @throws \EE_Error
 	 */
-	public function set_validation_strategies( $validation_strategies ) {
+	public function set_validation_strategies($validation_strategies) {
 		$strategies = array();
-		foreach ( (array) $validation_strategies as $validation_strategy ) {
+		foreach ((array) $validation_strategies as $validation_strategy) {
 			$strategies = ValidationStrategiesLoader::add(
 				$validation_strategy,
 				$strategies
 			);
 		}
-		$this->set( 'QST_validation_strategies', $strategies );
+		$this->set('QST_validation_strategies', $strategies);
 	}
 
 
@@ -206,8 +206,8 @@ 
 	 * @param string $QST_validation_message
 	 * @throws \EE_Error
 	 */
-	public function set_validation_message( $QST_validation_message = '' ) {
-		$this->set( 'QST_validation_message', $QST_validation_message );
+	public function set_validation_message($QST_validation_message = '') {
+		$this->set('QST_validation_message', $QST_validation_message);
 	}
 
 
@@ -219,8 +219,8 @@ 
 	 * @param        int $QST_order
 	 * @throws \EE_Error
 	 */
-	public function set_order( $QST_order = 0 ) {
-		$this->set( 'QST_order', $QST_order );
+	public function set_order($QST_order = 0) {
+		$this->set('QST_order', $QST_order);
 	}
 
 
@@ -232,8 +232,8 @@ 
 	 * @param        bool $QST_admin_only
 	 * @throws \EE_Error
 	 */
-	public function set_admin_only( $QST_admin_only = FALSE ) {
-		$this->set( 'QST_admin_only', $QST_admin_only );
+	public function set_admin_only($QST_admin_only = FALSE) {
+		$this->set('QST_admin_only', $QST_admin_only);
 	}
 
 
@@ -245,8 +245,8 @@ 
 	 * @param        int $QST_wp_user
 	 * @throws \EE_Error
 	 */
-	public function set_wp_user( $QST_wp_user = 1 ) {
-		$this->set( 'QST_wp_user', $QST_wp_user );
+	public function set_wp_user($QST_wp_user = 1) {
+		$this->set('QST_wp_user', $QST_wp_user);
 	}
 
 
@@ -263,8 +263,8 @@ 
 	 * @param    bool $QST_deleted
 	 * @throws \EE_Error
 	 */
-	public function set_deleted( $QST_deleted = FALSE ) {
-		$this->set( 'QST_deleted', $QST_deleted );
+	public function set_deleted($QST_deleted = FALSE) {
+		$this->set('QST_deleted', $QST_deleted);
 	}
 
 
@@ -277,7 +277,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function identifier() {
-		return $this->get( 'QST_identifier' );
+		return $this->get('QST_identifier');
 	}
 
 
@@ -290,7 +290,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function display_text() {
-		return $this->get( 'QST_display_text' );
+		return $this->get('QST_display_text');
 	}
 
 
@@ -303,7 +303,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function admin_label() {
-		return $this->get( 'QST_admin_label' );
+		return $this->get('QST_admin_label');
 	}
 
 
@@ -316,7 +316,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function system_ID() {
-		return $this->get( 'QST_system' );
+		return $this->get('QST_system');
 	}
 
 
@@ -329,8 +329,8 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function desc( $pretty = false ) {
-		return $pretty ? $this->get_pretty( 'QST_desc' ) : $this->get( 'QST_desc' );
+	public function desc($pretty = false) {
+		return $pretty ? $this->get_pretty('QST_desc') : $this->get('QST_desc');
 	}
 
 
@@ -343,7 +343,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function html_name() {
-		return $this->get( 'QST_html_name' );
+		return $this->get('QST_html_name');
 	}
 
 
@@ -356,7 +356,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function html_id() {
-		return $this->get( 'QST_html_id' );
+		return $this->get('QST_html_id');
 	}
 
 
@@ -369,7 +369,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function html_class() {
-		return $this->get( 'QST_html_class' );
+		return $this->get('QST_html_class');
 	}
 
 
@@ -382,7 +382,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function html_content() {
-		return $this->get( 'QST_html_content' );
+		return $this->get('QST_html_content');
 	}
 
 
@@ -396,7 +396,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function html_label_id() {
-		return $this->get( 'QST_html_label_id' );
+		return $this->get('QST_html_label_id');
 	}
 
 
@@ -410,7 +410,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function html_label_class() {
-		return $this->get( 'QST_html_label_class' );
+		return $this->get('QST_html_label_class');
 	}
 
 
@@ -427,7 +427,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function validation_strategies() {
-		return $this->get( 'QST_validation_strategies' );
+		return $this->get('QST_validation_strategies');
 	}
 
 
@@ -440,9 +440,9 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function has_validation_strategy( $validation_strategy = '' ) {
-		$validations = $this->get( 'QST_validation_strategies' );
-		return isset( $validations[ $validation_strategy ] ) ? true : false;
+	public function has_validation_strategy($validation_strategy = '') {
+		$validations = $this->get('QST_validation_strategies');
+		return isset($validations[$validation_strategy]) ? true : false;
 	}
 
 
@@ -455,7 +455,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function validation_message() {
-		return $this->get( 'QST_validation_message' );
+		return $this->get('QST_validation_message');
 	}
 
 
@@ -468,7 +468,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function type() {
-		return $this->get( 'QST_type' );
+		return $this->get('QST_type');
 	}
 
 
@@ -482,7 +482,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function order() {
-		return $this->get( 'QST_order' );
+		return $this->get('QST_order');
 	}
 
 
@@ -496,7 +496,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function admin_only() {
-		return $this->get( 'QST_admin_only' );
+		return $this->get('QST_admin_only');
 	}
 
 
@@ -509,7 +509,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function wp_user() {
-		return $this->get( 'QST_wp_user' );
+		return $this->get('QST_wp_user');
 	}
 
 
@@ -522,7 +522,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function deleted() {
-		return $this->get( 'QST_deleted' );
+		return $this->get('QST_deleted');
 	}
 
 
@@ -534,7 +534,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function answers() {
-		return $this->get_many_related( 'Answer' );
+		return $this->get_many_related('Answer');
 	}
 
 
@@ -544,7 +544,7 @@ 
 	 * @return boolean true = has answers, false = no answers.
 	 */
 	public function has_answers() {
-		return $this->count_related( 'Answer' ) > 0 ? TRUE : FALSE;
+		return $this->count_related('Answer') > 0 ? TRUE : FALSE;
 	}
 
 
@@ -556,7 +556,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function question_groups() {
-		return $this->get_many_related( 'Question_Group' );
+		return $this->get_many_related('Question_Group');
 	}
 
 
@@ -573,24 +573,24 @@ 
 	 * @return EE_Question_Option[]
 	 * @throws \EE_Error
 	 */
-	public function options( $notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL ) {
-		if ( ! $this->ID() ) {
+	public function options($notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL) {
+		if ( ! $this->ID()) {
 			return array();
 		}
 		$query_params = array();
-		if ( $selected_value_to_always_include ) {
-			if ( is_array( $selected_value_to_always_include ) ) {
-				$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_value' ] = array( 'IN', $selected_value_to_always_include );
+		if ($selected_value_to_always_include) {
+			if (is_array($selected_value_to_always_include)) {
+				$query_params[0]['OR*options-query']['QSO_value'] = array('IN', $selected_value_to_always_include);
 			} else {
-				$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_value' ] = $selected_value_to_always_include;
+				$query_params[0]['OR*options-query']['QSO_value'] = $selected_value_to_always_include;
 			}
 		}
-		if ( $notDeletedOptionsOnly ) {
-			$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_deleted' ] = FALSE;
+		if ($notDeletedOptionsOnly) {
+			$query_params[0]['OR*options-query']['QSO_deleted'] = FALSE;
 		}
 		//order by QSO_order
-		$query_params[ 'order_by' ] = array( 'QSO_order' => 'ASC' );
-		return $this->get_many_related( 'Question_Option', $query_params );
+		$query_params['order_by'] = array('QSO_order' => 'ASC');
+		return $this->get_many_related('Question_Option', $query_params);
 	}
 
 
@@ -600,7 +600,7 @@ 
 	 * @return \EE_Question_Option[]
 	 */
 	public function temp_options() {
-		return $this->_model_relations[ 'Question_Option' ];
+		return $this->_model_relations['Question_Option'];
 	}
 
 
@@ -613,8 +613,8 @@ 
 	 * @return boolean success
 	 * @throws \EE_Error
 	 */
-	public function add_option( EE_Question_Option $option ) {
-		return $this->_add_relation_to( $option, 'Question_Option' );
+	public function add_option(EE_Question_Option $option) {
+		return $this->_add_relation_to($option, 'Question_Option');
 	}
 
 
@@ -624,8 +624,8 @@ 
 	 * @param EE_Question_Option $option
 	 * @return boolean success
 	 */
-	public function add_temp_option( EE_Question_Option $option ) {
-		$this->_model_relations[ 'Question_Option' ][ ] = $option;
+	public function add_temp_option(EE_Question_Option $option) {
+		$this->_model_relations['Question_Option'][] = $option;
 		return TRUE;
 	}
 
@@ -638,8 +638,8 @@ 
 	 * @return boolean success
 	 * @throws \EE_Error
 	 */
-	public function remove_option( EE_Question_Option $option ) {
-		return $this->_remove_relation_to( $option, 'Question_Option' );
+	public function remove_option(EE_Question_Option $option) {
+		return $this->_remove_relation_to($option, 'Question_Option');
 	}
 
 
@@ -649,8 +649,8 @@ 
 	 * @throws \EE_Error
 	 */
 	public function is_system_question() {
-		$system_ID = $this->get( 'QST_system' );
-		return ! empty( $system_ID ) ? TRUE : FALSE;
+		$system_ID = $this->get('QST_system');
+		return ! empty($system_ID) ? TRUE : FALSE;
 	}
 
 
@@ -663,8 +663,8 @@ 
 	 */
 	public function set_order_to_latest() {
 		$latest_order = $this->get_model()->get_latest_question_order();
-		$latest_order ++;
-		$this->set( 'QST_order', $latest_order );
+		$latest_order++;
+		$this->set('QST_order', $latest_order);
 	}
 
 
@@ -688,20 +688,20 @@ 
 	 * @return \EE_Question
 	 * @throws \EE_Error
 	 */
-	public function duplicate( $options = array() ) {
+	public function duplicate($options = array()) {
 		$new_question = clone $this;
-		$new_question->set( 'QST_ID', null );
-		$new_question->set_display_text( sprintf( __( '%s **Duplicate**', 'event_espresso' ), $this->display_text() ) );
-		$new_question->set_admin_label( sprintf( __( '%s **Duplicate**', 'event_espresso' ), $this->admin_label() ) );
-		$new_question->set_system_ID( null );
-		$new_question->set_wp_user( get_current_user_id() );
+		$new_question->set('QST_ID', null);
+		$new_question->set_display_text(sprintf(__('%s **Duplicate**', 'event_espresso'), $this->display_text()));
+		$new_question->set_admin_label(sprintf(__('%s **Duplicate**', 'event_espresso'), $this->admin_label()));
+		$new_question->set_system_ID(null);
+		$new_question->set_wp_user(get_current_user_id());
                 //if we're duplicating a trashed question, assume we don't want the new one to be trashed
-                $new_question->set_deleted( false );
+                $new_question->set_deleted(false);
 		$success = $new_question->save();
-		if( $success ) {
+		if ($success) {
 			//we don't totally want to duplicate the question options, because we want them to be for the NEW question
-			foreach( $this->options() as $question_option ) {
-				$question_option->duplicate( array( 'QST_ID' => $new_question->ID() ) );
+			foreach ($this->options() as $question_option) {
+				$question_option->duplicate(array('QST_ID' => $new_question->ID()));
 			}
 			return $new_question;
 		} else {
@@ -718,7 +718,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function max() {
-		return $this->get( 'QST_max' );
+		return $this->get('QST_max');
 	}
 
 
@@ -730,8 +730,8 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function set_max( $new_max ) {
-		$this->set( 'QST_max', $new_max );
+	public function set_max($new_max) {
+		$this->set('QST_max', $new_max);
 	}
 
 
@@ -745,7 +745,7 @@ 
 	 * @return EE_Form_Input_Base
 	 * @throws \EE_Error
 	 */
-	public function generate_form_input( $registration = null, $answer = null, $input_constructor_args = array() ) {
+	public function generate_form_input($registration = null, $answer = null, $input_constructor_args = array()) {
 		$identifier = $this->is_system_question() ? $this->system_ID() : $this->ID();
 
 		$input_constructor_args = array_merge(
@@ -756,27 +756,27 @@ 
 				),
 				$input_constructor_args
 			);
-		if( ! $answer instanceof EE_Answer && $registration instanceof EE_Registration ) {
-			$answer = EEM_Answer::instance()->get_registration_question_answer_object( $registration, $this->ID() );
+		if ( ! $answer instanceof EE_Answer && $registration instanceof EE_Registration) {
+			$answer = EEM_Answer::instance()->get_registration_question_answer_object($registration, $this->ID());
 		}
 		// has this question been answered ?
-		if ( $answer instanceof EE_Answer ) {
+		if ($answer instanceof EE_Answer) {
 			//answer gets htmlspecialchars called on it, undo that please
 			//because the form input's display strategy may call esc_attr too
 			//which also does html special characters
 			$values_with_html_special_chars = $answer->value();
-			if( is_array( $values_with_html_special_chars ) ) {
-				$default_value = array_map( 'htmlspecialchars_decode', $values_with_html_special_chars );
+			if (is_array($values_with_html_special_chars)) {
+				$default_value = array_map('htmlspecialchars_decode', $values_with_html_special_chars);
 			} else {
-				$default_value = htmlspecialchars_decode( $values_with_html_special_chars );
+				$default_value = htmlspecialchars_decode($values_with_html_special_chars);
 			}
 			$input_constructor_args['default'] = $default_value;
 		}
-		$max_max_for_question = EEM_Question::instance()->absolute_max_for_system_question( $this->system_ID() );
-		if( EEM_Question::instance()->question_type_is_in_category(  $this->type(), 'text' ) ) {
-			$input_constructor_args[ 'validation_strategies' ][] = new EE_Max_Length_Validation_Strategy(
+		$max_max_for_question = EEM_Question::instance()->absolute_max_for_system_question($this->system_ID());
+		if (EEM_Question::instance()->question_type_is_in_category($this->type(), 'text')) {
+			$input_constructor_args['validation_strategies'][] = new EE_Max_Length_Validation_Strategy(
 				null,
-				min( $max_max_for_question, $this->max() )
+				min($max_max_for_question, $this->max())
 			);
 		}
 		$input_constructor_args = (array) apply_filters(
@@ -788,22 +788,22 @@ 
 		);
 
 		$result = null;
-		switch ( $this->type() ) {
+		switch ($this->type()) {
 			// Text
 			case EEM_Question::QST_type_text :
-				$result = new EE_Text_Input( $input_constructor_args );
+				$result = new EE_Text_Input($input_constructor_args);
 				break;
 			// Textarea
 			case EEM_Question::QST_type_textarea :
-				$result = new EE_Text_Area_Input( $input_constructor_args );
+				$result = new EE_Text_Area_Input($input_constructor_args);
 				break;
 			// Radio Buttons
 			case EEM_Question::QST_type_radio :
-				$result = new EE_Radio_Button_Input( $this->options(), $input_constructor_args );
+				$result = new EE_Radio_Button_Input($this->options(), $input_constructor_args);
 				break;
 			// Dropdown
 			case EEM_Question::QST_type_dropdown :
-				$result = new EE_Select_Input( $this->options(), $input_constructor_args );
+				$result = new EE_Select_Input($this->options(), $input_constructor_args);
 				break;
 			// State Dropdown
 			case EEM_Question::QST_type_state :
@@ -814,7 +814,7 @@ 
 					$registration,
 					$answer
 				);
-				$result = new EE_State_Select_Input( $state_options, $input_constructor_args );
+				$result = new EE_State_Select_Input($state_options, $input_constructor_args);
 				break;
 			// Country Dropdown
 			case EEM_Question::QST_type_country :
@@ -825,49 +825,49 @@ 
 					$registration,
 					$answer
 				);
-				$result = new EE_Country_Select_Input( $country_options, $input_constructor_args );
+				$result = new EE_Country_Select_Input($country_options, $input_constructor_args);
 				break;
 			// Checkboxes
 			case EEM_Question::QST_type_checkbox :
-				$result = new EE_Checkbox_Multi_Input( $this->options(), $input_constructor_args );
+				$result = new EE_Checkbox_Multi_Input($this->options(), $input_constructor_args);
 				break;
 			// Date
 			case EEM_Question::QST_type_date :
-				$result = new EE_Datepicker_Input( $input_constructor_args );
+				$result = new EE_Datepicker_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_html_textarea :
-				$input_constructor_args[ 'validation_strategies' ][] = new EE_Simple_HTML_Validation_Strategy();
-				$result =  new EE_Text_Area_Input( $input_constructor_args );
-				$result->remove_validation_strategy( 'EE_Plaintext_Validation_Strategy' );
+				$input_constructor_args['validation_strategies'][] = new EE_Simple_HTML_Validation_Strategy();
+				$result = new EE_Text_Area_Input($input_constructor_args);
+				$result->remove_validation_strategy('EE_Plaintext_Validation_Strategy');
 				break;
 			case EEM_Question::QST_type_email :
-				$result = new EE_Email_Input( $input_constructor_args );
+				$result = new EE_Email_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_us_phone :
-				$result = new EE_Phone_Input( $input_constructor_args );
+				$result = new EE_Phone_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_int :
-				$input_constructor_args[ 'validation_strategies' ][] = new EE_Int_Validation_Strategy();
-				$result = new EE_Text_Input( $input_constructor_args );
+				$input_constructor_args['validation_strategies'][] = new EE_Int_Validation_Strategy();
+				$result = new EE_Text_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_decimal :
-				$input_constructor_args[ 'validation_strategies' ][] = new EE_Float_Validation_Strategy();
-				$result = new EE_Text_Input( $input_constructor_args );
+				$input_constructor_args['validation_strategies'][] = new EE_Float_Validation_Strategy();
+				$result = new EE_Text_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_url :
-				$input_constructor_args[ 'validation_strategies' ][] = new EE_URL_Validation_Strategy();
-				$result = new EE_Text_Input( $input_constructor_args );
+				$input_constructor_args['validation_strategies'][] = new EE_URL_Validation_Strategy();
+				$result = new EE_Text_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_year :
 				$result = new EE_Year_Input(
 						$input_constructor_args,
-						apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__four_digit', true, $this ),
-						apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__early_range', 100, $this ),
-						apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__end_range', 100, $this )
+						apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__four_digit', true, $this),
+						apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__early_range', 100, $this),
+						apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__end_range', 100, $this)
 						);
 				break;
 			case EEM_Question::QST_type_multi_select :
-				$result = new EE_Select_Multiple_Input( $this->options(), $input_constructor_args );
+				$result = new EE_Select_Multiple_Input($this->options(), $input_constructor_args);
 				break;
 			// fallback
 			default :
@@ -878,12 +878,12 @@ 
 					$this,
 					$input_constructor_args
 				);
-				if( ! $default_input ){
-					$default_input = new EE_Text_Input( $input_constructor_args );
+				if ( ! $default_input) {
+					$default_input = new EE_Text_Input($input_constructor_args);
 				}
 				$result = $default_input;
 		}
-		return apply_filters( 'FHEE__EE_Question__generate_form_input__return', $result, $registration, $this, $answer );
+		return apply_filters('FHEE__EE_Question__generate_form_input__return', $result, $registration, $this, $answer);
 	}
 
 
@@ -895,7 +895,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function get_form_input_class_name() {
-		switch ( $this->type() ) {
+		switch ($this->type()) {
 			case EEM_Question::QST_type_textarea :
 			case EEM_Question::QST_type_html_textarea :
 				return 'EE_Text_Area_Input';
@@ -935,7 +935,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function required() {
-		return $this->has_validation_strategy( 'required' );
+		return $this->has_validation_strategy('required');
 	}
 
 

Doc Comments +2 added lines, -2 removed lines

@@ -610,7 +610,7 @@ 
 	 * Question, that relationship will be overwritten.
 	 *
 	 * @param EE_Question_Option $option
-	 * @return boolean success
+	 * @return EE_Base_Class success
 	 * @throws \EE_Error
 	 */
 	public function add_option( EE_Question_Option $option ) {
@@ -635,7 +635,7 @@ 
 	 * Marks the option as deleted.
 	 *
 	 * @param EE_Question_Option $option
-	 * @return boolean success
+	 * @return EE_Base_Class success
 	 * @throws \EE_Error
 	 */
 	public function remove_option( EE_Question_Option $option ) {

core/db_models/EEM_Question.model.php

Spacing +94 added lines, -94 removed lines

@@ -1,8 +1,8 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
-require_once( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
-require_once( EE_CLASSES . 'EE_Question.class.php' );
+require_once(EE_MODELS.'EEM_Soft_Delete_Base.model.php');
+require_once(EE_CLASSES.'EE_Question.class.php');
 
 
 
@@ -107,54 +107,54 @@ 
 	 *
 	 * @param null $timezone
 	 */
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Question','event_espresso');
-		$this->plural_item = __('Questions','event_espresso');
-		$this->_allowed_question_types=apply_filters(
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Question', 'event_espresso');
+		$this->plural_item = __('Questions', 'event_espresso');
+		$this->_allowed_question_types = apply_filters(
 			'FHEE__EEM_Question__construct__allowed_question_types',
 			array(
-				EEM_Question::QST_type_text =>__('Text','event_espresso'),
-				EEM_Question::QST_type_textarea =>__('Textarea','event_espresso'),
-				EEM_Question::QST_type_checkbox =>__('Checkboxes','event_espresso'),
-				EEM_Question::QST_type_radio =>__('Radio Buttons','event_espresso'),
-				EEM_Question::QST_type_dropdown =>__('Dropdown','event_espresso'),
-				EEM_Question::QST_type_state =>__('State/Province Dropdown','event_espresso'),
-				EEM_Question::QST_type_country =>__('Country Dropdown','event_espresso'),
-				EEM_Question::QST_type_date =>__('Date Picker','event_espresso'),
-				EEM_Question::QST_type_html_textarea => __( 'HTML Textarea', 'event_espresso' ),
-				EEM_Question::QST_type_email => __( 'Email', 'event_espresso' ),
-				EEM_Question::QST_type_us_phone => __( 'USA - Format Phone', 'event_espresso' ),
-				EEM_Question::QST_type_decimal => __( 'Number', 'event_espresso' ),
-				EEM_Question::QST_type_int => __( 'Whole Number', 'event_espresso' ),
-				EEM_Question::QST_type_url => __( 'URL', 'event_espresso' ),
-				EEM_Question::QST_type_year => __( 'Year', 'event_espresso' ),
-				EEM_Question::QST_type_multi_select => __( 'Multi Select', 'event_espresso' ),
-				EEM_Question::QST_type_ajax_select => __( 'AJAX Select', 'event_espresso' ),
+				EEM_Question::QST_type_text =>__('Text', 'event_espresso'),
+				EEM_Question::QST_type_textarea =>__('Textarea', 'event_espresso'),
+				EEM_Question::QST_type_checkbox =>__('Checkboxes', 'event_espresso'),
+				EEM_Question::QST_type_radio =>__('Radio Buttons', 'event_espresso'),
+				EEM_Question::QST_type_dropdown =>__('Dropdown', 'event_espresso'),
+				EEM_Question::QST_type_state =>__('State/Province Dropdown', 'event_espresso'),
+				EEM_Question::QST_type_country =>__('Country Dropdown', 'event_espresso'),
+				EEM_Question::QST_type_date =>__('Date Picker', 'event_espresso'),
+				EEM_Question::QST_type_html_textarea => __('HTML Textarea', 'event_espresso'),
+				EEM_Question::QST_type_email => __('Email', 'event_espresso'),
+				EEM_Question::QST_type_us_phone => __('USA - Format Phone', 'event_espresso'),
+				EEM_Question::QST_type_decimal => __('Number', 'event_espresso'),
+				EEM_Question::QST_type_int => __('Whole Number', 'event_espresso'),
+				EEM_Question::QST_type_url => __('URL', 'event_espresso'),
+				EEM_Question::QST_type_year => __('Year', 'event_espresso'),
+				EEM_Question::QST_type_multi_select => __('Multi Select', 'event_espresso'),
+				EEM_Question::QST_type_ajax_select => __('AJAX Select', 'event_espresso'),
 			)
 		);
 		$this->_question_descriptions = apply_filters(
 			'FHEE__EEM_Question__construct__allowed_question_types',
 			array(
-				EEM_Question::QST_type_text          => __( 'A single line text input field', 'event_espresso' ),
-				EEM_Question::QST_type_textarea      => __( 'A multi line text input field', 'event_espresso' ),
-				EEM_Question::QST_type_checkbox      => __( 'Allows multiple preset options to be selected', 'event_espresso' ),
-				EEM_Question::QST_type_radio         => __( 'Allows a single preset option to be selected', 'event_espresso' ),
-				EEM_Question::QST_type_dropdown      => __( 'A dropdown that allows a single selection', 'event_espresso' ),
-				EEM_Question::QST_type_state         => __( 'A dropdown that lists states/provinces', 'event_espresso' ),
-				EEM_Question::QST_type_country       => __( 'A dropdown that lists countries', 'event_espresso' ),
-				EEM_Question::QST_type_date          => __( 'A popup calendar that allows date selections', 'event_espresso' ),
-				EEM_Question::QST_type_html_textarea => __( 'A multi line text input field that allows HTML', 'event_espresso' ),
-				EEM_Question::QST_type_email         => __( 'A text field that must contain a valid Email address', 'event_espresso' ),
-				EEM_Question::QST_type_us_phone      => __( 'A text field that must contain a valid US phone number', 'event_espresso' ),
-				EEM_Question::QST_type_decimal       => __( 'A text field that allows number values with decimals', 'event_espresso' ),
-				EEM_Question::QST_type_int           => __( 'A text field that only allows whole numbers (no decimals)', 'event_espresso' ),
-				EEM_Question::QST_type_url           => __( 'A text field that must contain a valid URL', 'event_espresso' ),
-				EEM_Question::QST_type_year          => __( 'A dropdown that lists the last 100 years', 'event_espresso' ),
-				EEM_Question::QST_type_multi_select  => __( 'A dropdown that allows multiple selections', 'event_espresso' ),
-				EEM_Question::QST_type_ajax_select   => __( 'A dropdown that populates it\'s options dynamically via AJAX', 'event_espresso' ),
+				EEM_Question::QST_type_text          => __('A single line text input field', 'event_espresso'),
+				EEM_Question::QST_type_textarea      => __('A multi line text input field', 'event_espresso'),
+				EEM_Question::QST_type_checkbox      => __('Allows multiple preset options to be selected', 'event_espresso'),
+				EEM_Question::QST_type_radio         => __('Allows a single preset option to be selected', 'event_espresso'),
+				EEM_Question::QST_type_dropdown      => __('A dropdown that allows a single selection', 'event_espresso'),
+				EEM_Question::QST_type_state         => __('A dropdown that lists states/provinces', 'event_espresso'),
+				EEM_Question::QST_type_country       => __('A dropdown that lists countries', 'event_espresso'),
+				EEM_Question::QST_type_date          => __('A popup calendar that allows date selections', 'event_espresso'),
+				EEM_Question::QST_type_html_textarea => __('A multi line text input field that allows HTML', 'event_espresso'),
+				EEM_Question::QST_type_email         => __('A text field that must contain a valid Email address', 'event_espresso'),
+				EEM_Question::QST_type_us_phone      => __('A text field that must contain a valid US phone number', 'event_espresso'),
+				EEM_Question::QST_type_decimal       => __('A text field that allows number values with decimals', 'event_espresso'),
+				EEM_Question::QST_type_int           => __('A text field that only allows whole numbers (no decimals)', 'event_espresso'),
+				EEM_Question::QST_type_url           => __('A text field that must contain a valid URL', 'event_espresso'),
+				EEM_Question::QST_type_year          => __('A dropdown that lists the last 100 years', 'event_espresso'),
+				EEM_Question::QST_type_multi_select  => __('A dropdown that allows multiple selections', 'event_espresso'),
+				EEM_Question::QST_type_ajax_select   => __('A dropdown that populates it\'s options dynamically via AJAX', 'event_espresso'),
 			)
 		);
-		$this->_question_type_categories = (array)apply_filters(
+		$this->_question_type_categories = (array) apply_filters(
 			'FHEE__EEM_Question__construct__question_type_categories',
 			array(
 				'text' => array(
@@ -180,33 +180,33 @@ 
 		);
 
 		$this->_tables = array(
-			'Question'=>new EE_Primary_Table('esp_question','QST_ID')
+			'Question'=>new EE_Primary_Table('esp_question', 'QST_ID')
 		);
 		$this->_fields = array(
 			'Question'=>array(
-				'QST_ID'=> new EE_Primary_Key_Int_Field('QST_ID', __('Question ID','event_espresso')),
-				'QSG_ID' => new EE_Foreign_Key_Int_Field('QSG_ID',__( 'Question Group ID', 'event_espresso' ),false,0,'Question_Group'),
-				'QST_admin_label' => new EE_Plain_Text_Field('QST_admin_label',__( 'Question Label (admin-only)', 'event_espresso' ),true,''),
-				'QST_display_text'=> new EE_Post_Content_Field('QST_display_text', __('Question Text','event_espresso'), true, ''),
-				'QST_identifier'=> new EE_Plain_Text_Field('QST_identifier', __('Internal string ID for question','event_espresso'), TRUE, NULL ),
-				'QST_system'=> new EE_Plain_Text_Field('QST_system', __('System Question type ID','event_espresso'), TRUE, NULL ),
-				'QST_type'=> new EE_Enum_Text_Field('QST_type', __('Question Type','event_espresso'),false, 'TEXT',$this->_allowed_question_types),
-				'QST_required'=> new EE_Boolean_Field('QST_required', __('Required Question?','event_espresso'), false, false),
-				'QST_required_text'=> new EE_Simple_HTML_Field('QST_required_text', __('Text to Display if Not Provided','event_espresso'), true, ''),
-				'QST_desc'=> new EE_Full_HTML_Field('QST_desc', __( 'Description of Question', 'event_espresso' ), true, ''),
-				'QST_html_name' => new EE_Plain_Text_Field('QST_html_name',__( 'HTML name property', 'event_espresso' ),true,null),
-				'QST_html_id' => new EE_Plain_Text_Field('QST_html_id',__( 'HTML CSS "id" property', 'event_espresso' ),true,null),
-				'QST_html_class' => new EE_Plain_Text_Field('QST_html_class',__( 'HTML CSS "class" property', 'event_espresso' ),true,null),
-				'QST_html_label_id' => new EE_Plain_Text_Field( 'QST_html_label_id', __( "HTML CSS \"id\" property for the Question's label", 'event_espresso' ), true, null),
-				'QST_html_label_class' => new EE_Plain_Text_Field( 'QST_html_label_class', __( "HTML CSS \"class\" property for the Question's label", 'event_espresso' ), true, null),
-				'QST_default_value' => new EE_Plain_Text_Field( 'QST_default_value', __( 'Default value for input', 'event_espresso' ), true, null),
-				'QST_validation_strategies'=> new EE_Plain_Text_Field('QST_validation_strategies', __('List of validations to be applied to Question.','event_espresso'), false, false),
-				'QST_validation_message'=> new EE_Simple_HTML_Field('QST_validation_message', __('Validation message to be displayed if this question fails to pass a validation check','event_espresso'), true, ''),
-				'QST_order'=> new EE_Integer_Field('QST_order', __('Question Order','event_espresso'), false, 0),
-				'QST_admin_only'=> new EE_Boolean_Field('QST_admin_only', __('Admin-Only Question?','event_espresso'), false, false),
-				'QST_max' => new EE_Infinite_Integer_Field( 'QST_max', __( 'Max Size', 'event_espresso'	), false, EE_INF ),
-				'QST_wp_user'=> new EE_WP_User_Field('QST_wp_user', __('Question Creator ID','event_espresso'), false ),
-				'QST_deleted'=> new EE_Trashed_Flag_Field('QST_deleted', __('Flag Indicating question was deleted','event_espresso'), false, false)
+				'QST_ID'=> new EE_Primary_Key_Int_Field('QST_ID', __('Question ID', 'event_espresso')),
+				'QSG_ID' => new EE_Foreign_Key_Int_Field('QSG_ID', __('Question Group ID', 'event_espresso'), false, 0, 'Question_Group'),
+				'QST_admin_label' => new EE_Plain_Text_Field('QST_admin_label', __('Question Label (admin-only)', 'event_espresso'), true, ''),
+				'QST_display_text'=> new EE_Post_Content_Field('QST_display_text', __('Question Text', 'event_espresso'), true, ''),
+				'QST_identifier'=> new EE_Plain_Text_Field('QST_identifier', __('Internal string ID for question', 'event_espresso'), TRUE, NULL),
+				'QST_system'=> new EE_Plain_Text_Field('QST_system', __('System Question type ID', 'event_espresso'), TRUE, NULL),
+				'QST_type'=> new EE_Enum_Text_Field('QST_type', __('Question Type', 'event_espresso'), false, 'TEXT', $this->_allowed_question_types),
+				'QST_required'=> new EE_Boolean_Field('QST_required', __('Required Question?', 'event_espresso'), false, false),
+				'QST_required_text'=> new EE_Simple_HTML_Field('QST_required_text', __('Text to Display if Not Provided', 'event_espresso'), true, ''),
+				'QST_desc'=> new EE_Full_HTML_Field('QST_desc', __('Description of Question', 'event_espresso'), true, ''),
+				'QST_html_name' => new EE_Plain_Text_Field('QST_html_name', __('HTML name property', 'event_espresso'), true, null),
+				'QST_html_id' => new EE_Plain_Text_Field('QST_html_id', __('HTML CSS "id" property', 'event_espresso'), true, null),
+				'QST_html_class' => new EE_Plain_Text_Field('QST_html_class', __('HTML CSS "class" property', 'event_espresso'), true, null),
+				'QST_html_label_id' => new EE_Plain_Text_Field('QST_html_label_id', __("HTML CSS \"id\" property for the Question's label", 'event_espresso'), true, null),
+				'QST_html_label_class' => new EE_Plain_Text_Field('QST_html_label_class', __("HTML CSS \"class\" property for the Question's label", 'event_espresso'), true, null),
+				'QST_default_value' => new EE_Plain_Text_Field('QST_default_value', __('Default value for input', 'event_espresso'), true, null),
+				'QST_validation_strategies'=> new EE_Plain_Text_Field('QST_validation_strategies', __('List of validations to be applied to Question.', 'event_espresso'), false, false),
+				'QST_validation_message'=> new EE_Simple_HTML_Field('QST_validation_message', __('Validation message to be displayed if this question fails to pass a validation check', 'event_espresso'), true, ''),
+				'QST_order'=> new EE_Integer_Field('QST_order', __('Question Order', 'event_espresso'), false, 0),
+				'QST_admin_only'=> new EE_Boolean_Field('QST_admin_only', __('Admin-Only Question?', 'event_espresso'), false, false),
+				'QST_max' => new EE_Infinite_Integer_Field('QST_max', __('Max Size', 'event_espresso'), false, EE_INF),
+				'QST_wp_user'=> new EE_WP_User_Field('QST_wp_user', __('Question Creator ID', 'event_espresso'), false),
+				'QST_deleted'=> new EE_Trashed_Flag_Field('QST_deleted', __('Flag Indicating question was deleted', 'event_espresso'), false, false)
 			)
 		);
 
@@ -218,11 +218,11 @@ 
 			'Question_Group_Question' => new EE_Has_Many_Relation(),
 		);
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('QST_system');
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('QST_system');
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('QST_system');
-		parent::__construct( $timezone );
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Reg_Form('QST_system');
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Reg_Form('QST_system');
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Reg_Form('QST_system');
+		parent::__construct($timezone);
 	}
 
 	/**
@@ -230,7 +230,7 @@ 
 	 * but they can be extended
 	 * @return string[]
 	 */
-	public function allowed_question_types(){
+	public function allowed_question_types() {
 		return $this->_allowed_question_types;
 	}
 	/**
@@ -238,16 +238,16 @@ 
 	 * @param string $question_type one of EEM_Question::allowed_question_types(
 	 * @return string[] like EEM_Question::allowed_question_types()
 	 */
-	public function question_types_in_same_category( $question_type ) {
-		$question_types = array( $question_type );
-		foreach( $this->_question_type_categories as $category => $question_types_in_category ) {
-			if( in_array( $question_type, $question_types_in_category ) ) {
+	public function question_types_in_same_category($question_type) {
+		$question_types = array($question_type);
+		foreach ($this->_question_type_categories as $category => $question_types_in_category) {
+			if (in_array($question_type, $question_types_in_category)) {
 				$question_types = $question_types_in_category;
 				break;
 			}
 		}
 
-		return array_intersect_key( $this->allowed_question_types(), array_flip( $question_types ) );
+		return array_intersect_key($this->allowed_question_types(), array_flip($question_types));
 	}
 
 	/**
@@ -256,11 +256,11 @@ 
 	 * @param string $category one of the top-level keys of EEM_Question::question_type_categories()
 	 * @return boolean
 	 */
-	public function question_type_is_in_category( $question_type, $category ) {
-		if( ! isset( $this->_question_type_categories[ $category ] ) ) {
+	public function question_type_is_in_category($question_type, $category) {
+		if ( ! isset($this->_question_type_categories[$category])) {
 			return false;
 		}
-		return in_array( $question_type, $this->_question_type_categories[ $category ] );
+		return in_array($question_type, $this->_question_type_categories[$category]);
 	}
 
 	/**
@@ -277,9 +277,9 @@ 
 	 * @param string $system_question_group_id QSG_system
 	 * @return array of system question names (QST_system)
 	 */
-	public function allowed_system_questions_in_system_question_group( $system_question_group_id ) {
+	public function allowed_system_questions_in_system_question_group($system_question_group_id) {
 		$question_system_ids = array();
-		switch( $system_question_group_id ) {
+		switch ($system_question_group_id) {
 			case EEM_Question_Group::system_personal:
 				$question_system_ids = array(
 					EEM_Attendee::system_question_fname,
@@ -300,7 +300,7 @@ 
 				);
 				break;
 		}
-		return apply_filters( 'FHEE__EEM_Question__system_questions_allowed_in_system_question_group__return', $question_system_ids, $system_question_group_id );
+		return apply_filters('FHEE__EEM_Question__system_questions_allowed_in_system_question_group__return', $question_system_ids, $system_question_group_id);
 	}
 
 	/**
@@ -309,11 +309,11 @@ 
 	 * @param string $system_question_group_id QSG_system
 	 * @return array of system question names (QST_system)
 	 */
-	public function required_system_questions_in_system_question_group( $system_question_group_id ) {
+	public function required_system_questions_in_system_question_group($system_question_group_id) {
 		$question_system_ids = null;
-		switch( $system_question_group_id ) {
+		switch ($system_question_group_id) {
 			case EEM_Question_Group::system_personal:
-				$question_system_ids =  array(
+				$question_system_ids = array(
 					EEM_Attendee::system_question_fname,
 					EEM_Attendee::system_question_email,
 				);
@@ -321,7 +321,7 @@ 
 			default:
 				$question_system_ids = array();
 		}
-		return apply_filters( 'FHEE__EEM_Question__system_questions_required_in_system_question_group', $question_system_ids, $system_question_group_id );
+		return apply_filters('FHEE__EEM_Question__system_questions_required_in_system_question_group', $question_system_ids, $system_question_group_id);
 	}
 
 
@@ -334,8 +334,8 @@ 
 	 * @return int of QST_ID for the question that corresponds to that QST_system
 	 * @throws \EE_Error
 	 */
-	public function get_Question_ID_from_system_string( $QST_system ){
-		 return $this->get_var( array( array( 'QST_system' => $QST_system ) ) );
+	public function get_Question_ID_from_system_string($QST_system) {
+		 return $this->get_var(array(array('QST_system' => $QST_system)));
 	}
 
 
@@ -349,10 +349,10 @@ 
 	 */
 	public function get_latest_question_order() {
 		$columns_to_select = array(
-			'max_order' => array("MAX(QST_order)","%d")
+			'max_order' => array("MAX(QST_order)", "%d")
 		);
-		$max = (array) $this->_get_all_wpdb_results( array(), ARRAY_A, $columns_to_select );
-		return isset( $max[0], $max[0]['max_order'] ) ? $max[0]['max_order'] : 0;
+		$max = (array) $this->_get_all_wpdb_results(array(), ARRAY_A, $columns_to_select);
+		return isset($max[0], $max[0]['max_order']) ? $max[0]['max_order'] : 0;
 	}
 
 	/**
@@ -381,10 +381,10 @@ 
 	 * @param string $system_question_value
 	 * @return int|float
 	 */
-	public function absolute_max_for_system_question( $system_question_value ) {
+	public function absolute_max_for_system_question($system_question_value) {
 		$maxes = $this->system_question_maxes();
-		if( isset( $maxes[ $system_question_value ] ) ) {
-			return $maxes[ $system_question_value ];
+		if (isset($maxes[$system_question_value])) {
+			return $maxes[$system_question_value];
 		} else {
 			return EE_INF;
 		}

Doc Comments +1 added lines, -1 removed lines

@@ -331,7 +331,7 @@
 	 * which system question QST_ID corresponds to the QST_system 'city', use EEM_Question::instance()->get_Question_ID_from_system_string('city');
 	 *
 	 * @param $QST_system
-	 * @return int of QST_ID for the question that corresponds to that QST_system
+	 * @return string of QST_ID for the question that corresponds to that QST_system
 	 * @throws \EE_Error
 	 */
 	public function get_Question_ID_from_system_string( $QST_system ){

core/db_models/EEM_Question_Group.model.php

Spacing +26 added lines, -26 removed lines

@@ -1,6 +1,6 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-require_once( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
-require_once( EE_CLASSES . 'EE_Question_Group.class.php' );
+require_once(EE_MODELS.'EEM_Soft_Delete_Base.model.php');
+require_once(EE_CLASSES.'EE_Question_Group.class.php');
 
 
 
@@ -26,30 +26,30 @@ 
 	/**
 	 * @param null $timezone
 	 */
-	protected function __construct( $timezone = NULL ) {
+	protected function __construct($timezone = NULL) {
 
-		$this->singular_item = __('Question Group','event_espresso');
-		$this->plural_item = __('Question Groups','event_espresso');
+		$this->singular_item = __('Question Group', 'event_espresso');
+		$this->plural_item = __('Question Groups', 'event_espresso');
 
 		$this->_tables = array(
-			'Question_Group'=>new EE_Primary_Table('esp_question_group','QSG_ID')
+			'Question_Group'=>new EE_Primary_Table('esp_question_group', 'QSG_ID')
 		);
 
 		$this->_fields = array(
 			'Question_Group'=>array(
-				'QSG_ID'=>new EE_Primary_Key_Int_Field('QSG_ID', __('Question Group ID','event_espresso')),
-				'QSG_name'=>new EE_Plain_Text_Field('QSG_name', __('Question Group Name','event_espresso'), false, ''),
-				'QSG_identifier'=>new EE_Plain_Text_Field('QSG_identifier', __('Text ID for question Group','event_espresso'), false, ''),
-				'QSG_desc'=>new EE_Post_Content_Field('QSG_desc', __('Description of Question Group','event_espresso'), true, ''),
-				'QSG_parent' => new EE_Integer_Field('QSG_parent',__('The Question Group that this is a child of.','event_espresso'),true,null),
-				'QSG_html_name' => new EE_Plain_Text_Field('QSG_html_name',__('Form Section Name','event_espresso'),true,null),
-				'QSG_html_id' => new EE_Plain_Text_Field('QSG_html_id',__('HTML CSS id for question Group','event_espresso'),true,null),
-				'QSG_html_class' => new EE_Plain_Text_Field('QSG_html_class',__('HTML CSS class for question Group','event_espresso'),true,null),
-				'QSG_html_content' => new EE_Plain_Text_Field('QSG_html_content',__('Actual content if this is an HTML Form Section','event_espresso'),true,null),
-				'QSG_order'=>new EE_Integer_Field('QSG_order', __('Order in which to show the question group','event_espresso'), true, 0),
-				'QSG_wp_user' => new EE_WP_User_Field('QSG_wp_user', __('Question Group Creator ID', 'event_espresso'), FALSE ),
-				'QSG_system'=>new EE_Integer_Field('QSG_system', __('Indicate IF this is a system group and if it is what system group it corresponds to.','event_espresso'), false, 0),
-				'QSG_deleted'=>new EE_Trashed_Flag_Field('QSG_deleted', __('Flag indicating this question group was deleted','event_espresso'), false, false)
+				'QSG_ID'=>new EE_Primary_Key_Int_Field('QSG_ID', __('Question Group ID', 'event_espresso')),
+				'QSG_name'=>new EE_Plain_Text_Field('QSG_name', __('Question Group Name', 'event_espresso'), false, ''),
+				'QSG_identifier'=>new EE_Plain_Text_Field('QSG_identifier', __('Text ID for question Group', 'event_espresso'), false, ''),
+				'QSG_desc'=>new EE_Post_Content_Field('QSG_desc', __('Description of Question Group', 'event_espresso'), true, ''),
+				'QSG_parent' => new EE_Integer_Field('QSG_parent', __('The Question Group that this is a child of.', 'event_espresso'), true, null),
+				'QSG_html_name' => new EE_Plain_Text_Field('QSG_html_name', __('Form Section Name', 'event_espresso'), true, null),
+				'QSG_html_id' => new EE_Plain_Text_Field('QSG_html_id', __('HTML CSS id for question Group', 'event_espresso'), true, null),
+				'QSG_html_class' => new EE_Plain_Text_Field('QSG_html_class', __('HTML CSS class for question Group', 'event_espresso'), true, null),
+				'QSG_html_content' => new EE_Plain_Text_Field('QSG_html_content', __('Actual content if this is an HTML Form Section', 'event_espresso'), true, null),
+				'QSG_order'=>new EE_Integer_Field('QSG_order', __('Order in which to show the question group', 'event_espresso'), true, 0),
+				'QSG_wp_user' => new EE_WP_User_Field('QSG_wp_user', __('Question Group Creator ID', 'event_espresso'), FALSE),
+				'QSG_system'=>new EE_Integer_Field('QSG_system', __('Indicate IF this is a system group and if it is what system group it corresponds to.', 'event_espresso'), false, 0),
+				'QSG_deleted'=>new EE_Trashed_Flag_Field('QSG_deleted', __('Flag indicating this question group was deleted', 'event_espresso'), false, false)
 			)
 		);
 
@@ -61,11 +61,11 @@ 
 		);
 
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('QSG_system');
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('QSG_system');
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('QSG_system');
-		parent::__construct( $timezone );
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Reg_Form('QSG_system');
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Reg_Form('QSG_system');
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Reg_Form('QSG_system');
+		parent::__construct($timezone);
 
 	}
 
@@ -83,10 +83,10 @@ 
 			array(),
 			ARRAY_A,
 			array(
-				'max_order' => array( "MAX(QSG_order)", "%d" ),
+				'max_order' => array("MAX(QSG_order)", "%d"),
 			)
 		);
-		return is_array( $max ) && isset( $max[0], $max[0]['max_order'] ) ? $max[0]['max_order'] : 0;
+		return is_array($max) && isset($max[0], $max[0]['max_order']) ? $max[0]['max_order'] : 0;
 	}
 
 

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 require_once( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
 require_once( EE_CLASSES . 'EE_Question_Group.class.php' );
 

core/helpers/EEH_Activation.helper.php

Spacing +390 added lines, -390 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed');}
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed'); }
 /**
  * EEH_Activation Helper
  *
@@ -48,9 +48,9 @@ 
 	 * @param $table_name
 	 * @return string
 	 */
-	public static function ensure_table_name_has_prefix( $table_name ) {
+	public static function ensure_table_name_has_prefix($table_name) {
 		global $wpdb;
-		return strpos( $table_name, $wpdb->base_prefix ) === 0 ? $table_name : $wpdb->prefix . $table_name;
+		return strpos($table_name, $wpdb->base_prefix) === 0 ? $table_name : $wpdb->prefix.$table_name;
 	}
 
 
@@ -78,7 +78,7 @@ 
 	 * @return boolean success, whether the database and folders are setup properly
 	 * @throws \EE_Error
 	 */
-	public static function initialize_db_and_folders(){
+	public static function initialize_db_and_folders() {
 		$good_filesystem = EEH_Activation::create_upload_directories();
 		$good_db = EEH_Activation::create_database_tables();
 		return $good_filesystem && $good_db;
@@ -94,9 +94,9 @@ 
 	 *
 	 * @throws \EE_Error
 	 */
-	public static function initialize_db_content(){
+	public static function initialize_db_content() {
 		//let's avoid doing all this logic repeatedly, especially when addons are requesting it
-		if( EEH_Activation::$_initialized_db_content_already_in_this_request ) {
+		if (EEH_Activation::$_initialized_db_content_already_in_this_request) {
 			return;
 		}
 		EEH_Activation::$_initialized_db_content_already_in_this_request = true;
@@ -113,9 +113,9 @@ 
 		EEH_Activation::remove_cron_tasks();
 		EEH_Activation::create_cron_tasks();
 		// remove all TXN locks since that is being done via extra meta now
-		delete_option( 'ee_locked_transactions' );
+		delete_option('ee_locked_transactions');
 		//also, check for CAF default db content
-		do_action( 'AHEE__EEH_Activation__initialize_db_content' );
+		do_action('AHEE__EEH_Activation__initialize_db_content');
 		//also: EEM_Gateways::load_all_gateways() outputs a lot of success messages
 		//which users really won't care about on initial activation
 		EE_Error::overwrite_success();
@@ -135,7 +135,7 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	public static function get_cron_tasks( $which_to_include ) {
+	public static function get_cron_tasks($which_to_include) {
 		$cron_tasks = apply_filters(
 			'FHEE__EEH_Activation__get_cron_tasks',
 			array(
@@ -144,16 +144,16 @@ 
 				'AHEE__EE_Cron_Tasks__update_transaction_with_payment' => EEH_Activation::cron_task_no_longer_in_use, //there may have been a bug which prevented from these cron tasks from getting unscheduled, so we might want to remove these for a few updates
 			)
 		);
-		if ( $which_to_include === 'old' ) {
+		if ($which_to_include === 'old') {
 			$cron_tasks = array_filter(
 				$cron_tasks,
-				function ( $value ) {
+				function($value) {
 					return $value === EEH_Activation::cron_task_no_longer_in_use;
 				}
 			);
-		} elseif ( $which_to_include === 'current' ) {
-			$cron_tasks = array_filter( $cron_tasks );
-		} elseif ( WP_DEBUG && $which_to_include !== 'all' ) {
+		} elseif ($which_to_include === 'current') {
+			$cron_tasks = array_filter($cron_tasks);
+		} elseif (WP_DEBUG && $which_to_include !== 'all') {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -176,9 +176,9 @@ 
 	 */
 	public static function create_cron_tasks() {
 
-		foreach( EEH_Activation::get_cron_tasks( 'current' ) as $hook_name => $frequency ) {
-			if( ! wp_next_scheduled( $hook_name ) ) {
-				wp_schedule_event( time(), $frequency, $hook_name );
+		foreach (EEH_Activation::get_cron_tasks('current') as $hook_name => $frequency) {
+			if ( ! wp_next_scheduled($hook_name)) {
+				wp_schedule_event(time(), $frequency, $hook_name);
 			}
 		}
 
@@ -192,10 +192,10 @@ 
 	 * @param boolean $remove_all whether to only remove the old ones, or remove absolutely ALL the EE ones
 	 * @throws \EE_Error
 	 */
-	public static function remove_cron_tasks( $remove_all = true ) {
+	public static function remove_cron_tasks($remove_all = true) {
 		$cron_tasks_to_remove = $remove_all ? 'all' : 'old';
 		$crons = _get_cron_array();
-		$crons = is_array( $crons ) ? $crons : array();
+		$crons = is_array($crons) ? $crons : array();
 		/* reminder of what $crons look like:
 		 * Top-level keys are timestamps, and their values are arrays.
 		 * The 2nd level arrays have keys with each of the cron task hook names to run at that time
@@ -213,23 +213,23 @@ 
 		 *					...
 		 *      ...
 		 */
-		$ee_cron_tasks_to_remove = EEH_Activation::get_cron_tasks( $cron_tasks_to_remove );
-		foreach ( (array) $crons as $timestamp => $hooks_to_fire_at_time ) {
-			if ( is_array( $hooks_to_fire_at_time ) ) {
-				foreach ( (array) $hooks_to_fire_at_time as $hook_name => $hook_actions ) {
-					if ( isset( $ee_cron_tasks_to_remove[ $hook_name ] )
-					     && is_array( $ee_cron_tasks_to_remove[ $hook_name ] )
+		$ee_cron_tasks_to_remove = EEH_Activation::get_cron_tasks($cron_tasks_to_remove);
+		foreach ((array) $crons as $timestamp => $hooks_to_fire_at_time) {
+			if (is_array($hooks_to_fire_at_time)) {
+				foreach ((array) $hooks_to_fire_at_time as $hook_name => $hook_actions) {
+					if (isset($ee_cron_tasks_to_remove[$hook_name])
+					     && is_array($ee_cron_tasks_to_remove[$hook_name])
 					) {
-						unset( $crons[ $timestamp ][ $hook_name ] );
+						unset($crons[$timestamp][$hook_name]);
 					}
 				}
 				//also take care of any empty cron timestamps.
-				if ( empty( $hooks_to_fire_at_time ) ) {
-					unset( $crons[ $timestamp ] );
+				if (empty($hooks_to_fire_at_time)) {
+					unset($crons[$timestamp]);
 				}
 			}
 		}
-		_set_cron_array( $crons );
+		_set_cron_array($crons);
 	}
 
 
@@ -244,7 +244,7 @@ 
 	 */
 	public static function CPT_initialization() {
 		// register Custom Post Types
-		EE_Registry::instance()->load_core( 'Register_CPTs' );
+		EE_Registry::instance()->load_core('Register_CPTs');
 		flush_rewrite_rules();
 	}
 
@@ -262,8 +262,8 @@ 
 	 * 	@return void
 	 */
 	public static function reset_and_update_config() {
-		do_action( 'AHEE__EE_Config___load_core_config__start', array( 'EEH_Activation', 'load_calendar_config' ) );
-		add_filter( 'FHEE__EE_Config___load_core_config__config_settings', array( 'EEH_Activation', 'migrate_old_config_data' ), 10, 3 );
+		do_action('AHEE__EE_Config___load_core_config__start', array('EEH_Activation', 'load_calendar_config'));
+		add_filter('FHEE__EE_Config___load_core_config__config_settings', array('EEH_Activation', 'migrate_old_config_data'), 10, 3);
 		//EE_Config::reset();
 	}
 
@@ -276,28 +276,28 @@ 
 	 */
 	public static function load_calendar_config() {
 		// grab array of all plugin folders and loop thru it
-		$plugins = glob( WP_PLUGIN_DIR . DS . '*', GLOB_ONLYDIR );
-		if ( empty( $plugins ) ) {
+		$plugins = glob(WP_PLUGIN_DIR.DS.'*', GLOB_ONLYDIR);
+		if (empty($plugins)) {
 			return;
 		}
-		foreach ( $plugins as $plugin_path ) {
+		foreach ($plugins as $plugin_path) {
 			// grab plugin folder name from path
-			$plugin = basename( $plugin_path );
+			$plugin = basename($plugin_path);
 			// drill down to Espresso plugins
 			// then to calendar related plugins
 			if (
-				strpos( $plugin, 'espresso' ) !== FALSE
-				|| strpos( $plugin, 'Espresso' ) !== FALSE
-				|| strpos( $plugin, 'ee4' ) !== FALSE
-				|| strpos( $plugin, 'EE4' ) !== FALSE
-				|| strpos( $plugin, 'calendar' ) !== false
+				strpos($plugin, 'espresso') !== FALSE
+				|| strpos($plugin, 'Espresso') !== FALSE
+				|| strpos($plugin, 'ee4') !== FALSE
+				|| strpos($plugin, 'EE4') !== FALSE
+				|| strpos($plugin, 'calendar') !== false
 			) {
 				// this is what we are looking for
-				$calendar_config = $plugin_path . DS . 'EE_Calendar_Config.php';
+				$calendar_config = $plugin_path.DS.'EE_Calendar_Config.php';
 				// does it exist in this folder ?
-				if ( is_readable( $calendar_config )) {
+				if (is_readable($calendar_config)) {
 					// YEAH! let's load it
-					require_once( $calendar_config );
+					require_once($calendar_config);
 				}
 			}
 		}
@@ -313,21 +313,21 @@ 
 	 * @param \EE_Config     $EE_Config
 	 * @return \stdClass
 	 */
-	public static function migrate_old_config_data( $settings = array(), $config = '', EE_Config $EE_Config ) {
-		$convert_from_array = array( 'addons' );
+	public static function migrate_old_config_data($settings = array(), $config = '', EE_Config $EE_Config) {
+		$convert_from_array = array('addons');
 		// in case old settings were saved as an array
-		if ( is_array( $settings ) && in_array( $config, $convert_from_array )) {
+		if (is_array($settings) && in_array($config, $convert_from_array)) {
 			// convert existing settings to an object
 			$config_array = $settings;
 			$settings = new stdClass();
-			foreach ( (array) $config_array as $key => $value ){
-				if ( $key === 'calendar' && class_exists( 'EE_Calendar_Config' )) {
-					$EE_Config->set_config( 'addons', 'EE_Calendar', 'EE_Calendar_Config', $value );
+			foreach ((array) $config_array as $key => $value) {
+				if ($key === 'calendar' && class_exists('EE_Calendar_Config')) {
+					$EE_Config->set_config('addons', 'EE_Calendar', 'EE_Calendar_Config', $value);
 				} else {
 					$settings->{$key} = $value;
 				}
 			}
-			add_filter( 'FHEE__EE_Config___load_core_config__update_espresso_config', '__return_true' );
+			add_filter('FHEE__EE_Config___load_core_config__update_espresso_config', '__return_true');
 		}
 		return $settings;
 	}
@@ -343,8 +343,8 @@ 
 	 */
 	public static function deactivate_event_espresso() {
 		// check permissions
-		if ( current_user_can( 'activate_plugins' )) {
-			deactivate_plugins( EE_PLUGIN_BASENAME, TRUE );
+		if (current_user_can('activate_plugins')) {
+			deactivate_plugins(EE_PLUGIN_BASENAME, TRUE);
 		}
 	}
 
@@ -366,25 +366,25 @@ 
 		$critical_pages = array(
 			array(
 				'id' =>'reg_page_id',
-				'name' => __( 'Registration Checkout', 'event_espresso' ),
+				'name' => __('Registration Checkout', 'event_espresso'),
 				'post' => NULL,
 				'code' => 'ESPRESSO_CHECKOUT'
 			),
 			array(
 				'id' => 'txn_page_id',
-				'name' => __( 'Transactions', 'event_espresso' ),
+				'name' => __('Transactions', 'event_espresso'),
 				'post' => NULL,
 				'code' => 'ESPRESSO_TXN_PAGE'
 			),
 			array(
 				'id' => 'thank_you_page_id',
-				'name' => __( 'Thank You', 'event_espresso' ),
+				'name' => __('Thank You', 'event_espresso'),
 				'post' => NULL,
 				'code' => 'ESPRESSO_THANK_YOU'
 			),
 			array(
 				'id' => 'cancel_page_id',
-				'name' => __( 'Registration Cancelled', 'event_espresso' ),
+				'name' => __('Registration Cancelled', 'event_espresso'),
 				'post' => NULL,
 				'code' => 'ESPRESSO_CANCELLED'
 			),
@@ -392,62 +392,62 @@ 
 
 		$EE_Core_Config = EE_Registry::instance()->CFG->core;
 
-		foreach ( $critical_pages as $critical_page ) {
+		foreach ($critical_pages as $critical_page) {
 			// is critical page ID set in config ?
-			if ( $EE_Core_Config->{$critical_page[ 'id' ]} !== FALSE ) {
+			if ($EE_Core_Config->{$critical_page['id']} !== FALSE) {
 				// attempt to find post by ID
-				$critical_page['post'] = get_post( $EE_Core_Config->{$critical_page[ 'id' ]} );
+				$critical_page['post'] = get_post($EE_Core_Config->{$critical_page['id']} );
 			}
 			// no dice?
-			if ( $critical_page['post'] === null ) {
+			if ($critical_page['post'] === null) {
 				// attempt to find post by title
-				$critical_page['post'] = self::get_page_by_ee_shortcode( $critical_page['code'] );
+				$critical_page['post'] = self::get_page_by_ee_shortcode($critical_page['code']);
 				// still nothing?
-				if ( $critical_page['post'] === null ) {
-					$critical_page = EEH_Activation::create_critical_page( $critical_page );
+				if ($critical_page['post'] === null) {
+					$critical_page = EEH_Activation::create_critical_page($critical_page);
 					// REALLY? Still nothing ??!?!?
-					if ( $critical_page['post'] === null ) {
-						$msg = __( 'The Event Espresso critical page configuration settings could not be updated.', 'event_espresso' );
-						EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					if ($critical_page['post'] === null) {
+						$msg = __('The Event Espresso critical page configuration settings could not be updated.', 'event_espresso');
+						EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 						break;
 					}
 				}
 			}
 			// track post_shortcodes
-			if ( $critical_page['post'] ) {
-				EEH_Activation::_track_critical_page_post_shortcodes( $critical_page );
+			if ($critical_page['post']) {
+				EEH_Activation::_track_critical_page_post_shortcodes($critical_page);
 			}
 			// check that Post ID matches critical page ID in config
 			if (
-				isset( $critical_page['post']->ID )
-				&& $critical_page['post']->ID !== $EE_Core_Config->{$critical_page[ 'id' ]}
+				isset($critical_page['post']->ID)
+				&& $critical_page['post']->ID !== $EE_Core_Config->{$critical_page['id']}
 			) {
 				//update Config with post ID
-				$EE_Core_Config->{$critical_page[ 'id' ]} = $critical_page['post']->ID;
-				if ( ! EE_Config::instance()->update_espresso_config( FALSE, FALSE ) ) {
-					$msg = __( 'The Event Espresso critical page configuration settings could not be updated.', 'event_espresso' );
-					EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+				$EE_Core_Config->{$critical_page['id']} = $critical_page['post']->ID;
+				if ( ! EE_Config::instance()->update_espresso_config(FALSE, FALSE)) {
+					$msg = __('The Event Espresso critical page configuration settings could not be updated.', 'event_espresso');
+					EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 				}
 			}
 
 			$critical_page_problem =
-				! isset( $critical_page['post']->post_status )
+				! isset($critical_page['post']->post_status)
 				|| $critical_page['post']->post_status !== 'publish'
-				|| strpos( $critical_page['post']->post_content, $critical_page['code'] ) === FALSE
+				|| strpos($critical_page['post']->post_content, $critical_page['code']) === FALSE
 					? TRUE
 					: $critical_page_problem;
 
 		}
 
-		if ( $critical_page_problem ) {
+		if ($critical_page_problem) {
 			$msg = sprintf(
-				__('A potential issue has been detected with one or more of your Event Espresso pages. Go to %s to view your Event Espresso pages.', 'event_espresso' ),
-				'<a href="' . admin_url('admin.php?page=espresso_general_settings&action=critical_pages') . '">' . __('Event Espresso Critical Pages Settings', 'event_espresso') . '</a>'
+				__('A potential issue has been detected with one or more of your Event Espresso pages. Go to %s to view your Event Espresso pages.', 'event_espresso'),
+				'<a href="'.admin_url('admin.php?page=espresso_general_settings&action=critical_pages').'">'.__('Event Espresso Critical Pages Settings', 'event_espresso').'</a>'
 			);
-			EE_Error::add_persistent_admin_notice( 'critical_page_problem', $msg );
+			EE_Error::add_persistent_admin_notice('critical_page_problem', $msg);
 		}
-		if ( EE_Error::has_notices() ) {
-			EE_Error::get_notices( FALSE, TRUE, TRUE );
+		if (EE_Error::has_notices()) {
+			EE_Error::get_notices(FALSE, TRUE, TRUE);
 		}
 	}
 
@@ -459,13 +459,13 @@ 
 	 * parameter to the shortcode
 	 * @return WP_Post or NULl
 	 */
-	public static function get_page_by_ee_shortcode($ee_shortcode){
+	public static function get_page_by_ee_shortcode($ee_shortcode) {
 		global $wpdb;
 		$shortcode_and_opening_bracket = '['.$ee_shortcode;
 		$post_id = $wpdb->get_var("SELECT ID FROM {$wpdb->posts} WHERE post_content LIKE '%$shortcode_and_opening_bracket%' LIMIT 1");
-		if($post_id){
+		if ($post_id) {
 			return get_post($post_id);
-		}else{
+		} else {
 			return NULL;
 		}
 
@@ -482,32 +482,32 @@ 
 	 * @param array $critical_page
 	 * @return array
 	 */
-	public static function create_critical_page( $critical_page ) {
+	public static function create_critical_page($critical_page) {
 
 		$post_args = array(
 			'post_title' => $critical_page['name'],
 			'post_status' => 'publish',
 			'post_type' => 'page',
 			'comment_status' => 'closed',
-			'post_content' => '[' . $critical_page['code'] . ']'
+			'post_content' => '['.$critical_page['code'].']'
 		);
 
-		$post_id = wp_insert_post( $post_args );
-		if ( ! $post_id ) {
+		$post_id = wp_insert_post($post_args);
+		if ( ! $post_id) {
 			$msg = sprintf(
-				__( 'The Event Espresso  critical page entitled "%s" could not be created.', 'event_espresso' ),
+				__('The Event Espresso  critical page entitled "%s" could not be created.', 'event_espresso'),
 				$critical_page['name']
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return $critical_page;
 		}
 		// get newly created post's details
-		if ( ! $critical_page['post'] = get_post( $post_id )) {
+		if ( ! $critical_page['post'] = get_post($post_id)) {
 			$msg = sprintf(
-				__( 'The Event Espresso critical page entitled "%s" could not be retrieved.', 'event_espresso' ),
+				__('The Event Espresso critical page entitled "%s" could not be retrieved.', 'event_espresso'),
 				$critical_page['name']
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 
 		return $critical_page;
@@ -526,35 +526,35 @@ 
 	 * @param array $critical_page
 	 * @return void
 	 */
-	private static function _track_critical_page_post_shortcodes( $critical_page = array() ) {
+	private static function _track_critical_page_post_shortcodes($critical_page = array()) {
 		// check the goods
-		if ( ! $critical_page['post'] instanceof WP_Post ) {
+		if ( ! $critical_page['post'] instanceof WP_Post) {
 			$msg = sprintf(
-				__( 'The Event Espresso critical page shortcode for the page %s can not be tracked because it is not a WP_Post object.', 'event_espresso' ),
+				__('The Event Espresso critical page shortcode for the page %s can not be tracked because it is not a WP_Post object.', 'event_espresso'),
 				$critical_page['name']
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
 		$EE_Core_Config = EE_Registry::instance()->CFG->core;
 		// map shortcode to post
-		$EE_Core_Config->post_shortcodes[ $critical_page['post']->post_name ][ $critical_page['code'] ] = $critical_page['post']->ID;
+		$EE_Core_Config->post_shortcodes[$critical_page['post']->post_name][$critical_page['code']] = $critical_page['post']->ID;
 		// and make sure it's NOT added to the WP "Posts Page"
 		// name of the WP Posts Page
 		$posts_page = EE_Config::get_page_for_posts();
-		if ( isset( $EE_Core_Config->post_shortcodes[ $posts_page ] )) {
-			unset( $EE_Core_Config->post_shortcodes[ $posts_page ][ $critical_page['code'] ] );
+		if (isset($EE_Core_Config->post_shortcodes[$posts_page])) {
+			unset($EE_Core_Config->post_shortcodes[$posts_page][$critical_page['code']]);
 		}
-		if ( $posts_page !== 'posts' && isset( $EE_Core_Config->post_shortcodes['posts'] )) {
-			unset( $EE_Core_Config->post_shortcodes['posts'][ $critical_page['code'] ] );
+		if ($posts_page !== 'posts' && isset($EE_Core_Config->post_shortcodes['posts'])) {
+			unset($EE_Core_Config->post_shortcodes['posts'][$critical_page['code']]);
 		}
 		// update post_shortcode CFG
-		if ( ! EE_Config::instance()->update_espresso_config( FALSE, FALSE )) {
+		if ( ! EE_Config::instance()->update_espresso_config(FALSE, FALSE)) {
 			$msg = sprintf(
-				__( 'The Event Espresso critical page shortcode for the %s page could not be configured properly.', 'event_espresso' ),
+				__('The Event Espresso critical page shortcode for the %s page could not be configured properly.', 'event_espresso'),
 				$critical_page['name']
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -572,24 +572,24 @@ 
 	public static function get_default_creator_id() {
 		global $wpdb;
 
-		if ( ! empty( self::$_default_creator_id ) ) {
+		if ( ! empty(self::$_default_creator_id)) {
 			return self::$_default_creator_id;
 		}/**/
 
-		$role_to_check = apply_filters( 'FHEE__EEH_Activation__get_default_creator_id__role_to_check', 'administrator' );
+		$role_to_check = apply_filters('FHEE__EEH_Activation__get_default_creator_id__role_to_check', 'administrator');
 
 		//let's allow pre_filtering for early exits by alternative methods for getting id.  We check for truthy result and if so then exit early.
-		$pre_filtered_id = apply_filters( 'FHEE__EEH_Activation__get_default_creator_id__pre_filtered_id', false, $role_to_check );
-		if ( $pre_filtered_id !== false ) {
+		$pre_filtered_id = apply_filters('FHEE__EEH_Activation__get_default_creator_id__pre_filtered_id', false, $role_to_check);
+		if ($pre_filtered_id !== false) {
 			return (int) $pre_filtered_id;
 		}
 
-		$capabilities_key = EEH_Activation::ensure_table_name_has_prefix( 'capabilities' );
-		$query = $wpdb->prepare( "SELECT user_id FROM $wpdb->usermeta WHERE meta_key = '$capabilities_key' AND meta_value LIKE %s ORDER BY user_id ASC LIMIT 0,1", '%' . $role_to_check . '%' );
-		$user_id = $wpdb->get_var( $query );
-		 $user_id = apply_filters( 'FHEE__EEH_Activation_Helper__get_default_creator_id__user_id', $user_id );
-		 if ( $user_id && (int)$user_id ) {
-		 	self::$_default_creator_id = (int)$user_id;
+		$capabilities_key = EEH_Activation::ensure_table_name_has_prefix('capabilities');
+		$query = $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = '$capabilities_key' AND meta_value LIKE %s ORDER BY user_id ASC LIMIT 0,1", '%'.$role_to_check.'%');
+		$user_id = $wpdb->get_var($query);
+		 $user_id = apply_filters('FHEE__EEH_Activation_Helper__get_default_creator_id__user_id', $user_id);
+		 if ($user_id && (int) $user_id) {
+		 	self::$_default_creator_id = (int) $user_id;
 		 	return self::$_default_creator_id;
 		 } else {
 		 	return NULL;
@@ -616,29 +616,29 @@ 
 	 * 	@return void
 	 * @throws EE_Error if there are database errors
 	 */
-	public static function create_table( $table_name, $sql, $engine = 'ENGINE=MyISAM ', $drop_pre_existing_table = false ) {
-		if( apply_filters( 'FHEE__EEH_Activation__create_table__short_circuit', FALSE, $table_name, $sql ) ){
+	public static function create_table($table_name, $sql, $engine = 'ENGINE=MyISAM ', $drop_pre_existing_table = false) {
+		if (apply_filters('FHEE__EEH_Activation__create_table__short_circuit', FALSE, $table_name, $sql)) {
 			return;
 		}
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		if ( ! function_exists( 'dbDelta' )) {
-			require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		if ( ! function_exists('dbDelta')) {
+			require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 		}
 		/** @var WPDB $wpdb */
 		global $wpdb;
-		$wp_table_name = EEH_Activation::ensure_table_name_has_prefix( $table_name );
+		$wp_table_name = EEH_Activation::ensure_table_name_has_prefix($table_name);
 		// do we need to first delete an existing version of this table ?
-		if ( $drop_pre_existing_table && EEH_Activation::table_exists( $wp_table_name ) ){
+		if ($drop_pre_existing_table && EEH_Activation::table_exists($wp_table_name)) {
 			// ok, delete the table... but ONLY if it's empty
-			$deleted_safely = EEH_Activation::delete_db_table_if_empty( $wp_table_name );
+			$deleted_safely = EEH_Activation::delete_db_table_if_empty($wp_table_name);
 			// table is NOT empty, are you SURE you want to delete this table ???
-			if ( ! $deleted_safely && defined( 'EE_DROP_BAD_TABLES' ) && EE_DROP_BAD_TABLES ){
-				EEH_Activation::delete_unused_db_table( $wp_table_name );
-			} else if ( ! $deleted_safely ) {
+			if ( ! $deleted_safely && defined('EE_DROP_BAD_TABLES') && EE_DROP_BAD_TABLES) {
+				EEH_Activation::delete_unused_db_table($wp_table_name);
+			} else if ( ! $deleted_safely) {
 				// so we should be more cautious rather than just dropping tables so easily
 				EE_Error::add_persistent_admin_notice(
-						'bad_table_' . $wp_table_name . '_detected',
-						sprintf( __( 'Database table %1$s exists when it shouldn\'t, and may contain erroneous data. If you have previously restored your database from a backup that didn\'t remove the old tables, then we recommend adding %2$s to your %3$s file then restore to that backup again. This will clear out the invalid data from %1$s. Afterwards you should undo that change from your %3$s file. %4$sIf you cannot edit %3$s, you should remove the data from %1$s manually then restore to the backup again.', 'event_espresso' ),
+						'bad_table_'.$wp_table_name.'_detected',
+						sprintf(__('Database table %1$s exists when it shouldn\'t, and may contain erroneous data. If you have previously restored your database from a backup that didn\'t remove the old tables, then we recommend adding %2$s to your %3$s file then restore to that backup again. This will clear out the invalid data from %1$s. Afterwards you should undo that change from your %3$s file. %4$sIf you cannot edit %3$s, you should remove the data from %1$s manually then restore to the backup again.', 'event_espresso'),
 								$wp_table_name,
 								"<pre>define( 'EE_DROP_BAD_TABLES', TRUE );</pre>",
 								'<b>wp-config.php</b>',
@@ -647,25 +647,25 @@ 
 			}
 		}
 		// does $sql contain valid column information? ( LPT: https://regex101.com/ is great for working out regex patterns )
-		if ( preg_match( '((((.*?))(,\s))+)', $sql, $valid_column_data ) ) {
+		if (preg_match('((((.*?))(,\s))+)', $sql, $valid_column_data)) {
 			$SQL = "CREATE TABLE $wp_table_name ( $sql ) $engine DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;";
 			//get $wpdb to echo errors, but buffer them. This way at least WE know an error
 			//happened. And then we can choose to tell the end user
-			$old_show_errors_policy = $wpdb->show_errors( TRUE );
-			$old_error_suppression_policy = $wpdb->suppress_errors( FALSE );
+			$old_show_errors_policy = $wpdb->show_errors(TRUE);
+			$old_error_suppression_policy = $wpdb->suppress_errors(FALSE);
 			ob_start();
-			dbDelta( $SQL );
+			dbDelta($SQL);
 			$output = ob_get_contents();
 			ob_end_clean();
-			$wpdb->show_errors( $old_show_errors_policy );
-			$wpdb->suppress_errors( $old_error_suppression_policy );
-			if( ! empty( $output ) ){
-				throw new EE_Error( $output	);
+			$wpdb->show_errors($old_show_errors_policy);
+			$wpdb->suppress_errors($old_error_suppression_policy);
+			if ( ! empty($output)) {
+				throw new EE_Error($output);
 			}
 		} else {
 			throw new EE_Error(
 				sprintf(
-					__( 'The following table creation SQL does not contain valid information about the table columns: %1$s %2$s', 'event_espresso' ),
+					__('The following table creation SQL does not contain valid information about the table columns: %1$s %2$s', 'event_espresso'),
 					'<br />',
 					$sql
 				)
@@ -688,15 +688,15 @@ 
 	 *                            'VARCHAR(10)'
 	 * @return bool|int
 	 */
-	public static function add_column_if_it_doesnt_exist($table_name,$column_name,$column_info='INT UNSIGNED NOT NULL'){
-		if( apply_filters( 'FHEE__EEH_Activation__add_column_if_it_doesnt_exist__short_circuit', FALSE ) ){
+	public static function add_column_if_it_doesnt_exist($table_name, $column_name, $column_info = 'INT UNSIGNED NOT NULL') {
+		if (apply_filters('FHEE__EEH_Activation__add_column_if_it_doesnt_exist__short_circuit', FALSE)) {
 			return FALSE;
 		}
 		global $wpdb;
-		$full_table_name= EEH_Activation::ensure_table_name_has_prefix( $table_name );
+		$full_table_name = EEH_Activation::ensure_table_name_has_prefix($table_name);
 		$fields = self::get_fields_on_table($table_name);
-		if (!in_array($column_name, $fields)){
-			$alter_query="ALTER TABLE $full_table_name ADD $column_name $column_info";
+		if ( ! in_array($column_name, $fields)) {
+			$alter_query = "ALTER TABLE $full_table_name ADD $column_name $column_info";
 			//echo "alter query:$alter_query";
 			return $wpdb->query($alter_query);
 		}
@@ -715,14 +715,14 @@ 
 	 * 	@param string $table_name, without prefixed $wpdb->prefix
 	 * 	@return array|boolean of database column names
 	 */
-	public static function get_fields_on_table( $table_name = NULL ) {
+	public static function get_fields_on_table($table_name = NULL) {
 		global $wpdb;
-		$table_name= EEH_Activation::ensure_table_name_has_prefix( $table_name );
-		if ( ! empty( $table_name )) {
+		$table_name = EEH_Activation::ensure_table_name_has_prefix($table_name);
+		if ( ! empty($table_name)) {
 			$columns = $wpdb->get_results("SHOW COLUMNS FROM $table_name ");
 			if ($columns !== FALSE) {
 				$field_array = array();
-				foreach( (array) $columns as $column ){
+				foreach ((array) $columns as $column) {
 					$field_array[] = $column->Field;
 				}
 				return $field_array;
@@ -741,12 +741,12 @@ 
 	 * @param string $table_name
 	 * @return bool
 	 */
-	public static function db_table_is_empty( $table_name ) {
+	public static function db_table_is_empty($table_name) {
 		global $wpdb;
-		$table_name = EEH_Activation::ensure_table_name_has_prefix( $table_name );
-		if ( EEH_Activation::table_exists( $table_name ) ) {
-			$count = $wpdb->get_var( "SELECT COUNT(*) FROM $table_name" );
-			return absint( $count ) === 0 ? true : false;
+		$table_name = EEH_Activation::ensure_table_name_has_prefix($table_name);
+		if (EEH_Activation::table_exists($table_name)) {
+			$count = $wpdb->get_var("SELECT COUNT(*) FROM $table_name");
+			return absint($count) === 0 ? true : false;
 		}
 		return false;
 	}
@@ -761,9 +761,9 @@ 
 	 * @param string $table_name
 	 * @return bool | int
 	 */
-	public static function delete_db_table_if_empty( $table_name ) {
-		if ( EEH_Activation::db_table_is_empty( $table_name ) ) {
-			return EEH_Activation::delete_unused_db_table( $table_name );
+	public static function delete_db_table_if_empty($table_name) {
+		if (EEH_Activation::db_table_is_empty($table_name)) {
+			return EEH_Activation::delete_unused_db_table($table_name);
 		}
 		return false;
 	}
@@ -778,11 +778,11 @@ 
 	 * @param string $table_name
 	 * @return bool | int
 	 */
-	public static function delete_unused_db_table( $table_name ) {
+	public static function delete_unused_db_table($table_name) {
 		global $wpdb;
-		if ( EEH_Activation::table_exists( $table_name ) ) {
-			$table_name = EEH_Activation::ensure_table_name_has_prefix( $table_name );
-			return $wpdb->query( "DROP TABLE IF EXISTS $table_name" );
+		if (EEH_Activation::table_exists($table_name)) {
+			$table_name = EEH_Activation::ensure_table_name_has_prefix($table_name);
+			return $wpdb->query("DROP TABLE IF EXISTS $table_name");
 		}
 		return false;
 	}
@@ -798,18 +798,18 @@ 
 	 * @param string $index_name
 	 * @return bool | int
 	 */
-	public static function drop_index( $table_name, $index_name ) {
-		if( apply_filters( 'FHEE__EEH_Activation__drop_index__short_circuit', FALSE ) ){
+	public static function drop_index($table_name, $index_name) {
+		if (apply_filters('FHEE__EEH_Activation__drop_index__short_circuit', FALSE)) {
 			return FALSE;
 		}
 		global $wpdb;
-		$table_name = EEH_Activation::ensure_table_name_has_prefix( $table_name );
+		$table_name = EEH_Activation::ensure_table_name_has_prefix($table_name);
 		$index_exists_query = "SHOW INDEX FROM $table_name WHERE Key_name = '$index_name'";
 		if (
-			EEH_Activation::table_exists(  $table_name )
-			&& $wpdb->get_var( $index_exists_query ) === $table_name //using get_var with the $index_exists_query returns the table's name
+			EEH_Activation::table_exists($table_name)
+			&& $wpdb->get_var($index_exists_query) === $table_name //using get_var with the $index_exists_query returns the table's name
 		) {
-			return $wpdb->query( "ALTER TABLE $table_name DROP INDEX $index_name" );
+			return $wpdb->query("ALTER TABLE $table_name DROP INDEX $index_name");
 		}
 		return TRUE;
 	}
@@ -825,27 +825,27 @@ 
 	 * @return boolean success (whether database is setup properly or not)
 	 */
 	public static function create_database_tables() {
-		EE_Registry::instance()->load_core( 'Data_Migration_Manager' );
+		EE_Registry::instance()->load_core('Data_Migration_Manager');
 		//find the migration script that sets the database to be compatible with the code
 		$dms_name = EE_Data_Migration_Manager::instance()->get_most_up_to_date_dms();
-		if( $dms_name ){
-			$current_data_migration_script = EE_Registry::instance()->load_dms( $dms_name );
-			$current_data_migration_script->set_migrating( false );
+		if ($dms_name) {
+			$current_data_migration_script = EE_Registry::instance()->load_dms($dms_name);
+			$current_data_migration_script->set_migrating(false);
 			$current_data_migration_script->schema_changes_before_migration();
 			$current_data_migration_script->schema_changes_after_migration();
-			if( $current_data_migration_script->get_errors() ){
-				if( WP_DEBUG ){
-					foreach( $current_data_migration_script->get_errors() as $error ){
-						EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__ );
+			if ($current_data_migration_script->get_errors()) {
+				if (WP_DEBUG) {
+					foreach ($current_data_migration_script->get_errors() as $error) {
+						EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__);
 					}
-				}else{
-					EE_Error::add_error( __( 'There were errors creating the Event Espresso database tables and Event Espresso has been deactivated. To view the errors, please enable WP_DEBUG in your wp-config.php file.', 'event_espresso' ) );
+				} else {
+					EE_Error::add_error(__('There were errors creating the Event Espresso database tables and Event Espresso has been deactivated. To view the errors, please enable WP_DEBUG in your wp-config.php file.', 'event_espresso'));
 				}
 				return false;
 			}
 			EE_Data_Migration_Manager::instance()->update_current_database_state_to();
-		}else{
-			EE_Error::add_error( __( 'Could not determine most up-to-date data migration script from which to pull database schema structure. So database is probably not setup properly', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+		} else {
+			EE_Error::add_error(__('Could not determine most up-to-date data migration script from which to pull database schema structure. So database is probably not setup properly', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		return true;
@@ -865,36 +865,36 @@ 
 	public static function initialize_system_questions() {
 		// QUESTION GROUPS
 		global $wpdb;
-		$table_name = EEH_Activation::ensure_table_name_has_prefix( 'esp_question_group' );
+		$table_name = EEH_Activation::ensure_table_name_has_prefix('esp_question_group');
 		$SQL = "SELECT QSG_system FROM $table_name WHERE QSG_system != 0";
 		// what we have
-		$question_groups = $wpdb->get_col( $SQL );
+		$question_groups = $wpdb->get_col($SQL);
 		// check the response
-		$question_groups = is_array( $question_groups ) ? $question_groups : array();
+		$question_groups = is_array($question_groups) ? $question_groups : array();
 		// what we should have
-		$QSG_systems = array( 1, 2 );
+		$QSG_systems = array(1, 2);
 		$QSG_IDs = array();
 		$timestamp = time();
 		// loop thru what we should have and compare to what we have
-		foreach ( $QSG_systems as $QSG_system ) {
+		foreach ($QSG_systems as $QSG_system) {
 			// reset values array
 			$QSG_values = array();
 			// if we don't have what we should have (but use $QST_system as as string because that's what we got from the db)
-			if ( ! in_array( "$QSG_system", $question_groups )) {
+			if ( ! in_array("$QSG_system", $question_groups)) {
 				// add it
-				switch ( $QSG_system ) {
+				switch ($QSG_system) {
 
 					case 1:
 							$QSG_values = array(
-								'QSG_name'       => __( 'Personal Information', 'event_espresso' ),
-								'QSG_identifier' => 'personal-information-' . $timestamp,
+								'QSG_name'       => __('Personal Information', 'event_espresso'),
+								'QSG_identifier' => 'personal-information-'.$timestamp,
 								'QSG_desc'       => __(
 									'Questions for gathering critical details like "Name" and "Email Address"',
 									'event_espresso'
 								),
 								'QSG_parent'     => null,
-								'QSG_html_name'  => 'personal-information-' . $timestamp,
-								'QSG_html_id'    => 'personal-information-' . $timestamp,
+								'QSG_html_name'  => 'personal-information-'.$timestamp,
+								'QSG_html_id'    => 'personal-information-'.$timestamp,
 								'QSG_order'      => 1,
 								'QSG_wp_user'    => self::get_default_creator_id(),
 								'QSG_system'     => EEM_Question_Group::system_personal,
@@ -904,15 +904,15 @@ 
 
 					case 2:
 							$QSG_values = array(
-								'QSG_name'       => __( 'Address Information', 'event_espresso' ),
-								'QSG_identifier' => 'address-information-' . $timestamp,
+								'QSG_name'       => __('Address Information', 'event_espresso'),
+								'QSG_identifier' => 'address-information-'.$timestamp,
 								'QSG_desc'       => __(
 									'Questions for gathering mailing address details',
 									'event_espresso'
 								),
 								'QSG_parent'     => null,
-								'QSG_html_name'  => 'address-information-' . $timestamp,
-								'QSG_html_id'    => 'address-information-' . $timestamp,
+								'QSG_html_name'  => 'address-information-'.$timestamp,
+								'QSG_html_id'    => 'address-information-'.$timestamp,
 								'QSG_order'      => 2,
 								'QSG_wp_user'    => self::get_default_creator_id(),
 								'QSG_system'     => EEM_Question_Group::system_address,
@@ -922,14 +922,14 @@ 
 
 				}
 				// make sure we have some values before inserting them
-				if ( ! empty( $QSG_values )) {
+				if ( ! empty($QSG_values)) {
 					// insert system question
 					$wpdb->insert(
 						$table_name,
 						$QSG_values,
-						array('%s', '%s', '%s', '%d', '%d', '%d', '%d', '%d' )
+						array('%s', '%s', '%s', '%d', '%d', '%d', '%d', '%d')
 					);
-					$QSG_IDs[ $QSG_system ] = $wpdb->insert_id;
+					$QSG_IDs[$QSG_system] = $wpdb->insert_id;
 				}
 			}
 		}
@@ -938,10 +938,10 @@ 
 
 		// QUESTIONS
 		global $wpdb;
-		$table_name = EEH_Activation::ensure_table_name_has_prefix( 'esp_question' );
+		$table_name = EEH_Activation::ensure_table_name_has_prefix('esp_question');
 		$SQL = "SELECT QST_system FROM $table_name WHERE QST_system != ''";
 		// what we have
-		$questions = $wpdb->get_col( $SQL );
+		$questions = $wpdb->get_col($SQL);
 		// what we should have
 		$QST_systems = array(
 			'fname',
@@ -956,32 +956,32 @@ 
 			'phone'
 		);
 		// loop thru what we should have and compare to what we have
-		foreach ( $QST_systems as $QST_system ) {
+		foreach ($QST_systems as $QST_system) {
 			// reset values array
 			$QST_values = array();
 			// if we don't have what we should have
-			if ( ! in_array( $QST_system, $questions )) {
+			if ( ! in_array($QST_system, $questions)) {
 				// add it
-				switch ( $QST_system ) {
+				switch ($QST_system) {
 
 					case 'fname':
 						$QST_values = array(
-							'QSG_ID'               => $QSG_IDs[ EEM_Question_Group::system_personal ],
-							'QST_admin_label'      => __( 'First Name - System Question', 'event_espresso' ),
-							'QST_display_text'     => __( 'First Name', 'event_espresso' ),
-							'QST_identifier'       => 'fname-' . $timestamp,
+							'QSG_ID'               => $QSG_IDs[EEM_Question_Group::system_personal],
+							'QST_admin_label'      => __('First Name - System Question', 'event_espresso'),
+							'QST_display_text'     => __('First Name', 'event_espresso'),
+							'QST_identifier'       => 'fname-'.$timestamp,
 							'QST_system'           => 'fname',
 							'QST_type'             => 'TEXT',
 							'QST_required' => 1,
-							'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+							'QST_required_text' => __('This field is required', 'event_espresso'),
 							'QST_desc'             => 'The registrant\'s given name',
-							'QST_html_name'        => 'fname-' . $timestamp,
-							'QST_html_id'          => 'fname-' . $timestamp,
+							'QST_html_name'        => 'fname-'.$timestamp,
+							'QST_html_id'          => 'fname-'.$timestamp,
 							'QST_html_class'       => 'fname',
-							'QST_html_label_id'    => 'fname-' . $timestamp . '-lbl',
+							'QST_html_label_id'    => 'fname-'.$timestamp.'-lbl',
 							'QST_html_label_class' => 'fname-lbl',
 							'QST_default_value'    => '',
-							'QST_validation_strategies' => array( 'required' => '' ),
+							'QST_validation_strategies' => array('required' => ''),
 							'QST_validation_message' => '',
 							'QST_order'            => 1,
 							'QST_admin_only'       => 0,
@@ -995,19 +995,19 @@ 
 
 					case 'lname':
 						$QST_values = array(
-							'QSG_ID'               => $QSG_IDs[ EEM_Question_Group::system_personal ],
-							'QST_admin_label'      => __( 'Last Name - System Question', 'event_espresso' ),
-							'QST_display_text'     => __( 'Last Name', 'event_espresso' ),
-							'QST_identifier'       => 'lname-' . $timestamp,
+							'QSG_ID'               => $QSG_IDs[EEM_Question_Group::system_personal],
+							'QST_admin_label'      => __('Last Name - System Question', 'event_espresso'),
+							'QST_display_text'     => __('Last Name', 'event_espresso'),
+							'QST_identifier'       => 'lname-'.$timestamp,
 							'QST_system'           => 'lname',
 							'QST_type'             => 'TEXT',
 							'QST_required' => 1,
-							'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+							'QST_required_text' => __('This field is required', 'event_espresso'),
 							'QST_desc'             => 'The registrant\'s family name',
-							'QST_html_name'        => 'lname-' . $timestamp,
-							'QST_html_id'          => 'lname-' . $timestamp,
+							'QST_html_name'        => 'lname-'.$timestamp,
+							'QST_html_id'          => 'lname-'.$timestamp,
 							'QST_html_class'       => 'lname',
-							'QST_html_label_id'    => 'lname-' . $timestamp . '-lbl',
+							'QST_html_label_id'    => 'lname-'.$timestamp.'-lbl',
 							'QST_html_label_class' => 'lname-lbl',
 							'QST_default_value'    => '',
 							'QST_validation_strategies' => array(),
@@ -1024,22 +1024,22 @@ 
 
 					case 'email':
 						$QST_values = array(
-							'QSG_ID'               => $QSG_IDs[ EEM_Question_Group::system_personal ],
-							'QST_display_text'     => __( 'Email Address', 'event_espresso' ),
-							'QST_admin_label'      => __( 'Email Address - System Question', 'event_espresso' ),
-							'QST_identifier'       => 'email-' . $timestamp,
+							'QSG_ID'               => $QSG_IDs[EEM_Question_Group::system_personal],
+							'QST_display_text'     => __('Email Address', 'event_espresso'),
+							'QST_admin_label'      => __('Email Address - System Question', 'event_espresso'),
+							'QST_identifier'       => 'email-'.$timestamp,
 							'QST_system'           => 'email',
 							'QST_type'             => 'EMAIL',
 							'QST_required' => 1,
-							'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+							'QST_required_text' => __('This field is required', 'event_espresso'),
 							'QST_desc'             => 'The registrant\'s email address',
-							'QST_html_name'        => 'email-' . $timestamp,
-							'QST_html_id'          => 'email-' . $timestamp,
+							'QST_html_name'        => 'email-'.$timestamp,
+							'QST_html_id'          => 'email-'.$timestamp,
 							'QST_html_class'       => 'email',
-							'QST_html_label_id'    => 'email-' . $timestamp . '-lbl',
+							'QST_html_label_id'    => 'email-'.$timestamp.'-lbl',
 							'QST_html_label_class' => 'email-lbl',
 							'QST_default_value'    => '',
-							'QST_validation_strategies' => array( 'required' => '', 'email' => '', ),
+							'QST_validation_strategies' => array('required' => '', 'email' => '',),
 							'QST_validation_message' => '',
 							'QST_order'            => 3,
 							'QST_admin_only'       => 0,
@@ -1053,22 +1053,22 @@ 
 
 					case 'address':
 						$QST_values = array(
-							'QSG_ID'               => $QSG_IDs[ EEM_Question_Group::system_address ],
-							'QST_display_text'     => __( 'Address', 'event_espresso' ),
-							'QST_admin_label'      => __( 'Address - System Question', 'event_espresso' ),
-							'QST_identifier'       => 'address-' . $timestamp,
+							'QSG_ID'               => $QSG_IDs[EEM_Question_Group::system_address],
+							'QST_display_text'     => __('Address', 'event_espresso'),
+							'QST_admin_label'      => __('Address - System Question', 'event_espresso'),
+							'QST_identifier'       => 'address-'.$timestamp,
 							'QST_system'           => 'address',
 							'QST_type'             => 'TEXT',
 							'QST_required' => 0,
-							'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+							'QST_required_text' => __('This field is required', 'event_espresso'),
 							'QST_desc'             => 'The registrant\'s street address',
-							'QST_html_name'        => 'address-' . $timestamp,
-							'QST_html_id'          => 'address-' . $timestamp,
+							'QST_html_name'        => 'address-'.$timestamp,
+							'QST_html_id'          => 'address-'.$timestamp,
 							'QST_html_class'       => 'address',
-							'QST_html_label_id'    => 'address-' . $timestamp . '-lbl',
+							'QST_html_label_id'    => 'address-'.$timestamp.'-lbl',
 							'QST_html_label_class' => 'address-lbl',
 							'QST_default_value'    => '',
-							'QST_validation_strategies' => array( 'required' => '' ),
+							'QST_validation_strategies' => array('required' => ''),
 							'QST_validation_message' => '',
 							'QST_order'            => 4,
 							'QST_admin_only'       => 0,
@@ -1082,22 +1082,22 @@ 
 
 					case 'address2':
 						$QST_values = array(
-							'QSG_ID'               => $QSG_IDs[ EEM_Question_Group::system_address ],
-							'QST_display_text'     => __( 'Address2', 'event_espresso' ),
-							'QST_admin_label'      => __( 'Address2 - System Question', 'event_espresso' ),
-							'QST_identifier'       => 'address2-' . $timestamp,
+							'QSG_ID'               => $QSG_IDs[EEM_Question_Group::system_address],
+							'QST_display_text'     => __('Address2', 'event_espresso'),
+							'QST_admin_label'      => __('Address2 - System Question', 'event_espresso'),
+							'QST_identifier'       => 'address2-'.$timestamp,
 							'QST_system'           => 'address2',
 							'QST_type'             => 'TEXT',
 							'QST_required' => 0,
-							'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+							'QST_required_text' => __('This field is required', 'event_espresso'),
 							'QST_desc'             => 'The registrant\'s street address (additional info)',
-							'QST_html_name'        => 'address2-' . $timestamp,
-							'QST_html_id'          => 'address2-' . $timestamp,
+							'QST_html_name'        => 'address2-'.$timestamp,
+							'QST_html_id'          => 'address2-'.$timestamp,
 							'QST_html_class'       => 'address2',
-							'QST_html_label_id'    => 'address2-' . $timestamp . '-lbl',
+							'QST_html_label_id'    => 'address2-'.$timestamp.'-lbl',
 							'QST_html_label_class' => 'address2-lbl',
 							'QST_default_value'    => '',
-							'QST_validation_strategies' => array( 'required' => '' ),
+							'QST_validation_strategies' => array('required' => ''),
 							'QST_validation_message' => '',
 							'QST_order'            => 5,
 							'QST_admin_only'       => 0,
@@ -1111,22 +1111,22 @@ 
 
 					case 'city':
 						$QST_values = array(
-							'QSG_ID'               => $QSG_IDs[ EEM_Question_Group::system_address ],
-							'QST_display_text'     => __( 'City', 'event_espresso' ),
-							'QST_admin_label'      => __( 'City - System Question', 'event_espresso' ),
-							'QST_identifier'       => 'city-' . $timestamp,
+							'QSG_ID'               => $QSG_IDs[EEM_Question_Group::system_address],
+							'QST_display_text'     => __('City', 'event_espresso'),
+							'QST_admin_label'      => __('City - System Question', 'event_espresso'),
+							'QST_identifier'       => 'city-'.$timestamp,
 							'QST_system'           => 'city',
 							'QST_type'             => 'TEXT',
 							'QST_required' => 0,
-							'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+							'QST_required_text' => __('This field is required', 'event_espresso'),
 							'QST_desc'             => 'The registrant\'s city',
-							'QST_html_name'        => 'city-' . $timestamp,
-							'QST_html_id'          => 'city-' . $timestamp,
+							'QST_html_name'        => 'city-'.$timestamp,
+							'QST_html_id'          => 'city-'.$timestamp,
 							'QST_html_class'       => 'city',
-							'QST_html_label_id'    => 'city-' . $timestamp . '-lbl',
+							'QST_html_label_id'    => 'city-'.$timestamp.'-lbl',
 							'QST_html_label_class' => 'city-lbl',
 							'QST_default_value'    => '',
-							'QST_validation_strategies' => array( 'required' => '' ),
+							'QST_validation_strategies' => array('required' => ''),
 							'QST_validation_message' => '',
 							'QST_order'            => 6,
 							'QST_admin_only'       => 0,
@@ -1140,22 +1140,22 @@ 
 
 					case 'state':
 						$QST_values = array(
-							'QSG_ID'               => $QSG_IDs[ EEM_Question_Group::system_address ],
-							'QST_display_text'     => __( 'State/Province', 'event_espresso' ),
-							'QST_admin_label'      => __( 'State/Province - System Question', 'event_espresso' ),
-							'QST_identifier'       => 'state-' . $timestamp,
+							'QSG_ID'               => $QSG_IDs[EEM_Question_Group::system_address],
+							'QST_display_text'     => __('State/Province', 'event_espresso'),
+							'QST_admin_label'      => __('State/Province - System Question', 'event_espresso'),
+							'QST_identifier'       => 'state-'.$timestamp,
 							'QST_system'           => 'state',
 							'QST_type'             => 'STATE',
 							'QST_required' => 0,
-							'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+							'QST_required_text' => __('This field is required', 'event_espresso'),
 							'QST_desc'             => 'The registrant\'s state/province',
-							'QST_html_name'        => 'state-' . $timestamp,
-							'QST_html_id'          => 'state-' . $timestamp,
+							'QST_html_name'        => 'state-'.$timestamp,
+							'QST_html_id'          => 'state-'.$timestamp,
 							'QST_html_class'       => 'state',
-							'QST_html_label_id'    => 'state-' . $timestamp . '-lbl',
+							'QST_html_label_id'    => 'state-'.$timestamp.'-lbl',
 							'QST_html_label_class' => 'state-lbl',
 							'QST_default_value'    => '',
-							'QST_validation_strategies' => array( 'required' => '' ),
+							'QST_validation_strategies' => array('required' => ''),
 							'QST_validation_message' => '',
 							'QST_order'            => 7,
 							'QST_admin_only'       => 0,
@@ -1166,22 +1166,22 @@ 
 
 					case 'country' :
 						$QST_values = array(
-							'QSG_ID'               => $QSG_IDs[ EEM_Question_Group::system_address ],
-							'QST_display_text'     => __( 'Country', 'event_espresso' ),
-							'QST_admin_label'      => __( 'Country - System Question', 'event_espresso' ),
-							'QST_identifier'       => 'country-' . $timestamp,
+							'QSG_ID'               => $QSG_IDs[EEM_Question_Group::system_address],
+							'QST_display_text'     => __('Country', 'event_espresso'),
+							'QST_admin_label'      => __('Country - System Question', 'event_espresso'),
+							'QST_identifier'       => 'country-'.$timestamp,
 							'QST_system'           => 'country',
 							'QST_type'             => 'COUNTRY',
 							'QST_required' => 0,
-							'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+							'QST_required_text' => __('This field is required', 'event_espresso'),
 							'QST_desc'             => 'The registrant\'s country',
-							'QST_html_name'        => 'country-' . $timestamp,
-							'QST_html_id'          => 'country-' . $timestamp,
+							'QST_html_name'        => 'country-'.$timestamp,
+							'QST_html_id'          => 'country-'.$timestamp,
 							'QST_html_class'       => 'country',
-							'QST_html_label_id'    => 'country-' . $timestamp . '-lbl',
+							'QST_html_label_id'    => 'country-'.$timestamp.'-lbl',
 							'QST_html_label_class' => 'country-lbl',
 							'QST_default_value'    => '',
-							'QST_validation_strategies' => array( 'required' => '' ),
+							'QST_validation_strategies' => array('required' => ''),
 							'QST_validation_message' => '',
 							'QST_order'            => 8,
 							'QST_admin_only'       => 0,
@@ -1192,22 +1192,22 @@ 
 
 					case 'zip':
 						$QST_values = array(
-							'QSG_ID'               => $QSG_IDs[ EEM_Question_Group::system_address ],
-							'QST_display_text'     => __( 'Zip/Postal Code', 'event_espresso' ),
-							'QST_admin_label'      => __( 'Zip/Postal Code - System Question', 'event_espresso' ),
-							'QST_identifier'       => 'zip-' . $timestamp,
+							'QSG_ID'               => $QSG_IDs[EEM_Question_Group::system_address],
+							'QST_display_text'     => __('Zip/Postal Code', 'event_espresso'),
+							'QST_admin_label'      => __('Zip/Postal Code - System Question', 'event_espresso'),
+							'QST_identifier'       => 'zip-'.$timestamp,
 							'QST_system'           => 'zip',
 							'QST_type'             => 'TEXT',
 							'QST_required' => 0,
-							'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+							'QST_required_text' => __('This field is required', 'event_espresso'),
 							'QST_desc'             => 'The registrant\'s zip/postal code',
-							'QST_html_name'        => 'zip-' . $timestamp,
-							'QST_html_id'          => 'zip-' . $timestamp,
+							'QST_html_name'        => 'zip-'.$timestamp,
+							'QST_html_id'          => 'zip-'.$timestamp,
 							'QST_html_class'       => 'zip',
-							'QST_html_label_id'    => 'zip-' . $timestamp . '-lbl',
+							'QST_html_label_id'    => 'zip-'.$timestamp.'-lbl',
 							'QST_html_label_class' => 'zip-lbl',
 							'QST_default_value'    => '',
-							'QST_validation_strategies' => array( 'required' => '' ),
+							'QST_validation_strategies' => array('required' => ''),
 							'QST_validation_message' => '',
 							'QST_order'            => 9,
 							'QST_admin_only'       => 0,
@@ -1221,22 +1221,22 @@ 
 
 					case 'phone':
 						$QST_values = array(
-							'QSG_ID'               => $QSG_IDs[ EEM_Question_Group::system_address ],
-							'QST_display_text'     => __( 'Phone Number', 'event_espresso' ),
-							'QST_admin_label'      => __( 'Phone Number - System Question', 'event_espresso' ),
-							'QST_identifier'       => 'phone-' . $timestamp,
+							'QSG_ID'               => $QSG_IDs[EEM_Question_Group::system_address],
+							'QST_display_text'     => __('Phone Number', 'event_espresso'),
+							'QST_admin_label'      => __('Phone Number - System Question', 'event_espresso'),
+							'QST_identifier'       => 'phone-'.$timestamp,
 							'QST_system'           => 'phone',
 							'QST_type'             => 'TEXT',
 							'QST_required' => 0,
-							'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+							'QST_required_text' => __('This field is required', 'event_espresso'),
 							'QST_desc'             => 'The registrant\'s phone number',
-							'QST_html_name'        => 'phone-' . $timestamp,
-							'QST_html_id'          => 'phone-' . $timestamp,
+							'QST_html_name'        => 'phone-'.$timestamp,
+							'QST_html_id'          => 'phone-'.$timestamp,
 							'QST_html_class'       => 'phone',
-							'QST_html_label_id'    => 'phone-' . $timestamp . '-lbl',
+							'QST_html_label_id'    => 'phone-'.$timestamp.'-lbl',
 							'QST_html_label_class' => 'phone-lbl',
 							'QST_default_value'    => '',
-							'QST_validation_strategies' => array( 'required' => '' ),
+							'QST_validation_strategies' => array('required' => ''),
 							'QST_validation_message' => '',
 							'QST_order'            => 10,
 							'QST_admin_only'       => 0,
@@ -1249,12 +1249,12 @@ 
 					break;
 
 				}
-				if ( ! empty( $QST_values )) {
+				if ( ! empty($QST_values)) {
 					// insert system question
 					$wpdb->insert(
 						$table_name,
 						$QST_values,
-						array( '%s', '%s', '%s', '%s', '%d', '%s', '%d', '%d', '%d', '%d' )
+						array('%s', '%s', '%s', '%s', '%d', '%s', '%d', '%d', '%d', '%d')
 					);
 				}
 			}
@@ -1268,11 +1268,11 @@ 
 	 *
 	 * @throws \EE_Error
 	 */
-	public static function insert_default_payment_methods(){
-		if( ! EEM_Payment_Method::instance()->count_active( EEM_Payment_Method::scope_cart ) ){
-			EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
-			EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type( 'Invoice' );
-		}else{
+	public static function insert_default_payment_methods() {
+		if ( ! EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart)) {
+			EE_Registry::instance()->load_lib('Payment_Method_Manager');
+			EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type('Invoice');
+		} else {
 			EEM_Payment_Method::instance()->verify_button_urls();
 		}
 	}
@@ -1288,7 +1288,7 @@ 
 
 		global $wpdb;
 
-		if ( EEH_Activation::table_exists( EEM_Status::instance()->table() ) ) {
+		if (EEH_Activation::table_exists(EEM_Status::instance()->table())) {
 
 			$table_name = EEM_Status::instance()->table();
 
@@ -1364,33 +1364,33 @@ 
 		$folders = array(
 				EVENT_ESPRESSO_TEMPLATE_DIR,
 				EVENT_ESPRESSO_GATEWAY_DIR,
-				EVENT_ESPRESSO_UPLOAD_DIR . 'logs/',
-				EVENT_ESPRESSO_UPLOAD_DIR . 'css/',
-				EVENT_ESPRESSO_UPLOAD_DIR . 'tickets/'
+				EVENT_ESPRESSO_UPLOAD_DIR.'logs/',
+				EVENT_ESPRESSO_UPLOAD_DIR.'css/',
+				EVENT_ESPRESSO_UPLOAD_DIR.'tickets/'
 		);
-		foreach ( $folders as $folder ) {
+		foreach ($folders as $folder) {
 			try {
-				EEH_File::ensure_folder_exists_and_is_writable( $folder );
-				@ chmod( $folder, 0755 );
-			} catch( EE_Error $e ){
+				EEH_File::ensure_folder_exists_and_is_writable($folder);
+				@ chmod($folder, 0755);
+			} catch (EE_Error $e) {
 				EE_Error::add_error(
 					sprintf(
-						__(  'Could not create the folder at "%1$s" because: %2$s', 'event_espresso' ),
+						__('Could not create the folder at "%1$s" because: %2$s', 'event_espresso'),
 						$folder,
-						'<br />' . $e->getMessage()
+						'<br />'.$e->getMessage()
 					),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 				//indicate we'll need to fix this later
-				update_option( EEH_Activation::upload_directories_incomplete_option_name, true );
+				update_option(EEH_Activation::upload_directories_incomplete_option_name, true);
 				return FALSE;
 			}
 		}
 		//just add the .htaccess file to the logs directory to begin with. Even if logging
 		//is disabled, there might be activation errors recorded in there
-		EEH_File::add_htaccess_deny_from_all( EVENT_ESPRESSO_UPLOAD_DIR . 'logs/' );
+		EEH_File::add_htaccess_deny_from_all(EVENT_ESPRESSO_UPLOAD_DIR.'logs/');
 		//remember EE's folders are all good
-		delete_option( EEH_Activation::upload_directories_incomplete_option_name );
+		delete_option(EEH_Activation::upload_directories_incomplete_option_name);
 		return TRUE;
 	}
 
@@ -1403,7 +1403,7 @@ 
 	 * @return boolean
 	 */
 	public static function upload_directories_incomplete() {
-		return get_option( EEH_Activation::upload_directories_incomplete_option_name, false );
+		return get_option(EEH_Activation::upload_directories_incomplete_option_name, false);
 	}
 
 
@@ -1420,7 +1420,7 @@ 
 	 */
 	public static function generate_default_message_templates() {
 		/** @type EE_Message_Resource_Manager $message_resource_manager */
-		$message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
+		$message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 		/*
 		 * This first method is taking care of ensuring any default messengers
 		 * that should be made active and have templates generated are done.
@@ -1456,22 +1456,22 @@ 
 		$active_messengers = $message_resource_manager->active_messengers();
 		$installed_message_types = $message_resource_manager->installed_message_types();
 		$templates_created = false;
-		foreach ( $active_messengers as $active_messenger ) {
+		foreach ($active_messengers as $active_messenger) {
 			$default_message_type_names_for_messenger = $active_messenger->get_default_message_types();
 			$default_message_type_names_to_activate = array();
 			// looping through each default message type reported by the messenger
 			// and setup the actual message types to activate.
-			foreach ( $default_message_type_names_for_messenger as $default_message_type_name_for_messenger ) {
+			foreach ($default_message_type_names_for_messenger as $default_message_type_name_for_messenger) {
 				// if already active or has already been activated before we skip
 				// (otherwise we might reactivate something user's intentionally deactivated.)
 				// we also skip if the message type is not installed.
 				if (
-					$message_resource_manager->has_message_type_been_activated_for_messenger( $default_message_type_name_for_messenger, $active_messenger->name )
+					$message_resource_manager->has_message_type_been_activated_for_messenger($default_message_type_name_for_messenger, $active_messenger->name)
 					|| $message_resource_manager->is_message_type_active_for_messenger(
 						$active_messenger->name,
 						$default_message_type_name_for_messenger
 					)
-					|| ! isset( $installed_message_types[ $default_message_type_name_for_messenger ] )
+					|| ! isset($installed_message_types[$default_message_type_name_for_messenger])
 				) {
 					continue;
 				}
@@ -1484,7 +1484,7 @@ 
 				false
 			);
 			//activate the templates for these message types
-			if ( ! empty( $default_message_type_names_to_activate ) ) {
+			if ( ! empty($default_message_type_names_to_activate)) {
 				$templates_created = EEH_MSG_Template::generate_new_templates(
 					$active_messenger->name,
 					$default_message_type_names_for_messenger,
@@ -1511,18 +1511,18 @@ 
 		EE_Message_Resource_Manager $message_resource_manager
 	) {
 		/** @type EE_messenger[] $messengers_to_generate */
-		$messengers_to_generate = self::_get_default_messengers_to_generate_on_activation( $message_resource_manager );
+		$messengers_to_generate = self::_get_default_messengers_to_generate_on_activation($message_resource_manager);
 		$installed_message_types = $message_resource_manager->installed_message_types();
 		$templates_generated = false;
-		foreach ( $messengers_to_generate as $messenger_to_generate ) {
+		foreach ($messengers_to_generate as $messenger_to_generate) {
 			$default_message_type_names_for_messenger = $messenger_to_generate->get_default_message_types();
 			//verify the default message types match an installed message type.
-			foreach ( $default_message_type_names_for_messenger as $key => $name ) {
+			foreach ($default_message_type_names_for_messenger as $key => $name) {
 				if (
-					! isset( $installed_message_types[ $name ] )
-					|| $message_resource_manager->has_message_type_been_activated_for_messenger( $name, $messenger_to_generate->name )
+					! isset($installed_message_types[$name])
+					|| $message_resource_manager->has_message_type_been_activated_for_messenger($name, $messenger_to_generate->name)
 				) {
-					unset( $default_message_type_names_for_messenger[ $key ] );
+					unset($default_message_type_names_for_messenger[$key]);
 				}
 			}
 			// in previous iterations, the active_messengers option in the db
@@ -1536,7 +1536,7 @@ 
 				false
 			);
 			//create any templates needing created (or will reactivate templates already generated as necessary).
-			if ( ! empty( $default_message_type_names_for_messenger ) ) {
+			if ( ! empty($default_message_type_names_for_messenger)) {
 				$templates_generated = EEH_MSG_Template::generate_new_templates(
 					$messenger_to_generate->name,
 					$default_message_type_names_for_messenger,
@@ -1568,18 +1568,18 @@ 
 		$has_activated = $message_resource_manager->get_has_activated_messengers_option();
 
 		$messengers_to_generate = array();
-		foreach ( $installed_messengers as $installed_messenger ) {
+		foreach ($installed_messengers as $installed_messenger) {
 			//if installed messenger is a messenger that should be activated on install
 			//and is not already active
 			//and has never been activated
 			if (
 				! $installed_messenger->activate_on_install
-				|| isset( $active_messengers[ $installed_messenger->name ] )
-				|| isset( $has_activated[ $installed_messenger->name ] )
+				|| isset($active_messengers[$installed_messenger->name])
+				|| isset($has_activated[$installed_messenger->name])
 			) {
 				continue;
 			}
-			$messengers_to_generate[ $installed_messenger->name ] = $installed_messenger;
+			$messengers_to_generate[$installed_messenger->name] = $installed_messenger;
 		}
 		return $messengers_to_generate;
 	}
@@ -1604,9 +1604,9 @@ 
 	 */
 	public static function validate_messages_system() {
 		/** @type EE_Message_Resource_Manager $message_resource_manager */
-		$message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
+		$message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 		$message_resource_manager->validate_active_message_types_are_installed();
-		do_action( 'AHEE__EEH_Activation__validate_messages_system' );
+		do_action('AHEE__EEH_Activation__validate_messages_system');
 	}
 
 
@@ -1619,12 +1619,12 @@ 
 	 * 	@static
 	 * 	@return void
 	 */
-	public static function create_no_ticket_prices_array(){
+	public static function create_no_ticket_prices_array() {
 		// this creates an array for tracking events that have no active ticket prices created
 		// this allows us to warn admins of the situation so that it can be corrected
-		$espresso_no_ticket_prices = get_option( 'ee_no_ticket_prices', FALSE );
-		if ( ! $espresso_no_ticket_prices ) {
-			add_option( 'ee_no_ticket_prices', array(), '', FALSE );
+		$espresso_no_ticket_prices = get_option('ee_no_ticket_prices', FALSE);
+		if ( ! $espresso_no_ticket_prices) {
+			add_option('ee_no_ticket_prices', array(), '', FALSE);
 		}
 	}
 
@@ -1649,24 +1649,24 @@ 
 	 * @global wpdb $wpdb
 	 * @throws \EE_Error
 	 */
-	public static function delete_all_espresso_cpt_data(){
+	public static function delete_all_espresso_cpt_data() {
 		global $wpdb;
 		//get all the CPT post_types
 		$ee_post_types = array();
-		foreach(EE_Registry::instance()->non_abstract_db_models as $model_name){
-			if ( method_exists( $model_name, 'instance' )) {
-				$model_obj = call_user_func( array( $model_name, 'instance' ));
-				if ( $model_obj instanceof EEM_CPT_Base ) {
-					$ee_post_types[] = $wpdb->prepare("%s",$model_obj->post_type());
+		foreach (EE_Registry::instance()->non_abstract_db_models as $model_name) {
+			if (method_exists($model_name, 'instance')) {
+				$model_obj = call_user_func(array($model_name, 'instance'));
+				if ($model_obj instanceof EEM_CPT_Base) {
+					$ee_post_types[] = $wpdb->prepare("%s", $model_obj->post_type());
 				}
 			}
 		}
 		//get all our CPTs
-		$query = "SELECT ID FROM {$wpdb->posts} WHERE post_type IN (".implode(",",$ee_post_types).")";
+		$query = "SELECT ID FROM {$wpdb->posts} WHERE post_type IN (".implode(",", $ee_post_types).")";
 		$cpt_ids = $wpdb->get_col($query);
 		//delete each post meta and term relations too
-		foreach($cpt_ids as $post_id){
-			wp_delete_post($post_id,true);
+		foreach ($cpt_ids as $post_id) {
+			wp_delete_post($post_id, true);
 		}
 	}
 
@@ -1680,18 +1680,18 @@ 
 	 * @param bool $remove_all
 	 * @return void
 	 */
-	public static function delete_all_espresso_tables_and_data( $remove_all = true ) {
+	public static function delete_all_espresso_tables_and_data($remove_all = true) {
 		global $wpdb;
 		$undeleted_tables = array();
 
 		// load registry
-		foreach( EE_Registry::instance()->non_abstract_db_models as $model_name ){
-			if ( method_exists( $model_name, 'instance' )) {
-				$model_obj = call_user_func( array( $model_name, 'instance' ));
-				if ( $model_obj instanceof EEM_Base ) {
-					foreach ( $model_obj->get_tables() as $table ) {
-						if ( strpos( $table->get_table_name(), 'esp_' )) {
-							switch ( EEH_Activation::delete_unused_db_table( $table->get_table_name() )) {
+		foreach (EE_Registry::instance()->non_abstract_db_models as $model_name) {
+			if (method_exists($model_name, 'instance')) {
+				$model_obj = call_user_func(array($model_name, 'instance'));
+				if ($model_obj instanceof EEM_Base) {
+					foreach ($model_obj->get_tables() as $table) {
+						if (strpos($table->get_table_name(), 'esp_')) {
+							switch (EEH_Activation::delete_unused_db_table($table->get_table_name())) {
 								case false :
 									$undeleted_tables[] = $table->get_table_name();
 								break;
@@ -1716,8 +1716,8 @@ 
 			'esp_promotion_rule',
 			'esp_rule'
 		);
-		foreach( $tables_without_models as $table ){
-			EEH_Activation::delete_db_table_if_empty( $table );
+		foreach ($tables_without_models as $table) {
+			EEH_Activation::delete_db_table_if_empty($table);
 		}
 
 
@@ -1755,58 +1755,58 @@ 
 			'ee_job_parameters_' => false,
 			'ee_upload_directories_incomplete' => true,
 		);
-		if( is_main_site() ) {
-			$wp_options_to_delete[ 'ee_network_config' ] = true;
+		if (is_main_site()) {
+			$wp_options_to_delete['ee_network_config'] = true;
 		}
 
 		$undeleted_options = array();
-		foreach ( $wp_options_to_delete as $option_name => $no_wildcard ) {
+		foreach ($wp_options_to_delete as $option_name => $no_wildcard) {
 
-			if( $no_wildcard ){
-				if( ! delete_option( $option_name ) ){
+			if ($no_wildcard) {
+				if ( ! delete_option($option_name)) {
 					$undeleted_options[] = $option_name;
 				}
-			}else{
-				$option_names_to_delete_from_wildcard = $wpdb->get_col( "SELECT option_name FROM $wpdb->options WHERE option_name LIKE '%$option_name%'" );
-				foreach($option_names_to_delete_from_wildcard as $option_name_from_wildcard ){
-					if( ! delete_option( $option_name_from_wildcard ) ){
+			} else {
+				$option_names_to_delete_from_wildcard = $wpdb->get_col("SELECT option_name FROM $wpdb->options WHERE option_name LIKE '%$option_name%'");
+				foreach ($option_names_to_delete_from_wildcard as $option_name_from_wildcard) {
+					if ( ! delete_option($option_name_from_wildcard)) {
 						$undeleted_options[] = $option_name_from_wildcard;
 					}
 				}
 			}
 		}
                 //also, let's make sure the "ee_config_option_names" wp option stays out by removing the action that adds it
-                remove_action( 'shutdown', array( EE_Config::instance(), 'shutdown' ), 10 );
+                remove_action('shutdown', array(EE_Config::instance(), 'shutdown'), 10);
 
-		if ( $remove_all && $espresso_db_update = (array) get_option( 'espresso_db_update' )) {
+		if ($remove_all && $espresso_db_update = (array) get_option('espresso_db_update')) {
 			$db_update_sans_ee4 = array();
-			foreach($espresso_db_update as $version => $times_activated){
-				if( (string)$version[0] === '3'){//if its NON EE4
+			foreach ($espresso_db_update as $version => $times_activated) {
+				if ((string) $version[0] === '3') {//if its NON EE4
 					$db_update_sans_ee4[$version] = $times_activated;
 				}
 			}
-			update_option( 'espresso_db_update', $db_update_sans_ee4 );
+			update_option('espresso_db_update', $db_update_sans_ee4);
 		}
 
 		$errors = '';
-		if ( ! empty( $undeleted_tables )) {
+		if ( ! empty($undeleted_tables)) {
 			$errors .= sprintf(
-				__( 'The following tables could not be deleted: %s%s', 'event_espresso' ),
+				__('The following tables could not be deleted: %s%s', 'event_espresso'),
 				'<br/>',
-				implode( ',<br/>', $undeleted_tables )
+				implode(',<br/>', $undeleted_tables)
 			);
 		}
-		if ( ! empty( $undeleted_options )) {
-			$errors .= ! empty( $undeleted_tables ) ? '<br/>' : '';
+		if ( ! empty($undeleted_options)) {
+			$errors .= ! empty($undeleted_tables) ? '<br/>' : '';
 			$errors .= sprintf(
-				__( 'The following wp-options could not be deleted: %s%s', 'event_espresso' ),
+				__('The following wp-options could not be deleted: %s%s', 'event_espresso'),
 				'<br/>',
-				implode( ',<br/>', $undeleted_options )
+				implode(',<br/>', $undeleted_options)
 			);
 
 		}
-		if ( ! empty( $errors ) ) {
-			EE_Error::add_attention( $errors, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! empty($errors)) {
+			EE_Error::add_attention($errors, __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -1816,10 +1816,10 @@ 
 	 */
 	public static function last_wpdb_error_code() {
 		global $wpdb;
-		if( $wpdb->use_mysqli ) {
-			return mysqli_errno( $wpdb->dbh );
+		if ($wpdb->use_mysqli) {
+			return mysqli_errno($wpdb->dbh);
 		} else {
-			return mysql_errno( $wpdb->dbh );
+			return mysql_errno($wpdb->dbh);
 		}
 	}
 
@@ -1829,23 +1829,23 @@ 
 	 * @param string $table_name with or without $wpdb->prefix
 	 * @return boolean
 	 */
-	public static function table_exists( $table_name ){
+	public static function table_exists($table_name) {
 		global $wpdb, $EZSQL_ERROR;
-		$table_name = EEH_Activation::ensure_table_name_has_prefix( $table_name );
+		$table_name = EEH_Activation::ensure_table_name_has_prefix($table_name);
 		//ignore if this causes an sql error
 		$old_error = $wpdb->last_error;
 		$old_suppress_errors = $wpdb->suppress_errors();
-		$old_show_errors_value = $wpdb->show_errors( FALSE );
+		$old_show_errors_value = $wpdb->show_errors(FALSE);
 		$ezsql_error_cache = $EZSQL_ERROR;
-		$wpdb->get_results( "SELECT * from $table_name LIMIT 1");
-		$wpdb->show_errors( $old_show_errors_value );
-		$wpdb->suppress_errors( $old_suppress_errors );
+		$wpdb->get_results("SELECT * from $table_name LIMIT 1");
+		$wpdb->show_errors($old_show_errors_value);
+		$wpdb->suppress_errors($old_suppress_errors);
 		$new_error = $wpdb->last_error;
 		$wpdb->last_error = $old_error;
 		$EZSQL_ERROR = $ezsql_error_cache;
 		//if there was a table doesn't exist error
-		if( ! empty( $new_error ) ) {
-			if(
+		if ( ! empty($new_error)) {
+			if (
 				in_array(
 					EEH_Activation::last_wpdb_error_code(),
 					array(
@@ -1855,14 +1855,14 @@ 
 					)
 				)
 				||
-				preg_match( '~^Table .* doesn\'t exist~', $new_error ) //in case not using mysql and error codes aren't reliable, just check for this error string
+				preg_match('~^Table .* doesn\'t exist~', $new_error) //in case not using mysql and error codes aren't reliable, just check for this error string
 			) {
 				return false;
 			} else {
 				//log this because that's weird. Just use the normal PHP error log
 				error_log(
 					sprintf(
-						__( 'Event Espresso error detected when checking if table existed: %1$s (it wasn\'t just that the table didn\'t exist either)', 'event_espresso' ),
+						__('Event Espresso error detected when checking if table existed: %1$s (it wasn\'t just that the table didn\'t exist either)', 'event_espresso'),
 					$new_error
 					)
 				);
@@ -1874,7 +1874,7 @@ 
 	/**
 	 * Resets the cache on EEH_Activation
 	 */
-	public static function reset(){
+	public static function reset() {
 		self::$_default_creator_id = NULL;
 		self::$_initialized_db_content_already_in_this_request = false;
 	}

Doc Comments +2 added lines, -1 removed lines

@@ -567,7 +567,7 @@ 
 	 * @since  4.6.0
 	 * @global WPDB $wpdb
 	 *
-	 * @return mixed null|int WP_user ID or NULL
+	 * @return integer|null null|int WP_user ID or NULL
 	 */
 	public static function get_default_creator_id() {
 		global $wpdb;
@@ -713,6 +713,7 @@ 
 	 * 	@access public
 	 * 	@static
 	 * 	@param string $table_name, without prefixed $wpdb->prefix
+	 * @param string $table_name
 	 * 	@return array|boolean of database column names
 	 */
 	public static function get_fields_on_table( $table_name = NULL ) {

Indentation +3 added lines, -3 removed lines

@@ -218,7 +218,7 @@ 
 			if ( is_array( $hooks_to_fire_at_time ) ) {
 				foreach ( (array) $hooks_to_fire_at_time as $hook_name => $hook_actions ) {
 					if ( isset( $ee_cron_tasks_to_remove[ $hook_name ] )
-					     && is_array( $ee_cron_tasks_to_remove[ $hook_name ] )
+						 && is_array( $ee_cron_tasks_to_remove[ $hook_name ] )
 					) {
 						unset( $crons[ $timestamp ][ $hook_name ] );
 					}
@@ -1775,8 +1775,8 @@ 
 				}
 			}
 		}
-                //also, let's make sure the "ee_config_option_names" wp option stays out by removing the action that adds it
-                remove_action( 'shutdown', array( EE_Config::instance(), 'shutdown' ), 10 );
+				//also, let's make sure the "ee_config_option_names" wp option stays out by removing the action that adds it
+				remove_action( 'shutdown', array( EE_Config::instance(), 'shutdown' ), 10 );
 
 		if ( $remove_all && $espresso_db_update = (array) get_option( 'espresso_db_update' )) {
 			$db_update_sans_ee4 = array();

admin_pages/registration_form/RegistrationFormEditor.php

Spacing +40 added lines, -40 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\admin_pages\registration_form;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -79,9 +79,9 @@ 
 	 * @throws \EE_Error
 	 */
 	public function getAdminPageTitle() {
-		$page_title = ucwords( str_replace( '_', ' ', $this->reg_form_admin_page->get_req_action() ) );
+		$page_title = ucwords(str_replace('_', ' ', $this->reg_form_admin_page->get_req_action()));
 		return $this->question_group->ID()
-			? $page_title . ' # ' . $this->question_group->ID()
+			? $page_title.' # '.$this->question_group->ID()
 			: $page_title;
 	}
 
@@ -94,8 +94,8 @@ 
 	 * @throws \EE_Error
 	 */
 	public function getAdditionalHiddenFields() {
-		if ( $this->question_group->ID() ) {
-			return array( 'QSG_ID' => array( 'type' => 'hidden', 'value' => $this->question_group->ID() ) );
+		if ($this->question_group->ID()) {
+			return array('QSG_ID' => array('type' => 'hidden', 'value' => $this->question_group->ID()));
 		} else {
 			return array();
 		}
@@ -130,20 +130,20 @@ 
 	 * @throws \EE_Error
 	 */
 	public function getAdminPageContent() {
-		\EE_Registry::instance()->load_helper( 'EEH_HTML' );
-		$html = \EEH_HTML::div( '', 'ee-reg-form-editor-form-main-meta-box', 'ee-reg-form-editor-form-dv postbox' );
+		\EE_Registry::instance()->load_helper('EEH_HTML');
+		$html = \EEH_HTML::div('', 'ee-reg-form-editor-form-main-meta-box', 'ee-reg-form-editor-form-dv postbox');
 			$html .= \EEH_HTML::div(
 				'',
 				'ee-reg-form-editor-form-inputs-wrapper-dv',
 				'ee-reg-form-editor-form-inputs-wrapper-dv'
 			);
-				$html .= \EEH_HTML::ul( 'ee-reg-form-editor-active-form-ul', 'sortable' );
+				$html .= \EEH_HTML::ul('ee-reg-form-editor-active-form-ul', 'sortable');
 		// foreach ( $this->available_form_inputs as $form_input => $form_input_class_name ) {
 		// 	\EEH_Debug_Tools::printr( $form_input, '$form_input', __FILE__, __LINE__ );
 		// 	\EEH_Debug_Tools::printr( $form_input_class_name, '$form_input_class_name', __FILE__, __LINE__ );
 		// }
-				if ( $this->question_group->ID() ) {
-					foreach ( $this->question_group->questions() as $question ) {
+				if ($this->question_group->ID()) {
+					foreach ($this->question_group->questions() as $question) {
 						$html .= $this->formatInputListItem(
 							$question->identifier(),
 							$question->get_form_input_class_name(),
@@ -153,12 +153,12 @@ 
 					}
 				}
 				$html .= \EEH_HTML::ulx();
-				$html .= \EEH_HTML::div( '', '', 'ee-reg-form-editor-form-new-input-dv droppable' );
-				$html .= \EEH_HTML::h2( 'drag and drop form inputs to add', '', 'ee-reg-form-editor-form-new-input-hdr' );
+				$html .= \EEH_HTML::div('', '', 'ee-reg-form-editor-form-new-input-dv droppable');
+				$html .= \EEH_HTML::h2('drag and drop form inputs to add', '', 'ee-reg-form-editor-form-new-input-hdr');
 				$html .= \EEH_HTML::divx();
 			$html .= \EEH_HTML::divx();
 		$html .= \EEH_HTML::divx();
-		do_action( 'AHEE__EE_Admin_Page__reg_form_editor_form_sections_meta_box__after_content' );
+		do_action('AHEE__EE_Admin_Page__reg_form_editor_form_sections_meta_box__after_content');
 		$input_list = new \EE_Hidden_Input(
 			array(
 				'html_id'   => 'reg_form-input_list',
@@ -182,7 +182,7 @@ 
 			'ee-reg-form-editor-form-layout-meta-box',
 			'ee-reg-form-editor-form-layout-dv infolinks'
 		);
-		$html .= \EEH_HTML::ul( '', 'ee-reg-form-editor-form-layout-ul draggable' );
+		$html .= \EEH_HTML::ul('', 'ee-reg-form-editor-form-layout-ul draggable');
 		$html .= \EEH_HTML::li(
 			'',
 			'ee-reg-form-editor-form-layout-li-html',
@@ -199,7 +199,7 @@ 
 		$html .= \EEH_HTML::ulx();
 		$html .= \EEH_HTML::divx();
 		echo $html;
-		do_action( 'AHEE__EE_Admin_Page__reg_form_editor_form_layout_meta_box__after_content' );
+		do_action('AHEE__EE_Admin_Page__reg_form_editor_form_layout_meta_box__after_content');
 	}
 
 
@@ -208,19 +208,19 @@ 
 	 * addMetaBoxes
 	 */
 	public function addMetaBoxes() {
-		\EE_Registry::instance()->load_helper( 'EEH_HTML' );
+		\EE_Registry::instance()->load_helper('EEH_HTML');
 		//sidebars
 		add_meta_box(
 			'espresso_reg_form_editor_form_layout_meta_box',
-			__( 'Form Layout', 'event_espresso' ),
-			array( $this, 'formLayoutMetaBox' ),
+			__('Form Layout', 'event_espresso'),
+			array($this, 'formLayoutMetaBox'),
 			$this->reg_form_admin_page->get_wp_page_slug(),
 			'side'
 		);
 		add_meta_box(
 			'espresso_reg_form_editor_form_inputs_meta_box',
-			__( 'Form Inputs', 'event_espresso' ),
-			array( $this, 'formInputsMetaBox' ),
+			__('Form Inputs', 'event_espresso'),
+			array($this, 'formInputsMetaBox'),
 			$this->reg_form_admin_page->get_wp_page_slug(),
 			'side'
 		);
@@ -240,27 +240,27 @@ 
 			'ee-reg-form-editor-form-inputs-meta-box',
 			'ee-reg-form-editor-form-inputs-dv infolinks'
 		);
-		$html .= \EEH_HTML::ul( '', 'ee-reg-form-editor-form-inputs-ul draggable' );
-		foreach ( $this->available_form_inputs as $form_input => $form_input_class_name ) {
+		$html .= \EEH_HTML::ul('', 'ee-reg-form-editor-form-inputs-ul draggable');
+		foreach ($this->available_form_inputs as $form_input => $form_input_class_name) {
 			$html .= \EEH_HTML::li(
 				'',
-				'ee-reg-form-editor-form-input-li-' . $form_input,
+				'ee-reg-form-editor-form-input-li-'.$form_input,
 				'ee-reg-form-editor-form-input-li'
 			);
 			$html .= \EEH_HTML::div(
-				$this->formatInputName( $form_input_class_name ),
-				'ee-reg-form-editor-form-input-' . $form_input,
+				$this->formatInputName($form_input_class_name),
+				'ee-reg-form-editor-form-input-'.$form_input,
 				'ee-reg-form-editor-form-input draggable button',
 				'',
-				'data-form_input="ee-reg-form-editor-active-form-li-' . $form_input . '"'
+				'data-form_input="ee-reg-form-editor-active-form-li-'.$form_input.'"'
 			);
-			$html .= $this->formatInputListItem( $form_input, $form_input_class_name );
+			$html .= $this->formatInputListItem($form_input, $form_input_class_name);
 			$html .= \EEH_HTML::lix(); // end 'ee-reg-form-editor-form-input-li'
 		}
 		$html .= \EEH_HTML::ulx();
 		$html .= \EEH_HTML::divx();
 		echo $html;
-		do_action( 'AHEE__EE_Admin_Page__reg_form_editor_form_sections_meta_box__after_content' );
+		do_action('AHEE__EE_Admin_Page__reg_form_editor_form_sections_meta_box__after_content');
 	}
 
 
@@ -283,41 +283,41 @@ 
 	) {
 		$html = \EEH_HTML::li(
 			'',
-			'ee-reg-form-editor-active-form-li-' . $form_input,
+			'ee-reg-form-editor-active-form-li-'.$form_input,
 			'ee-reg-form-editor-active-form-li',
 			! $display ? 'display:none;' : ''
 		);
-		$html .= \EEH_HTML::div( '', '', 'ee-reg-form-editor-active-form-controls-dv' );
+		$html .= \EEH_HTML::div('', '', 'ee-reg-form-editor-active-form-controls-dv');
 		$html .= \EEH_HTML::span(
 			'',
 			'',
 			'ee-form-input-control-config ee-config-form-input dashicons dashicons-admin-generic',
 			'',
-			'title="' . __( 'Click to Edit Settings', 'event_espresso' ) . '"'
+			'title="'.__('Click to Edit Settings', 'event_espresso').'"'
 		);
 		$html .= \EEH_HTML::span(
 			'',
 			'',
 			'ee-form-input-control-delete ee-delete-form-input dashicons dashicons-trash',
 			'',
-			'title="' . __( 'Click to Delete', 'event_espresso' ) . '"'
+			'title="'.__('Click to Delete', 'event_espresso').'"'
 		);
 		$html .= \EEH_HTML::span(
 			'',
 			'',
 			'ee-form-input-control-sort dashicons dashicons-arrow-up-alt2',
 			'',
-			'title="' . __( 'Drag to Sort', 'event_espresso' ) . '"'
+			'title="'.__('Drag to Sort', 'event_espresso').'"'
 		);
 		$html .= \EEH_HTML::span(
 			'',
 			'',
 			'ee-form-input-control-sort dashicons dashicons-arrow-down-alt2', //list-view
 			'',
-			'title="' . __( 'Drag to Sort', 'event_espresso' ) . '"'
+			'title="'.__('Drag to Sort', 'event_espresso').'"'
 		);
 		$html .= \EEH_HTML::divx(); // end 'ee-reg-form-editor-active-form-controls-dv'
-		$html .= $this->input_form_generator->formHTML( $form_input, $form_input_class_name, $question );
+		$html .= $this->input_form_generator->formHTML($form_input, $form_input_class_name, $question);
 		$html .= \EEH_HTML::lix(); // end 'ee-reg-form-editor-active-form-li'
 		return $html;
 	}
@@ -330,15 +330,15 @@ 
 	 * @param $form_input_class_name
 	 * @return string
 	 */
-	protected function formatInputName( $form_input_class_name ) {
+	protected function formatInputName($form_input_class_name) {
 		$form_input_class_name = trim(
 			str_replace(
-				array( '\EE_', '_Input', '_' ), // find
-				array( '', '', ' ' ),           // replace
+				array('\EE_', '_Input', '_'), // find
+				array('', '', ' '), // replace
 				$form_input_class_name
 			)
 		);
-		switch( $form_input_class_name ) {
+		switch ($form_input_class_name) {
 			case 'Admin File Uploader' :
 				$form_input_class_name = 'File Uploader';
 				break;

admin_pages/registration_form/FormSectionListTable.php

Indentation +9 added lines, -9 removed lines

@@ -122,8 +122,8 @@ 
 		$lock_icon = $system_group === 0 && $this->_view === 'trash' && $has_questions_with_answers
 			? 'ee-lock-icon ee-alternate-color' : 'ee-lock-icon ee-system-lock';
 		return $system_group > 0
-		       || ( $system_group === 0 && $this->_view === 'trash' && $has_questions_with_answers )
-		       || ! \EE_Registry::instance()->CAP->current_user_can(
+			   || ( $system_group === 0 && $this->_view === 'trash' && $has_questions_with_answers )
+			   || ! \EE_Registry::instance()->CAP->current_user_can(
 			'ee_delete_question_groups',
 			'espresso_registration_form_trash_form_sections',
 			$item->ID()
@@ -192,12 +192,12 @@ 
 		) {
 			$actions = array(
 				'edit' => '<a href="'
-				          . $edit_link
-				          . '" title="'
-				          . esc_attr__( 'Edit Question Group', 'event_espresso' )
-				          . '">'
-				          . __( 'Edit', 'event_espresso' )
-				          . '</a>'
+						  . $edit_link
+						  . '" title="'
+						  . esc_attr__( 'Edit Question Group', 'event_espresso' )
+						  . '">'
+						  . __( 'Edit', 'event_espresso' )
+						  . '</a>'
 			);
 		}
 		if (
@@ -227,7 +227,7 @@ 
 					) . '">' . __( 'Restore', 'event_espresso' ) . '</a>';
 			}
 			if ( ! $item->has_questions_with_answers()
-			     && \EE_Registry::instance()->CAP->current_user_can(
+				 && \EE_Registry::instance()->CAP->current_user_can(
 					'ee_delete_question_group',
 					'espresso_registration_form_delete_form_section',
 					$item->ID()

Spacing +42 added lines, -42 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 namespace EventEspresso\admin_pages\registration_form;
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 
 
@@ -29,9 +29,9 @@ 
 	 *
 	 * @param \Registration_Form_Admin_Page $admin_page
 	 */
-	public function __construct( \Registration_Form_Admin_Page $admin_page ) {
+	public function __construct(\Registration_Form_Admin_Page $admin_page) {
 		$this->adminPage = $admin_page;
-		parent::__construct( $admin_page );
+		parent::__construct($admin_page);
 	}
 
 
@@ -41,32 +41,32 @@ 
 			$this->_per_page,
 			$this->_current_page,
 			false
-		) : $this->adminPage->get_trashed_form_sections( $this->_per_page, $this->_current_page, false );
+		) : $this->adminPage->get_trashed_form_sections($this->_per_page, $this->_current_page, false);
 		$this->_all_data_count = $this->_view !== 'trash' ? $this->adminPage->get_form_sections(
 			$this->_per_page,
 			$this->_current_page,
 			true
-		) : $this->adminPage->get_trashed_form_sections( $this->_per_page, $this->_current_page, true );
+		) : $this->adminPage->get_trashed_form_sections($this->_per_page, $this->_current_page, true);
 	}
 
 
 
 	protected function _set_properties() {
 		$this->_wp_list_args = array(
-			'singular' => __( 'question group', 'event_espresso' ),
-			'plural'   => __( 'question groups', 'event_espresso' ),
+			'singular' => __('question group', 'event_espresso'),
+			'plural'   => __('question groups', 'event_espresso'),
 			'ajax'     => true, //for now,
 			'screen'   => $this->adminPage->get_current_screen()->id
 		);
 		$this->_columns = array(
 			'cb'              => '<input type="checkbox" />',
-			'id'              => __( 'ID', 'event_espresso' ),
-			'name'            => __( 'Form Section Name', 'event_espresso' ),
-			'description'     => __( 'Description', 'event_espresso' ),
+			'id'              => __('ID', 'event_espresso'),
+			'name'            => __('Form Section Name', 'event_espresso'),
+			'description'     => __('Description', 'event_espresso'),
 		);
 		$this->_sortable_columns = array(
-			'id'   => array( 'QSG_ID' => false ),
-			'name' => array( 'QSG_name' => false )
+			'id'   => array('QSG_ID' => false),
+			'name' => array('QSG_name' => false)
 		);
 		$this->_hidden_columns = array(
 			'id'
@@ -96,7 +96,7 @@ 
 			$this->_current_page,
 			true
 		);
-		if ( \EE_Registry::instance()->CAP->current_user_can(
+		if (\EE_Registry::instance()->CAP->current_user_can(
 			'ee_delete_question_groups',
 			'espresso_registration_form_trash_form_section'
 		)
@@ -116,19 +116,19 @@ 
 	 * @return string|void
 	 * @throws \EE_Error
 	 */
-	public function column_cb( $item ) {
-		$system_group = $item->get( 'QSG_system' );
+	public function column_cb($item) {
+		$system_group = $item->get('QSG_system');
 		$has_questions_with_answers = $item->has_questions_with_answers();
 		$lock_icon = $system_group === 0 && $this->_view === 'trash' && $has_questions_with_answers
 			? 'ee-lock-icon ee-alternate-color' : 'ee-lock-icon ee-system-lock';
 		return $system_group > 0
-		       || ( $system_group === 0 && $this->_view === 'trash' && $has_questions_with_answers )
+		       || ($system_group === 0 && $this->_view === 'trash' && $has_questions_with_answers)
 		       || ! \EE_Registry::instance()->CAP->current_user_can(
 			'ee_delete_question_groups',
 			'espresso_registration_form_trash_form_sections',
 			$item->ID()
 		)
-			? '<span class="' . $lock_icon . '"></span>' . sprintf(
+			? '<span class="'.$lock_icon.'"></span>'.sprintf(
 				'<input type="hidden" name="hdnchk[%1$d]" value="%1$d" />',
 				$item->ID()
 			)
@@ -145,9 +145,9 @@ 
 	 * @return mixed|string
 	 * @throws \EE_Error
 	 */
-	public function column_id( \EE_Question_Group $item ) {
+	public function column_id(\EE_Question_Group $item) {
 		$content = $item->ID();
-		$content .= '  <span class="show-on-mobile-view-only">' . $item->name() . '</span>';
+		$content .= '  <span class="show-on-mobile-view-only">'.$item->name().'</span>';
 		return $content;
 	}
 
@@ -158,11 +158,11 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function column_name( \EE_Question_Group $item ) {
+	public function column_name(\EE_Question_Group $item) {
 		$actions = array();
 		//return $item->name();
-		if ( ! defined( 'REG_ADMIN_URL' ) ) {
-			define( 'REG_ADMIN_URL', EVENTS_ADMIN_URL );
+		if ( ! defined('REG_ADMIN_URL')) {
+			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
 		}
 		$edit_query_args = array(
 			'action' => 'add_edit_form_section',
@@ -180,11 +180,11 @@ 
 			'action' => 'delete_form_section',
 			'QSG_ID' => $item->ID()
 		);
-		$edit_link = \EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EE_FORMS_ADMIN_URL );
-		$trash_link = \EE_Admin_Page::add_query_args_and_nonce( $trash_query_args, EE_FORMS_ADMIN_URL );
-		$restore_link = \EE_Admin_Page::add_query_args_and_nonce( $restore_query_args, EE_FORMS_ADMIN_URL );
-		$delete_link = \EE_Admin_Page::add_query_args_and_nonce( $delete_query_args, EE_FORMS_ADMIN_URL );
-		if ( \EE_Registry::instance()->CAP->current_user_can(
+		$edit_link = \EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL);
+		$trash_link = \EE_Admin_Page::add_query_args_and_nonce($trash_query_args, EE_FORMS_ADMIN_URL);
+		$restore_link = \EE_Admin_Page::add_query_args_and_nonce($restore_query_args, EE_FORMS_ADMIN_URL);
+		$delete_link = \EE_Admin_Page::add_query_args_and_nonce($delete_query_args, EE_FORMS_ADMIN_URL);
+		if (\EE_Registry::instance()->CAP->current_user_can(
 			'ee_edit_question_group',
 			'espresso_registration_form_edit_form_section',
 			$item->ID()
@@ -194,37 +194,37 @@ 
 				'edit' => '<a href="'
 				          . $edit_link
 				          . '" title="'
-				          . esc_attr__( 'Edit Question Group', 'event_espresso' )
+				          . esc_attr__('Edit Question Group', 'event_espresso')
 				          . '">'
-				          . __( 'Edit', 'event_espresso' )
+				          . __('Edit', 'event_espresso')
 				          . '</a>'
 			);
 		}
 		if (
 			$this->_view !== 'trash'
-			&& $item->get( 'QSG_system' ) < 1
+			&& $item->get('QSG_system') < 1
 			&& \EE_Registry::instance()->CAP->current_user_can(
 				'ee_delete_question_group',
 				'espresso_registration_form_trash_form_section',
 				$item->ID()
 			)
 		) {
-			$actions['delete'] = '<a href="' . $trash_link . '" title="' . esc_attr__(
+			$actions['delete'] = '<a href="'.$trash_link.'" title="'.esc_attr__(
 					'Delete Question Group',
 					'event_espresso'
-				) . '">' . __( 'Trash', 'event_espresso' ) . '</a>';
+				).'">'.__('Trash', 'event_espresso').'</a>';
 		}
-		if ( $this->_view === 'trash' ) {
-			if ( \EE_Registry::instance()->CAP->current_user_can(
+		if ($this->_view === 'trash') {
+			if (\EE_Registry::instance()->CAP->current_user_can(
 				'ee_delete_question_group',
 				'espresso_registration_form_restore_form_section',
 				$item->ID()
 			)
 			) {
-				$actions['restore'] = '<a href="' . $restore_link . '" title="' . esc_attr__(
+				$actions['restore'] = '<a href="'.$restore_link.'" title="'.esc_attr__(
 						'Restore Question Group',
 						'event_espresso'
-					) . '">' . __( 'Restore', 'event_espresso' ) . '</a>';
+					).'">'.__('Restore', 'event_espresso').'</a>';
 			}
 			if ( ! $item->has_questions_with_answers()
 			     && \EE_Registry::instance()->CAP->current_user_can(
@@ -233,18 +233,18 @@ 
 					$item->ID()
 				)
 			) {
-				$actions['delete'] = '<a href="' . $delete_link . '" title="' . esc_attr__(
+				$actions['delete'] = '<a href="'.$delete_link.'" title="'.esc_attr__(
 						'Delete Question Group Permanently',
 						'event_espresso'
-					) . '">' . __( 'Delete Permanently', 'event_espresso' ) . '</a>';
+					).'">'.__('Delete Permanently', 'event_espresso').'</a>';
 			}
 		}
 		$content = \EE_Registry::instance()->CAP->current_user_can(
 			'ee_edit_question_group',
 			'espresso_registration_form_edit_form_section',
 			$item->ID()
-		) ? '<strong><a class="row-title" href="' . $edit_link . '">' . $item->name() . '</a></strong>' : $item->name();
-		$content .= $this->row_actions( $actions );
+		) ? '<strong><a class="row-title" href="'.$edit_link.'">'.$item->name().'</a></strong>' : $item->name();
+		$content .= $this->row_actions($actions);
 		return $content;
 	}
 
@@ -254,7 +254,7 @@ 
 	 * @param \EE_Question_Group $item
 	 * @return string
 	 */
-	public function column_identifier( \EE_Question_Group $item ) {
+	public function column_identifier(\EE_Question_Group $item) {
 		return $item->identifier();
 	}
 
@@ -264,7 +264,7 @@ 
 	 * @param \EE_Question_Group $item
 	 * @return string
 	 */
-	public function column_description( \EE_Question_Group $item ) {
+	public function column_description(\EE_Question_Group $item) {
 		return $item->desc();
 	}
 

Doc Comments +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
 
 	/**
 	 * @param \EE_Question_Group $item
-	 * @return mixed|string
+	 * @return string
 	 * @throws \EE_Error
 	 */
 	public function column_id( \EE_Question_Group $item ) {