eventespresso / event-espresso-core

core/data_migration_scripts/4_5_0_stages/EE_DMS_4_5_0_invoice_settings.dmsstage.php

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		//so in case teh IPN is arriving later, let's try to process an IPN!
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
 			return $this->handle_ipn($_POST, $transaction );
-		}else{
+		} else{
 			return parent::finalize_payment_for( $transaction );
 		}
 	}

Spacing +24 added lines, -24 removed lines

@@ -29,7 +29,7 @@ 
 	 * Just initializes the status of the migration
 	 */
 	public function __construct() {
-		$this->_pretty_name = __( 'Update Invoice Gateway Settings', 'event_espresso' );
+		$this->_pretty_name = __('Update Invoice Gateway Settings', 'event_espresso');
 		parent::__construct();
 	}
 
@@ -56,39 +56,39 @@ 
 	 * @throws EE_Error
 	 * @return int number of items ACTUALLY migrated
 	 */
-	protected function _migration_step( $num_items = 1 ){
+	protected function _migration_step($num_items = 1) {
 		// if this isn't set then something is really wrong
-		if ( ! EE_Config::instance()->gateway instanceof EE_Gateway_Config ) {
-			throw new EE_Error( __( 'It appears the Event Espresso Core Configuration is not setup correctly.', 'event_espresso' ));
+		if ( ! EE_Config::instance()->gateway instanceof EE_Gateway_Config) {
+			throw new EE_Error(__('It appears the Event Espresso Core Configuration is not setup correctly.', 'event_espresso'));
 		}
-		$invoice_settings = isset( EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] ) ? EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] : NULL;
-		if( ! $invoice_settings ){
-			$this->add_error( __( 'Could not migrate EE4.4 invoice settings to EE4.5 because they didnt exist', 'event_espresso' ) );
-		}else{
-			$invoice_settings[ 'template_payment_instructions' ] = $invoice_settings[ 'pdf_instructions' ];
-			$invoice_settings[ 'template_invoice_payee_name' ] = $invoice_settings[ 'payable_to' ];
-			$invoice_settings[ 'template_invoice_address' ] = $invoice_settings[ 'payment_address' ];
-			$invoice_settings[ 'template_invoice_email' ] = '';
-			$invoice_settings[ 'template_invoice_tax_number' ] = '';
-			unset( $invoice_settings[ 'pdf_instructions' ] );
-			unset( $invoice_settings[ 'payable_to' ] );
-			unset( $invoice_settings[ 'payment_address' ] );
-			EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] = $invoice_settings;
-			EE_Config::instance()->update_espresso_config(false,false);
+		$invoice_settings = isset(EE_Config::instance()->gateway->payment_settings['Invoice']) ? EE_Config::instance()->gateway->payment_settings['Invoice'] : NULL;
+		if ( ! $invoice_settings) {
+			$this->add_error(__('Could not migrate EE4.4 invoice settings to EE4.5 because they didnt exist', 'event_espresso'));
+		} else {
+			$invoice_settings['template_payment_instructions'] = $invoice_settings['pdf_instructions'];
+			$invoice_settings['template_invoice_payee_name'] = $invoice_settings['payable_to'];
+			$invoice_settings['template_invoice_address'] = $invoice_settings['payment_address'];
+			$invoice_settings['template_invoice_email'] = '';
+			$invoice_settings['template_invoice_tax_number'] = '';
+			unset($invoice_settings['pdf_instructions']);
+			unset($invoice_settings['payable_to']);
+			unset($invoice_settings['payment_address']);
+			EE_Config::instance()->gateway->payment_settings['Invoice'] = $invoice_settings;
+			EE_Config::instance()->update_espresso_config(false, false);
 
 			//@todo: check 'invoice_css' too because we can't easily affect that so we might need to set a persistent notice
 			//(why is it tough to change? because we want to update the receipt and invoice message template, but
 			//message templates are only initialized AFTER migrations and those two are new in 4.5. So if we wanted to
 			//update them from a DMS, we'd need to have the DMS create the message templates which is quite a lot of code;
 			//also we don't want to build a dependency on the messages code because it is likely to change soon
-			if( ! in_array( $invoice_settings[ 'invoice_css' ], array( '', 'simple.css' ) ) ){
-				EE_Error::add_persistent_admin_notice( 'invoice_css_not_updated', sprintf( __( 'You had previously set your Invoice Payment Method\'s stylesheet to be %1$s, but that setting has moved. PDF and HTML Invoices and Receipts are now Messages, which means you can easily modify them from your Wordpress Dashboard instead of using filters or uploading template files. Please visit Messages -> Receipt and Messages -> Invoice to change their stylesheets.', 'event_espresso'), $invoice_settings[ 'invoice_css' ] ), FALSE );
+			if ( ! in_array($invoice_settings['invoice_css'], array('', 'simple.css'))) {
+				EE_Error::add_persistent_admin_notice('invoice_css_not_updated', sprintf(__('You had previously set your Invoice Payment Method\'s stylesheet to be %1$s, but that setting has moved. PDF and HTML Invoices and Receipts are now Messages, which means you can easily modify them from your Wordpress Dashboard instead of using filters or uploading template files. Please visit Messages -> Receipt and Messages -> Invoice to change their stylesheets.', 'event_espresso'), $invoice_settings['invoice_css']), FALSE);
 			}
 			$templates_relative_path = 'modules/gateways/Invoice/lib/templates/';
-			$overridden_invoice_body = EEH_Template::locate_template( $templates_relative_path . 'invoice_body.template.php', NULL, FALSE, FALSE, TRUE );
-			$overridden_receipt_body= EEH_Template::locate_template( $templates_relative_path . 'receipt_body.template.php', NULL, FALSE, FALSE, TRUE );
-			if( $overridden_invoice_body || $overridden_receipt_body ) {
-				EE_Error::add_persistent_admin_notice( 'invoice_overriding_templates', sprintf( __( 'Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overriden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents. We recommend deleting your old Invoice/Receipt templates and modifying the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.')), TRUE );
+			$overridden_invoice_body = EEH_Template::locate_template($templates_relative_path.'invoice_body.template.php', NULL, FALSE, FALSE, TRUE);
+			$overridden_receipt_body = EEH_Template::locate_template($templates_relative_path.'receipt_body.template.php', NULL, FALSE, FALSE, TRUE);
+			if ($overridden_invoice_body || $overridden_receipt_body) {
+				EE_Error::add_persistent_admin_notice('invoice_overriding_templates', sprintf(__('Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overriden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents. We recommend deleting your old Invoice/Receipt templates and modifying the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.')), TRUE);
 			}
 
 		}

core/data_migration_scripts/EE_DMS_Core_4_6_0.dms.php

Braces +2 added lines, -2 removed lines

@@ -65,11 +65,11 @@
 		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{
+		} else{
 //			echo "$version_string doesnt apply";
 			return false;
 		}

Spacing +64 added lines, -64 removed lines

@@ -10,13 +10,13 @@ 
 //(all other times it gets resurrected from a wordpress option)
 $stages = glob(EE_CORE.'data_migration_scripts/4_6_0_stages/*');
 $class_to_filepath = array();
-foreach($stages as $filepath){
+foreach ($stages as $filepath) {
 	$matches = array();
-	preg_match('~4_6_0_stages/(.*).dmsstage.php~',$filepath,$matches);
+	preg_match('~4_6_0_stages/(.*).dmsstage.php~', $filepath, $matches);
 	$class_to_filepath[$matches[1]] = $filepath;
 }
 //give addons a chance to autoload their stages too
-$class_to_filepath = apply_filters('FHEE__EE_DMS_4_6_0__autoloaded_stages',$class_to_filepath);
+$class_to_filepath = apply_filters('FHEE__EE_DMS_4_6_0__autoloaded_stages', $class_to_filepath);
 EEH_Autoloader::register_autoloader($class_to_filepath);
 
 
@@ -32,7 +32,7 @@ 
  * @since                4.6.0
  *
  */
-class EE_DMS_Core_4_6_0 extends EE_Data_Migration_Script_Base{
+class EE_DMS_Core_4_6_0 extends EE_Data_Migration_Script_Base {
 
 	/**
 	 * return EE_DMS_Core_4_6_0
@@ -62,14 +62,14 @@ 
 	 */
 	public function can_migrate_from_version($version_array) {
 		$version_string = $version_array['Core'];
-		if($version_string <= '4.6.0' && $version_string >= '4.5.0' ){
+		if ($version_string <= '4.6.0' && $version_string >= '4.5.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;
 		}
@@ -91,14 +91,14 @@ 
 	 */
 	public function schema_changes_before_migration() {
 		//relies on 4.1's EEH_Activation::create_table
-		require_once( EE_HELPERS . 'EEH_Activation.helper.php' );
-		$table_name='esp_answer';
-		$sql=" ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		require_once(EE_HELPERS.'EEH_Activation.helper.php');
+		$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_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_attendee_meta';
 		$sql = "ATTM_ID INT(10) UNSIGNED NOT	NULL AUTO_INCREMENT,
@@ -137,7 +137,7 @@ 
 					  CNT_is_EU TINYINT(1) DEFAULT '0',
 					  CNT_active TINYINT(1) DEFAULT '0',
 					  PRIMARY KEY  (CNT_ISO)";
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_currency';
 		$sql = "CUR_code VARCHAR(6) COLLATE utf8_bin NOT NULL,
@@ -147,7 +147,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_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_currency_payment_method';
@@ -177,7 +177,7 @@ 
 
 
 
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 		$table_name = 'esp_event_meta';
 		$sql = "
 			EVTM_ID INT NOT NULL AUTO_INCREMENT,
@@ -194,41 +194,41 @@ 
 			EVT_external_URL VARCHAR(200) NULL,
 			EVT_donations TINYINT(1) NULL,
 			PRIMARY KEY  (EVTM_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($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_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($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_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($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_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($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 '',
@@ -244,7 +244,7 @@ 
 				OBJ_ID INT(11) DEFAULT NULL,
 				OBJ_type VARCHAR(45)DEFAULT NULL,
 				PRIMARY KEY  (LIN_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_log';
 		$sql = "LOG_ID INT(11) NOT NULL AUTO_INCREMENT,
@@ -267,7 +267,7 @@ 
 					KEY GRP_ID (GRP_ID)";
 		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		EEH_Activation::drop_index( 'esp_message_template_group', 'EVT_ID' );
+		EEH_Activation::drop_index('esp_message_template_group', 'EVT_ID');
 
 		$table_name = 'esp_message_template_group';
 		$sql = "GRP_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -282,7 +282,7 @@ 
 					MTP_is_active TINYINT(1) NOT NULL DEFAULT '1',
 					PRIMARY KEY  (GRP_ID),
 					KEY MTP_user_id (MTP_user_id)";
-		$this->_table_should_exist_previously( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_event_message_template';
 		$sql = "EMT_ID BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -291,7 +291,7 @@ 
 					PRIMARY KEY  (EMT_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY GRP_ID (GRP_ID)";
-		$this->_table_should_exist_previously( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 		$table_name = 'esp_payment';
@@ -359,8 +359,8 @@ 
 					  PRIMARY KEY  (TTM_ID)";
 		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		$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,27 +372,27 @@ 
 					QST_wp_user BIGINT UNSIGNED NULL,
 					QST_deleted TINYINT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QST_ID)';
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($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,
 					QGQ_order INT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QGQ_ID) ";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($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_order INT UNSIGNED NOT NULL DEFAULT 0,
 					QSO_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSO_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -425,8 +425,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,
@@ -515,7 +515,7 @@ 
 					  PRC_wp_user BIGINT UNSIGNED NULL,
 					  PRC_parent INT(10) UNSIGNED DEFAULT 0,
 					  PRIMARY KEY  (PRC_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = "esp_price_type";
 		$sql = "PRT_ID TINYINT(3) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -552,12 +552,12 @@ 
 					  TKT_parent INT(10) UNSIGNED DEFAULT '0',
 					  TKT_deleted TINYINT(1) NOT NULL DEFAULT '0',
 					  PRIMARY KEY  (TKT_ID)";
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($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,
@@ -569,7 +569,7 @@ 
 					QSG_wp_user BIGINT UNSIGNED NULL,
 					PRIMARY KEY  (QSG_ID),
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier ASC)';
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($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');
@@ -597,15 +597,15 @@ 
 		return true;
 	}
 
-	public function migration_page_hooks(){
+	public function migration_page_hooks() {
 
 	}
 
-	public function add_default_admin_only_payments(){
+	public function add_default_admin_only_payments() {
 		global $wpdb;
 		$table_name = $wpdb->prefix."esp_payment_method";
 		$user_id = EEH_Activation::get_default_creator_id();
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '" . $table_name . "'") == $table_name ) {
+		if ($wpdb->get_var("SHOW TABLES LIKE '".$table_name."'") == $table_name) {
 
 			$SQL = "SELECT COUNT( * ) FROM $table_name";
 			$existing_payment_methods = $wpdb->get_var($SQL);
@@ -626,11 +626,11 @@ 
 			//so admins can record payments for them from the admin page
 
 
-			foreach($default_admin_only_payment_methods as $nicename => $description){
+			foreach ($default_admin_only_payment_methods as $nicename => $description) {
 				$slug = sanitize_key($nicename);
 			//check that such a payment method exists
-				$exists = $wpdb->get_var($wpdb->prepare("SELECT count(*) FROM $table_name WHERE PMD_slug = %s",$slug));
-				if( ! $exists){
+				$exists = $wpdb->get_var($wpdb->prepare("SELECT count(*) FROM $table_name WHERE PMD_slug = %s", $slug));
+				if ( ! $exists) {
 					$values = array(
 								'PMD_type'=>'Admin_Only',
 								'PMD_name'=>$nicename,
@@ -644,17 +644,17 @@ 
 							$table_name,
 							$values,
 							array(
-								'%s',//PMD_type
-								'%s',//PMD_name
-								'%s',//PMD_admin_name
-								'%s',//PMD_admin_desc
-								'%s',//PMD_slug
-								'%d',//PMD_wp_user
-								'%s',//PMD_scope
+								'%s', //PMD_type
+								'%s', //PMD_name
+								'%s', //PMD_admin_name
+								'%s', //PMD_admin_desc
+								'%s', //PMD_slug
+								'%d', //PMD_wp_user
+								'%s', //PMD_scope
 							)
 							);
-					if( ! $success ){
-						$this->add_error(sprintf(__("Could not insert new admin-only payment method with values %s during migration", "event_espresso"),$this->_json_encode($values)));
+					if ( ! $success) {
+						$this->add_error(sprintf(__("Could not insert new admin-only payment method with values %s during migration", "event_espresso"), $this->_json_encode($values)));
 					}
 				}
 			}
@@ -672,11 +672,11 @@ 
 
 		global $wpdb;
 		$currency_table = $wpdb->prefix."esp_currency";
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '" . $currency_table . "'") == $currency_table ) {
+		if ($wpdb->get_var("SHOW TABLES LIKE '".$currency_table."'") == $currency_table) {
 
 			$SQL = "SELECT COUNT('CUR_code') FROM $currency_table";
 			$countries = $wpdb->get_var($SQL);
-			if ( ! $countries ) {
+			if ( ! $countries) {
 				$SQL = "INSERT INTO $currency_table
 				( CUR_code, CUR_single, CUR_plural, CUR_sign, CUR_dec_plc, CUR_active) VALUES
 				( 'EUR',  'Euro',  'Euros',  '€',  2,1),

core/db_classes/EE_Attendee.class.php

Braces +3 added lines, -3 removed lines

@@ -92,7 +92,7 @@ 
 	public function construction_finalized(){
 		if( $this->_model instanceof EEM_Base  && $this->_action ){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -125,7 +125,7 @@ 
 	public function has_generated_cap_restrictions(){
 		if( $this->_cap_restrictions_generated === false ){
 			return false;
-		}else{
+		} else{
 			return true;
 		}
 	}
@@ -153,7 +153,7 @@ 
 		$caps_for_admin = EE_Registry::instance()->CAP->get_ee_capabilities( 'administrator' );
 		if( in_array( self::get_cap_name( $model, $action ), $caps_for_admin ) ) {
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}

Spacing +101 added lines, -101 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -33,20 +33,20 @@ 
 	 * @param string $timezone
 	 * @param array $date_formats
 	 */
-	protected function __construct( $fieldValues = NULL, $bydb = FALSE, $timezone = NULL, $date_formats = array() ) {
-		if ( !isset( $fieldValues[ 'ATT_full_name' ] ) ) {
-			$fname = isset( $fieldValues[ 'ATT_fname' ] ) ? $fieldValues[ 'ATT_fname' ] . ' ' : '';
-			$lname = isset( $fieldValues[ 'ATT_lname' ] ) ? $fieldValues[ 'ATT_lname' ] : '';
-			$fieldValues[ 'ATT_full_name' ] = $fname . $lname;
+	protected function __construct($fieldValues = NULL, $bydb = FALSE, $timezone = NULL, $date_formats = array()) {
+		if ( ! isset($fieldValues['ATT_full_name'])) {
+			$fname = isset($fieldValues['ATT_fname']) ? $fieldValues['ATT_fname'].' ' : '';
+			$lname = isset($fieldValues['ATT_lname']) ? $fieldValues['ATT_lname'] : '';
+			$fieldValues['ATT_full_name'] = $fname.$lname;
 		}
-		if ( !isset( $fieldValues[ 'ATT_slug' ] ) ) {
+		if ( ! isset($fieldValues['ATT_slug'])) {
 			//			$fieldValues['ATT_slug'] = sanitize_key(wp_generate_password(20));
-			$fieldValues[ 'ATT_slug' ] = sanitize_title( $fieldValues[ 'ATT_full_name' ] );
+			$fieldValues['ATT_slug'] = sanitize_title($fieldValues['ATT_full_name']);
 		}
-		if ( !isset( $fieldValues[ 'ATT_short_bio' ] ) && isset( $fieldValues[ 'ATT_bio' ] ) ) {
-			$fieldValues[ 'ATT_short_bio' ] = substr( $fieldValues[ 'ATT_bio' ], 0, 50 );
+		if ( ! isset($fieldValues['ATT_short_bio']) && isset($fieldValues['ATT_bio'])) {
+			$fieldValues['ATT_short_bio'] = substr($fieldValues['ATT_bio'], 0, 50);
 		}
-		parent::__construct( $fieldValues, $bydb, $timezone, $date_formats );
+		parent::__construct($fieldValues, $bydb, $timezone, $date_formats);
 	}
 
 
@@ -60,9 +60,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Attendee
 	 */
-	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);
 	}
 
 
@@ -73,8 +73,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Attendee
 	 */
-	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);
 	}
 
 
@@ -85,8 +85,8 @@ 
 	 * @access        public
 	 * @param string $fname
 	 */
-	public function set_fname( $fname = '' ) {
-		$this->set( 'ATT_fname', $fname );
+	public function set_fname($fname = '') {
+		$this->set('ATT_fname', $fname);
 	}
 
 
@@ -97,8 +97,8 @@ 
 	 * @access        public
 	 * @param string $lname
 	 */
-	public function set_lname( $lname = '' ) {
-		$this->set( 'ATT_lname', $lname );
+	public function set_lname($lname = '') {
+		$this->set('ATT_lname', $lname);
 	}
 
 
@@ -109,8 +109,8 @@ 
 	 * @access        public
 	 * @param string $address
 	 */
-	public function set_address( $address = '' ) {
-		$this->set( 'ATT_address', $address );
+	public function set_address($address = '') {
+		$this->set('ATT_address', $address);
 	}
 
 
@@ -121,8 +121,8 @@ 
 	 * @access        public
 	 * @param        string $address2
 	 */
-	public function set_address2( $address2 = '' ) {
-		$this->set( 'ATT_address2', $address2 );
+	public function set_address2($address2 = '') {
+		$this->set('ATT_address2', $address2);
 	}
 
 
@@ -133,8 +133,8 @@ 
 	 * @access        public
 	 * @param        string $city
 	 */
-	public function set_city( $city = '' ) {
-		$this->set( 'ATT_city', $city );
+	public function set_city($city = '') {
+		$this->set('ATT_city', $city);
 	}
 
 
@@ -145,8 +145,8 @@ 
 	 * @access        public
 	 * @param        int $STA_ID
 	 */
-	public function set_state( $STA_ID = 0 ) {
-		$this->set( 'STA_ID', $STA_ID );
+	public function set_state($STA_ID = 0) {
+		$this->set('STA_ID', $STA_ID);
 	}
 
 
@@ -157,8 +157,8 @@ 
 	 * @access        public
 	 * @param        string $CNT_ISO
 	 */
-	public function set_country( $CNT_ISO = '' ) {
-		$this->set( 'CNT_ISO', $CNT_ISO );
+	public function set_country($CNT_ISO = '') {
+		$this->set('CNT_ISO', $CNT_ISO);
 	}
 
 
@@ -169,8 +169,8 @@ 
 	 * @access        public
 	 * @param        string $zip
 	 */
-	public function set_zip( $zip = '' ) {
-		$this->set( 'ATT_zip', $zip );
+	public function set_zip($zip = '') {
+		$this->set('ATT_zip', $zip);
 	}
 
 
@@ -181,8 +181,8 @@ 
 	 * @access        public
 	 * @param        string $email
 	 */
-	public function set_email( $email = '' ) {
-		$this->set( 'ATT_email', $email );
+	public function set_email($email = '') {
+		$this->set('ATT_email', $email);
 	}
 
 
@@ -193,8 +193,8 @@ 
 	 * @access        public
 	 * @param        string $phone
 	 */
-	public function set_phone( $phone = '' ) {
-		$this->set( 'ATT_phone', $phone );
+	public function set_phone($phone = '') {
+		$this->set('ATT_phone', $phone);
 	}
 
 
@@ -205,8 +205,8 @@ 
 	 * @access        public
 	 * @param        bool $ATT_deleted
 	 */
-	public function set_deleted( $ATT_deleted = FALSE ) {
-		$this->set( 'ATT_deleted', $ATT_deleted );
+	public function set_deleted($ATT_deleted = FALSE) {
+		$this->set('ATT_deleted', $ATT_deleted);
 	}
 
 
@@ -219,7 +219,7 @@ 
 	 * @return int
 	 */
 	public function wp_user() {
-		return $this->get( 'ATT_author' );
+		return $this->get('ATT_author');
 	}
 
 
@@ -230,7 +230,7 @@ 
 	 * @return string
 	 */
 	public function fname() {
-		return $this->get( 'ATT_fname' );
+		return $this->get('ATT_fname');
 	}
 
 
@@ -250,9 +250,9 @@ 
 	 * @param bool $apply_html_entities
 	 * @return string
 	 */
-	public function full_name( $apply_html_entities = FALSE ) {
-		$full_name = $this->fname() . ' ' . $this->lname();
-		return $apply_html_entities ? htmlentities( $full_name, ENT_QUOTES, 'UTF-8' ) : $full_name;
+	public function full_name($apply_html_entities = FALSE) {
+		$full_name = $this->fname().' '.$this->lname();
+		return $apply_html_entities ? htmlentities($full_name, ENT_QUOTES, 'UTF-8') : $full_name;
 	}
 
 
@@ -263,7 +263,7 @@ 
 	 * @return string
 	 */
 	public function lname() {
-		return $this->get( 'ATT_lname' );
+		return $this->get('ATT_lname');
 	}
 
 
@@ -277,26 +277,26 @@ 
 	 */
 	public function full_address_as_array() {
 		$full_address_array = array();
-		$initial_address_fields = array( 'ATT_address', 'ATT_address2', 'ATT_city', );
-		foreach ( $initial_address_fields as $address_field_name ) {
-			$address_fields_value = $this->get( $address_field_name );
-			if ( !empty( $address_fields_value ) ) {
-				$full_address_array[ ] = $address_fields_value;
+		$initial_address_fields = array('ATT_address', 'ATT_address2', 'ATT_city',);
+		foreach ($initial_address_fields as $address_field_name) {
+			$address_fields_value = $this->get($address_field_name);
+			if ( ! empty($address_fields_value)) {
+				$full_address_array[] = $address_fields_value;
 			}
 		}
 		//now handle state and country
 		$state_obj = $this->state_obj();
-		if ( !empty( $state_obj ) ) {
-			$full_address_array[ ] = $state_obj->name();
+		if ( ! empty($state_obj)) {
+			$full_address_array[] = $state_obj->name();
 		}
 		$country_obj = $this->country_obj();
-		if ( !empty( $country_obj ) ) {
-			$full_address_array[ ] = $country_obj->name();
+		if ( ! empty($country_obj)) {
+			$full_address_array[] = $country_obj->name();
 		}
 		//lastly get the xip
 		$zip_value = $this->zip();
-		if ( !empty( $zip_value ) ) {
-			$full_address_array[ ] = $zip_value;
+		if ( ! empty($zip_value)) {
+			$full_address_array[] = $zip_value;
 		}
 		return $full_address_array;
 	}
@@ -308,7 +308,7 @@ 
 	 * @return string
 	 */
 	public function address() {
-		return $this->get( 'ATT_address' );
+		return $this->get('ATT_address');
 	}
 
 
@@ -318,7 +318,7 @@ 
 	 * @return string
 	 */
 	public function address2() {
-		return $this->get( 'ATT_address2' );
+		return $this->get('ATT_address2');
 	}
 
 
@@ -328,7 +328,7 @@ 
 	 * @return string
 	 */
 	public function city() {
-		return $this->get( 'ATT_city' );
+		return $this->get('ATT_city');
 	}
 
 
@@ -338,7 +338,7 @@ 
 	 * @return string
 	 */
 	public function state_ID() {
-		return $this->get( 'STA_ID' );
+		return $this->get('STA_ID');
 	}
 
 
@@ -347,7 +347,7 @@ 
 	 * @return string
 	 */
 	public function state_abbrev() {
-		return $this->state_obj() instanceof EE_State ? $this->state_obj()->abbrev() : __( 'Unknown', 'event_espresso' );
+		return $this->state_obj() instanceof EE_State ? $this->state_obj()->abbrev() : __('Unknown', 'event_espresso');
 	}
 
 
@@ -357,18 +357,18 @@ 
 	 * @return EE_State
 	 */
 	public function state_obj() {
-		return $this->get_first_related( 'State' );
+		return $this->get_first_related('State');
 	}
 
 	/**
 	 * Returns the state's name, otherwise 'Unknown'
 	 * @return string
 	 */
-	public function state_name(){
-		if( $this->state_obj() ){
+	public function state_name() {
+		if ($this->state_obj()) {
 			return $this->state_obj()->name();
-		}else{
-			return __( 'Unknown', 'event_espresso' );
+		} else {
+			return __('Unknown', 'event_espresso');
 		}
 	}
 
@@ -381,7 +381,7 @@ 
 	 * @return string
 	 */
 	public function state() {
-		if ( apply_filters( 'FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj() ) ) {
+		if (apply_filters('FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj())) {
 			return $this->state_abbrev();
 		} else {
 			return $this->state_name();
@@ -395,7 +395,7 @@ 
 	 * @return string
 	 */
 	public function country_ID() {
-		return $this->get( 'CNT_ISO' );
+		return $this->get('CNT_ISO');
 	}
 
 
@@ -405,18 +405,18 @@ 
 	 * @return EE_Country
 	 */
 	public function country_obj() {
-		return $this->get_first_related( 'Country' );
+		return $this->get_first_related('Country');
 	}
 
 	/**
 	 * Returns the country's name if known, otherwise 'Unknown'
 	 * @return string
 	 */
-	public function country_name(){
-		if( $this->country_obj() ){
+	public function country_name() {
+		if ($this->country_obj()) {
 			return $this->country_obj()->name();
-		}else{
-			return __( 'Unknown', 'event_espresso' );
+		} else {
+			return __('Unknown', 'event_espresso');
 		}
 	}
 
@@ -429,7 +429,7 @@ 
 	 * @return string
 	 */
 	public function country() {
-		if ( apply_filters( 'FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj() ) ) {
+		if (apply_filters('FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj())) {
 			return $this->country_ID();
 		} else {
 			return $this->country_name();
@@ -443,7 +443,7 @@ 
 	 * @return string
 	 */
 	public function zip() {
-		return $this->get( 'ATT_zip' );
+		return $this->get('ATT_zip');
 	}
 
 
@@ -453,7 +453,7 @@ 
 	 * @return string
 	 */
 	public function email() {
-		return $this->get( 'ATT_email' );
+		return $this->get('ATT_email');
 	}
 
 
@@ -463,7 +463,7 @@ 
 	 * @return string
 	 */
 	public function phone() {
-		return $this->get( 'ATT_phone' );
+		return $this->get('ATT_phone');
 	}
 
 
@@ -473,7 +473,7 @@ 
 	 * @return        bool
 	 */
 	public function deleted() {
-		return $this->get( 'ATT_deleted' );
+		return $this->get('ATT_deleted');
 	}
 
 
@@ -483,8 +483,8 @@ 
 	 * @param array $query_params
 	 * @return EE_Registration[]
 	 */
-	public function get_registrations( $query_params = array() ) {
-		return $this->get_many_related( 'Registration', $query_params );
+	public function get_registrations($query_params = array()) {
+		return $this->get_many_related('Registration', $query_params);
 	}
 
 
@@ -494,7 +494,7 @@ 
 	 * @return EE_Registration
 	 */
 	public function get_most_recent_registration() {
-		return $this->get_first_related( 'Registration', array( 'order_by' => array( 'REG_date' => 'DESC' ) ) ); //null, 'REG_date', 'DESC', '=', 'OBJECT_K');
+		return $this->get_first_related('Registration', array('order_by' => array('REG_date' => 'DESC'))); //null, 'REG_date', 'DESC', '=', 'OBJECT_K');
 	}
 
 
@@ -504,8 +504,8 @@ 
 	 * @param int $event_id
 	 * @return EE_Registration
 	 */
-	public function get_most_recent_registration_for_event( $event_id ) {
-		return $this->get_first_related( 'Registration', array(array( 'EVT_ID' => $event_id ), 'order_by' => array('REG_date' => 'DESC')));//, '=', 'OBJECT_K' );
+	public function get_most_recent_registration_for_event($event_id) {
+		return $this->get_first_related('Registration', array(array('EVT_ID' => $event_id), 'order_by' => array('REG_date' => 'DESC'))); //, '=', 'OBJECT_K' );
 	}
 
 
@@ -515,7 +515,7 @@ 
 	 * @return array
 	 */
 	public function events() {
-		return $this->get_many_related( 'Event' );
+		return $this->get_many_related('Event');
 	}
 
 	/**
@@ -524,17 +524,17 @@ 
 	 * @param EE_Payment_Method $payment_method the _gateway_name property on the gateway class
 	 * @return EE_Form_Section_Proper
 	 */
-	public function billing_info_for_payment_method($payment_method){
+	public function billing_info_for_payment_method($payment_method) {
 		$pm_type = $payment_method->type_obj();
-		if( ! $pm_type instanceof EE_PMT_Base ){
+		if ( ! $pm_type instanceof EE_PMT_Base) {
 			return NULL;
 		}
-		$billing_info =  $this->get_post_meta( $this->get_billing_info_postmeta_name( $payment_method ), true );
-		if ( ! $billing_info){
+		$billing_info = $this->get_post_meta($this->get_billing_info_postmeta_name($payment_method), true);
+		if ( ! $billing_info) {
 			return NULL;
 		}
 		$billing_form = $pm_type->billing_form();
-		$billing_form->receive_form_submission( array( $billing_form->name() => $billing_info ), FALSE );
+		$billing_form->receive_form_submission(array($billing_form->name() => $billing_info), FALSE);
 		return $billing_form;
 	}
 
@@ -544,10 +544,10 @@ 
 	 * @param EE_Payment_Method $payment_method
 	 * @return string
 	 */
-	public function get_billing_info_postmeta_name($payment_method){
-		if( $payment_method->type_obj() instanceof EE_PMT_Base ){
-			return 'billing_info_' . $payment_method->type_obj()->system_name();
-		}else{
+	public function get_billing_info_postmeta_name($payment_method) {
+		if ($payment_method->type_obj() instanceof EE_PMT_Base) {
+			return 'billing_info_'.$payment_method->type_obj()->system_name();
+		} else {
 			return NULL;
 		}
 	}
@@ -558,13 +558,13 @@ 
 	 * @param EE_Payment_Method $payment_method
 	 * @return boolean
 	 */
-	public function save_and_clean_billing_info_for_payment_method($billing_form, $payment_method){
-		if( ! $billing_form instanceof EE_Billing_Attendee_Info_Form ){
-			EE_Error::add_error( __( 'Cannot save billing info because there is none.', 'event_espresso' ) );
+	public function save_and_clean_billing_info_for_payment_method($billing_form, $payment_method) {
+		if ( ! $billing_form instanceof EE_Billing_Attendee_Info_Form) {
+			EE_Error::add_error(__('Cannot save billing info because there is none.', 'event_espresso'));
 			return false;
 		}
 		$billing_form->clean_sensitive_data();
-		return update_post_meta($this->ID(), $this->get_billing_info_postmeta_name( $payment_method ), $billing_form->input_values( true ) );
+		return update_post_meta($this->ID(), $this->get_billing_info_postmeta_name($payment_method), $billing_form->input_values(true));
 	}
 
 	/**
@@ -580,14 +580,14 @@ 
 	 * @return string
 	 */
 	public function get_admin_edit_link() {
-		EE_Registry::instance()->load_helper( 'URL' );
+		EE_Registry::instance()->load_helper('URL');
 		return EEH_URL::add_query_args_and_nonce(
 			array(
 				'page' => 'espresso_registrations',
 				'action' => 'edit_attendee',
 				'post' => $this->ID()
 			),
-			admin_url( 'admin.php' )
+			admin_url('admin.php')
 		);
 	}
 
@@ -604,13 +604,13 @@ 
 	 * @return string
 	 */
 	public function get_admin_overview_link() {
-		EE_Registry::instance()->load_helper( 'URL' );
+		EE_Registry::instance()->load_helper('URL');
 		return EEH_URL::add_query_args_and_nonce(
 			array(
 				'page' => 'espresso_registrations',
 				'action' => 'contact_list'
 			),
-			admin_url( 'admin.php' )
+			admin_url('admin.php')
 		);
 	}
 

Doc Comments +2 added lines, -2 removed lines

@@ -512,7 +512,7 @@ 
 
 	/**
 	 * returns any events attached to this attendee ($_Event property);
-	 * @return array
+	 * @return EE_Base_Class[]
 	 */
 	public function events() {
 		return $this->get_many_related( 'Event' );
@@ -522,7 +522,7 @@ 
 	 * Gets the billing info array where keys match espresso_reg_page_billing_inputs(),
 	 * and keys are their cleaned values. @see EE_Attendee::save_and_clean_billing_info_for_payment_method() which was used to save the billing info
 	 * @param EE_Payment_Method $payment_method the _gateway_name property on the gateway class
-	 * @return EE_Form_Section_Proper
+	 * @return null|EE_Billing_Info_Form
 	 */
 	public function billing_info_for_payment_method($payment_method){
 		$pm_type = $payment_method->type_obj();

core/db_classes/EE_Checkin.class.php

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');
+}
 do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 /**
  * Event Espresso

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 /**
  * Event Espresso
  *
@@ -23,7 +23,7 @@ 
  * @subpackage		includes/classes/EE_Checkin.class.php
  * @author				Darren Ethier
  */
-class EE_Checkin extends EE_Base_Class{
+class EE_Checkin extends EE_Base_Class {
 
 	/**
 	 *
@@ -34,9 +34,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Checkin
 	 */
-	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);
 	}
 
 
@@ -47,8 +47,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Checkin
 	 */
-	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);
 	}
 
 

core/db_classes/EE_Currency.class.php

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_Currency extends EE_Base_Class{
+class EE_Currency extends EE_Base_Class {
 
 		/** Currency COde @var CUR_code*/ protected $_CUR_code = NULL;
 		/** Currency Name Singular @var CUR_single*/ protected $_CUR_single = NULL;
@@ -43,9 +43,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Attendee
 	 */
-	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);
 	}
 
 
@@ -56,8 +56,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Attendee
 	 */
-	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);
 	}
 	/**
 	 * Gets code
@@ -159,8 +159,8 @@ 
 	 * Gets a prettier name
 	 * @return string
 	 */
-	function name(){
-		return sprintf(__("%s (%s)", "event_espresso"),$this->code(),$this->plural_name());
+	function name() {
+		return sprintf(__("%s (%s)", "event_espresso"), $this->code(), $this->plural_name());
 	}
 
 }

Doc Comments +7 added lines, -7 removed lines

@@ -54,7 +54,7 @@ 
 	 * @param array $props_n_values  incoming values from the database
 	 * @param string $timezone  incoming timezone as set by the model.  If not set the timezone for
 	 *                          		the website will be used.
-	 * @return EE_Attendee
+	 * @return EE_Currency
 	 */
 	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
 		return new self( $props_n_values, TRUE, $timezone );
@@ -70,7 +70,7 @@ 
 	/**
 	 * Sets code
 	 * @param string $code
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_code($code) {
 		return $this->set('CUR_code', $code);
@@ -86,7 +86,7 @@ 
 	/**
 	 * Sets active
 	 * @param boolean $active
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_active($active) {
 		return $this->set('CUR_active', $active);
@@ -102,7 +102,7 @@ 
 	/**
 	 * Sets dec_plc
 	 * @param int $dec_plc
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_dec_plc($dec_plc) {
 		return $this->set('CUR_dec_plc', $dec_plc);
@@ -118,7 +118,7 @@ 
 	/**
 	 * Sets plural
 	 * @param string $plural
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_plural_name($plural) {
 		return $this->set('CUR_plural', $plural);
@@ -134,7 +134,7 @@ 
 	/**
 	 * Sets sign
 	 * @param string $sign
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_sign($sign) {
 		return $this->set('CUR_sign', $sign);
@@ -150,7 +150,7 @@ 
 	/**
 	 * Sets single
 	 * @param string $single
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_singular_name($single) {
 		return $this->set('CUR_single', $single);

core/db_models/EEM_Extra_Meta.model.php

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');
+}
 /**
  * Event Espresso
  *

Spacing +8 added lines, -8 removed lines

@@ -26,16 +26,16 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
 
 class EEM_Extra_Meta extends EEM_Base {
 
   	// private instance of the Attendee object
 	protected static $_instance = NULL;
 
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Extra Meta','event_espresso');
-		$this->plural_item = __('Extra Metas','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Extra Meta', 'event_espresso');
+		$this->plural_item = __('Extra Metas', 'event_espresso');
 		$this->_tables = array(
 			'Extra_Meta'=> new EE_Primary_Table('esp_extra_meta', 'EXM_ID')
 		);
@@ -50,13 +50,13 @@ 
 
 			));
 		$this->_model_relations = array();
-		foreach($models_this_can_attach_to as $model){
+		foreach ($models_this_can_attach_to as $model) {
 			$this->_model_relations[$model] = new EE_Belongs_To_Any_Relation();
 		}
-		foreach( $this->cap_contexts_to_cap_action_map() as $cap_context => $action ) {
-			$this->_cap_restriction_generators[ $cap_context ] = new EE_Restriction_Generator_Meta( 'EXM_key', 'EXM_value' );
+		foreach ($this->cap_contexts_to_cap_action_map() as $cap_context => $action) {
+			$this->_cap_restriction_generators[$cap_context] = new EE_Restriction_Generator_Meta('EXM_key', 'EXM_value');
 		}
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 

core/db_models/EEM_Question_Option.model.php

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');
+}
 /**
  * Event Espresso
  *

Spacing +18 added lines, -18 removed lines

@@ -21,8 +21,8 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
-require_once( EE_CLASSES . 'EE_Question_Option.class.php');
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
+require_once(EE_CLASSES.'EE_Question_Option.class.php');
 
 
 class EEM_Question_Option extends EEM_Soft_Delete_Base {
@@ -30,22 +30,22 @@ 
   	// private instance of the Attendee object
 	protected static $_instance = NULL;
 
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Question Option','event_espresso');
-		$this->plural_item = __('Question Options','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Question Option', 'event_espresso');
+		$this->plural_item = __('Question Options', 'event_espresso');
 
 		$this->_tables = array(
-			'Question_Option'=>new EE_Primary_Table('esp_question_option','QSO_ID')
+			'Question_Option'=>new EE_Primary_Table('esp_question_option', 'QSO_ID')
 		);
 		$this->_fields = array(
 			'Question_Option'=>array(
-					'QSO_ID'=>new EE_Primary_Key_Int_Field('QSO_ID', __('Question Option ID','event_espresso')),
-					'QST_ID'=>new EE_Foreign_Key_Int_Field('QST_ID', __('Question ID','event_espresso'), false, 0, 'Question'),
-					'QSO_value'=>new EE_Plain_Text_Field('QSO_value',  __("Question Option Value", "event_espresso"),false,''),
-					'QSO_desc'=>new EE_Full_HTML_Field('QSO_desc', __('Question Option Description','event_espresso'), false, ''),
-					'QSO_order' => new EE_Integer_Field('QSO_order', __('Question Option Order', 'event_espresso' ), false, 0 ),
-					'QSO_system'=>new EE_Plain_Text_Field('QSO_system', __('Internal string ID for question option','event_espresso'), TRUE, NULL ),
-					'QSO_deleted'=>new EE_Trashed_Flag_Field('QSO_deleted', __('Flag indicating Option was trashed','event_espresso'), false, false)
+					'QSO_ID'=>new EE_Primary_Key_Int_Field('QSO_ID', __('Question Option ID', 'event_espresso')),
+					'QST_ID'=>new EE_Foreign_Key_Int_Field('QST_ID', __('Question ID', 'event_espresso'), false, 0, 'Question'),
+					'QSO_value'=>new EE_Plain_Text_Field('QSO_value', __("Question Option Value", "event_espresso"), false, ''),
+					'QSO_desc'=>new EE_Full_HTML_Field('QSO_desc', __('Question Option Description', 'event_espresso'), false, ''),
+					'QSO_order' => new EE_Integer_Field('QSO_order', __('Question Option Order', 'event_espresso'), false, 0),
+					'QSO_system'=>new EE_Plain_Text_Field('QSO_system', __('Internal string ID for question option', 'event_espresso'), TRUE, NULL),
+					'QSO_deleted'=>new EE_Trashed_Flag_Field('QSO_deleted', __('Flag indicating Option was trashed', 'event_espresso'), false, false)
 				)
 		);
 		$this->_model_relations = array(
@@ -54,12 +54,12 @@ 
 
 		$this->_model_chain_to_wp_user = 'Question';
 		//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('Question_Option');
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('Question_Option');
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('Question_Option');
+		$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('Question_Option');
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Reg_Form('Question_Option');
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Reg_Form('Question_Option');
 		$this->_caps_slug = 'questions';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 

core/db_models/EEM_Soft_Delete_Base.model.php

Braces +4 added lines, -2 removed lines

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

Doc Comments +3 added lines, -3 removed lines

@@ -146,7 +146,7 @@ 
 	 * Sum all the deleted items.
 	 * @param array $query_params like EEM_Base::get_all
 	 * @param string $field_to_sum
-	 * @return int
+	 * @return double
 	 */
 	public function sum_deleted($query_params = null, $field_to_sum = null){
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
@@ -195,7 +195,7 @@ 
 	 * @param boolean $allow_blocking if TRUE, matched objects will only be deleted if there is no related model info
 	 * that blocks it (ie, there' sno other data that depends on this data); if false, deletes regardless of other objects
 	 * which may depend on it. Its generally advisable to always leave this as TRUE, otherwise you could easily corrupt your DB
-	 * @return boolean success
+	 * @return integer success
 	 */
 	public function delete_permanently($query_params = array(), $allow_blocking = true){
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
@@ -278,7 +278,7 @@ 
 	/**
 	 * Updates all the items of this model which match the $query params, regardless of whether
 	 * they've been soft-deleted or not
-	 * @param array $field_n_values like EEM_Base::update's $fields_n_value
+	 * @param array $fields_n_values like EEM_Base::update's $fields_n_value
 	 * @param array $query_params like EEM_base::get_all's $query_params
 	 * @param boolean $keep_model_objs_in_sync if TRUE, makes sure we ALSO update model objects
 	 * in this model's entity map according to $fields_n_values that match $query_params. This

Spacing +37 added lines, -37 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-require_once( EE_MODELS . 'EEM_Base.model.php');
+require_once(EE_MODELS.'EEM_Base.model.php');
 /**
  * EEM_Soft_Delete_Base
  *
@@ -25,13 +25,13 @@ 
  * @subpackage		includes/models/
  * @author				Michael Nelson
  */
-abstract class EEM_Soft_Delete_Base extends EEM_Base{
+abstract class EEM_Soft_Delete_Base extends EEM_Base {
 
 	/**
 	 * @param null $timezone
 	 */
 	protected function __construct($timezone = NULL) {
-		if( ! $this->_default_where_conditions_strategy instanceof EE_Default_Where_Conditions ){
+		if ( ! $this->_default_where_conditions_strategy instanceof EE_Default_Where_Conditions) {
 			$this->_default_where_conditions_strategy = new EE_Soft_Delete_Where_Conditions();
 		}
 		parent::__construct($timezone);
@@ -42,12 +42,12 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	public function deleted_field_name(){
+	public function deleted_field_name() {
 		$field = $this->get_a_field_of_type('EE_Trashed_Flag_Field');
-		if($field){
+		if ($field) {
 			return $field->get_name();
-		}else{
-			throw new EE_Error(sprintf(__('We are trying to find the deleted flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?','event_espresso'),get_class($this),get_class($this)));
+		} else {
+			throw new EE_Error(sprintf(__('We are trying to find the deleted flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?', 'event_espresso'), get_class($this), get_class($this)));
 		}
 	}
 
@@ -57,7 +57,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all's $query_params
 	 * @return EE_Soft_Delete_Base_Class
 	 */
-	public function get_one_deleted($query_params = array()){
+	public function get_one_deleted($query_params = array()) {
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
 		return parent::get_one($query_params);
 	}
@@ -67,7 +67,7 @@ 
 	 * @param array $query_params like EEM_base::get_all's $query_params
 	 * @return EE_Soft_Delete_Base_Class
 	 */
-	public function get_one_deleted_or_undeleted($query_params = array()){
+	public function get_one_deleted_or_undeleted($query_params = array()) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		return parent::get_one($query_params);
 	}
@@ -77,11 +77,11 @@ 
 	 * @param int|string $id
 	 * @return EE_Soft_Delete_Base_Class
 	 */
-	public function get_one_by_ID_but_ignore_deleted($id){
+	public function get_one_by_ID_but_ignore_deleted($id) {
 		return $this->get_one( 
 			$this->alter_query_params_to_restrict_by_ID( 
 				$id,
-				array( 'default_where_conditions' => 'default' ) 
+				array('default_where_conditions' => 'default') 
 			) 
 		);
 	}
@@ -93,7 +93,7 @@ 
 	 * @param bool 	 $distinct if we want to only count the distinct values for the column then you can trigger that by the setting $distinct to TRUE;
 	 * @return int
 	 */
-	public function count_deleted($query_params = null, $field_to_count = null, $distinct = FALSE){
+	public function count_deleted($query_params = null, $field_to_count = null, $distinct = FALSE) {
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
 		return parent::count($query_params, $field_to_count, $distinct);
 	}
@@ -103,9 +103,9 @@ 
 	 * @param array $query_params like EEM_Base::get_all's $query_params
 	 * @return array like EEM_Base::get_all's $query_params
 	 */
-	protected function _alter_query_params_so_only_trashed_items_included($query_params){
-		$deletedFlagFieldName=$this->deleted_field_name();
-		$query_params[0][$deletedFlagFieldName]=true;
+	protected function _alter_query_params_so_only_trashed_items_included($query_params) {
+		$deletedFlagFieldName = $this->deleted_field_name();
+		$query_params[0][$deletedFlagFieldName] = true;
 		return $query_params;
 	}
 
@@ -114,7 +114,7 @@ 
 	 * @param array $query_params
 	 * @return array
 	 */
-	public function alter_query_params_so_deleted_and_undeleted_items_included( $query_params = array() ){
+	public function alter_query_params_so_deleted_and_undeleted_items_included($query_params = array()) {
 		return $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 	}
 
@@ -123,8 +123,8 @@ 
 	 * @param array $query_params
 	 * @return array
 	 */
-	protected function _alter_query_params_so_deleted_and_undeleted_items_included($query_params){
-		if( ! isset( $query_params[ 'default_where_conditions' ] ) ) {
+	protected function _alter_query_params_so_deleted_and_undeleted_items_included($query_params) {
+		if ( ! isset($query_params['default_where_conditions'])) {
 			$query_params['default_where_conditions'] = 'minimum';
 		}
 		return $query_params;
@@ -137,9 +137,9 @@ 
 	 * @param bool 	 $distinct if we want to only count the distinct values for the column then you can trigger that by the setting $distinct to TRUE;
 	 * @return int
 	 */
-	public function count_deleted_and_undeleted($query_params = null, $field_to_count = null, $distinct = FALSE){
+	public function count_deleted_and_undeleted($query_params = null, $field_to_count = null, $distinct = FALSE) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
-		return parent::count($query_params,$field_to_count, $distinct);
+		return parent::count($query_params, $field_to_count, $distinct);
 	}
 
 	/**
@@ -148,7 +148,7 @@ 
 	 * @param string $field_to_sum
 	 * @return int
 	 */
-	public function sum_deleted($query_params = null, $field_to_sum = null){
+	public function sum_deleted($query_params = null, $field_to_sum = null) {
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
 		return parent::sum($query_params, $field_to_sum);
 	}
@@ -159,7 +159,7 @@ 
 	 * @param string $field_to_sum
 	 * @reutrn int
 	 */
-	public function sum_deleted_and_undeleted($query_params = null, $field_to_sum = null){
+	public function sum_deleted_and_undeleted($query_params = null, $field_to_sum = null) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		parent::sum($query_params, $field_to_sum);
 	}
@@ -169,7 +169,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Soft_Delete_Base_Class[]
 	 */
-	public function get_all_deleted_and_undeleted($query_params = array()){
+	public function get_all_deleted_and_undeleted($query_params = array()) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		return parent::get_all($query_params);
 	}
@@ -179,7 +179,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Soft_Delete_Base_Class[]
 	 */
-	public function get_all_deleted($query_params = array()){
+	public function get_all_deleted($query_params = array()) {
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
 		return parent::get_all($query_params);
 	}
@@ -197,7 +197,7 @@ 
 	 * which may depend on it. Its generally advisable to always leave this as TRUE, otherwise you could easily corrupt your DB
 	 * @return boolean success
 	 */
-	public function delete_permanently($query_params = array(), $allow_blocking = true){
+	public function delete_permanently($query_params = array(), $allow_blocking = true) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		return parent::delete_permanently($query_params, $allow_blocking);
 	}
@@ -208,8 +208,8 @@ 
 	 * @param mixed $ID int if primary key is an int, string otherwise
 	 * @return boolean success
 	 */
-	public function restore_by_ID($ID=FALSE){
-		return $this->delete_or_restore_by_ID(false,$ID);
+	public function restore_by_ID($ID = FALSE) {
+		return $this->delete_or_restore_by_ID(false, $ID);
 	}
 	/**
 	 * For deleting or restoring a particular item. Note that this model is a SOFT-DELETABLE model! However,
@@ -218,14 +218,14 @@ 
 	 * @param mixed $ID int if primary key is an int, string otherwise
 	 * @return boolean
 	 */
-	public function delete_or_restore_by_ID($delete=true,$ID=FALSE){
-		if ( ! $ID ) {
+	public function delete_or_restore_by_ID($delete = true, $ID = FALSE) {
+		if ( ! $ID) {
 			return FALSE;
 		}
 		if ( 
 			$this->delete_or_restore(
 				$delete, 
-				$this->alter_query_params_to_restrict_by_ID( $ID ) 
+				$this->alter_query_params_to_restrict_by_ID($ID) 
 			)
 		) {
 			return TRUE;
@@ -245,7 +245,7 @@ 
 	 * @param bool  $block_deletes
 	 * @return boolean
 	 */
-	public function delete($query_params = array(), $block_deletes = false){
+	public function delete($query_params = array(), $block_deletes = false) {
 		//no matter what, we WON'T block soft deletes.
 		return $this->delete_or_restore(true, $query_params);
 	}
@@ -256,7 +256,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return boolean
 	 */
-	public function restore($query_params = array()){
+	public function restore($query_params = array()) {
 		return $this->delete_or_restore(false, $query_params);
 	}
 	/**
@@ -265,10 +265,10 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return boolean
 	 */
-	function delete_or_restore($delete=true,$query_params = array()){
-		$deletedFlagFieldName=$this->deleted_field_name();
+	function delete_or_restore($delete = true, $query_params = array()) {
+		$deletedFlagFieldName = $this->deleted_field_name();
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
-		if ( $this->update (array($deletedFlagFieldName=>$delete), $query_params )) {
+		if ($this->update(array($deletedFlagFieldName=>$delete), $query_params)) {
 			return TRUE;
 		} else {
 			return FALSE;
@@ -286,8 +286,8 @@ 
 	 * be aware that model objects being used could get out-of-sync with the database
 	 * @return int number of items updated
 	 */
-	public function update_deleted_and_undeleted($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE ){
+	public function update_deleted_and_undeleted($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
-		return $this->update($fields_n_values, $query_params, $keep_model_objs_in_sync );
+		return $this->update($fields_n_values, $query_params, $keep_model_objs_in_sync);
 	}
 }

core/db_models/EEM_Term_Relationship.model.php

Braces +4 added lines, -2 removed lines

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

Spacing +35 added lines, -35 removed lines

@@ -21,61 +21,61 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
 
 class EEM_Term_Relationship extends EEM_Base {
 
   	// private instance of the Attendee object
 	protected static $_instance = NULL;
 
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Term Relationship','event_espresso');
-		$this->plural_item = __('Term Relationships','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Term Relationship', 'event_espresso');
+		$this->plural_item = __('Term Relationships', 'event_espresso');
 		$this->_tables = array(
 			'Term_Relationship'=> new EE_Primary_Table('term_relationships')
 		);
-		$models_this_can_attach_to = array_keys( EE_Registry::instance()->cpt_models() );
+		$models_this_can_attach_to = array_keys(EE_Registry::instance()->cpt_models());
 		$this->_fields = array(
 			'Term_Relationship'=>array(
-				'object_id'=> new EE_Foreign_Key_Int_Field('object_id', __('Object(Post) ID','event_espresso'), false,0, $models_this_can_attach_to ),
-				'term_taxonomy_id'=>new EE_Foreign_Key_Int_Field('term_taxonomy_id', __('Term (in context of a taxonomy) ID','event_espresso'), false, 0, 'Term_Taxonomy'),
-				'term_order'=>new EE_Integer_Field('term_order', __('Term Order','event_espresso'), false, 0)
+				'object_id'=> new EE_Foreign_Key_Int_Field('object_id', __('Object(Post) ID', 'event_espresso'), false, 0, $models_this_can_attach_to),
+				'term_taxonomy_id'=>new EE_Foreign_Key_Int_Field('term_taxonomy_id', __('Term (in context of a taxonomy) ID', 'event_espresso'), false, 0, 'Term_Taxonomy'),
+				'term_order'=>new EE_Integer_Field('term_order', __('Term Order', 'event_espresso'), false, 0)
 			));
 		$this->_model_relations = array(
 			'Term_Taxonomy'=>new EE_Belongs_To_Relation()
 		);
-		foreach( $models_this_can_attach_to as $model_name ) {
-			$this->_model_relations[ $model_name ] = new EE_Belongs_To_Relation();
+		foreach ($models_this_can_attach_to as $model_name) {
+			$this->_model_relations[$model_name] = new EE_Belongs_To_Relation();
 		}
 		$this->_indexes = array(
-			'PRIMARY'=>new EE_Primary_Key_Index(array('object_id','term_taxonomy_id'))
+			'PRIMARY'=>new EE_Primary_Key_Index(array('object_id', 'term_taxonomy_id'))
 		);
 		$path_to_event_model = 'Event.';
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Event_Related_Public( $path_to_event_model );
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Event_Related_Protected( $path_to_event_model );
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Event_Related_Protected( $path_to_event_model );
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Event_Related_Protected( $path_to_event_model, EEM_Base::caps_edit );
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Event_Related_Public($path_to_event_model);
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Event_Related_Protected($path_to_event_model);
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Event_Related_Protected($path_to_event_model);
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Event_Related_Protected($path_to_event_model, EEM_Base::caps_edit);
 
 		$path_to_tax_model = 'Term_Taxonomy.';
 		//add cap restrictions for editing term relations to the "ee_assign_*"
 		//and for deleting term relations too
-		$cap_contexts_affected = array( EEM_Base::caps_edit, EEM_Base::caps_delete );
-		foreach( $cap_contexts_affected as $cap_context_affected ) {
-			$this->_cap_restrictions[ $cap_context_affected ]['ee_assign_event_category'] = new EE_Default_Where_Conditions(
+		$cap_contexts_affected = array(EEM_Base::caps_edit, EEM_Base::caps_delete);
+		foreach ($cap_contexts_affected as $cap_context_affected) {
+			$this->_cap_restrictions[$cap_context_affected]['ee_assign_event_category'] = new EE_Default_Where_Conditions(
 					array(
-						$path_to_tax_model . 'taxonomy*ee_assign_event_category' => array( '!=', 'espresso_event_categories' )
+						$path_to_tax_model.'taxonomy*ee_assign_event_category' => array('!=', 'espresso_event_categories')
 					));
-			$this->_cap_restrictions[ $cap_context_affected ]['ee_assign_venue_category'] = new EE_Default_Where_Conditions(
+			$this->_cap_restrictions[$cap_context_affected]['ee_assign_venue_category'] = new EE_Default_Where_Conditions(
 					array(
-						$path_to_tax_model . 'taxonomy*ee_assign_venue_category' => array( '!=', 'espresso_venue_categories' )
+						$path_to_tax_model.'taxonomy*ee_assign_venue_category' => array('!=', 'espresso_venue_categories')
 					));
-			$this->_cap_restrictions[ $cap_context_affected ]['ee_assign_event_type'] = new EE_Default_Where_Conditions(
+			$this->_cap_restrictions[$cap_context_affected]['ee_assign_event_type'] = new EE_Default_Where_Conditions(
 					array(
-						$path_to_tax_model . 'taxonomy*ee_assign_event_type' => array( '!=', 'espresso_event_type' )
+						$path_to_tax_model.'taxonomy*ee_assign_event_type' => array('!=', 'espresso_event_type')
 					));
 		}
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 	/**
@@ -84,17 +84,17 @@ 
 	 * @global type $wpdb
 	 * @return int the number of rows affected
 	 */
-	public function update_term_taxonomy_counts($term_taxonomy_id = NULL){
+	public function update_term_taxonomy_counts($term_taxonomy_id = NULL) {
 		//because this uses a subquery and sometimes assigning to column to be another column's
 		//value, we just write the SQL directly.
 		global $wpdb;
-		if( $term_taxonomy_id ){
-			$second_operand = $wpdb->prepare('%d',$term_taxonomy_id);
-		}else{
+		if ($term_taxonomy_id) {
+			$second_operand = $wpdb->prepare('%d', $term_taxonomy_id);
+		} else {
 			$second_operand = 'tr.term_taxonomy_id';
 		}
-		$rows_affected = $this->_do_wpdb_query( 'query' , array("UPDATE {$wpdb->term_taxonomy} AS tt SET count = (select count(*) as proper_count
-from {$wpdb->term_relationships} AS tr WHERE tt.term_taxonomy_id = $second_operand)" ) );
+		$rows_affected = $this->_do_wpdb_query('query', array("UPDATE {$wpdb->term_taxonomy} AS tt SET count = (select count(*) as proper_count
+from {$wpdb->term_relationships} AS tr WHERE tt.term_taxonomy_id = $second_operand)"));
 		return $rows_affected;
 	}
 
@@ -106,8 +106,8 @@ 
 	 */
 	public function insert($field_n_values) {
 		$return = parent::insert($field_n_values);
-		if( isset( $field_n_values[ 'term_taxonomy_id' ] ) ) {
-			$this->update_term_taxonomy_counts($field_n_values[ 'term_taxonomy_id' ] );
+		if (isset($field_n_values['term_taxonomy_id'])) {
+			$this->update_term_taxonomy_counts($field_n_values['term_taxonomy_id']);
 		}
 		return $return;
 	}
@@ -123,8 +123,8 @@ 
 	 * @return int
 	 */
 	public function update($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE) {
-		$count = parent::update($fields_n_values, $query_params, $keep_model_objs_in_sync );
-		if( $count ){
+		$count = parent::update($fields_n_values, $query_params, $keep_model_objs_in_sync);
+		if ($count) {
 			$this->update_term_taxonomy_counts();
 		}
 		return $count;
@@ -138,7 +138,7 @@ 
 	 */
 	public function delete($query_params, $allow_blocking = true) {
 		$count = parent::delete($query_params, $allow_blocking);
-		if( $count ){
+		if ($count) {
 			$this->update_term_taxonomy_counts();
 		}
 		return $count;