Completed
Pull Request — master (#1258)
by Rico
13:22
created
app/Module/GoogleMapsModule.php 1 patch
Switch Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -1120,24 +1120,24 @@
 block discarded – undo
1120 1120
 										if ($latlongval[$i] == $latlongval[$k]) {
1121 1121
 											$dups++;
1122 1122
 											switch ($dups) {
1123
-												case 1:
1124
-													$marker_number = $curgen . 'L';
1125
-													break;
1126
-												case 2:
1127
-													$marker_number = $curgen . 'R';
1128
-													break;
1129
-												case 3:
1130
-													$marker_number = $curgen . 'Ls';
1131
-													break;
1132
-												case 4:
1133
-													$marker_number = $curgen . 'Rs';
1134
-													break;
1135
-												case 5: //adjust position where markers have same coodinates
1136
-												default:
1137
-													$marker_number = $curgen;
1138
-													$lon[$i] += 0.0025;
1139
-													$lat[$i] += 0.0025;
1140
-													break;
1123
+											case 1:
1124
+												$marker_number = $curgen . 'L';
1125
+												break;
1126
+											case 2:
1127
+												$marker_number = $curgen . 'R';
1128
+												break;
1129
+											case 3:
1130
+												$marker_number = $curgen . 'Ls';
1131
+												break;
1132
+											case 4:
1133
+												$marker_number = $curgen . 'Rs';
1134
+												break;
1135
+											case 5: //adjust position where markers have same coodinates
1136
+											default:
1137
+												$marker_number = $curgen;
1138
+												$lon[$i] += 0.0025;
1139
+												$lat[$i] += 0.0025;
1140
+												break;
1141 1141
 											}
1142 1142
 										}
1143 1143
 									}
Please login to merge, or discard this patch.
app/Census/CensusColumnSexMF.php 1 patch
Switch Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -38,12 +38,12 @@
 block discarded – undo
38 38
 	 */
39 39
 	public function generate(Individual $individual, Individual $head = null) {
40 40
 		switch ($individual->getSex()) {
41
-			case 'M':
42
-				return $this->male;
43
-			case 'F':
44
-				return $this->female;
45
-			default:
46
-				return '';
41
+		case 'M':
42
+			return $this->male;
43
+		case 'F':
44
+			return $this->female;
45
+		default:
46
+			return '';
47 47
 		}
48 48
 	}
49 49
 }
Please login to merge, or discard this patch.
edit_interface.php 1 patch
Switch Indentation   +97 added lines, -97 removed lines patch added patch discarded remove patch
@@ -273,40 +273,40 @@  discard block
 block discarded – undo
273 273
 
274 274
 		$level1type = $edit_fact->getTag();
275 275
 		switch ($record::RECORD_TYPE) {
276
-			case 'REPO':
277
-				// REPO:NAME facts may take a NOTE (but the REPO record may not).
278
-				if ($level1type === 'NAME') {
279
-					FunctionsEdit::printAddLayer('NOTE');
280
-					FunctionsEdit::printAddLayer('SHARED_NOTE');
276
+		case 'REPO':
277
+			// REPO:NAME facts may take a NOTE (but the REPO record may not).
278
+			if ($level1type === 'NAME') {
279
+				FunctionsEdit::printAddLayer('NOTE');
280
+				FunctionsEdit::printAddLayer('SHARED_NOTE');
281
+			}
282
+			break;
283
+		case 'FAM':
284
+		case 'INDI':
285
+			// FAM and INDI records have real facts. They can take NOTE/SOUR/OBJE/etc.
286
+			if ($level1type !== 'SEX' && $level1type !== 'NOTE' && $level1type !== 'ALIA') {
287
+				if ($level1type !== 'SOUR') {
288
+					FunctionsEdit::printAddLayer('SOUR');
281 289
 				}
282
-				break;
283
-			case 'FAM':
284
-			case 'INDI':
285
-				// FAM and INDI records have real facts. They can take NOTE/SOUR/OBJE/etc.
286
-				if ($level1type !== 'SEX' && $level1type !== 'NOTE' && $level1type !== 'ALIA') {
287
-					if ($level1type !== 'SOUR') {
288
-						FunctionsEdit::printAddLayer('SOUR');
289
-					}
290
-					if ($level1type !== 'OBJE') {
291
-						FunctionsEdit::printAddLayer('OBJE');
292
-					}
293
-					FunctionsEdit::printAddLayer('NOTE');
294
-					FunctionsEdit::printAddLayer('SHARED_NOTE', 2, $level1type);
295
-					if ($level1type !== 'ASSO' && $level1type !== 'NOTE' && $level1type !== 'SOUR') {
296
-						FunctionsEdit::printAddLayer('ASSO');
297
-					}
298
-					// allow to add godfather and godmother for CHR fact or best man and bridesmaid  for MARR fact in one window
299
-					if (in_array($level1type, Config::twoAssociates())) {
300
-						FunctionsEdit::printAddLayer('ASSO2');
301
-					}
302
-					if ($level1type !== 'SOUR') {
303
-						FunctionsEdit::printAddLayer('RESN');
304
-					}
290
+				if ($level1type !== 'OBJE') {
291
+					FunctionsEdit::printAddLayer('OBJE');
305 292
 				}
306
-				break;
307
-			default:
308
-				// Other types of record do not have these lower-level records
309
-				break;
293
+				FunctionsEdit::printAddLayer('NOTE');
294
+				FunctionsEdit::printAddLayer('SHARED_NOTE', 2, $level1type);
295
+				if ($level1type !== 'ASSO' && $level1type !== 'NOTE' && $level1type !== 'SOUR') {
296
+					FunctionsEdit::printAddLayer('ASSO');
297
+				}
298
+				// allow to add godfather and godmother for CHR fact or best man and bridesmaid  for MARR fact in one window
299
+				if (in_array($level1type, Config::twoAssociates())) {
300
+					FunctionsEdit::printAddLayer('ASSO2');
301
+				}
302
+				if ($level1type !== 'SOUR') {
303
+					FunctionsEdit::printAddLayer('RESN');
304
+				}
305
+			}
306
+			break;
307
+		default:
308
+			// Other types of record do not have these lower-level records
309
+			break;
310 310
 		}
311 311
 
312 312
 		?>
@@ -2089,15 +2089,15 @@  discard block
 block discarded – undo
2089 2089
 								<b>
2090 2090
 									<?php
2091 2091
 									switch ($father->getSex()) {
2092
-										case 'M':
2093
-											echo I18N::translate('husband');
2094
-											break;
2095
-										case 'F':
2096
-											echo I18N::translate('wife');
2097
-											break;
2098
-										default:
2099
-											echo I18N::translate('spouse');
2100
-											break;
2092
+									case 'M':
2093
+										echo I18N::translate('husband');
2094
+										break;
2095
+									case 'F':
2096
+										echo I18N::translate('wife');
2097
+										break;
2098
+									default:
2099
+										echo I18N::translate('spouse');
2100
+										break;
2101 2101
 									}
2102 2102
 									?>
2103 2103
 								</b>
@@ -2128,15 +2128,15 @@  discard block
 block discarded – undo
2128 2128
 								<b>
2129 2129
 									<?php
2130 2130
 									switch ($mother->getSex()) {
2131
-										case 'M':
2132
-											echo I18N::translate('husband');
2133
-											break;
2134
-										case 'F':
2135
-											echo I18N::translate('wife');
2136
-											break;
2137
-										default:
2138
-											echo I18N::translate('spouse');
2139
-											break;
2131
+									case 'M':
2132
+										echo I18N::translate('husband');
2133
+										break;
2134
+									case 'F':
2135
+										echo I18N::translate('wife');
2136
+										break;
2137
+									default:
2138
+										echo I18N::translate('spouse');
2139
+										break;
2140 2140
 									}
2141 2141
 									?>
2142 2142
 								</b>
@@ -2169,15 +2169,15 @@  discard block
 block discarded – undo
2169 2169
 								<b>
2170 2170
 									<?php
2171 2171
 									switch ($child->getSex()) {
2172
-										case 'M':
2173
-											echo I18N::translate('son');
2174
-											break;
2175
-										case 'F':
2176
-											echo I18N::translate('daughter');
2177
-											break;
2178
-										default:
2179
-											echo I18N::translate('child');
2180
-											break;
2172
+									case 'M':
2173
+										echo I18N::translate('son');
2174
+										break;
2175
+									case 'F':
2176
+										echo I18N::translate('daughter');
2177
+										break;
2178
+									default:
2179
+										echo I18N::translate('child');
2180
+										break;
2181 2181
 									}
2182 2182
 									?>
2183 2183
 								</b>
@@ -2561,35 +2561,35 @@  discard block
 block discarded – undo
2561 2561
 		}
2562 2562
 
2563 2563
 		switch ($nextaction) {
2564
-			case 'add_child_to_family_action':
2565
-				$name_fields = array_merge($name_fields, $surname_tradition->newChildNames($father_name, $mother_name, $gender));
2566
-				break;
2567
-			case 'add_child_to_individual_action':
2568
-				if ($person->getSex() === 'F') {
2569
-					$name_fields = array_merge($name_fields, $surname_tradition->newChildNames('', $indi_name, $gender));
2570
-				} else {
2571
-					$name_fields = array_merge($name_fields, $surname_tradition->newChildNames($indi_name, '', $gender));
2572
-				}
2573
-				break;
2574
-			case 'add_parent_to_individual_action':
2575
-				$name_fields = array_merge($name_fields, $surname_tradition->newParentNames($indi_name, $gender));
2576
-				break;
2577
-			case 'add_spouse_to_family_action':
2578
-				if ($father) {
2579
-					$name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($father_name, $gender));
2580
-				} else {
2581
-					$name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($mother_name, $gender));
2582
-				}
2583
-				break;
2584
-			case 'add_spouse_to_individual_action':
2585
-				$name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($indi_name, $gender));
2586
-				break;
2587
-			case 'add_unlinked_indi_action':
2588
-			case 'update':
2589
-				if ($surname_tradition->hasSurnames()) {
2590
-					$name_fields['NAME'] = '//';
2591
-				}
2592
-				break;
2564
+		case 'add_child_to_family_action':
2565
+			$name_fields = array_merge($name_fields, $surname_tradition->newChildNames($father_name, $mother_name, $gender));
2566
+			break;
2567
+		case 'add_child_to_individual_action':
2568
+			if ($person->getSex() === 'F') {
2569
+				$name_fields = array_merge($name_fields, $surname_tradition->newChildNames('', $indi_name, $gender));
2570
+			} else {
2571
+				$name_fields = array_merge($name_fields, $surname_tradition->newChildNames($indi_name, '', $gender));
2572
+			}
2573
+			break;
2574
+		case 'add_parent_to_individual_action':
2575
+			$name_fields = array_merge($name_fields, $surname_tradition->newParentNames($indi_name, $gender));
2576
+			break;
2577
+		case 'add_spouse_to_family_action':
2578
+			if ($father) {
2579
+				$name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($father_name, $gender));
2580
+			} else {
2581
+				$name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($mother_name, $gender));
2582
+			}
2583
+			break;
2584
+		case 'add_spouse_to_individual_action':
2585
+			$name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($indi_name, $gender));
2586
+			break;
2587
+		case 'add_unlinked_indi_action':
2588
+		case 'update':
2589
+			if ($surname_tradition->hasSurnames()) {
2590
+				$name_fields['NAME'] = '//';
2591
+			}
2592
+			break;
2593 2593
 		}
2594 2594
 	}
2595 2595
 
@@ -2609,15 +2609,15 @@  discard block
 block discarded – undo
2609 2609
 	echo '<table class="facts_table">';
2610 2610
 
2611 2611
 	switch ($nextaction) {
2612
-		case 'add_child_to_family_action':
2613
-		case 'add_child_to_individual_action':
2614
-			// When adding a new child, specify the pedigree
2615
-			FunctionsEdit::addSimpleTag('0 PEDI');
2616
-			break;
2617
-		case 'update':
2618
-			// When adding/editing a name, specify the type
2619
-			FunctionsEdit::addSimpleTag('0 TYPE ' . $name_type, '', '', null, $person);
2620
-			break;
2612
+	case 'add_child_to_family_action':
2613
+	case 'add_child_to_individual_action':
2614
+		// When adding a new child, specify the pedigree
2615
+		FunctionsEdit::addSimpleTag('0 PEDI');
2616
+		break;
2617
+	case 'update':
2618
+		// When adding/editing a name, specify the type
2619
+		FunctionsEdit::addSimpleTag('0 TYPE ' . $name_type, '', '', null, $person);
2620
+		break;
2621 2621
 	}
2622 2622
 
2623 2623
 	// First - new/existing standard name fields
Please login to merge, or discard this patch.