Completed
Branch BUG-9583-fix-fetching-term-rel... (646110)
by
unknown
539:15 queued 523:53
created
core/db_models/EEM_Question_Group_Question.model.php 2 patches
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -26,26 +26,26 @@  discard block
 block discarded – undo
26 26
  *
27 27
  * ------------------------------------------------------------------------
28 28
  */
29
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
30
-require_once( EE_CLASSES . 'EE_Question_Group_Question.class.php');
29
+require_once (EE_MODELS.'EEM_Base.model.php');
30
+require_once(EE_CLASSES.'EE_Question_Group_Question.class.php');
31 31
 class EEM_Question_Group_Question extends EEM_Base {
32 32
 
33 33
   	// private instance of the Attendee object
34 34
 	protected static $_instance = NULL;
35 35
 
36 36
 
37
-	protected function __construct( $timezone = NULL ) {
38
-		$this->singular_item = __('Question Group to Question Link','event_espresso');
39
-		$this->plural_item = __('Question Group to Question Links','event_espresso');
37
+	protected function __construct($timezone = NULL) {
38
+		$this->singular_item = __('Question Group to Question Link', 'event_espresso');
39
+		$this->plural_item = __('Question Group to Question Links', 'event_espresso');
40 40
 		$this->_tables = array(
41
-			'Question_Group_Question'=>new EE_Primary_Table('esp_question_group_question','QGQ_ID')
41
+			'Question_Group_Question'=>new EE_Primary_Table('esp_question_group_question', 'QGQ_ID')
42 42
 		);
43 43
 		$this->_fields = array(
44 44
 			'Question_Group_Question'=>array(
45
-				'QGQ_ID'=>new EE_Primary_Key_Int_Field('QGQ_ID', __('Question Group to Question Link ID','event_espresso')),
46
-				'QSG_ID'=>new EE_Foreign_Key_Int_Field('QSG_ID', __('Question Group ID','event_espresso'), false, 0, 'Question_Group'),
47
-				'QST_ID'=>new EE_Foreign_Key_Int_Field('QST_ID', __('Question Id','event_espresso'), false, 0, 'Question'),
48
-				'QGQ_order' => new EE_Integer_Field('QGQ_order', __('Question Group Question Order', 'event_espresso'), false, 0 )
45
+				'QGQ_ID'=>new EE_Primary_Key_Int_Field('QGQ_ID', __('Question Group to Question Link ID', 'event_espresso')),
46
+				'QSG_ID'=>new EE_Foreign_Key_Int_Field('QSG_ID', __('Question Group ID', 'event_espresso'), false, 0, 'Question_Group'),
47
+				'QST_ID'=>new EE_Foreign_Key_Int_Field('QST_ID', __('Question Id', 'event_espresso'), false, 0, 'Question'),
48
+				'QGQ_order' => new EE_Integer_Field('QGQ_order', __('Question Group Question Order', 'event_espresso'), false, 0)
49 49
 			)
50 50
 		);
51 51
 		$this->_model_relations = array(
@@ -55,13 +55,13 @@  discard block
 block discarded – undo
55 55
 
56 56
 		$this->_model_chain_to_wp_user = 'Question_Group';
57 57
 		//this model is generally available for reading
58
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
59
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('Question_Group.QSG_system');
60
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('Question_Group.QSG_system');
61
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('Question_Group.QSG_system');
58
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
59
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Reg_Form('Question_Group.QSG_system');
60
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Reg_Form('Question_Group.QSG_system');
61
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Reg_Form('Question_Group.QSG_system');
62 62
 		//use the caps for question groups
63 63
 		$this->_caps_slug = 'question_groups';
64
-		parent::__construct( $timezone );
64
+		parent::__construct($timezone);
65 65
 	}
66 66
 
67 67
 
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_Registration.model.php 4 patches
Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -219,11 +219,11 @@  discard block
 block discarded – undo
219 219
 
220 220
 
221 221
 	/**
222
-	*		retrieve ALL registrations for a particular Attendee from db
223
-	* 		@access		public
224
-	* 		@param		int		$ATT_ID
225
-	*		@return 	EE_Registration[]
226
-	*/
222
+	 *		retrieve ALL registrations for a particular Attendee from db
223
+	 * 		@access		public
224
+	 * 		@param		int		$ATT_ID
225
+	 *		@return 	EE_Registration[]
226
+	 */
227 227
 	public function get_all_registrations_for_attendee( $ATT_ID = 0 ) {
228 228
 		if ( ! $ATT_ID ) {
229 229
 			return FALSE;
@@ -250,14 +250,14 @@  discard block
 block discarded – undo
250 250
 
251 251
 
252 252
 	/**
253
-	*		retrieve registration for a specific transaction attendee from db
254
-	*
255
-	* 		@access		public
256
-	* 		@param	int	$TXN_ID
257
-	* 		@param    int		$ATT_ID
258
-	* 		@param    int		$att_nmbr 	in case the ATT_ID is the same for multiple registrations (same details used) then the attendee number is required
259
-	*		@return 		mixed		array on success, FALSE on fail
260
-	*/
253
+	 *		retrieve registration for a specific transaction attendee from db
254
+	 *
255
+	 * 		@access		public
256
+	 * 		@param	int	$TXN_ID
257
+	 * 		@param    int		$ATT_ID
258
+	 * 		@param    int		$att_nmbr 	in case the ATT_ID is the same for multiple registrations (same details used) then the attendee number is required
259
+	 *		@return 		mixed		array on success, FALSE on fail
260
+	 */
261 261
 	public function get_registration_for_transaction_attendee( $TXN_ID = 0, $ATT_ID = 0, $att_nmbr = 0 ) {
262 262
 		return $this->get_one(array(
263 263
 			array(
@@ -270,12 +270,12 @@  discard block
 block discarded – undo
270 270
 
271 271
 
272 272
 	/**
273
-	*		get the number of registrations per day  for the Registration Admin page Reports Tab.
273
+	 *		get the number of registrations per day  for the Registration Admin page Reports Tab.
274 274
 	 *		(doesn't utilize models because it's a fairly specialized query)
275
-	* 		@access		public
275
+	 * 		@access		public
276 276
 	 *		@param $period string which can be passed to php's strtotime function (eg "-1 month")
277 277
 	 *		@return stdClass[] with properties regDate and total
278
-	*/
278
+	 */
279 279
 	public function get_registrations_per_day_report( $period = '-1 month' ) {
280 280
 
281 281
 		$sql_date = $this->convert_datetime_for_query( 'REG_date', date("Y-m-d H:i:s", strtotime($period) ), 'Y-m-d H:i:s', 'UTC' );
@@ -304,11 +304,11 @@  discard block
 block discarded – undo
304 304
 
305 305
 
306 306
 	/**
307
-	*		get the number of registrations per event  for the Registration Admin page Reports Tab
308
-	* 		@access		public
307
+	 *		get the number of registrations per event  for the Registration Admin page Reports Tab
308
+	 * 		@access		public
309 309
 	 * @param $period string which can be passed to php's strtotime function (eg "-1 month")
310 310
 	 *		@return stdClass[] each with properties event_name, reg_limit, and total
311
-	*/
311
+	 */
312 312
 	public function get_registrations_per_event_report( $period = '-1 month' ) {
313 313
 
314 314
 		$date_sql = $this->convert_datetime_for_query( 'REG_date', date( "Y-m-d H:i:s", strtotime( $period )), 'Y-m-d H:i:s', 'UTC' );
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.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -257,7 +257,7 @@
 block discarded – undo
257 257
 	* 		@param	int	$TXN_ID
258 258
 	* 		@param    int		$ATT_ID
259 259
 	* 		@param    int		$att_nmbr 	in case the ATT_ID is the same for multiple registrations (same details used) then the attendee number is required
260
-	*		@return 		mixed		array on success, FALSE on fail
260
+	*		@return 		EE_Base_Class|null		array on success, FALSE on fail
261 261
 	*/
262 262
 	public function get_registration_for_transaction_attendee( $TXN_ID = 0, $ATT_ID = 0, $att_nmbr = 0 ) {
263 263
 		return $this->get_one(array(
Please login to merge, or discard this patch.
Spacing   +108 added lines, -108 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  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_Soft_Delete_Base.model.php' );
3
-require_once ( EE_CLASSES . 'EE_Registration.class.php' );
2
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
3
+require_once (EE_CLASSES.'EE_Registration.class.php');
4 4
 /**
5 5
  *
6 6
  * Registration Model
@@ -92,31 +92,31 @@  discard block
 block discarded – undo
92 92
 	 *    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)
93 93
 	 * @return \EEM_Registration
94 94
 	 */
95
-	protected function __construct( $timezone ) {
96
-		$this->singular_item = __('Registration','event_espresso');
97
-		$this->plural_item = __('Registrations','event_espresso');
95
+	protected function __construct($timezone) {
96
+		$this->singular_item = __('Registration', 'event_espresso');
97
+		$this->plural_item = __('Registrations', 'event_espresso');
98 98
 
99 99
 		$this->_tables = array(
100
-			'Registration'=>new EE_Primary_Table('esp_registration','REG_ID')
100
+			'Registration'=>new EE_Primary_Table('esp_registration', 'REG_ID')
101 101
 		);
102 102
 		$this->_fields = array(
103 103
 			'Registration'=>array(
104
-				'REG_ID'=>new EE_Primary_Key_Int_Field('REG_ID', __('Registration ID','event_espresso')),
105
-				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('Event ID','event_espresso'), false, 0, 'Event'),
106
-				'ATT_ID'=>new EE_Foreign_Key_Int_Field('ATT_ID', __('Attendee ID','event_espresso'), false, 0, 'Attendee'),
107
-				'TXN_ID'=>new EE_Foreign_Key_Int_Field('TXN_ID', __('Transaction ID','event_espresso'), false, 0, 'Transaction'),
108
-				'TKT_ID'=>new EE_Foreign_Key_Int_Field('TKT_ID', __('Ticket ID','event_espresso'), false, 0, 'Ticket'),
109
-				'STS_ID'=>new EE_Foreign_Key_String_Field('STS_ID', __('Status ID','event_espresso'), false, EEM_Registration::status_id_incomplete, 'Status'),
110
-				'REG_date'=>new EE_Datetime_Field('REG_date', __('Time registration occurred','event_espresso'), false, time(), $timezone ),
111
-				'REG_final_price'=>new EE_Money_Field('REG_final_price', __('Registration\'s share of the transaction total','event_espresso'), false, 0),
112
-				'REG_paid'=>new EE_Money_Field('REG_paid', __('Amount paid to date towards registration','event_espresso'), false, 0),
113
-				'REG_session'=>new EE_Plain_Text_Field('REG_session', __('Session ID of registration','event_espresso'), false, ''),
114
-				'REG_code'=>new EE_Plain_Text_Field('REG_code', __('Unique Code for this registration','event_espresso'), false, ''),
115
-				'REG_url_link'=>new EE_Plain_Text_Field('REG_url_link', __('String to be used in URL for identifying registration','event_espresso'), false, ''),
116
-				'REG_count'=>new EE_Integer_Field('REG_count', __('Count of this registration in the group registration ','event_espresso'), true, 1),
117
-				'REG_group_size'=>new EE_Integer_Field('REG_group_size', __('Number of registrations on this group','event_espresso'), false, 1),
118
-				'REG_att_is_going'=>new EE_Boolean_Field('REG_att_is_going', __('Flag indicating the registrant plans on attending','event_espresso'), false, false),
119
-				'REG_deleted' => new EE_Trashed_Flag_Field('REG_deleted', __('Flag indicating if registration has been archived or not.', 'event_espresso'), false, false )
104
+				'REG_ID'=>new EE_Primary_Key_Int_Field('REG_ID', __('Registration ID', 'event_espresso')),
105
+				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('Event ID', 'event_espresso'), false, 0, 'Event'),
106
+				'ATT_ID'=>new EE_Foreign_Key_Int_Field('ATT_ID', __('Attendee ID', 'event_espresso'), false, 0, 'Attendee'),
107
+				'TXN_ID'=>new EE_Foreign_Key_Int_Field('TXN_ID', __('Transaction ID', 'event_espresso'), false, 0, 'Transaction'),
108
+				'TKT_ID'=>new EE_Foreign_Key_Int_Field('TKT_ID', __('Ticket ID', 'event_espresso'), false, 0, 'Ticket'),
109
+				'STS_ID'=>new EE_Foreign_Key_String_Field('STS_ID', __('Status ID', 'event_espresso'), false, EEM_Registration::status_id_incomplete, 'Status'),
110
+				'REG_date'=>new EE_Datetime_Field('REG_date', __('Time registration occurred', 'event_espresso'), false, time(), $timezone),
111
+				'REG_final_price'=>new EE_Money_Field('REG_final_price', __('Registration\'s share of the transaction total', 'event_espresso'), false, 0),
112
+				'REG_paid'=>new EE_Money_Field('REG_paid', __('Amount paid to date towards registration', 'event_espresso'), false, 0),
113
+				'REG_session'=>new EE_Plain_Text_Field('REG_session', __('Session ID of registration', 'event_espresso'), false, ''),
114
+				'REG_code'=>new EE_Plain_Text_Field('REG_code', __('Unique Code for this registration', 'event_espresso'), false, ''),
115
+				'REG_url_link'=>new EE_Plain_Text_Field('REG_url_link', __('String to be used in URL for identifying registration', 'event_espresso'), false, ''),
116
+				'REG_count'=>new EE_Integer_Field('REG_count', __('Count of this registration in the group registration ', 'event_espresso'), true, 1),
117
+				'REG_group_size'=>new EE_Integer_Field('REG_group_size', __('Number of registrations on this group', 'event_espresso'), false, 1),
118
+				'REG_att_is_going'=>new EE_Boolean_Field('REG_att_is_going', __('Flag indicating the registrant plans on attending', 'event_espresso'), false, false),
119
+				'REG_deleted' => new EE_Trashed_Flag_Field('REG_deleted', __('Flag indicating if registration has been archived or not.', 'event_espresso'), false, false)
120 120
 			)
121 121
 		);
122 122
 		$this->_model_relations = array(
@@ -128,12 +128,12 @@  discard block
 block discarded – undo
128 128
 			'Answer'=>new EE_Has_Many_Relation(),
129 129
 			'Checkin'=>new EE_Has_Many_Relation(),
130 130
 			'Registration_Payment' => new EE_Has_Many_Relation(),
131
-			'Payment'=>new EE_HABTM_Relation( 'Registration_Payment' ),
132
-			'Message' => new EE_Has_Many_Any_Relation( false ) //allow deletes even if there are messages in the queue related
131
+			'Payment'=>new EE_HABTM_Relation('Registration_Payment'),
132
+			'Message' => new EE_Has_Many_Any_Relation(false) //allow deletes even if there are messages in the queue related
133 133
 		);
134 134
 		$this->_model_chain_to_wp_user = 'Event';
135 135
 
136
-		parent::__construct( $timezone );
136
+		parent::__construct($timezone);
137 137
 	}
138 138
 
139 139
 
@@ -166,9 +166,9 @@  discard block
 block discarded – undo
166 166
 	 *		@param bool  $translated If true will return the values as singular localized strings
167 167
 	 *		@return array
168 168
 	 */
169
-	public static function reg_status_array( $exclude = array(), $translated = FALSE ) {
170
-		EEM_Registration::instance()->_get_registration_status_array( $exclude );
171
-		return $translated ? EEM_Status::instance()->localized_status( self::$_reg_status, FALSE, 'sentence') : self::$_reg_status;
169
+	public static function reg_status_array($exclude = array(), $translated = FALSE) {
170
+		EEM_Registration::instance()->_get_registration_status_array($exclude);
171
+		return $translated ? EEM_Status::instance()->localized_status(self::$_reg_status, FALSE, 'sentence') : self::$_reg_status;
172 172
 	}
173 173
 
174 174
 
@@ -179,18 +179,18 @@  discard block
 block discarded – undo
179 179
 	 * @param array $exclude
180 180
 	 * @return array
181 181
 	 */
182
-	private function _get_registration_status_array( $exclude = array() ) {
182
+	private function _get_registration_status_array($exclude = array()) {
183 183
 		//in the very rare circumstance that we are deleting a model's table's data
184 184
 		//and the table hasn't actually been created, this could have an error
185 185
 		/** @type WPDB $wpdb */
186 186
 		global $wpdb;
187
-		if( EEH_Activation::table_exists( $wpdb->prefix . 'esp_status' ) ){
188
-			$SQL = 'SELECT STS_ID, STS_code FROM '. $wpdb->prefix . 'esp_status WHERE STS_type = "registration"';
189
-			$results = $wpdb->get_results( $SQL );
187
+		if (EEH_Activation::table_exists($wpdb->prefix.'esp_status')) {
188
+			$SQL = 'SELECT STS_ID, STS_code FROM '.$wpdb->prefix.'esp_status WHERE STS_type = "registration"';
189
+			$results = $wpdb->get_results($SQL);
190 190
 			self::$_reg_status = array();
191
-			foreach ( $results as $status ) {
192
-				if ( ! in_array( $status->STS_ID, $exclude )) {
193
-					self::$_reg_status[ $status->STS_ID ] = $status->STS_code;
191
+			foreach ($results as $status) {
192
+				if ( ! in_array($status->STS_ID, $exclude)) {
193
+					self::$_reg_status[$status->STS_ID] = $status->STS_code;
194 194
 				}
195 195
 			}
196 196
 		}
@@ -205,15 +205,15 @@  discard block
 block discarded – undo
205 205
 	 * @param  array  $where_params Array of query_params as described in the comments for EEM_Base::get_all()
206 206
 	 * @return wpdb results array
207 207
 	 */
208
-	public function get_reg_months_and_years( $where_params ) {
208
+	public function get_reg_months_and_years($where_params) {
209 209
 		$query_params[0] = $where_params;
210 210
 		$query_params['group_by'] = array('reg_year', 'reg_month');
211
-		$query_params['order_by'] = array( 'REG_date' => 'DESC' );
211
+		$query_params['order_by'] = array('REG_date' => 'DESC');
212 212
 		$columns_to_select = array(
213 213
 			'reg_year' => array('YEAR(REG_date)', '%s'),
214 214
 			'reg_month' => array('MONTHNAME(REG_date)', '%s')
215 215
 			);
216
-		return $this->_get_all_wpdb_results( $query_params, OBJECT, $columns_to_select );
216
+		return $this->_get_all_wpdb_results($query_params, OBJECT, $columns_to_select);
217 217
 	}
218 218
 
219 219
 
@@ -225,11 +225,11 @@  discard block
 block discarded – undo
225 225
 	* 		@param		int		$ATT_ID
226 226
 	*		@return 	EE_Registration[]
227 227
 	*/
228
-	public function get_all_registrations_for_attendee( $ATT_ID = 0 ) {
229
-		if ( ! $ATT_ID ) {
228
+	public function get_all_registrations_for_attendee($ATT_ID = 0) {
229
+		if ( ! $ATT_ID) {
230 230
 			return FALSE;
231 231
 		}
232
-		return $this->get_all( array( array( 'ATT_ID' => $ATT_ID )));
232
+		return $this->get_all(array(array('ATT_ID' => $ATT_ID)));
233 233
 	}
234 234
 
235 235
 
@@ -240,8 +240,8 @@  discard block
 block discarded – undo
240 240
 	 * @param string $REG_url_link
241 241
 	 * @return EE_Registration
242 242
 	 */
243
-	public function get_registration_for_reg_url_link($REG_url_link){
244
-		if(!$REG_url_link){
243
+	public function get_registration_for_reg_url_link($REG_url_link) {
244
+		if ( ! $REG_url_link) {
245 245
 			return false;
246 246
 		}
247 247
 		return $this->get_one(array(array('REG_url_link'=>$REG_url_link)));
@@ -259,13 +259,13 @@  discard block
 block discarded – undo
259 259
 	* 		@param    int		$att_nmbr 	in case the ATT_ID is the same for multiple registrations (same details used) then the attendee number is required
260 260
 	*		@return 		mixed		array on success, FALSE on fail
261 261
 	*/
262
-	public function get_registration_for_transaction_attendee( $TXN_ID = 0, $ATT_ID = 0, $att_nmbr = 0 ) {
262
+	public function get_registration_for_transaction_attendee($TXN_ID = 0, $ATT_ID = 0, $att_nmbr = 0) {
263 263
 		return $this->get_one(array(
264 264
 			array(
265 265
 				'TXN_ID'=>$TXN_ID,
266 266
 				'ATT_ID'=>$ATT_ID
267 267
 			),
268
-			'limit'=>array( min( ( $att_nmbr-1 ), 0 ), 1 )
268
+			'limit'=>array(min(($att_nmbr - 1), 0), 1)
269 269
 		));
270 270
 	}
271 271
 
@@ -277,16 +277,16 @@  discard block
 block discarded – undo
277 277
 	 *		@param $period string which can be passed to php's strtotime function (eg "-1 month")
278 278
 	 *		@return stdClass[] with properties regDate and total
279 279
 	*/
280
-	public function get_registrations_per_day_report( $period = '-1 month' ) {
280
+	public function get_registrations_per_day_report($period = '-1 month') {
281 281
 
282
-		$sql_date = $this->convert_datetime_for_query( 'REG_date', date("Y-m-d H:i:s", strtotime($period) ), 'Y-m-d H:i:s', 'UTC' );
283
-		$where = array( 'REG_date' => array( '>=', $sql_date ), 'STS_ID' => array( '!=', EEM_Registration::status_id_incomplete ) );
282
+		$sql_date = $this->convert_datetime_for_query('REG_date', date("Y-m-d H:i:s", strtotime($period)), 'Y-m-d H:i:s', 'UTC');
283
+		$where = array('REG_date' => array('>=', $sql_date), 'STS_ID' => array('!=', EEM_Registration::status_id_incomplete));
284 284
 
285
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'reg_per_day_report' ) ) {
285
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_day_report')) {
286 286
 			$where['Event.EVT_wp_user'] = get_current_user_id();
287 287
 		}
288 288
 
289
-		$query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset( $this->get_timezone(), 'REG_date' );
289
+		$query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset($this->get_timezone(), 'REG_date');
290 290
 
291 291
 		$results = $this->_get_all_wpdb_results(
292 292
 				array(
@@ -296,8 +296,8 @@  discard block
 block discarded – undo
296 296
 				),
297 297
 				OBJECT,
298 298
 				array(
299
-					'regDate'=>array( 'DATE(' . $query_interval . ')','%s'),
300
-					'total'=>array('count(REG_ID)','%d')
299
+					'regDate'=>array('DATE('.$query_interval.')', '%s'),
300
+					'total'=>array('count(REG_ID)', '%d')
301 301
 				));
302 302
 		return $results;
303 303
 	}
@@ -312,22 +312,22 @@  discard block
 block discarded – undo
312 312
 	 * @return stdClass[] with properties Registration_REG_date and a column for each registration status as the STS_ID
313 313
 	 *                    (i.e. RAP)
314 314
 	 */
315
-	public function get_registrations_per_day_and_per_status_report( $period = '-1 month' ) {
315
+	public function get_registrations_per_day_and_per_status_report($period = '-1 month') {
316 316
 		global $wpdb;
317
-		$registration_table = $wpdb->prefix . 'esp_registration';
317
+		$registration_table = $wpdb->prefix.'esp_registration';
318 318
 		$event_table = $wpdb->posts;
319
-		$sql_date = date("Y-m-d H:i:s", strtotime($period) );
319
+		$sql_date = date("Y-m-d H:i:s", strtotime($period));
320 320
 
321 321
 		//prepare the query interval for displaying offset
322
-		$query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset( $this->get_timezone(), 'dates.REG_date' );
322
+		$query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset($this->get_timezone(), 'dates.REG_date');
323 323
 
324 324
 		//inner date query
325 325
 		$inner_date_query = "SELECT DISTINCT REG_date from $registration_table ";
326 326
 		$inner_where = " WHERE";
327 327
 		//exclude events not authored by user if permissions in effect
328
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'reg_per_event_report' ) ) {
328
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
329 329
 			$inner_date_query .= "LEFT JOIN $event_table ON ID = EVT_ID";
330
-			$inner_where .= " post_author = " . get_current_user_id() . " AND";
330
+			$inner_where .= " post_author = ".get_current_user_id()." AND";
331 331
 		}
332 332
 		$inner_where .= " REG_date >= '$sql_date'";
333 333
 		$inner_date_query .= $inner_where;
@@ -339,8 +339,8 @@  discard block
 block discarded – undo
339 339
 		$select_parts = array();
340 340
 
341 341
 		//loop through registration stati to do parts for each status.
342
-		foreach ( EEM_Registration::reg_status_array() as $STS_ID => $STS_code ) {
343
-			if ( $STS_ID === EEM_Registration::status_id_incomplete ) {
342
+		foreach (EEM_Registration::reg_status_array() as $STS_ID => $STS_code) {
343
+			if ($STS_ID === EEM_Registration::status_id_incomplete) {
344 344
 				continue;
345 345
 			}
346 346
 			$select_parts[] = "COUNT($STS_code.REG_ID) as $STS_ID";
@@ -348,14 +348,14 @@  discard block
 block discarded – undo
348 348
 		}
349 349
 
350 350
 		//setup the selects
351
-		$select .= implode(', ', $select_parts );
351
+		$select .= implode(', ', $select_parts);
352 352
 		$select .= " FROM ($inner_date_query) AS dates LEFT JOIN ";
353 353
 
354 354
 		//setup the joins
355
-		$join .= implode( " LEFT JOIN ", $join_parts );
355
+		$join .= implode(" LEFT JOIN ", $join_parts);
356 356
 
357 357
 		//now let's put it all together
358
-		$query = $select . $join . ' GROUP BY Registration_REG_date';
358
+		$query = $select.$join.' GROUP BY Registration_REG_date';
359 359
 
360 360
 		//and execute it
361 361
 		$results = $wpdb->get_results(
@@ -376,23 +376,23 @@  discard block
 block discarded – undo
376 376
 	 * @param $period string which can be passed to php's strtotime function (eg "-1 month")
377 377
 	 *		@return stdClass[] each with properties event_name, reg_limit, and total
378 378
 	*/
379
-	public function get_registrations_per_event_report( $period = '-1 month' ) {
379
+	public function get_registrations_per_event_report($period = '-1 month') {
380 380
 
381
-		$date_sql = $this->convert_datetime_for_query( 'REG_date', date( "Y-m-d H:i:s", strtotime( $period )), 'Y-m-d H:i:s', 'UTC' );
382
-		$where = array( 'REG_date' => array( '>=', $date_sql ), 'STS_ID' => array( '!=', EEM_Registration::status_id_incomplete ) );
381
+		$date_sql = $this->convert_datetime_for_query('REG_date', date("Y-m-d H:i:s", strtotime($period)), 'Y-m-d H:i:s', 'UTC');
382
+		$where = array('REG_date' => array('>=', $date_sql), 'STS_ID' => array('!=', EEM_Registration::status_id_incomplete));
383 383
 
384
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'reg_per_event_report' ) ) {
384
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
385 385
 			$where['Event.EVT_wp_user'] = get_current_user_id();
386 386
 		}
387 387
 		$results = $this->_get_all_wpdb_results(array(
388 388
 			$where,
389 389
 			'group_by'=>'Event.EVT_name',
390 390
 			'order_by'=>'Event.EVT_name',
391
-			'limit'=>array(0,24)),
391
+			'limit'=>array(0, 24)),
392 392
 			OBJECT,
393 393
 			array(
394
-				'event_name'=>array('Event_CPT.post_title','%s'),
395
-				'total'=>array('COUNT(REG_ID)','%s')
394
+				'event_name'=>array('Event_CPT.post_title', '%s'),
395
+				'total'=>array('COUNT(REG_ID)', '%s')
396 396
 			)
397 397
 		);
398 398
 
@@ -410,19 +410,19 @@  discard block
 block discarded – undo
410 410
 	 * @return stdClass[] with properties `Registration_Event` and a column for each registration status as the STS_ID
411 411
 	 *                    (i.e. RAP)
412 412
 	 */
413
-	public function get_registrations_per_event_and_per_status_report( $period = '-1 month' ) {
413
+	public function get_registrations_per_event_and_per_status_report($period = '-1 month') {
414 414
 		global $wpdb;
415
-		$registration_table = $wpdb->prefix . 'esp_registration';
415
+		$registration_table = $wpdb->prefix.'esp_registration';
416 416
 		$event_table = $wpdb->posts;
417
-		$sql_date = date("Y-m-d H:i:s", strtotime($period) );
417
+		$sql_date = date("Y-m-d H:i:s", strtotime($period));
418 418
 
419 419
 		//inner date query
420 420
 		$inner_date_query = "SELECT DISTINCT EVT_ID, REG_date from $registration_table ";
421 421
 		$inner_where = " WHERE";
422 422
 		//exclude events not authored by user if permissions in effect
423
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'reg_per_event_report' ) ) {
423
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
424 424
 			$inner_date_query .= "LEFT JOIN $event_table ON ID = EVT_ID";
425
-			$inner_where .= " post_author = " . get_current_user_id() . " AND";
425
+			$inner_where .= " post_author = ".get_current_user_id()." AND";
426 426
 		}
427 427
 		$inner_where .= " REG_date >= '$sql_date'";
428 428
 		$inner_date_query .= $inner_where;
@@ -434,8 +434,8 @@  discard block
 block discarded – undo
434 434
 		$select_parts = array();
435 435
 
436 436
 		//loop through registration stati to do parts for each status.
437
-		foreach ( EEM_Registration::reg_status_array() as $STS_ID => $STS_code ) {
438
-			if ( $STS_ID === EEM_Registration::status_id_incomplete ) {
437
+		foreach (EEM_Registration::reg_status_array() as $STS_ID => $STS_code) {
438
+			if ($STS_ID === EEM_Registration::status_id_incomplete) {
439 439
 				continue;
440 440
 			}
441 441
 			$select_parts[] = "COUNT($STS_code.REG_ID) as $STS_ID";
@@ -443,14 +443,14 @@  discard block
 block discarded – undo
443 443
 		}
444 444
 
445 445
 		//setup the selects
446
-		$select .= implode( ', ', $select_parts );
446
+		$select .= implode(', ', $select_parts);
447 447
 		$select .= " FROM ($inner_date_query) AS dates LEFT JOIN $event_table as Event ON Event.ID = dates.EVT_ID LEFT JOIN ";
448 448
 
449 449
 		//setup remaining joins
450
-		$join .= implode( " LEFT JOIN ", $join_parts );
450
+		$join .= implode(" LEFT JOIN ", $join_parts);
451 451
 
452 452
 		//now put it all together
453
-		$query = $select . $join . ' GROUP BY Registration_Event';
453
+		$query = $select.$join.' GROUP BY Registration_Event';
454 454
 
455 455
 		//and execute
456 456
 		$results = $wpdb->get_results(
@@ -466,11 +466,11 @@  discard block
 block discarded – undo
466 466
 	 * @param int $TXN_ID
467 467
 	 * @return EE_Registration
468 468
 	 */
469
-	public function get_primary_registration_for_transaction_ID( $TXN_ID = 0){
470
-		if( ! $TXN_ID ){
469
+	public function get_primary_registration_for_transaction_ID($TXN_ID = 0) {
470
+		if ( ! $TXN_ID) {
471 471
 			return false;
472 472
 		}
473
-		return $this->get_one(array(array('TXN_ID'=>$TXN_ID,'REG_count'=>  EEM_Registration::PRIMARY_REGISTRANT_COUNT)));
473
+		return $this->get_one(array(array('TXN_ID'=>$TXN_ID, 'REG_count'=>  EEM_Registration::PRIMARY_REGISTRANT_COUNT)));
474 474
 	}
475 475
 
476 476
 
@@ -482,11 +482,11 @@  discard block
 block discarded – undo
482 482
 	 *		@param boolean $for_incomplete_payments
483 483
 	 *		@return int
484 484
 	 */
485
-	public function get_event_registration_count ( $EVT_ID, $for_incomplete_payments = FALSE ) {
485
+	public function get_event_registration_count($EVT_ID, $for_incomplete_payments = FALSE) {
486 486
 		// we only count approved registrations towards registration limits
487
-		$query_params = array( array( 'EVT_ID' => $EVT_ID, 'STS_ID' => self::status_id_approved ) );
488
-		if( $for_incomplete_payments ){
489
-			$query_params[0]['Transaction.STS_ID']=array('!=',  EEM_Transaction::complete_status_code);
487
+		$query_params = array(array('EVT_ID' => $EVT_ID, 'STS_ID' => self::status_id_approved));
488
+		if ($for_incomplete_payments) {
489
+			$query_params[0]['Transaction.STS_ID'] = array('!=', EEM_Transaction::complete_status_code);
490 490
 		}
491 491
 
492 492
 		return $this->count($query_params);
@@ -502,7 +502,7 @@  discard block
 block discarded – undo
502 502
 		/** @type WPDB $wpdb */
503 503
 		global $wpdb;
504 504
 		return $wpdb->query(
505
-				'DELETE r FROM ' . $this->table() . ' r LEFT JOIN ' . EEM_Transaction::instance()->table() . ' t ON r.TXN_ID = t.TXN_ID WHERE t.TXN_ID IS NULL' );
505
+				'DELETE r FROM '.$this->table().' r LEFT JOIN '.EEM_Transaction::instance()->table().' t ON r.TXN_ID = t.TXN_ID WHERE t.TXN_ID IS NULL' );
506 506
 	}
507 507
 
508 508
 	/**
@@ -512,17 +512,17 @@  discard block
 block discarded – undo
512 512
 	 * @param boolean $checked_in whether to count registrations checked IN or OUT
513 513
 	 * @return int
514 514
 	 */
515
-	public function count_registrations_checked_into_datetime( $DTT_ID, $checked_in = true) {
515
+	public function count_registrations_checked_into_datetime($DTT_ID, $checked_in = true) {
516 516
 		global $wpdb;
517 517
 		//subquery to get latest checkin
518 518
 		$query = $wpdb->prepare(
519 519
 			'SELECT '
520 520
 				. 'COUNT( DISTINCT checkins.REG_ID ) '
521
-			. 'FROM ' . EEM_Checkin::instance()->table() . ' AS checkins INNER JOIN'
521
+			. 'FROM '.EEM_Checkin::instance()->table().' AS checkins INNER JOIN'
522 522
 				. '( SELECT '
523 523
 					. 'max( CHK_timestamp ) AS latest_checkin, '
524 524
 					. 'REG_ID AS REG_ID '
525
-				. 'FROM ' . EEM_Checkin::instance()->table() . ' '
525
+				. 'FROM '.EEM_Checkin::instance()->table().' '
526 526
 				. 'WHERE DTT_ID=%d '
527 527
 				. 'GROUP BY REG_ID'
528 528
 			. ') AS most_recent_checkin_per_reg '
@@ -533,7 +533,7 @@  discard block
 block discarded – undo
533 533
 			$DTT_ID,
534 534
 			$checked_in
535 535
 		);
536
-		return (int)$wpdb->get_var( $query );
536
+		return (int) $wpdb->get_var($query);
537 537
 	}
538 538
 
539 539
 	/**
@@ -543,18 +543,18 @@  discard block
 block discarded – undo
543 543
 	 * @param boolean $checked_in whether to count registrations checked IN or OUT
544 544
 	 * @return int
545 545
 	 */
546
-	public function count_registrations_checked_into_event( $EVT_ID, $checked_in = true ) {
546
+	public function count_registrations_checked_into_event($EVT_ID, $checked_in = true) {
547 547
 		global $wpdb;
548 548
 		//subquery to get latest checkin
549 549
 		$query = $wpdb->prepare(
550 550
 			'SELECT '
551 551
 				. 'COUNT( DISTINCT checkins.REG_ID ) '
552
-			. 'FROM ' . EEM_Checkin::instance()->table() . ' AS checkins INNER JOIN'
552
+			. 'FROM '.EEM_Checkin::instance()->table().' AS checkins INNER JOIN'
553 553
 				. '( SELECT '
554 554
 					. 'max( CHK_timestamp ) AS latest_checkin, '
555 555
 					. 'REG_ID AS REG_ID '
556
-				. 'FROM ' . EEM_Checkin::instance()->table() . ' AS c '
557
-				. 'INNER JOIN ' . EEM_Datetime::instance()->table() . ' AS d '
556
+				. 'FROM '.EEM_Checkin::instance()->table().' AS c '
557
+				. 'INNER JOIN '.EEM_Datetime::instance()->table().' AS d '
558 558
 				. 'ON c.DTT_ID=d.DTT_ID '
559 559
 				. 'WHERE d.EVT_ID=%d '
560 560
 				. 'GROUP BY REG_ID'
@@ -566,7 +566,7 @@  discard block
 block discarded – undo
566 566
 			$EVT_ID,
567 567
 			$checked_in
568 568
 		);
569
-		return (int)$wpdb->get_var( $query );
569
+		return (int) $wpdb->get_var($query);
570 570
 	}
571 571
 
572 572
 
@@ -581,15 +581,15 @@  discard block
 block discarded – undo
581 581
 	 * @param array $attendee_ids
582 582
 	 * @return EE_Registration[]
583 583
 	 */
584
-	public function get_latest_registration_for_each_of_given_contacts( $attendee_ids = array() ) {
584
+	public function get_latest_registration_for_each_of_given_contacts($attendee_ids = array()) {
585 585
 		//first do a native wp_query to get the latest REG_ID's matching these attendees.
586 586
 		global $wpdb;
587
-		$registration_table = $wpdb->prefix . 'esp_registration';
587
+		$registration_table = $wpdb->prefix.'esp_registration';
588 588
 		$attendee_table = $wpdb->posts;
589
-		$attendee_ids = is_array( $attendee_ids )
590
-			? array_map( 'absint', $attendee_ids )
591
-			: array( (int) $attendee_ids );
592
-		$attendee_ids = implode( ',', $attendee_ids );
589
+		$attendee_ids = is_array($attendee_ids)
590
+			? array_map('absint', $attendee_ids)
591
+			: array((int) $attendee_ids);
592
+		$attendee_ids = implode(',', $attendee_ids);
593 593
 
594 594
 
595 595
 		//first we do a query to get the registration ids
@@ -614,24 +614,24 @@  discard block
 block discarded – undo
614 614
 			ARRAY_A
615 615
 		);
616 616
 
617
-		if ( empty( $registration_ids ) ) {
617
+		if (empty($registration_ids)) {
618 618
 			return array();
619 619
 		}
620 620
 
621 621
 		$ids_for_model_query = array();
622 622
 		//let's flatten the ids so they can be used in the model query.
623
-		foreach ( $registration_ids as $registration_id ) {
624
-			if ( isset( $registration_id['registration_id'] ) ) {
623
+		foreach ($registration_ids as $registration_id) {
624
+			if (isset($registration_id['registration_id'])) {
625 625
 				$ids_for_model_query[] = $registration_id['registration_id'];
626 626
 			}
627 627
 		}
628 628
 
629 629
 		//construct query
630 630
 		$_where = array(
631
-			'REG_ID' => array( 'IN', $ids_for_model_query )
631
+			'REG_ID' => array('IN', $ids_for_model_query)
632 632
 		);
633 633
 
634
-		return $this->get_all( array( $_where ) );
634
+		return $this->get_all(array($_where));
635 635
 	}
636 636
 
637 637
 
Please login to merge, or discard this patch.
core/db_models/EEM_Registration_Payment.model.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -15,21 +15,21 @@  discard block
 block discarded – undo
15 15
 	protected static $_instance = NULL;
16 16
 
17 17
 
18
-	protected function __construct( $timezone = NULL ) {
18
+	protected function __construct($timezone = NULL) {
19 19
 
20
-		$this->singular_item = __( 'Registration Payment', 'event_espresso' );
21
-		$this->plural_item 	= __( 'Registration Payments', 'event_espresso' );
20
+		$this->singular_item = __('Registration Payment', 'event_espresso');
21
+		$this->plural_item = __('Registration Payments', 'event_espresso');
22 22
 
23 23
 		$this->_tables = array(
24
-			'Registration_Payment' => new EE_Primary_Table( 'esp_registration_payment', 'RPY_ID' )
24
+			'Registration_Payment' => new EE_Primary_Table('esp_registration_payment', 'RPY_ID')
25 25
 		);
26 26
 
27 27
 		$this->_fields = array(
28 28
 			'Registration_Payment'=>array(
29
-				'RPY_ID' 				=> new EE_Primary_Key_Int_Field( 'RPY_ID', __( 'Registration Payment ID', 'event_espresso' )),
30
-				'REG_ID' 				=> new EE_Foreign_Key_Int_Field( 'REG_ID', __( 'Registration ID', 'event_espresso' ), false, 0, 'Registration' ),
31
-				'PAY_ID' 				=> new EE_Foreign_Key_Int_Field( 'PAY_ID', __( 'Payment ID', 'event_espresso' ), true, null, 'Payment' ),
32
-				'RPY_amount' 	=> new EE_Money_Field( 'RPY_amount', __( 'Amount attributed to the registration', 'event_espresso' ), false, 0 ),
29
+				'RPY_ID' 				=> new EE_Primary_Key_Int_Field('RPY_ID', __('Registration Payment ID', 'event_espresso')),
30
+				'REG_ID' 				=> new EE_Foreign_Key_Int_Field('REG_ID', __('Registration ID', 'event_espresso'), false, 0, 'Registration'),
31
+				'PAY_ID' 				=> new EE_Foreign_Key_Int_Field('PAY_ID', __('Payment ID', 'event_espresso'), true, null, 'Payment'),
32
+				'RPY_amount' 	=> new EE_Money_Field('RPY_amount', __('Amount attributed to the registration', 'event_espresso'), false, 0),
33 33
 			)
34 34
 		);
35 35
 
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 			'Payment' 		=> new EE_Belongs_To_Relation(),
39 39
 		);
40 40
 
41
-		parent::__construct( $timezone );
41
+		parent::__construct($timezone);
42 42
 	}
43 43
 
44 44
 
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_Status.model.php 3 patches
Braces   +6 added lines, -3 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
  *
@@ -207,8 +209,9 @@  discard block
 block discarded – undo
207 209
 
208 210
 		$translation_array = apply_filters( 'FHEE__EEM_Status__localized_status__translation_array', $translation_array );
209 211
 
210
-		if ( !is_array($statuses) )
211
-			throw new EE_Error( __('The incoming statuses argument must be an array with keys as the $status_id and values as the $status_code', 'event_espresso') );
212
+		if ( !is_array($statuses) ) {
213
+					throw new EE_Error( __('The incoming statuses argument must be an array with keys as the $status_id and values as the $status_code', 'event_espresso') );
214
+		}
212 215
 
213 216
 	    $translation = array();
214 217
 
Please login to merge, or discard this patch.
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 	public function localized_status(  $statuses, $plural = FALSE, $schema = 'upper' ) {
84 84
 		//note these are all in lower case because ucwords() on upper case will NOT convert.
85 85
 		$translation_array = array(
86
-	     	EEM_Registration::status_id_pending_payment => array(
86
+		 	EEM_Registration::status_id_pending_payment => array(
87 87
 				__('pending payment', 'event_espresso'), //singular
88 88
 				__('pending payments', 'event_espresso') //plural
89 89
 			),
@@ -217,22 +217,22 @@  discard block
 block discarded – undo
217 217
 				__('queued for sending', 'event_espresso'),
218 218
 				__('queued for sending', 'event_espresso'),
219 219
 			),
220
-	        EEM_Message::status_failed => array(
221
-		        __('failed', 'event_espresso'),
222
-		        __('failed', 'event_espresso'),
223
-	        ),
220
+			EEM_Message::status_failed => array(
221
+				__('failed', 'event_espresso'),
222
+				__('failed', 'event_espresso'),
223
+			),
224 224
 			EEM_Message::status_debug_only => array(
225 225
 				__( 'debug only', 'event_espresso' ),
226 226
 				__( 'debug only', 'event_espresso' )
227 227
 			),
228
-	        EEM_Message::status_resend => array(
229
-		        __('queued for resending', 'event_espresso'),
230
-		        __('queued for resending', 'event_espresso'),
231
-	        ),
232
-	        EEM_Message::status_incomplete => array(
233
-		        __('queued for generating', 'event_espresso'),
234
-		        __('queued for generating', 'event_espresso'),
235
-	        ),
228
+			EEM_Message::status_resend => array(
229
+				__('queued for resending', 'event_espresso'),
230
+				__('queued for resending', 'event_espresso'),
231
+			),
232
+			EEM_Message::status_incomplete => array(
233
+				__('queued for generating', 'event_espresso'),
234
+				__('queued for generating', 'event_espresso'),
235
+			),
236 236
 			EEM_Message::status_retry => array(
237 237
 				__('failed sending, can be retried', 'event_espresso'),
238 238
 				__('failed sending, can be retried', 'event_espresso'),
@@ -261,37 +261,37 @@  discard block
 block discarded – undo
261 261
 	  			__('trashed', 'event_espresso'),
262 262
 	  			__('trashed', 'event_espresso')
263 263
   			),
264
-	    );
264
+		);
265 265
 
266 266
 		$translation_array = apply_filters( 'FHEE__EEM_Status__localized_status__translation_array', $translation_array );
267 267
 
268 268
 		if ( !is_array($statuses) )
269 269
 			throw new EE_Error( __('The incoming statuses argument must be an array with keys as the $status_id and values as the $status_code', 'event_espresso') );
270 270
 
271
-	    $translation = array();
271
+		$translation = array();
272 272
 
273
-	    foreach ( $statuses as $id => $code ) {
274
-	    	if ( isset( $translation_array[$id] ) ) {
275
-	    		$translation[$id] = $plural ? $translation_array[$id][1] : $translation_array[$id][0];
276
-	    	} else {
277
-	    		$translation[$id] = $code;
278
-	    	}
273
+		foreach ( $statuses as $id => $code ) {
274
+			if ( isset( $translation_array[$id] ) ) {
275
+				$translation[$id] = $plural ? $translation_array[$id][1] : $translation_array[$id][0];
276
+			} else {
277
+				$translation[$id] = $code;
278
+			}
279 279
 
280
-	    	//schema
281
-	    	switch ( $schema ) {
282
-	    		case 'lower' :
283
-	    			$translation[$id] = strtolower( $translation[$id] ); //even though these start in lower case, this will catch any statuses added via filter.
284
-	    			break;
285
-	    		case 'sentence' :
286
-	    			$translation[$id] = ucwords( $translation[$id] );
287
-	    			break;
288
-	    		case 'upper' :
289
-	    			$translation[$id] = strtoupper( $translation[$id] );
290
-	    			break;
291
-	    	}
292
-	    }
280
+			//schema
281
+			switch ( $schema ) {
282
+				case 'lower' :
283
+					$translation[$id] = strtolower( $translation[$id] ); //even though these start in lower case, this will catch any statuses added via filter.
284
+					break;
285
+				case 'sentence' :
286
+					$translation[$id] = ucwords( $translation[$id] );
287
+					break;
288
+				case 'upper' :
289
+					$translation[$id] = strtoupper( $translation[$id] );
290
+					break;
291
+			}
292
+		}
293 293
 
294
-	    return $translation;
294
+		return $translation;
295 295
 	}
296 296
 
297 297
 
Please login to merge, or discard this patch.
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
  *
14 14
  * ------------------------------------------------------------------------
15 15
  */
16
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
16
+require_once (EE_MODELS.'EEM_Base.model.php');
17 17
 /**
18 18
  *
19 19
  * Class EEM_Status
@@ -32,32 +32,32 @@  discard block
 block discarded – undo
32 32
 	/**
33 33
 	 * @return EEM_Status
34 34
 	 */
35
-	protected function __construct( $timezone = NULL ) {
36
-		$this->singular_item = __('Status','event_espresso');
37
-		$this->plural_item = __('Stati','event_espresso');
35
+	protected function __construct($timezone = NULL) {
36
+		$this->singular_item = __('Status', 'event_espresso');
37
+		$this->plural_item = __('Stati', 'event_espresso');
38 38
 		$this->_tables = array(
39 39
 			'Status'=> new EE_Primary_Table('esp_status', 'STS_ID')
40 40
 		);
41 41
 		$this->_fields = array(
42 42
 			'Status'=>array(
43
-				'STS_ID'=> new EE_Primary_Key_String_Field('STS_ID', __('Status ID','event_espresso')),
44
-				'STS_code'=>new EE_Plain_Text_Field('STS_code',__('Status Code','event_espresso'),false, ''),
43
+				'STS_ID'=> new EE_Primary_Key_String_Field('STS_ID', __('Status ID', 'event_espresso')),
44
+				'STS_code'=>new EE_Plain_Text_Field('STS_code', __('Status Code', 'event_espresso'), false, ''),
45 45
 				'STS_type'=>new EE_Enum_Text_Field(
46 46
 					'STS_type',
47 47
 					__("Type", "event_espresso"),
48 48
 					false,
49 49
 					'event',
50 50
 						array(
51
-							'event'=> __("Event", "event_espresso"),//deprecated
51
+							'event'=> __("Event", "event_espresso"), //deprecated
52 52
 							'registration'=>  __("Registration", "event_espresso"),
53 53
 							'transaction'=>  __("Transaction", "event_espresso"),
54 54
 							'payment'=>  __("Payment", "event_espresso"),
55 55
 							'email'=>  __("Email", "event_espresso"),
56 56
 							'message' => __("Message", "event_espresso")
57 57
 						)),
58
-				'STS_can_edit'=>new EE_Boolean_Field('STS_can_edit', __('Editable?','event_espresso'), false),
58
+				'STS_can_edit'=>new EE_Boolean_Field('STS_can_edit', __('Editable?', 'event_espresso'), false),
59 59
 				'STS_desc'=>new EE_Simple_HTML_Field('STS_desc', __("Description", "event_espresso"), false, ''),
60
-				'STS_open'=>new EE_Boolean_Field('STS_open', __("Open?", "event_espresso"), false,false)
60
+				'STS_open'=>new EE_Boolean_Field('STS_open', __("Open?", "event_espresso"), false, false)
61 61
 			));
62 62
 		$this->_model_relations = array(
63 63
 			'Registration'=>new EE_Has_Many_Relation(),
@@ -65,9 +65,9 @@  discard block
 block discarded – undo
65 65
 			'Payment'=>new EE_Has_Many_Relation()
66 66
 		);
67 67
 		//this model is generally available for reading
68
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
68
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
69 69
 
70
-		parent::__construct( $timezone );
70
+		parent::__construct($timezone);
71 71
 	}
72 72
 
73 73
 
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 	 * @throws EE_Error
81 81
 	 * @return array             an array of translated strings for the incoming status id.
82 82
 	 */
83
-	public function localized_status(  $statuses, $plural = FALSE, $schema = 'upper' ) {
83
+	public function localized_status($statuses, $plural = FALSE, $schema = 'upper') {
84 84
 		//note these are all in lower case because ucwords() on upper case will NOT convert.
85 85
 		$translation_array = array(
86 86
 	     	EEM_Registration::status_id_pending_payment => array(
@@ -222,8 +222,8 @@  discard block
 block discarded – undo
222 222
 		        __('failed', 'event_espresso'),
223 223
 	        ),
224 224
 			EEM_Message::status_debug_only => array(
225
-				__( 'debug only', 'event_espresso' ),
226
-				__( 'debug only', 'event_espresso' )
225
+				__('debug only', 'event_espresso'),
226
+				__('debug only', 'event_espresso')
227 227
 			),
228 228
 	        EEM_Message::status_resend => array(
229 229
 		        __('queued for resending', 'event_espresso'),
@@ -263,30 +263,30 @@  discard block
 block discarded – undo
263 263
   			),
264 264
 	    );
265 265
 
266
-		$translation_array = apply_filters( 'FHEE__EEM_Status__localized_status__translation_array', $translation_array );
266
+		$translation_array = apply_filters('FHEE__EEM_Status__localized_status__translation_array', $translation_array);
267 267
 
268
-		if ( !is_array($statuses) )
269
-			throw new EE_Error( __('The incoming statuses argument must be an array with keys as the $status_id and values as the $status_code', 'event_espresso') );
268
+		if ( ! is_array($statuses))
269
+			throw new EE_Error(__('The incoming statuses argument must be an array with keys as the $status_id and values as the $status_code', 'event_espresso'));
270 270
 
271 271
 	    $translation = array();
272 272
 
273
-	    foreach ( $statuses as $id => $code ) {
274
-	    	if ( isset( $translation_array[$id] ) ) {
273
+	    foreach ($statuses as $id => $code) {
274
+	    	if (isset($translation_array[$id])) {
275 275
 	    		$translation[$id] = $plural ? $translation_array[$id][1] : $translation_array[$id][0];
276 276
 	    	} else {
277 277
 	    		$translation[$id] = $code;
278 278
 	    	}
279 279
 
280 280
 	    	//schema
281
-	    	switch ( $schema ) {
281
+	    	switch ($schema) {
282 282
 	    		case 'lower' :
283
-	    			$translation[$id] = strtolower( $translation[$id] ); //even though these start in lower case, this will catch any statuses added via filter.
283
+	    			$translation[$id] = strtolower($translation[$id]); //even though these start in lower case, this will catch any statuses added via filter.
284 284
 	    			break;
285 285
 	    		case 'sentence' :
286
-	    			$translation[$id] = ucwords( $translation[$id] );
286
+	    			$translation[$id] = ucwords($translation[$id]);
287 287
 	    			break;
288 288
 	    		case 'upper' :
289
-	    			$translation[$id] = strtoupper( $translation[$id] );
289
+	    			$translation[$id] = strtoupper($translation[$id]);
290 290
 	    			break;
291 291
 	    	}
292 292
 	    }
Please login to merge, or discard this patch.
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
 /**
3 5
  * Event Espresso
4 6
  *
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
  * Event Espresso
4 6
  *
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.