Completed
Branch BUG/11214/move-command-handler... (de017e)
by
unknown
05:27 queued 03:19
created
core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_prices.dmsstage.php 2 patches
Spacing   +74 added lines, -74 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 			));
87 87
  */
88 88
 
89
-class EE_DMS_4_1_0_prices extends EE_Data_Migration_Script_Stage_Table{
89
+class EE_DMS_4_1_0_prices extends EE_Data_Migration_Script_Stage_Table {
90 90
 	private $_new_price_table;
91 91
 	private $_new_ticket_table;
92 92
 	private $_new_ticket_price_table;
@@ -122,10 +122,10 @@  discard block
 block discarded – undo
122 122
 //			$member_price_discount_id = 0;
123 123
 //		}
124 124
 		//create the surcharge if there is any
125
-		if(floatval($old_row['surcharge']) >= 0.01){
125
+		if (floatval($old_row['surcharge']) >= 0.01) {
126 126
 			$surcharge_price_id = $this->_insert_new_surcharge_price($old_row);
127
-			$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_price_table, array($new_price_id,$surcharge_price_id));
128
-		}else{
127
+			$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_price_table, array($new_price_id, $surcharge_price_id));
128
+		} else {
129 129
 			$surcharge_price_id = 0;
130 130
 			$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_price_table, array($new_price_id));
131 131
 		}
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 //		}
146 146
 		//create a ticket for each old price -old datetime combo
147 147
 		$tickets_for_old_price = array();
148
-		foreach($this->_get_datetime_ids_for_old_event_id($old_row['event_id']) as $new_datetime_id){
148
+		foreach ($this->_get_datetime_ids_for_old_event_id($old_row['event_id']) as $new_datetime_id) {
149 149
 			$ticket_id = $this->_insert_new_ticket($old_row);
150 150
 			$tickets_for_old_price[] = $ticket_id;
151 151
 			//associate to old prices
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 	 * @param type $old_price
163 163
 	 * @return int
164 164
 	 */
165
-	private function _insert_new_price($old_price){
165
+	private function _insert_new_price($old_price) {
166 166
 		global $wpdb;
167 167
 		$cols_n_values = array(
168 168
 			'PRT_ID'=>self::price_type_base,
@@ -176,17 +176,17 @@  discard block
 block discarded – undo
176 176
 
177 177
 		);
178 178
 		$datatypes = array(
179
-			'%d',//PRT_ID
180
-			'%f',//PRT_amount
181
-			'%s',//PRC_name
182
-			'%d',//PRC_is_default
183
-			'%d',//PRC_overrides
184
-			'%d',//PRC_order
185
-			'%d',//PRC_deleted
186
-			'%d',//PRC_parent
179
+			'%d', //PRT_ID
180
+			'%f', //PRT_amount
181
+			'%s', //PRC_name
182
+			'%d', //PRC_is_default
183
+			'%d', //PRC_overrides
184
+			'%d', //PRC_order
185
+			'%d', //PRC_deleted
186
+			'%d', //PRC_parent
187 187
 		);
188
-		$success = $wpdb->insert($this->_new_price_table,$cols_n_values,$datatypes);
189
-		if ( ! $success){
188
+		$success = $wpdb->insert($this->_new_price_table, $cols_n_values, $datatypes);
189
+		if ( ! $success) {
190 190
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_price, $this->_new_price_table, $cols_n_values, $datatypes));
191 191
 			return 0;
192 192
 		}
@@ -237,11 +237,11 @@  discard block
 block discarded – undo
237 237
 	 * @param type $old_price
238 238
 	 * @return int
239 239
 	 */
240
-	private function _insert_new_surcharge_price($old_price){
240
+	private function _insert_new_surcharge_price($old_price) {
241 241
 
242
-		if($old_price['surcharge_type'] == 'flat_rate'){
242
+		if ($old_price['surcharge_type'] == 'flat_rate') {
243 243
 			$price_type = self::price_type_flat_surcharge;
244
-		}else{
244
+		} else {
245 245
 			$price_type = self::price_type_percent_surcharge;
246 246
 		}
247 247
 		global $wpdb;
@@ -257,17 +257,17 @@  discard block
 block discarded – undo
257 257
 
258 258
 		);
259 259
 		$datatypes = array(
260
-			'%d',//PRT_ID
261
-			'%f',//PRT_amount
262
-			'%s',//PRC_name
263
-			'%d',//PRC_is_default
264
-			'%d',//PRC_overrides
265
-			'%d',//PRC_order
266
-			'%d',//PRC_deleted
267
-			'%d',//PRC_parent
260
+			'%d', //PRT_ID
261
+			'%f', //PRT_amount
262
+			'%s', //PRC_name
263
+			'%d', //PRC_is_default
264
+			'%d', //PRC_overrides
265
+			'%d', //PRC_order
266
+			'%d', //PRC_deleted
267
+			'%d', //PRC_parent
268 268
 		);
269
-		$success = $wpdb->insert($this->_new_price_table,$cols_n_values,$datatypes);
270
-		if ( ! $success){
269
+		$success = $wpdb->insert($this->_new_price_table, $cols_n_values, $datatypes);
270
+		if ( ! $success) {
271 271
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_price, $this->_new_price_table, $cols_n_values, $datatypes));
272 272
 			return 0;
273 273
 		}
@@ -282,18 +282,18 @@  discard block
 block discarded – undo
282 282
 	 * @param $new_surcharge_id int
283 283
 	 * @return int new ticket id
284 284
 	 */
285
-	private function _insert_new_ticket($old_price_row){
285
+	private function _insert_new_ticket($old_price_row) {
286 286
 		global $wpdb;
287 287
 		$event_row = $this->_get_event_row($old_price_row['event_id']);
288
-		if($old_price_row['surcharge_type'] == 'flat_rate'){
288
+		if ($old_price_row['surcharge_type'] == 'flat_rate') {
289 289
 			$final_ticket_price = floatval($old_price_row['event_cost']) + floatval($old_price_row['surcharge']);
290
-		}else{//percent surcharge
291
-			$final_ticket_price = floatval($old_price_row['event_cost']) * (1 + floatval($old_price_row['surcharge'])/100);
290
+		} else {//percent surcharge
291
+			$final_ticket_price = floatval($old_price_row['event_cost']) * (1 + floatval($old_price_row['surcharge']) / 100);
292 292
 		}
293 293
 		$start_date = $event_row['registration_start']." ".$this->get_migration_script()->convertTimeFromAMPM($event_row['registration_startT']);
294
-		$start_date_utc = $this->get_migration_script()->convert_date_string_to_utc($this,$old_price_row,$start_date,$event_row['timezone_string']);
294
+		$start_date_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $old_price_row, $start_date, $event_row['timezone_string']);
295 295
 		$end_date = $event_row['registration_end']." ".$this->get_migration_script()->convertTimeFromAMPM($event_row['registration_endT']);
296
-		$end_date_utc = $this->get_migration_script()->convert_date_string_to_utc($this,$old_price_row,$end_date,$event_row['timezone_string']);
296
+		$end_date_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $old_price_row, $end_date, $event_row['timezone_string']);
297 297
 		$cols_n_values = array(
298 298
 			'TTM_ID'=>0,
299 299
 			'TKT_name'=>$old_price_row['price_type'],
@@ -303,38 +303,38 @@  discard block
 block discarded – undo
303 303
 			'TKT_min'=>0,
304 304
 			'TKT_max'=>-1,
305 305
 			'TKT_price'=>$final_ticket_price,
306
-			'TKT_sold'=> 0,//note: this will get calculated as we actually add registrations during the migration
306
+			'TKT_sold'=> 0, //note: this will get calculated as we actually add registrations during the migration
307 307
 			'TKT_qty'=> -1,
308 308
 			'TKT_uses'=> 1,
309
-			'TKT_taxable'=>false,//so by default, old prices are NOT taxable. This way they don't suddenly have a sudden spike in prices
309
+			'TKT_taxable'=>false, //so by default, old prices are NOT taxable. This way they don't suddenly have a sudden spike in prices
310 310
 			'TKT_is_default'=>false,
311 311
 			'TKT_order'=>$this->_get_ticket_count(),
312
-			'TKT_row'=>0,//doesn't matter because UI reset this on first save anyways
312
+			'TKT_row'=>0, //doesn't matter because UI reset this on first save anyways
313 313
 			'TKT_deleted'=>false,
314 314
 			'TKT_parent'=>0
315 315
 
316 316
 		);
317 317
 		$datatypes = array(
318
-			'%d',//TTM_ID
319
-			'%s',//TKT_name
320
-			'%s',//TKT_description
321
-			'%s',//TKT_start_date
322
-			'%s',//TKT_end_date
323
-			'%d',//TKT_min
324
-			'%d',//TKT_max
325
-			'%f',//TKT_price
326
-			'%d',//TKT_sold
327
-			'%d',//TKT_qty
328
-			'%d',//TKT_uses
329
-			'%d',//TKT_taxable
330
-			'%d',//TKT_is_default
331
-			'%d',//TKT_order
332
-			'%d',//TKT_row
333
-			'%d',//TKT_deleted
334
-			'%d',//TKT_parent
318
+			'%d', //TTM_ID
319
+			'%s', //TKT_name
320
+			'%s', //TKT_description
321
+			'%s', //TKT_start_date
322
+			'%s', //TKT_end_date
323
+			'%d', //TKT_min
324
+			'%d', //TKT_max
325
+			'%f', //TKT_price
326
+			'%d', //TKT_sold
327
+			'%d', //TKT_qty
328
+			'%d', //TKT_uses
329
+			'%d', //TKT_taxable
330
+			'%d', //TKT_is_default
331
+			'%d', //TKT_order
332
+			'%d', //TKT_row
333
+			'%d', //TKT_deleted
334
+			'%d', //TKT_parent
335 335
 		);
336
-		$success = $wpdb->insert($this->_new_ticket_table,$cols_n_values,$datatypes);
337
-		if ( ! $success){
336
+		$success = $wpdb->insert($this->_new_ticket_table, $cols_n_values, $datatypes);
337
+		if ( ! $success) {
338 338
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_price_row, $this->_new_ticket_table, $cols_n_values, $datatypes));
339 339
 			return 0;
340 340
 		}
@@ -349,19 +349,19 @@  discard block
 block discarded – undo
349 349
 	 * @param type $new_price_id
350 350
 	 * @return int
351 351
 	 */
352
-	private function _insert_ticket_price_relation($new_ticket_id,$new_price_id){
352
+	private function _insert_ticket_price_relation($new_ticket_id, $new_price_id) {
353 353
 		global $wpdb;
354 354
 		$cols_n_values = array(
355 355
 			'TKT_ID'=>$new_ticket_id,
356 356
 			'PRC_ID'=>$new_price_id,
357 357
 		);
358 358
 		$datatypes = array(
359
-			'%d',//TKT_ID
360
-			'%d',//PRC_ID
359
+			'%d', //TKT_ID
360
+			'%d', //PRC_ID
361 361
 		);
362
-		$success = $wpdb->insert($this->_new_ticket_price_table,$cols_n_values,$datatypes);
363
-		if ( ! $success){
364
-			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('ticket id'=>$new_ticket_id,'price id'=>$new_price_id), $this->_new_ticket_price_table, $cols_n_values, $datatypes));
362
+		$success = $wpdb->insert($this->_new_ticket_price_table, $cols_n_values, $datatypes);
363
+		if ( ! $success) {
364
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('ticket id'=>$new_ticket_id, 'price id'=>$new_price_id), $this->_new_ticket_price_table, $cols_n_values, $datatypes));
365 365
 			return 0;
366 366
 		}
367 367
 		$new_id = $wpdb->insert_id;
@@ -375,19 +375,19 @@  discard block
 block discarded – undo
375 375
 	 * @param type $new_price_id
376 376
 	 * @return int
377 377
 	 */
378
-	private function _insert_datetime_ticket_relation($new_datetime_id,$new_ticket_id){
378
+	private function _insert_datetime_ticket_relation($new_datetime_id, $new_ticket_id) {
379 379
 		global $wpdb;
380 380
 		$cols_n_values = array(
381 381
 			'TKT_ID'=>$new_ticket_id,
382 382
 			'DTT_ID'=>$new_datetime_id,
383 383
 		);
384 384
 		$datatypes = array(
385
-			'%d',//TKT_ID
386
-			'%d',//DTT_ID
385
+			'%d', //TKT_ID
386
+			'%d', //DTT_ID
387 387
 		);
388
-		$success = $wpdb->insert($this->_new_datetime_ticket_table,$cols_n_values,$datatypes);
389
-		if ( ! $success){
390
-			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('ticket id'=>$new_ticket_id,'datetime id'=>$new_datetime_id), $this->_new_datetime_ticket_table, $cols_n_values, $datatypes));
388
+		$success = $wpdb->insert($this->_new_datetime_ticket_table, $cols_n_values, $datatypes);
389
+		if ( ! $success) {
390
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('ticket id'=>$new_ticket_id, 'datetime id'=>$new_datetime_id), $this->_new_datetime_ticket_table, $cols_n_values, $datatypes));
391 391
 			return 0;
392 392
 		}
393 393
 		$new_id = $wpdb->insert_id;
@@ -400,17 +400,17 @@  discard block
 block discarded – undo
400 400
 	 * @param type $event_id
401 401
 	 * @return array
402 402
 	 */
403
-	private function _get_event_row($event_id){
403
+	private function _get_event_row($event_id) {
404 404
 		global $wpdb;
405 405
 		$old_event_table = $wpdb->prefix."events_detail";
406
-		return $wpdb->get_row($wpdb->prepare("SELECT * FROM $old_event_table WHERE id=%d",$event_id),ARRAY_A);
406
+		return $wpdb->get_row($wpdb->prepare("SELECT * FROM $old_event_table WHERE id=%d", $event_id), ARRAY_A);
407 407
 	}
408 408
 	/**
409 409
 	 * Gets a higher ticket count than last time it was called (and is persisted between HTTP requests).
410 410
 	 * Yes we COULD run a query joining events->datetimes->ticket_datetimes->tickets, but this should work fine too
411 411
 	 * @return int
412 412
 	 */
413
-	private function _get_ticket_count(){
413
+	private function _get_ticket_count() {
414 414
 		return $this->_ticket_count++;
415 415
 	}
416 416
 
@@ -419,10 +419,10 @@  discard block
 block discarded – undo
419 419
 	 * @param int $old_event_id
420 420
 	 * @return array where values are datetime ids
421 421
 	 */
422
-	private function _get_datetime_ids_for_old_event_id($old_event_id){
422
+	private function _get_datetime_ids_for_old_event_id($old_event_id) {
423 423
 		global $wpdb;
424 424
 		$new_cpt_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_detail", $old_event_id, $wpdb->posts);
425
-		$datetime_ids = $wpdb->get_col($wpdb->prepare("SELECT DTT_ID FROM {$wpdb->prefix}esp_datetime WHERE EVT_ID=%d",$new_cpt_id));
425
+		$datetime_ids = $wpdb->get_col($wpdb->prepare("SELECT DTT_ID FROM {$wpdb->prefix}esp_datetime WHERE EVT_ID=%d", $new_cpt_id));
426 426
 		return $datetime_ids;
427 427
 	}
428 428
 }
Please login to merge, or discard this patch.
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 		if(floatval($old_row['surcharge']) >= 0.01){
126 126
 			$surcharge_price_id = $this->_insert_new_surcharge_price($old_row);
127 127
 			$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_price_table, array($new_price_id,$surcharge_price_id));
128
-		}else{
128
+		} else{
129 129
 			$surcharge_price_id = 0;
130 130
 			$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_price_table, array($new_price_id));
131 131
 		}
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
 
242 242
 		if($old_price['surcharge_type'] == 'flat_rate'){
243 243
 			$price_type = self::price_type_flat_surcharge;
244
-		}else{
244
+		} else{
245 245
 			$price_type = self::price_type_percent_surcharge;
246 246
 		}
247 247
 		global $wpdb;
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
 		$event_row = $this->_get_event_row($old_price_row['event_id']);
288 288
 		if($old_price_row['surcharge_type'] == 'flat_rate'){
289 289
 			$final_ticket_price = floatval($old_price_row['event_cost']) + floatval($old_price_row['surcharge']);
290
-		}else{//percent surcharge
290
+		} else{//percent surcharge
291 291
 			$final_ticket_price = floatval($old_price_row['event_cost']) * (1 + floatval($old_price_row['surcharge'])/100);
292 292
 		}
293 293
 		$start_date = $event_row['registration_start']." ".$this->get_migration_script()->convertTimeFromAMPM($event_row['registration_startT']);
Please login to merge, or discard this patch.
4_1_0_stages/EE_DMS_4_1_0_question_group_question.dmsstage.php 3 patches
Indentation   -2 removed lines patch added patch discarded remove patch
@@ -12,8 +12,6 @@
 block discarded – undo
12 12
   KEY `group_id` (`group_id`),
13 13
   KEY `question_id` (`question_id`)
14 14
 ) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8$$
15
-
16
-
17 15
  * 4.1 question group question model's tables and fields:
18 16
  $this->_tables = array(
19 17
 			'Question_Group_Question'=>new EE_Primary_Table('esp_question_group_question','QGQ_ID')
Please login to merge, or discard this patch.
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -27,20 +27,20 @@  discard block
 block discarded – undo
27 27
 		);
28 28
  * 
29 29
  */
30
-class EE_DMS_4_1_0_question_group_question extends EE_Data_Migration_Script_Stage{
30
+class EE_DMS_4_1_0_question_group_question extends EE_Data_Migration_Script_Stage {
31 31
 	private $_old_table;
32 32
 	private $_new_table;
33
-	function _migration_step($num_items=50){
33
+	function _migration_step($num_items = 50) {
34 34
 		
35 35
 		global $wpdb;
36 36
 		$start_at_record = $this->count_records_migrated();
37
-		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d",$start_at_record,$num_items),ARRAY_A);
37
+		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
38 38
 		$items_actually_migrated = 0;
39
-		foreach($rows as $question_group_question){
39
+		foreach ($rows as $question_group_question) {
40 40
 			$this->_insert_new_question_group_question($question_group_question);
41 41
 			$items_actually_migrated++;
42 42
 		}
43
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
43
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
44 44
 			$this->set_completed();
45 45
 		}
46 46
 		return $items_actually_migrated;
@@ -64,39 +64,39 @@  discard block
 block discarded – undo
64 64
 	 * @param array $old_question_group_question
65 65
 	 * @return int
66 66
 	 */
67
-	private function _insert_new_question_group_question($old_question_group_question){
67
+	private function _insert_new_question_group_question($old_question_group_question) {
68 68
 		global $wpdb;
69 69
 		$new_question_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_question", $old_question_group_question['question_id'], $wpdb->prefix."esp_question");
70 70
 		$new_question_group_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_qst_group", $old_question_group_question['group_id'], $wpdb->prefix."esp_question_group");
71
-		if( ! $new_question_id){
72
-			$this->add_error(sprintf(__("Could not find 4.1 question id for 3.1 question #%d.", "event_espresso"),$old_question_group_question['question_id']));
71
+		if ( ! $new_question_id) {
72
+			$this->add_error(sprintf(__("Could not find 4.1 question id for 3.1 question #%d.", "event_espresso"), $old_question_group_question['question_id']));
73 73
 			return 0;
74 74
 		}
75
-		if( ! $new_question_group_id){
76
-			$this->add_error(sprintf(__("Could not find 4.1 question group id for 3.1 question group #%d.", "event_espresso"),$old_question_group_question['group_id']));
75
+		if ( ! $new_question_group_id) {
76
+			$this->add_error(sprintf(__("Could not find 4.1 question group id for 3.1 question group #%d.", "event_espresso"), $old_question_group_question['group_id']));
77 77
 			return 0;
78 78
 		}
79 79
 		//if it's a system question, it needs to be in the right system group. otherwise no dice!
80
-		if(
81
-				($this->_is_system_question_group($new_question_group_id) == $this->_is_system_question_for_question_group($new_question_id) )
80
+		if (
81
+				($this->_is_system_question_group($new_question_group_id) == $this->_is_system_question_for_question_group($new_question_id))
82 82
 				||
83 83
 				! $this->_is_system_question_for_question_group($new_question_id)
84
-			){
84
+			) {
85 85
 			$cols_n_values = array(
86 86
 				'QSG_ID'=>$new_question_group_id,
87 87
 				'QST_ID'=>$new_question_id
88 88
 			);
89 89
 			$datatypes = array(
90
-				'%d',//QSG_ID
91
-				'%d',//QST_ID
90
+				'%d', //QSG_ID
91
+				'%d', //QST_ID
92 92
 			);
93
-			$success = $wpdb->insert($this->_new_table,$cols_n_values,$datatypes);
94
-			if ( ! $success){
93
+			$success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
94
+			if ( ! $success) {
95 95
 				$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_question_group_question, $this->_new_table, $cols_n_values, $datatypes));
96 96
 				return 0;
97 97
 			}
98 98
 			return $wpdb->insert_id;
99
-		}else{
99
+		} else {
100 100
 			return false;
101 101
 		}
102 102
 		
@@ -109,14 +109,14 @@  discard block
 block discarded – undo
109 109
 	 * @param type $new_question_id
110 110
 	 * @return int
111 111
 	 */
112
-	private function _is_system_question_for_question_group($new_question_id){
112
+	private function _is_system_question_for_question_group($new_question_id) {
113 113
 		global $wpdb;
114
-		$system_id = $wpdb->get_var($wpdb->prepare("SELECT QST_system FROM ".$wpdb->prefix."esp_question WHERE QST_ID=%d",$new_question_id));
115
-		if(in_array($system_id, array('fname','lname','email'))){
114
+		$system_id = $wpdb->get_var($wpdb->prepare("SELECT QST_system FROM ".$wpdb->prefix."esp_question WHERE QST_ID=%d", $new_question_id));
115
+		if (in_array($system_id, array('fname', 'lname', 'email'))) {
116 116
 			return 1;
117
-		}elseif($system_id!='' && $system_id){
117
+		}elseif ($system_id != '' && $system_id) {
118 118
 			return 2;
119
-		}else{
119
+		} else {
120 120
 			return 0;
121 121
 		}
122 122
 	}
@@ -128,9 +128,9 @@  discard block
 block discarded – undo
128 128
 	 * @param type $new_question_group_id
129 129
 	 * @return boolean
130 130
 	 */
131
-	private function _is_system_question_group($new_question_group_id){
131
+	private function _is_system_question_group($new_question_group_id) {
132 132
 		global $wpdb;
133
-		$system_id = $wpdb->get_var($wpdb->prepare("SELECT QSG_system FROM ".$wpdb->prefix."esp_question_group WHERE QSG_ID=%d",$new_question_group_id));
133
+		$system_id = $wpdb->get_var($wpdb->prepare("SELECT QSG_system FROM ".$wpdb->prefix."esp_question_group WHERE QSG_ID=%d", $new_question_group_id));
134 134
 		return intval($system_id);
135 135
 	}
136 136
 
Please login to merge, or discard this patch.
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 				return 0;
97 97
 			}
98 98
 			return $wpdb->insert_id;
99
-		}else{
99
+		} else{
100 100
 			return false;
101 101
 		}
102 102
 		
@@ -114,9 +114,9 @@  discard block
 block discarded – undo
114 114
 		$system_id = $wpdb->get_var($wpdb->prepare("SELECT QST_system FROM ".$wpdb->prefix."esp_question WHERE QST_ID=%d",$new_question_id));
115 115
 		if(in_array($system_id, array('fname','lname','email'))){
116 116
 			return 1;
117
-		}elseif($system_id!='' && $system_id){
117
+		} elseif($system_id!='' && $system_id){
118 118
 			return 2;
119
-		}else{
119
+		} else{
120 120
 			return 0;
121 121
 		}
122 122
 	}
Please login to merge, or discard this patch.
4_1_0_stages/EE_DMS_4_1_0_question_groups.dmsstage.php 2 patches
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 		);
39 39
  * 
40 40
  */
41
-class EE_DMS_4_1_0_question_groups extends EE_Data_Migration_Script_Stage{
41
+class EE_DMS_4_1_0_question_groups extends EE_Data_Migration_Script_Stage {
42 42
 	private $_old_table;
43 43
 	private $_new_table;
44 44
 	/**
@@ -49,19 +49,19 @@  discard block
 block discarded – undo
49 49
 	 * @var boolean
50 50
 	 */
51 51
 	private $_already_got_system_question_group_1 = false;
52
-	function _migration_step($num_items=50){
52
+	function _migration_step($num_items = 50) {
53 53
 		
54 54
 		global $wpdb;
55 55
 		$start_at_record = $this->count_records_migrated();
56
-		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d",$start_at_record,$num_items),ARRAY_A);
56
+		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
57 57
 		$items_actually_migrated = 0;
58
-		foreach($rows as $question_group){
58
+		foreach ($rows as $question_group) {
59 59
 			$new_id = $this->_insert_new_question_group($question_group);
60 60
 
61 61
 			$this->get_migration_script()->set_mapping($this->_old_table, $question_group['id'], $this->_new_table, $new_id);
62 62
 			$items_actually_migrated++;
63 63
 		}
64
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
64
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
65 65
 			$this->set_completed();
66 66
 		}
67 67
 		return $items_actually_migrated;
@@ -85,24 +85,24 @@  discard block
 block discarded – undo
85 85
 	 * @param array $old_question_group
86 86
 	 * @return int
87 87
 	 */
88
-	private function _insert_new_question_group($old_question_group){
88
+	private function _insert_new_question_group($old_question_group) {
89 89
 		global $wpdb;
90 90
 		//try to guess what the QST_system int should be... finding the Personal info system
91 91
 		//question group is quite easy. But in 3.1 address info WASN'T a system group, it just exitsed by default but
92 92
 		//could be easily removed.
93
-		if($old_question_group['system_group'] && ! $this->_already_got_system_question_group_1()){
93
+		if ($old_question_group['system_group'] && ! $this->_already_got_system_question_group_1()) {
94 94
 			$guess_at_system_number = 1;
95
-		}elseif($old_question_group['id'] == '2' && strpos($old_question_group['group_name'],'Address')!==FALSE){
95
+		}elseif ($old_question_group['id'] == '2' && strpos($old_question_group['group_name'], 'Address') !== FALSE) {
96 96
 			$guess_at_system_number = 2;
97
-		}else{
97
+		} else {
98 98
 			$guess_at_system_number = 0;
99 99
 		}
100 100
 		//if the question group wasn't made by the normal admin, 
101 101
 		//we'd like to keep track of who made it
102
-		if(intval($old_question_group['wp_user'])!=1){
103
-			$username = $wpdb->get_var($wpdb->prepare("SELECT user_nicename FROM ".$wpdb->users." WHERE ID = %d",$old_question_group['wp_user']));
102
+		if (intval($old_question_group['wp_user']) != 1) {
103
+			$username = $wpdb->get_var($wpdb->prepare("SELECT user_nicename FROM ".$wpdb->users." WHERE ID = %d", $old_question_group['wp_user']));
104 104
 			$identifier = $old_question_group['group_identifier']."-by-".$username;
105
-		}else{
105
+		} else {
106 106
 			$identifier = $old_question_group['group_identifier'];
107 107
 		}
108 108
 		$cols_n_values = array(
@@ -116,17 +116,17 @@  discard block
 block discarded – undo
116 116
 			'QSG_deleted'=>false
117 117
 		);
118 118
 		$datatypes = array(
119
-			'%s',//QSG_name
120
-			'%s',//QSG_identifier
121
-			'%s',//QSG_desc
122
-			'%d',//QSG_order
123
-			'%d',//QSG_show_group_name
124
-			'%d',//QSG_show_group_desc
125
-			'%d',//QSG_system
126
-			'%d',//QSG_deleted
119
+			'%s', //QSG_name
120
+			'%s', //QSG_identifier
121
+			'%s', //QSG_desc
122
+			'%d', //QSG_order
123
+			'%d', //QSG_show_group_name
124
+			'%d', //QSG_show_group_desc
125
+			'%d', //QSG_system
126
+			'%d', //QSG_deleted
127 127
 		);
128
-		$success = $wpdb->insert($this->_new_table,$cols_n_values,$datatypes);
129
-		if ( ! $success){
128
+		$success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
129
+		if ( ! $success) {
130 130
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_question_group, $this->_new_table, $cols_n_values, $datatypes));
131 131
 			return 0;
132 132
 		}
@@ -138,12 +138,12 @@  discard block
 block discarded – undo
138 138
 	 * @global type $wpdb
139 139
 	 * @return boolean
140 140
 	 */
141
-	private function _already_got_system_question_group_1(){
142
-		if( ! $this->_already_got_system_question_group_1 ){
141
+	private function _already_got_system_question_group_1() {
142
+		if ( ! $this->_already_got_system_question_group_1) {
143 143
 			//check the db
144 144
 			global $wpdb;
145 145
 			$exists = $wpdb->get_var("SELECT COUNT(*) FROM {$this->_new_table} WHERE QSG_system=1");
146
-			if(intval($exists)>0){
146
+			if (intval($exists) > 0) {
147 147
 				$this->_already_got_system_question_group_1 = true;
148 148
 			}
149 149
 		}		
Please login to merge, or discard this patch.
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -92,9 +92,9 @@  discard block
 block discarded – undo
92 92
 		//could be easily removed.
93 93
 		if($old_question_group['system_group'] && ! $this->_already_got_system_question_group_1()){
94 94
 			$guess_at_system_number = 1;
95
-		}elseif($old_question_group['id'] == '2' && strpos($old_question_group['group_name'],'Address')!==FALSE){
95
+		} elseif($old_question_group['id'] == '2' && strpos($old_question_group['group_name'],'Address')!==FALSE){
96 96
 			$guess_at_system_number = 2;
97
-		}else{
97
+		} else{
98 98
 			$guess_at_system_number = 0;
99 99
 		}
100 100
 		//if the question group wasn't made by the normal admin, 
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 		if(intval($old_question_group['wp_user'])!=1){
103 103
 			$username = $wpdb->get_var($wpdb->prepare("SELECT user_nicename FROM ".$wpdb->users." WHERE ID = %d",$old_question_group['wp_user']));
104 104
 			$identifier = $old_question_group['group_identifier']."-by-".$username;
105
-		}else{
105
+		} else{
106 106
 			$identifier = $old_question_group['group_identifier'];
107 107
 		}
108 108
 		$cols_n_values = array(
Please login to merge, or discard this patch.
core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_venues.dmsstage.php 2 patches
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
 		try{
207 207
 			$country = $this->get_migration_script()->get_or_create_country(stripslashes($old_venue['country']));
208 208
 			$country_iso = $country['CNT_ISO'];
209
-		}catch(EE_Error $e){
209
+		} catch(EE_Error $e){
210 210
 			$this->add_error(sprintf(__("%s for venue %s", "event_espresso"),$e->getMessage(),$this->_json_encode($old_venue)));
211 211
 			$country_iso = null;
212 212
 		}
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 		try{
215 215
 			$state = $this->get_migration_script()->get_or_create_state(stripslashes($old_venue['state']),isset($country['CNT_name']) ? $country['CNT_name'] : strip_tags($old_venue['country']));
216 216
 			$state_id = $state['STA_ID'];
217
-		}catch(EE_Error $e){
217
+		} catch(EE_Error $e){
218 218
 			$this->add_error(sprintf(__("%s for venue %s", "event_espresso"),$e->getMessage(),$this->_json_encode($old_venue)));
219 219
 			$state_id = 0;
220 220
 		}
Please login to merge, or discard this patch.
Spacing   +79 added lines, -79 removed lines patch added patch discarded remove patch
@@ -61,44 +61,44 @@  discard block
 block discarded – undo
61 61
 //			));
62 62
  *
63 63
  */
64
-class EE_DMS_4_1_0_venues extends EE_Data_Migration_Script_Stage{
64
+class EE_DMS_4_1_0_venues extends EE_Data_Migration_Script_Stage {
65 65
 	private $_old_table;
66 66
 	private $_new_table;
67 67
 	private $_new_meta_table;
68
-function _migration_step($num_items=50){
68
+function _migration_step($num_items = 50) {
69 69
 	global $wpdb;
70 70
 	$start_at_record = $this->count_records_migrated();
71
-	$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".$this->_old_table." LIMIT %d,%d",$start_at_record,$num_items),ARRAY_A);
71
+	$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".$this->_old_table." LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
72 72
 	$items_actually_migrated = 0;
73
-	foreach($rows as $old_venue){
74
-		if ( ! $new_id = $this->_insert_into_posts($old_venue)){
73
+	foreach ($rows as $old_venue) {
74
+		if ( ! $new_id = $this->_insert_into_posts($old_venue)) {
75 75
 			$items_actually_migrated++;
76 76
 			continue;
77 77
 		}
78 78
 		$this->get_migration_script()->set_mapping($this->_old_table, $old_venue['id'], $this->_new_table, $new_id);
79
-		if( ! $new_meta_id = $this->_insert_into_meta_table($new_id,$old_venue)){
79
+		if ( ! $new_meta_id = $this->_insert_into_meta_table($new_id, $old_venue)) {
80 80
 			$items_actually_migrated++;
81 81
 			continue;
82 82
 		}
83 83
 		$this->get_migration_script()->set_mapping($this->_old_table, $old_venue['id'], $this->_new_meta_table, $new_meta_id);
84 84
 		//lastly, save the 'contact' as post meta, because it doesn't exist anywhere else but someone may still want it
85 85
 		$venue_meta = maybe_unserialize($old_venue['meta']);
86
-		if(isset($venue_meta['contact']) && $venue_meta['contact']){
87
-			add_post_meta($new_id,'contact',$venue_meta['contact']);
86
+		if (isset($venue_meta['contact']) && $venue_meta['contact']) {
87
+			add_post_meta($new_id, 'contact', $venue_meta['contact']);
88 88
 		}
89 89
 		//is there an image on this venue?
90 90
 		$guid = isset($venue_meta['image']) && $venue_meta['image'] ? $venue_meta['image'] : NULL;
91
-		if($guid){
92
-			$this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid,$new_id,$this);
91
+		if ($guid) {
92
+			$this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid, $new_id, $this);
93 93
 		}
94 94
 		$items_actually_migrated++;
95
-		if($guid){
95
+		if ($guid) {
96 96
 			//if there was an image, we may have had to download it etc and it may have taken
97 97
 			//longer, then let's not bother migrating anymore on this step
98 98
 			break;
99 99
 		}
100 100
 	}
101
-	if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
101
+	if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
102 102
 		$this->set_completed();
103 103
 	}
104 104
 	return $items_actually_migrated;
@@ -122,42 +122,42 @@  discard block
 block discarded – undo
122 122
 	 * @param array $old_venue keys are cols, values are col values
123 123
 	 * @return int
124 124
 	 */
125
-	private function _insert_into_posts($old_venue){
125
+	private function _insert_into_posts($old_venue) {
126 126
 		global $wpdb;
127 127
 		$meta = maybe_unserialize($old_venue['meta']);
128
-		$slug = $this->_find_unique_slug( $old_venue[ 'name' ], $old_venue[ 'identifier' ] );
128
+		$slug = $this->_find_unique_slug($old_venue['name'], $old_venue['identifier']);
129 129
 		$insertion_array = array(
130
-					'post_title'=>stripslashes($old_venue['name']),//VNU_name
131
-					'post_content'=>isset($meta['description']) ? stripslashes(strip_tags($meta['description'])) : '',//VNU_desc
132
-					'post_name'=> $slug,//VNU_identifier
133
-					'post_date'=>current_time('mysql'),//VNU_created
134
-					'post_date_gmt'=>  current_time('mysql',true),
135
-					'post_excerpt'=>'',//wp_trim_words($meta['description'] ? $meta['description'] : '',50),//VNU_short_desc arbitraty only 50 characters
136
-					'post_modified'=>current_time('mysql'),//VNU_modified
137
-					'post_modified_gmt'=>current_time('mysql',true),
138
-					'post_author'=>$old_venue['wp_user'],//VNU_wp_user
139
-					'post_parent'=>0,//parent
140
-					'menu_order'=>0,//VNU_order
130
+					'post_title'=>stripslashes($old_venue['name']), //VNU_name
131
+					'post_content'=>isset($meta['description']) ? stripslashes(strip_tags($meta['description'])) : '', //VNU_desc
132
+					'post_name'=> $slug, //VNU_identifier
133
+					'post_date'=>current_time('mysql'), //VNU_created
134
+					'post_date_gmt'=>  current_time('mysql', true),
135
+					'post_excerpt'=>'', //wp_trim_words($meta['description'] ? $meta['description'] : '',50),//VNU_short_desc arbitraty only 50 characters
136
+					'post_modified'=>current_time('mysql'), //VNU_modified
137
+					'post_modified_gmt'=>current_time('mysql', true),
138
+					'post_author'=>$old_venue['wp_user'], //VNU_wp_user
139
+					'post_parent'=>0, //parent
140
+					'menu_order'=>0, //VNU_order
141 141
 					'post_type'=>'espresso_venues'//post_type
142 142
 				);
143 143
 		$datatypes_array = array(
144
-					'%s',//VNU_name
145
-					'%s',//VNU_desc
146
-					'%s',//VNU_identifier
147
-					'%s',//VNU_created
144
+					'%s', //VNU_name
145
+					'%s', //VNU_desc
146
+					'%s', //VNU_identifier
147
+					'%s', //VNU_created
148 148
 					'%s',
149
-					'%s',//VNU_short_desc
150
-					'%s',//VNU_modified
149
+					'%s', //VNU_short_desc
150
+					'%s', //VNU_modified
151 151
 					'%s',
152
-					'%d',//VNU_wp_user
153
-					'%d',//parent
154
-					'%d',//VNU_order
155
-					'%s',//post_type
152
+					'%d', //VNU_wp_user
153
+					'%d', //parent
154
+					'%d', //VNU_order
155
+					'%s', //post_type
156 156
 				);
157 157
 		$success = $wpdb->insert($this->_new_table,
158 158
 				$insertion_array,
159 159
 				$datatypes_array);
160
-		if( ! $success ){
160
+		if ( ! $success) {
161 161
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_venue, $this->_new_table, $insertion_array, $datatypes_array));
162 162
 			return 0;
163 163
 		}
@@ -171,11 +171,11 @@  discard block
 block discarded – undo
171 171
 	 * @param string $post_name
172 172
 	 * @return string
173 173
 	 */
174
-	private function _find_unique_slug($post_name, $old_identifier = '' ){
174
+	private function _find_unique_slug($post_name, $old_identifier = '') {
175 175
 		$count = 0;
176
-		$original_name = $post_name ? sanitize_title( $post_name ) : $old_identifier;
176
+		$original_name = $post_name ? sanitize_title($post_name) : $old_identifier;
177 177
 		$event_slug = $original_name;
178
-		while( $this->_other_post_exists_with_that_slug($event_slug) && $count<50){
178
+		while ($this->_other_post_exists_with_that_slug($event_slug) && $count < 50) {
179 179
 			$event_slug = sanitize_title($original_name."-".++$count);
180 180
 		}
181 181
 		return $event_slug;
@@ -187,11 +187,11 @@  discard block
 block discarded – undo
187 187
 	 * @param type $slug
188 188
 	 * @return boolean
189 189
 	 */
190
-	private function _other_post_exists_with_that_slug($slug){
190
+	private function _other_post_exists_with_that_slug($slug) {
191 191
 		global $wpdb;
192
-		$query = $wpdb->prepare("SELECT COUNT(ID) FROM ".$this->_new_table." WHERE post_name = %s",$slug);
192
+		$query = $wpdb->prepare("SELECT COUNT(ID) FROM ".$this->_new_table." WHERE post_name = %s", $slug);
193 193
 		$count = $wpdb->get_var($query);
194
-		return (boolean)intval($count);
194
+		return (boolean) intval($count);
195 195
 	}
196 196
 
197 197
 	/**
@@ -200,60 +200,60 @@  discard block
 block discarded – undo
200 200
 	 * @param type $old_venue
201 201
 	 * @return int
202 202
 	 */
203
-	private function _insert_into_meta_table($cpt_id,$old_venue){
203
+	private function _insert_into_meta_table($cpt_id, $old_venue) {
204 204
 		global $wpdb;
205 205
 		//get a country with the same name, or insert one
206
-		try{
206
+		try {
207 207
 			$country = $this->get_migration_script()->get_or_create_country(stripslashes($old_venue['country']));
208 208
 			$country_iso = $country['CNT_ISO'];
209
-		}catch(EE_Error $e){
210
-			$this->add_error(sprintf(__("%s for venue %s", "event_espresso"),$e->getMessage(),$this->_json_encode($old_venue)));
209
+		} catch (EE_Error $e) {
210
+			$this->add_error(sprintf(__("%s for venue %s", "event_espresso"), $e->getMessage(), $this->_json_encode($old_venue)));
211 211
 			$country_iso = null;
212 212
 		}
213 213
 		//get a state with the same name, if possible
214
-		try{
215
-			$state = $this->get_migration_script()->get_or_create_state(stripslashes($old_venue['state']),isset($country['CNT_name']) ? $country['CNT_name'] : strip_tags($old_venue['country']));
214
+		try {
215
+			$state = $this->get_migration_script()->get_or_create_state(stripslashes($old_venue['state']), isset($country['CNT_name']) ? $country['CNT_name'] : strip_tags($old_venue['country']));
216 216
 			$state_id = $state['STA_ID'];
217
-		}catch(EE_Error $e){
218
-			$this->add_error(sprintf(__("%s for venue %s", "event_espresso"),$e->getMessage(),$this->_json_encode($old_venue)));
217
+		} catch (EE_Error $e) {
218
+			$this->add_error(sprintf(__("%s for venue %s", "event_espresso"), $e->getMessage(), $this->_json_encode($old_venue)));
219 219
 			$state_id = 0;
220 220
 		}
221 221
 		$meta = maybe_unserialize($old_venue['meta']);
222 222
 		//now insert into meta table
223 223
 		$insertion_array = array(
224
-			'VNU_ID'=>$cpt_id,//VNU_ID_fk
225
-			'VNU_address'=>stripslashes($old_venue['address']),//VNU_address
226
-			'VNU_address2'=>stripslashes($old_venue['address2']),//VNU_address2
227
-			'VNU_city'=>stripslashes($old_venue['city']),//VNU_city
228
-			'STA_ID'=>$state_id,//STA_ID
229
-			'CNT_ISO'=>$country_iso,//CNT_ISO
230
-			'VNU_zip'=>stripslashes($old_venue['zip']),//VNU_zip
231
-			'VNU_phone'=>isset($meta['phone']) ? stripslashes($meta['phone']) : '',//VNU_phone
232
-			'VNU_capacity'=>-1,//VNU_capacity
233
-			'VNU_url'=>isset($meta['website']) ? stripslashes($meta['website']) : '',//VNU_url
234
-			'VNU_virtual_phone'=>'',//VNU_virtual_phone
235
-			'VNU_virtual_url'=>'',//VNU_virtual_url
236
-			'VNU_google_map_link'=>'',//VNU_google_map_link
224
+			'VNU_ID'=>$cpt_id, //VNU_ID_fk
225
+			'VNU_address'=>stripslashes($old_venue['address']), //VNU_address
226
+			'VNU_address2'=>stripslashes($old_venue['address2']), //VNU_address2
227
+			'VNU_city'=>stripslashes($old_venue['city']), //VNU_city
228
+			'STA_ID'=>$state_id, //STA_ID
229
+			'CNT_ISO'=>$country_iso, //CNT_ISO
230
+			'VNU_zip'=>stripslashes($old_venue['zip']), //VNU_zip
231
+			'VNU_phone'=>isset($meta['phone']) ? stripslashes($meta['phone']) : '', //VNU_phone
232
+			'VNU_capacity'=>-1, //VNU_capacity
233
+			'VNU_url'=>isset($meta['website']) ? stripslashes($meta['website']) : '', //VNU_url
234
+			'VNU_virtual_phone'=>'', //VNU_virtual_phone
235
+			'VNU_virtual_url'=>'', //VNU_virtual_url
236
+			'VNU_google_map_link'=>'', //VNU_google_map_link
237 237
 			'VNU_enable_for_gmap'=>true	//VNU_enable_for_gmap
238 238
 		);
239 239
 		$datatypes = array(
240
-			'%d',//VNU_ID_fk
241
-			'%s',//VNU_address
242
-			'%s',//VNU_address2
243
-			'%s',//VNU_city
244
-			'%d',//STA_ID
245
-			'%s',//CNT_ISO
246
-			'%s',//VNU_zip
247
-			'%s',//VNU_phone
248
-			'%d',//VNU_capacity
249
-			'%s',//VNU_url
250
-			'%s',//VNU_virtual_phone
251
-			'%s',//VNU_virtual_url
252
-			'%s',//VNU_google_map_link
253
-			'%d',//VNU_enable_for_gmap
240
+			'%d', //VNU_ID_fk
241
+			'%s', //VNU_address
242
+			'%s', //VNU_address2
243
+			'%s', //VNU_city
244
+			'%d', //STA_ID
245
+			'%s', //CNT_ISO
246
+			'%s', //VNU_zip
247
+			'%s', //VNU_phone
248
+			'%d', //VNU_capacity
249
+			'%s', //VNU_url
250
+			'%s', //VNU_virtual_phone
251
+			'%s', //VNU_virtual_url
252
+			'%s', //VNU_google_map_link
253
+			'%d', //VNU_enable_for_gmap
254 254
 		);
255
-		$success = $wpdb->insert($this->_new_meta_table,$insertion_array,$datatypes);
256
-		if( ! $success ){
255
+		$success = $wpdb->insert($this->_new_meta_table, $insertion_array, $datatypes);
256
+		if ( ! $success) {
257 257
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_venue, $this->_new_meta_table, $insertion_array, $datatypes));
258 258
 			return 0;
259 259
 		}
Please login to merge, or discard this patch.
4_2_0_stages/EE_DMS_4_2_0_datetime_fields.dmsstage.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
  * The name is set to just be a string representation of the start date (in UTC time for now), and the description is just left blank
6 6
 */
7 7
 
8
-class EE_DMS_4_2_0_datetime_fields extends EE_Data_Migration_Script_Stage_Table{
8
+class EE_DMS_4_2_0_datetime_fields extends EE_Data_Migration_Script_Stage_Table {
9 9
 	function __construct() {
10 10
 		global $wpdb;
11 11
 		$this->_pretty_name = __("Datetime Fields", "event_espresso");
@@ -25,14 +25,14 @@  discard block
 block discarded – undo
25 25
 				array(
26 26
 					'DTT_ID'=>$old_row['DTT_ID']),
27 27
 				array(
28
-					'%s',//DTT_name,
29
-					'%s',//DTT_description
28
+					'%s', //DTT_name,
29
+					'%s', //DTT_description
30 30
 					),
31 31
 				array(
32
-					'%d',//DTT_ID
32
+					'%d', //DTT_ID
33 33
 					));
34
-		if( FALSE === $updated ){
35
-			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting DTT_name = '' and DTT_description = '' where DTT_ID = %d", 'event_espresso'),$old_row['QST_ID']));
34
+		if (FALSE === $updated) {
35
+			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting DTT_name = '' and DTT_description = '' where DTT_ID = %d", 'event_espresso'), $old_row['QST_ID']));
36 36
 		}
37 37
 		//nothing to map really
38 38
 	}	
Please login to merge, or discard this patch.
4_2_0_stages/EE_DMS_4_2_0_question_group_questions.dmsstage.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
  * Populates the QGQ_order (introduced in this version, 4.2.0) from the QST_order
5 5
 */
6 6
 
7
-class EE_DMS_4_2_0_question_group_questions extends EE_Data_Migration_Script_Stage_Table{
7
+class EE_DMS_4_2_0_question_group_questions extends EE_Data_Migration_Script_Stage_Table {
8 8
 	private $_qgq_table;
9 9
 	function __construct() {
10 10
 		global $wpdb;
@@ -20,12 +20,12 @@  discard block
 block discarded – undo
20 20
 		$updated = $wpdb->update($this->_qgq_table,
21 21
 				array('QGQ_order'=>$old_row['QST_order']),
22 22
 				array('QST_ID'=>$old_row['QST_ID']),
23
-				array('%d',//QGQ_order
23
+				array('%d', //QGQ_order
24 24
 					),
25
-				array('%d',//QST_ID
25
+				array('%d', //QST_ID
26 26
 					));
27
-		if( FALSE === $updated ){
28
-			$this->add_error(sprintf(__("Error in updating table {$this->_qgq_table} setting QGQ_order = %d where QST_ID = %d", 'event_espresso'),$old_row['QST_order'],$old_row['QST_ID']));
27
+		if (FALSE === $updated) {
28
+			$this->add_error(sprintf(__("Error in updating table {$this->_qgq_table} setting QGQ_order = %d where QST_ID = %d", 'event_espresso'), $old_row['QST_order'], $old_row['QST_ID']));
29 29
 		}
30 30
 		//nothing to map really
31 31
 	}	
Please login to merge, or discard this patch.
4_3_0_stages/EE_DMS_4_3_0_event_message_templates.dmsstage.php 3 patches
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -41,19 +41,19 @@  discard block
 block discarded – undo
41 41
  		//foreach row that has an evt_id ..let's create an equivalent entry in the new event_messages_template table to link the message template to the event (since EVT_ID is no longer referenced in esp_message_template_groups )
42 42
  		global $wpdb;
43 43
  		if ( $old_row['EVT_ID'] > 0 ) {
44
-                                    //let's get the EVT for this id so we can update the custom name on the old row.
45
-                                    $event_name = 'Custom Template for ' . $wpdb->get_var( $wpdb->prepare( "SELECT post_title from $wpdb->posts WHERE ID = %d", absint( $old_row['EVT_ID'] ) ) );
44
+									//let's get the EVT for this id so we can update the custom name on the old row.
45
+									$event_name = 'Custom Template for ' . $wpdb->get_var( $wpdb->prepare( "SELECT post_title from $wpdb->posts WHERE ID = %d", absint( $old_row['EVT_ID'] ) ) );
46 46
 
47
-                                    //update name
48
-                                    $updated = $wpdb->update(
49
-                                        $this->_old_table,
50
-                                        array(
51
-                                            'MTP_name' =>$event_name
52
-                                            ),
53
-                                        array( 'GRP_ID' => (int) $old_row['GRP_ID'] ),
54
-                                        array( '%s' ),
55
-                                        array( '%d' )
56
-                                        );
47
+									//update name
48
+									$updated = $wpdb->update(
49
+										$this->_old_table,
50
+										array(
51
+											'MTP_name' =>$event_name
52
+											),
53
+										array( 'GRP_ID' => (int) $old_row['GRP_ID'] ),
54
+										array( '%s' ),
55
+										array( '%d' )
56
+										);
57 57
 
58 58
  			$inserted = $wpdb->insert(
59 59
  				$this->_emt_table,
@@ -64,9 +64,9 @@  discard block
 block discarded – undo
64 64
  				array( '%d', '%d' )
65 65
  				);
66 66
 
67
-                                    if ( FALSE === $updated ) {
68
-                                        $this->add_error( sprintf( __("Error in updating the row in %s setting 'MTP_name = %s", 'event_espresso'), $this->_old_table, $event_name ) );
69
-                                    }
67
+									if ( FALSE === $updated ) {
68
+										$this->add_error( sprintf( __("Error in updating the row in %s setting 'MTP_name = %s", 'event_espresso'), $this->_old_table, $event_name ) );
69
+									}
70 70
 
71 71
  			if ( FALSE === $inserted ) {
72 72
  				$this->add_error( sprintf( __("Error in inserting a row into  setting EVT_ID = %d and GRP_ID = %d", "event_espresso"), $this->_emt_table, $old_row['EVT_ID'], $old_row['GRP_ID'] ) );
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -37,12 +37,12 @@  discard block
 block discarded – undo
37 37
 
38 38
 
39 39
 
40
- 	protected function _migrate_old_row( $old_row ) {
40
+ 	protected function _migrate_old_row($old_row) {
41 41
  		//foreach row that has an evt_id ..let's create an equivalent entry in the new event_messages_template table to link the message template to the event (since EVT_ID is no longer referenced in esp_message_template_groups )
42 42
  		global $wpdb;
43
- 		if ( $old_row['EVT_ID'] > 0 ) {
43
+ 		if ($old_row['EVT_ID'] > 0) {
44 44
                                     //let's get the EVT for this id so we can update the custom name on the old row.
45
-                                    $event_name = 'Custom Template for ' . $wpdb->get_var( $wpdb->prepare( "SELECT post_title from $wpdb->posts WHERE ID = %d", absint( $old_row['EVT_ID'] ) ) );
45
+                                    $event_name = 'Custom Template for '.$wpdb->get_var($wpdb->prepare("SELECT post_title from $wpdb->posts WHERE ID = %d", absint($old_row['EVT_ID'])));
46 46
 
47 47
                                     //update name
48 48
                                     $updated = $wpdb->update(
@@ -50,9 +50,9 @@  discard block
 block discarded – undo
50 50
                                         array(
51 51
                                             'MTP_name' =>$event_name
52 52
                                             ),
53
-                                        array( 'GRP_ID' => (int) $old_row['GRP_ID'] ),
54
-                                        array( '%s' ),
55
-                                        array( '%d' )
53
+                                        array('GRP_ID' => (int) $old_row['GRP_ID']),
54
+                                        array('%s'),
55
+                                        array('%d')
56 56
                                         );
57 57
 
58 58
  			$inserted = $wpdb->insert(
@@ -61,15 +61,15 @@  discard block
 block discarded – undo
61 61
  					'EVT_ID' => (int) $old_row['EVT_ID'],
62 62
  					'GRP_ID' => (int) $old_row['GRP_ID'],
63 63
  					),
64
- 				array( '%d', '%d' )
64
+ 				array('%d', '%d')
65 65
  				);
66 66
 
67
-                                    if ( FALSE === $updated ) {
68
-                                        $this->add_error( sprintf( __("Error in updating the row in %s setting 'MTP_name = %s", 'event_espresso'), $this->_old_table, $event_name ) );
67
+                                    if (FALSE === $updated) {
68
+                                        $this->add_error(sprintf(__("Error in updating the row in %s setting 'MTP_name = %s", 'event_espresso'), $this->_old_table, $event_name));
69 69
                                     }
70 70
 
71
- 			if ( FALSE === $inserted ) {
72
- 				$this->add_error( sprintf( __("Error in inserting a row into  setting EVT_ID = %d and GRP_ID = %d", "event_espresso"), $this->_emt_table, $old_row['EVT_ID'], $old_row['GRP_ID'] ) );
71
+ 			if (FALSE === $inserted) {
72
+ 				$this->add_error(sprintf(__("Error in inserting a row into  setting EVT_ID = %d and GRP_ID = %d", "event_espresso"), $this->_emt_table, $old_row['EVT_ID'], $old_row['GRP_ID']));
73 73
  			}
74 74
  		}
75 75
  	}
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,9 @@
 block discarded – undo
5 5
  * @subpackage 	migrations
6 6
  * @since 			4.3
7 7
  */
8
- if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
8
+ if ( ! defined('EVENT_ESPRESSO_VERSION')) {
9
+ 	exit('No direct script access allowed');
10
+ }
9 11
 
10 12
 
11 13
 /**
Please login to merge, or discard this patch.
4_3_0_stages/EE_DMS_4_3_0_question_option_order.dmsstage.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,12 +19,12 @@
 block discarded – undo
19 19
 		$updated = $wpdb->update($this->_old_table,
20 20
 				array('QSO_order'=>$old_row['QSO_ID']),
21 21
 				array('QSO_ID'=>$old_row['QSO_ID']),
22
-				array('%d',//QSO_order
22
+				array('%d', //QSO_order
23 23
 					),
24
-				array('%d',//QSO_ID
24
+				array('%d', //QSO_ID
25 25
 					));
26
-		if ( FALSE === $updated ) {
27
-			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting QSO_order = %d where QSO_ID = %d", 'event_espresso'),$old_row['QSO_ID'],$old_row['QSO_ID']));
26
+		if (FALSE === $updated) {
27
+			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting QSO_order = %d where QSO_ID = %d", 'event_espresso'), $old_row['QSO_ID'], $old_row['QSO_ID']));
28 28
 		}
29 29
 	}
30 30
 }
31 31
\ No newline at end of file
Please login to merge, or discard this patch.
4_5_0_stages/EE_DMS_4_5_0_invoice_settings.dmsstage.php 3 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@
 block discarded – undo
64 64
 		$invoice_settings = isset( EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] ) ? EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] : NULL;
65 65
 		if( ! $invoice_settings ){
66 66
 			$this->add_error( __( 'Could not migrate EE4.4 invoice settings to EE4.5 because they didnt exist', 'event_espresso' ) );
67
-		}else{
67
+		} else{
68 68
 			$invoice_settings[ 'template_payment_instructions' ] = $invoice_settings[ 'pdf_instructions' ];
69 69
 			$invoice_settings[ 'template_invoice_payee_name' ] = $invoice_settings[ 'payable_to' ];
70 70
 			$invoice_settings[ 'template_invoice_address' ] = $invoice_settings[ 'payment_address' ];
Please login to merge, or discard this patch.
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -51,15 +51,15 @@  discard block
 block discarded – undo
51 51
 
52 52
 
53 53
 
54
-    /**
55
-     *    _migration_step
56
-     *
57
-     * @access protected
58
-     * @param int $num_items
59
-     * @throws EE_Error
60
-     * @return int number of items ACTUALLY migrated
61
-     * @throws InvalidDataTypeException
62
-     */
54
+	/**
55
+	 *    _migration_step
56
+	 *
57
+	 * @access protected
58
+	 * @param int $num_items
59
+	 * @throws EE_Error
60
+	 * @return int number of items ACTUALLY migrated
61
+	 * @throws InvalidDataTypeException
62
+	 */
63 63
 	protected function _migration_step( $num_items = 1 ){
64 64
 		// if this isn't set then something is really wrong
65 65
 		if ( ! EE_Config::instance()->gateway instanceof EE_Gateway_Config ) {
@@ -86,29 +86,29 @@  discard block
 block discarded – undo
86 86
 			//update them from a DMS, we'd need to have the DMS create the message templates which is quite a lot of code;
87 87
 			//also we don't want to build a dependency on the messages code because it is likely to change soon
88 88
 			if( ! in_array( $invoice_settings[ 'invoice_css' ], array( '', 'simple.css' ) ) ){
89
-                new PersistentAdminNotice(
90
-                    'invoice_css_not_updated',
91
-                    sprintf(
92
-                        esc_html__(
93
-                            'You had previously set your Invoice Payment Method\'s stylesheet to be %1$s, but that setting has moved. PDF and HTML Invoices and Receipts are now Messages, which means you can easily modify them from your Wordpress Dashboard instead of using filters or uploading template files. Please visit Messages -> Receipt and Messages -> Invoice to change their stylesheets.',
94
-                            'event_espresso'
95
-                        ),
96
-                        $invoice_settings['invoice_css']
97
-                    )
98
-                );
89
+				new PersistentAdminNotice(
90
+					'invoice_css_not_updated',
91
+					sprintf(
92
+						esc_html__(
93
+							'You had previously set your Invoice Payment Method\'s stylesheet to be %1$s, but that setting has moved. PDF and HTML Invoices and Receipts are now Messages, which means you can easily modify them from your Wordpress Dashboard instead of using filters or uploading template files. Please visit Messages -> Receipt and Messages -> Invoice to change their stylesheets.',
94
+							'event_espresso'
95
+						),
96
+						$invoice_settings['invoice_css']
97
+					)
98
+				);
99 99
 			}
100 100
 			$templates_relative_path = 'modules/gateways/Invoice/lib/templates/';
101 101
 			$overridden_invoice_body = EEH_Template::locate_template( $templates_relative_path . 'invoice_body.template.php', NULL, FALSE, FALSE, TRUE );
102 102
 			$overridden_receipt_body= EEH_Template::locate_template( $templates_relative_path . 'receipt_body.template.php', NULL, FALSE, FALSE, TRUE );
103 103
 			if( $overridden_invoice_body || $overridden_receipt_body ) {
104
-                new PersistentAdminNotice(
105
-                    'invoice_overriding_templates',
106
-                    esc_html__(
107
-                        'Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overridden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents. We recommend deleting your old Invoice/Receipt templates and modifying the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.',
108
-                        'event_espresso'
109
-                    ),
110
-                    true
111
-                );
104
+				new PersistentAdminNotice(
105
+					'invoice_overriding_templates',
106
+					esc_html__(
107
+						'Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overridden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents. We recommend deleting your old Invoice/Receipt templates and modifying the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.',
108
+						'event_espresso'
109
+					),
110
+					true
111
+				);
112 112
 			}
113 113
 
114 114
 		}
Please login to merge, or discard this patch.
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 	 * Just initializes the status of the migration
33 33
 	 */
34 34
 	public function __construct() {
35
-		$this->_pretty_name = __( 'Update Invoice Gateway Settings', 'event_espresso' );
35
+		$this->_pretty_name = __('Update Invoice Gateway Settings', 'event_espresso');
36 36
 		parent::__construct();
37 37
 	}
38 38
 
@@ -60,32 +60,32 @@  discard block
 block discarded – undo
60 60
      * @return int number of items ACTUALLY migrated
61 61
      * @throws InvalidDataTypeException
62 62
      */
63
-	protected function _migration_step( $num_items = 1 ){
63
+	protected function _migration_step($num_items = 1) {
64 64
 		// if this isn't set then something is really wrong
65
-		if ( ! EE_Config::instance()->gateway instanceof EE_Gateway_Config ) {
66
-			throw new EE_Error( __( 'It appears the Event Espresso Core Configuration is not setup correctly.', 'event_espresso' ));
65
+		if ( ! EE_Config::instance()->gateway instanceof EE_Gateway_Config) {
66
+			throw new EE_Error(__('It appears the Event Espresso Core Configuration is not setup correctly.', 'event_espresso'));
67 67
 		}
68
-		$invoice_settings = isset( EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] ) ? EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] : NULL;
69
-		if( ! $invoice_settings ){
70
-			$this->add_error( __( 'Could not migrate EE4.4 invoice settings to EE4.5 because they didnt exist', 'event_espresso' ) );
71
-		}else{
72
-			$invoice_settings[ 'template_payment_instructions' ] = $invoice_settings[ 'pdf_instructions' ];
73
-			$invoice_settings[ 'template_invoice_payee_name' ] = $invoice_settings[ 'payable_to' ];
74
-			$invoice_settings[ 'template_invoice_address' ] = $invoice_settings[ 'payment_address' ];
75
-			$invoice_settings[ 'template_invoice_email' ] = '';
76
-			$invoice_settings[ 'template_invoice_tax_number' ] = '';
77
-			unset( $invoice_settings[ 'pdf_instructions' ] );
78
-			unset( $invoice_settings[ 'payable_to' ] );
79
-			unset( $invoice_settings[ 'payment_address' ] );
80
-			EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] = $invoice_settings;
81
-			EE_Config::instance()->update_espresso_config(false,false);
68
+		$invoice_settings = isset(EE_Config::instance()->gateway->payment_settings['Invoice']) ? EE_Config::instance()->gateway->payment_settings['Invoice'] : NULL;
69
+		if ( ! $invoice_settings) {
70
+			$this->add_error(__('Could not migrate EE4.4 invoice settings to EE4.5 because they didnt exist', 'event_espresso'));
71
+		} else {
72
+			$invoice_settings['template_payment_instructions'] = $invoice_settings['pdf_instructions'];
73
+			$invoice_settings['template_invoice_payee_name'] = $invoice_settings['payable_to'];
74
+			$invoice_settings['template_invoice_address'] = $invoice_settings['payment_address'];
75
+			$invoice_settings['template_invoice_email'] = '';
76
+			$invoice_settings['template_invoice_tax_number'] = '';
77
+			unset($invoice_settings['pdf_instructions']);
78
+			unset($invoice_settings['payable_to']);
79
+			unset($invoice_settings['payment_address']);
80
+			EE_Config::instance()->gateway->payment_settings['Invoice'] = $invoice_settings;
81
+			EE_Config::instance()->update_espresso_config(false, false);
82 82
 
83 83
 			//@todo: check 'invoice_css' too because we can't easily affect that so we might need to set a persistent notice
84 84
 			//(why is it tough to change? because we want to update the receipt and invoice message template, but
85 85
 			//message templates are only initialized AFTER migrations and those two are new in 4.5. So if we wanted to
86 86
 			//update them from a DMS, we'd need to have the DMS create the message templates which is quite a lot of code;
87 87
 			//also we don't want to build a dependency on the messages code because it is likely to change soon
88
-			if( ! in_array( $invoice_settings[ 'invoice_css' ], array( '', 'simple.css' ) ) ){
88
+			if ( ! in_array($invoice_settings['invoice_css'], array('', 'simple.css'))) {
89 89
                 new PersistentAdminNotice(
90 90
                     'invoice_css_not_updated',
91 91
                     sprintf(
@@ -98,9 +98,9 @@  discard block
 block discarded – undo
98 98
                 );
99 99
 			}
100 100
 			$templates_relative_path = 'modules/gateways/Invoice/lib/templates/';
101
-			$overridden_invoice_body = EEH_Template::locate_template( $templates_relative_path . 'invoice_body.template.php', NULL, FALSE, FALSE, TRUE );
102
-			$overridden_receipt_body= EEH_Template::locate_template( $templates_relative_path . 'receipt_body.template.php', NULL, FALSE, FALSE, TRUE );
103
-			if( $overridden_invoice_body || $overridden_receipt_body ) {
101
+			$overridden_invoice_body = EEH_Template::locate_template($templates_relative_path.'invoice_body.template.php', NULL, FALSE, FALSE, TRUE);
102
+			$overridden_receipt_body = EEH_Template::locate_template($templates_relative_path.'receipt_body.template.php', NULL, FALSE, FALSE, TRUE);
103
+			if ($overridden_invoice_body || $overridden_receipt_body) {
104 104
                 new PersistentAdminNotice(
105 105
                     'invoice_overriding_templates',
106 106
                     esc_html__(
Please login to merge, or discard this patch.