Completed
Branch BUG-9583-fix-fetching-term-rel... (646110)
by
unknown
43:11 queued 32:33
created
core/data_migration_scripts/EE_DMS_Core_4_5_0.dms.php 2 patches
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,11 +42,11 @@
 block discarded – undo
42 42
 		if($version_string <= '4.5.0' && $version_string >= '4.3.0' ){
43 43
 //			echo "$version_string can be migrated from";
44 44
 			return true;
45
-		}elseif( ! $version_string ){
45
+		} elseif( ! $version_string ){
46 46
 //			echo "no version string provided: $version_string";
47 47
 			//no version string provided... this must be pre 4.3
48 48
 			return false;//changed mind. dont want people thinking they should migrate yet because they cant
49
-		}else{
49
+		} else{
50 50
 //			echo "$version_string doesnt apply";
51 51
 			return false;
52 52
 		}
Please login to merge, or discard this patch.
Spacing   +72 added lines, -72 removed lines patch added patch discarded remove patch
@@ -12,16 +12,16 @@  discard block
 block discarded – undo
12 12
 //(all other times it gets resurrected from a wordpress option)
13 13
 $stages = glob(EE_CORE.'data_migration_scripts/4_5_0_stages/*');
14 14
 $class_to_filepath = array();
15
-foreach($stages as $filepath){
15
+foreach ($stages as $filepath) {
16 16
 	$matches = array();
17
-	preg_match('~4_5_0_stages/(.*).dmsstage.php~',$filepath,$matches);
17
+	preg_match('~4_5_0_stages/(.*).dmsstage.php~', $filepath, $matches);
18 18
 	$class_to_filepath[$matches[1]] = $filepath;
19 19
 }
20 20
 //give addons a chance to autoload their stages too
21
-$class_to_filepath = apply_filters('FHEE__EE_DMS_4_5_0__autoloaded_stages',$class_to_filepath);
21
+$class_to_filepath = apply_filters('FHEE__EE_DMS_4_5_0__autoloaded_stages', $class_to_filepath);
22 22
 EEH_Autoloader::register_autoloader($class_to_filepath);
23 23
 
24
-class EE_DMS_Core_4_5_0 extends EE_Data_Migration_Script_Base{
24
+class EE_DMS_Core_4_5_0 extends EE_Data_Migration_Script_Base {
25 25
 
26 26
 
27 27
 
@@ -39,14 +39,14 @@  discard block
 block discarded – undo
39 39
 	}
40 40
 	public function can_migrate_from_version($version_array) {
41 41
 		$version_string = $version_array['Core'];
42
-		if($version_string <= '4.5.0' && $version_string >= '4.3.0' ){
42
+		if ($version_string <= '4.5.0' && $version_string >= '4.3.0') {
43 43
 //			echo "$version_string can be migrated from";
44 44
 			return true;
45
-		}elseif( ! $version_string ){
45
+		}elseif ( ! $version_string) {
46 46
 //			echo "no version string provided: $version_string";
47 47
 			//no version string provided... this must be pre 4.3
48
-			return false;//changed mind. dont want people thinking they should migrate yet because they cant
49
-		}else{
48
+			return false; //changed mind. dont want people thinking they should migrate yet because they cant
49
+		} else {
50 50
 //			echo "$version_string doesnt apply";
51 51
 			return false;
52 52
 		}
@@ -56,14 +56,14 @@  discard block
 block discarded – undo
56 56
 	}
57 57
 	public function schema_changes_before_migration() {
58 58
 		//relies on 4.1's EEH_Activation::create_table
59
-		require_once( EE_HELPERS . 'EEH_Activation.helper.php' );
60
-		$table_name='esp_answer';
61
-		$sql=" ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
59
+		require_once(EE_HELPERS.'EEH_Activation.helper.php');
60
+		$table_name = 'esp_answer';
61
+		$sql = " ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
62 62
 					REG_ID INT UNSIGNED NOT NULL,
63 63
 					QST_ID INT UNSIGNED NOT NULL,
64 64
 					ANS_value TEXT NOT NULL,
65 65
 					PRIMARY KEY  (ANS_ID)";
66
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
66
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
67 67
 
68 68
 		$table_name = 'esp_attendee_meta';
69 69
 		$sql = "ATTM_ID INT(10) UNSIGNED NOT	NULL AUTO_INCREMENT,
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 					  CNT_is_EU TINYINT(1) DEFAULT '0',
103 103
 					  CNT_active TINYINT(1) DEFAULT '0',
104 104
 					  PRIMARY KEY  (CNT_ISO)";
105
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
105
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
106 106
 
107 107
 		$table_name = 'esp_datetime';
108 108
 		$sql = "DTT_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 
124 124
 
125 125
 
126
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
126
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
127 127
 		$table_name = 'esp_event_meta';
128 128
 		$sql = "
129 129
 			EVTM_ID INT NOT NULL AUTO_INCREMENT,
@@ -140,41 +140,41 @@  discard block
 block discarded – undo
140 140
 			EVT_external_URL VARCHAR(200) NULL,
141 141
 			EVT_donations TINYINT(1) NULL,
142 142
 			PRIMARY KEY  (EVTM_ID)";
143
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
143
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
144 144
 
145 145
 
146 146
 
147
-		$table_name='esp_event_question_group';
148
-		$sql="EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
147
+		$table_name = 'esp_event_question_group';
148
+		$sql = "EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
149 149
 					EVT_ID BIGINT(20) UNSIGNED NOT NULL,
150 150
 					QSG_ID INT UNSIGNED NOT NULL,
151 151
 					EQG_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
152 152
 					PRIMARY KEY  (EQG_ID)";
153
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
153
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
154 154
 
155 155
 
156 156
 
157
-		$table_name='esp_event_venue';
158
-		$sql="EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
157
+		$table_name = 'esp_event_venue';
158
+		$sql = "EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
159 159
 				EVT_ID BIGINT(20) UNSIGNED NOT NULL,
160 160
 				VNU_ID BIGINT(20) UNSIGNED NOT NULL,
161 161
 				EVV_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
162 162
 				PRIMARY KEY  (EVV_ID)";
163
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
163
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
164 164
 
165 165
 
166 166
 
167
-		$table_name='esp_extra_meta';
168
-		$sql="EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
167
+		$table_name = 'esp_extra_meta';
168
+		$sql = "EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
169 169
 				OBJ_ID INT(11) DEFAULT NULL,
170 170
 				EXM_type VARCHAR(45) DEFAULT NULL,
171 171
 				EXM_key VARCHAR(45) DEFAULT NULL,
172 172
 				EXM_value TEXT,
173 173
 				PRIMARY KEY  (EXM_ID)";
174
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
174
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
175 175
 
176
-		$table_name='esp_line_item';
177
-		$sql="LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
176
+		$table_name = 'esp_line_item';
177
+		$sql = "LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
178 178
 				LIN_code VARCHAR(245) NOT NULL DEFAULT '',
179 179
 				TXN_ID INT(11) DEFAULT NULL,
180 180
 				LIN_name VARCHAR(245) NOT NULL DEFAULT '',
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 				OBJ_ID INT(11) DEFAULT NULL,
191 191
 				OBJ_type VARCHAR(45)DEFAULT NULL,
192 192
 				PRIMARY KEY  (LIN_ID)";
193
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB' );
193
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
194 194
 
195 195
 		$table_name = 'esp_message_template';
196 196
 		$sql = "MTP_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 					KEY GRP_ID (GRP_ID)";
203 203
 		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
204 204
 
205
-		EEH_Activation::drop_index( 'esp_message_template_group', 'EVT_ID' );
205
+		EEH_Activation::drop_index('esp_message_template_group', 'EVT_ID');
206 206
 
207 207
 		$table_name = 'esp_message_template_group';
208 208
 		$sql = "GRP_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
 					MTP_is_active TINYINT(1) NOT NULL DEFAULT '1',
218 218
 					PRIMARY KEY  (GRP_ID),
219 219
 					KEY MTP_user_id (MTP_user_id)";
220
-		$this->_table_should_exist_previously( $table_name, $sql, 'ENGINE=InnoDB');
220
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
221 221
 
222 222
 		$table_name = 'esp_event_message_template';
223 223
 		$sql = "EMT_ID BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 					PRIMARY KEY  (EMT_ID),
227 227
 					KEY EVT_ID (EVT_ID),
228 228
 					KEY GRP_ID (GRP_ID)";
229
-		$this->_table_should_exist_previously( $table_name, $sql, 'ENGINE=InnoDB');
229
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
230 230
 
231 231
 
232 232
 		$table_name = 'esp_payment';
@@ -276,8 +276,8 @@  discard block
 block discarded – undo
276 276
 					  PRIMARY KEY  (TTM_ID)";
277 277
 		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
278 278
 
279
-		$table_name='esp_question';
280
-		$sql='QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
279
+		$table_name = 'esp_question';
280
+		$sql = 'QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
281 281
 					QST_display_text TEXT NOT NULL,
282 282
 					QST_admin_label VARCHAR(255) NOT NULL,
283 283
 					QST_system VARCHAR(25) DEFAULT NULL,
@@ -289,27 +289,27 @@  discard block
 block discarded – undo
289 289
 					QST_wp_user BIGINT UNSIGNED NULL,
290 290
 					QST_deleted TINYINT UNSIGNED NOT NULL DEFAULT 0,
291 291
 					PRIMARY KEY  (QST_ID)';
292
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
292
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
293 293
 
294
-		$table_name='esp_question_group_question';
295
-		$sql="QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
294
+		$table_name = 'esp_question_group_question';
295
+		$sql = "QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
296 296
 					QSG_ID INT UNSIGNED NOT NULL,
297 297
 					QST_ID INT UNSIGNED NOT NULL,
298 298
 					QGQ_order INT UNSIGNED NOT NULL DEFAULT 0,
299 299
 					PRIMARY KEY  (QGQ_ID) ";
300
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
300
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
301 301
 
302 302
 
303 303
 
304
-		$table_name='esp_question_option';
305
-		$sql="QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
304
+		$table_name = 'esp_question_option';
305
+		$sql = "QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
306 306
 					QSO_value VARCHAR(255) NOT NULL,
307 307
 					QSO_desc TEXT NOT NULL,
308 308
 					QST_ID INT UNSIGNED NOT NULL,
309 309
 					QSO_order INT UNSIGNED NOT NULL DEFAULT 0,
310 310
 					QSO_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
311 311
 					PRIMARY KEY  (QSO_ID)";
312
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
312
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
313 313
 
314 314
 
315 315
 
@@ -342,8 +342,8 @@  discard block
 block discarded – undo
342 342
 
343 343
 
344 344
 
345
-		$table_name='esp_checkin';
346
-		$sql="CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
345
+		$table_name = 'esp_checkin';
346
+		$sql = "CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
347 347
 					REG_ID INT(10) UNSIGNED NOT NULL,
348 348
 					DTT_ID INT(10) UNSIGNED NOT NULL,
349 349
 					CHK_in TINYINT(1) UNSIGNED NOT NULL DEFAULT 1,
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
 					  PRC_wp_user BIGINT UNSIGNED NULL,
432 432
 					  PRC_parent INT(10) UNSIGNED DEFAULT 0,
433 433
 					  PRIMARY KEY  (PRC_ID)";
434
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
434
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
435 435
 
436 436
 		$table_name = "esp_price_type";
437 437
 		$sql = "PRT_ID TINYINT(3) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -468,12 +468,12 @@  discard block
 block discarded – undo
468 468
 					  TKT_parent INT(10) UNSIGNED DEFAULT '0',
469 469
 					  TKT_deleted TINYINT(1) NOT NULL DEFAULT '0',
470 470
 					  PRIMARY KEY  (TKT_ID)";
471
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
471
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
472 472
 
473
-		EEH_Activation::drop_index( 'esp_question_group', 'QSG_identifier_UNIQUE' );
473
+		EEH_Activation::drop_index('esp_question_group', 'QSG_identifier_UNIQUE');
474 474
 
475 475
 		$table_name = 'esp_question_group';
476
-		$sql='QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
476
+		$sql = 'QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
477 477
 					QSG_name VARCHAR(255) NOT NULL,
478 478
 					QSG_identifier VARCHAR(100) NOT NULL,
479 479
 					QSG_desc TEXT NULL,
@@ -485,7 +485,7 @@  discard block
 block discarded – undo
485 485
 					QSG_wp_user BIGINT UNSIGNED NULL,
486 486
 					PRIMARY KEY  (QSG_ID),
487 487
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier ASC)';
488
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
488
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
489 489
 
490 490
 		$script_4_1_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
491 491
 
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
509 509
 		return true;
510 510
 	}
511 511
 
512
-	public function migration_page_hooks(){
512
+	public function migration_page_hooks() {
513 513
 
514 514
 	}
515 515
 
@@ -523,21 +523,21 @@  discard block
 block discarded – undo
523 523
 		global $wpdb;
524 524
 		$price_type_table = $wpdb->prefix."esp_price_type";
525 525
 
526
-		if ( EEH_Activation::table_exists( $price_type_table ) ) {
526
+		if (EEH_Activation::table_exists($price_type_table)) {
527 527
 
528
-			$SQL = 'SELECT COUNT(PRT_ID) FROM ' . $price_type_table;
529
-			$price_types_exist = $wpdb->get_var( $SQL );
528
+			$SQL = 'SELECT COUNT(PRT_ID) FROM '.$price_type_table;
529
+			$price_types_exist = $wpdb->get_var($SQL);
530 530
 
531
-			if ( ! $price_types_exist ) {
531
+			if ( ! $price_types_exist) {
532 532
 				$user_id = EEH_Activation::get_default_creator_id();
533 533
 				$SQL = "INSERT INTO $price_type_table ( PRT_ID, PRT_name, PBT_ID, PRT_is_percent, PRT_order, PRT_wp_user, PRT_deleted ) VALUES
534
-							(1, '" . __('Base Price', 'event_espresso') . "', 1,  0, 0, $user_id, 0),
535
-							(2, '" . __('Percent Discount', 'event_espresso') . "', 2,  1, 20, $user_id, 0),
536
-							(3, '" . __('Dollar Discount', 'event_espresso') . "', 2,  0, 30, $user_id, 0),
537
-							(4, '" . __('Percent Surcharge', 'event_espresso') . "', 3,  1, 40, $user_id,  0),
538
-							(5, '" . __('Dollar Surcharge', 'event_espresso') . "', 3,  0, 50, $user_id, 0);";
539
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_5_0__insert_default_price_types__SQL', $SQL );
540
-				$wpdb->query( $SQL );
534
+							(1, '".__('Base Price', 'event_espresso')."', 1,  0, 0, $user_id, 0),
535
+							(2, '".__('Percent Discount', 'event_espresso')."', 2,  1, 20, $user_id, 0),
536
+							(3, '".__('Dollar Discount', 'event_espresso')."', 2,  0, 30, $user_id, 0),
537
+							(4, '".__('Percent Surcharge', 'event_espresso')."', 3,  1, 40, $user_id,  0),
538
+							(5, '".__('Dollar Surcharge', 'event_espresso')."', 3,  0, 50, $user_id, 0);";
539
+				$SQL = apply_filters('FHEE__EE_DMS_4_5_0__insert_default_price_types__SQL', $SQL);
540
+				$wpdb->query($SQL);
541 541
 			}
542 542
 		}
543 543
 	}
@@ -557,17 +557,17 @@  discard block
 block discarded – undo
557 557
 		global $wpdb;
558 558
 		$price_table = $wpdb->prefix."esp_price";
559 559
 
560
-		if ( EEH_Activation::table_exists( $price_table ) ) {
560
+		if (EEH_Activation::table_exists($price_table)) {
561 561
 
562
-			$SQL = 'SELECT COUNT(PRC_ID) FROM ' .$price_table;
563
-			$prices_exist = $wpdb->get_var( $SQL );
562
+			$SQL = 'SELECT COUNT(PRC_ID) FROM '.$price_table;
563
+			$prices_exist = $wpdb->get_var($SQL);
564 564
 
565
-			if ( ! $prices_exist ) {
565
+			if ( ! $prices_exist) {
566 566
 				$user_id = EEH_Activation::get_default_creator_id();
567 567
 				$SQL = "INSERT INTO $price_table
568 568
 							(PRC_ID, PRT_ID, PRC_amount, PRC_name, PRC_desc,  PRC_is_default, PRC_overrides, PRC_wp_user, PRC_order, PRC_deleted, PRC_parent ) VALUES
569 569
 							(1, 1, '0.00', 'Free Admission', '', 1, NULL, $user_id, 0, 0, 0);";
570
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_5_0__insert_default_prices__SQL', $SQL );
570
+				$SQL = apply_filters('FHEE__EE_DMS_4_5_0__insert_default_prices__SQL', $SQL);
571 571
 				$wpdb->query($SQL);
572 572
 			}
573 573
 		}
@@ -585,35 +585,35 @@  discard block
 block discarded – undo
585 585
 
586 586
 		global $wpdb;
587 587
 		$ticket_table = $wpdb->prefix."esp_ticket";
588
-		if ( EEH_Activation::table_exists( $ticket_table ) ) {
588
+		if (EEH_Activation::table_exists($ticket_table)) {
589 589
 
590
-			$SQL = 'SELECT COUNT(TKT_ID) FROM ' . $ticket_table;
590
+			$SQL = 'SELECT COUNT(TKT_ID) FROM '.$ticket_table;
591 591
 			$tickets_exist = $wpdb->get_var($SQL);
592 592
 
593
-			if ( ! $tickets_exist ) {
593
+			if ( ! $tickets_exist) {
594 594
 				$user_id = EEH_Activation::get_default_creator_id();
595 595
 				$SQL = "INSERT INTO $ticket_table
596 596
 					( TKT_ID, TTM_ID, TKT_name, TKT_description, TKT_qty, TKT_sold, TKT_uses, TKT_required, TKT_min, TKT_max, TKT_price, TKT_start_date, TKT_end_date, TKT_taxable, TKT_order, TKT_row, TKT_is_default, TKT_parent, TKT_wp_user, TKT_deleted ) VALUES
597
-					( 1, 0, '" . __("Free Ticket", "event_espresso") . "', '', 100, 0, -1, 0, 0, -1, 0.00, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 0, 1, 1, 0, $user_id, 0);";
598
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_5_0__insert_default_tickets__SQL', $SQL );
597
+					( 1, 0, '".__("Free Ticket", "event_espresso")."', '', 100, 0, -1, 0, 0, -1, 0.00, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 0, 1, 1, 0, $user_id, 0);";
598
+				$SQL = apply_filters('FHEE__EE_DMS_4_5_0__insert_default_tickets__SQL', $SQL);
599 599
 				$wpdb->query($SQL);
600 600
 			}
601 601
 		}
602 602
 		$ticket_price_table = $wpdb->prefix."esp_ticket_price";
603 603
 
604
-		if ( EEH_Activation::table_exists( $ticket_price_table ) ) {
604
+		if (EEH_Activation::table_exists($ticket_price_table)) {
605 605
 
606
-			$SQL = 'SELECT COUNT(TKP_ID) FROM ' . $ticket_price_table;
606
+			$SQL = 'SELECT COUNT(TKP_ID) FROM '.$ticket_price_table;
607 607
 			$ticket_prc_exist = $wpdb->get_var($SQL);
608 608
 
609
-			if ( ! $ticket_prc_exist ) {
609
+			if ( ! $ticket_prc_exist) {
610 610
 
611 611
 				$SQL = "INSERT INTO $ticket_price_table
612 612
 				( TKP_ID, TKT_ID, PRC_ID ) VALUES
613 613
 				( 1, 1, 1 )
614 614
 				";
615 615
 
616
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_5_0__insert_default_tickets__SQL__ticket_price', $SQL );
616
+				$SQL = apply_filters('FHEE__EE_DMS_4_5_0__insert_default_tickets__SQL__ticket_price', $SQL);
617 617
 				$wpdb->query($SQL);
618 618
 			}
619 619
 		}
Please login to merge, or discard this patch.
core/data_migration_scripts/EE_DMS_Core_4_6_0.dms.php 2 patches
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -65,11 +65,11 @@
 block discarded – undo
65 65
 		if($version_string <= '4.6.0' && $version_string >= '4.5.0' ){
66 66
 //			echo "$version_string can be migrated from";
67 67
 			return true;
68
-		}elseif( ! $version_string ){
68
+		} elseif( ! $version_string ){
69 69
 //			echo "no version string provided: $version_string";
70 70
 			//no version string provided... this must be pre 4.3
71 71
 			return false;//changed mind. dont want people thinking they should migrate yet because they cant
72
-		}else{
72
+		} else{
73 73
 //			echo "$version_string doesnt apply";
74 74
 			return false;
75 75
 		}
Please login to merge, or discard this patch.
Spacing   +64 added lines, -64 removed lines patch added patch discarded remove patch
@@ -10,13 +10,13 @@  discard block
 block discarded – undo
10 10
 //(all other times it gets resurrected from a wordpress option)
11 11
 $stages = glob(EE_CORE.'data_migration_scripts/4_6_0_stages/*');
12 12
 $class_to_filepath = array();
13
-foreach($stages as $filepath){
13
+foreach ($stages as $filepath) {
14 14
 	$matches = array();
15
-	preg_match('~4_6_0_stages/(.*).dmsstage.php~',$filepath,$matches);
15
+	preg_match('~4_6_0_stages/(.*).dmsstage.php~', $filepath, $matches);
16 16
 	$class_to_filepath[$matches[1]] = $filepath;
17 17
 }
18 18
 //give addons a chance to autoload their stages too
19
-$class_to_filepath = apply_filters('FHEE__EE_DMS_4_6_0__autoloaded_stages',$class_to_filepath);
19
+$class_to_filepath = apply_filters('FHEE__EE_DMS_4_6_0__autoloaded_stages', $class_to_filepath);
20 20
 EEH_Autoloader::register_autoloader($class_to_filepath);
21 21
 
22 22
 
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
  * @since                4.6.0
33 33
  *
34 34
  */
35
-class EE_DMS_Core_4_6_0 extends EE_Data_Migration_Script_Base{
35
+class EE_DMS_Core_4_6_0 extends EE_Data_Migration_Script_Base {
36 36
 
37 37
 	/**
38 38
 	 * return EE_DMS_Core_4_6_0
@@ -62,14 +62,14 @@  discard block
 block discarded – undo
62 62
 	 */
63 63
 	public function can_migrate_from_version($version_array) {
64 64
 		$version_string = $version_array['Core'];
65
-		if($version_string <= '4.6.0' && $version_string >= '4.5.0' ){
65
+		if ($version_string <= '4.6.0' && $version_string >= '4.5.0') {
66 66
 //			echo "$version_string can be migrated from";
67 67
 			return true;
68
-		}elseif( ! $version_string ){
68
+		}elseif ( ! $version_string) {
69 69
 //			echo "no version string provided: $version_string";
70 70
 			//no version string provided... this must be pre 4.3
71
-			return false;//changed mind. dont want people thinking they should migrate yet because they cant
72
-		}else{
71
+			return false; //changed mind. dont want people thinking they should migrate yet because they cant
72
+		} else {
73 73
 //			echo "$version_string doesnt apply";
74 74
 			return false;
75 75
 		}
@@ -91,14 +91,14 @@  discard block
 block discarded – undo
91 91
 	 */
92 92
 	public function schema_changes_before_migration() {
93 93
 		//relies on 4.1's EEH_Activation::create_table
94
-		require_once( EE_HELPERS . 'EEH_Activation.helper.php' );
95
-		$table_name='esp_answer';
96
-		$sql=" ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
94
+		require_once(EE_HELPERS.'EEH_Activation.helper.php');
95
+		$table_name = 'esp_answer';
96
+		$sql = " ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
97 97
 					REG_ID INT UNSIGNED NOT NULL,
98 98
 					QST_ID INT UNSIGNED NOT NULL,
99 99
 					ANS_value TEXT NOT NULL,
100 100
 					PRIMARY KEY  (ANS_ID)";
101
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
101
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
102 102
 
103 103
 		$table_name = 'esp_attendee_meta';
104 104
 		$sql = "ATTM_ID INT(10) UNSIGNED NOT	NULL AUTO_INCREMENT,
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 					  CNT_is_EU TINYINT(1) DEFAULT '0',
138 138
 					  CNT_active TINYINT(1) DEFAULT '0',
139 139
 					  PRIMARY KEY  (CNT_ISO)";
140
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
140
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
141 141
 
142 142
 		$table_name = 'esp_currency';
143 143
 		$sql = "CUR_code VARCHAR(6) COLLATE utf8_bin NOT NULL,
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 				CUR_dec_plc VARCHAR(1) COLLATE utf8_bin NOT NULL DEFAULT '2',
148 148
 				CUR_active TINYINT(1) DEFAULT '0',
149 149
 				PRIMARY KEY  (CUR_code)";
150
-		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB' );
150
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
151 151
 
152 152
 
153 153
 		$table_name = 'esp_currency_payment_method';
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 
178 178
 
179 179
 
180
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
180
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
181 181
 		$table_name = 'esp_event_meta';
182 182
 		$sql = "
183 183
 			EVTM_ID INT NOT NULL AUTO_INCREMENT,
@@ -194,41 +194,41 @@  discard block
 block discarded – undo
194 194
 			EVT_external_URL VARCHAR(200) NULL,
195 195
 			EVT_donations TINYINT(1) NULL,
196 196
 			PRIMARY KEY  (EVTM_ID)";
197
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
197
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
198 198
 
199 199
 
200 200
 
201
-		$table_name='esp_event_question_group';
202
-		$sql="EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
201
+		$table_name = 'esp_event_question_group';
202
+		$sql = "EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
203 203
 					EVT_ID BIGINT(20) UNSIGNED NOT NULL,
204 204
 					QSG_ID INT UNSIGNED NOT NULL,
205 205
 					EQG_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
206 206
 					PRIMARY KEY  (EQG_ID)";
207
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
207
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
208 208
 
209 209
 
210 210
 
211
-		$table_name='esp_event_venue';
212
-		$sql="EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
211
+		$table_name = 'esp_event_venue';
212
+		$sql = "EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
213 213
 				EVT_ID BIGINT(20) UNSIGNED NOT NULL,
214 214
 				VNU_ID BIGINT(20) UNSIGNED NOT NULL,
215 215
 				EVV_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
216 216
 				PRIMARY KEY  (EVV_ID)";
217
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
217
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
218 218
 
219 219
 
220 220
 
221
-		$table_name='esp_extra_meta';
222
-		$sql="EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
221
+		$table_name = 'esp_extra_meta';
222
+		$sql = "EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
223 223
 				OBJ_ID INT(11) DEFAULT NULL,
224 224
 				EXM_type VARCHAR(45) DEFAULT NULL,
225 225
 				EXM_key VARCHAR(45) DEFAULT NULL,
226 226
 				EXM_value TEXT,
227 227
 				PRIMARY KEY  (EXM_ID)";
228
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
228
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
229 229
 
230
-		$table_name='esp_line_item';
231
-		$sql="LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
230
+		$table_name = 'esp_line_item';
231
+		$sql = "LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
232 232
 				LIN_code VARCHAR(245) NOT NULL DEFAULT '',
233 233
 				TXN_ID INT(11) DEFAULT NULL,
234 234
 				LIN_name VARCHAR(245) NOT NULL DEFAULT '',
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
 				OBJ_ID INT(11) DEFAULT NULL,
245 245
 				OBJ_type VARCHAR(45)DEFAULT NULL,
246 246
 				PRIMARY KEY  (LIN_ID)";
247
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB' );
247
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
248 248
 
249 249
 		$table_name = 'esp_log';
250 250
 		$sql = "LOG_ID INT(11) NOT NULL AUTO_INCREMENT,
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
 					KEY GRP_ID (GRP_ID)";
268 268
 		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
269 269
 
270
-		EEH_Activation::drop_index( 'esp_message_template_group', 'EVT_ID' );
270
+		EEH_Activation::drop_index('esp_message_template_group', 'EVT_ID');
271 271
 
272 272
 		$table_name = 'esp_message_template_group';
273 273
 		$sql = "GRP_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
 					MTP_is_active TINYINT(1) NOT NULL DEFAULT '1',
283 283
 					PRIMARY KEY  (GRP_ID),
284 284
 					KEY MTP_user_id (MTP_user_id)";
285
-		$this->_table_should_exist_previously( $table_name, $sql, 'ENGINE=InnoDB');
285
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
286 286
 
287 287
 		$table_name = 'esp_event_message_template';
288 288
 		$sql = "EMT_ID BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
291 291
 					PRIMARY KEY  (EMT_ID),
292 292
 					KEY EVT_ID (EVT_ID),
293 293
 					KEY GRP_ID (GRP_ID)";
294
-		$this->_table_should_exist_previously( $table_name, $sql, 'ENGINE=InnoDB');
294
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
295 295
 
296 296
 
297 297
 		$table_name = 'esp_payment';
@@ -359,8 +359,8 @@  discard block
 block discarded – undo
359 359
 					  PRIMARY KEY  (TTM_ID)";
360 360
 		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
361 361
 
362
-		$table_name='esp_question';
363
-		$sql='QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
362
+		$table_name = 'esp_question';
363
+		$sql = 'QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
364 364
 					QST_display_text TEXT NOT NULL,
365 365
 					QST_admin_label VARCHAR(255) NOT NULL,
366 366
 					QST_system VARCHAR(25) DEFAULT NULL,
@@ -372,27 +372,27 @@  discard block
 block discarded – undo
372 372
 					QST_wp_user BIGINT UNSIGNED NULL,
373 373
 					QST_deleted TINYINT UNSIGNED NOT NULL DEFAULT 0,
374 374
 					PRIMARY KEY  (QST_ID)';
375
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
375
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
376 376
 
377
-		$table_name='esp_question_group_question';
378
-		$sql="QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
377
+		$table_name = 'esp_question_group_question';
378
+		$sql = "QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
379 379
 					QSG_ID INT UNSIGNED NOT NULL,
380 380
 					QST_ID INT UNSIGNED NOT NULL,
381 381
 					QGQ_order INT UNSIGNED NOT NULL DEFAULT 0,
382 382
 					PRIMARY KEY  (QGQ_ID) ";
383
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
383
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
384 384
 
385 385
 
386 386
 
387
-		$table_name='esp_question_option';
388
-		$sql="QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
387
+		$table_name = 'esp_question_option';
388
+		$sql = "QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
389 389
 					QSO_value VARCHAR(255) NOT NULL,
390 390
 					QSO_desc TEXT NOT NULL,
391 391
 					QST_ID INT UNSIGNED NOT NULL,
392 392
 					QSO_order INT UNSIGNED NOT NULL DEFAULT 0,
393 393
 					QSO_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
394 394
 					PRIMARY KEY  (QSO_ID)";
395
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
395
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
396 396
 
397 397
 
398 398
 
@@ -425,8 +425,8 @@  discard block
 block discarded – undo
425 425
 
426 426
 
427 427
 
428
-		$table_name='esp_checkin';
429
-		$sql="CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
428
+		$table_name = 'esp_checkin';
429
+		$sql = "CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
430 430
 					REG_ID INT(10) UNSIGNED NOT NULL,
431 431
 					DTT_ID INT(10) UNSIGNED NOT NULL,
432 432
 					CHK_in TINYINT(1) UNSIGNED NOT NULL DEFAULT 1,
@@ -515,7 +515,7 @@  discard block
 block discarded – undo
515 515
 					  PRC_wp_user BIGINT UNSIGNED NULL,
516 516
 					  PRC_parent INT(10) UNSIGNED DEFAULT 0,
517 517
 					  PRIMARY KEY  (PRC_ID)";
518
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
518
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
519 519
 
520 520
 		$table_name = "esp_price_type";
521 521
 		$sql = "PRT_ID TINYINT(3) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -552,12 +552,12 @@  discard block
 block discarded – undo
552 552
 					  TKT_parent INT(10) UNSIGNED DEFAULT '0',
553 553
 					  TKT_deleted TINYINT(1) NOT NULL DEFAULT '0',
554 554
 					  PRIMARY KEY  (TKT_ID)";
555
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
555
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
556 556
 
557
-		EEH_Activation::drop_index( 'esp_question_group', 'QSG_identifier_UNIQUE' );
557
+		EEH_Activation::drop_index('esp_question_group', 'QSG_identifier_UNIQUE');
558 558
 
559 559
 		$table_name = 'esp_question_group';
560
-		$sql='QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
560
+		$sql = 'QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
561 561
 					QSG_name VARCHAR(255) NOT NULL,
562 562
 					QSG_identifier VARCHAR(100) NOT NULL,
563 563
 					QSG_desc TEXT NULL,
@@ -569,7 +569,7 @@  discard block
 block discarded – undo
569 569
 					QSG_wp_user BIGINT UNSIGNED NULL,
570 570
 					PRIMARY KEY  (QSG_ID),
571 571
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier ASC)';
572
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
572
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
573 573
 
574 574
 		/** @var EE_DMS_Core_4_1_0 $script_4_1_defaults */
575 575
 		$script_4_1_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
@@ -597,15 +597,15 @@  discard block
 block discarded – undo
597 597
 		return true;
598 598
 	}
599 599
 
600
-	public function migration_page_hooks(){
600
+	public function migration_page_hooks() {
601 601
 
602 602
 	}
603 603
 
604
-	public function add_default_admin_only_payments(){
604
+	public function add_default_admin_only_payments() {
605 605
 		global $wpdb;
606 606
 		$table_name = $wpdb->prefix."esp_payment_method";
607 607
 		$user_id = EEH_Activation::get_default_creator_id();
608
-		if ( EEH_Activation::table_exists( $table_name ) ) {
608
+		if (EEH_Activation::table_exists($table_name)) {
609 609
 
610 610
 			$SQL = "SELECT COUNT( * ) FROM $table_name";
611 611
 			$existing_payment_methods = $wpdb->get_var($SQL);
@@ -626,11 +626,11 @@  discard block
 block discarded – undo
626 626
 			//so admins can record payments for them from the admin page
627 627
 
628 628
 
629
-			foreach($default_admin_only_payment_methods as $nicename => $description){
629
+			foreach ($default_admin_only_payment_methods as $nicename => $description) {
630 630
 				$slug = sanitize_key($nicename);
631 631
 			//check that such a payment method exists
632
-				$exists = $wpdb->get_var($wpdb->prepare("SELECT count(*) FROM $table_name WHERE PMD_slug = %s",$slug));
633
-				if( ! $exists){
632
+				$exists = $wpdb->get_var($wpdb->prepare("SELECT count(*) FROM $table_name WHERE PMD_slug = %s", $slug));
633
+				if ( ! $exists) {
634 634
 					$values = array(
635 635
 								'PMD_type'=>'Admin_Only',
636 636
 								'PMD_name'=>$nicename,
@@ -644,17 +644,17 @@  discard block
 block discarded – undo
644 644
 							$table_name,
645 645
 							$values,
646 646
 							array(
647
-								'%s',//PMD_type
648
-								'%s',//PMD_name
649
-								'%s',//PMD_admin_name
650
-								'%s',//PMD_admin_desc
651
-								'%s',//PMD_slug
652
-								'%d',//PMD_wp_user
653
-								'%s',//PMD_scope
647
+								'%s', //PMD_type
648
+								'%s', //PMD_name
649
+								'%s', //PMD_admin_name
650
+								'%s', //PMD_admin_desc
651
+								'%s', //PMD_slug
652
+								'%d', //PMD_wp_user
653
+								'%s', //PMD_scope
654 654
 							)
655 655
 							);
656
-					if( ! $success ){
657
-						$this->add_error(sprintf(__("Could not insert new admin-only payment method with values %s during migration", "event_espresso"),$this->_json_encode($values)));
656
+					if ( ! $success) {
657
+						$this->add_error(sprintf(__("Could not insert new admin-only payment method with values %s during migration", "event_espresso"), $this->_json_encode($values)));
658 658
 					}
659 659
 				}
660 660
 			}
@@ -672,11 +672,11 @@  discard block
 block discarded – undo
672 672
 
673 673
 		global $wpdb;
674 674
 		$currency_table = $wpdb->prefix."esp_currency";
675
-		if ( EEH_Activation::table_exists( $currency_table ) ) {
675
+		if (EEH_Activation::table_exists($currency_table)) {
676 676
 
677 677
 			$SQL = "SELECT COUNT('CUR_code') FROM $currency_table";
678 678
 			$countries = $wpdb->get_var($SQL);
679
-			if ( ! $countries ) {
679
+			if ( ! $countries) {
680 680
 				$SQL = "INSERT INTO $currency_table
681 681
 				( CUR_code, CUR_single, CUR_plural, CUR_sign, CUR_dec_plc, CUR_active) VALUES
682 682
 				( 'EUR',  'Euro',  'Euros',  '€',  2,1),
Please login to merge, or discard this patch.
core/data_migration_scripts/EE_DMS_Core_4_8_0.dms.php 3 patches
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -65,11 +65,11 @@
 block discarded – undo
65 65
 		if( $version_string <= '4.8.0' && $version_string >= '4.7.0' ){
66 66
 //			echo "$version_string can be migrated from";
67 67
 			return true;
68
-		}elseif( ! $version_string ){
68
+		} elseif( ! $version_string ){
69 69
 //			echo "no version string provided: $version_string";
70 70
 			//no version string provided... this must be pre 4.3
71 71
 			return false;//changed mind. dont want people thinking they should migrate yet because they cant
72
-		}else{
72
+		} else{
73 73
 //			echo "$version_string doesnt apply";
74 74
 			return false;
75 75
 		}
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -715,7 +715,7 @@
 block discarded – undo
715 715
 				}
716 716
 			}
717 717
 		}
718
-        }
718
+		}
719 719
 	/**
720 720
 	 * addresses https://events.codebasehq.com/projects/event-espresso/tickets/8731
721 721
 	 * which should just be a temporary issue for folks who installed 4.8.0-4.8.5;
Please login to merge, or discard this patch.
Spacing   +78 added lines, -78 removed lines patch added patch discarded remove patch
@@ -13,13 +13,13 @@  discard block
 block discarded – undo
13 13
 //(all other times it gets resurrected from a wordpress option)
14 14
 $stages = glob(EE_CORE.'data_migration_scripts/4_8_0_stages/*');
15 15
 $class_to_filepath = array();
16
-foreach($stages as $filepath){
16
+foreach ($stages as $filepath) {
17 17
 	$matches = array();
18
-	preg_match('~4_8_0_stages/(.*).dmsstage.php~',$filepath,$matches);
18
+	preg_match('~4_8_0_stages/(.*).dmsstage.php~', $filepath, $matches);
19 19
 	$class_to_filepath[$matches[1]] = $filepath;
20 20
 }
21 21
 //give addons a chance to autoload their stages too
22
-$class_to_filepath = apply_filters('FHEE__EE_DMS_4_8_0__autoloaded_stages',$class_to_filepath);
22
+$class_to_filepath = apply_filters('FHEE__EE_DMS_4_8_0__autoloaded_stages', $class_to_filepath);
23 23
 EEH_Autoloader::register_autoloader($class_to_filepath);
24 24
 
25 25
 
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
  * @since                4.6.0
36 36
  *
37 37
  */
38
-class EE_DMS_Core_4_8_0 extends EE_Data_Migration_Script_Base{
38
+class EE_DMS_Core_4_8_0 extends EE_Data_Migration_Script_Base {
39 39
 
40 40
 	/**
41 41
 	 * return EE_DMS_Core_4_8_0
@@ -62,14 +62,14 @@  discard block
 block discarded – undo
62 62
 	 */
63 63
 	public function can_migrate_from_version($version_array) {
64 64
 		$version_string = $version_array['Core'];
65
-		if( $version_string <= '4.8.0' && $version_string >= '4.7.0' ){
65
+		if ($version_string <= '4.8.0' && $version_string >= '4.7.0') {
66 66
 //			echo "$version_string can be migrated from";
67 67
 			return true;
68
-		}elseif( ! $version_string ){
68
+		}elseif ( ! $version_string) {
69 69
 //			echo "no version string provided: $version_string";
70 70
 			//no version string provided... this must be pre 4.3
71
-			return false;//changed mind. dont want people thinking they should migrate yet because they cant
72
-		}else{
71
+			return false; //changed mind. dont want people thinking they should migrate yet because they cant
72
+		} else {
73 73
 //			echo "$version_string doesnt apply";
74 74
 			return false;
75 75
 		}
@@ -90,19 +90,19 @@  discard block
 block discarded – undo
90 90
 	 * @return bool
91 91
 	 */
92 92
 	public function schema_changes_before_migration() {
93
-		require_once( EE_HELPERS . 'EEH_Activation.helper.php' );
94
-		$now_in_mysql = current_time( 'mysql', true );
93
+		require_once(EE_HELPERS.'EEH_Activation.helper.php');
94
+		$now_in_mysql = current_time('mysql', true);
95 95
 
96
-		require_once( EE_HELPERS . 'EEH_Activation.helper.php' );
97
-		$table_name='esp_answer';
98
-		$sql=" ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
96
+		require_once(EE_HELPERS.'EEH_Activation.helper.php');
97
+		$table_name = 'esp_answer';
98
+		$sql = " ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
99 99
 					REG_ID int(10) unsigned NOT NULL,
100 100
 					QST_ID int(10) unsigned NOT NULL,
101 101
 					ANS_value text NOT NULL,
102 102
 					PRIMARY KEY  (ANS_ID),
103 103
 					KEY REG_ID (REG_ID),
104 104
 					KEY QST_ID (QST_ID)";
105
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
105
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
106 106
 
107 107
 		$table_name = 'esp_attendee_meta';
108 108
 		$sql = "ATTM_ID int(10) unsigned NOT	NULL AUTO_INCREMENT,
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 					  CNT_is_EU tinyint(1) DEFAULT '0',
143 143
 					  CNT_active tinyint(1) DEFAULT '0',
144 144
 					  PRIMARY KEY  (CNT_ISO)";
145
-		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB' );
145
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
146 146
 
147 147
 		$table_name = 'esp_currency';
148 148
 		$sql = "CUR_code varchar(6) collate utf8_bin NOT NULL,
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 				CUR_dec_plc varchar(1) collate utf8_bin NOT NULL DEFAULT '2',
153 153
 				CUR_active tinyint(1) DEFAULT '0',
154 154
 				PRIMARY KEY  (CUR_code)";
155
-		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB' );
155
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
156 156
 
157 157
 
158 158
 		$table_name = 'esp_currency_payment_method';
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 						KEY EVT_ID (EVT_ID),
183 183
 						KEY DTT_is_primary (DTT_is_primary)";
184 184
 
185
-		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB' );
185
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
186 186
 
187 187
 		$table_name = 'esp_event_meta';
188 188
 		$sql = "
@@ -201,41 +201,41 @@  discard block
 block discarded – undo
201 201
 			EVT_donations tinyint(1) NULL,
202 202
 			PRIMARY KEY  (EVTM_ID),
203 203
 			KEY EVT_ID (EVT_ID)";
204
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
204
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
205 205
 
206 206
 
207 207
 
208
-		$table_name='esp_event_question_group';
209
-		$sql="EQG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
208
+		$table_name = 'esp_event_question_group';
209
+		$sql = "EQG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
210 210
 					EVT_ID bigint(20) unsigned NOT NULL,
211 211
 					QSG_ID int(10) unsigned NOT NULL,
212 212
 					EQG_primary tinyint(1) unsigned NOT NULL DEFAULT 0,
213 213
 					PRIMARY KEY  (EQG_ID),
214 214
 					KEY EVT_ID (EVT_ID),
215 215
 					KEY QSG_ID (QSG_ID)";
216
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
216
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
217 217
 
218 218
 
219 219
 
220
-		$table_name='esp_event_venue';
221
-		$sql="EVV_ID int(11) NOT NULL AUTO_INCREMENT,
220
+		$table_name = 'esp_event_venue';
221
+		$sql = "EVV_ID int(11) NOT NULL AUTO_INCREMENT,
222 222
 				EVT_ID bigint(20) unsigned NOT NULL,
223 223
 				VNU_ID bigint(20) unsigned NOT NULL,
224 224
 				EVV_primary tinyint(1) unsigned NOT NULL DEFAULT 0,
225 225
 				PRIMARY KEY  (EVV_ID)";
226
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
226
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
227 227
 
228 228
 
229 229
 
230
-		$table_name='esp_extra_meta';
231
-		$sql="EXM_ID int(11) NOT NULL AUTO_INCREMENT,
230
+		$table_name = 'esp_extra_meta';
231
+		$sql = "EXM_ID int(11) NOT NULL AUTO_INCREMENT,
232 232
 				OBJ_ID int(11) DEFAULT NULL,
233 233
 				EXM_type varchar(45) DEFAULT NULL,
234 234
 				EXM_key varchar(45) DEFAULT NULL,
235 235
 				EXM_value text,
236 236
 				PRIMARY KEY  (EXM_ID),
237 237
 				KEY EXM_type (EXM_type,OBJ_ID,EXM_key)";
238
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
238
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
239 239
 
240 240
 		$table_name = 'esp_extra_join';
241 241
 		$sql = "EXJ_ID int(11) NOT NULL AUTO_INCREMENT,
@@ -248,8 +248,8 @@  discard block
 block discarded – undo
248 248
 				KEY second_model (EXJ_second_model_name,EXJ_second_model_id)";
249 249
 		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB ');
250 250
 
251
-		$table_name='esp_line_item';
252
-		$sql="LIN_ID int(11) NOT NULL AUTO_INCREMENT,
251
+		$table_name = 'esp_line_item';
252
+		$sql = "LIN_ID int(11) NOT NULL AUTO_INCREMENT,
253 253
 				LIN_code varchar(245) NOT NULL DEFAULT '',
254 254
 				TXN_ID int(11) DEFAULT NULL,
255 255
 				LIN_name varchar(245) NOT NULL DEFAULT '',
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
 				PRIMARY KEY  (LIN_ID),
269 269
 				KEY LIN_code (LIN_code(191)),
270 270
 				KEY TXN_ID (TXN_ID)";
271
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB' );
271
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
272 272
 
273 273
 		$table_name = 'esp_log';
274 274
 		$sql = "LOG_ID int(11) NOT NULL AUTO_INCREMENT,
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
 					MTP_is_active tinyint(1) NOT NULL DEFAULT '1',
308 308
 					PRIMARY KEY  (GRP_ID),
309 309
 					KEY MTP_user_id (MTP_user_id)";
310
-		$this->_table_has_not_changed_since_previous( $table_name, $sql, 'ENGINE=InnoDB');
310
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
311 311
 
312 312
 		$table_name = 'esp_event_message_template';
313 313
 		$sql = "EMT_ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
 					PRIMARY KEY  (EMT_ID),
317 317
 					KEY EVT_ID (EVT_ID),
318 318
 					KEY GRP_ID (GRP_ID)";
319
-		$this->_table_has_not_changed_since_previous( $table_name, $sql, 'ENGINE=InnoDB');
319
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
320 320
 
321 321
 
322 322
 		$table_name = 'esp_payment';
@@ -389,8 +389,8 @@  discard block
 block discarded – undo
389 389
 					  PRIMARY KEY  (TTM_ID)";
390 390
 		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
391 391
 
392
-		$table_name='esp_question';
393
-		$sql='QST_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
392
+		$table_name = 'esp_question';
393
+		$sql = 'QST_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
394 394
 					QST_display_text text NOT NULL,
395 395
 					QST_admin_label varchar(255) NOT NULL,
396 396
 					QST_system varchar(25) NOT NULL DEFAULT "",
@@ -404,22 +404,22 @@  discard block
 block discarded – undo
404 404
 					QST_deleted tinyint(2) unsigned NOT NULL DEFAULT 0,
405 405
 					PRIMARY KEY  (QST_ID),
406 406
 					KEY QST_order (QST_order)';
407
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
407
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
408 408
 
409
-		$table_name='esp_question_group_question';
410
-		$sql="QGQ_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
409
+		$table_name = 'esp_question_group_question';
410
+		$sql = "QGQ_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
411 411
 					QSG_ID int(10) unsigned NOT NULL,
412 412
 					QST_ID int(10) unsigned NOT NULL,
413 413
 					QGQ_order int(10) unsigned NOT NULL DEFAULT 0,
414 414
 					PRIMARY KEY  (QGQ_ID),
415 415
 					KEY QST_ID (QST_ID),
416 416
 					KEY QSG_ID_order (QSG_ID,QGQ_order)";
417
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
417
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
418 418
 
419 419
 
420 420
 
421
-		$table_name='esp_question_option';
422
-		$sql="QSO_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
421
+		$table_name = 'esp_question_option';
422
+		$sql = "QSO_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
423 423
 					QSO_value varchar(255) NOT NULL,
424 424
 					QSO_desc text NOT NULL,
425 425
 					QST_ID int(10) unsigned NOT NULL,
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
429 429
 					PRIMARY KEY  (QSO_ID),
430 430
 					KEY QST_ID (QST_ID),
431 431
 					KEY QSO_order (QSO_order)";
432
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
432
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
433 433
 
434 434
 
435 435
 
@@ -475,8 +475,8 @@  discard block
 block discarded – undo
475 475
 
476 476
 
477 477
 
478
-		$table_name='esp_checkin';
479
-		$sql="CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
478
+		$table_name = 'esp_checkin';
479
+		$sql = "CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
480 480
 					REG_ID int(10) unsigned NOT NULL,
481 481
 					DTT_ID int(10) unsigned NOT NULL,
482 482
 					CHK_in tinyint(1) unsigned NOT NULL DEFAULT 1,
@@ -571,7 +571,7 @@  discard block
 block discarded – undo
571 571
 					  PRC_parent int(10) unsigned DEFAULT 0,
572 572
 					  PRIMARY KEY  (PRC_ID),
573 573
 					  KEY PRT_ID (PRT_ID)";
574
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
574
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
575 575
 
576 576
 		$table_name = "esp_price_type";
577 577
 		$sql = "PRT_ID tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
@@ -609,10 +609,10 @@  discard block
 block discarded – undo
609 609
 					  TKT_deleted tinyint(1) NOT NULL DEFAULT '0',
610 610
 					  PRIMARY KEY  (TKT_ID),
611 611
 					  KEY TKT_start_date (TKT_start_date)";
612
-		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB' );
612
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
613 613
 
614 614
 		$table_name = 'esp_question_group';
615
-		$sql='QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
615
+		$sql = 'QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
616 616
 					QSG_name varchar(255) NOT NULL,
617 617
 					QSG_identifier varchar(100) NOT NULL,
618 618
 					QSG_desc text NULL,
@@ -625,7 +625,7 @@  discard block
 block discarded – undo
625 625
 					PRIMARY KEY  (QSG_ID),
626 626
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier),
627 627
 					KEY QSG_order (QSG_order)';
628
-		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB' );
628
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
629 629
 
630 630
 		/** @var EE_DMS_Core_4_1_0 $script_4_1_defaults */
631 631
 		$script_4_1_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
@@ -661,7 +661,7 @@  discard block
 block discarded – undo
661 661
 		return $script_4_7_defaults->schema_changes_after_migration();
662 662
 	}
663 663
 
664
-	public function migration_page_hooks(){
664
+	public function migration_page_hooks() {
665 665
 
666 666
 	}
667 667
 	
@@ -675,19 +675,19 @@  discard block
 block discarded – undo
675 675
 		//CNT_ISO, CNT_ISO3, RGN_ID, CNT_name, CNT_cur_code, CNT_cur_single, CNT_cur_plural, CNT_cur_sign, CNT_cur_sign_b4, CNT_cur_dec_plc, CNT_tel_code, CNT_is_EU, CNT_active
676 676
 		//('AD', 'AND', 0, 'Andorra', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+376', 0, 0),
677 677
 		$newer_countries = array(
678
-			array( 'AX', 'ALA', 0, 'Alan Islands', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+358', 1, 0 ),
679
-			array( 'BL', 'BLM', 0, 'Saint Barthelemy', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+590', 1, 0 ),
680
-			array( 'CW', 'CUW', 0, 'Curacao', 'ANG', 'Guilder', 'Guilders', 'ƒ', 1, 2, '+599', 1, 0 ),
681
-			array( 'GG', 'GGY', 0, 'Guernsey', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+44', 0, 0 ),
682
-			array( 'IM', 'IMN', 0, 'Isle of Man', 'GBP', 'Pound', 'Pounds', '£', 1, 2,  '+44', 0, 0  ),
683
-			array( 'JE', 'JEY', 0, 'Jersey', 'GBP', 'Pound', 'Pounds', '£', 1, 2, '+44', 0, 0 ),
684
-			array( 'MF', 'MAF', 0, 'Saint Martin', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+590', 1, 0 ),
685
-			array( 'MN', 'MNE', 0, 'Montenegro', 'EUR', 'Euro', 'Euros', '€', 1,  2, '+382', 0, 0 ),
686
-			array( 'RS', 'SRB', 0, 'Serbia', 'RSD', 'Dinar', 'Dinars', '', 0, 2, '+941', 1, 0 ),
687
-			array( 'SS', 'SSD', 0, 'South Sudan', 'SSP', 'Pound', 'Pounds', '£', 1, 2, '+211', 0, 0 ),
688
-			array( 'SX', 'SXM', 0, 'Sint Maarten', 'ANG', 'Guilder', 'Guilders', 'ƒ', 1, 2, '+1', 1, 0 ),
689
-			array( 'XK', 'XKX', 0, 'Kosovo', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+381', 0, 0 ),
690
-			array( 'YT', 'MYT', 0, 'Mayotte', 'EUR', 'Euro', 'Euros', '€', 0, 2, '+262', 1, 0 ),
678
+			array('AX', 'ALA', 0, 'Alan Islands', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+358', 1, 0),
679
+			array('BL', 'BLM', 0, 'Saint Barthelemy', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+590', 1, 0),
680
+			array('CW', 'CUW', 0, 'Curacao', 'ANG', 'Guilder', 'Guilders', 'ƒ', 1, 2, '+599', 1, 0),
681
+			array('GG', 'GGY', 0, 'Guernsey', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+44', 0, 0),
682
+			array('IM', 'IMN', 0, 'Isle of Man', 'GBP', 'Pound', 'Pounds', '£', 1, 2, '+44', 0, 0),
683
+			array('JE', 'JEY', 0, 'Jersey', 'GBP', 'Pound', 'Pounds', '£', 1, 2, '+44', 0, 0),
684
+			array('MF', 'MAF', 0, 'Saint Martin', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+590', 1, 0),
685
+			array('MN', 'MNE', 0, 'Montenegro', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+382', 0, 0),
686
+			array('RS', 'SRB', 0, 'Serbia', 'RSD', 'Dinar', 'Dinars', '', 0, 2, '+941', 1, 0),
687
+			array('SS', 'SSD', 0, 'South Sudan', 'SSP', 'Pound', 'Pounds', '£', 1, 2, '+211', 0, 0),
688
+			array('SX', 'SXM', 0, 'Sint Maarten', 'ANG', 'Guilder', 'Guilders', 'ƒ', 1, 2, '+1', 1, 0),
689
+			array('XK', 'XKX', 0, 'Kosovo', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+381', 0, 0),
690
+			array('YT', 'MYT', 0, 'Mayotte', 'EUR', 'Euro', 'Euros', '€', 0, 2, '+262', 1, 0),
691 691
 		);
692 692
 		global $wpdb;
693 693
 		$country_table = $wpdb->prefix."esp_country";
@@ -706,14 +706,14 @@  discard block
 block discarded – undo
706 706
 							"CNT_is_EU" => '%d',
707 707
 							"CNT_active" => '%d',
708 708
 						);
709
-		if ( EEH_Activation::table_exists( $country_table ) ) {
710
-			foreach( $newer_countries as $country ) {
711
-				$SQL = "SELECT COUNT('CNT_ISO') FROM {$country_table} WHERE CNT_ISO='{$country[0]}' LIMIT 1" ;
709
+		if (EEH_Activation::table_exists($country_table)) {
710
+			foreach ($newer_countries as $country) {
711
+				$SQL = "SELECT COUNT('CNT_ISO') FROM {$country_table} WHERE CNT_ISO='{$country[0]}' LIMIT 1";
712 712
 				$countries = $wpdb->get_var($SQL);
713
-				if ( ! $countries ) {
713
+				if ( ! $countries) {
714 714
 
715
-					$wpdb->insert( $country_table,
716
-							array_combine( array_keys( $country_format), $country ),
715
+					$wpdb->insert($country_table,
716
+							array_combine(array_keys($country_format), $country),
717 717
 							$country_format
718 718
 							);
719 719
 				}
@@ -731,7 +731,7 @@  discard block
 block discarded – undo
731 731
 		// CUR_code, CUR_single, CUR_plural, CUR_sign, CUR_dec_plc, CUR_active
732 732
 		//( 'EUR',  'Euro',  'Euros',  '€',  2,1),
733 733
 		$newer_currencies = array(
734
-			array( 'RSD', 'Dinar', 'Dinars', '', 3, 1 ),
734
+			array('RSD', 'Dinar', 'Dinars', '', 3, 1),
735 735
 		);
736 736
 		global $wpdb;
737 737
 		$currency_table = $wpdb->prefix."esp_currency";
@@ -743,14 +743,14 @@  discard block
 block discarded – undo
743 743
 							"CUR_dec_plc" => '%d',
744 744
 							"CUR_active" => '%d',
745 745
 						);
746
-		if ( EEH_Activation::table_exists( $currency_table ) ) {
747
-			foreach( $newer_currencies as $currency ) {
748
-				$SQL = "SELECT COUNT('CUR_code') FROM {$currency_table} WHERE CUR_code='{$currency[0]}' LIMIT 1" ;
746
+		if (EEH_Activation::table_exists($currency_table)) {
747
+			foreach ($newer_currencies as $currency) {
748
+				$SQL = "SELECT COUNT('CUR_code') FROM {$currency_table} WHERE CUR_code='{$currency[0]}' LIMIT 1";
749 749
 				$countries = $wpdb->get_var($SQL);
750
-				if ( ! $countries ) {
750
+				if ( ! $countries) {
751 751
 
752
-					$wpdb->insert( $currency_table,
753
-							array_combine( array_keys( $currency_format), $currency ),
752
+					$wpdb->insert($currency_table,
753
+							array_combine(array_keys($currency_format), $currency),
754 754
 							$currency_format
755 755
 							);
756 756
 				}
@@ -762,9 +762,9 @@  discard block
 block discarded – undo
762 762
 	 * which should just be a temporary issue for folks who installed 4.8.0-4.8.5;
763 763
 	 * we should be able to stop doing this in 4.9
764 764
 	 */
765
-	public function fix_non_default_taxes(){
765
+	public function fix_non_default_taxes() {
766 766
 		global $wpdb;
767
-		$query = $wpdb->prepare( "UPDATE
767
+		$query = $wpdb->prepare("UPDATE
768 768
 				{$wpdb->prefix}esp_price p INNER JOIN
769 769
 				{$wpdb->prefix}esp_price_type pt ON p.PRT_ID = pt.PRT_ID
770 770
 			SET
@@ -772,7 +772,7 @@  discard block
 block discarded – undo
772 772
 			WHERE
773 773
 				p.PRC_is_default = 0 AND
774 774
 				pt.PBT_ID = %d
775
-					", EEM_Price_Type::base_type_tax );
776
-		$wpdb->query( $query );
775
+					", EEM_Price_Type::base_type_tax);
776
+		$wpdb->query($query);
777 777
 	}
778 778
 }
Please login to merge, or discard this patch.
core/data_migration_scripts/EE_DMS_Unknown_1_0_0.core.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
  */
18 18
 /**
19 19
  */
20
-class EE_DMS_Unknown_1_0_0 extends EE_Data_Migration_Script_Base{
20
+class EE_DMS_Unknown_1_0_0 extends EE_Data_Migration_Script_Base {
21 21
 
22 22
 	/**
23 23
 	 * Returns whether or not this data migration script can operate on the given version of the database.
Please login to merge, or discard this patch.
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_Checkin.class.php 2 patches
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
 do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
3 5
 /**
4 6
  * Event Espresso
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
2
-do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
2
+do_action('AHEE_log', __FILE__, __FUNCTION__, '');
3 3
 /**
4 4
  * Event Espresso
5 5
  *
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
  * @subpackage		includes/classes/EE_Checkin.class.php
24 24
  * @author				Darren Ethier
25 25
  */
26
-class EE_Checkin extends EE_Base_Class{
26
+class EE_Checkin extends EE_Base_Class {
27 27
 
28 28
 	/**
29 29
 	 *
@@ -34,9 +34,9 @@  discard block
 block discarded – undo
34 34
 	 *                             		    date_format and the second value is the time format
35 35
 	 * @return EE_Checkin
36 36
 	 */
37
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
38
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
39
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
37
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
38
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
39
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
40 40
 	}
41 41
 
42 42
 
@@ -47,8 +47,8 @@  discard block
 block discarded – undo
47 47
 	 *                          		the website will be used.
48 48
 	 * @return EE_Checkin
49 49
 	 */
50
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
51
-		return new self( $props_n_values, TRUE, $timezone );
50
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
51
+		return new self($props_n_values, TRUE, $timezone);
52 52
 	}
53 53
 
54 54
 
Please login to merge, or discard this patch.
core/db_classes/EE_Datetime.class.php 3 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.
Spacing   +126 added lines, -126 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
 
@@ -119,8 +119,8 @@  discard block
 block discarded – undo
119 119
 	 * @access        public
120 120
 	 * @param        string $date a string representation of the event's date ex:  Dec. 25, 2025 or 12-25-2025
121 121
 	 */
122
-	public function set_start_date( $date ) {
123
-		$this->_set_date_for( $date, 'DTT_EVT_start' );
122
+	public function set_start_date($date) {
123
+		$this->_set_date_for($date, 'DTT_EVT_start');
124 124
 	}
125 125
 
126 126
 
@@ -133,8 +133,8 @@  discard block
 block discarded – undo
133 133
 	 * @access        public
134 134
 	 * @param        string $time a string representation of the event time ex:  9am  or  7:30 PM
135 135
 	 */
136
-	public function set_start_time( $time ) {
137
-		$this->_set_time_for( $time, 'DTT_EVT_start' );
136
+	public function set_start_time($time) {
137
+		$this->_set_time_for($time, 'DTT_EVT_start');
138 138
 	}
139 139
 
140 140
 
@@ -147,8 +147,8 @@  discard block
 block discarded – undo
147 147
 	 * @access        public
148 148
 	 * @param        string $date a string representation of the event's date ex:  Dec. 25, 2025 or 12-25-2025
149 149
 	 */
150
-	public function set_end_date( $date ) {
151
-		$this->_set_date_for( $date, 'DTT_EVT_end' );
150
+	public function set_end_date($date) {
151
+		$this->_set_date_for($date, 'DTT_EVT_end');
152 152
 	}
153 153
 
154 154
 
@@ -161,8 +161,8 @@  discard block
 block discarded – undo
161 161
 	 * @access        public
162 162
 	 * @param        string $time a string representation of the event time ex:  9am  or  7:30 PM
163 163
 	 */
164
-	public function set_end_time( $time ) {
165
-		$this->_set_time_for( $time, 'DTT_EVT_end' );
164
+	public function set_end_time($time) {
165
+		$this->_set_time_for($time, 'DTT_EVT_end');
166 166
 	}
167 167
 
168 168
 
@@ -175,8 +175,8 @@  discard block
 block discarded – undo
175 175
 	 * @access        public
176 176
 	 * @param        int $reg_limit
177 177
 	 */
178
-	public function set_reg_limit( $reg_limit ) {
179
-		$this->set( 'DTT_reg_limit', $reg_limit );
178
+	public function set_reg_limit($reg_limit) {
179
+		$this->set('DTT_reg_limit', $reg_limit);
180 180
 	}
181 181
 
182 182
 
@@ -187,10 +187,10 @@  discard block
 block discarded – undo
187 187
 	 * @access        public
188 188
 	 * @param        int $sold
189 189
 	 */
190
-	public function set_sold( $sold ) {
190
+	public function set_sold($sold) {
191 191
 		// sold can not go below zero
192
-		$sold = max( 0, $sold );
193
-		$this->set( 'DTT_sold', $sold );
192
+		$sold = max(0, $sold);
193
+		$this->set('DTT_sold', $sold);
194 194
 	}
195 195
 
196 196
 
@@ -199,9 +199,9 @@  discard block
 block discarded – undo
199 199
 	 * increments sold by amount passed by $qty
200 200
 	 * @param int $qty
201 201
 	 */
202
-	function increase_sold( $qty = 1 ) {
202
+	function increase_sold($qty = 1) {
203 203
 		$sold = $this->sold() + $qty;
204
-		$this->set_sold( $sold );
204
+		$this->set_sold($sold);
205 205
 	}
206 206
 
207 207
 
@@ -210,9 +210,9 @@  discard block
 block discarded – undo
210 210
 	 * decrements (subtracts) sold amount passed by $qty
211 211
 	 * @param int $qty
212 212
 	 */
213
-	function decrease_sold( $qty = 1 ) {
213
+	function decrease_sold($qty = 1) {
214 214
 		$sold = $this->sold() - $qty;
215
-		$this->set_sold( $sold );
215
+		$this->set_sold($sold);
216 216
 	}
217 217
 
218 218
 
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 	 * @return string
223 223
 	 */
224 224
 	public function name() {
225
-		return $this->get( 'DTT_name' );
225
+		return $this->get('DTT_name');
226 226
 	}
227 227
 
228 228
 
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
 	 * @return string
233 233
 	 */
234 234
 	public function description() {
235
-		return $this->get( 'DTT_description' );
235
+		return $this->get('DTT_description');
236 236
 	}
237 237
 
238 238
 
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 	 * @return boolean          TRUE if is primary, FALSE if not.
243 243
 	 */
244 244
 	public function is_primary() {
245
-		return $this->get( 'DTT_is_primary' );
245
+		return $this->get('DTT_is_primary');
246 246
 	}
247 247
 
248 248
 
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
 	 * @return int         The order of the datetime for this event.
253 253
 	 */
254 254
 	public function order() {
255
-		return $this->get( 'DTT_order' );
255
+		return $this->get('DTT_order');
256 256
 	}
257 257
 
258 258
 
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
 	 * @return int
263 263
 	 */
264 264
 	public function parent() {
265
-		return $this->get( 'DTT_parent' );
265
+		return $this->get('DTT_parent');
266 266
 	}
267 267
 
268 268
 
@@ -278,10 +278,10 @@  discard block
 block discarded – undo
278 278
 	 * @param    bool   $echo         - whether we echo or return (note echoing uses "pretty" formats, otherwise we use the standard formats)
279 279
 	 * @return    string|bool|void  string on success, FALSE on fail
280 280
 	 */
281
-	private function _show_datetime( $date_or_time = NULL, $start_or_end = 'start', $dt_frmt = '', $tm_frmt = '', $echo = FALSE ) {
281
+	private function _show_datetime($date_or_time = NULL, $start_or_end = 'start', $dt_frmt = '', $tm_frmt = '', $echo = FALSE) {
282 282
 		$field_name = "DTT_EVT_{$start_or_end}";
283
-		$dtt = $this->_get_datetime( $field_name, $dt_frmt, $tm_frmt, $date_or_time, $echo );
284
-		if ( ! $echo ) {
283
+		$dtt = $this->_get_datetime($field_name, $dt_frmt, $tm_frmt, $date_or_time, $echo);
284
+		if ( ! $echo) {
285 285
 			return $dtt;
286 286
 		}
287 287
 		return '';
@@ -297,8 +297,8 @@  discard block
 block discarded – undo
297 297
 	 * @param null $dt_frmt - string representation of date format defaults to 'F j, Y'
298 298
 	 * @return        mixed        string on success, FALSE on fail
299 299
 	 */
300
-	public function start_date( $dt_frmt = NULL ) {
301
-		return $this->_show_datetime( 'D', 'start', $dt_frmt );
300
+	public function start_date($dt_frmt = NULL) {
301
+		return $this->_show_datetime('D', 'start', $dt_frmt);
302 302
 	}
303 303
 
304 304
 
@@ -307,8 +307,8 @@  discard block
 block discarded – undo
307 307
 	 * Echoes start_date()
308 308
 	 * @param string $dt_frmt
309 309
 	 */
310
-	public function e_start_date( $dt_frmt = NULL ) {
311
-		$this->_show_datetime( 'D', 'start', $dt_frmt, NULL, TRUE );
310
+	public function e_start_date($dt_frmt = NULL) {
311
+		$this->_show_datetime('D', 'start', $dt_frmt, NULL, TRUE);
312 312
 	}
313 313
 
314 314
 
@@ -321,8 +321,8 @@  discard block
 block discarded – undo
321 321
 	 * @param null $dt_frmt - string representation of date format defaults to 'F j, Y'
322 322
 	 * @return        mixed        string on success, FALSE on fail
323 323
 	 */
324
-	public function end_date( $dt_frmt = NULL ) {
325
-		return $this->_show_datetime( 'D', 'end', $dt_frmt );
324
+	public function end_date($dt_frmt = NULL) {
325
+		return $this->_show_datetime('D', 'end', $dt_frmt);
326 326
 	}
327 327
 
328 328
 
@@ -331,8 +331,8 @@  discard block
 block discarded – undo
331 331
 	 * Echoes the end date. See end_date()
332 332
 	 * @param string $dt_frmt
333 333
 	 */
334
-	public function e_end_date( $dt_frmt = NULL ) {
335
-		$this->_show_datetime( 'D', 'end', $dt_frmt, NULL, TRUE );
334
+	public function e_end_date($dt_frmt = NULL) {
335
+		$this->_show_datetime('D', 'end', $dt_frmt, NULL, TRUE);
336 336
 	}
337 337
 
338 338
 
@@ -345,11 +345,11 @@  discard block
 block discarded – undo
345 345
 	 * @param        string $conjunction - conjunction junction what's your function ? this string joins the start date with the end date ie: Jan 01 "to" Dec 31
346 346
 	 * @return        mixed        string on success, FALSE on fail
347 347
 	 */
348
-	public function date_range( $dt_frmt = NULL, $conjunction = ' - ' ) {
349
-		$dt_frmt = ! empty( $dt_frmt ) ? $dt_frmt : $this->_dt_frmt;
350
-		$start = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_start', $dt_frmt ) );
351
-		$end = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_end', $dt_frmt ) );
352
-		return $start != $end ? $start . $conjunction . $end : $start;
348
+	public function date_range($dt_frmt = NULL, $conjunction = ' - ') {
349
+		$dt_frmt = ! empty($dt_frmt) ? $dt_frmt : $this->_dt_frmt;
350
+		$start = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_start', $dt_frmt));
351
+		$end = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_end', $dt_frmt));
352
+		return $start != $end ? $start.$conjunction.$end : $start;
353 353
 	}
354 354
 
355 355
 
@@ -358,8 +358,8 @@  discard block
 block discarded – undo
358 358
 	 * @param null   $dt_frmt
359 359
 	 * @param string $conjunction
360 360
 	 */
361
-	public function e_date_range( $dt_frmt = NULL, $conjunction = ' - ' ) {
362
-		echo $this->date_range( $dt_frmt, $conjunction );
361
+	public function e_date_range($dt_frmt = NULL, $conjunction = ' - ') {
362
+		echo $this->date_range($dt_frmt, $conjunction);
363 363
 	}
364 364
 
365 365
 
@@ -371,8 +371,8 @@  discard block
 block discarded – undo
371 371
 	 * @param        string $tm_format - string representation of time format defaults to 'g:i a'
372 372
 	 * @return        mixed        string on success, FALSE on fail
373 373
 	 */
374
-	public function start_time( $tm_format = NULL ) {
375
-		return $this->_show_datetime( 'T', 'start', NULL, $tm_format );
374
+	public function start_time($tm_format = NULL) {
375
+		return $this->_show_datetime('T', 'start', NULL, $tm_format);
376 376
 	}
377 377
 
378 378
 
@@ -380,8 +380,8 @@  discard block
 block discarded – undo
380 380
 	/**
381 381
 	 * @param null $tm_format
382 382
 	 */
383
-	public function e_start_time( $tm_format = NULL ) {
384
-		$this->_show_datetime( 'T', 'start', NULL, $tm_format, TRUE );
383
+	public function e_start_time($tm_format = NULL) {
384
+		$this->_show_datetime('T', 'start', NULL, $tm_format, TRUE);
385 385
 	}
386 386
 
387 387
 
@@ -393,8 +393,8 @@  discard block
 block discarded – undo
393 393
 	 * @param        string $tm_format - string representation of time format defaults to 'g:i a'
394 394
 	 * @return        mixed        string on success, FALSE on fail
395 395
 	 */
396
-	public function end_time( $tm_format = NULL ) {
397
-		return $this->_show_datetime( 'T', 'end', NULL, $tm_format );
396
+	public function end_time($tm_format = NULL) {
397
+		return $this->_show_datetime('T', 'end', NULL, $tm_format);
398 398
 	}
399 399
 
400 400
 
@@ -402,8 +402,8 @@  discard block
 block discarded – undo
402 402
 	/**
403 403
 	 * @param null $tm_format
404 404
 	 */
405
-	public function e_end_time( $tm_format = NULL ) {
406
-		$this->_show_datetime( 'T', 'end', NULL, $tm_format, TRUE );
405
+	public function e_end_time($tm_format = NULL) {
406
+		$this->_show_datetime('T', 'end', NULL, $tm_format, TRUE);
407 407
 	}
408 408
 
409 409
 
@@ -416,12 +416,12 @@  discard block
 block discarded – undo
416 416
 	 * @param        string $conjunction - conjunction junction what's your function ? this string joins the start date with the end date ie: Jan 01 "to" Dec 31
417 417
 	 * @return        mixed        string on success, FALSE on fail
418 418
 	 */
419
-	public function time_range( $tm_format = NULL, $conjunction = ' - ' ) {
420
-		$tm_format = !empty( $tm_format ) ? $tm_format : $this->_tm_frmt;
419
+	public function time_range($tm_format = NULL, $conjunction = ' - ') {
420
+		$tm_format = ! empty($tm_format) ? $tm_format : $this->_tm_frmt;
421 421
 
422
-		$start = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_start', $tm_format ) );
423
-		$end = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_end',  $tm_format ) );
424
-		return $start != $end ? $start . $conjunction . $end : $start;
422
+		$start = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_start', $tm_format));
423
+		$end = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_end', $tm_format));
424
+		return $start != $end ? $start.$conjunction.$end : $start;
425 425
 	}
426 426
 
427 427
 
@@ -430,8 +430,8 @@  discard block
 block discarded – undo
430 430
 	 * @param null   $tm_format
431 431
 	 * @param string $conjunction
432 432
 	 */
433
-	public function e_time_range( $tm_format = NULL, $conjunction = ' - ' ) {
434
-		echo $this->time_range( $tm_format, $conjunction );
433
+	public function e_time_range($tm_format = NULL, $conjunction = ' - ') {
434
+		echo $this->time_range($tm_format, $conjunction);
435 435
 	}
436 436
 
437 437
 
@@ -444,8 +444,8 @@  discard block
 block discarded – undo
444 444
 	 * @param 	string 	$tm_format - string representation of time format defaults to 'g:i a'
445 445
 	 * @return 	mixed 	string on success, FALSE on fail
446 446
 	 */
447
-	public function start_date_and_time( $dt_format = NULL, $tm_format = NULL ) {
448
-		return $this->_show_datetime( '', 'start', $dt_format, $tm_format );
447
+	public function start_date_and_time($dt_format = NULL, $tm_format = NULL) {
448
+		return $this->_show_datetime('', 'start', $dt_format, $tm_format);
449 449
 	}
450 450
 
451 451
 
@@ -454,8 +454,8 @@  discard block
 block discarded – undo
454 454
 	 * @param null $dt_frmt
455 455
 	 * @param null $tm_format
456 456
 	 */
457
-	public function e_start_date_and_time( $dt_frmt = NULL, $tm_format = NULL ) {
458
-		$this->_show_datetime( '', 'start', $dt_frmt, $tm_format, TRUE );
457
+	public function e_start_date_and_time($dt_frmt = NULL, $tm_format = NULL) {
458
+		$this->_show_datetime('', 'start', $dt_frmt, $tm_format, TRUE);
459 459
 	}
460 460
 
461 461
 
@@ -469,11 +469,11 @@  discard block
 block discarded – undo
469 469
 	 * @param bool   $round_up
470 470
 	 * @return float|int|mixed
471 471
 	 */
472
-	public function length( $units = 'seconds', $round_up = FALSE ) {
473
-		$start = $this->get_raw( 'DTT_EVT_start' );
474
-		$end = $this->get_raw( 'DTT_EVT_end' );
472
+	public function length($units = 'seconds', $round_up = FALSE) {
473
+		$start = $this->get_raw('DTT_EVT_start');
474
+		$end = $this->get_raw('DTT_EVT_end');
475 475
 		$length_in_units = $end - $start;
476
-		switch ( $units ) {
476
+		switch ($units) {
477 477
 			//NOTE: We purposefully don't use "break;" in order to chain the divisions
478 478
 			/** @noinspection PhpMissingBreakStatementInspection */
479 479
 			case 'days':
@@ -486,10 +486,10 @@  discard block
 block discarded – undo
486 486
 				$length_in_units /= 60;
487 487
 			case 'seconds':
488 488
 			default:
489
-				$length_in_units = ceil( $length_in_units );
489
+				$length_in_units = ceil($length_in_units);
490 490
 		}
491
-		if ( $round_up ) {
492
-			$length_in_units = max( $length_in_units, 1 );
491
+		if ($round_up) {
492
+			$length_in_units = max($length_in_units, 1);
493 493
 		}
494 494
 		return $length_in_units;
495 495
 	}
@@ -504,8 +504,8 @@  discard block
 block discarded – undo
504 504
 	 * @param bool | string 	$tm_format - string representation of time format defaults to 'g:i a'
505 505
 	 * @return 	mixed        		string on success, FALSE on fail
506 506
 	 */
507
-	public function end_date_and_time( $dt_frmt = FALSE, $tm_format = FALSE ) {
508
-		return $this->_show_datetime( '', 'end', $dt_frmt, $tm_format );
507
+	public function end_date_and_time($dt_frmt = FALSE, $tm_format = FALSE) {
508
+		return $this->_show_datetime('', 'end', $dt_frmt, $tm_format);
509 509
 	}
510 510
 
511 511
 
@@ -514,8 +514,8 @@  discard block
 block discarded – undo
514 514
 	 * @param bool $dt_frmt
515 515
 	 * @param bool $tm_format
516 516
 	 */
517
-	public function e_end_date_and_time( $dt_frmt = FALSE, $tm_format = FALSE ) {
518
-		$this->_show_datetime( '', 'end', $dt_frmt, $tm_format, TRUE );
517
+	public function e_end_date_and_time($dt_frmt = FALSE, $tm_format = FALSE) {
518
+		$this->_show_datetime('', 'end', $dt_frmt, $tm_format, TRUE);
519 519
 	}
520 520
 
521 521
 
@@ -527,7 +527,7 @@  discard block
 block discarded – undo
527 527
 	 * @return        int
528 528
 	 */
529 529
 	public function start() {
530
-		return $this->get_raw( 'DTT_EVT_start' );
530
+		return $this->get_raw('DTT_EVT_start');
531 531
 	}
532 532
 
533 533
 
@@ -539,7 +539,7 @@  discard block
 block discarded – undo
539 539
 	 * @return        int
540 540
 	 */
541 541
 	public function end() {
542
-		return $this->get_raw( 'DTT_EVT_end' );
542
+		return $this->get_raw('DTT_EVT_end');
543 543
 	}
544 544
 
545 545
 
@@ -551,7 +551,7 @@  discard block
 block discarded – undo
551 551
 	 * @return        mixed        int on success, FALSE on fail
552 552
 	 */
553 553
 	public function reg_limit() {
554
-		return $this->get_raw( 'DTT_reg_limit' );
554
+		return $this->get_raw('DTT_reg_limit');
555 555
 	}
556 556
 
557 557
 
@@ -563,7 +563,7 @@  discard block
 block discarded – undo
563 563
 	 * @return        mixed        int on success, FALSE on fail
564 564
 	 */
565 565
 	public function sold() {
566
-		return $this->get_raw( 'DTT_sold' );
566
+		return $this->get_raw('DTT_sold');
567 567
 	}
568 568
 
569 569
 
@@ -592,15 +592,15 @@  discard block
 block discarded – undo
592 592
 	 * 																	the spaces remaining for this particular datetime, hence the flag.
593 593
 	 * @return 	int
594 594
 	 */
595
-	public function spaces_remaining( $consider_tickets = FALSE ) {
595
+	public function spaces_remaining($consider_tickets = FALSE) {
596 596
 		// tickets remaining available for purchase
597 597
 		//no need for special checks for infinite, because if DTT_reg_limit == EE_INF, then EE_INF - x = EE_INF
598 598
 		$dtt_remaining = $this->reg_limit() - $this->sold();
599
-		if ( ! $consider_tickets ) {
599
+		if ( ! $consider_tickets) {
600 600
 			return $dtt_remaining;
601 601
 		}
602 602
 		$tickets_remaining = $this->tickets_remaining();
603
-		return min( $dtt_remaining, $tickets_remaining );
603
+		return min($dtt_remaining, $tickets_remaining);
604 604
 	}
605 605
 
606 606
 
@@ -611,19 +611,19 @@  discard block
 block discarded – undo
611 611
 	 * @param array $query_params like EEM_Base::get_all's
612 612
 	 * @return int
613 613
 	 */
614
-	public function tickets_remaining( $query_params = array() ) {
614
+	public function tickets_remaining($query_params = array()) {
615 615
 		$sum = 0;
616
-		$tickets = $this->tickets( $query_params );
617
-		if ( ! empty( $tickets ) ) {
618
-			foreach ( $tickets as $ticket ) {
619
-				if ( $ticket instanceof EE_Ticket ) {
616
+		$tickets = $this->tickets($query_params);
617
+		if ( ! empty($tickets)) {
618
+			foreach ($tickets as $ticket) {
619
+				if ($ticket instanceof EE_Ticket) {
620 620
 					// get the actual amount of tickets that can be sold
621
-					$qty = $ticket->qty( 'saleable' );
622
-					if ( $qty === EE_INF ) {
621
+					$qty = $ticket->qty('saleable');
622
+					if ($qty === EE_INF) {
623 623
 						return EE_INF;
624 624
 					}
625 625
 					// no negative ticket quantities plz
626
-					if ( $qty > 0 ) {
626
+					if ($qty > 0) {
627 627
 						$sum += $qty;
628 628
 					}
629 629
 				}
@@ -640,8 +640,8 @@  discard block
 block discarded – undo
640 640
 	 * @param array $query_params like EEM_Base::get_all's
641 641
 	 * @return int
642 642
 	 */
643
-	public function sum_tickets_initially_available( $query_params = array() ) {
644
-		return $this->sum_related( 'Ticket', $query_params, 'TKT_qty' );
643
+	public function sum_tickets_initially_available($query_params = array()) {
644
+		return $this->sum_related('Ticket', $query_params, 'TKT_qty');
645 645
 	}
646 646
 
647 647
 
@@ -653,7 +653,7 @@  discard block
 block discarded – undo
653 653
 	 * @return int
654 654
 	 */
655 655
 	public function total_tickets_available_at_this_datetime() {
656
-		return $this->spaces_remaining( true );
656
+		return $this->spaces_remaining(true);
657 657
 	}
658 658
 
659 659
 
@@ -664,7 +664,7 @@  discard block
 block discarded – undo
664 664
 	 * @return boolean
665 665
 	 */
666 666
 	public function is_upcoming() {
667
-		return ( $this->get_raw( 'DTT_EVT_start' ) > time() );
667
+		return ($this->get_raw('DTT_EVT_start') > time());
668 668
 	}
669 669
 
670 670
 
@@ -674,7 +674,7 @@  discard block
 block discarded – undo
674 674
 	 * @return boolean
675 675
 	 */
676 676
 	public function is_active() {
677
-		return ( $this->get_raw( 'DTT_EVT_start' ) < time() && $this->get_raw( 'DTT_EVT_end' ) > time() );
677
+		return ($this->get_raw('DTT_EVT_start') < time() && $this->get_raw('DTT_EVT_end') > time());
678 678
 	}
679 679
 
680 680
 
@@ -684,7 +684,7 @@  discard block
 block discarded – undo
684 684
 	 * @return boolean
685 685
 	 */
686 686
 	public function is_expired() {
687
-		return ( $this->get_raw( 'DTT_EVT_end' ) < time() );
687
+		return ($this->get_raw('DTT_EVT_end') < time());
688 688
 	}
689 689
 
690 690
 
@@ -695,16 +695,16 @@  discard block
 block discarded – undo
695 695
 	 */
696 696
 	public function get_active_status() {
697 697
 		$total_tickets_for_this_dtt = $this->total_tickets_available_at_this_datetime();
698
-		if ( $total_tickets_for_this_dtt !== FALSE && $total_tickets_for_this_dtt < 1 ) {
698
+		if ($total_tickets_for_this_dtt !== FALSE && $total_tickets_for_this_dtt < 1) {
699 699
 			return EE_Datetime::sold_out;
700 700
 		}
701
-		if ( $this->is_expired() ) {
701
+		if ($this->is_expired()) {
702 702
 			return EE_Datetime::expired;
703 703
 		}
704
-		if ( $this->is_upcoming() ) {
704
+		if ($this->is_upcoming()) {
705 705
 			return EE_Datetime::upcoming;
706 706
 		}
707
-		if ( $this->is_active() ) {
707
+		if ($this->is_active()) {
708 708
 			return EE_Datetime::active;
709 709
 		}
710 710
 		return NULL;
@@ -718,24 +718,24 @@  discard block
 block discarded – undo
718 718
 	 * @param  boolean $use_dtt_name if TRUE then we'll use DTT->name() if its not empty.
719 719
 	 * @return string
720 720
 	 */
721
-	public function get_dtt_display_name( $use_dtt_name = FALSE ) {
722
-		if ( $use_dtt_name ) {
721
+	public function get_dtt_display_name($use_dtt_name = FALSE) {
722
+		if ($use_dtt_name) {
723 723
 			$dtt_name = $this->name();
724
-			if ( !empty( $dtt_name ) ) {
724
+			if ( ! empty($dtt_name)) {
725 725
 				return $dtt_name;
726 726
 			}
727 727
 		}
728 728
 		//first condition is to see if the months are different
729
-		if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) ) {
730
-			$display_date = $this->start_date( 'M j\, Y g:i a' ) . ' - ' . $this->end_date( 'M j\, Y g:i a' );
729
+		if (date('m', $this->get_raw('DTT_EVT_start')) != date('m', $this->get_raw('DTT_EVT_end'))) {
730
+			$display_date = $this->start_date('M j\, Y g:i a').' - '.$this->end_date('M j\, Y g:i a');
731 731
 			//next condition is if its the same month but different day
732 732
 		}
733 733
 		else {
734
-			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' ) ) ) {
735
-				$display_date = $this->start_date( 'M j\, g:i a' ) . ' - ' . $this->end_date( 'M j\, g:i a Y' );
734
+			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'))) {
735
+				$display_date = $this->start_date('M j\, g:i a').' - '.$this->end_date('M j\, g:i a Y');
736 736
 			}
737 737
 			else {
738
-				$display_date = $this->start_date( 'F j\, Y' ) . ' @ ' . $this->start_date( 'g:i a' ) . ' - ' . $this->end_date( 'g:i a' );
738
+				$display_date = $this->start_date('F j\, Y').' @ '.$this->start_date('g:i a').' - '.$this->end_date('g:i a');
739 739
 			}
740 740
 		}
741 741
 		return $display_date;
@@ -749,8 +749,8 @@  discard block
 block discarded – undo
749 749
 *@param array $query_params see EEM_Base::get_all()
750 750
 	 * @return EE_Ticket[]
751 751
 	 */
752
-	public function tickets( $query_params = array() ) {
753
-		return $this->get_many_related( 'Ticket', $query_params );
752
+	public function tickets($query_params = array()) {
753
+		return $this->get_many_related('Ticket', $query_params);
754 754
 	}
755 755
 
756 756
 
@@ -760,21 +760,21 @@  discard block
 block discarded – undo
760 760
 	 * @param array $query_params like EEM_Base::get_all's
761 761
 	 * @return EE_Ticket[]
762 762
 	 */
763
-	public function ticket_types_available_for_purchase( $query_params = array() ) {
763
+	public function ticket_types_available_for_purchase($query_params = array()) {
764 764
 		// first check if datetime is valid
765
-		if ( ! ( $this->is_upcoming() || $this->is_active() ) || $this->sold_out() ) {
765
+		if ( ! ($this->is_upcoming() || $this->is_active()) || $this->sold_out()) {
766 766
 			return array();
767 767
 		}
768
-		if ( empty( $query_params ) ) {
768
+		if (empty($query_params)) {
769 769
 			$query_params = array(
770 770
 				array(
771
-					'TKT_start_date' => array( '<=', EEM_Ticket::instance()->current_time_for_query( 'TKT_start_date' ) ),
772
-					'TKT_end_date'   => array( '>=', EEM_Ticket::instance()->current_time_for_query( 'TKT_end_date' ) ),
771
+					'TKT_start_date' => array('<=', EEM_Ticket::instance()->current_time_for_query('TKT_start_date')),
772
+					'TKT_end_date'   => array('>=', EEM_Ticket::instance()->current_time_for_query('TKT_end_date')),
773 773
 					'TKT_deleted'    => false
774 774
 				)
775 775
 			);
776 776
 		}
777
-		return $this->tickets( $query_params );
777
+		return $this->tickets($query_params);
778 778
 	}
779 779
 
780 780
 
@@ -784,7 +784,7 @@  discard block
 block discarded – undo
784 784
 	 * @return EE_Event
785 785
 	 */
786 786
 	public function event() {
787
-		return $this->get_first_related( 'Event' );
787
+		return $this->get_first_related('Event');
788 788
 	}
789 789
 
790 790
 
@@ -796,13 +796,13 @@  discard block
 block discarded – undo
796 796
 	 */
797 797
 	public function update_sold() {
798 798
 		$count_regs_for_this_datetime = EEM_Registration::instance()->count(
799
-			array( array(
799
+			array(array(
800 800
 				'STS_ID' 					=> EEM_Registration::status_id_approved,
801 801
 				'REG_deleted' 				=> 0,
802 802
 				'Ticket.Datetime.DTT_ID' 	=> $this->ID(),
803
-			) )
803
+			))
804 804
 		);
805
-		$this->set( 'DTT_sold', $count_regs_for_this_datetime );
805
+		$this->set('DTT_sold', $count_regs_for_this_datetime);
806 806
 		$this->save();
807 807
 		return $count_regs_for_this_datetime;
808 808
 	}
Please login to merge, or discard this patch.
Doc Comments   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
 	 * @param    string $dt_frmt
277 277
 	 * @param    string $tm_frmt
278 278
 	 * @param    bool   $echo         - whether we echo or return (note echoing uses "pretty" formats, otherwise we use the standard formats)
279
-	 * @return    string|bool|void  string on success, FALSE on fail
279
+	 * @return    null|string  string on success, FALSE on fail
280 280
 	 */
281 281
 	private function _show_datetime( $date_or_time = NULL, $start_or_end = 'start', $dt_frmt = '', $tm_frmt = '', $echo = FALSE ) {
282 282
 		$field_name = "DTT_EVT_{$start_or_end}";
@@ -294,8 +294,8 @@  discard block
 block discarded – undo
294 294
 	 * last-used format, or '' to use the default date format
295 295
 	 *
296 296
 	 * @access        public
297
-	 * @param null $dt_frmt - string representation of date format defaults to 'F j, Y'
298
-	 * @return        mixed        string on success, FALSE on fail
297
+	 * @param string $dt_frmt - string representation of date format defaults to 'F j, Y'
298
+	 * @return        null|string        string on success, FALSE on fail
299 299
 	 */
300 300
 	public function start_date( $dt_frmt = NULL ) {
301 301
 		return $this->_show_datetime( 'D', 'start', $dt_frmt );
@@ -318,8 +318,8 @@  discard block
 block discarded – undo
318 318
 	 * last-used format, or '' to use the default date format
319 319
 	 *
320 320
 	 * @access        public
321
-	 * @param null $dt_frmt - string representation of date format defaults to 'F j, Y'
322
-	 * @return        mixed        string on success, FALSE on fail
321
+	 * @param string $dt_frmt - string representation of date format defaults to 'F j, Y'
322
+	 * @return        null|string        string on success, FALSE on fail
323 323
 	 */
324 324
 	public function end_date( $dt_frmt = NULL ) {
325 325
 		return $this->_show_datetime( 'D', 'end', $dt_frmt );
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
343 343
 	 * @access        public
344 344
 	 * @param null          $dt_frmt - string representation of date format defaults to WP settings
345 345
 	 * @param        string $conjunction - conjunction junction what's your function ? this string joins the start date with the end date ie: Jan 01 "to" Dec 31
346
-	 * @return        mixed        string on success, FALSE on fail
346
+	 * @return        string        string on success, FALSE on fail
347 347
 	 */
348 348
 	public function date_range( $dt_frmt = NULL, $conjunction = ' - ' ) {
349 349
 		$dt_frmt = ! empty( $dt_frmt ) ? $dt_frmt : $this->_dt_frmt;
@@ -369,7 +369,7 @@  discard block
 block discarded – undo
369 369
 	 *
370 370
 	 * @access        public
371 371
 	 * @param        string $tm_format - string representation of time format defaults to 'g:i a'
372
-	 * @return        mixed        string on success, FALSE on fail
372
+	 * @return        null|string        string on success, FALSE on fail
373 373
 	 */
374 374
 	public function start_time( $tm_format = NULL ) {
375 375
 		return $this->_show_datetime( 'T', 'start', NULL, $tm_format );
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
 	 *
392 392
 	 * @access        public
393 393
 	 * @param        string $tm_format - string representation of time format defaults to 'g:i a'
394
-	 * @return        mixed        string on success, FALSE on fail
394
+	 * @return        null|string        string on success, FALSE on fail
395 395
 	 */
396 396
 	public function end_time( $tm_format = NULL ) {
397 397
 		return $this->_show_datetime( 'T', 'end', NULL, $tm_format );
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
 	 * @access        public
415 415
 	 * @param        string $tm_format   - string representation of time format defaults to 'g:i a'
416 416
 	 * @param        string $conjunction - conjunction junction what's your function ? this string joins the start date with the end date ie: Jan 01 "to" Dec 31
417
-	 * @return        mixed        string on success, FALSE on fail
417
+	 * @return        string        string on success, FALSE on fail
418 418
 	 */
419 419
 	public function time_range( $tm_format = NULL, $conjunction = ' - ' ) {
420 420
 		$tm_format = !empty( $tm_format ) ? $tm_format : $this->_tm_frmt;
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
442 442
 	 * @access        public
443 443
 	 * @param 	string 	$dt_format - string representation of date format defaults to 'F j, Y'
444 444
 	 * @param 	string 	$tm_format - string representation of time format defaults to 'g:i a'
445
-	 * @return 	mixed 	string on success, FALSE on fail
445
+	 * @return 	null|string 	string on success, FALSE on fail
446 446
 	 */
447 447
 	public function start_date_and_time( $dt_format = NULL, $tm_format = NULL ) {
448 448
 		return $this->_show_datetime( '', 'start', $dt_format, $tm_format );
@@ -502,7 +502,7 @@  discard block
 block discarded – undo
502 502
 	 * @access        public
503 503
 	 * @param bool | string 	$dt_frmt- string representation of date format defaults to 'F j, Y'
504 504
 	 * @param bool | string 	$tm_format - string representation of time format defaults to 'g:i a'
505
-	 * @return 	mixed        		string on success, FALSE on fail
505
+	 * @return 	null|string        		string on success, FALSE on fail
506 506
 	 */
507 507
 	public function end_date_and_time( $dt_frmt = FALSE, $tm_format = FALSE ) {
508 508
 		return $this->_show_datetime( '', 'end', $dt_frmt, $tm_format );
Please login to merge, or discard this patch.