Completed
Branch FET-8365-add-indexes (4b9253)
by
unknown
531:58 queued 519:27
created
core/db_models/EEM_Question_Group.model.php 2 patches
Spacing   +23 added lines, -23 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_Soft_Delete_Base.model.php' );
25
-require_once( EE_CLASSES . 'EE_Question_Group.class.php');
24
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
25
+require_once(EE_CLASSES.'EE_Question_Group.class.php');
26 26
 class EEM_Question_Group extends EEM_Soft_Delete_Base {
27 27
 	const system_personal = 1;
28 28
 	const system_address = 2;
@@ -30,25 +30,25 @@  discard block
 block discarded – undo
30 30
 	protected static $_instance = NULL;
31 31
 
32 32
 
33
-	protected function __construct( $timezone = NULL ) {
34
-		$this->singular_item = __('Question Group','event_espresso');
35
-		$this->plural_item = __('Question Groups','event_espresso');
33
+	protected function __construct($timezone = NULL) {
34
+		$this->singular_item = __('Question Group', 'event_espresso');
35
+		$this->plural_item = __('Question Groups', 'event_espresso');
36 36
 
37 37
 		$this->_tables = array(
38
-			'Question_Group'=>new EE_Primary_Table('esp_question_group','QSG_ID')
38
+			'Question_Group'=>new EE_Primary_Table('esp_question_group', 'QSG_ID')
39 39
 		);
40 40
 		$this->_fields = array(
41 41
 			'Question_Group'=>array(
42
-				'QSG_ID'=>new EE_Primary_Key_Int_Field('QSG_ID', __('Question Group ID','event_espresso')),
43
-				'QSG_name'=>new EE_Plain_Text_Field('QSG_name', __('Question Group Name','event_espresso'), false, ''),
44
-				'QSG_identifier'=>new EE_Plain_Text_Field('QSG_identifier', __('Text ID for question Group','event_espresso'), false, ''),
45
-				'QSG_desc'=>new EE_Full_HTML_Field('QSG_desc', __('Description of Question Group','event_espresso'), true, ''),
46
-				'QSG_order'=>new EE_Integer_Field('QSG_order', __('Order in which to show the question group','event_espresso'), true, 0),
47
-				'QSG_show_group_name'=>new EE_Boolean_Field('QSG_show_group_name', __('Flag indicating whether to show the group\'s name on the registration page','event_espresso'), false, true),
48
-				'QSG_show_group_desc'=>new EE_Boolean_Field('QSG_show_group_desc', __('Flag indicating whether to show the group\s description on the registration page','event_espresso'), false, false),
49
-				'QSG_wp_user' => new EE_WP_User_Field('QSG_wp_user', __('Question Group Creator ID', 'event_espresso'), FALSE ),
50
-				'QSG_system'=>new EE_Integer_Field('QSG_system', __('Indicate IF this is a system group and if it is what system group it corresponds to.','event_espresso'), false, 0),
51
-				'QSG_deleted'=>new EE_Trashed_Flag_Field('QSG_deleted', __('Flag indicating this question group was deleted','event_espresso'), false, false)
42
+				'QSG_ID'=>new EE_Primary_Key_Int_Field('QSG_ID', __('Question Group ID', 'event_espresso')),
43
+				'QSG_name'=>new EE_Plain_Text_Field('QSG_name', __('Question Group Name', 'event_espresso'), false, ''),
44
+				'QSG_identifier'=>new EE_Plain_Text_Field('QSG_identifier', __('Text ID for question Group', 'event_espresso'), false, ''),
45
+				'QSG_desc'=>new EE_Full_HTML_Field('QSG_desc', __('Description of Question Group', 'event_espresso'), true, ''),
46
+				'QSG_order'=>new EE_Integer_Field('QSG_order', __('Order in which to show the question group', 'event_espresso'), true, 0),
47
+				'QSG_show_group_name'=>new EE_Boolean_Field('QSG_show_group_name', __('Flag indicating whether to show the group\'s name on the registration page', 'event_espresso'), false, true),
48
+				'QSG_show_group_desc'=>new EE_Boolean_Field('QSG_show_group_desc', __('Flag indicating whether to show the group\s description on the registration page', 'event_espresso'), false, false),
49
+				'QSG_wp_user' => new EE_WP_User_Field('QSG_wp_user', __('Question Group Creator ID', 'event_espresso'), FALSE),
50
+				'QSG_system'=>new EE_Integer_Field('QSG_system', __('Indicate IF this is a system group and if it is what system group it corresponds to.', 'event_espresso'), false, 0),
51
+				'QSG_deleted'=>new EE_Trashed_Flag_Field('QSG_deleted', __('Flag indicating this question group was deleted', 'event_espresso'), false, false)
52 52
 			)
53 53
 		);
54 54
 		$this->_model_relations = array(
@@ -58,11 +58,11 @@  discard block
 block discarded – undo
58 58
 			'WP_User' => new EE_Belongs_To_Relation(),
59 59
 		);
60 60
 		//this model is generally available for reading
61
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
62
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('QSG_system');
63
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('QSG_system');
64
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('QSG_system');
65
-		parent::__construct( $timezone );
61
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
62
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Reg_Form('QSG_system');
63
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Reg_Form('QSG_system');
64
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Reg_Form('QSG_system');
65
+		parent::__construct($timezone);
66 66
 
67 67
 	}
68 68
 
@@ -75,9 +75,9 @@  discard block
 block discarded – undo
75 75
 	 */
76 76
 	public function get_latest_question_group_order() {
77 77
 		$columns_to_select = array(
78
-			'max_order' => array("MAX(QSG_order)","%d")
78
+			'max_order' => array("MAX(QSG_order)", "%d")
79 79
 			);
80
-		$max = $this->_get_all_wpdb_results(array(), ARRAY_A, $columns_to_select );
80
+		$max = $this->_get_all_wpdb_results(array(), ARRAY_A, $columns_to_select);
81 81
 		return $max[0]['max_order'];
82 82
 	}
83 83
 
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_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_Question_Option.model.php 2 patches
Spacing   +17 added lines, -17 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_Soft_Delete_Base.model.php' );
25
-require_once( EE_CLASSES . 'EE_Question_Option.class.php');
24
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
25
+require_once(EE_CLASSES.'EE_Question_Option.class.php');
26 26
 
27 27
 
28 28
 class EEM_Question_Option extends EEM_Soft_Delete_Base {
@@ -30,21 +30,21 @@  discard block
 block discarded – undo
30 30
   	// private instance of the Attendee object
31 31
 	protected static $_instance = NULL;
32 32
 
33
-	protected function __construct( $timezone = NULL ) {
34
-		$this->singular_item = __('Question Option','event_espresso');
35
-		$this->plural_item = __('Question Options','event_espresso');
33
+	protected function __construct($timezone = NULL) {
34
+		$this->singular_item = __('Question Option', 'event_espresso');
35
+		$this->plural_item = __('Question Options', 'event_espresso');
36 36
 
37 37
 		$this->_tables = array(
38
-			'Question_Option'=>new EE_Primary_Table('esp_question_option','QSO_ID')
38
+			'Question_Option'=>new EE_Primary_Table('esp_question_option', 'QSO_ID')
39 39
 		);
40 40
 		$this->_fields = array(
41 41
 			'Question_Option'=>array(
42
-					'QSO_ID'=>new EE_Primary_Key_Int_Field('QSO_ID', __('Question Option ID','event_espresso')),
43
-					'QST_ID'=>new EE_Foreign_Key_Int_Field('QST_ID', __('Question ID','event_espresso'), false, 0, 'Question'),
44
-					'QSO_value'=>new EE_Plain_Text_Field('QSO_value',  __("Question Option Value", "event_espresso"),false,''),
45
-					'QSO_desc'=>new EE_Full_HTML_Field('QSO_desc', __('Question Option Description','event_espresso'), false, ''),
46
-					'QSO_order' => new EE_Integer_Field('QSO_order', __('Question Option Order', 'event_espresso' ), false, 0 ),
47
-					'QSO_deleted'=>new EE_Trashed_Flag_Field('QSO_deleted', __('Flag indicating Option was trashed','event_espresso'), false, false)
42
+					'QSO_ID'=>new EE_Primary_Key_Int_Field('QSO_ID', __('Question Option ID', 'event_espresso')),
43
+					'QST_ID'=>new EE_Foreign_Key_Int_Field('QST_ID', __('Question ID', 'event_espresso'), false, 0, 'Question'),
44
+					'QSO_value'=>new EE_Plain_Text_Field('QSO_value', __("Question Option Value", "event_espresso"), false, ''),
45
+					'QSO_desc'=>new EE_Full_HTML_Field('QSO_desc', __('Question Option Description', 'event_espresso'), false, ''),
46
+					'QSO_order' => new EE_Integer_Field('QSO_order', __('Question Option Order', 'event_espresso'), false, 0),
47
+					'QSO_deleted'=>new EE_Trashed_Flag_Field('QSO_deleted', __('Flag indicating Option was trashed', 'event_espresso'), false, false)
48 48
 				)
49 49
 		);
50 50
 		$this->_model_relations = array(
@@ -53,12 +53,12 @@  discard block
 block discarded – undo
53 53
 
54 54
 		$this->_model_chain_to_wp_user = 'Question';
55 55
 		//this model is generally available for reading
56
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
57
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('Question_Option');
58
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('Question_Option');
59
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('Question_Option');
56
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
57
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Reg_Form('Question_Option');
58
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Reg_Form('Question_Option');
59
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Reg_Form('Question_Option');
60 60
 		$this->_caps_slug = 'questions';
61
-		parent::__construct( $timezone );
61
+		parent::__construct($timezone);
62 62
 	}
63 63
 
64 64
 
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_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_Soft_Delete_Base.model.php 3 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
  * EEM_Soft_Delete_Base
5 5
  *
@@ -25,14 +25,14 @@  discard block
 block discarded – undo
25 25
  * @subpackage		includes/models/
26 26
  * @author				Michael Nelson
27 27
  */
28
-abstract class EEM_Soft_Delete_Base extends EEM_Base{
28
+abstract class EEM_Soft_Delete_Base extends EEM_Base {
29 29
 
30 30
 	/**
31 31
 	 * @param null $timezone
32 32
 	 */
33 33
 	protected function __construct($timezone = NULL) {
34
-		require_once( EE_MODELS . 'strategies/EE_Soft_Delete_Where_Conditions.strategy.php');
35
-		if( ! $this->_default_where_conditions_strategy){
34
+		require_once(EE_MODELS.'strategies/EE_Soft_Delete_Where_Conditions.strategy.php');
35
+		if ( ! $this->_default_where_conditions_strategy) {
36 36
 			$this->_default_where_conditions_strategy = new EE_Soft_Delete_Where_Conditions();
37 37
 		}
38 38
 		parent::__construct($timezone);
@@ -43,12 +43,12 @@  discard block
 block discarded – undo
43 43
 	 * @return string
44 44
 	 * @throws EE_Error
45 45
 	 */
46
-	public function deleted_field_name(){
46
+	public function deleted_field_name() {
47 47
 		$field = $this->get_a_field_of_type('EE_Trashed_Flag_Field');
48
-		if($field){
48
+		if ($field) {
49 49
 			return $field->get_name();
50
-		}else{
51
-			throw new EE_Error(sprintf(__('We are trying to find the deleted flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?','event_espresso'),get_class($this),get_class($this)));
50
+		} else {
51
+			throw new EE_Error(sprintf(__('We are trying to find the deleted flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?', 'event_espresso'), get_class($this), get_class($this)));
52 52
 		}
53 53
 	}
54 54
 
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 	 * @param array $query_params like EEM_Base::get_all
60 60
 	 * @return EE_Soft_Delete_Base_Class[]
61 61
 	 */
62
-	public function get_all($query_params = array()){
62
+	public function get_all($query_params = array()) {
63 63
 		return parent::get_all($query_params);
64 64
 	}
65 65
 
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 	 * @param array $query_params like EEM_Base::get_all's $query_params
70 70
 	 * @return EE_Soft_Delete_Base_Class
71 71
 	 */
72
-	public function get_one($query_params = array()){
72
+	public function get_one($query_params = array()) {
73 73
 		return parent::get_one($query_params);
74 74
 	}
75 75
 	/**
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 	 * @param array $query_params like EEM_Base::get_all's $query_params
78 78
 	 * @return EE_Soft_Delete_Base_Class
79 79
 	 */
80
-	public function get_one_deleted($query_params = array()){
80
+	public function get_one_deleted($query_params = array()) {
81 81
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
82 82
 		return parent::get_one($query_params);
83 83
 	}
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 	 * @param array $query_params like EEM_base::get_all's $query_params
88 88
 	 * @return EE_Soft_Delete_Base_Class
89 89
 	 */
90
-	public function get_one_deleted_or_undeleted($query_params = array()){
90
+	public function get_one_deleted_or_undeleted($query_params = array()) {
91 91
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
92 92
 		return parent::get_one($query_params);
93 93
 	}
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 	 * @param int|string $id
109 109
 	 * @return EE_Soft_Delete_Base_Class
110 110
 	 */
111
-	public function get_one_by_ID_but_ignore_deleted($id){
111
+	public function get_one_by_ID_but_ignore_deleted($id) {
112 112
 		return parent::get_one_by_ID($id);
113 113
 	}
114 114
 	/**
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 	 * @param boolean $distinct
120 120
 	 * @return int count
121 121
 	 */
122
-	public function count($query_params = array(), $field_to_count = null, $distinct = false){
122
+	public function count($query_params = array(), $field_to_count = null, $distinct = false) {
123 123
 		//just calls parent, but changes PHP docs for this function
124 124
 		return parent::count($query_params, $field_to_count, $distinct);
125 125
 	}
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 	 * @param bool 	 $distinct if we want to only count the distinct values for the column then you can trigger that by the setting $distinct to TRUE;
132 132
 	 * @return int
133 133
 	 */
134
-	public function count_deleted($query_params = null, $field_to_count = null, $distinct = FALSE){
134
+	public function count_deleted($query_params = null, $field_to_count = null, $distinct = FALSE) {
135 135
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
136 136
 		return parent::count($query_params, $field_to_count, $distinct);
137 137
 	}
@@ -141,9 +141,9 @@  discard block
 block discarded – undo
141 141
 	 * @param array $query_params like EEM_Base::get_all's $query_params
142 142
 	 * @return array like EEM_Base::get_all's $query_params
143 143
 	 */
144
-	protected function _alter_query_params_so_only_trashed_items_included($query_params){
145
-		$deletedFlagFieldName=$this->deleted_field_name();
146
-		$query_params[0][$deletedFlagFieldName]=true;
144
+	protected function _alter_query_params_so_only_trashed_items_included($query_params) {
145
+		$deletedFlagFieldName = $this->deleted_field_name();
146
+		$query_params[0][$deletedFlagFieldName] = true;
147 147
 		return $query_params;
148 148
 	}
149 149
 
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 	 * @param array $query_params
153 153
 	 * @return array
154 154
 	 */
155
-	public function alter_query_params_so_deleted_and_undeleted_items_included( $query_params = array() ){
155
+	public function alter_query_params_so_deleted_and_undeleted_items_included($query_params = array()) {
156 156
 		return $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
157 157
 	}
158 158
 
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
 	 * @param array $query_params
162 162
 	 * @return array
163 163
 	 */
164
-	protected function _alter_query_params_so_deleted_and_undeleted_items_included($query_params){
164
+	protected function _alter_query_params_so_deleted_and_undeleted_items_included($query_params) {
165 165
 		$query_params['default_where_conditions'] = 'other_models_only';
166 166
 		return $query_params;
167 167
 	}
@@ -173,9 +173,9 @@  discard block
 block discarded – undo
173 173
 	 * @param bool 	 $distinct if we want to only count the distinct values for the column then you can trigger that by the setting $distinct to TRUE;
174 174
 	 * @return int
175 175
 	 */
176
-	public function count_deleted_and_undeleted($query_params = null, $field_to_count = null, $distinct = FALSE){
176
+	public function count_deleted_and_undeleted($query_params = null, $field_to_count = null, $distinct = FALSE) {
177 177
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
178
-		return parent::count($query_params,$field_to_count, $distinct);
178
+		return parent::count($query_params, $field_to_count, $distinct);
179 179
 	}
180 180
 
181 181
 	/**
@@ -184,9 +184,9 @@  discard block
 block discarded – undo
184 184
 	 * @param string $field_to_sum name of field
185 185
 	 * @return int count
186 186
 	 */
187
-	public function sum($query_params =null,$field_to_sum= null){
187
+	public function sum($query_params = null, $field_to_sum = null) {
188 188
 		//just calls parent, but changes PHP doc
189
-		return parent::sum($query_params,$field_to_sum);
189
+		return parent::sum($query_params, $field_to_sum);
190 190
 	}
191 191
 
192 192
 
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 	 * @param string $field_to_sum
197 197
 	 * @return int
198 198
 	 */
199
-	public function sum_deleted($query_params = null, $field_to_sum = null){
199
+	public function sum_deleted($query_params = null, $field_to_sum = null) {
200 200
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
201 201
 		return parent::sum($query_params, $field_to_sum);
202 202
 	}
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
 	 * @param string $field_to_sum
208 208
 	 * @reutrn int
209 209
 	 */
210
-	public function sum_deleted_and_undeleted($query_params = null, $field_to_sum = null){
210
+	public function sum_deleted_and_undeleted($query_params = null, $field_to_sum = null) {
211 211
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
212 212
 		parent::sum($query_params, $field_to_sum);
213 213
 	}
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
 	 * @param array $query_params like EEM_Base::get_all
218 218
 	 * @return EE_Soft_Delete_Base_Class[]
219 219
 	 */
220
-	public function get_all_deleted_and_undeleted($query_params = array()){
220
+	public function get_all_deleted_and_undeleted($query_params = array()) {
221 221
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
222 222
 		return parent::get_all($query_params);
223 223
 	}
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
 	 * @param array $query_params like EEM_Base::get_all
228 228
 	 * @return EE_Soft_Delete_Base_Class[]
229 229
 	 */
230
-	public function get_all_deleted($query_params = array()){
230
+	public function get_all_deleted($query_params = array()) {
231 231
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
232 232
 		return parent::get_all($query_params);
233 233
 	}
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
 	 * which may depend on it. Its generally advisable to always leave this as TRUE, otherwise you could easily corrupt your DB
246 246
 	 * @return boolean success
247 247
 	 */
248
-	public function delete_permanently($query_params = array(), $allow_blocking = true){
248
+	public function delete_permanently($query_params = array(), $allow_blocking = true) {
249 249
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
250 250
 		return parent::delete($query_params, $allow_blocking);
251 251
 	}
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 	 * which may depend on it. Its generally advisable to always leave this as TRUE, otherwise you could easily corrupt your DB
261 261
 	 * @return boolean success
262 262
 	 */
263
-	public function delete_permanently_by_ID($ID=FALSE, $allow_blocking = true){
263
+	public function delete_permanently_by_ID($ID = FALSE, $allow_blocking = true) {
264 264
 		$query_params = array();
265 265
 		$query_params[0] = array($this->get_primary_key_field()->get_name() => $ID);
266 266
 		$query_params['limit'] = 1;
@@ -274,8 +274,8 @@  discard block
 block discarded – undo
274 274
 	 * @param mixed $ID value of the primary_key or primary_text_key
275 275
 	 * @return boolean success
276 276
 	 */
277
-	public function delete_by_ID($ID){
278
-		return $this->delete_or_restore_by_ID(true,$ID);
277
+	public function delete_by_ID($ID) {
278
+		return $this->delete_or_restore_by_ID(true, $ID);
279 279
 	}
280 280
 	/**
281 281
 	 * Restores a particular item by its ID (primary key). Ignores the fact whether the item
@@ -283,8 +283,8 @@  discard block
 block discarded – undo
283 283
 	 * @param mixed $ID int if primary key is an int, string otherwise
284 284
 	 * @return boolean success
285 285
 	 */
286
-	public function restore_by_ID($ID=FALSE){
287
-		return $this->delete_or_restore_by_ID(false,$ID);
286
+	public function restore_by_ID($ID = FALSE) {
287
+		return $this->delete_or_restore_by_ID(false, $ID);
288 288
 	}
289 289
 	/**
290 290
 	 * For deleting or restoring a particular item. Note that this model is a SOFT-DELETABLE model! However,
@@ -293,15 +293,15 @@  discard block
 block discarded – undo
293 293
 	 * @param mixed $ID int if primary key is an int, string otherwise
294 294
 	 * @return boolean
295 295
 	 */
296
-	public function delete_or_restore_by_ID($delete=true,$ID=FALSE){
297
-		if ( ! $ID ) {
296
+	public function delete_or_restore_by_ID($delete = true, $ID = FALSE) {
297
+		if ( ! $ID) {
298 298
 			return FALSE;
299 299
 		}
300
-		$primaryKeyName=$this->primary_key_name();
300
+		$primaryKeyName = $this->primary_key_name();
301 301
 		// retrieve a particular transaction
302 302
 		$query_params = array();
303
-		$query_params[0] = array( $primaryKeyName => $ID );
304
-		if ( $this->delete_or_restore ($delete, $query_params )) {
303
+		$query_params[0] = array($primaryKeyName => $ID);
304
+		if ($this->delete_or_restore($delete, $query_params)) {
305 305
 			return TRUE;
306 306
 		} else {
307 307
 			return FALSE;
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
 	 * @param bool  $block_deletes
320 320
 	 * @return boolean
321 321
 	 */
322
-	public function delete($query_params = array(), $block_deletes = false){
322
+	public function delete($query_params = array(), $block_deletes = false) {
323 323
 		//no matter what, we WON'T block soft deletes.
324 324
 		return $this->delete_or_restore(true, $query_params);
325 325
 	}
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
 	 * @param array $query_params like EEM_Base::get_all
331 331
 	 * @return boolean
332 332
 	 */
333
-	public function restore($query_params = array()){
333
+	public function restore($query_params = array()) {
334 334
 		return $this->delete_or_restore(false, $query_params);
335 335
 	}
336 336
 	/**
@@ -339,10 +339,10 @@  discard block
 block discarded – undo
339 339
 	 * @param array $query_params like EEM_Base::get_all
340 340
 	 * @return boolean
341 341
 	 */
342
-	function delete_or_restore($delete=true,$query_params = array()){
343
-		$deletedFlagFieldName=$this->deleted_field_name();
342
+	function delete_or_restore($delete = true, $query_params = array()) {
343
+		$deletedFlagFieldName = $this->deleted_field_name();
344 344
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
345
-		if ( $this->update (array($deletedFlagFieldName=>$delete), $query_params )) {
345
+		if ($this->update(array($deletedFlagFieldName=>$delete), $query_params)) {
346 346
 			return TRUE;
347 347
 		} else {
348 348
 			return FALSE;
@@ -360,9 +360,9 @@  discard block
 block discarded – undo
360 360
 	 * be aware that model objects being used could get out-of-sync with the database
361 361
 	 * @return int number of items updated
362 362
 	 */
363
-	public function update_deleted_and_undeleted($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE ){
363
+	public function update_deleted_and_undeleted($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE) {
364 364
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
365
-		return $this->update($fields_n_values, $query_params, $keep_model_objs_in_sync );
365
+		return $this->update($fields_n_values, $query_params, $keep_model_objs_in_sync);
366 366
 	}
367 367
 
368 368
 	/**
@@ -377,8 +377,8 @@  discard block
 block discarded – undo
377 377
 	 * be aware that model objects being used could get out-of-sync with the database
378 378
 	 * @return int how many items were updated
379 379
 	 */
380
-	public function update($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE ){
381
-		return parent::update($fields_n_values,$query_params, $keep_model_objs_in_sync );
380
+	public function update($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE) {
381
+		return parent::update($fields_n_values, $query_params, $keep_model_objs_in_sync);
382 382
 	}
383 383
 
384 384
 
Please login to merge, or discard this patch.
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
 	 * @param boolean $allow_blocking if TRUE, matched objects will only be deleted if there is no related model info
244 244
 	 * that blocks it (ie, there' sno other data that depends on this data); if false, deletes regardless of other objects
245 245
 	 * which may depend on it. Its generally advisable to always leave this as TRUE, otherwise you could easily corrupt your DB
246
-	 * @return boolean success
246
+	 * @return integer success
247 247
 	 */
248 248
 	public function delete_permanently($query_params = array(), $allow_blocking = true){
249 249
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
 	 * @param boolean $allow_blocking if TRUE, matched objects will only be deleted if there is no related model info
259 259
 	 * that blocks it (ie, there' sno other data that depends on this data); if false, deletes regardless of other objects
260 260
 	 * which may depend on it. Its generally advisable to always leave this as TRUE, otherwise you could easily corrupt your DB
261
-	 * @return boolean success
261
+	 * @return integer success
262 262
 	 */
263 263
 	public function delete_permanently_by_ID($ID=FALSE, $allow_blocking = true){
264 264
 		$query_params = array();
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
 	/**
353 353
 	 * Updates all the items of this model which match the $query params, regardless of whether
354 354
 	 * they've been soft-deleted or not
355
-	 * @param array $field_n_values like EEM_Base::update's $fields_n_value
355
+	 * @param array $fields_n_values like EEM_Base::update's $fields_n_value
356 356
 	 * @param array $query_params like EEM_base::get_all's $query_params
357 357
 	 * @param boolean $keep_model_objs_in_sync if TRUE, makes sure we ALSO update model objects
358 358
 	 * in this model's entity map according to $fields_n_values that match $query_params. This
Please login to merge, or discard this patch.
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
  * EEH_URL helper
4 6
  * Helper class for URL-related PHP functions
@@ -62,7 +64,7 @@  discard block
 block discarded – undo
62 64
 				isset($results['response']['code']) &&
63 65
 				$results['response']['code'] == '200'){
64 66
 			return true;
65
-		}else{
67
+		} else{
66 68
 			return false;
67 69
 		}
68 70
 	}
Please login to merge, or discard this patch.
core/db_models/EEM_Status.model.php 3 patches
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 	public function localized_status(  $statuses, $plural = FALSE, $schema = 'upper' ) {
79 79
 		//note these are all in lower case because ucwords() on upper case will NOT convert.
80 80
 		$translation_array = array(
81
-	     	EEM_Registration::status_id_pending_payment => array(
81
+		 	EEM_Registration::status_id_pending_payment => array(
82 82
 				__('pending payment', 'event_espresso'), //singular
83 83
 				__('pending payments', 'event_espresso') //plural
84 84
 				),
@@ -203,37 +203,37 @@  discard block
 block discarded – undo
203 203
 	  			__('postponed', 'event_espresso'),
204 204
 	  			__('postponed', 'event_espresso')
205 205
 	  			)
206
-	    );
206
+		);
207 207
 
208 208
 		$translation_array = apply_filters( 'FHEE__EEM_Status__localized_status__translation_array', $translation_array );
209 209
 
210 210
 		if ( !is_array($statuses) )
211 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 212
 
213
-	    $translation = array();
213
+		$translation = array();
214 214
 
215
-	    foreach ( $statuses as $id => $code ) {
216
-	    	if ( isset( $translation_array[$id] ) ) {
217
-	    		$translation[$id] = $plural ? $translation_array[$id][1] : $translation_array[$id][0];
218
-	    	} else {
219
-	    		$translation[$id] = $code;
220
-	    	}
215
+		foreach ( $statuses as $id => $code ) {
216
+			if ( isset( $translation_array[$id] ) ) {
217
+				$translation[$id] = $plural ? $translation_array[$id][1] : $translation_array[$id][0];
218
+			} else {
219
+				$translation[$id] = $code;
220
+			}
221 221
 
222
-	    	//schema
223
-	    	switch ( $schema ) {
224
-	    		case 'lower' :
225
-	    			$translation[$id] = strtolower( $translation[$id] ); //even though these start in lower case, this will catch any statuses added via filter.
226
-	    			break;
227
-	    		case 'sentence' :
228
-	    			$translation[$id] = ucwords( $translation[$id] );
229
-	    			break;
230
-	    		case 'upper' :
231
-	    			$translation[$id] = strtoupper( $translation[$id] );
232
-	    			break;
233
-	    	}
234
-	    }
222
+			//schema
223
+			switch ( $schema ) {
224
+				case 'lower' :
225
+					$translation[$id] = strtolower( $translation[$id] ); //even though these start in lower case, this will catch any statuses added via filter.
226
+					break;
227
+				case 'sentence' :
228
+					$translation[$id] = ucwords( $translation[$id] );
229
+					break;
230
+				case 'upper' :
231
+					$translation[$id] = strtoupper( $translation[$id] );
232
+					break;
233
+			}
234
+		}
235 235
 
236
-	    return $translation;
236
+		return $translation;
237 237
 	}
238 238
 
239 239
 
Please login to merge, or discard this patch.
Spacing   +21 added lines, -21 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,27 +32,27 @@  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('STS_type', __("Type", "event_espresso"), false, 'event',
46 46
 						array(
47
-							'event'=> __("Event", "event_espresso"),//deprecated
47
+							'event'=> __("Event", "event_espresso"), //deprecated
48 48
 							'registration'=>  __("Registration", "event_espresso"),
49 49
 							'transaction'=>  __("Transaction", "event_espresso"),
50 50
 							'payment'=>  __("Payment", "event_espresso"),
51 51
 							'email'=>  __("Email", "event_espresso")
52 52
 						)),
53
-				'STS_can_edit'=>new EE_Boolean_Field('STS_can_edit', __('Editable?','event_espresso'), false),
53
+				'STS_can_edit'=>new EE_Boolean_Field('STS_can_edit', __('Editable?', 'event_espresso'), false),
54 54
 				'STS_desc'=>new EE_Simple_HTML_Field('STS_desc', __("Description", "event_espresso"), false, ''),
55
-				'STS_open'=>new EE_Boolean_Field('STS_open', __("Open?", "event_espresso"), false,false)
55
+				'STS_open'=>new EE_Boolean_Field('STS_open', __("Open?", "event_espresso"), false, false)
56 56
 			));
57 57
 		$this->_model_relations = array(
58 58
 			'Registration'=>new EE_Has_Many_Relation(),
@@ -60,9 +60,9 @@  discard block
 block discarded – undo
60 60
 			'Payment'=>new EE_Has_Many_Relation()
61 61
 		);
62 62
 		//this model is generally available for reading
63
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
63
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
64 64
 
65
-		parent::__construct( $timezone );
65
+		parent::__construct($timezone);
66 66
 	}
67 67
 
68 68
 
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 	 * @throws EE_Error
76 76
 	 * @return array             an array of translated strings for the incoming status id.
77 77
 	 */
78
-	public function localized_status(  $statuses, $plural = FALSE, $schema = 'upper' ) {
78
+	public function localized_status($statuses, $plural = FALSE, $schema = 'upper') {
79 79
 		//note these are all in lower case because ucwords() on upper case will NOT convert.
80 80
 		$translation_array = array(
81 81
 	     	EEM_Registration::status_id_pending_payment => array(
@@ -205,30 +205,30 @@  discard block
 block discarded – undo
205 205
 	  			)
206 206
 	    );
207 207
 
208
-		$translation_array = apply_filters( 'FHEE__EEM_Status__localized_status__translation_array', $translation_array );
208
+		$translation_array = apply_filters('FHEE__EEM_Status__localized_status__translation_array', $translation_array);
209 209
 
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') );
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 212
 
213 213
 	    $translation = array();
214 214
 
215
-	    foreach ( $statuses as $id => $code ) {
216
-	    	if ( isset( $translation_array[$id] ) ) {
215
+	    foreach ($statuses as $id => $code) {
216
+	    	if (isset($translation_array[$id])) {
217 217
 	    		$translation[$id] = $plural ? $translation_array[$id][1] : $translation_array[$id][0];
218 218
 	    	} else {
219 219
 	    		$translation[$id] = $code;
220 220
 	    	}
221 221
 
222 222
 	    	//schema
223
-	    	switch ( $schema ) {
223
+	    	switch ($schema) {
224 224
 	    		case 'lower' :
225
-	    			$translation[$id] = strtolower( $translation[$id] ); //even though these start in lower case, this will catch any statuses added via filter.
225
+	    			$translation[$id] = strtolower($translation[$id]); //even though these start in lower case, this will catch any statuses added via filter.
226 226
 	    			break;
227 227
 	    		case 'sentence' :
228
-	    			$translation[$id] = ucwords( $translation[$id] );
228
+	    			$translation[$id] = ucwords($translation[$id]);
229 229
 	    			break;
230 230
 	    		case 'upper' :
231
-	    			$translation[$id] = strtoupper( $translation[$id] );
231
+	    			$translation[$id] = strtoupper($translation[$id]);
232 232
 	    			break;
233 233
 	    	}
234 234
 	    }
Please login to merge, or discard this patch.
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.
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_Term_Relationship.model.php 2 patches
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -21,24 +21,24 @@  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 37
 		$this->_fields = array(
38 38
 			'Term_Relationship'=>array(
39
-				'object_id'=> new EE_Foreign_Key_Int_Field('object_id', __('Object(Post) ID','event_espresso'), false,0,array('Event','Venue','Attendee')),
40
-				'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'),
41
-				'term_order'=>new EE_Integer_Field('term_order', __('Term Order','event_espresso'), false, 0)
39
+				'object_id'=> new EE_Foreign_Key_Int_Field('object_id', __('Object(Post) ID', 'event_espresso'), false, 0, array('Event', 'Venue', 'Attendee')),
40
+				'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'),
41
+				'term_order'=>new EE_Integer_Field('term_order', __('Term Order', 'event_espresso'), false, 0)
42 42
 			));
43 43
 		$this->_model_relations = array(
44 44
 			'Event'=>new EE_Belongs_To_Relation(),
@@ -47,34 +47,34 @@  discard block
 block discarded – undo
47 47
 			'Term_Taxonomy'=>new EE_Belongs_To_Relation()
48 48
 		);
49 49
 		$this->_indexes = array(
50
-			'PRIMARY'=>new EE_Primary_Key_Index(array('object_id','term_taxonomy_id'))
50
+			'PRIMARY'=>new EE_Primary_Key_Index(array('object_id', 'term_taxonomy_id'))
51 51
 		);
52 52
 		$path_to_event_model = 'Event.';
53
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Event_Related_Public( $path_to_event_model );
54
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Event_Related_Protected( $path_to_event_model );
55
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Event_Related_Protected( $path_to_event_model );
56
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Event_Related_Protected( $path_to_event_model, EEM_Base::caps_edit );
53
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Event_Related_Public($path_to_event_model);
54
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Event_Related_Protected($path_to_event_model);
55
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Event_Related_Protected($path_to_event_model);
56
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Event_Related_Protected($path_to_event_model, EEM_Base::caps_edit);
57 57
 
58 58
 		$path_to_tax_model = 'Term_Taxonomy.';
59 59
 		//add cap restrictions for editing term relations to the "ee_assign_*"
60 60
 		//and for deleting term relations too
61
-		$cap_contexts_affected = array( EEM_Base::caps_edit, EEM_Base::caps_delete );
62
-		foreach( $cap_contexts_affected as $cap_context_affected ) {
63
-			$this->_cap_restrictions[ $cap_context_affected ]['ee_assign_event_category'] = new EE_Default_Where_Conditions(
61
+		$cap_contexts_affected = array(EEM_Base::caps_edit, EEM_Base::caps_delete);
62
+		foreach ($cap_contexts_affected as $cap_context_affected) {
63
+			$this->_cap_restrictions[$cap_context_affected]['ee_assign_event_category'] = new EE_Default_Where_Conditions(
64 64
 					array(
65
-						$path_to_tax_model . 'taxonomy*ee_assign_event_category' => array( '!=', 'espresso_event_categories' )
65
+						$path_to_tax_model.'taxonomy*ee_assign_event_category' => array('!=', 'espresso_event_categories')
66 66
 					));
67
-			$this->_cap_restrictions[ $cap_context_affected ]['ee_assign_venue_category'] = new EE_Default_Where_Conditions(
67
+			$this->_cap_restrictions[$cap_context_affected]['ee_assign_venue_category'] = new EE_Default_Where_Conditions(
68 68
 					array(
69
-						$path_to_tax_model . 'taxonomy*ee_assign_venue_category' => array( '!=', 'espresso_venue_categories' )
69
+						$path_to_tax_model.'taxonomy*ee_assign_venue_category' => array('!=', 'espresso_venue_categories')
70 70
 					));
71
-			$this->_cap_restrictions[ $cap_context_affected ]['ee_assign_event_type'] = new EE_Default_Where_Conditions(
71
+			$this->_cap_restrictions[$cap_context_affected]['ee_assign_event_type'] = new EE_Default_Where_Conditions(
72 72
 					array(
73
-						$path_to_tax_model . 'taxonomy*ee_assign_event_type' => array( '!=', 'espresso_event_type' )
73
+						$path_to_tax_model.'taxonomy*ee_assign_event_type' => array('!=', 'espresso_event_type')
74 74
 					));
75 75
 		}
76 76
 
77
-		parent::__construct( $timezone );
77
+		parent::__construct($timezone);
78 78
 	}
79 79
 
80 80
 	/**
@@ -83,17 +83,17 @@  discard block
 block discarded – undo
83 83
 	 * @global type $wpdb
84 84
 	 * @return int the number of rows affected
85 85
 	 */
86
-	public function update_term_taxonomy_counts($term_taxonomy_id = NULL){
86
+	public function update_term_taxonomy_counts($term_taxonomy_id = NULL) {
87 87
 		//because this uses a subquery and sometimes assigning to column to be another column's
88 88
 		//value, we just write the SQL directly.
89 89
 		global $wpdb;
90
-		if( $term_taxonomy_id ){
91
-			$second_operand = $wpdb->prepare('%d',$term_taxonomy_id);
92
-		}else{
90
+		if ($term_taxonomy_id) {
91
+			$second_operand = $wpdb->prepare('%d', $term_taxonomy_id);
92
+		} else {
93 93
 			$second_operand = 'tr.term_taxonomy_id';
94 94
 		}
95
-		$rows_affected = $this->_do_wpdb_query( 'query' , array("UPDATE {$wpdb->term_taxonomy} AS tt SET count = (select count(*) as proper_count
96
-from {$wpdb->term_relationships} AS tr WHERE tt.term_taxonomy_id = $second_operand)" ) );
95
+		$rows_affected = $this->_do_wpdb_query('query', array("UPDATE {$wpdb->term_taxonomy} AS tt SET count = (select count(*) as proper_count
96
+from {$wpdb->term_relationships} AS tr WHERE tt.term_taxonomy_id = $second_operand)"));
97 97
 		return $rows_affected;
98 98
 	}
99 99
 
@@ -105,8 +105,8 @@  discard block
 block discarded – undo
105 105
 	 */
106 106
 	public function insert($field_n_values) {
107 107
 		$return = parent::insert($field_n_values);
108
-		if( isset( $field_n_values[ 'term_taxonomy_id' ] ) ) {
109
-			$this->update_term_taxonomy_counts($field_n_values[ 'term_taxonomy_id' ] );
108
+		if (isset($field_n_values['term_taxonomy_id'])) {
109
+			$this->update_term_taxonomy_counts($field_n_values['term_taxonomy_id']);
110 110
 		}
111 111
 		return $return;
112 112
 	}
@@ -122,8 +122,8 @@  discard block
 block discarded – undo
122 122
 	 * @return int
123 123
 	 */
124 124
 	public function update($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE) {
125
-		$count = parent::update($fields_n_values, $query_params, $keep_model_objs_in_sync );
126
-		if( $count ){
125
+		$count = parent::update($fields_n_values, $query_params, $keep_model_objs_in_sync);
126
+		if ($count) {
127 127
 			$this->update_term_taxonomy_counts();
128 128
 		}
129 129
 		return $count;
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 	 */
138 138
 	public function delete($query_params, $allow_blocking = true) {
139 139
 		$count = parent::delete($query_params, $allow_blocking);
140
-		if( $count ){
140
+		if ($count) {
141 141
 			$this->update_term_taxonomy_counts();
142 142
 		}
143 143
 		return $count;
Please login to merge, or discard this patch.
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
  * EEH_URL helper
4 6
  * Helper class for URL-related PHP functions
@@ -62,7 +64,7 @@  discard block
 block discarded – undo
62 64
 				isset($results['response']['code']) &&
63 65
 				$results['response']['code'] == '200'){
64 66
 			return true;
65
-		}else{
67
+		} else{
66 68
 			return false;
67 69
 		}
68 70
 	}
Please login to merge, or discard this patch.
core/db_models/EEM_Ticket.model.php 2 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
  *
@@ -131,8 +133,9 @@  discard block
 block discarded – undo
131 133
 					'tickets_remaining'=>array('Ticket.TKT_qty-Ticket.TKT_sold','%d'),//note! calculations based on TKT_qty are dangerous because -1 means infinity in the db!
132 134
 					'initially_available'=>array('Ticket.TKT_qty','%d')));
133 135
 
134
-		if ( empty( $remaining_per_ticket ) )
135
-			return FALSE;
136
+		if ( empty( $remaining_per_ticket ) ) {
137
+					return FALSE;
138
+		}
136 139
 
137 140
 
138 141
 		foreach($remaining_per_ticket as $remaining){
Please login to merge, or discard this patch.
Spacing   +40 added lines, -40 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_Soft_Delete_Base.model.php' );
25
-require_once ( EE_CLASSES . 'EE_Ticket.class.php' );
24
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
25
+require_once (EE_CLASSES.'EE_Ticket.class.php');
26 26
 
27 27
 class EEM_Ticket extends EEM_Soft_Delete_Base {
28 28
 
@@ -36,35 +36,35 @@  discard block
 block discarded – undo
36 36
 	 *		@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)
37 37
 	 *		@return void
38 38
 	 */
39
-	protected function __construct( $timezone ) {
40
-		$this->singular_item = __('Ticket','event_espresso');
41
-		$this->plural_item = __('Tickets','event_espresso');
39
+	protected function __construct($timezone) {
40
+		$this->singular_item = __('Ticket', 'event_espresso');
41
+		$this->plural_item = __('Tickets', 'event_espresso');
42 42
 
43 43
 		$this->_tables = array(
44 44
 			'Ticket'=> new EE_Primary_Table('esp_ticket', 'TKT_ID')
45 45
 		);
46 46
 		$this->_fields = array(
47 47
 			'Ticket'=>array(
48
-				'TKT_ID'=> new EE_Primary_Key_Int_Field('TKT_ID', __('Ticket ID','event_espresso')),
49
-				'TTM_ID'=>new EE_Foreign_Key_Int_Field('TTM_ID', __('Ticket Template ID','event_espresso'), false, 0, 'Ticket_Template'),
48
+				'TKT_ID'=> new EE_Primary_Key_Int_Field('TKT_ID', __('Ticket ID', 'event_espresso')),
49
+				'TTM_ID'=>new EE_Foreign_Key_Int_Field('TTM_ID', __('Ticket Template ID', 'event_espresso'), false, 0, 'Ticket_Template'),
50 50
 				'TKT_name'=>new EE_Plain_Text_Field('TKT_name', __('Ticket Name', 'event_espresso'), false, ''),
51
-				'TKT_description'=>new EE_Full_HTML_Field('TKT_description', __('Description of Ticket', 'event_espresso'), false, '' ),
52
-				'TKT_start_date'=>new EE_Datetime_Field('TKT_start_date', __('Start time/date of Ticket','event_espresso'), false, current_time('timestamp'), $timezone ),
53
-				'TKT_end_date'=>new EE_Datetime_Field('TKT_end_date', __('End time/date of Ticket','event_espresso'), false, current_time('timestamp'), $timezone ),
54
-				'TKT_min'=>new EE_Integer_Field('TKT_min', __('Minimum quantity of this ticket that must be purchased', 'event_espresso'), false, 0 ),
55
-				'TKT_max'=>new EE_Infinite_Integer_Field('TKT_max', __('Maximum quantity of this ticket that can be purchased in one transaction', 'event_espresso'), false, INF ),
51
+				'TKT_description'=>new EE_Full_HTML_Field('TKT_description', __('Description of Ticket', 'event_espresso'), false, ''),
52
+				'TKT_start_date'=>new EE_Datetime_Field('TKT_start_date', __('Start time/date of Ticket', 'event_espresso'), false, current_time('timestamp'), $timezone),
53
+				'TKT_end_date'=>new EE_Datetime_Field('TKT_end_date', __('End time/date of Ticket', 'event_espresso'), false, current_time('timestamp'), $timezone),
54
+				'TKT_min'=>new EE_Integer_Field('TKT_min', __('Minimum quantity of this ticket that must be purchased', 'event_espresso'), false, 0),
55
+				'TKT_max'=>new EE_Infinite_Integer_Field('TKT_max', __('Maximum quantity of this ticket that can be purchased in one transaction', 'event_espresso'), false, INF),
56 56
 				'TKT_price'=> new EE_Money_Field('TKT_price', 'Final calculated price for ticket', false, 0),
57 57
 				'TKT_sold' => new EE_Integer_Field('TKT_sold', __('Number of this ticket sold', 'event_espresso'), false, 0),
58
-				'TKT_qty'=>new EE_Infinite_Integer_Field('TKT_qty', __('Quantity of this ticket that is available','event_espresso'), false, INF),
59
-				'TKT_uses'=>new EE_Infinite_Integer_Field('TKT_uses', __('Number of datetimes this ticket can be used at', 'event_espresso'), false, INF ),
60
-				'TKT_required'=>new EE_Boolean_Field('TKT_required', __("Flag indicating whether this ticket must be purchased with a transaction", "event_espresso"), false, false ),
61
-				'TKT_taxable'=>new EE_Boolean_Field('TKT_taxable', __("Flag indicating whether there is tax applied on this ticket", "event_espresso"), false,false),
62
-				'TKT_is_default'=>new EE_Boolean_Field('TKT_is_default', __('Flag indicating that this ticket is a default ticket', 'event_espresso'), false, false ),
58
+				'TKT_qty'=>new EE_Infinite_Integer_Field('TKT_qty', __('Quantity of this ticket that is available', 'event_espresso'), false, INF),
59
+				'TKT_uses'=>new EE_Infinite_Integer_Field('TKT_uses', __('Number of datetimes this ticket can be used at', 'event_espresso'), false, INF),
60
+				'TKT_required'=>new EE_Boolean_Field('TKT_required', __("Flag indicating whether this ticket must be purchased with a transaction", "event_espresso"), false, false),
61
+				'TKT_taxable'=>new EE_Boolean_Field('TKT_taxable', __("Flag indicating whether there is tax applied on this ticket", "event_espresso"), false, false),
62
+				'TKT_is_default'=>new EE_Boolean_Field('TKT_is_default', __('Flag indicating that this ticket is a default ticket', 'event_espresso'), false, false),
63 63
 				'TKT_order' => new EE_Integer_Field('TKT_order', __('The order in which the Ticket is displayed in the editor (used for autosaves when the form doesn\'t have the ticket ID yet)', 'event_espresso'), false, 0),
64
-				'TKT_row' => new EE_Integer_Field('TKT_row', __('How tickets are displayed in the ui', 'event_espresso'), false, 0 ),
64
+				'TKT_row' => new EE_Integer_Field('TKT_row', __('How tickets are displayed in the ui', 'event_espresso'), false, 0),
65 65
 				'TKT_deleted' => new EE_Trashed_Flag_Field('TKT_deleted', __('Flag indicating if this has been archived or not', 'event_espresso'), false, false),
66
-				'TKT_wp_user' => new EE_WP_User_Field('TKT_wp_user', __('Ticket Creator ID', 'event_espresso'), FALSE ),
67
-				'TKT_parent' => new EE_Integer_Field('TKT_parent', __('Indicates what TKT_ID is the parent of this TKT_ID (used in autosaves/revisions)'), true, 0 )
66
+				'TKT_wp_user' => new EE_WP_User_Field('TKT_wp_user', __('Ticket Creator ID', 'event_espresso'), FALSE),
67
+				'TKT_parent' => new EE_Integer_Field('TKT_parent', __('Indicates what TKT_ID is the parent of this TKT_ID (used in autosaves/revisions)'), true, 0)
68 68
 			));
69 69
 		$this->_model_relations = array(
70 70
 			'Datetime'=>new EE_HABTM_Relation('Datetime_Ticket'),
@@ -76,12 +76,12 @@  discard block
 block discarded – undo
76 76
 		);
77 77
 
78 78
 		//this model is generally available for reading
79
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Default_Public('TKT_is_default', 'Datetime.Event');
79
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Default_Public('TKT_is_default', 'Datetime.Event');
80 80
 		//account for default tickets in the caps
81
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Default_Protected( 'TKT_is_default', 'Datetime.Event' );
82
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Default_Protected( 'TKT_is_default', 'Datetime.Event' );
83
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Default_Protected( 'TKT_is_default', 'Datetime.Event' );
84
-		parent::__construct( $timezone );
81
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Default_Protected('TKT_is_default', 'Datetime.Event');
82
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Default_Protected('TKT_is_default', 'Datetime.Event');
83
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Default_Protected('TKT_is_default', 'Datetime.Event');
84
+		parent::__construct($timezone);
85 85
 	}
86 86
 
87 87
 
@@ -91,10 +91,10 @@  discard block
 block discarded – undo
91 91
 	 * @return EE_Ticket[]
92 92
 	 */
93 93
 	public function get_all_default_tickets() {
94
-		$tickets = $this->get_all( array( array('TKT_is_default' => 1), 'order_by' => array('TKT_order' => 'ASC')) );
94
+		$tickets = $this->get_all(array(array('TKT_is_default' => 1), 'order_by' => array('TKT_order' => 'ASC')));
95 95
 
96 96
 		//we need to set the start date and end date to today's date and the start of the default dtt
97
-		return $this->_set_default_dates( $tickets );
97
+		return $this->_set_default_dates($tickets);
98 98
 	}
99 99
 
100 100
 
@@ -104,10 +104,10 @@  discard block
 block discarded – undo
104 104
 	 * @param EE_Ticket[] $tickets
105 105
 	 * @return EE_Ticket[]
106 106
 	 */
107
-	private function _set_default_dates( $tickets ) {
108
-		foreach ( $tickets as $ticket ) {
109
-			$ticket->set('TKT_start_date', current_time('timestamp') );
110
-			$ticket->set('TKT_end_date', current_time('timestamp') + (60 * 60 * 24 * 30 ) );
107
+	private function _set_default_dates($tickets) {
108
+		foreach ($tickets as $ticket) {
109
+			$ticket->set('TKT_start_date', current_time('timestamp'));
110
+			$ticket->set('TKT_end_date', current_time('timestamp') + (60 * 60 * 24 * 30));
111 111
 			$ticket->set_end_time("12am");
112 112
 		}
113 113
 
@@ -121,25 +121,25 @@  discard block
 block discarded – undo
121 121
 	 * @param array $query_params
122 122
 	 * @return int|boolean of tickets available. If sold out, return less than 1. If infinite, returns INF,  IF there are NO tickets attached to datetime then FALSE is returned.
123 123
 	 */
124
-	public function sum_tickets_currently_available_at_datetime($DTT_ID, $query_params = array()){
124
+	public function sum_tickets_currently_available_at_datetime($DTT_ID, $query_params = array()) {
125 125
 		$sum = 0;
126 126
 		$query_params[0]['Datetime.DTT_ID'] = $DTT_ID;
127 127
 		$remaining_per_ticket = $this->_get_all_wpdb_results(
128 128
 				$query_params,
129 129
 				ARRAY_A,
130 130
 				array(
131
-					'tickets_remaining'=>array('Ticket.TKT_qty-Ticket.TKT_sold','%d'),//note! calculations based on TKT_qty are dangerous because -1 means infinity in the db!
132
-					'initially_available'=>array('Ticket.TKT_qty','%d')));
131
+					'tickets_remaining'=>array('Ticket.TKT_qty-Ticket.TKT_sold', '%d'), //note! calculations based on TKT_qty are dangerous because -1 means infinity in the db!
132
+					'initially_available'=>array('Ticket.TKT_qty', '%d')));
133 133
 
134
-		if ( empty( $remaining_per_ticket ) )
134
+		if (empty($remaining_per_ticket))
135 135
 			return FALSE;
136 136
 
137 137
 
138
-		foreach($remaining_per_ticket as $remaining){
139
-			if(intval($remaining['initially_available'])==EE_INF_IN_DB){//infinite in DB
138
+		foreach ($remaining_per_ticket as $remaining) {
139
+			if (intval($remaining['initially_available']) == EE_INF_IN_DB) {//infinite in DB
140 140
 				return INF;
141 141
 			}
142
-			$sum+=intval($remaining['tickets_remaining']);
142
+			$sum += intval($remaining['tickets_remaining']);
143 143
 		}
144 144
 
145 145
 		return $sum;
@@ -150,8 +150,8 @@  discard block
 block discarded – undo
150 150
 	 * @param EE_Ticket[] $tickets
151 151
 	 * @return void
152 152
 	 */
153
-	public function update_tickets_sold($tickets){
154
-		foreach($tickets as $ticket){
153
+	public function update_tickets_sold($tickets) {
154
+		foreach ($tickets as $ticket) {
155 155
 			/* @var  $ticket EE_Ticket */
156 156
 			$ticket->update_tickets_sold();
157 157
 		}
Please login to merge, or discard this patch.