@@ -16,8 +16,8 @@ |
||
16 | 16 | namespace Fisharebest\Webtrees; |
17 | 17 | |
18 | 18 | use Exception; |
19 | -use Swift_Mailer; |
|
20 | 19 | use Swift_MailTransport; |
20 | +use Swift_Mailer; |
|
21 | 21 | use Swift_Message; |
22 | 22 | use Swift_NullTransport; |
23 | 23 | use Swift_Preferences; |
@@ -1120,24 +1120,24 @@ |
||
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 | } |
@@ -38,12 +38,12 @@ |
||
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 | } |
@@ -17,7 +17,6 @@ |
||
17 | 17 | |
18 | 18 | use Fisharebest\Webtrees\Database; |
19 | 19 | use Fisharebest\Webtrees\Family; |
20 | -use Fisharebest\Webtrees\Filter; |
|
21 | 20 | use Fisharebest\Webtrees\Html; |
22 | 21 | use Fisharebest\Webtrees\I18N; |
23 | 22 | use Fisharebest\Webtrees\Individual; |
@@ -17,7 +17,6 @@ |
||
17 | 17 | |
18 | 18 | use Fisharebest\Webtrees\Auth; |
19 | 19 | use Fisharebest\Webtrees\Family; |
20 | -use Fisharebest\Webtrees\Filter; |
|
21 | 20 | use Fisharebest\Webtrees\FlashMessages; |
22 | 21 | use Fisharebest\Webtrees\GedcomRecord; |
23 | 22 | use Fisharebest\Webtrees\GedcomTag; |
@@ -18,7 +18,6 @@ |
||
18 | 18 | use Fisharebest\Webtrees\Auth; |
19 | 19 | use Fisharebest\Webtrees\Database; |
20 | 20 | use Fisharebest\Webtrees\Family; |
21 | -use Fisharebest\Webtrees\Filter; |
|
22 | 21 | use Fisharebest\Webtrees\Functions\Functions; |
23 | 22 | use Fisharebest\Webtrees\I18N; |
24 | 23 | use Fisharebest\Webtrees\Individual; |
@@ -16,7 +16,6 @@ |
||
16 | 16 | namespace Fisharebest\Webtrees\Module; |
17 | 17 | |
18 | 18 | use Fisharebest\Webtrees\Auth; |
19 | -use Fisharebest\Webtrees\Filter; |
|
20 | 19 | use Fisharebest\Webtrees\FontAwesome; |
21 | 20 | use Fisharebest\Webtrees\Html; |
22 | 21 | use Fisharebest\Webtrees\I18N; |
@@ -26,7 +26,6 @@ |
||
26 | 26 | use Fisharebest\Webtrees\Date\JulianDate; |
27 | 27 | use Fisharebest\Webtrees\Fact; |
28 | 28 | use Fisharebest\Webtrees\Family; |
29 | -use Fisharebest\Webtrees\Filter; |
|
30 | 29 | use Fisharebest\Webtrees\I18N; |
31 | 30 | use Fisharebest\Webtrees\Individual; |
32 | 31 | use Fisharebest\Webtrees\Note; |
@@ -16,7 +16,6 @@ |
||
16 | 16 | namespace Fisharebest\Webtrees\Query; |
17 | 17 | |
18 | 18 | use Fisharebest\Webtrees\Database; |
19 | -use Fisharebest\Webtrees\Filter; |
|
20 | 19 | use Fisharebest\Webtrees\Media; |
21 | 20 | |
22 | 21 | /** |