Completed
Branch BUG-10209-session-encoding (a58b72)
by
unknown
108:10 queued 97:50
created
core/data_migration_scripts/EE_Data_Migration_Script_Stage_Table.core.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -21,12 +21,12 @@
 block discarded – undo
21 21
 	protected $_old_table;
22 22
 
23 23
 /**
24
-	 * Set in the constructor to add this sql to both the counting query in
25
-	 * EE_Data_Migration_Script_Stage_Table::_count_records_to_migrate() and
26
-	 * EE_Data_Migration_Script_Stage_Table::_get_rows().
27
-	 * Eg "where column_name like '%some_value%'"
28
-	 * @var string
29
-	 */
24
+ * Set in the constructor to add this sql to both the counting query in
25
+ * EE_Data_Migration_Script_Stage_Table::_count_records_to_migrate() and
26
+ * EE_Data_Migration_Script_Stage_Table::_get_rows().
27
+ * Eg "where column_name like '%some_value%'"
28
+ * @var string
29
+ */
30 30
 	protected $_extra_where_sql;
31 31
 
32 32
 
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -41,14 +41,14 @@  discard block
 block discarded – undo
41 41
 	 * @param int $num_items
42 42
 	 * @return int number of items ACTUALLY migrated
43 43
 	 */
44
-	function _migration_step($num_items=50){
45
-		$rows = $this->_get_rows( $num_items );
44
+	function _migration_step($num_items = 50) {
45
+		$rows = $this->_get_rows($num_items);
46 46
 		$items_actually_migrated = 0;
47
-		foreach($rows as $old_row){
47
+		foreach ($rows as $old_row) {
48 48
 			$this->_migrate_old_row($old_row);
49 49
 			$items_actually_migrated++;
50 50
 		}
51
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
51
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
52 52
 			$this->set_completed();
53 53
 		}
54 54
 		return $items_actually_migrated;
@@ -60,11 +60,11 @@  discard block
 block discarded – undo
60 60
 	 * @param int $limit
61 61
 	 * @return array of arrays like $wpdb->get_results($sql, ARRAY_A)
62 62
 	 */
63
-	protected function _get_rows( $limit ){
63
+	protected function _get_rows($limit) {
64 64
 		global $wpdb;
65 65
 		$start_at_record = $this->count_records_migrated();
66
-		$query = "SELECT * FROM {$this->_old_table} {$this->_extra_where_sql} " . $wpdb->prepare("LIMIT %d, %d",$start_at_record,$limit);
67
-		return $wpdb->get_results($query,ARRAY_A);
66
+		$query = "SELECT * FROM {$this->_old_table} {$this->_extra_where_sql} ".$wpdb->prepare("LIMIT %d, %d", $start_at_record, $limit);
67
+		return $wpdb->get_results($query, ARRAY_A);
68 68
 	}
69 69
 
70 70
 
@@ -75,8 +75,8 @@  discard block
 block discarded – undo
75 75
 	 */
76 76
 	function _count_records_to_migrate() {
77 77
 		global $wpdb;
78
-		$query =  "SELECT COUNT(*) FROM {$this->_old_table} {$this->_extra_where_sql}";
79
-		$count = $wpdb->get_var( $query );
78
+		$query = "SELECT COUNT(*) FROM {$this->_old_table} {$this->_extra_where_sql}";
79
+		$count = $wpdb->get_var($query);
80 80
 		return $count;
81 81
 	}
82 82
 
Please login to merge, or discard this patch.
core/db_classes/EE_Answer.class.php 2 patches
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
2
-	exit( 'No direct script access allowed' );
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3 3
 }
4 4
 /**
5 5
  * Event Espresso
@@ -31,9 +31,9 @@  discard block
 block discarded – undo
31 31
 	 * @param array $props_n_values
32 32
 	 * @return EE_Answer
33 33
 	 */
34
-	public static function new_instance( $props_n_values = array() ) {
35
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
36
-		return $has_object ? $has_object : new self( $props_n_values );
34
+	public static function new_instance($props_n_values = array()) {
35
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
36
+		return $has_object ? $has_object : new self($props_n_values);
37 37
 	}
38 38
 
39 39
 
@@ -43,8 +43,8 @@  discard block
 block discarded – undo
43 43
 	 * @param array $props_n_values
44 44
 	 * @return EE_Answer
45 45
 	 */
46
-	public static function new_instance_from_db( $props_n_values = array() ) {
47
-		return new self( $props_n_values, TRUE );
46
+	public static function new_instance_from_db($props_n_values = array()) {
47
+		return new self($props_n_values, TRUE);
48 48
 	}
49 49
 
50 50
 
@@ -55,8 +55,8 @@  discard block
 block discarded – undo
55 55
 	 * @access        public
56 56
 	 * @param int $QST_ID
57 57
 	 */
58
-	public function set_question( $QST_ID = 0 ) {
59
-		$this->set( 'QST_ID', $QST_ID );
58
+	public function set_question($QST_ID = 0) {
59
+		$this->set('QST_ID', $QST_ID);
60 60
 	}
61 61
 
62 62
 
@@ -67,8 +67,8 @@  discard block
 block discarded – undo
67 67
 	 * @access        public
68 68
 	 * @param int $REG_ID
69 69
 	 */
70
-	public function set_registration( $REG_ID = 0 ) {
71
-		$this->set( 'REG_ID', $REG_ID );
70
+	public function set_registration($REG_ID = 0) {
71
+		$this->set('REG_ID', $REG_ID);
72 72
 	}
73 73
 
74 74
 
@@ -79,8 +79,8 @@  discard block
 block discarded – undo
79 79
 	 * @access        public
80 80
 	 * @param mixed $ANS_value
81 81
 	 */
82
-	public function set_value( $ANS_value = '' ) {
83
-		$this->set( 'ANS_value', $ANS_value );
82
+	public function set_value($ANS_value = '') {
83
+		$this->set('ANS_value', $ANS_value);
84 84
 	}
85 85
 
86 86
 
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	 * @return        int
93 93
 	 */
94 94
 	public function registration_ID() {
95
-		return $this->get( 'REG_ID' );
95
+		return $this->get('REG_ID');
96 96
 	}
97 97
 
98 98
 
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 	 * @return        int
105 105
 	 */
106 106
 	public function question_ID() {
107
-		return $this->get( 'QST_ID' );
107
+		return $this->get('QST_ID');
108 108
 	}
109 109
 
110 110
 
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 	 * @return        string
117 117
 	 */
118 118
 	public function value() {
119
-		return $this->get( 'ANS_value' );
119
+		return $this->get('ANS_value');
120 120
 	}
121 121
 
122 122
 
@@ -126,8 +126,8 @@  discard block
 block discarded – undo
126 126
 	 * @param null $schema
127 127
 	 * @return string
128 128
 	 */
129
-	public function pretty_value( $schema = NULL ) {
130
-		return $this->get_pretty( 'ANS_value', $schema );
129
+	public function pretty_value($schema = NULL) {
130
+		return $this->get_pretty('ANS_value', $schema);
131 131
 	}
132 132
 
133 133
 
@@ -136,8 +136,8 @@  discard block
 block discarded – undo
136 136
 	 * Echoes out a pretty value (even for multi-choice options)
137 137
 	 * @param string $schema
138 138
 	 */
139
-	public function e_value( $schema = NULL ) {
140
-		$this->e( 'ANS_value', $schema );
139
+	public function e_value($schema = NULL) {
140
+		$this->e('ANS_value', $schema);
141 141
 	}
142 142
 
143 143
 
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 	 * @return EE_Question
148 148
 	 */
149 149
 	public function question() {
150
-		return $this->get_first_related( 'Question' );
150
+		return $this->get_first_related('Question');
151 151
 	}
152 152
 
153 153
 
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 	 * @return EE_Registration
158 158
 	 */
159 159
 	public function registration() {
160
-		return $this->get_first_related( 'Registration' );
160
+		return $this->get_first_related('Registration');
161 161
 	}
162 162
 }
163 163
 
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@
 block discarded – undo
77 77
 	 *    Set Answer value
78 78
 	 *
79 79
 	 * @access        public
80
-	 * @param mixed $ANS_value
80
+	 * @param string $ANS_value
81 81
 	 */
82 82
 	public function set_value( $ANS_value = '' ) {
83 83
 		$this->set( 'ANS_value', $ANS_value );
Please login to merge, or discard this patch.
core/db_classes/EE_Change_Log.class.php 3 patches
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if (!defined('EVENT_ESPRESSO_VERSION')) {
4 4
 	exit('No direct script access allowed');
5
+}
5 6
 
6 7
 /**
7 8
  * Event Espresso
@@ -152,7 +153,7 @@  discard block
 block discarded – undo
152 153
 		$is_model_name = EE_Registry::instance()->is_model_name($model_name_of_related_obj);
153 154
 		if( ! $is_model_name ){
154 155
 			return null;
155
-		}else{
156
+		} else{
156 157
 			return $this->get_first_related($model_name_of_related_obj);
157 158
 		}
158 159
 	}
@@ -169,13 +170,13 @@  discard block
 block discarded – undo
169 170
 		if($object instanceof EE_Base_Class){
170 171
 			$this->set_OBJ_type($object->get_model()->get_this_model_name());
171 172
 			$this->set_OBJ_ID($object->ID());
172
-		}else{
173
+		} else{
173 174
 			$this->set_OBJ_type(NULL);
174 175
 			$this->set_OBJ_ID(NULL);
175 176
 		}
176 177
 		if($save){
177 178
 			return $this->save();
178
-		}else{
179
+		} else{
179 180
 			return NULL;
180 181
 		}
181 182
 	}
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 
6 6
 /**
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EE_Change_Log extends EE_Base_Class{
28
+class EE_Change_Log extends EE_Base_Class {
29 29
 
30 30
 	/**
31 31
 	 *
@@ -36,9 +36,9 @@  discard block
 block discarded – undo
36 36
 	 *                             		    date_format and the second value is the time format
37 37
 	 * @return EE_Attendee
38 38
 	 */
39
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
40
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
41
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
39
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
40
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
41
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
42 42
 	}
43 43
 
44 44
 
@@ -49,8 +49,8 @@  discard block
 block discarded – undo
49 49
 	 *                          		the website will be used.
50 50
 	 * @return EE_Attendee
51 51
 	 */
52
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
53
-		return new self( $props_n_values, TRUE, $timezone );
52
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
53
+		return new self($props_n_values, TRUE, $timezone);
54 54
 	}
55 55
 	/**
56 56
 	 * Gets message
@@ -147,12 +147,12 @@  discard block
 block discarded – undo
147 147
 	 * Gets the model object attached to this log
148 148
 	 * @return EE_Base_Class
149 149
 	 */
150
-	function object(){
150
+	function object() {
151 151
 		$model_name_of_related_obj = $this->OBJ_type();
152 152
 		$is_model_name = EE_Registry::instance()->is_model_name($model_name_of_related_obj);
153
-		if( ! $is_model_name ){
153
+		if ( ! $is_model_name) {
154 154
 			return null;
155
-		}else{
155
+		} else {
156 156
 			return $this->get_first_related($model_name_of_related_obj);
157 157
 		}
158 158
 	}
@@ -165,17 +165,17 @@  discard block
 block discarded – undo
165 165
 	 * @param boolean $save
166 166
 	 * @return boolean if $save=true, NULL is $save=false
167 167
 	 */
168
-	function set_object($object, $save = TRUE ) {
169
-		if($object instanceof EE_Base_Class){
168
+	function set_object($object, $save = TRUE) {
169
+		if ($object instanceof EE_Base_Class) {
170 170
 			$this->set_OBJ_type($object->get_model()->get_this_model_name());
171 171
 			$this->set_OBJ_ID($object->ID());
172
-		}else{
172
+		} else {
173 173
 			$this->set_OBJ_type(NULL);
174 174
 			$this->set_OBJ_ID(NULL);
175 175
 		}
176
-		if($save){
176
+		if ($save) {
177 177
 			return $this->save();
178
-		}else{
178
+		} else {
179 179
 			return NULL;
180 180
 		}
181 181
 	}
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
 	 * @param array $props_n_values  incoming values from the database
48 48
 	 * @param string $timezone  incoming timezone as set by the model.  If not set the timezone for
49 49
 	 *                          		the website will be used.
50
-	 * @return EE_Attendee
50
+	 * @return EE_Change_Log
51 51
 	 */
52 52
 	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
53 53
 		return new self( $props_n_values, TRUE, $timezone );
Please login to merge, or discard this patch.
core/db_classes/EE_Country.class.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
2
-	exit( 'No direct script access allowed' );
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3 3
 }
4 4
 /**
5 5
  * Event Espresso
@@ -30,9 +30,9 @@  discard block
 block discarded – undo
30 30
 	 * @param array $props_n_values
31 31
 	 * @return EE_Country|mixed
32 32
 	 */
33
-	public static function new_instance( $props_n_values = array() ) {
34
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
35
-		return $has_object ? $has_object : new self( $props_n_values );
33
+	public static function new_instance($props_n_values = array()) {
34
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
35
+		return $has_object ? $has_object : new self($props_n_values);
36 36
 	}
37 37
 
38 38
 
@@ -41,8 +41,8 @@  discard block
 block discarded – undo
41 41
 	 * @param array $props_n_values
42 42
 	 * @return EE_Country
43 43
 	 */
44
-	public static function new_instance_from_db( $props_n_values = array() ) {
45
-		return new self( $props_n_values, TRUE );
44
+	public static function new_instance_from_db($props_n_values = array()) {
45
+		return new self($props_n_values, TRUE);
46 46
 	}
47 47
 
48 48
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 	 * @return string
55 55
 	 */
56 56
 	public function name() {
57
-		return $this->get( 'CNT_name' );
57
+		return $this->get('CNT_name');
58 58
 	}
59 59
 
60 60
 
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 	 * @return string
65 65
 	 */
66 66
 	public function currency_code() {
67
-		return $this->get( 'CNT_cur_code' );
67
+		return $this->get('CNT_cur_code');
68 68
 	}
69 69
 
70 70
 
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 	 * @return string
75 75
 	 */
76 76
 	public function currency_sign() {
77
-		$CNT_cur_sign = $this->get( 'CNT_cur_sign' );
77
+		$CNT_cur_sign = $this->get('CNT_cur_sign');
78 78
 		return $CNT_cur_sign ? $CNT_cur_sign : '&#164;';
79 79
 	}
80 80
 
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 	 * @return string
86 86
 	 */
87 87
 	public function currency_name_single() {
88
-		return $this->get( 'CNT_cur_single' );
88
+		return $this->get('CNT_cur_single');
89 89
 	}
90 90
 
91 91
 
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 	 * @return string
96 96
 	 */
97 97
 	public function currency_name_plural() {
98
-		return $this->get( 'CNT_cur_plural' );
98
+		return $this->get('CNT_cur_plural');
99 99
 	}
100 100
 
101 101
 
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 	 * @return boolean
106 106
 	 */
107 107
 	public function currency_sign_before() {
108
-		return $this->get( 'CNT_cur_sign_b4' );
108
+		return $this->get('CNT_cur_sign_b4');
109 109
 	}
110 110
 
111 111
 
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 	 * @return integer
116 116
 	 */
117 117
 	public function currency_decimal_places() {
118
-		return $this->get( 'CNT_cur_dec_plc' );
118
+		return $this->get('CNT_cur_dec_plc');
119 119
 	}
120 120
 
121 121
 
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 	 * @return string
126 126
 	 */
127 127
 	public function currency_decimal_mark() {
128
-		return $this->get( 'CNT_cur_dec_mrk' );
128
+		return $this->get('CNT_cur_dec_mrk');
129 129
 	}
130 130
 
131 131
 
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 	 * @return string
136 136
 	 */
137 137
 	public function currency_thousands_separator() {
138
-		return $this->get( 'CNT_cur_thsnds' );
138
+		return $this->get('CNT_cur_thsnds');
139 139
 	}
140 140
 }
141 141
 /* End of file EE_Country.class.php */
Please login to merge, or discard this patch.
core/db_classes/EE_Datetime.class.php 4 patches
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -708,12 +708,10 @@
 block discarded – undo
708 708
 		if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) ) {
709 709
 			$display_date = $this->start_date( 'M j\, Y g:i a' ) . ' - ' . $this->end_date( 'M j\, Y g:i a' );
710 710
 			//next condition is if its the same month but different day
711
-		}
712
-		else {
711
+		} else {
713 712
 			if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) == date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) && date( 'd', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'd', $this->get_raw( 'DTT_EVT_end' ) ) ) {
714 713
 				$display_date = $this->start_date( 'M j\, g:i a' ) . ' - ' . $this->end_date( 'M j\, g:i a Y' );
715
-			}
716
-			else {
714
+			} else {
717 715
 				$display_date = $this->start_date( 'F j\, Y' ) . ' @ ' . $this->start_date( 'g:i a' ) . ' - ' . $this->end_date( 'g:i a' );
718 716
 			}
719 717
 		}
Please login to merge, or discard this patch.
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
 	 *        get event start date.  Provide either the date format, or NULL to re-use the
288 288
 	 * last-used format, or '' to use the default date format
289 289
 	 *
290
-	 * @param null $dt_frmt - string representation of date format defaults to 'F j, Y'
290
+	 * @param string $dt_frmt - string representation of date format defaults to 'F j, Y'
291 291
 	 * @return        mixed        string on success, FALSE on fail
292 292
 	 */
293 293
 	public function start_date( $dt_frmt = NULL ) {
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
 	 *        get end date. Provide either the date format, or NULL to re-use the
311 311
 	 * last-used format, or '' to use the default date format
312 312
 	 *
313
-	 * @param null $dt_frmt - string representation of date format defaults to 'F j, Y'
313
+	 * @param string $dt_frmt - string representation of date format defaults to 'F j, Y'
314 314
 	 * @return        mixed        string on success, FALSE on fail
315 315
 	 */
316 316
 	public function end_date( $dt_frmt = NULL ) {
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
 	 * @param string $dt_frmt     - string representation of date format defaults to WP settings
337 337
 	 * @param string $conjunction - conjunction junction what's your function ? this string joins the start date with
338 338
 	 *                            the end date ie: Jan 01 "to" Dec 31
339
-	 * @return mixed        string on success, FALSE on fail
339
+	 * @return string        string on success, FALSE on fail
340 340
 	 * @throws \EE_Error
341 341
 	 */
342 342
 	public function date_range( $dt_frmt = NULL, $conjunction = ' - ' ) {
@@ -408,7 +408,7 @@  discard block
 block discarded – undo
408 408
 	 * @param string $tm_format   string representation of time format defaults to 'g:i a'
409 409
 	 * @param string $conjunction conjunction junction what's your function ?
410 410
 	 *                            this string joins the start date with the end date ie: Jan 01 "to" Dec 31
411
-	 * @return mixed              string on success, FALSE on fail
411
+	 * @return string              string on success, FALSE on fail
412 412
 	 * @throws \EE_Error
413 413
 	 */
414 414
 	public function time_range( $tm_format = null, $conjunction = ' - ' ) {
Please login to merge, or discard this patch.
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -456,14 +456,14 @@
 block discarded – undo
456 456
 			//start and end date are the same but times are different
457 457
 			case ( $this->start_date() === $this->end_date() ) :
458 458
 				$output = $this->get_i18n_datetime( 'DTT_EVT_start', $full_format )
459
-				          . $conjunction
460
-				          . $this->get_i18n_datetime( 'DTT_EVT_end', $tm_format );
459
+						  . $conjunction
460
+						  . $this->get_i18n_datetime( 'DTT_EVT_end', $tm_format );
461 461
 				break;
462 462
 			//all other conditions
463 463
 			default :
464 464
 				$output = $this->get_i18n_datetime( 'DTT_EVT_start', $full_format )
465
-				          . $conjunction
466
-				          . $this->get_i18n_datetime( 'DTT_EVT_end', $full_format );
465
+						  . $conjunction
466
+						  . $this->get_i18n_datetime( 'DTT_EVT_end', $full_format );
467 467
 				break;
468 468
 		}
469 469
 		return $output;
Please login to merge, or discard this patch.
Spacing   +140 added lines, -140 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
2
-	exit( 'No direct script access allowed' );
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3 3
 }
4 4
 /**
5 5
  * Event Espresso
@@ -74,9 +74,9 @@  discard block
 block discarded – undo
74 74
 	 *                             		    date_format and the second value is the time format
75 75
 	 * @return EE_Datetime
76 76
 	 */
77
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
78
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
79
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
77
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
78
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
79
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
80 80
 	}
81 81
 
82 82
 
@@ -87,8 +87,8 @@  discard block
 block discarded – undo
87 87
 	 *                          		the website will be used.
88 88
 	 * @return EE_Datetime
89 89
 	 */
90
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
91
-		return new self( $props_n_values, TRUE, $timezone );
90
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
91
+		return new self($props_n_values, TRUE, $timezone);
92 92
 	}
93 93
 
94 94
 
@@ -96,8 +96,8 @@  discard block
 block discarded – undo
96 96
 	/**
97 97
 	 * @param $name
98 98
 	 */
99
-	public function set_name( $name ) {
100
-		$this->set( 'DTT_name', $name );
99
+	public function set_name($name) {
100
+		$this->set('DTT_name', $name);
101 101
 	}
102 102
 
103 103
 
@@ -105,8 +105,8 @@  discard block
 block discarded – undo
105 105
 	/**
106 106
 	 * @param $description
107 107
 	 */
108
-	public function set_description( $description ) {
109
-		$this->set( 'DTT_description', $description );
108
+	public function set_description($description) {
109
+		$this->set('DTT_description', $description);
110 110
 	}
111 111
 
112 112
 
@@ -118,8 +118,8 @@  discard block
 block discarded – undo
118 118
 	 *
119 119
 	 * @param        string $date a string representation of the event's date ex:  Dec. 25, 2025 or 12-25-2025
120 120
 	 */
121
-	public function set_start_date( $date ) {
122
-		$this->_set_date_for( $date, 'DTT_EVT_start' );
121
+	public function set_start_date($date) {
122
+		$this->_set_date_for($date, 'DTT_EVT_start');
123 123
 	}
124 124
 
125 125
 
@@ -131,8 +131,8 @@  discard block
 block discarded – undo
131 131
 	 *
132 132
 	 * @param        string $time a string representation of the event time ex:  9am  or  7:30 PM
133 133
 	 */
134
-	public function set_start_time( $time ) {
135
-		$this->_set_time_for( $time, 'DTT_EVT_start' );
134
+	public function set_start_time($time) {
135
+		$this->_set_time_for($time, 'DTT_EVT_start');
136 136
 	}
137 137
 
138 138
 
@@ -144,8 +144,8 @@  discard block
 block discarded – undo
144 144
 	 *
145 145
 	 * @param        string $date a string representation of the event's date ex:  Dec. 25, 2025 or 12-25-2025
146 146
 	 */
147
-	public function set_end_date( $date ) {
148
-		$this->_set_date_for( $date, 'DTT_EVT_end' );
147
+	public function set_end_date($date) {
148
+		$this->_set_date_for($date, 'DTT_EVT_end');
149 149
 	}
150 150
 
151 151
 
@@ -157,8 +157,8 @@  discard block
 block discarded – undo
157 157
 	 *
158 158
 	 * @param        string $time a string representation of the event time ex:  9am  or  7:30 PM
159 159
 	 */
160
-	public function set_end_time( $time ) {
161
-		$this->_set_time_for( $time, 'DTT_EVT_end' );
160
+	public function set_end_time($time) {
161
+		$this->_set_time_for($time, 'DTT_EVT_end');
162 162
 	}
163 163
 
164 164
 
@@ -170,8 +170,8 @@  discard block
 block discarded – undo
170 170
 	 *
171 171
 	 * @param        int $reg_limit
172 172
 	 */
173
-	public function set_reg_limit( $reg_limit ) {
174
-		$this->set( 'DTT_reg_limit', $reg_limit );
173
+	public function set_reg_limit($reg_limit) {
174
+		$this->set('DTT_reg_limit', $reg_limit);
175 175
 	}
176 176
 
177 177
 
@@ -181,10 +181,10 @@  discard block
 block discarded – undo
181 181
 	 *
182 182
 	 * @param        int $sold
183 183
 	 */
184
-	public function set_sold( $sold ) {
184
+	public function set_sold($sold) {
185 185
 		// sold can not go below zero
186
-		$sold = max( 0, $sold );
187
-		$this->set( 'DTT_sold', $sold );
186
+		$sold = max(0, $sold);
187
+		$this->set('DTT_sold', $sold);
188 188
 	}
189 189
 
190 190
 
@@ -193,9 +193,9 @@  discard block
 block discarded – undo
193 193
 	 * increments sold by amount passed by $qty
194 194
 	 * @param int $qty
195 195
 	 */
196
-	public function increase_sold( $qty = 1 ) {
196
+	public function increase_sold($qty = 1) {
197 197
 		$sold = $this->sold() + $qty;
198
-		$this->set_sold( $sold );
198
+		$this->set_sold($sold);
199 199
 	}
200 200
 
201 201
 
@@ -204,9 +204,9 @@  discard block
 block discarded – undo
204 204
 	 * decrements (subtracts) sold amount passed by $qty
205 205
 	 * @param int $qty
206 206
 	 */
207
-	public function decrease_sold( $qty = 1 ) {
207
+	public function decrease_sold($qty = 1) {
208 208
 		$sold = $this->sold() - $qty;
209
-		$this->set_sold( $sold );
209
+		$this->set_sold($sold);
210 210
 	}
211 211
 
212 212
 
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 	 * @return string
217 217
 	 */
218 218
 	public function name() {
219
-		return $this->get( 'DTT_name' );
219
+		return $this->get('DTT_name');
220 220
 	}
221 221
 
222 222
 
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 	 * @return string
227 227
 	 */
228 228
 	public function description() {
229
-		return $this->get( 'DTT_description' );
229
+		return $this->get('DTT_description');
230 230
 	}
231 231
 
232 232
 
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
 	 * @return boolean          TRUE if is primary, FALSE if not.
237 237
 	 */
238 238
 	public function is_primary() {
239
-		return $this->get( 'DTT_is_primary' );
239
+		return $this->get('DTT_is_primary');
240 240
 	}
241 241
 
242 242
 
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
 	 * @return int         The order of the datetime for this event.
247 247
 	 */
248 248
 	public function order() {
249
-		return $this->get( 'DTT_order' );
249
+		return $this->get('DTT_order');
250 250
 	}
251 251
 
252 252
 
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
 	 * @return int
257 257
 	 */
258 258
 	public function parent() {
259
-		return $this->get( 'DTT_parent' );
259
+		return $this->get('DTT_parent');
260 260
 	}
261 261
 
262 262
 
@@ -272,10 +272,10 @@  discard block
 block discarded – undo
272 272
 	 * @param    bool   $echo         - whether we echo or return (note echoing uses "pretty" formats, otherwise we use the standard formats)
273 273
 	 * @return    string|bool|void  string on success, FALSE on fail
274 274
 	 */
275
-	private function _show_datetime( $date_or_time = NULL, $start_or_end = 'start', $dt_frmt = '', $tm_frmt = '', $echo = FALSE ) {
275
+	private function _show_datetime($date_or_time = NULL, $start_or_end = 'start', $dt_frmt = '', $tm_frmt = '', $echo = FALSE) {
276 276
 		$field_name = "DTT_EVT_{$start_or_end}";
277
-		$dtt = $this->_get_datetime( $field_name, $dt_frmt, $tm_frmt, $date_or_time, $echo );
278
-		if ( ! $echo ) {
277
+		$dtt = $this->_get_datetime($field_name, $dt_frmt, $tm_frmt, $date_or_time, $echo);
278
+		if ( ! $echo) {
279 279
 			return $dtt;
280 280
 		}
281 281
 		return '';
@@ -290,8 +290,8 @@  discard block
 block discarded – undo
290 290
 	 * @param null $dt_frmt - string representation of date format defaults to 'F j, Y'
291 291
 	 * @return        mixed        string on success, FALSE on fail
292 292
 	 */
293
-	public function start_date( $dt_frmt = NULL ) {
294
-		return $this->_show_datetime( 'D', 'start', $dt_frmt );
293
+	public function start_date($dt_frmt = NULL) {
294
+		return $this->_show_datetime('D', 'start', $dt_frmt);
295 295
 	}
296 296
 
297 297
 
@@ -300,8 +300,8 @@  discard block
 block discarded – undo
300 300
 	 * Echoes start_date()
301 301
 	 * @param string $dt_frmt
302 302
 	 */
303
-	public function e_start_date( $dt_frmt = NULL ) {
304
-		$this->_show_datetime( 'D', 'start', $dt_frmt, NULL, TRUE );
303
+	public function e_start_date($dt_frmt = NULL) {
304
+		$this->_show_datetime('D', 'start', $dt_frmt, NULL, TRUE);
305 305
 	}
306 306
 
307 307
 
@@ -313,8 +313,8 @@  discard block
 block discarded – undo
313 313
 	 * @param null $dt_frmt - string representation of date format defaults to 'F j, Y'
314 314
 	 * @return        mixed        string on success, FALSE on fail
315 315
 	 */
316
-	public function end_date( $dt_frmt = NULL ) {
317
-		return $this->_show_datetime( 'D', 'end', $dt_frmt );
316
+	public function end_date($dt_frmt = NULL) {
317
+		return $this->_show_datetime('D', 'end', $dt_frmt);
318 318
 	}
319 319
 
320 320
 
@@ -323,8 +323,8 @@  discard block
 block discarded – undo
323 323
 	 * Echoes the end date. See end_date()
324 324
 	 * @param string $dt_frmt
325 325
 	 */
326
-	public function e_end_date( $dt_frmt = NULL ) {
327
-		$this->_show_datetime( 'D', 'end', $dt_frmt, NULL, TRUE );
326
+	public function e_end_date($dt_frmt = NULL) {
327
+		$this->_show_datetime('D', 'end', $dt_frmt, NULL, TRUE);
328 328
 	}
329 329
 
330 330
 
@@ -339,11 +339,11 @@  discard block
 block discarded – undo
339 339
 	 * @return mixed        string on success, FALSE on fail
340 340
 	 * @throws \EE_Error
341 341
 	 */
342
-	public function date_range( $dt_frmt = NULL, $conjunction = ' - ' ) {
343
-		$dt_frmt = ! empty( $dt_frmt ) ? $dt_frmt : $this->_dt_frmt;
344
-		$start = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_start', $dt_frmt ) );
345
-		$end = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_end', $dt_frmt ) );
346
-		return $start !== $end ? $start . $conjunction . $end : $start;
342
+	public function date_range($dt_frmt = NULL, $conjunction = ' - ') {
343
+		$dt_frmt = ! empty($dt_frmt) ? $dt_frmt : $this->_dt_frmt;
344
+		$start = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_start', $dt_frmt));
345
+		$end = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_end', $dt_frmt));
346
+		return $start !== $end ? $start.$conjunction.$end : $start;
347 347
 	}
348 348
 
349 349
 
@@ -353,8 +353,8 @@  discard block
 block discarded – undo
353 353
 	 * @param string $conjunction
354 354
 	 * @throws \EE_Error
355 355
 	 */
356
-	public function e_date_range( $dt_frmt = NULL, $conjunction = ' - ' ) {
357
-		echo $this->date_range( $dt_frmt, $conjunction );
356
+	public function e_date_range($dt_frmt = NULL, $conjunction = ' - ') {
357
+		echo $this->date_range($dt_frmt, $conjunction);
358 358
 	}
359 359
 
360 360
 
@@ -365,8 +365,8 @@  discard block
 block discarded – undo
365 365
 	 * @param        string $tm_format - string representation of time format defaults to 'g:i a'
366 366
 	 * @return        mixed        string on success, FALSE on fail
367 367
 	 */
368
-	public function start_time( $tm_format = NULL ) {
369
-		return $this->_show_datetime( 'T', 'start', NULL, $tm_format );
368
+	public function start_time($tm_format = NULL) {
369
+		return $this->_show_datetime('T', 'start', NULL, $tm_format);
370 370
 	}
371 371
 
372 372
 
@@ -374,8 +374,8 @@  discard block
 block discarded – undo
374 374
 	/**
375 375
 	 * @param null $tm_format
376 376
 	 */
377
-	public function e_start_time( $tm_format = NULL ) {
378
-		$this->_show_datetime( 'T', 'start', NULL, $tm_format, TRUE );
377
+	public function e_start_time($tm_format = NULL) {
378
+		$this->_show_datetime('T', 'start', NULL, $tm_format, TRUE);
379 379
 	}
380 380
 
381 381
 
@@ -386,8 +386,8 @@  discard block
 block discarded – undo
386 386
 	 * @param        string $tm_format - string representation of time format defaults to 'g:i a'
387 387
 	 * @return        mixed        string on success, FALSE on fail
388 388
 	 */
389
-	public function end_time( $tm_format = NULL ) {
390
-		return $this->_show_datetime( 'T', 'end', NULL, $tm_format );
389
+	public function end_time($tm_format = NULL) {
390
+		return $this->_show_datetime('T', 'end', NULL, $tm_format);
391 391
 	}
392 392
 
393 393
 
@@ -395,8 +395,8 @@  discard block
 block discarded – undo
395 395
 	/**
396 396
 	 * @param null $tm_format
397 397
 	 */
398
-	public function e_end_time( $tm_format = NULL ) {
399
-		$this->_show_datetime( 'T', 'end', NULL, $tm_format, TRUE );
398
+	public function e_end_time($tm_format = NULL) {
399
+		$this->_show_datetime('T', 'end', NULL, $tm_format, TRUE);
400 400
 	}
401 401
 
402 402
 
@@ -411,11 +411,11 @@  discard block
 block discarded – undo
411 411
 	 * @return mixed              string on success, FALSE on fail
412 412
 	 * @throws \EE_Error
413 413
 	 */
414
-	public function time_range( $tm_format = null, $conjunction = ' - ' ) {
415
-		$tm_format = !empty( $tm_format ) ? $tm_format : $this->_tm_frmt;
416
-		$start = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_start', $tm_format ) );
417
-		$end = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_end',  $tm_format ) );
418
-		return $start !== $end ? $start . $conjunction . $end : $start;
414
+	public function time_range($tm_format = null, $conjunction = ' - ') {
415
+		$tm_format = ! empty($tm_format) ? $tm_format : $this->_tm_frmt;
416
+		$start = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_start', $tm_format));
417
+		$end = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_end', $tm_format));
418
+		return $start !== $end ? $start.$conjunction.$end : $start;
419 419
 	}
420 420
 
421 421
 
@@ -425,8 +425,8 @@  discard block
 block discarded – undo
425 425
 	 * @param string $conjunction
426 426
 	 * @throws \EE_Error
427 427
 	 */
428
-	public function e_time_range( $tm_format = NULL, $conjunction = ' - ' ) {
429
-		echo $this->time_range( $tm_format, $conjunction );
428
+	public function e_time_range($tm_format = NULL, $conjunction = ' - ') {
429
+		echo $this->time_range($tm_format, $conjunction);
430 430
 	}
431 431
 
432 432
 
@@ -442,28 +442,28 @@  discard block
 block discarded – undo
442 442
 	 * @return string
443 443
 	 * @throws \EE_Error
444 444
 	 */
445
-	public function date_and_time_range( $dt_format = '', $tm_format = '', $conjunction = ' - '  ) {
446
-		$dt_format = ! empty( $dt_format ) ? $dt_format : $this->_dt_frmt;
447
-		$tm_format = ! empty( $tm_format ) ? $tm_format : $this->_tm_frmt;
448
-		$full_format = $dt_format . ' ' . $tm_format;
445
+	public function date_and_time_range($dt_format = '', $tm_format = '', $conjunction = ' - ') {
446
+		$dt_format = ! empty($dt_format) ? $dt_format : $this->_dt_frmt;
447
+		$tm_format = ! empty($tm_format) ? $tm_format : $this->_tm_frmt;
448
+		$full_format = $dt_format.' '.$tm_format;
449 449
 
450 450
 		//the range output depends on various conditions
451
-		switch ( true ) {
451
+		switch (true) {
452 452
 			//start date timestamp and end date timestamp are the same.
453
-			case ( $this->get_raw( 'DTT_EVT_start' ) === $this->get_raw( 'DTT_EVT_end' ) ) :
454
-				$output = $this->get_i18n_datetime( 'DTT_EVT_start', $full_format );
453
+			case ($this->get_raw('DTT_EVT_start') === $this->get_raw('DTT_EVT_end')) :
454
+				$output = $this->get_i18n_datetime('DTT_EVT_start', $full_format);
455 455
 				break;
456 456
 			//start and end date are the same but times are different
457
-			case ( $this->start_date() === $this->end_date() ) :
458
-				$output = $this->get_i18n_datetime( 'DTT_EVT_start', $full_format )
457
+			case ($this->start_date() === $this->end_date()) :
458
+				$output = $this->get_i18n_datetime('DTT_EVT_start', $full_format)
459 459
 				          . $conjunction
460
-				          . $this->get_i18n_datetime( 'DTT_EVT_end', $tm_format );
460
+				          . $this->get_i18n_datetime('DTT_EVT_end', $tm_format);
461 461
 				break;
462 462
 			//all other conditions
463 463
 			default :
464
-				$output = $this->get_i18n_datetime( 'DTT_EVT_start', $full_format )
464
+				$output = $this->get_i18n_datetime('DTT_EVT_start', $full_format)
465 465
 				          . $conjunction
466
-				          . $this->get_i18n_datetime( 'DTT_EVT_end', $full_format );
466
+				          . $this->get_i18n_datetime('DTT_EVT_end', $full_format);
467 467
 				break;
468 468
 		}
469 469
 		return $output;
@@ -481,8 +481,8 @@  discard block
 block discarded – undo
481 481
 	 * @return void
482 482
 	 * @throws \EE_Error
483 483
 	 */
484
-	public function e_date_and_time_range( $dt_format = '', $tm_format = '', $conjunction = ' - ' ) {
485
-		echo $this->date_and_time_range( $dt_format, $tm_format, $conjunction );
484
+	public function e_date_and_time_range($dt_format = '', $tm_format = '', $conjunction = ' - ') {
485
+		echo $this->date_and_time_range($dt_format, $tm_format, $conjunction);
486 486
 	}
487 487
 
488 488
 
@@ -494,8 +494,8 @@  discard block
 block discarded – undo
494 494
 	 * @param 	string 	$tm_format - string representation of time format defaults to 'g:i a'
495 495
 	 * @return 	mixed 	string on success, FALSE on fail
496 496
 	 */
497
-	public function start_date_and_time( $dt_format = NULL, $tm_format = NULL ) {
498
-		return $this->_show_datetime( '', 'start', $dt_format, $tm_format );
497
+	public function start_date_and_time($dt_format = NULL, $tm_format = NULL) {
498
+		return $this->_show_datetime('', 'start', $dt_format, $tm_format);
499 499
 	}
500 500
 
501 501
 
@@ -504,8 +504,8 @@  discard block
 block discarded – undo
504 504
 	 * @param null $dt_frmt
505 505
 	 * @param null $tm_format
506 506
 	 */
507
-	public function e_start_date_and_time( $dt_frmt = NULL, $tm_format = NULL ) {
508
-		$this->_show_datetime( '', 'start', $dt_frmt, $tm_format, TRUE );
507
+	public function e_start_date_and_time($dt_frmt = NULL, $tm_format = NULL) {
508
+		$this->_show_datetime('', 'start', $dt_frmt, $tm_format, TRUE);
509 509
 	}
510 510
 
511 511
 
@@ -519,11 +519,11 @@  discard block
 block discarded – undo
519 519
 	 * @param bool   $round_up
520 520
 	 * @return float|int|mixed
521 521
 	 */
522
-	public function length( $units = 'seconds', $round_up = FALSE ) {
523
-		$start = $this->get_raw( 'DTT_EVT_start' );
524
-		$end = $this->get_raw( 'DTT_EVT_end' );
522
+	public function length($units = 'seconds', $round_up = FALSE) {
523
+		$start = $this->get_raw('DTT_EVT_start');
524
+		$end = $this->get_raw('DTT_EVT_end');
525 525
 		$length_in_units = $end - $start;
526
-		switch ( $units ) {
526
+		switch ($units) {
527 527
 			//NOTE: We purposefully don't use "break;" in order to chain the divisions
528 528
 			/** @noinspection PhpMissingBreakStatementInspection */
529 529
 			case 'days':
@@ -536,10 +536,10 @@  discard block
 block discarded – undo
536 536
 				$length_in_units /= 60;
537 537
 			case 'seconds':
538 538
 			default:
539
-				$length_in_units = ceil( $length_in_units );
539
+				$length_in_units = ceil($length_in_units);
540 540
 		}
541
-		if ( $round_up ) {
542
-			$length_in_units = max( $length_in_units, 1 );
541
+		if ($round_up) {
542
+			$length_in_units = max($length_in_units, 1);
543 543
 		}
544 544
 		return $length_in_units;
545 545
 	}
@@ -553,8 +553,8 @@  discard block
 block discarded – undo
553 553
 	 * @param bool | string 	$tm_format - string representation of time format defaults to 'g:i a'
554 554
 	 * @return 	mixed        		string on success, FALSE on fail
555 555
 	 */
556
-	public function end_date_and_time( $dt_frmt = FALSE, $tm_format = FALSE ) {
557
-		return $this->_show_datetime( '', 'end', $dt_frmt, $tm_format );
556
+	public function end_date_and_time($dt_frmt = FALSE, $tm_format = FALSE) {
557
+		return $this->_show_datetime('', 'end', $dt_frmt, $tm_format);
558 558
 	}
559 559
 
560 560
 
@@ -563,8 +563,8 @@  discard block
 block discarded – undo
563 563
 	 * @param bool $dt_frmt
564 564
 	 * @param bool $tm_format
565 565
 	 */
566
-	public function e_end_date_and_time( $dt_frmt = FALSE, $tm_format = FALSE ) {
567
-		$this->_show_datetime( '', 'end', $dt_frmt, $tm_format, TRUE );
566
+	public function e_end_date_and_time($dt_frmt = FALSE, $tm_format = FALSE) {
567
+		$this->_show_datetime('', 'end', $dt_frmt, $tm_format, TRUE);
568 568
 	}
569 569
 
570 570
 
@@ -575,7 +575,7 @@  discard block
 block discarded – undo
575 575
 	 * @return        int
576 576
 	 */
577 577
 	public function start() {
578
-		return $this->get_raw( 'DTT_EVT_start' );
578
+		return $this->get_raw('DTT_EVT_start');
579 579
 	}
580 580
 
581 581
 
@@ -586,7 +586,7 @@  discard block
 block discarded – undo
586 586
 	 * @return        int
587 587
 	 */
588 588
 	public function end() {
589
-		return $this->get_raw( 'DTT_EVT_end' );
589
+		return $this->get_raw('DTT_EVT_end');
590 590
 	}
591 591
 
592 592
 
@@ -597,7 +597,7 @@  discard block
 block discarded – undo
597 597
 	 * @return        mixed        int on success, FALSE on fail
598 598
 	 */
599 599
 	public function reg_limit() {
600
-		return $this->get_raw( 'DTT_reg_limit' );
600
+		return $this->get_raw('DTT_reg_limit');
601 601
 	}
602 602
 
603 603
 
@@ -608,7 +608,7 @@  discard block
 block discarded – undo
608 608
 	 * @return        mixed        int on success, FALSE on fail
609 609
 	 */
610 610
 	public function sold() {
611
-		return $this->get_raw( 'DTT_sold' );
611
+		return $this->get_raw('DTT_sold');
612 612
 	}
613 613
 
614 614
 
@@ -636,15 +636,15 @@  discard block
 block discarded – undo
636 636
 	 * 																	the spaces remaining for this particular datetime, hence the flag.
637 637
 	 * @return 	int
638 638
 	 */
639
-	public function spaces_remaining( $consider_tickets = FALSE ) {
639
+	public function spaces_remaining($consider_tickets = FALSE) {
640 640
 		// tickets remaining available for purchase
641 641
 		//no need for special checks for infinite, because if DTT_reg_limit == EE_INF, then EE_INF - x = EE_INF
642 642
 		$dtt_remaining = $this->reg_limit() - $this->sold();
643
-		if ( ! $consider_tickets ) {
643
+		if ( ! $consider_tickets) {
644 644
 			return $dtt_remaining;
645 645
 		}
646 646
 		$tickets_remaining = $this->tickets_remaining();
647
-		return min( $dtt_remaining, $tickets_remaining );
647
+		return min($dtt_remaining, $tickets_remaining);
648 648
 	}
649 649
 
650 650
 
@@ -655,19 +655,19 @@  discard block
 block discarded – undo
655 655
 	 * @param array $query_params like EEM_Base::get_all's
656 656
 	 * @return int
657 657
 	 */
658
-	public function tickets_remaining( $query_params = array() ) {
658
+	public function tickets_remaining($query_params = array()) {
659 659
 		$sum = 0;
660
-		$tickets = $this->tickets( $query_params );
661
-		if ( ! empty( $tickets ) ) {
662
-			foreach ( $tickets as $ticket ) {
663
-				if ( $ticket instanceof EE_Ticket ) {
660
+		$tickets = $this->tickets($query_params);
661
+		if ( ! empty($tickets)) {
662
+			foreach ($tickets as $ticket) {
663
+				if ($ticket instanceof EE_Ticket) {
664 664
 					// get the actual amount of tickets that can be sold
665
-					$qty = $ticket->qty( 'saleable' );
666
-					if ( $qty === EE_INF ) {
665
+					$qty = $ticket->qty('saleable');
666
+					if ($qty === EE_INF) {
667 667
 						return EE_INF;
668 668
 					}
669 669
 					// no negative ticket quantities plz
670
-					if ( $qty > 0 ) {
670
+					if ($qty > 0) {
671 671
 						$sum += $qty;
672 672
 					}
673 673
 				}
@@ -684,8 +684,8 @@  discard block
 block discarded – undo
684 684
 	 * @param array $query_params like EEM_Base::get_all's
685 685
 	 * @return int
686 686
 	 */
687
-	public function sum_tickets_initially_available( $query_params = array() ) {
688
-		return $this->sum_related( 'Ticket', $query_params, 'TKT_qty' );
687
+	public function sum_tickets_initially_available($query_params = array()) {
688
+		return $this->sum_related('Ticket', $query_params, 'TKT_qty');
689 689
 	}
690 690
 
691 691
 
@@ -697,7 +697,7 @@  discard block
 block discarded – undo
697 697
 	 * @return int
698 698
 	 */
699 699
 	public function total_tickets_available_at_this_datetime() {
700
-		return $this->spaces_remaining( true );
700
+		return $this->spaces_remaining(true);
701 701
 	}
702 702
 
703 703
 
@@ -708,7 +708,7 @@  discard block
 block discarded – undo
708 708
 	 * @return boolean
709 709
 	 */
710 710
 	public function is_upcoming() {
711
-		return ( $this->get_raw( 'DTT_EVT_start' ) > time() );
711
+		return ($this->get_raw('DTT_EVT_start') > time());
712 712
 	}
713 713
 
714 714
 
@@ -718,7 +718,7 @@  discard block
 block discarded – undo
718 718
 	 * @return boolean
719 719
 	 */
720 720
 	public function is_active() {
721
-		return ( $this->get_raw( 'DTT_EVT_start' ) < time() && $this->get_raw( 'DTT_EVT_end' ) > time() );
721
+		return ($this->get_raw('DTT_EVT_start') < time() && $this->get_raw('DTT_EVT_end') > time());
722 722
 	}
723 723
 
724 724
 
@@ -728,7 +728,7 @@  discard block
 block discarded – undo
728 728
 	 * @return boolean
729 729
 	 */
730 730
 	public function is_expired() {
731
-		return ( $this->get_raw( 'DTT_EVT_end' ) < time() );
731
+		return ($this->get_raw('DTT_EVT_end') < time());
732 732
 	}
733 733
 
734 734
 
@@ -739,16 +739,16 @@  discard block
 block discarded – undo
739 739
 	 */
740 740
 	public function get_active_status() {
741 741
 		$total_tickets_for_this_dtt = $this->total_tickets_available_at_this_datetime();
742
-		if ( $total_tickets_for_this_dtt !== FALSE && $total_tickets_for_this_dtt < 1 ) {
742
+		if ($total_tickets_for_this_dtt !== FALSE && $total_tickets_for_this_dtt < 1) {
743 743
 			return EE_Datetime::sold_out;
744 744
 		}
745
-		if ( $this->is_expired() ) {
745
+		if ($this->is_expired()) {
746 746
 			return EE_Datetime::expired;
747 747
 		}
748
-		if ( $this->is_upcoming() ) {
748
+		if ($this->is_upcoming()) {
749 749
 			return EE_Datetime::upcoming;
750 750
 		}
751
-		if ( $this->is_active() ) {
751
+		if ($this->is_active()) {
752 752
 			return EE_Datetime::active;
753 753
 		}
754 754
 		return NULL;
@@ -762,24 +762,24 @@  discard block
 block discarded – undo
762 762
 	 * @param  boolean $use_dtt_name if TRUE then we'll use DTT->name() if its not empty.
763 763
 	 * @return string
764 764
 	 */
765
-	public function get_dtt_display_name( $use_dtt_name = FALSE ) {
766
-		if ( $use_dtt_name ) {
765
+	public function get_dtt_display_name($use_dtt_name = FALSE) {
766
+		if ($use_dtt_name) {
767 767
 			$dtt_name = $this->name();
768
-			if ( !empty( $dtt_name ) ) {
768
+			if ( ! empty($dtt_name)) {
769 769
 				return $dtt_name;
770 770
 			}
771 771
 		}
772 772
 		//first condition is to see if the months are different
773
-		if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) ) {
774
-			$display_date = $this->start_date( 'M j\, Y g:i a' ) . ' - ' . $this->end_date( 'M j\, Y g:i a' );
773
+		if (date('m', $this->get_raw('DTT_EVT_start')) != date('m', $this->get_raw('DTT_EVT_end'))) {
774
+			$display_date = $this->start_date('M j\, Y g:i a').' - '.$this->end_date('M j\, Y g:i a');
775 775
 			//next condition is if its the same month but different day
776 776
 		}
777 777
 		else {
778
-			if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) == date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) && date( 'd', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'd', $this->get_raw( 'DTT_EVT_end' ) ) ) {
779
-				$display_date = $this->start_date( 'M j\, g:i a' ) . ' - ' . $this->end_date( 'M j\, g:i a Y' );
778
+			if (date('m', $this->get_raw('DTT_EVT_start')) == date('m', $this->get_raw('DTT_EVT_end')) && date('d', $this->get_raw('DTT_EVT_start')) != date('d', $this->get_raw('DTT_EVT_end'))) {
779
+				$display_date = $this->start_date('M j\, g:i a').' - '.$this->end_date('M j\, g:i a Y');
780 780
 			}
781 781
 			else {
782
-				$display_date = $this->start_date( 'F j\, Y' ) . ' @ ' . $this->start_date( 'g:i a' ) . ' - ' . $this->end_date( 'g:i a' );
782
+				$display_date = $this->start_date('F j\, Y').' @ '.$this->start_date('g:i a').' - '.$this->end_date('g:i a');
783 783
 			}
784 784
 		}
785 785
 		return $display_date;
@@ -793,8 +793,8 @@  discard block
 block discarded – undo
793 793
 *@param array $query_params see EEM_Base::get_all()
794 794
 	 * @return EE_Ticket[]
795 795
 	 */
796
-	public function tickets( $query_params = array() ) {
797
-		return $this->get_many_related( 'Ticket', $query_params );
796
+	public function tickets($query_params = array()) {
797
+		return $this->get_many_related('Ticket', $query_params);
798 798
 	}
799 799
 
800 800
 
@@ -804,21 +804,21 @@  discard block
 block discarded – undo
804 804
 	 * @param array $query_params like EEM_Base::get_all's
805 805
 	 * @return EE_Ticket[]
806 806
 	 */
807
-	public function ticket_types_available_for_purchase( $query_params = array() ) {
807
+	public function ticket_types_available_for_purchase($query_params = array()) {
808 808
 		// first check if datetime is valid
809
-		if ( ! ( $this->is_upcoming() || $this->is_active() ) || $this->sold_out() ) {
809
+		if ( ! ($this->is_upcoming() || $this->is_active()) || $this->sold_out()) {
810 810
 			return array();
811 811
 		}
812
-		if ( empty( $query_params ) ) {
812
+		if (empty($query_params)) {
813 813
 			$query_params = array(
814 814
 				array(
815
-					'TKT_start_date' => array( '<=', EEM_Ticket::instance()->current_time_for_query( 'TKT_start_date' ) ),
816
-					'TKT_end_date'   => array( '>=', EEM_Ticket::instance()->current_time_for_query( 'TKT_end_date' ) ),
815
+					'TKT_start_date' => array('<=', EEM_Ticket::instance()->current_time_for_query('TKT_start_date')),
816
+					'TKT_end_date'   => array('>=', EEM_Ticket::instance()->current_time_for_query('TKT_end_date')),
817 817
 					'TKT_deleted'    => false
818 818
 				)
819 819
 			);
820 820
 		}
821
-		return $this->tickets( $query_params );
821
+		return $this->tickets($query_params);
822 822
 	}
823 823
 
824 824
 
@@ -828,7 +828,7 @@  discard block
 block discarded – undo
828 828
 	 * @return EE_Event
829 829
 	 */
830 830
 	public function event() {
831
-		return $this->get_first_related( 'Event' );
831
+		return $this->get_first_related('Event');
832 832
 	}
833 833
 
834 834
 
@@ -840,13 +840,13 @@  discard block
 block discarded – undo
840 840
 	 */
841 841
 	public function update_sold() {
842 842
 		$count_regs_for_this_datetime = EEM_Registration::instance()->count(
843
-			array( array(
843
+			array(array(
844 844
 				'STS_ID' 					=> EEM_Registration::status_id_approved,
845 845
 				'REG_deleted' 				=> 0,
846 846
 				'Ticket.Datetime.DTT_ID' 	=> $this->ID(),
847
-			) )
847
+			))
848 848
 		);
849
-		$this->set( 'DTT_sold', $count_regs_for_this_datetime );
849
+		$this->set('DTT_sold', $count_regs_for_this_datetime);
850 850
 		$this->save();
851 851
 		return $count_regs_for_this_datetime;
852 852
 	}
Please login to merge, or discard this patch.
core/db_classes/EE_Event_Message_Template.class.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -22,9 +22,9 @@  discard block
 block discarded – undo
22 22
 	 * @param null  $timezone
23 23
 	 * @return EE_Event_Message_Template|mixed
24 24
 	 */
25
-	public static function new_instance( $props_n_values = array(), $timezone = NULL ) {
26
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone );
27
-		return $has_object ? $has_object : new self( $props_n_values, FALSE, $timezone );
25
+	public static function new_instance($props_n_values = array(), $timezone = NULL) {
26
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone);
27
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone);
28 28
 	}
29 29
 
30 30
 
@@ -34,8 +34,8 @@  discard block
 block discarded – undo
34 34
 	 * @param null  $timezone
35 35
 	 * @return EE_Event_Message_Template
36 36
 	 */
37
-	public static function new_instance_from_db ( $props_n_values = array(), $timezone = NULL ) {
38
-		return new self( $props_n_values, TRUE, $timezone );
37
+	public static function new_instance_from_db($props_n_values = array(), $timezone = NULL) {
38
+		return new self($props_n_values, TRUE, $timezone);
39 39
 	}
40 40
 
41 41
 }
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_classes/EE_Event_Question_Group.class.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,18 +1,18 @@  discard block
 block discarded – undo
1
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
2
-	exit( 'No direct script access allowed' );
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3 3
 }
4 4
 /**
5 5
  * Required  by EEM_Event_Question_Group in case someone queries for all its model objects
6 6
  */
7
-class EE_Event_Question_Group extends EE_Base_Class{
7
+class EE_Event_Question_Group extends EE_Base_Class {
8 8
 
9 9
 	/**
10 10
 	 * @param array $props_n_values
11 11
 	 * @return EE_Event_Question_Group|mixed
12 12
 	 */
13
-	public static function new_instance( $props_n_values = array() ) {
14
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
15
-		return $has_object ? $has_object : new self( $props_n_values);
13
+	public static function new_instance($props_n_values = array()) {
14
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
15
+		return $has_object ? $has_object : new self($props_n_values);
16 16
 	}
17 17
 
18 18
 
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 	 * @param array $props_n_values
22 22
 	 * @return EE_Event_Question_Group
23 23
 	 */
24
-	public static function new_instance_from_db ( $props_n_values = array() ) {
25
-		return new self( $props_n_values, TRUE );
24
+	public static function new_instance_from_db($props_n_values = array()) {
25
+		return new self($props_n_values, TRUE);
26 26
 	}
27 27
 }
28 28
\ No newline at end of file
Please login to merge, or discard this patch.
core/db_classes/EE_Event_Venue.class.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -2,15 +2,15 @@  discard block
 block discarded – undo
2 2
 /**
3 3
  * Required  by EEM_Event_Question_Group in case someone queries for all its model objects
4 4
  */
5
-class EE_Event_Venue extends EE_Base_Class{
5
+class EE_Event_Venue extends EE_Base_Class {
6 6
 
7 7
 	/**
8 8
 	 * @param array $props_n_values
9 9
 	 * @return EE_Event_Venue|mixed
10 10
 	 */
11
-	public static function new_instance( $props_n_values = array() ) {
12
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
13
-		return $has_object ? $has_object : new self( $props_n_values);
11
+	public static function new_instance($props_n_values = array()) {
12
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
13
+		return $has_object ? $has_object : new self($props_n_values);
14 14
 	}
15 15
 
16 16
 
@@ -19,8 +19,8 @@  discard block
 block discarded – undo
19 19
 	 * @param array $props_n_values
20 20
 	 * @return EE_Event_Venue
21 21
 	 */
22
-	public static function new_instance_from_db ( $props_n_values = array() ) {
23
-		return new self( $props_n_values, TRUE );
22
+	public static function new_instance_from_db($props_n_values = array()) {
23
+		return new self($props_n_values, TRUE);
24 24
 	}
25 25
 
26 26
 }
27 27
\ No newline at end of file
Please login to merge, or discard this patch.
core/db_classes/EE_Extra_Meta.class.php 2 patches
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
2
-	exit( 'No direct script access allowed' );
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3 3
 }
4 4
 /**
5 5
  * Event Espresso
@@ -30,9 +30,9 @@  discard block
 block discarded – undo
30 30
 	 * @param array $props_n_values
31 31
 	 * @return EE_Extra_Meta|mixed
32 32
 	 */
33
-	public static function new_instance( $props_n_values = array() ) {
34
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
35
-		return $has_object ? $has_object : new self( $props_n_values );
33
+	public static function new_instance($props_n_values = array()) {
34
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
35
+		return $has_object ? $has_object : new self($props_n_values);
36 36
 	}
37 37
 
38 38
 
@@ -41,8 +41,8 @@  discard block
 block discarded – undo
41 41
 	 * @param array $props_n_values
42 42
 	 * @return EE_Extra_Meta
43 43
 	 */
44
-	public static function new_instance_from_db( $props_n_values = array() ) {
45
-		return new self( $props_n_values, TRUE );
44
+	public static function new_instance_from_db($props_n_values = array()) {
45
+		return new self($props_n_values, TRUE);
46 46
 	}
47 47
 
48 48
 
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 	 * @return int
53 53
 	 */
54 54
 	function FK_ID() {
55
-		return $this->get( 'FK_ID' );
55
+		return $this->get('FK_ID');
56 56
 	}
57 57
 
58 58
 
@@ -62,8 +62,8 @@  discard block
 block discarded – undo
62 62
 	 * @param int $FK_ID
63 63
 	 * @return boolean
64 64
 	 */
65
-	function set_FK_ID( $FK_ID ) {
66
-		$this->set( 'FK_ID', $FK_ID );
65
+	function set_FK_ID($FK_ID) {
66
+		$this->set('FK_ID', $FK_ID);
67 67
 	}
68 68
 
69 69
 
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 	 * @return string
74 74
 	 */
75 75
 	function model() {
76
-		return $this->get( 'EXM_model' );
76
+		return $this->get('EXM_model');
77 77
 	}
78 78
 
79 79
 
@@ -83,8 +83,8 @@  discard block
 block discarded – undo
83 83
 	 * @param string $model
84 84
 	 * @return boolean
85 85
 	 */
86
-	function set_model( $model ) {
87
-		$this->set( 'EXM_model', $model );
86
+	function set_model($model) {
87
+		$this->set('EXM_model', $model);
88 88
 	}
89 89
 
90 90
 
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 	 * @return string
95 95
 	 */
96 96
 	function key() {
97
-		return $this->get( 'EXM_key' );
97
+		return $this->get('EXM_key');
98 98
 	}
99 99
 
100 100
 
@@ -104,8 +104,8 @@  discard block
 block discarded – undo
104 104
 	 * @param string $key
105 105
 	 * @return boolean
106 106
 	 */
107
-	function set_key( $key ) {
108
-		$this->set( 'EXM_key', $key );
107
+	function set_key($key) {
108
+		$this->set('EXM_key', $key);
109 109
 	}
110 110
 
111 111
 
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 	 * @return string
116 116
 	 */
117 117
 	function value() {
118
-		return $this->get( 'EXM_value' );
118
+		return $this->get('EXM_value');
119 119
 	}
120 120
 
121 121
 
@@ -125,8 +125,8 @@  discard block
 block discarded – undo
125 125
 	 * @param string $value
126 126
 	 * @return boolean
127 127
 	 */
128
-	function set_value( $value ) {
129
-		$this->set( 'EXM_value', $value );
128
+	function set_value($value) {
129
+		$this->set('EXM_value', $value);
130 130
 	}
131 131
 
132 132
 
Please login to merge, or discard this patch.
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 	/**
61 61
 	 * Sets meta_id
62 62
 	 * @param int $meta_id
63
-	 * @return boolean
63
+	 * @return boolean|null
64 64
 	 */
65 65
 	function set_meta_id( $meta_id) {
66 66
 		return $this->set( 'meta_id', $meta_id);
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 	/**
79 79
 	 * Sets post_id
80 80
 	 * @param int $post_id
81
-	 * @return boolean
81
+	 * @return boolean|null
82 82
 	 */
83 83
 	function set_post_id( $post_id) {
84 84
 		return $this->set( 'post_id', $post_id);
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 	/**
97 97
 	 * Sets meta_key
98 98
 	 * @param string $meta_key
99
-	 * @return boolean
99
+	 * @return boolean|null
100 100
 	 */
101 101
 	function set_meta_key( $meta_key) {
102 102
 		return $this->set( 'meta_key', $meta_key);
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 	/**
115 115
 	 * Sets meta_value
116 116
 	 * @param mixed $meta_value
117
-	 * @return boolean
117
+	 * @return boolean|null
118 118
 	 */
119 119
 	function set_meta_value( $meta_value) {
120 120
 		return $this->set( 'meta_value', $meta_value);
Please login to merge, or discard this patch.