fisharebest / webtrees

resources/views/admin/trees-privacy.php

Indentation +6 added lines, -6 removed lines

@@ -106,12 +106,12 @@
 			</legend>
 			<div class="col-sm-8">
 				<?php
-				echo
-					/* I18N: Extend privacy to dead individuals who were… */ I18N::translate(
-					'born in the last %1$s years or died in the last %2$s years',
-					'<input type="text" name="KEEP_ALIVE_YEARS_BIRTH" value="' . $tree->getPreference('KEEP_ALIVE_YEARS_BIRTH') . '" size="5" maxlength="3">',
-					'<input type="text" name="KEEP_ALIVE_YEARS_DEATH" value="' . $tree->getPreference('KEEP_ALIVE_YEARS_DEATH') . '" size="5" maxlength="3">'
-				) ?>
+                echo
+                    /* I18N: Extend privacy to dead individuals who were… */ I18N::translate(
+                    'born in the last %1$s years or died in the last %2$s years',
+                    '<input type="text" name="KEEP_ALIVE_YEARS_BIRTH" value="' . $tree->getPreference('KEEP_ALIVE_YEARS_BIRTH') . '" size="5" maxlength="3">',
+                    '<input type="text" name="KEEP_ALIVE_YEARS_DEATH" value="' . $tree->getPreference('KEEP_ALIVE_YEARS_DEATH') . '" size="5" maxlength="3">'
+                ) ?>
 				<p class="small text-muted">
 					<?= /* I18N: Help text for the “Extend privacy to dead individuals” configuration setting */ I18N::translate('In some countries, privacy laws apply not only to living individuals, but also to those who have died recently. This option will allow you to extend the privacy rules for living individuals to those who were born or died within a specified number of years. Leave these values empty to disable this feature.') ?>
 				</p>

resources/views/admin/control-panel-manager.php

Indentation +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 	<div class="card-body">
 		<p>
 			<?= /* I18N: %s is a URL/link to the project website */
-			I18N::translate('Support and documentation can be found at %s.', '<a href="https://webtrees.net/">webtrees.net</a>') ?>
+            I18N::translate('Support and documentation can be found at %s.', '<a href="https://webtrees.net/">webtrees.net</a>') ?>
 		</p>
 	</div>
 </div>

resources/views/admin/trees-merge.php

Indentation +4 added lines, -4 removed lines

@@ -31,10 +31,10 @@
 	<?= csrf_field() ?>
 	<p class="form-inline">
 		<?= I18N::translate(/* I18N: Copy all the records from [family tree 1] into [family tree 2] */
-			'Copy all the records from %1$s into %2$s.',
-			Bootstrap4::select($tree_list, $tree1 ? $tree1->getName() : '', ['name' => 'tree1_name']),
-			Bootstrap4::select($tree_list, $tree2 ? $tree2->getName() : '', ['name' => 'tree2_name'])
-		) ?>
+            'Copy all the records from %1$s into %2$s.',
+            Bootstrap4::select($tree_list, $tree1 ? $tree1->getName() : '', ['name' => 'tree1_name']),
+            Bootstrap4::select($tree_list, $tree2 ? $tree2->getName() : '', ['name' => 'tree2_name'])
+        ) ?>
 	</p>
 
 	<button type="submit" class="btn btn-primary">

resources/views/search-advanced-page.php

Indentation +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
 		<div class="row form-group my-3">
 			<div class="form-row mx-auto">
 				<input type="submit" class="btn btn-primary" value="<?= /* I18N: A button label. */
-				I18N::translate('search') ?>">
+                I18N::translate('search') ?>">
 			</div>
 		</div>
 	</form>

resources/views/descendants-page.php

Indentation +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 		<div class="col-form-label col-sm-3 wt-page-options-label"></div>
 		<div class="col-sm-9 wt-page-options-value">
 			<input class="btn btn-primary" type="submit" value="<?= /* I18N: A button label. */
-			I18N::translate('view') ?>">
+            I18N::translate('view') ?>">
 		</div>
 	</div>
 </form>

resources/views/timeline-page.php

Indentation +4 added lines, -4 removed lines

@@ -20,9 +20,9 @@ 
 		</label>
 		<div class="col-sm-9 wt-page-options-value">
 			<?= FunctionsEdit::formControlIndividual($tree, null, [
-				'id'   => 'xref-add',
-				'name' => 'xrefs[]',
-			]) ?>
+                'id'   => 'xref-add',
+                'name' => 'xrefs[]',
+            ]) ?>
 		</div>
 	</div>
 
@@ -30,7 +30,7 @@ 
 		<div class="col-form-label col-sm-3 wt-page-options-label"></div>
 		<div class="col-sm-9 wt-page-options-value">
 			<input class="btn btn-primary" type="submit" value="<?= /* I18N: A button label. */
-			I18N::translate('add') ?>">
+            I18N::translate('add') ?>">
 			<a class="btn btn-secondary" href="<?= e(route('timeline', ['ged' => $tree->getName()])) ?>">
 				<?= /* I18N: A button label. */ I18N::translate('reset') ?>
 			</a>

resources/views/lists/media-table.php

Indentation +10 added lines, -10 removed lines

@@ -6,26 +6,26 @@
 // It is not good to bypass privacy, but many servers do not have the resources
 // to process privacy for every record in the tree
 $count_individuals = Database::prepare(
-	"SELECT l_to, COUNT(*) FROM `##individuals` JOIN `##link` ON l_from = i_id AND l_file = i_file AND l_type = 'NOTE' AND l_file = :tree_id GROUP BY l_to"
+    "SELECT l_to, COUNT(*) FROM `##individuals` JOIN `##link` ON l_from = i_id AND l_file = i_file AND l_type = 'NOTE' AND l_file = :tree_id GROUP BY l_to"
 )->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc();
 $count_families    = Database::prepare(
-	"SELECT l_to, COUNT(*) FROM `##families` JOIN `##link` ON l_from = f_id AND l_file = f_file AND l_type = 'NOTE' AND l_file = :tree_id GROUP BY l_to"
+    "SELECT l_to, COUNT(*) FROM `##families` JOIN `##link` ON l_from = f_id AND l_file = f_file AND l_type = 'NOTE' AND l_file = :tree_id GROUP BY l_to"
 )->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc();
 $count_sources     = Database::prepare(
-	"SELECT l_to, COUNT(*) FROM `##sources` JOIN `##link` ON l_from = s_id AND l_file = s_file AND l_type = 'NOTE' AND l_file = :tree_id GROUP BY l_to"
+    "SELECT l_to, COUNT(*) FROM `##sources` JOIN `##link` ON l_from = s_id AND l_file = s_file AND l_type = 'NOTE' AND l_file = :tree_id GROUP BY l_to"
 )->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc();
 ?>
 
 <table
 	class="table table-bordered table-sm wt-table-media datatables"
 	data-columns="<?= e(json_encode([
-		null,
-		null,
-		['visible' => array_sum($count_individuals) > 0],
-		['visible' => array_sum($count_families) > 0],
-		['visible' => array_sum($count_sources) > 0],
-		['visible' => (bool) $tree->getPreference('SHOW_LAST_CHANGE'), 'searchable' => false],
-	])) ?>"
+        null,
+        null,
+        ['visible' => array_sum($count_individuals) > 0],
+        ['visible' => array_sum($count_families) > 0],
+        ['visible' => array_sum($count_sources) > 0],
+        ['visible' => (bool) $tree->getPreference('SHOW_LAST_CHANGE'), 'searchable' => false],
+    ])) ?>"
 	data-state-save="true"
 >
 	<caption class="sr-only">

resources/views/lists/sources-table.php

Indentation +12 added lines, -12 removed lines

@@ -6,30 +6,30 @@
 // It is not good to bypass privacy, but many servers do not have the resources
 // to process privacy for every record in the tree
 $count_individuals = Database::prepare(
-	"SELECT l_to, COUNT(*) FROM `##individuals` JOIN `##link` ON l_from = i_id AND l_file = i_file AND l_type = 'SOUR' AND l_file = :tree_id GROUP BY l_to"
+    "SELECT l_to, COUNT(*) FROM `##individuals` JOIN `##link` ON l_from = i_id AND l_file = i_file AND l_type = 'SOUR' AND l_file = :tree_id GROUP BY l_to"
 )->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc();
 $count_families    = Database::prepare(
-	"SELECT l_to, COUNT(*) FROM `##families` JOIN `##link` ON l_from = f_id AND l_file = f_file AND l_type = 'SOUR' AND l_file = :tree_id GROUP BY l_to"
+    "SELECT l_to, COUNT(*) FROM `##families` JOIN `##link` ON l_from = f_id AND l_file = f_file AND l_type = 'SOUR' AND l_file = :tree_id GROUP BY l_to"
 )->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc();
 $count_media       = Database::prepare(
-	"SELECT l_to, COUNT(*) FROM `##media` JOIN `##link` ON l_from = m_id AND l_file = m_file AND l_type = 'SOUR' AND l_file = :tree_id GROUP BY l_to"
+    "SELECT l_to, COUNT(*) FROM `##media` JOIN `##link` ON l_from = m_id AND l_file = m_file AND l_type = 'SOUR' AND l_file = :tree_id GROUP BY l_to"
 )->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc();
 $count_notes       = Database::prepare(
-	"SELECT l_to, COUNT(*) FROM `##other` JOIN `##link` ON l_from = o_id AND l_file = o_file AND o_type = 'NOTE' AND l_type = 'SOUR' AND l_file = :tree_id GROUP BY l_to"
+    "SELECT l_to, COUNT(*) FROM `##other` JOIN `##link` ON l_from = o_id AND l_file = o_file AND o_type = 'NOTE' AND l_type = 'SOUR' AND l_file = :tree_id GROUP BY l_to"
 )->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc();
 ?>
 
 <table
 	class="table table-bordered table-sm wt-table-source datatables d-none"
 	data-columns="<?= e(json_encode([
-		null,
-		null,
-		['visible' => array_sum($count_individuals) > 0],
-		['visible' => array_sum($count_families) > 0],
-		['visible' => array_sum($count_media) > 0],
-		['visible' => array_sum($count_notes) > 0],
-		['visible' => (bool) $tree->getPreference('SHOW_LAST_CHANGE'), 'searchable' => false],
-	])) ?>"
+        null,
+        null,
+        ['visible' => array_sum($count_individuals) > 0],
+        ['visible' => array_sum($count_families) > 0],
+        ['visible' => array_sum($count_media) > 0],
+        ['visible' => array_sum($count_notes) > 0],
+        ['visible' => (bool) $tree->getPreference('SHOW_LAST_CHANGE'), 'searchable' => false],
+    ])) ?>"
 	data-state-save="true"
 >
 	<caption class="sr-only">

resources/views/lists/individuals-table.php

Indentation +4 added lines, -4 removed lines

@@ -78,13 +78,13 @@ 
 // Inititialise chart data
 $deat_by_age = [];
 for ($age = 0; $age <= $max_age; $age++) {
-	$deat_by_age[$age] = '';
+    $deat_by_age[$age] = '';
 }
 $birt_by_decade = [];
 $deat_by_decade = [];
 for ($year = 1550; $year < 2030; $year += 10) {
-	$birt_by_decade[$year] = '';
-	$deat_by_decade[$year] = '';
+    $birt_by_decade[$year] = '';
+    $deat_by_decade[$year] = '';
 }
 ?>
 
@@ -197,7 +197,7 @@ 
 				<th><?= I18N::translate('Given names') ?></th>
 				<th><?= I18N::translate('Surname') ?></th>
 				<th><?= /* I18N: Abbreviation for “Sosa-Stradonitz number”. This is an individual’s surname, so may need transliterating into non-latin alphabets. */
-					I18N::translate('Sosa') ?></th>
+                    I18N::translate('Sosa') ?></th>
 				<th><?= I18N::translate('Birth') ?></th>
 				<th>
 					<i class="icon-reminder" title="<?= I18N::translate('Anniversary') ?>"></i>

Braces +5 added lines, -2 removed lines

@@ -319,8 +319,11 @@
 					<?php if (!isset($unique_indis[$individual->getXref()]) && $age_at_death >= 0 && $age_at_death <= $max_age): ?>
 						<?php $deat_by_age[$age_at_death] .= $individual->getSex(); ?>
 					<?php endif ?>
-				<?php else: ?>
-					<?php $age_at_death = ''; ?>
+				<?php else {
+    : ?>
+					<?php $age_at_death = '';
+}
+?>
 					<?php $age_at_death_sort = PHP_INT_MAX; ?>
 				<?php endif ?>
 				<td class="center" data-sort="<?= e($age_at_death_sort) ?>">