eventespresso / event-espresso-core

core/db_models/EEM_CPT_Base.model.php

Spacing +85 added lines, -85 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-define('EE_Event_Category_Taxonomy','espresso_event_category');
+define('EE_Event_Category_Taxonomy', 'espresso_event_category');
 /**
  *
  * EEM_CPT_Base
@@ -16,7 +16,7 @@ 
  * @author 				Mike Nelson
  *
  */
-abstract class EEM_CPT_Base extends EEM_Soft_Delete_Base{
+abstract class EEM_CPT_Base extends EEM_Soft_Delete_Base {
 
 	/**
 	 * @var string post_status_trashed - the wp post status for trashed cpts
@@ -44,46 +44,46 @@ 
 	 * @param string $timezone
 	 * @throws \EE_Error
 	 */
-	protected function __construct( $timezone = NULL ){
+	protected function __construct($timezone = NULL) {
 
 		//adds a relationship to Term_Taxonomy for all these models. For this to work
 		//Term_Relationship must have a relation to each model subclassing EE_CPT_Base explicitly
 		//eg, in EEM_Term_Relationship, inside the _model_relations array, there must be an entry
 		//with key equalling the subclassing model's model name (eg 'Event' or 'Venue'), and the value
 		//must also be new EE_HABTM_Relation('Term_Relationship');
-		$this->_model_relations['Term_Taxonomy'] =new EE_HABTM_Relation('Term_Relationship');
+		$this->_model_relations['Term_Taxonomy'] = new EE_HABTM_Relation('Term_Relationship');
 		$primary_table_name = NULL;
 		//add  the common _status field to all CPT primary tables.
-		foreach ( $this->_tables as $alias => $table_obj ) {
-			if ( $table_obj instanceof EE_Primary_Table ) {
+		foreach ($this->_tables as $alias => $table_obj) {
+			if ($table_obj instanceof EE_Primary_Table) {
 				$primary_table_name = $alias;
 			}
 		}
 		//set default wp post statuses if child has not already set.
-		if ( ! isset( $this->_fields[$primary_table_name]['status'] )) {
+		if ( ! isset($this->_fields[$primary_table_name]['status'])) {
 			$this->_fields[$primary_table_name]['status'] = new EE_WP_Post_Status_Field('post_status', __("Event Status", "event_espresso"), false, 'draft');
 		}
-		if( ! isset( $this->_fields[$primary_table_name]['to_ping'])){
-			$this->_fields[$primary_table_name]['to_ping'] = new EE_DB_Only_Text_Field('to_ping', __( 'To Ping', 'event_espresso' ), FALSE, '');
+		if ( ! isset($this->_fields[$primary_table_name]['to_ping'])) {
+			$this->_fields[$primary_table_name]['to_ping'] = new EE_DB_Only_Text_Field('to_ping', __('To Ping', 'event_espresso'), FALSE, '');
 		}
-		if( ! isset( $this->_fields[$primary_table_name]['pinged'])){
-			$this->_fields[$primary_table_name]['pinged'] = new EE_DB_Only_Text_Field('pinged', __( 'Pinged', 'event_espresso' ), FALSE, '');
+		if ( ! isset($this->_fields[$primary_table_name]['pinged'])) {
+			$this->_fields[$primary_table_name]['pinged'] = new EE_DB_Only_Text_Field('pinged', __('Pinged', 'event_espresso'), FALSE, '');
 		}
 
-		if( ! isset( $this->_fields[$primary_table_name]['comment_status'])){
-			$this->_fields[$primary_table_name]['comment_status'] = new EE_Plain_Text_Field('comment_status', __('Comment Status', 'event_espresso' ), FALSE, 'open');
+		if ( ! isset($this->_fields[$primary_table_name]['comment_status'])) {
+			$this->_fields[$primary_table_name]['comment_status'] = new EE_Plain_Text_Field('comment_status', __('Comment Status', 'event_espresso'), FALSE, 'open');
 		}
 
-		if( ! isset( $this->_fields[$primary_table_name]['ping_status'])){
+		if ( ! isset($this->_fields[$primary_table_name]['ping_status'])) {
 			$this->_fields[$primary_table_name]['ping_status'] = new EE_Plain_Text_Field('ping_status', __('Ping Status', 'event_espresso'), FALSE, 'open');
 		}
 
-		if( ! isset( $this->_fields[$primary_table_name]['post_content_filtered'])){
-			$this->_fields[$primary_table_name]['post_content_filtered'] = new EE_DB_Only_Text_Field('post_content_filtered', __( 'Post Content Filtered', 'event_espresso' ), FALSE, '');
+		if ( ! isset($this->_fields[$primary_table_name]['post_content_filtered'])) {
+			$this->_fields[$primary_table_name]['post_content_filtered'] = new EE_DB_Only_Text_Field('post_content_filtered', __('Post Content Filtered', 'event_espresso'), FALSE, '');
 		}
-		if( ! isset( $this->_model_relations[ 'Post_Meta' ] ) ) {
+		if ( ! isset($this->_model_relations['Post_Meta'])) {
 			//don't block deletes though because we want to maintain the current behaviour
-			$this->_model_relations[ 'Post_Meta' ] = new EE_Has_Many_Relation( false );
+			$this->_model_relations['Post_Meta'] = new EE_Has_Many_Relation(false);
 		}
 		parent::__construct($timezone);
 
@@ -96,7 +96,7 @@ 
 	 */
 	public function public_event_stati() {
 		// @see wp-includes/post.php
-		return get_post_stati( array( 'public' => TRUE ));
+		return get_post_stati(array('public' => TRUE));
 	}
 
 
@@ -107,7 +107,7 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	public function deleted_field_name(){
+	public function deleted_field_name() {
 		throw new EE_Error(sprintf(__("EEM_CPT_Base should nto call deleted_field_name! It should instead use post_status_field_name", "event_espresso")));
 	}
 
@@ -118,12 +118,12 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	public function post_status_field_name(){
+	public function post_status_field_name() {
 		$field = $this->get_a_field_of_type('EE_WP_Post_Status_Field');
-		if($field){
+		if ($field) {
 			return $field->get_name();
-		}else{
-			throw new EE_Error(sprintf(__('We are trying to find the post status 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 post status 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)));
 		}
 	}
 
@@ -134,9 +134,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){
-		$post_status_field_name=$this->post_status_field_name();
-		$query_params[0][$post_status_field_name]=self::post_status_trashed;
+	protected function _alter_query_params_so_only_trashed_items_included($query_params) {
+		$post_status_field_name = $this->post_status_field_name();
+		$query_params[0][$post_status_field_name] = self::post_status_trashed;
 		return $query_params;
 	}
 
@@ -147,9 +147,9 @@ 
 	 * @param array $query_params
 	 * @return array
 	 */
-	protected function _alter_query_params_so_deleted_and_undeleted_items_included($query_params){
-		$post_status_field_name=$this->post_status_field_name();
-		$query_params[0][$post_status_field_name]=array('IN',array_keys($this->get_status_array()));
+	protected function _alter_query_params_so_deleted_and_undeleted_items_included($query_params) {
+		$post_status_field_name = $this->post_status_field_name();
+		$query_params[0][$post_status_field_name] = array('IN', array_keys($this->get_status_array()));
 		return $query_params;
 	}
 
@@ -161,11 +161,11 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return boolean success
 	 */
-	function delete_or_restore($delete=true,$query_params = array()){
-		$post_status_field_name=$this->post_status_field_name();
+	function delete_or_restore($delete = true, $query_params = array()) {
+		$post_status_field_name = $this->post_status_field_name();
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		$new_status = $delete ? self::post_status_trashed : 'draft';
-		if ( $this->update (array($post_status_field_name=>$new_status), $query_params )) {
+		if ($this->update(array($post_status_field_name=>$new_status), $query_params)) {
 			return TRUE;
 		} else {
 			return FALSE;
@@ -182,7 +182,7 @@ 
 	 */
 	public function meta_table() {
 		$meta_table = $this->_get_other_tables();
-		$meta_table = reset( $meta_table );
+		$meta_table = reset($meta_table);
 		return $meta_table instanceof EE_Secondary_Table ? $meta_table->get_table_name() : NULL;
 	}
 
@@ -194,16 +194,16 @@ 
 	 * @param  bool $all triggers whether we include DB_Only fields or JUST non DB_Only fields.  Defaults to false (no db only fields)
 	 * @return array
 	 */
-	public function get_meta_table_fields( $all = FALSE ) {
+	public function get_meta_table_fields($all = FALSE) {
 		$all_fields = $fields_to_return = array();
-		foreach ( $this->_tables as $alias => $table_obj ) {
-			if ( $table_obj instanceof EE_Secondary_Table )
-				$all_fields = array_merge( $this->_get_fields_for_table($alias), $all_fields );
+		foreach ($this->_tables as $alias => $table_obj) {
+			if ($table_obj instanceof EE_Secondary_Table)
+				$all_fields = array_merge($this->_get_fields_for_table($alias), $all_fields);
 		}
 
-		if ( !$all ) {
-			foreach ( $all_fields as $name => $obj ) {
-				if ( $obj instanceof EE_DB_Only_Field_Base )
+		if ( ! $all) {
+			foreach ($all_fields as $name => $obj) {
+				if ($obj instanceof EE_DB_Only_Field_Base)
 					continue;
 				$fields_to_return[] = $name;
 			}
@@ -226,13 +226,13 @@ 
 	 * @param int $parent_term_taxonomy_id
 	 * @return EE_Term_Taxonomy
 	 */
-	function add_event_category(EE_CPT_Base $cpt_model_object, $category_name, $category_description ='',$parent_term_taxonomy_id = null){
+	function add_event_category(EE_CPT_Base $cpt_model_object, $category_name, $category_description = '', $parent_term_taxonomy_id = null) {
 		//create term
-		require_once( EE_MODELS . 'EEM_Term.model.php');
+		require_once(EE_MODELS.'EEM_Term.model.php');
 		//first, check for a term by the same name or slug
 		$category_slug = sanitize_title($category_name);
-		$term = EEM_Term::instance()->get_one(array(array('OR'=>array('name'=>$category_name,'slug'=>$category_slug))));
-		if( ! $term ){
+		$term = EEM_Term::instance()->get_one(array(array('OR'=>array('name'=>$category_name, 'slug'=>$category_slug))));
+		if ( ! $term) {
 			$term = EE_Term::new_instance(array(
 				'name'=>$category_name,
 				'slug'=>$category_slug
@@ -240,10 +240,10 @@ 
 			$term->save();
 		}
 		//make sure there's a term-taxonomy entry too
-		require_once( EE_MODELS . 'EEM_Term_Taxonomy.model.php');
-		$term_taxonomy = EEM_Term_Taxonomy::instance()->get_one(array(array('term_id'=>$term->ID(),'taxonomy'=>EE_Event_Category_Taxonomy)));
+		require_once(EE_MODELS.'EEM_Term_Taxonomy.model.php');
+		$term_taxonomy = EEM_Term_Taxonomy::instance()->get_one(array(array('term_id'=>$term->ID(), 'taxonomy'=>EE_Event_Category_Taxonomy)));
 		/** @var $term_taxonomy EE_Term_Taxonomy */
-		if( ! $term_taxonomy ){
+		if ( ! $term_taxonomy) {
 			$term_taxonomy = EE_Term_Taxonomy::new_instance(array(
 				'term_id'=>$term->ID(),
 				'taxonomy'=>EE_Event_Category_Taxonomy,
@@ -252,7 +252,7 @@ 
 				'parent'=>$parent_term_taxonomy_id
 			));
 			$term_taxonomy->save();
-		}else{
+		} else {
 			$term_taxonomy->set_count($term_taxonomy->count() + 1);
 			$term_taxonomy->save();
 		}
@@ -267,11 +267,11 @@ 
 	 * @param string $category_name name of the event category (term)
 	 * @return bool
 	 */
-	function remove_event_category(EE_CPT_Base $cpt_model_object_event, $category_name){
+	function remove_event_category(EE_CPT_Base $cpt_model_object_event, $category_name) {
 		//find the term_taxonomy by that name
-		$term_taxonomy = $this->get_first_related($cpt_model_object_event, 'Term_Taxonomy', array(array('Term.name'=>$category_name,'taxonomy'=>EE_Event_Category_Taxonomy)));
+		$term_taxonomy = $this->get_first_related($cpt_model_object_event, 'Term_Taxonomy', array(array('Term.name'=>$category_name, 'taxonomy'=>EE_Event_Category_Taxonomy)));
 		/** @var $term_taxonomy EE_Term_Taxonomy */
-		if( $term_taxonomy ){
+		if ($term_taxonomy) {
 			$term_taxonomy->set_count($term_taxonomy->count() - 1);
 			$term_taxonomy->save();
 		}
@@ -291,8 +291,8 @@ 
 	 * @param string|array $attr Optional. Query string or array of attributes.
 	 * @return string HTML image element
 	 */
-	public function get_feature_image( $id, $size = 'thumbnail', $attr = '' ) {
-		return get_the_post_thumbnail( $id, $size, $attr );
+	public function get_feature_image($id, $size = 'thumbnail', $attr = '') {
+		return get_the_post_thumbnail($id, $size, $attr);
 	}
 
 
@@ -305,10 +305,10 @@ 
 	 * @global array $wp_post_statuses set in wp core for storing all the post stati
 	 * @return array
 	 */
-	public function get_post_statuses(){
+	public function get_post_statuses() {
 		global $wp_post_statuses;
 		$statuses = array();
-		foreach($wp_post_statuses as $post_status => $args_object){
+		foreach ($wp_post_statuses as $post_status => $args_object) {
 			$statuses[$post_status] = $args_object->label;
 		}
 		return $statuses;
@@ -323,9 +323,9 @@ 
 	public function get_status_array() {
 		$statuses = $this->get_post_statuses();
 		//first the global filter
-		$statuses = apply_filters( 'FHEE_EEM_CPT_Base__get_status_array', $statuses );
+		$statuses = apply_filters('FHEE_EEM_CPT_Base__get_status_array', $statuses);
 		//now the class specific filter
-		$statuses = apply_filters( 'FHEE_EEM_' . get_class($this) . '__get_status_array', $statuses );
+		$statuses = apply_filters('FHEE_EEM_'.get_class($this).'__get_status_array', $statuses);
 		return $statuses;
 	}
 
@@ -337,7 +337,7 @@ 
 	 */
 	public function get_custom_post_statuses() {
 		$new_stati = array();
-		foreach ( $this->_custom_stati as $status => $props ) {
+		foreach ($this->_custom_stati as $status => $props) {
 			$new_stati[$status] = $props['label'];
 		}
 		return $new_stati;
@@ -353,24 +353,24 @@ 
 	 * @param WP_Post|array $post
 	 * @return EE_CPT_Base
 	 */
-	public function instantiate_class_from_post_object_orig($post){
-		$post = (array)$post;
+	public function instantiate_class_from_post_object_orig($post) {
+		$post = (array) $post;
 		$has_all_necessary_fields_for_table = true;
 		//check if the post has fields on the meta table already
-		foreach($this->_get_other_tables() as $table_obj){
+		foreach ($this->_get_other_tables() as $table_obj) {
 			$fields_for_that_table = $this->_get_fields_for_table($table_obj->get_table_alias());
-			foreach($fields_for_that_table as $field_obj){
-				if( ! isset($post[$field_obj->get_table_column()])
-					&& ! isset($post[$field_obj->get_qualified_column()])){
+			foreach ($fields_for_that_table as $field_obj) {
+				if ( ! isset($post[$field_obj->get_table_column()])
+					&& ! isset($post[$field_obj->get_qualified_column()])) {
 					$has_all_necessary_fields_for_table = false;
 				}
 			}
 		}
 		//if we don't have all the fields we need, then just fetch the proper model from the DB
-		if( ! $has_all_necessary_fields_for_table){
+		if ( ! $has_all_necessary_fields_for_table) {
 
 			return $this->get_one_by_ID($post['ID']);
-		}else{
+		} else {
 			return $this->instantiate_class_from_array_or_object($post);
 		}
 	}
@@ -381,30 +381,30 @@ 
 	 * @param null $post
 	 * @return EE_Base_Class|EE_Soft_Delete_Base_Class
 	 */
-	public function instantiate_class_from_post_object( $post = NULL ){
-		if ( empty( $post )) {
+	public function instantiate_class_from_post_object($post = NULL) {
+		if (empty($post)) {
 			global $post;
 		}
-		$post = (array)$post;
+		$post = (array) $post;
 		$tables_needing_to_be_queried = array();
 		//check if the post has fields on the meta table already
-		foreach($this->get_tables() as $table_obj){
+		foreach ($this->get_tables() as $table_obj) {
 			$fields_for_that_table = $this->_get_fields_for_table($table_obj->get_table_alias());
-			foreach($fields_for_that_table as $field_obj){
-				if( ! isset($post[$field_obj->get_table_column()])
-					&& ! isset($post[$field_obj->get_qualified_column()])){
+			foreach ($fields_for_that_table as $field_obj) {
+				if ( ! isset($post[$field_obj->get_table_column()])
+					&& ! isset($post[$field_obj->get_qualified_column()])) {
 					$tables_needing_to_be_queried[$table_obj->get_table_alias()] = $table_obj;
 				}
 			}
 		}
 		//if we don't have all the fields we need, then just fetch the proper model from the DB
-		if( $tables_needing_to_be_queried){
-			if(count($tables_needing_to_be_queried) == 1 && reset($tables_needing_to_be_queried) instanceof EE_Secondary_Table){
+		if ($tables_needing_to_be_queried) {
+			if (count($tables_needing_to_be_queried) == 1 && reset($tables_needing_to_be_queried) instanceof EE_Secondary_Table) {
 				//so we're only missing data from a secondary table. Well that's not too hard to query for
 				$table_to_query = reset($tables_needing_to_be_queried);
-				$missing_data = $this->_do_wpdb_query( 'get_row', array( 'SELECT * FROM ' . $table_to_query->get_table_name() . ' WHERE ' . $table_to_query->get_fk_on_table() . ' = ' . $post['ID'], ARRAY_A ));
-				if ( ! empty( $missing_data )) {
-					$post = array_merge( $post, $missing_data );
+				$missing_data = $this->_do_wpdb_query('get_row', array('SELECT * FROM '.$table_to_query->get_table_name().' WHERE '.$table_to_query->get_fk_on_table().' = '.$post['ID'], ARRAY_A));
+				if ( ! empty($missing_data)) {
+					$post = array_merge($post, $missing_data);
 				}
 			} else {
 				return $this->get_one_by_ID($post['ID']);
@@ -421,15 +421,15 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	public function post_type(){
+	public function post_type() {
 		$post_type_field = NULL;
-		foreach($this->field_settings(true) as $field_obj){
-			if($field_obj instanceof EE_WP_Post_Type_Field){
-				$post_type_field = $field_obj;break;
+		foreach ($this->field_settings(true) as $field_obj) {
+			if ($field_obj instanceof EE_WP_Post_Type_Field) {
+				$post_type_field = $field_obj; break;
 			}
 		}
-		if($post_type_field == NULL){
-			throw new EE_Error(sprintf(__("CPT Model %s should have a field of type EE_WP_Post_Type, but doesnt", "event_espresso"),get_class($this)));
+		if ($post_type_field == NULL) {
+			throw new EE_Error(sprintf(__("CPT Model %s should have a field of type EE_WP_Post_Type, but doesnt", "event_espresso"), get_class($this)));
 		}
 		return $post_type_field->get_default_value();
 	}

core/db_models/EEM_Datetime.model.php

Indentation +19 added lines, -19 removed lines

@@ -75,11 +75,11 @@ 
 
 
 	/**
-	*		create new blank datetime
-	*
-	* 		@access		public
-	*		@return 		EE_Datetime[]		array on success, FALSE on fail
-	*/
+	 *		create new blank datetime
+	 *
+	 * 		@access		public
+	 *		@return 		EE_Datetime[]		array on success, FALSE on fail
+	 */
 	public function create_new_blank_datetime() {
 		$blank_datetime = EE_Datetime::new_instance(
 			array(
@@ -100,12 +100,12 @@ 
 
 
 	/**
-	*		get event start date from db
-	*
-	* 		@access		public
-	* 		@param		int 			$EVT_ID
-	*		@return 		EE_Datetime[]		array on success, FALSE on fail
-	*/
+	 *		get event start date from db
+	 *
+	 * 		@access		public
+	 * 		@param		int 			$EVT_ID
+	 *		@return 		EE_Datetime[]		array on success, FALSE on fail
+	 */
 	public function get_all_event_dates( $EVT_ID = 0 ) {
 		if ( ! $EVT_ID ) { // on add_new_event event_id gets set to 0
 			return $this->create_new_blank_datetime();
@@ -250,14 +250,14 @@ 
 	}
 
 		/**
-	 * Gets ALL the datetimes for an ticket (including trashed ones, for now), ordered
-	 * only by start date
-	 * @param int $TKT_ID
-	 * @param boolean $include_expired
-	 * @param boolean $include_deleted
-	 * @param int $limit
-	 * @return EE_Datetime[]
-	 */
+		 * Gets ALL the datetimes for an ticket (including trashed ones, for now), ordered
+		 * only by start date
+		 * @param int $TKT_ID
+		 * @param boolean $include_expired
+		 * @param boolean $include_deleted
+		 * @param int $limit
+		 * @return EE_Datetime[]
+		 */
 	public function get_datetimes_for_ticket_ordered_by_start_time($TKT_ID, $include_expired = true, $include_deleted= true, $limit = NULL){
 		//sanitize TKT_ID
 		$TKT_ID =  intval( $TKT_ID );

Doc Comments +1 added lines, -1 removed lines

@@ -443,7 +443,7 @@
 	/**
 	 * This returns an array of counts of datetimes in the database for each Datetime status that can be queried.
 	 *
-	 * @param  array $stati_to_include        If included you can restrict the statuses we return counts for by including the stati
+	 * @param  string[] $stati_to_include        If included you can restrict the statuses we return counts for by including the stati
 	 *                               you want counts for as values in the array.  An empty array returns counts for all valid
 	 *                               stati.
 	 * @param  array  $query_params  If included can be used to refine the conditions for returning the count (i.e. only for

Spacing +132 added lines, -132 removed lines

@@ -21,8 +21,8 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
-require_once ( EE_CLASSES . 'EE_Datetime.class.php' );
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
+require_once (EE_CLASSES.'EE_Datetime.class.php');
 
 class EEM_Datetime extends EEM_Soft_Delete_Base {
 
@@ -35,27 +35,27 @@ 
 	 *		@access private
 	 *		@param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
 	 */
-	protected function __construct( $timezone ) {
-		$this->singular_item = __('Datetime','event_espresso');
-		$this->plural_item = __('Datetimes','event_espresso');
+	protected function __construct($timezone) {
+		$this->singular_item = __('Datetime', 'event_espresso');
+		$this->plural_item = __('Datetimes', 'event_espresso');
 
 		$this->_tables = array(
 			'Datetime'=> new EE_Primary_Table('esp_datetime', 'DTT_ID')
 		);
 		$this->_fields = array(
 			'Datetime'=>array(
-				'DTT_ID'=> new EE_Primary_Key_Int_Field('DTT_ID', __('Datetime ID','event_espresso')),
-				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('Event ID','event_espresso'), false, 0, 'Event'),
+				'DTT_ID'=> new EE_Primary_Key_Int_Field('DTT_ID', __('Datetime ID', 'event_espresso')),
+				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('Event ID', 'event_espresso'), false, 0, 'Event'),
 				'DTT_name' => new EE_Plain_Text_Field('DTT_name', __('Datetime Name', 'event_espresso'), false, ''),
 				'DTT_description' => new EE_Full_HTML_Field('DTT_description', __('Description for Datetime', 'event_espresso'), false, ''),
-				'DTT_EVT_start'=>new EE_Datetime_Field('DTT_EVT_start', __('Start time/date of Event','event_espresso'), false, time(), $timezone ),
-				'DTT_EVT_end'=>new EE_Datetime_Field('DTT_EVT_end', __('End time/date of Event','event_espresso'), false, time(), $timezone ),
-				'DTT_reg_limit'=>new EE_Infinite_Integer_Field('DTT_reg_limit', __('Registration Limit for this time','event_espresso'), true, EE_INF),
-				'DTT_sold'=>new EE_Integer_Field('DTT_sold', __('How many sales for this Datetime that have occurred', 'event_espresso'), true, 0 ),
-				'DTT_is_primary'=>new EE_Boolean_Field('DTT_is_primary', __("Flag indicating datetime is primary one for event", "event_espresso"), false,false),
+				'DTT_EVT_start'=>new EE_Datetime_Field('DTT_EVT_start', __('Start time/date of Event', 'event_espresso'), false, time(), $timezone),
+				'DTT_EVT_end'=>new EE_Datetime_Field('DTT_EVT_end', __('End time/date of Event', 'event_espresso'), false, time(), $timezone),
+				'DTT_reg_limit'=>new EE_Infinite_Integer_Field('DTT_reg_limit', __('Registration Limit for this time', 'event_espresso'), true, EE_INF),
+				'DTT_sold'=>new EE_Integer_Field('DTT_sold', __('How many sales for this Datetime that have occurred', 'event_espresso'), true, 0),
+				'DTT_is_primary'=>new EE_Boolean_Field('DTT_is_primary', __("Flag indicating datetime is primary one for event", "event_espresso"), false, false),
 				'DTT_order' => new EE_Integer_Field('DTT_order', __('The order in which the Datetime is displayed', 'event_espresso'), false, 0),
-				'DTT_parent' => new EE_Integer_Field('DTT_parent', __('Indicates what DTT_ID is the parent of this DTT_ID'), true, 0 ),
-				'DTT_deleted' => new EE_Trashed_Flag_Field('DTT_deleted', __('Flag indicating datetime is archived', 'event_espresso'), false, false ),
+				'DTT_parent' => new EE_Integer_Field('DTT_parent', __('Indicates what DTT_ID is the parent of this DTT_ID'), true, 0),
+				'DTT_deleted' => new EE_Trashed_Flag_Field('DTT_deleted', __('Flag indicating datetime is archived', 'event_espresso'), false, false),
 			));
 		$this->_model_relations = array(
 			'Ticket'=>new EE_HABTM_Relation('Datetime_Ticket'),
@@ -64,11 +64,11 @@ 
 		);
 		$this->_model_chain_to_wp_user = 'Event';
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Event_Related_Public( 'Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Event_Related_Protected( 'Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Event_Related_Protected( 'Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Event_Related_Protected( 'Event', EEM_Base::caps_edit );
-		parent::__construct( $timezone );
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Event_Related_Public('Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Event_Related_Protected('Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Event_Related_Protected('Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Event_Related_Protected('Event', EEM_Base::caps_edit);
+		parent::__construct($timezone);
 	}
 
 
@@ -83,16 +83,16 @@ 
 	public function create_new_blank_datetime() {
 		$blank_datetime = EE_Datetime::new_instance(
 			array(
-				'DTT_EVT_start' => $this->current_time_for_query( 'DTT_EVT_start', true ) + (60 * 60 * 24 * 30),
-				'DTT_EVT_end' => $this->current_time_for_query( 'DTT_EVT_end', true ) + (60 * 60 * 24 * 30),
+				'DTT_EVT_start' => $this->current_time_for_query('DTT_EVT_start', true) + (60 * 60 * 24 * 30),
+				'DTT_EVT_end' => $this->current_time_for_query('DTT_EVT_end', true) + (60 * 60 * 24 * 30),
 				'DTT_order' => 1,
 				'DTT_reg_limit' => EE_INF
 			),
 			$this->_timezone
 		);
-		$blank_datetime->set_start_time( $this->convert_datetime_for_query( 'DTT_EVT_start', '8am', 'ga', $this->_timezone ) );
-		$blank_datetime->set_end_time( $this->convert_datetime_for_query( 'DTT_EVT_end', '5pm', 'ga', $this->_timezone ) );
-		return array( $blank_datetime );
+		$blank_datetime->set_start_time($this->convert_datetime_for_query('DTT_EVT_start', '8am', 'ga', $this->_timezone));
+		$blank_datetime->set_end_time($this->convert_datetime_for_query('DTT_EVT_end', '5pm', 'ga', $this->_timezone));
+		return array($blank_datetime);
 	}
 
 
@@ -106,13 +106,13 @@ 
 	* 		@param		int 			$EVT_ID
 	*		@return 		EE_Datetime[]		array on success, FALSE on fail
 	*/
-	public function get_all_event_dates( $EVT_ID = 0 ) {
-		if ( ! $EVT_ID ) { // on add_new_event event_id gets set to 0
+	public function get_all_event_dates($EVT_ID = 0) {
+		if ( ! $EVT_ID) { // on add_new_event event_id gets set to 0
 			return $this->create_new_blank_datetime();
 		}
-		$results =  $this->get_datetimes_for_event_ordered_by_DTT_order($EVT_ID);
+		$results = $this->get_datetimes_for_event_ordered_by_DTT_order($EVT_ID);
 
-		if ( empty( $results ) ) {
+		if (empty($results)) {
 			return $this->create_new_blank_datetime();
 		}
 
@@ -133,26 +133,26 @@ 
 	 *                        	the given number
 	 * @return EE_Datetime[]
 	 */
-	public function get_datetimes_for_event_ordered_by_DTT_order( $EVT_ID, $include_expired = TRUE, $include_deleted= TRUE, $limit = NULL  ) {
+	public function get_datetimes_for_event_ordered_by_DTT_order($EVT_ID, $include_expired = TRUE, $include_deleted = TRUE, $limit = NULL) {
 
 		//sanitize EVT_ID
-		$EVT_ID = intval( $EVT_ID );
+		$EVT_ID = intval($EVT_ID);
 
 		$old_assumption = $this->get_assumption_concerning_values_already_prepared_by_model_object();
-		$this->assume_values_already_prepared_by_model_object( EEM_Base::prepared_for_use_in_db );
-		$where_params = array( 'Event.EVT_ID' => $EVT_ID );
+		$this->assume_values_already_prepared_by_model_object(EEM_Base::prepared_for_use_in_db);
+		$where_params = array('Event.EVT_ID' => $EVT_ID);
 
-		$query_params = ! empty( $limit ) ? array( $where_params, 'limit' => $limit, 'order_by' => array( 'DTT_order' => 'ASC' ), 'default_where_conditions' => 'none' ) : array( $where_params, 'order_by' => array( 'DTT_order' => 'ASC' ), 'default_where_conditions' => 'none' );
+		$query_params = ! empty($limit) ? array($where_params, 'limit' => $limit, 'order_by' => array('DTT_order' => 'ASC'), 'default_where_conditions' => 'none') : array($where_params, 'order_by' => array('DTT_order' => 'ASC'), 'default_where_conditions' => 'none');
 
-		if( ! $include_expired){
-			$query_params[0]['DTT_EVT_end'] = array( '>=', current_time( 'mysql', TRUE ) );
+		if ( ! $include_expired) {
+			$query_params[0]['DTT_EVT_end'] = array('>=', current_time('mysql', TRUE));
 		}
-		if( $include_deleted){
-			$query_params[0]['DTT_deleted'] = array( 'IN', array( TRUE, FALSE ));
+		if ($include_deleted) {
+			$query_params[0]['DTT_deleted'] = array('IN', array(TRUE, FALSE));
 		}
 
-		$result = $this->get_all( $query_params );
-		$this->assume_values_already_prepared_by_model_object( $old_assumption );
+		$result = $this->get_all($query_params);
+		$this->assume_values_already_prepared_by_model_object($old_assumption);
 		return $result;
 	}
 
@@ -167,8 +167,8 @@ 
 	 * @param int $limit
 	 * @return EE_Datetime[]
 	 */
-	public function get_datetimes_for_event_ordered_by_importance( $EVT_ID = 0, $limit = NULL){
-		return $this->get_all( array(array('Event.EVT_ID'=>$EVT_ID),
+	public function get_datetimes_for_event_ordered_by_importance($EVT_ID = 0, $limit = NULL) {
+		return $this->get_all(array(array('Event.EVT_ID'=>$EVT_ID),
 			'limit'=>$limit,
 			'order_by'=>array('DTT_EVT_start'=>'ASC'),
 			'default_where_conditions' => 'none'));
@@ -183,11 +183,11 @@ 
 	 * @param boolean $include_deleted
 	 * @return EE_Datetime
 	 */
-	public function get_oldest_datetime_for_event($EVT_ID, $include_expired = false,$include_deleted = false){
-		$results =  $this->get_datetimes_for_event_ordered_by_start_time($EVT_ID, $include_expired, $include_deleted, 1);
-		if($results){
+	public function get_oldest_datetime_for_event($EVT_ID, $include_expired = false, $include_deleted = false) {
+		$results = $this->get_datetimes_for_event_ordered_by_start_time($EVT_ID, $include_expired, $include_deleted, 1);
+		if ($results) {
 			return array_shift($results);
-		}else{
+		} else {
 			return NULL;
 		}
 	}
@@ -201,16 +201,16 @@ 
 	 * @param bool $try_to_exclude_deleted
 	 * @return \EE_Datetime
 	 */
-	public function get_primary_datetime_for_event($EVT_ID,$try_to_exclude_expired = true, $try_to_exclude_deleted = true){
-		if($try_to_exclude_expired){
-			$non_expired = $this->get_oldest_datetime_for_event($EVT_ID, false,false);
-			if($non_expired){
+	public function get_primary_datetime_for_event($EVT_ID, $try_to_exclude_expired = true, $try_to_exclude_deleted = true) {
+		if ($try_to_exclude_expired) {
+			$non_expired = $this->get_oldest_datetime_for_event($EVT_ID, false, false);
+			if ($non_expired) {
 				return $non_expired;
 			}
 		}
-		if($try_to_exclude_deleted){
+		if ($try_to_exclude_deleted) {
 			$expired_even = $this->get_oldest_datetime_for_event($EVT_ID, true);
-			if($expired_even){
+			if ($expired_even) {
 				return $expired_even;
 			}
 		}
@@ -229,23 +229,23 @@ 
 	 * @param int $limit
 	 * @return EE_Datetime[]
 	 */
-	public function get_datetimes_for_event_ordered_by_start_time($EVT_ID, $include_expired = true, $include_deleted= true, $limit = NULL ){
+	public function get_datetimes_for_event_ordered_by_start_time($EVT_ID, $include_expired = true, $include_deleted = true, $limit = NULL) {
 		//sanitize EVT_ID
-		$EVT_ID = intval( $EVT_ID );
+		$EVT_ID = intval($EVT_ID);
 		$old_assumption = $this->get_assumption_concerning_values_already_prepared_by_model_object();
-		$this->assume_values_already_prepared_by_model_object( EEM_Base::prepared_for_use_in_db );
-		$query_params =array(array('Event.EVT_ID'=>$EVT_ID),'order_by'=>array('DTT_EVT_start'=>'asc'));
-		if( ! $include_expired){
-			$query_params[0]['DTT_EVT_end'] = array('>=',current_time('mysql', TRUE));
+		$this->assume_values_already_prepared_by_model_object(EEM_Base::prepared_for_use_in_db);
+		$query_params = array(array('Event.EVT_ID'=>$EVT_ID), 'order_by'=>array('DTT_EVT_start'=>'asc'));
+		if ( ! $include_expired) {
+			$query_params[0]['DTT_EVT_end'] = array('>=', current_time('mysql', TRUE));
 		}
-		if( $include_deleted){
-			$query_params[0]['DTT_deleted'] = array('IN',array(true,false));
+		if ($include_deleted) {
+			$query_params[0]['DTT_deleted'] = array('IN', array(true, false));
 		}
-		if($limit){
+		if ($limit) {
 			$query_params['limit'] = $limit;
 		}
-		$result = $this->get_all( $query_params );
-		$this->assume_values_already_prepared_by_model_object( $old_assumption );
+		$result = $this->get_all($query_params);
+		$this->assume_values_already_prepared_by_model_object($old_assumption);
 		return $result;
 	}
 
@@ -258,23 +258,23 @@ 
 	 * @param int $limit
 	 * @return EE_Datetime[]
 	 */
-	public function get_datetimes_for_ticket_ordered_by_start_time($TKT_ID, $include_expired = true, $include_deleted= true, $limit = NULL){
+	public function get_datetimes_for_ticket_ordered_by_start_time($TKT_ID, $include_expired = true, $include_deleted = true, $limit = NULL) {
 		//sanitize TKT_ID
-		$TKT_ID =  intval( $TKT_ID );
+		$TKT_ID = intval($TKT_ID);
 		$old_assumption = $this->get_assumption_concerning_values_already_prepared_by_model_object();
-		$this->assume_values_already_prepared_by_model_object( EEM_Base::prepared_for_use_in_db );
-		$query_params =array(array('Ticket.TKT_ID'=>$TKT_ID),'order_by'=>array('DTT_EVT_start'=>'asc'));
-		if( ! $include_expired){
-			$query_params[0]['DTT_EVT_end'] = array('>=',current_time('mysql', TRUE));
+		$this->assume_values_already_prepared_by_model_object(EEM_Base::prepared_for_use_in_db);
+		$query_params = array(array('Ticket.TKT_ID'=>$TKT_ID), 'order_by'=>array('DTT_EVT_start'=>'asc'));
+		if ( ! $include_expired) {
+			$query_params[0]['DTT_EVT_end'] = array('>=', current_time('mysql', TRUE));
 		}
-		if( $include_deleted){
-			$query_params[0]['DTT_deleted'] = array('IN',array(true,false));
+		if ($include_deleted) {
+			$query_params[0]['DTT_deleted'] = array('IN', array(true, false));
 		}
-		if($limit){
+		if ($limit) {
 			$query_params['limit'] = $limit;
 		}
-		$result = $this->get_all( $query_params );
-		$this->assume_values_already_prepared_by_model_object( $old_assumption );
+		$result = $this->get_all($query_params);
+		$this->assume_values_already_prepared_by_model_object($old_assumption);
 		return $result;
 	}
 
@@ -290,24 +290,24 @@ 
 	 *                                  that number
 	 * @return EE_Datetime[]
 	 */
-	public function get_datetimes_for_ticket_ordered_by_DTT_order( $TKT_ID, $include_expired = true, $include_deleted = true, $limit = NULL ) {
+	public function get_datetimes_for_ticket_ordered_by_DTT_order($TKT_ID, $include_expired = true, $include_deleted = true, $limit = NULL) {
 		//sanitize id.
-		$TKT_ID =  intval( $TKT_ID );
+		$TKT_ID = intval($TKT_ID);
 		$old_assumption = $this->get_assumption_concerning_values_already_prepared_by_model_object();
-		$this->assume_values_already_prepared_by_model_object( EEM_Base::prepared_for_use_in_db );
-		$where_params = array( 'Ticket.TKT_ID' => $TKT_ID );
-		$query_params = array( $where_params, 'order_by' => array( 'DTT_order' => 'ASC' ) );
-		if( ! $include_expired){
-			$query_params[0]['DTT_EVT_end'] = array('>=',current_time('mysql', TRUE));
+		$this->assume_values_already_prepared_by_model_object(EEM_Base::prepared_for_use_in_db);
+		$where_params = array('Ticket.TKT_ID' => $TKT_ID);
+		$query_params = array($where_params, 'order_by' => array('DTT_order' => 'ASC'));
+		if ( ! $include_expired) {
+			$query_params[0]['DTT_EVT_end'] = array('>=', current_time('mysql', TRUE));
 		}
-		if( $include_deleted){
-			$query_params[0]['DTT_deleted'] = array('IN',array(true,false));
+		if ($include_deleted) {
+			$query_params[0]['DTT_deleted'] = array('IN', array(true, false));
 		}
-		if($limit){
+		if ($limit) {
 			$query_params['limit'] = $limit;
 		}
-		$result = $this->get_all( $query_params );
-		$this->assume_values_already_prepared_by_model_object( $old_assumption );
+		$result = $this->get_all($query_params);
+		$this->assume_values_already_prepared_by_model_object($old_assumption);
 		return $result;
 	}
 
@@ -318,11 +318,11 @@ 
 	 * @param int $EVT_ID
 	 * @return EE_Datetime
 	 */
-	public function get_most_important_datetime_for_event($EVT_ID){
+	public function get_most_important_datetime_for_event($EVT_ID) {
 		$results = $this->get_datetimes_for_event_ordered_by_importance($EVT_ID, 1);
-		if($results){
+		if ($results) {
 			return array_shift($results);
-		}else{
+		} else {
 			return null;
 		}
 	}
@@ -341,71 +341,71 @@ 
 	 * 			- inactive = Events that are either not published.
 	 * @return wpdb results array
 	 */
-	public function get_dtt_months_and_years( $where_params, $evt_active_status = '' ) {
+	public function get_dtt_months_and_years($where_params, $evt_active_status = '') {
 
-		switch ( $evt_active_status ) {
+		switch ($evt_active_status) {
 			case 'upcoming' :
 					$where_params['Event.status'] = 'publish';
 					//if there are already query_params matching DTT_EVT_start then we need to modify that to add them.
-					if ( isset( $where_params['DTT_EVT_start'] ) ) {
+					if (isset($where_params['DTT_EVT_start'])) {
 						$where_params['DTT_EVT_start*****'] = $where_params['DTT_EVT_start'];
 					}
-					$where_params['DTT_EVT_start'] = array('>', $this->current_time_for_query( 'DTT_EVT_start' ) );
+					$where_params['DTT_EVT_start'] = array('>', $this->current_time_for_query('DTT_EVT_start'));
 					break;
 
 			case 'expired' :
-				if ( isset( $where_params['Event.status'] ) ) unset( $where_params['Event.status'] );
+				if (isset($where_params['Event.status'])) unset($where_params['Event.status']);
 				//get events to exclude
-				$exclude_query[0] = array_merge( $where_params, array( 'DTT_EVT_end' => array( '>', $this->current_time_for_query( 'DTT_EVT_end' ) ) ) );
+				$exclude_query[0] = array_merge($where_params, array('DTT_EVT_end' => array('>', $this->current_time_for_query('DTT_EVT_end'))));
 				//first get all events that have datetimes where its not expired.
-				$event_ids = $this->_get_all_wpdb_results( $exclude_query, OBJECT_K, 'Datetime.EVT_ID' );
-				$event_ids = array_keys( $event_ids );
+				$event_ids = $this->_get_all_wpdb_results($exclude_query, OBJECT_K, 'Datetime.EVT_ID');
+				$event_ids = array_keys($event_ids);
 
-				if ( isset( $where_params['DTT_EVT_end'] ) ) {
+				if (isset($where_params['DTT_EVT_end'])) {
 					$where_params['DTT_EVT_end****'] = $where_params['DTT_EVT_end'];
 				}
-				$where_params['DTT_EVT_end'] = array( '<', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_end' ) );
-				$where_params['Event.EVT_ID'] = array( 'NOT IN', $event_ids );
+				$where_params['DTT_EVT_end'] = array('<', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'));
+				$where_params['Event.EVT_ID'] = array('NOT IN', $event_ids);
 				break;
 
 			case 'active' :
 				$where_params['Event.status'] = 'publish';
-				if ( isset( $where_params['DTT_EVT_start'] ) ) {
+				if (isset($where_params['DTT_EVT_start'])) {
 					$where_params['Datetime.DTT_EVT_start******'] = $where_params['DTT_EVT_start'];
 				}
-				if ( isset( $where_params['Datetime.DTT_EVT_end'] ) ) {
+				if (isset($where_params['Datetime.DTT_EVT_end'])) {
 					$where_params['Datetime.DTT_EVT_end*****'] = $where_params['DTT_EVT_end'];
 				}
-				$where_params['DTT_EVT_start'] = array('<',  $this->current_time_for_query( 'DTT_EVT_start' ) );
-				$where_params['DTT_EVT_end'] = array('>', $this->current_time_for_query( 'DTT_EVT_end' ) );
+				$where_params['DTT_EVT_start'] = array('<', $this->current_time_for_query('DTT_EVT_start'));
+				$where_params['DTT_EVT_end'] = array('>', $this->current_time_for_query('DTT_EVT_end'));
 				break;
 
 			case 'inactive' :
-				if ( isset( $where_params['Event.status'] ) ) unset( $where_params['Event.status'] );
-				if ( isset( $where_params['OR'] ) ) {
+				if (isset($where_params['Event.status'])) unset($where_params['Event.status']);
+				if (isset($where_params['OR'])) {
 					$where_params['AND']['OR'] = $where_params['OR'];
 				}
-				if ( isset( $where_params['DTT_EVT_end'] ) ) {
+				if (isset($where_params['DTT_EVT_end'])) {
 					$where_params['AND']['DTT_EVT_end****'] = $where_params['DTT_EVT_end'];
-					unset( $where_params['DTT_EVT_end'] );
+					unset($where_params['DTT_EVT_end']);
 				}
 
-				if ( isset( $where_params['DTT_EVT_start'] ) ) {
+				if (isset($where_params['DTT_EVT_start'])) {
 					$where_params['AND']['DTT_EVT_start'] = $where_params['DTT_EVT_start'];
-					unset( $where_params['DTT_EVT_start'] );
+					unset($where_params['DTT_EVT_start']);
 				}
-				$where_params['AND']['Event.status'] = array( '!=', 'publish' );
+				$where_params['AND']['Event.status'] = array('!=', 'publish');
 				break;
 		}
 
 		$query_params[0] = $where_params;
 		$query_params['group_by'] = array('dtt_year', 'dtt_month');
-		$query_params['order_by'] = array( 'DTT_EVT_start' => 'DESC' );
+		$query_params['order_by'] = array('DTT_EVT_start' => 'DESC');
 		$columns_to_select = array(
 			'dtt_year' => array('YEAR(DTT_EVT_start)', '%s'),
 			'dtt_month' => array('MONTHNAME(DTT_EVT_start)', '%s')
 			);
-		return $this->_get_all_wpdb_results( $query_params, OBJECT, $columns_to_select );
+		return $this->_get_all_wpdb_results($query_params, OBJECT, $columns_to_select);
 	}
 
 	/**
@@ -413,8 +413,8 @@ 
 	 * for the tickets for each datetime)
 	 * @param EE_Datetime[] $datetimes
 	 */
-	public function update_sold($datetimes){
-		foreach($datetimes as $datetime){
+	public function update_sold($datetimes) {
+		foreach ($datetimes as $datetime) {
 			$datetime->update_sold();
 		}
 	}
@@ -429,10 +429,10 @@ 
 	 * @param array $query_params
 	 * @return int of tickets available. If sold out, return less than 1. If infinite, returns EE_INF,  IF there are NO tickets attached to datetime then FALSE is returned.
 	 */
-	public function sum_tickets_currently_available_at_datetime( $DTT_ID, $query_params = array() ) {
-		$datetime = $this->get_one_by_ID( $DTT_ID );
-		if ( $datetime instanceof EE_Datetime ) {
-			return $datetime->tickets_remaining( $query_params );
+	public function sum_tickets_currently_available_at_datetime($DTT_ID, $query_params = array()) {
+		$datetime = $this->get_one_by_ID($DTT_ID);
+		if ($datetime instanceof EE_Datetime) {
+			return $datetime->tickets_remaining($query_params);
 		}
 		return 0;
 	}
@@ -454,36 +454,36 @@ 
 	 *                EE_Datetime::upcoming
 	 *                EE_Datetime::expired
 	 */
-	public function get_datetime_counts_by_status( $stati_to_include = array(), $query_params = array() ) {
+	public function get_datetime_counts_by_status($stati_to_include = array(), $query_params = array()) {
 		//only accept where conditions for this query.
-		$_where = isset( $query_params[0] ) ? $query_params[0] : array();
+		$_where = isset($query_params[0]) ? $query_params[0] : array();
 		$status_query_args = array(
 				EE_Datetime::active => array_merge(
 						$_where,
-						array( 'DTT_EVT_start' => array( '<', time() ), 'DTT_EVT_end' => array( '>', time() ) )
+						array('DTT_EVT_start' => array('<', time()), 'DTT_EVT_end' => array('>', time()))
 				),
 				EE_Datetime::upcoming => array_merge(
 						$_where,
-						array( 'DTT_EVT_start' => array( '>', time() ) )
+						array('DTT_EVT_start' => array('>', time()))
 				),
 				EE_Datetime::expired => array_merge(
 						$_where,
-						array( 'DTT_EVT_end' => array('<', time() ) )
+						array('DTT_EVT_end' => array('<', time()))
 				)
 		);
 
-		if ( ! empty( $stati_to_include ) ) {
-			foreach( array_keys( $status_query_args ) as $status ) {
-				if ( ! in_array( $status, $stati_to_include ) ) {
-					unset( $status_query_args[$status] );
+		if ( ! empty($stati_to_include)) {
+			foreach (array_keys($status_query_args) as $status) {
+				if ( ! in_array($status, $stati_to_include)) {
+					unset($status_query_args[$status]);
 				}
 			}
 		}
 
 		//loop through and query counts for each stati.
 		$status_query_results = array();
-		foreach( $status_query_args as $status => $status_where_conditions ) {
-			$status_query_results[ $status ] = EEM_Datetime::count( array( $status_where_conditions ), 'DTT_ID', true );
+		foreach ($status_query_args as $status => $status_where_conditions) {
+			$status_query_results[$status] = EEM_Datetime::count(array($status_where_conditions), 'DTT_ID', true);
 		}
 
 		return $status_query_results;
@@ -497,9 +497,9 @@ 
 	 * @param array $query_params
 	 * @return int
 	 */
-	public function get_datetime_count_for_status( $status = EE_Datetime::active, $query_params = array() ) {
-		$count = $this->get_datetime_counts_by_status( array( $status ), $query_params );
-		return ! empty( $count[$status] ) ? $count[$status] : 0;
+	public function get_datetime_count_for_status($status = EE_Datetime::active, $query_params = array()) {
+		$count = $this->get_datetime_counts_by_status(array($status), $query_params);
+		return ! empty($count[$status]) ? $count[$status] : 0;
 	}
 
 

core/db_models/EEM_Line_Item.model.php

Spacing +52 added lines, -52 removed lines

@@ -103,41 +103,41 @@ 
 	 * @param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
 	 * @return \EEM_Line_Item
 	 */
-	protected function __construct( $timezone ) {
-		$this->singular_item = __('Line Item','event_espresso');
-		$this->plural_item = __('Line Items','event_espresso');
+	protected function __construct($timezone) {
+		$this->singular_item = __('Line Item', 'event_espresso');
+		$this->plural_item = __('Line Items', 'event_espresso');
 
 		$this->_tables = array(
-			'Line_Item'=>new EE_Primary_Table('esp_line_item','LIN_ID')
+			'Line_Item'=>new EE_Primary_Table('esp_line_item', 'LIN_ID')
 		);
-		$line_items_can_be_for = apply_filters( 'FHEE__EEM_Line_Item__line_items_can_be_for', array('Ticket','Price', 'Event' ) );
+		$line_items_can_be_for = apply_filters('FHEE__EEM_Line_Item__line_items_can_be_for', array('Ticket', 'Price', 'Event'));
 		$this->_fields = array(
 			'Line_Item' => array(
-				'LIN_ID' 				=> new EE_Primary_Key_Int_Field( 'LIN_ID', __( "ID", "event_espresso" ) ),
-				'LIN_code' 			=> new EE_Slug_Field( 'LIN_code', __( "Code for index into Cart", "event_espresso" ), TRUE ),
-				'TXN_ID' 				=> new EE_Foreign_Key_Int_Field( 'TXN_ID', __( "Transaction ID", "event_espresso" ), TRUE, NULL, 'Transaction' ),
-				'LIN_name' 			=> new EE_Full_HTML_Field( 'LIN_name', __( "Line Item Name", "event_espresso" ), FALSE, '' ),
-				'LIN_desc' 			=> new EE_Full_HTML_Field( 'LIN_desc', __( "Line Item Description", "event_espresso" ), TRUE ),
-				'LIN_unit_price' 	=> new EE_Money_Field( 'LIN_unit_price', __( "Unit Price", "event_espresso" ), FALSE, 0 ),
-				'LIN_percent' 		=> new EE_Float_Field( 'LIN_percent', __( "Percent", "event_espresso" ), FALSE, 0 ),
-				'LIN_is_taxable' 	=> new EE_Boolean_Field( 'LIN_is_taxable', __( "Taxable", "event_espresso" ), FALSE, FALSE ),
-				'LIN_order' 			=> new EE_Integer_Field( 'LIN_order', __( "Order of Application towards total of parent", "event_espresso" ), FALSE, 1 ),
-				'LIN_total' 			=> new EE_Money_Field( 'LIN_total', __( "Total (unit price x quantity)", "event_espresso" ), FALSE, 0 ),
-				'LIN_quantity' 	=> new EE_Integer_Field( 'LIN_quantity', __( "Quantity", "event_espresso" ), TRUE, 1 ),
-				'LIN_parent' 		=> new EE_Integer_Field( 'LIN_parent', __( "Parent ID (this item goes towards that Line Item's total)", "event_espresso" ), TRUE, NULL ),
-				'LIN_type' 			=> new EE_Enum_Text_Field( 'LIN_type', __( "Type", "event_espresso" ), FALSE, 'line-item', array(
+				'LIN_ID' 				=> new EE_Primary_Key_Int_Field('LIN_ID', __("ID", "event_espresso")),
+				'LIN_code' 			=> new EE_Slug_Field('LIN_code', __("Code for index into Cart", "event_espresso"), TRUE),
+				'TXN_ID' 				=> new EE_Foreign_Key_Int_Field('TXN_ID', __("Transaction ID", "event_espresso"), TRUE, NULL, 'Transaction'),
+				'LIN_name' 			=> new EE_Full_HTML_Field('LIN_name', __("Line Item Name", "event_espresso"), FALSE, ''),
+				'LIN_desc' 			=> new EE_Full_HTML_Field('LIN_desc', __("Line Item Description", "event_espresso"), TRUE),
+				'LIN_unit_price' 	=> new EE_Money_Field('LIN_unit_price', __("Unit Price", "event_espresso"), FALSE, 0),
+				'LIN_percent' 		=> new EE_Float_Field('LIN_percent', __("Percent", "event_espresso"), FALSE, 0),
+				'LIN_is_taxable' 	=> new EE_Boolean_Field('LIN_is_taxable', __("Taxable", "event_espresso"), FALSE, FALSE),
+				'LIN_order' 			=> new EE_Integer_Field('LIN_order', __("Order of Application towards total of parent", "event_espresso"), FALSE, 1),
+				'LIN_total' 			=> new EE_Money_Field('LIN_total', __("Total (unit price x quantity)", "event_espresso"), FALSE, 0),
+				'LIN_quantity' 	=> new EE_Integer_Field('LIN_quantity', __("Quantity", "event_espresso"), TRUE, 1),
+				'LIN_parent' 		=> new EE_Integer_Field('LIN_parent', __("Parent ID (this item goes towards that Line Item's total)", "event_espresso"), TRUE, NULL),
+				'LIN_type' 			=> new EE_Enum_Text_Field('LIN_type', __("Type", "event_espresso"), FALSE, 'line-item', array(
 						self::type_line_item		=>  __("Line Item", "event_espresso"),
 						self::type_sub_line_item	=>  __("Sub-Item", "event_espresso"),
 						self::type_sub_total		=>  __("Subtotal", "event_espresso"),
 						self::type_tax_sub_total 	=> __("Tax Subtotal", "event_espresso"),
 						self::type_tax					=>  __("Tax", "event_espresso"),
 						self::type_total				=>  __("Total", "event_espresso"),
-						self::type_cancellation	=> __( 'Cancellation', 'event_espresso' )
+						self::type_cancellation	=> __('Cancellation', 'event_espresso')
 					)
 				),
-				'OBJ_ID' 					=> new EE_Foreign_Key_Int_Field( 'OBJ_ID', __( 'ID of Item purchased.', 'event_espresso' ), TRUE, NULL, $line_items_can_be_for ),
-				'OBJ_type'				=>new EE_Any_Foreign_Model_Name_Field( 'OBJ_type', __( "Model Name this Line Item is for", "event_espresso" ), TRUE, NULL, $line_items_can_be_for ),
-				'LIN_timestamp' => new EE_Datetime_Field('LIN_timestamp', __('When the line item was created','event_espresso'), false, time(), $timezone ),
+				'OBJ_ID' 					=> new EE_Foreign_Key_Int_Field('OBJ_ID', __('ID of Item purchased.', 'event_espresso'), TRUE, NULL, $line_items_can_be_for),
+				'OBJ_type'				=>new EE_Any_Foreign_Model_Name_Field('OBJ_type', __("Model Name this Line Item is for", "event_espresso"), TRUE, NULL, $line_items_can_be_for),
+				'LIN_timestamp' => new EE_Datetime_Field('LIN_timestamp', __('When the line item was created', 'event_espresso'), false, time(), $timezone),
 			)
 		);
 		$this->_model_relations = array(
@@ -148,7 +148,7 @@ 
 		);
 		$this->_model_chain_to_wp_user = 'Transaction.Registration.Event';
 		$this->_caps_slug = 'transactions';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -159,9 +159,9 @@ 
 	 * @param EE_Transaction|int $transaction
 	 * @return EE_Line_Item[]
 	 */
-	public function get_all_of_type_for_transaction( $line_item_type, $transaction ){
-		$transaction = EEM_Transaction::instance()->ensure_is_ID( $transaction );
-		return $this->get_all( array( array(
+	public function get_all_of_type_for_transaction($line_item_type, $transaction) {
+		$transaction = EEM_Transaction::instance()->ensure_is_ID($transaction);
+		return $this->get_all(array(array(
 			'LIN_type' => $line_item_type,
 			'TXN_ID' => $transaction
 		)));
@@ -175,14 +175,14 @@ 
 	 * @param EE_Transaction|int $transaction
 	 * @return \EE_Base_Class[]
 	 */
-	public function get_all_non_ticket_line_items_for_transaction( $transaction ) {
-		$transaction = EEM_Transaction::instance()->ensure_is_ID( $transaction );
-		return $this->get_all( array( array(
+	public function get_all_non_ticket_line_items_for_transaction($transaction) {
+		$transaction = EEM_Transaction::instance()->ensure_is_ID($transaction);
+		return $this->get_all(array(array(
 			'LIN_type' => self::type_line_item,
 			'TXN_ID' => $transaction,
 			'OR' => array(
-				'OBJ_type*notticket' => array( '!=', 'Ticket'),
-				'OBJ_type*null' => array( 'IS_NULL' ))
+				'OBJ_type*notticket' => array('!=', 'Ticket'),
+				'OBJ_type*null' => array('IS_NULL'))
 		)));
 	}
 
@@ -192,7 +192,7 @@ 
 	 * because if there are spam bots afoot there will be LOTS of line items
 	 * @return int count of how many deleted
 	 */
-	public function delete_line_items_with_no_transaction(){
+	public function delete_line_items_with_no_transaction() {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$time_to_leave_alone = apply_filters(
@@ -200,13 +200,13 @@ 
 		);
 		$query = $wpdb->prepare(
 				'DELETE li
-				FROM ' . $this->table() . ' li
-				LEFT JOIN ' . EEM_Transaction::instance()->table(). ' t ON li.TXN_ID = t.TXN_ID
+				FROM ' . $this->table().' li
+				LEFT JOIN ' . EEM_Transaction::instance()->table().' t ON li.TXN_ID = t.TXN_ID
 				WHERE t.TXN_ID IS NULL AND li.LIN_timestamp < %s',
 				// use GMT time because that's what TXN_timestamps are in
-				gmdate(  'Y-m-d H:i:s', time() - $time_to_leave_alone )
+				gmdate('Y-m-d H:i:s', time() - $time_to_leave_alone)
 				);
-		return $wpdb->query( $query );
+		return $wpdb->query($query);
 	}
 
 
@@ -219,10 +219,10 @@ 
 	 * @param \EE_Base_Class $object
 	 * @return EE_Line_Item[]
 	 */
-	public function get_line_item_for_transaction_object( $TXN_ID, EE_Base_Class $object ){
-		return $this->get_all( array( array(
+	public function get_line_item_for_transaction_object($TXN_ID, EE_Base_Class $object) {
+		return $this->get_all(array(array(
 			'TXN_ID' 		=> $TXN_ID,
-			'OBJ_type' 	=> str_replace( 'EE_', '', get_class( $object )),
+			'OBJ_type' 	=> str_replace('EE_', '', get_class($object)),
 			'OBJ_ID' 		=> $object->ID()
 		)));
 	}
@@ -238,16 +238,16 @@ 
 	 * @param array $OBJ_IDs
 	 * @return EE_Line_Item[]
 	 */
-	public function get_object_line_items_for_transaction( $TXN_ID, $OBJ_type = 'Event', $OBJ_IDs = array() ){
+	public function get_object_line_items_for_transaction($TXN_ID, $OBJ_type = 'Event', $OBJ_IDs = array()) {
 		$query_params = array(
 			'OBJ_type' 	=> $OBJ_type,
 			// if incoming $OBJ_IDs is an array, then make sure it is formatted correctly for the query
-			'OBJ_ID' 		=> is_array( $OBJ_IDs ) && ! isset( $OBJ_IDs['IN'] ) ? array( 'IN', $OBJ_IDs ) : $OBJ_IDs
+			'OBJ_ID' 		=> is_array($OBJ_IDs) && ! isset($OBJ_IDs['IN']) ? array('IN', $OBJ_IDs) : $OBJ_IDs
 		);
-		if ( $TXN_ID ) {
+		if ($TXN_ID) {
 			$query_params['TXN_ID'] = $TXN_ID;
 		}
-		return $this->get_all( array( $query_params ));
+		return $this->get_all(array($query_params));
 	}
 
 
@@ -262,8 +262,8 @@ 
 	 * @param EE_Promotion $promotion
 	 * @return EE_Line_Item
 	 */
-	public function get_existing_promotion_line_item( EE_Line_Item $parent_line_item, EE_Promotion $promotion ) {
-		return $this->get_one( array(
+	public function get_existing_promotion_line_item(EE_Line_Item $parent_line_item, EE_Promotion $promotion) {
+		return $this->get_one(array(
 			array(
 				'TXN_ID' 			=> $parent_line_item->TXN_ID(),
 				'LIN_parent' 	=> $parent_line_item->ID(),
@@ -284,8 +284,8 @@ 
 	 * @param EE_Line_Item $parent_line_item
 	 * @return EE_Line_Item[]
 	 */
-	public function get_all_promotion_line_items( EE_Line_Item $parent_line_item ) {
-		return $this->get_all( array(
+	public function get_all_promotion_line_items(EE_Line_Item $parent_line_item) {
+		return $this->get_all(array(
 			array(
 				'TXN_ID' 			=> $parent_line_item->TXN_ID(),
 				'LIN_parent' 	=> $parent_line_item->ID(),
@@ -302,8 +302,8 @@ 
 	 * @param EE_Registration $registration
 	 * @return EEM_Line_ITem
 	 */
-	public function get_line_item_for_registration( EE_Registration $registration ) {
-		return $this->get_one( $this->line_item_for_registration_query_params( $registration ));
+	public function get_line_item_for_registration(EE_Registration $registration) {
+		return $this->get_one($this->line_item_for_registration_query_params($registration));
 	}
 
 	/**
@@ -312,14 +312,14 @@ 
 	 * @param array $original_query_params any extra query params you'd like to be merged with
 	 * @return array like EEM_Base::get_all()'s $query_params
 	 */
-	public function line_item_for_registration_query_params( EE_Registration $registration, $original_query_params = array() ) {
-		return array_replace_recursive( $original_query_params, array(
+	public function line_item_for_registration_query_params(EE_Registration $registration, $original_query_params = array()) {
+		return array_replace_recursive($original_query_params, array(
 			array(
 				'OBJ_ID' => $registration->ticket_ID(),
 				'OBJ_type' => 'Ticket',
 				'TXN_ID' => $registration->transaction_ID()
 			)
-		) );
+		));
 	}
 
 

Indentation +37 added lines, -37 removed lines

@@ -1,42 +1,42 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package			Event Espresso
- * @ author				Seth Shoultes
- * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
- * @ link					http://www.eventespresso.com
- * @ version		 	4.0
- *
- * ------------------------------------------------------------------------
- *
- * Line Item Model. Mostly used for storing a snapshot of all the items in a transaction
- * as they were recorded at the time of being added to the cart.
- * There are different 'types' of line items: item, sub-item, tax, sub-total, and total.
- * Note that line items can be nested. For example, a total line item should have one-or-more
- * children sub-totals. Likewise, sub-totals should have one-or-more nested items or taxes
- * (or maybe promotions or products?). Also, items can have nested sub-items (eg. an item could be a
- * ticket, which has many sub-item prices which together make up the price of that ticket).
- * Note that line items should point to real model objects using OBJ_ID and OBJ_type (note:
- * there is a current limitation that they can only point to models with INT primary keys),
- * but this is NOT required. And in fact, the items they are related to CAN be deleted, but
- * the line item should still exist (in this case it merely shows that there was ONCE a model
- * object the line item was based off of).
- *
- * In usage, Line Items are first stored on the EE_Cart, but not saved until a user's registration is
- * finalized (like how the EE_Transaction is stored in the session until it is confirmed).
- * Many of their methods (like
- *
- *
- * @package			Event Espresso
- * @subpackage		includes/models/EEM_Line_Item.model.php
- * @author			Mike Nelson
- *
- * ------------------------------------------------------------------------
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package			Event Espresso
+	 * @ author				Seth Shoultes
+	 * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
+	 * @ link					http://www.eventespresso.com
+	 * @ version		 	4.0
+	 *
+	 * ------------------------------------------------------------------------
+	 *
+	 * Line Item Model. Mostly used for storing a snapshot of all the items in a transaction
+	 * as they were recorded at the time of being added to the cart.
+	 * There are different 'types' of line items: item, sub-item, tax, sub-total, and total.
+	 * Note that line items can be nested. For example, a total line item should have one-or-more
+	 * children sub-totals. Likewise, sub-totals should have one-or-more nested items or taxes
+	 * (or maybe promotions or products?). Also, items can have nested sub-items (eg. an item could be a
+	 * ticket, which has many sub-item prices which together make up the price of that ticket).
+	 * Note that line items should point to real model objects using OBJ_ID and OBJ_type (note:
+	 * there is a current limitation that they can only point to models with INT primary keys),
+	 * but this is NOT required. And in fact, the items they are related to CAN be deleted, but
+	 * the line item should still exist (in this case it merely shows that there was ONCE a model
+	 * object the line item was based off of).
+	 *
+	 * In usage, Line Items are first stored on the EE_Cart, but not saved until a user's registration is
+	 * finalized (like how the EE_Transaction is stored in the session until it is confirmed).
+	 * Many of their methods (like
+	 *
+	 *
+	 * @package			Event Espresso
+	 * @subpackage		includes/models/EEM_Line_Item.model.php
+	 * @author			Mike Nelson
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 
 class EEM_Line_Item extends EEM_Base {
 

core/db_models/EEM_Question_Option.model.php

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_System_Status.model.php

Indentation +6 added lines, -6 removed lines

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

Spacing +56 added lines, -56 removed lines

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

core/db_models/EEM_Term_Relationship.model.php

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;

core/db_models/EEM_Term_Taxonomy.model.php

Spacing +30 added lines, -30 removed lines

@@ -21,7 +21,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
 
 class EEM_Term_Taxonomy extends EEM_Base {
 
@@ -29,67 +29,67 @@ 
 	protected static $_instance = NULL;
 
 
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Term Taxonomy','event_espresso');
-		$this->plural_item = __('Term Taxonomy','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Term Taxonomy', 'event_espresso');
+		$this->plural_item = __('Term Taxonomy', 'event_espresso');
 		$this->_tables = array(
 			'Term_Taxonomy'=> new EE_Primary_Table('term_taxonomy', 'term_taxonomy_id')
 		);
 		$this->_fields = array(
 			'Term_Taxonomy'=>array(
-				'term_taxonomy_id'=> new EE_Primary_Key_Int_Field('term_taxonomy_id', __('Term-Taxonomy ID','event_espresso')),
-				'term_id'=>new EE_Foreign_Key_Int_Field('term_id',  __("Term Id", "event_espresso"), false, 0, 'Term'), //EE_Foreign_Key_Int_Field('term_taxonomy_id', __('Term (in context of a taxonomy) ID','event_espresso'), false, 0, 'Term_Taxonomy'),
-				'taxonomy'=>new EE_Plain_Text_Field('taxonomy', __('Taxonomy Name','event_espresso'), false, 'category'),
-				'description'=>new EE_Post_Content_Field('description', __("Description of Term", "event_espresso"), false,''),
-				'parent'=>new EE_Integer_Field('parent', __("Parent Term ID", "event_espresso"), false,0),
+				'term_taxonomy_id'=> new EE_Primary_Key_Int_Field('term_taxonomy_id', __('Term-Taxonomy ID', 'event_espresso')),
+				'term_id'=>new EE_Foreign_Key_Int_Field('term_id', __("Term Id", "event_espresso"), false, 0, 'Term'), //EE_Foreign_Key_Int_Field('term_taxonomy_id', __('Term (in context of a taxonomy) ID','event_espresso'), false, 0, 'Term_Taxonomy'),
+				'taxonomy'=>new EE_Plain_Text_Field('taxonomy', __('Taxonomy Name', 'event_espresso'), false, 'category'),
+				'description'=>new EE_Post_Content_Field('description', __("Description of Term", "event_espresso"), false, ''),
+				'parent'=>new EE_Integer_Field('parent', __("Parent Term ID", "event_espresso"), false, 0),
 				'term_count'=> new EE_Integer_Field('count', __("Count of Objects attached", 'event_espresso'), false, 0)
 			));
 		$this->_model_relations = array(
 			'Term_Relationship'=>new EE_Has_Many_Relation(),
 			'Term'=>new EE_Belongs_To_Relation(),
 		);
-		$cpt_models = array_keys( EE_Registry::instance()->cpt_models() );
-		foreach( $cpt_models  as $model_name ) {
-			$this->_model_relations[ $model_name ] = new EE_HABTM_Relation( 'Term_Relationship' );
+		$cpt_models = array_keys(EE_Registry::instance()->cpt_models());
+		foreach ($cpt_models  as $model_name) {
+			$this->_model_relations[$model_name] = new EE_HABTM_Relation('Term_Relationship');
 		}
 		$this->_indexes = array(
-			'term_id_taxonomy'=>new EE_Unique_Index(array('term_id','taxonomy'))
+			'term_id_taxonomy'=>new EE_Unique_Index(array('term_id', 'taxonomy'))
 		);
 		$path_to_tax_model = '';
-		$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_Taxonomy_Protected( $path_to_tax_model );
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = false;
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = false;
+		$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_Taxonomy_Protected($path_to_tax_model);
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = false;
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = false;
 
 		//add cap restrictions for editing relating to the "ee_edit_*"
-		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_edit_event_category' => array( '!=', 'espresso_event_categories' )
+					$path_to_tax_model.'taxonomy*ee_edit_event_category' => array('!=', 'espresso_event_categories')
 				));
-		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_edit_venue_category' => array( '!=', 'espresso_venue_categories' )
+					$path_to_tax_model.'taxonomy*ee_edit_venue_category' => array('!=', 'espresso_venue_categories')
 				));
-		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_edit_event_type' => array( '!=', 'espresso_event_type' )
+					$path_to_tax_model.'taxonomy*ee_edit_event_type' => array('!=', 'espresso_event_type')
 				));
 
 		//add cap restrictions for deleting relating to the "ee_deleting_*"
-		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_delete_event_category' => array( '!=', 'espresso_event_categories' )
+					$path_to_tax_model.'taxonomy*ee_delete_event_category' => array('!=', 'espresso_event_categories')
 				));
-		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_delete_venue_category' => array( '!=', 'espresso_venue_categories' )
+					$path_to_tax_model.'taxonomy*ee_delete_venue_category' => array('!=', 'espresso_venue_categories')
 				));
-		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_delete_event_type' => array( '!=', 'espresso_event_type' )
+					$path_to_tax_model.'taxonomy*ee_delete_event_type' => array('!=', 'espresso_event_type')
 				));
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 }

core/db_models/fields/EE_Enum_Text_Field.php

Spacing +11 added lines, -11 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once( EE_MODELS . 'fields/EE_Text_Field_Base.php' );
+require_once(EE_MODELS.'fields/EE_Text_Field_Base.php');
 /**
  *
  * Class EE_Enum_Text_Field
@@ -23,7 +23,7 @@ 
 	 * @param mixed $default_value
 	 * @param array $allowed_enum_values  keys are values to be used in the DB, values are how they should be displayed
 	 */
-	function __construct($table_column, $nice_name, $nullable, $default_value, $allowed_enum_values){
+	function __construct($table_column, $nice_name, $nullable, $default_value, $allowed_enum_values) {
 		$this->_allowed_enum_values = $allowed_enum_values;
 		parent::__construct($table_column, $nice_name, $nullable, $default_value);
 	}
@@ -37,24 +37,24 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	function prepare_for_set( $value_inputted_for_field_on_model_object ) {
-		if(
+	function prepare_for_set($value_inputted_for_field_on_model_object) {
+		if (
 			$value_inputted_for_field_on_model_object !== null
-			&& ! array_key_exists( $value_inputted_for_field_on_model_object, $this->_allowed_enum_values )
-		){
-			if( defined( 'WP_DEBUG' ) &&  WP_DEBUG ){
+			&& ! array_key_exists($value_inputted_for_field_on_model_object, $this->_allowed_enum_values)
+		) {
+			if (defined('WP_DEBUG') && WP_DEBUG) {
 				$msg = sprintf(
-					__('System is assigning incompatible value "%1$s" to field "%2$s"','event_espresso'),
+					__('System is assigning incompatible value "%1$s" to field "%2$s"', 'event_espresso'),
 					$value_inputted_for_field_on_model_object,
 					$this->_name
 				);
 				$msg2 = sprintf(
-					__('Allowed values for "%1$s" are "%2$s". You provided: "%3$s"','event_espresso'),
+					__('Allowed values for "%1$s" are "%2$s". You provided: "%3$s"', 'event_espresso'),
 					$this->_name,
-					implode( ", ", array_keys( $this->_allowed_enum_values ) ),
+					implode(", ", array_keys($this->_allowed_enum_values)),
 					$value_inputted_for_field_on_model_object
 				);
-				EE_Error::add_error( "$msg||$msg2", __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error("$msg||$msg2", __FILE__, __FUNCTION__, __LINE__);
 			}
 			return $this->get_default_value();
 

core/db_models/fields/EE_Serialized_Text_Field.php

Spacing +13 added lines, -13 removed lines

@@ -7,8 +7,8 @@ 
  * However, when inserting into the DB, it should be serialized.
  * Upon retrieval from the DB, it should be unserialized back into an array.
  */
-require_once( EE_MODELS . 'fields/EE_Text_Field_Base.php' );
-class EE_Serialized_Text_Field extends EE_Text_Field_Base{
+require_once(EE_MODELS.'fields/EE_Text_Field_Base.php');
+class EE_Serialized_Text_Field extends EE_Text_Field_Base {
 	/**
 	 * Value SHOULD be an array, and we want to now convert it to a serialized string
 	 * @param array $value_of_field_on_model_object
@@ -18,13 +18,13 @@ 
 		return maybe_serialize($value_of_field_on_model_object);
 	}
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
-		EE_Registry::instance()->load_helper( 'Array' );
-		$value_inputted_for_field_on_model_object = EEH_Array::maybe_unserialize( $value_inputted_for_field_on_model_object );
-		if(is_string($value_inputted_for_field_on_model_object)){
+		EE_Registry::instance()->load_helper('Array');
+		$value_inputted_for_field_on_model_object = EEH_Array::maybe_unserialize($value_inputted_for_field_on_model_object);
+		if (is_string($value_inputted_for_field_on_model_object)) {
 			return parent::prepare_for_set($value_inputted_for_field_on_model_object);
-		}elseif(is_array($value_inputted_for_field_on_model_object)){
-			return array_map(array($this,'prepare_for_set'), $value_inputted_for_field_on_model_object);
-		}else{//so they passed NULL or an INT or something wack
+		}elseif (is_array($value_inputted_for_field_on_model_object)) {
+			return array_map(array($this, 'prepare_for_set'), $value_inputted_for_field_on_model_object);
+		} else {//so they passed NULL or an INT or something wack
 			return $value_inputted_for_field_on_model_object;
 		}
 	}
@@ -34,8 +34,8 @@ 
 	 * @return array
 	 */
 	function prepare_for_set_from_db($value_found_in_db_for_model_object) {
-		EE_Registry::instance()->load_helper( 'Array' );
-		return EEH_Array::maybe_unserialize( $value_found_in_db_for_model_object );
+		EE_Registry::instance()->load_helper('Array');
+		return EEH_Array::maybe_unserialize($value_found_in_db_for_model_object);
 	}
 
 	/**
@@ -45,16 +45,16 @@ 
 	 * @return string
 	 */
 	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
-		switch($schema){
+		switch ($schema) {
 			case 'print_r':
-				$pretty_value = print_r($value_on_field_to_be_outputted,true);
+				$pretty_value = print_r($value_on_field_to_be_outputted, true);
 				break;
 			case 'as_table':
 				EE_Registry::instance()->load_helper('Template');
 				$pretty_value = EEH_Template::layout_array_as_table($value_on_field_to_be_outputted);
 				break;
 			default:
-				$pretty_value = implode(", ",$value_on_field_to_be_outputted);
+				$pretty_value = implode(", ", $value_on_field_to_be_outputted);
 		}
 		return $pretty_value;
 	}