Completed
Branch FET-9998-unit-test-bootstrappi... (db3cac)
by
unknown
111:23 queued 102:09
created
core/db_models/EEM_Term.model.php 2 patches
Spacing   +48 added lines, -48 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
2
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
2
+require_once (EE_MODELS.'EEM_Base.model.php');
3 3
 
4 4
 /**
5 5
  *
@@ -20,58 +20,58 @@  discard block
 block discarded – undo
20 20
 	/**
21 21
 	 *__construct
22 22
 	 */
23
-	protected function __construct( $timezone = NULL ) {
24
-		$this->singular_item = __('Term','event_espresso');
25
-		$this->plural_item = __('Terms','event_espresso');
23
+	protected function __construct($timezone = NULL) {
24
+		$this->singular_item = __('Term', 'event_espresso');
25
+		$this->plural_item = __('Terms', 'event_espresso');
26 26
 		$this->_tables = array(
27 27
 			'Term'=> new EE_Primary_Table('terms', 'term_id')
28 28
 		);
29 29
 		$this->_fields = array(
30 30
 			'Term'=>array(
31
-				'term_id'=> new EE_Primary_Key_Int_Field('term_id', __('Term ID','event_espresso')),
32
-				'name'=>new EE_Plain_Text_Field('name',__('Term Name','event_espresso'),false, ''),
33
-				'slug'=>new EE_Slug_Field('slug', __('Term Slug','event_espresso'), false),
31
+				'term_id'=> new EE_Primary_Key_Int_Field('term_id', __('Term ID', 'event_espresso')),
32
+				'name'=>new EE_Plain_Text_Field('name', __('Term Name', 'event_espresso'), false, ''),
33
+				'slug'=>new EE_Slug_Field('slug', __('Term Slug', 'event_espresso'), false),
34 34
 				'term_group'=>new EE_Integer_Field('term_group', __("Term Group", "event_espresso"), false, 0)
35 35
 			));
36 36
 		$this->_model_relations = array(
37 37
 			'Term_Taxonomy'=>new EE_Has_Many_Relation(),
38 38
 		);
39 39
 		$path_to_tax_model = 'Term_Taxonomy';
40
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
41
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Taxonomy_Protected( $path_to_tax_model );
42
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = false;
43
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = false;
40
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
41
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Taxonomy_Protected($path_to_tax_model);
42
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = false;
43
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = false;
44 44
 
45
-		$path_to_tax_model = $path_to_tax_model . '.';
45
+		$path_to_tax_model = $path_to_tax_model.'.';
46 46
 		//add cap restrictions for editing relating to the "ee_edit_*"
47
-		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
47
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
48 48
 				array(
49
-					$path_to_tax_model . 'taxonomy*ee_edit_event_category' => array( '!=', 'espresso_event_categories' )
49
+					$path_to_tax_model.'taxonomy*ee_edit_event_category' => array('!=', 'espresso_event_categories')
50 50
 				));
51
-		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
51
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
52 52
 				array(
53
-					$path_to_tax_model . 'taxonomy*ee_edit_venue_category' => array( '!=', 'espresso_venue_categories' )
53
+					$path_to_tax_model.'taxonomy*ee_edit_venue_category' => array('!=', 'espresso_venue_categories')
54 54
 				));
55
-		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
55
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
56 56
 				array(
57
-					$path_to_tax_model . 'taxonomy*ee_edit_event_type' => array( '!=', 'espresso_event_type' )
57
+					$path_to_tax_model.'taxonomy*ee_edit_event_type' => array('!=', 'espresso_event_type')
58 58
 				));
59 59
 
60 60
 		//add cap restrictions for deleting relating to the "ee_deleting_*"
61
-		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
61
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
62 62
 				array(
63
-					$path_to_tax_model . 'taxonomy*ee_delete_event_category' => array( '!=', 'espresso_event_categories' )
63
+					$path_to_tax_model.'taxonomy*ee_delete_event_category' => array('!=', 'espresso_event_categories')
64 64
 				));
65
-		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
65
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
66 66
 				array(
67
-					$path_to_tax_model . 'taxonomy*ee_delete_venue_category' => array( '!=', 'espresso_venue_categories' )
67
+					$path_to_tax_model.'taxonomy*ee_delete_venue_category' => array('!=', 'espresso_venue_categories')
68 68
 				));
69
-		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
69
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
70 70
 				array(
71
-					$path_to_tax_model . 'taxonomy*ee_delete_event_type' => array( '!=', 'espresso_event_type' )
71
+					$path_to_tax_model.'taxonomy*ee_delete_event_type' => array('!=', 'espresso_event_type')
72 72
 				));
73 73
 
74
-		parent::__construct( $timezone );
74
+		parent::__construct($timezone);
75 75
 	}
76 76
 
77 77
 
@@ -82,20 +82,20 @@  discard block
 block discarded – undo
82 82
 	 *
83 83
 	 * @access public
84 84
 	 */
85
-	public function get_all_ee_categories( $show_uncategorized = FALSE ) {
85
+	public function get_all_ee_categories($show_uncategorized = FALSE) {
86 86
 
87 87
 		$where_params = array(
88 88
 			'Term_Taxonomy.taxonomy' => 'espresso_event_categories',
89
-			'NOT' => array( 'name' => __( 'Uncategorized', 'event_espresso' ))
89
+			'NOT' => array('name' => __('Uncategorized', 'event_espresso'))
90 90
 		);
91 91
 
92
-		if ( $show_uncategorized ) {
93
-			unset( $where_params['NOT'] );
92
+		if ($show_uncategorized) {
93
+			unset($where_params['NOT']);
94 94
 		}
95 95
 
96
-	 	return EEM_Term::instance()->get_all( array(
96
+	 	return EEM_Term::instance()->get_all(array(
97 97
 			$where_params,
98
-			'order_by' => array( 'name' => 'ASC' )
98
+			'order_by' => array('name' => 'ASC')
99 99
 		));
100 100
 	}
101 101
 
@@ -108,8 +108,8 @@  discard block
 block discarded – undo
108 108
 	 * @param string $post_type
109 109
 	 * @return array
110 110
 	 */
111
-	public function get_all_CPT_post_tags( $post_type = '' ) {
112
-		switch( $post_type ) {
111
+	public function get_all_CPT_post_tags($post_type = '') {
112
+		switch ($post_type) {
113 113
 			case 'espresso_events' :
114 114
 				return $this->get_all_event_post_tags();
115 115
 				break;
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 			default :
120 120
 				$event_tags = $this->get_all_event_post_tags();
121 121
 				$venue_tags = $this->get_all_venue_post_tags();
122
-				return array_merge( $event_tags, $venue_tags );
122
+				return array_merge($event_tags, $venue_tags);
123 123
 		}
124 124
 		return array();
125 125
 	}
@@ -132,19 +132,19 @@  discard block
 block discarded – undo
132 132
 	 * @return EE_Soft_Delete_Base_Class[]
133 133
 	 */
134 134
 	public function get_all_event_post_tags() {
135
-	 	$post_tags = EEM_Term::instance()->get_all( array(
135
+	 	$post_tags = EEM_Term::instance()->get_all(array(
136 136
 			array(
137 137
 				'Term_Taxonomy.taxonomy' => 'post_tag',
138 138
 				'Term_Taxonomy.Event.post_type' => 'espresso_events',
139 139
 			),
140
-			'order_by' => array( 'name' => 'ASC' ),
141
-			'force_join' => array( 'Term_Taxonomy.Event' )
140
+			'order_by' => array('name' => 'ASC'),
141
+			'force_join' => array('Term_Taxonomy.Event')
142 142
 		));
143
-		foreach ( $post_tags as $key => $post_tag ) {
144
-			if ( ! isset( $post_tags[ $key ]->post_type )) {
145
-				$post_tags[ $key ]->post_type = array();
143
+		foreach ($post_tags as $key => $post_tag) {
144
+			if ( ! isset($post_tags[$key]->post_type)) {
145
+				$post_tags[$key]->post_type = array();
146 146
 			}
147
-			$post_tags[ $key ]->post_type[] = 'espresso_events';
147
+			$post_tags[$key]->post_type[] = 'espresso_events';
148 148
 		}
149 149
 		return $post_tags;
150 150
 //		return array( 'espresso_events' => $post_tags );
@@ -158,19 +158,19 @@  discard block
 block discarded – undo
158 158
 	 * @return EE_Soft_Delete_Base_Class[]
159 159
 	 */
160 160
 	public function get_all_venue_post_tags() {
161
-		$post_tags = EEM_Term::instance()->get_all( array(
161
+		$post_tags = EEM_Term::instance()->get_all(array(
162 162
 			array(
163 163
 				'Term_Taxonomy.taxonomy' => 'post_tag',
164 164
 				'Term_Taxonomy.Venue.post_type' => 'espresso_venues',
165 165
 			),
166
-			'order_by' => array( 'name' => 'ASC' ),
167
-			'force_join' => array( 'Term_Taxonomy' )
166
+			'order_by' => array('name' => 'ASC'),
167
+			'force_join' => array('Term_Taxonomy')
168 168
 		));
169
-		foreach ( $post_tags as $key => $post_tag ) {
170
-			if ( ! isset( $post_tags[ $key ]->post_type )) {
171
-				$post_tags[ $key ]->post_type = array();
169
+		foreach ($post_tags as $key => $post_tag) {
170
+			if ( ! isset($post_tags[$key]->post_type)) {
171
+				$post_tags[$key]->post_type = array();
172 172
 			}
173
-			$post_tags[ $key ]->post_type[] = 'espresso_venues';
173
+			$post_tags[$key]->post_type[] = 'espresso_venues';
174 174
 		}
175 175
 		return $post_tags;
176 176
 //		return array( 'espresso_venues' => $post_tags );
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 block discarded – undo
1
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 require_once ( EE_MODELS . 'EEM_Base.model.php' );
3 5
 
4 6
 /**
Please login to merge, or discard this patch.
core/db_models/EEM_Term_Relationship.model.php 2 patches
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@  discard block
 block discarded – undo
1
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 /**
3 5
  * Event Espresso
4 6
  *
@@ -89,7 +91,7 @@  discard block
 block discarded – undo
89 91
 		global $wpdb;
90 92
 		if( $term_taxonomy_id ){
91 93
 			$second_operand = $wpdb->prepare('%d',$term_taxonomy_id);
92
-		}else{
94
+		} else{
93 95
 			$second_operand = 'tr.term_taxonomy_id';
94 96
 		}
95 97
 		$rows_affected = $this->_do_wpdb_query( 'query' , array("UPDATE {$wpdb->term_taxonomy} AS tt SET count = (select count(*) as proper_count
Please login to merge, or discard this patch.
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -21,61 +21,61 @@  discard block
 block discarded – undo
21 21
  *
22 22
  * ------------------------------------------------------------------------
23 23
  */
24
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
24
+require_once (EE_MODELS.'EEM_Base.model.php');
25 25
 
26 26
 class EEM_Term_Relationship extends EEM_Base {
27 27
 
28 28
   	// private instance of the Attendee object
29 29
 	protected static $_instance = NULL;
30 30
 
31
-	protected function __construct( $timezone = NULL ) {
32
-		$this->singular_item = __('Term Relationship','event_espresso');
33
-		$this->plural_item = __('Term Relationships','event_espresso');
31
+	protected function __construct($timezone = NULL) {
32
+		$this->singular_item = __('Term Relationship', 'event_espresso');
33
+		$this->plural_item = __('Term Relationships', 'event_espresso');
34 34
 		$this->_tables = array(
35 35
 			'Term_Relationship'=> new EE_Primary_Table('term_relationships')
36 36
 		);
37
-		$models_this_can_attach_to = array_keys( EE_Registry::instance()->cpt_models() );
37
+		$models_this_can_attach_to = array_keys(EE_Registry::instance()->cpt_models());
38 38
 		$this->_fields = array(
39 39
 			'Term_Relationship'=>array(
40
-				'object_id'=> new EE_Foreign_Key_Int_Field('object_id', __('Object(Post) ID','event_espresso'), false,0, $models_this_can_attach_to ),
41
-				'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'),
42
-				'term_order'=>new EE_Integer_Field('term_order', __('Term Order','event_espresso'), false, 0)
40
+				'object_id'=> new EE_Foreign_Key_Int_Field('object_id', __('Object(Post) ID', 'event_espresso'), false, 0, $models_this_can_attach_to),
41
+				'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'),
42
+				'term_order'=>new EE_Integer_Field('term_order', __('Term Order', 'event_espresso'), false, 0)
43 43
 			));
44 44
 		$this->_model_relations = array(
45 45
 			'Term_Taxonomy'=>new EE_Belongs_To_Relation()
46 46
 		);
47
-		foreach( $models_this_can_attach_to as $model_name ) {
48
-			$this->_model_relations[ $model_name ] = new EE_Belongs_To_Relation();
47
+		foreach ($models_this_can_attach_to as $model_name) {
48
+			$this->_model_relations[$model_name] = new EE_Belongs_To_Relation();
49 49
 		}
50 50
 		$this->_indexes = array(
51
-			'PRIMARY'=>new EE_Primary_Key_Index(array('object_id','term_taxonomy_id'))
51
+			'PRIMARY'=>new EE_Primary_Key_Index(array('object_id', 'term_taxonomy_id'))
52 52
 		);
53 53
 		$path_to_event_model = 'Event.';
54
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Event_Related_Public( $path_to_event_model );
55
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Event_Related_Protected( $path_to_event_model );
56
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Event_Related_Protected( $path_to_event_model );
57
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Event_Related_Protected( $path_to_event_model, EEM_Base::caps_edit );
54
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Event_Related_Public($path_to_event_model);
55
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Event_Related_Protected($path_to_event_model);
56
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Event_Related_Protected($path_to_event_model);
57
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Event_Related_Protected($path_to_event_model, EEM_Base::caps_edit);
58 58
 
59 59
 		$path_to_tax_model = 'Term_Taxonomy.';
60 60
 		//add cap restrictions for editing term relations to the "ee_assign_*"
61 61
 		//and for deleting term relations too
62
-		$cap_contexts_affected = array( EEM_Base::caps_edit, EEM_Base::caps_delete );
63
-		foreach( $cap_contexts_affected as $cap_context_affected ) {
64
-			$this->_cap_restrictions[ $cap_context_affected ]['ee_assign_event_category'] = new EE_Default_Where_Conditions(
62
+		$cap_contexts_affected = array(EEM_Base::caps_edit, EEM_Base::caps_delete);
63
+		foreach ($cap_contexts_affected as $cap_context_affected) {
64
+			$this->_cap_restrictions[$cap_context_affected]['ee_assign_event_category'] = new EE_Default_Where_Conditions(
65 65
 					array(
66
-						$path_to_tax_model . 'taxonomy*ee_assign_event_category' => array( '!=', 'espresso_event_categories' )
66
+						$path_to_tax_model.'taxonomy*ee_assign_event_category' => array('!=', 'espresso_event_categories')
67 67
 					));
68
-			$this->_cap_restrictions[ $cap_context_affected ]['ee_assign_venue_category'] = new EE_Default_Where_Conditions(
68
+			$this->_cap_restrictions[$cap_context_affected]['ee_assign_venue_category'] = new EE_Default_Where_Conditions(
69 69
 					array(
70
-						$path_to_tax_model . 'taxonomy*ee_assign_venue_category' => array( '!=', 'espresso_venue_categories' )
70
+						$path_to_tax_model.'taxonomy*ee_assign_venue_category' => array('!=', 'espresso_venue_categories')
71 71
 					));
72
-			$this->_cap_restrictions[ $cap_context_affected ]['ee_assign_event_type'] = new EE_Default_Where_Conditions(
72
+			$this->_cap_restrictions[$cap_context_affected]['ee_assign_event_type'] = new EE_Default_Where_Conditions(
73 73
 					array(
74
-						$path_to_tax_model . 'taxonomy*ee_assign_event_type' => array( '!=', 'espresso_event_type' )
74
+						$path_to_tax_model.'taxonomy*ee_assign_event_type' => array('!=', 'espresso_event_type')
75 75
 					));
76 76
 		}
77 77
 
78
-		parent::__construct( $timezone );
78
+		parent::__construct($timezone);
79 79
 	}
80 80
 
81 81
 	/**
@@ -84,17 +84,17 @@  discard block
 block discarded – undo
84 84
 	 * @global type $wpdb
85 85
 	 * @return int the number of rows affected
86 86
 	 */
87
-	public function update_term_taxonomy_counts($term_taxonomy_id = NULL){
87
+	public function update_term_taxonomy_counts($term_taxonomy_id = NULL) {
88 88
 		//because this uses a subquery and sometimes assigning to column to be another column's
89 89
 		//value, we just write the SQL directly.
90 90
 		global $wpdb;
91
-		if( $term_taxonomy_id ){
92
-			$second_operand = $wpdb->prepare('%d',$term_taxonomy_id);
93
-		}else{
91
+		if ($term_taxonomy_id) {
92
+			$second_operand = $wpdb->prepare('%d', $term_taxonomy_id);
93
+		} else {
94 94
 			$second_operand = 'tr.term_taxonomy_id';
95 95
 		}
96
-		$rows_affected = $this->_do_wpdb_query( 'query' , array("UPDATE {$wpdb->term_taxonomy} AS tt SET count = (select count(*) as proper_count
97
-from {$wpdb->term_relationships} AS tr WHERE tt.term_taxonomy_id = $second_operand)" ) );
96
+		$rows_affected = $this->_do_wpdb_query('query', array("UPDATE {$wpdb->term_taxonomy} AS tt SET count = (select count(*) as proper_count
97
+from {$wpdb->term_relationships} AS tr WHERE tt.term_taxonomy_id = $second_operand)"));
98 98
 		return $rows_affected;
99 99
 	}
100 100
 
@@ -106,8 +106,8 @@  discard block
 block discarded – undo
106 106
 	 */
107 107
 	public function insert($field_n_values) {
108 108
 		$return = parent::insert($field_n_values);
109
-		if( isset( $field_n_values[ 'term_taxonomy_id' ] ) ) {
110
-			$this->update_term_taxonomy_counts($field_n_values[ 'term_taxonomy_id' ] );
109
+		if (isset($field_n_values['term_taxonomy_id'])) {
110
+			$this->update_term_taxonomy_counts($field_n_values['term_taxonomy_id']);
111 111
 		}
112 112
 		return $return;
113 113
 	}
@@ -123,8 +123,8 @@  discard block
 block discarded – undo
123 123
 	 * @return int
124 124
 	 */
125 125
 	public function update($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE) {
126
-		$count = parent::update($fields_n_values, $query_params, $keep_model_objs_in_sync );
127
-		if( $count ){
126
+		$count = parent::update($fields_n_values, $query_params, $keep_model_objs_in_sync);
127
+		if ($count) {
128 128
 			$this->update_term_taxonomy_counts();
129 129
 		}
130 130
 		return $count;
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 	 */
139 139
 	public function delete($query_params, $allow_blocking = true) {
140 140
 		$count = parent::delete($query_params, $allow_blocking);
141
-		if( $count ){
141
+		if ($count) {
142 142
 			$this->update_term_taxonomy_counts();
143 143
 		}
144 144
 		return $count;
Please login to merge, or discard this patch.
core/db_models/EEM_Ticket_Price.model.php 2 patches
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -22,8 +22,8 @@  discard block
 block discarded – undo
22 22
  * ------------------------------------------------------------------------
23 23
  */
24 24
 
25
-require_once ( EE_CLASSES . 'EE_Ticket_Price.class.php' );
26
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
25
+require_once (EE_CLASSES.'EE_Ticket_Price.class.php');
26
+require_once (EE_MODELS.'EEM_Base.model.php');
27 27
 
28 28
 class EEM_Ticket_Price extends EEM_Base {
29 29
 
@@ -37,12 +37,12 @@  discard block
 block discarded – undo
37 37
 	 * 		@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)
38 38
 	 * 		@return void
39 39
 	 */
40
-	protected function __construct( $timezone ) {
41
-		$this->singular_item = __('Ticket Price','event_espresso');
42
-		$this->plural_item = __('Ticket Prices','event_espresso');
40
+	protected function __construct($timezone) {
41
+		$this->singular_item = __('Ticket Price', 'event_espresso');
42
+		$this->plural_item = __('Ticket Prices', 'event_espresso');
43 43
 
44 44
 		$this->_tables = array(
45
-			'Ticket_Price'=>new EE_Primary_Table('esp_ticket_price','TKP_ID')
45
+			'Ticket_Price'=>new EE_Primary_Table('esp_ticket_price', 'TKP_ID')
46 46
 		);
47 47
 		$this->_fields = array(
48 48
 			'Ticket_Price'=> array(
@@ -56,14 +56,14 @@  discard block
 block discarded – undo
56 56
 			'Price'=>new EE_Belongs_To_Relation()
57 57
 		);
58 58
 		$this->_model_chain_to_wp_user = 'Ticket';
59
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Default_Public('Ticket.TKT_is_default', 'Ticket.Datetime.Event' );
59
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Default_Public('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
60 60
 		//account for default tickets in the caps
61
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Default_Protected( 'Ticket.TKT_is_default', 'Ticket.Datetime.Event');
62
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Default_Protected( 'Ticket.TKT_is_default', 'Ticket.Datetime.Event');
63
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Default_Protected( 'Ticket.TKT_is_default', 'Ticket.Datetime.Event');
61
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
62
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
63
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
64 64
 		//follow the caps of the ticket
65 65
 		$this->_caps_slug = 'tickets';
66
-		parent::__construct( $timezone );
66
+		parent::__construct($timezone);
67 67
 
68 68
 	}
69 69
 
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 block discarded – undo
1
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 /**
3 5
  * Event Espresso
4 6
  *
Please login to merge, or discard this patch.
core/db_models/EEM_Ticket_Template.model.php 2 patches
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -21,8 +21,8 @@  discard block
 block discarded – undo
21 21
  *
22 22
  * ------------------------------------------------------------------------
23 23
  */
24
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
25
-require_once ( EE_CLASSES . 'EE_Ticket_Template.class.php' );
24
+require_once (EE_MODELS.'EEM_Base.model.php');
25
+require_once (EE_CLASSES.'EE_Ticket_Template.class.php');
26 26
 
27 27
 class EEM_Ticket_Template extends EEM_Base {
28 28
 
@@ -38,29 +38,29 @@  discard block
 block discarded – undo
38 38
 	 *		@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)
39 39
 	 *		@return void
40 40
 	 */
41
-	protected function __construct( $timezone ) {
42
-		$this->singular_item = __('Ticket Template','event_espresso');
43
-		$this->plural_item = __('Ticket Templates','event_espresso');
41
+	protected function __construct($timezone) {
42
+		$this->singular_item = __('Ticket Template', 'event_espresso');
43
+		$this->plural_item = __('Ticket Templates', 'event_espresso');
44 44
 
45 45
 		$this->_tables = array(
46 46
 			'Ticket_Template'=> new EE_Primary_Table('esp_ticket_template', 'TTM_ID')
47 47
 		);
48 48
 		$this->_fields = array(
49 49
 			'Ticket_Template'=>array(
50
-				'TTM_ID'=>new EE_Primary_Key_Int_Field('TTM_ID', __('Ticket Template ID','event_espresso')),
51
-				'TTM_name'=>new EE_Plain_Text_Field('TTM_name', __('The name of the ticket template','event_espresso'), false, '' ),
52
-				'TTM_description'=>new EE_Plain_Text_Field('TTM_description', __('The description for the ticket template','event_espresso'), true, '' ),
53
-				'TTM_file'=>new EE_Plain_Text_Field('TTM_file', __('The file name for the actual template file saved on disk','event_espresso'), true, '' ),
50
+				'TTM_ID'=>new EE_Primary_Key_Int_Field('TTM_ID', __('Ticket Template ID', 'event_espresso')),
51
+				'TTM_name'=>new EE_Plain_Text_Field('TTM_name', __('The name of the ticket template', 'event_espresso'), false, ''),
52
+				'TTM_description'=>new EE_Plain_Text_Field('TTM_description', __('The description for the ticket template', 'event_espresso'), true, ''),
53
+				'TTM_file'=>new EE_Plain_Text_Field('TTM_file', __('The file name for the actual template file saved on disk', 'event_espresso'), true, ''),
54 54
 			));
55 55
 		$this->_model_relations = array(
56 56
 			'Ticket'=>new EE_Has_Many_Relation()
57 57
 		);
58 58
 		$this->_model_chain_to_wp_user = 'Ticket';
59
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Default_Public('Ticket.TKT_is_default', 'Ticket.Datetime.Event' );
59
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Default_Public('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
60 60
 		//account for default tickets in the caps
61
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Default_Protected( 'Ticket.TKT_is_default', 'Ticket.Datetime.Event');
62
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Default_Protected( 'Ticket.TKT_is_default', 'Ticket.Datetime.Event');
63
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Default_Protected( 'Ticket.TKT_is_default', 'Ticket.Datetime.Event');
64
-		parent::__construct( $timezone );
61
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
62
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
63
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Default_Protected('Ticket.TKT_is_default', 'Ticket.Datetime.Event');
64
+		parent::__construct($timezone);
65 65
 	}
66 66
 } //end EEM_Ticket_Template class
67 67
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 block discarded – undo
1
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 /**
3 5
  * Event Espresso
4 6
  *
Please login to merge, or discard this patch.
core/db_models/EEM_WP_User.model.php 2 patches
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -22,24 +22,24 @@  discard block
 block discarded – undo
22 22
 	 * @param null $timezone
23 23
 	 * @throws \EE_Error
24 24
 	 */
25
-	protected function __construct( $timezone = NULL ){
26
-		$this->singular_item = __('WP_User','event_espresso');
27
-		$this->plural_item = __('WP_Users','event_espresso');
25
+	protected function __construct($timezone = NULL) {
26
+		$this->singular_item = __('WP_User', 'event_espresso');
27
+		$this->plural_item = __('WP_Users', 'event_espresso');
28 28
 		global $wpdb;
29 29
 		$this->_tables = array(
30
-			'WP_User'=> new EE_Primary_Table( $wpdb->users, 'ID', true)
30
+			'WP_User'=> new EE_Primary_Table($wpdb->users, 'ID', true)
31 31
 		);
32 32
 		$this->_fields = array(
33 33
 			'WP_User'=>array(
34
-				'ID'=> new EE_Primary_Key_Int_Field('ID', __('WP_User ID','event_espresso')),
35
-				'user_login'=>new EE_Plain_Text_Field('user_login', __('User Login','event_espresso'), false, '' ),
36
-				'user_pass'=>new EE_Plain_Text_Field('user_pass', __('User Password','event_espresso'), false, '' ),
37
-				'user_nicename'=>new EE_Plain_Text_Field('user_nicename', __(' User Nice Name','event_espresso'), false, ''),
38
-				'user_email' => new EE_Email_Field('user_email', __( 'User Email', 'event_espresso' ), false),
39
-				'user_registered' => new EE_Datetime_Field( 'user_registered', __( 'Date User Registered', 'event_espresso' ), false, current_time('timestamp'), $timezone ),
40
-				'user_activation_key' => new EE_Plain_Text_Field( 'user_activation_key', __( 'User Activation Key', 'event_espresso' ), false, '' ),
41
-				'user_status' => new EE_Integer_Field( 'user_status', __( 'User Status', 'event_espresso' ), false, 0 ),
42
-				'display_name' => new EE_Plain_Text_Field( 'display_name', __( 'Display Name', 'event_espresso' ), false, '' )
34
+				'ID'=> new EE_Primary_Key_Int_Field('ID', __('WP_User ID', 'event_espresso')),
35
+				'user_login'=>new EE_Plain_Text_Field('user_login', __('User Login', 'event_espresso'), false, ''),
36
+				'user_pass'=>new EE_Plain_Text_Field('user_pass', __('User Password', 'event_espresso'), false, ''),
37
+				'user_nicename'=>new EE_Plain_Text_Field('user_nicename', __(' User Nice Name', 'event_espresso'), false, ''),
38
+				'user_email' => new EE_Email_Field('user_email', __('User Email', 'event_espresso'), false),
39
+				'user_registered' => new EE_Datetime_Field('user_registered', __('Date User Registered', 'event_espresso'), false, current_time('timestamp'), $timezone),
40
+				'user_activation_key' => new EE_Plain_Text_Field('user_activation_key', __('User Activation Key', 'event_espresso'), false, ''),
41
+				'user_status' => new EE_Integer_Field('user_status', __('User Status', 'event_espresso'), false, 0),
42
+				'display_name' => new EE_Plain_Text_Field('display_name', __('Display Name', 'event_espresso'), false, '')
43 43
 			));
44 44
 		$this->_model_relations = array(
45 45
 			'Attendee' => new EE_Has_Many_Relation(),
@@ -55,14 +55,14 @@  discard block
 block discarded – undo
55 55
 		);
56 56
 		$this->_wp_core_model = true;
57 57
 		$this->_caps_slug = 'users';
58
-		$this->_cap_contexts_to_cap_action_map[ EEM_Base::caps_read ] = 'list';
59
-		$this->_cap_contexts_to_cap_action_map[ EEM_Base::caps_read_admin ] = 'list';
60
-		foreach( $this->_cap_contexts_to_cap_action_map as $context => $action ) {
61
-			$this->_cap_restriction_generators[ $context ] = new EE_Restriction_Generator_WP_User();
58
+		$this->_cap_contexts_to_cap_action_map[EEM_Base::caps_read] = 'list';
59
+		$this->_cap_contexts_to_cap_action_map[EEM_Base::caps_read_admin] = 'list';
60
+		foreach ($this->_cap_contexts_to_cap_action_map as $context => $action) {
61
+			$this->_cap_restriction_generators[$context] = new EE_Restriction_Generator_WP_User();
62 62
 		}
63 63
 		//@todo: account for create_users controls whether they can create users at all
64 64
 
65
-		parent::__construct( $timezone );
65
+		parent::__construct($timezone);
66 66
 	}
67 67
 
68 68
 	/**
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 block discarded – undo
1
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 /**
3 5
  * WP User Model. Not intended to replace WP_User, but this just allows
4 6
  * for EE model queries to more easily integrate with the WP User table
Please login to merge, or discard this patch.
core/db_models/fields/EE_All_Caps_Text_Field.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -2,8 +2,8 @@  discard block
 block discarded – undo
2 2
 /**
3 3
  * Text_Fields is a base class for any fields which are have text value. (Exception: foreign and private key fields. Wish PHP had multiple-inheritance for this...)
4 4
  */
5
-class EE_All_Caps_Text_Field extends EE_Text_Field_Base{
6
-	function get_wpdb_data_type(){
5
+class EE_All_Caps_Text_Field extends EE_Text_Field_Base {
6
+	function get_wpdb_data_type() {
7 7
 		return '%s';
8 8
 	}
9 9
 	
@@ -13,6 +13,6 @@  discard block
 block discarded – undo
13 13
 	 * @return string
14 14
 	 */
15 15
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
16
-		return strtoupper( sanitize_key($value_inputted_for_field_on_model_object));
16
+		return strtoupper(sanitize_key($value_inputted_for_field_on_model_object));
17 17
 	}
18 18
 }
19 19
\ No newline at end of file
Please login to merge, or discard this patch.
core/db_models/fields/EE_Any_Foreign_Model_Name_Field.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'fields/EE_DB_Only_Field_Base.php');
2
+require_once(EE_MODELS.'fields/EE_DB_Only_Field_Base.php');
3 3
 /**
4 4
  * Used by EE_Belongs_To_Any_Relations and EE_Has_Many_Any_Relations to identify the model the foreign key points to.
5 5
  * Note: the array of model names on this field should match the array of model names on the
@@ -8,8 +8,8 @@  discard block
 block discarded – undo
8 8
  * 'obj_id'=>new EE_Foreign_Key_Int_Field('obj_id_column',__('Related Object ID'),false,0,array('Registration','Transaction')),
9 9
  * 'obj_type'=>new EE_Any_Foreign_Model_Name_Field('obj_type_column',__('Related Object type'),false,null,array('Registration','Transaction')));
10 10
  */
11
-class EE_Any_Foreign_Model_Name_Field extends EE_Field_With_Model_Name{
12
-	function get_wpdb_data_type(){
11
+class EE_Any_Foreign_Model_Name_Field extends EE_Field_With_Model_Name {
12
+	function get_wpdb_data_type() {
13 13
 		return '%s';
14 14
 	}
15 15
 }
16 16
\ No newline at end of file
Please login to merge, or discard this patch.
core/db_models/fields/EE_Boolean_Field.php 2 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@
 block discarded – undo
4 4
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
5 5
 		if ($value_inputted_for_field_on_model_object){
6 6
 			return true;
7
-		}else{
7
+		} else{
8 8
 			return false;
9 9
 		}
10 10
 	}
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@  discard block
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'fields/EE_Integer_Field.php');
3
-class EE_Boolean_Field extends EE_Integer_Field{
2
+require_once(EE_MODELS.'fields/EE_Integer_Field.php');
3
+class EE_Boolean_Field extends EE_Integer_Field {
4 4
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
5
-		if ($value_inputted_for_field_on_model_object){
5
+		if ($value_inputted_for_field_on_model_object) {
6 6
 			return true;
7
-		}else{
7
+		} else {
8 8
 			return false;
9 9
 		}
10 10
 	}
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 	 * @return boolean
15 15
 	 */
16 16
 	function prepare_for_set_from_db($value_inputted_for_field_on_model_object) {
17
-		return intval( $value_inputted_for_field_on_model_object ) ? true : false;
17
+		return intval($value_inputted_for_field_on_model_object) ? true : false;
18 18
 	}
19 19
 	
20 20
 	/**
@@ -22,10 +22,10 @@  discard block
 block discarded – undo
22 22
 	 * @param boolean $value_on_field_to_be_outputted
23 23
 	 * @return string Yes or No
24 24
 	 */
25
-	function prepare_for_pretty_echoing( $value_on_field_to_be_outputted ) {
25
+	function prepare_for_pretty_echoing($value_on_field_to_be_outputted) {
26 26
 		return apply_filters( 
27 27
 			'FHEE__EE_Boolean_Field__prepare_for_pretty_echoing__return',
28
-			$value_on_field_to_be_outputted ? __( 'Yes', 'event_espresso' ) : __( 'No', 'event_espresso' ),
28
+			$value_on_field_to_be_outputted ? __('Yes', 'event_espresso') : __('No', 'event_espresso'),
29 29
 			$value_on_field_to_be_outputted
30 30
 		);
31 31
 	}
Please login to merge, or discard this patch.
core/db_models/fields/EE_DB_Only_Field_Base.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@
 block discarded – undo
7 7
  * special default values for them, or some other column-specific functionality. So we can add them as fields,
8 8
  * but db-only ones
9 9
  */
10
-abstract class EE_DB_Only_Field_Base extends EE_Model_Field_Base{
10
+abstract class EE_DB_Only_Field_Base extends EE_Model_Field_Base {
11 11
 	/**
12 12
 	 * All these children classes are for the db-only (meaning, we should select them
13 13
 	 * on get_all queries, update, delete, and will still want to set their default value
Please login to merge, or discard this patch.