fisharebest / webtrees

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) ?>">

resources/views/lists/repositories-table.php

Indentation +4 added lines, -4 removed lines

@@ -13,10 +13,10 @@
 <table
 	class="table table-bordered table-sm wt-table-source datatables d-none"
 	data-columns="<?= e(json_encode([
-		null,
-		['visible' => array_sum($count_sources) > 0],
-		['visible' => (bool) $tree->getPreference('SHOW_LAST_CHANGE'), 'searchable' => false],
-	])) ?>"
+        null,
+        ['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/chart-by-age.php

Indentation +18 added lines, -18 removed lines

@@ -6,14 +6,14 @@ 
 $vmax   = 0;
 $avg    = 0;
 foreach ($data as $age => $v) {
-	$n      = strlen($v);
-	$vmax   = max($vmax, $n);
-	$agemax = max($agemax, $age);
-	$count += $n;
-	$avg += $age * $n;
+    $n      = strlen($v);
+    $vmax   = max($vmax, $n);
+    $agemax = max($agemax, $age);
+    $count += $n;
+    $avg += $age * $n;
 }
 if ($count < 1) {
-	return '';
+    return '';
 }
 $avg       = round($avg / $count);
 $chart_url = 'https://chart.googleapis.com/chart?cht=bvs'; // chart type
@@ -27,36 +27,36 @@ 
 $chart_url .= '&amp;chm=V,FF0000,0,' . ($avg - 0.3) . ',1'; // average age line marker
 $chart_url .= '&amp;chxl=0:|'; // label
 for ($age = 0; $age <= $agemax; $age += 5) {
-	$chart_url .= $age . '|||||'; // x axis
+    $chart_url .= $age . '|||||'; // x axis
 }
 $chart_url .= '|1:||' . rawurlencode(I18N::percentage($vmax / $count)); // y axis
 $chart_url .= '|2:||';
 $step = $vmax;
 for ($d = $vmax; $d > 0; $d--) {
-	if ($vmax < ($d * 10 + 1) && ($vmax % $d) == 0) {
-		$step = $d;
-	}
+    if ($vmax < ($d * 10 + 1) && ($vmax % $d) == 0) {
+        $step = $d;
+    }
 }
 if ($step == $vmax) {
-	for ($d = $vmax - 1; $d > 0; $d--) {
-		if (($vmax - 1) < ($d * 10 + 1) && (($vmax - 1) % $d) == 0) {
-			$step = $d;
-		}
-	}
+    for ($d = $vmax - 1; $d > 0; $d--) {
+        if (($vmax - 1) < ($d * 10 + 1) && (($vmax - 1) % $d) == 0) {
+            $step = $d;
+        }
+    }
 }
 for ($n = $step; $n < $vmax; $n += $step) {
-	$chart_url .= $n . '|';
+    $chart_url .= $n . '|';
 }
 $chart_url .= rawurlencode($vmax . ' / ' . $count); // r axis
 $chart_url .= '&amp;chg=100,' . round(100 * $step / $vmax, 1) . ',1,5'; // grid
 $chart_url .= '&amp;chd=s:'; // data : simple encoding from A=0 to 9=61
 $CHART_ENCODING61 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
 for ($age = 0; $age <= $agemax; $age++) {
-	$chart_url .= $CHART_ENCODING61[(int) (substr_count($data[$age], 'M') * 61 / $vmax)];
+    $chart_url .= $CHART_ENCODING61[(int) (substr_count($data[$age], 'M') * 61 / $vmax)];
 }
 $chart_url .= ',';
 for ($age = 0; $age <= $agemax; $age++) {
-	$chart_url .= $CHART_ENCODING61[(int) (substr_count($data[$age], 'F') * 61 / $vmax)];
+    $chart_url .= $CHART_ENCODING61[(int) (substr_count($data[$age], 'F') * 61 / $vmax)];
 }
 $html = '<img src="' . $chart_url . '" alt="' . $title . '" title="' . $title . '" class="gchart">';
 

resources/views/lists/families-table.php

Indentation +26 added lines, -26 removed lines

@@ -70,13 +70,13 @@ 
 // init chart data
 $marr_by_age = [];
 for ($age = 0; $age <= $max_age; $age++) {
-	$marr_by_age[$age] = '';
+    $marr_by_age[$age] = '';
 }
 $birt_by_decade = [];
 $marr_by_decade = [];
 for ($year = 1550; $year < 2030; $year += 10) {
-	$birt_by_decade[$year] = '';
-	$marr_by_decade[$year] = '';
+    $birt_by_decade[$year] = '';
+    $marr_by_decade[$year] = '';
 }
 ?>
 
@@ -244,18 +244,18 @@ 
 
 				<!-- Husband age -->
 				<?php
-				$mdate = $family->getMarriageDate();
-				$hdate = $husb->getBirthDate();
-				if ($hdate->isOK() && $mdate->isOK()) {
-					if ($hdate->gregorianYear() >= 1550 && $hdate->gregorianYear() < 2030) {
-						$birt_by_decade[(int) ($hdate->gregorianYear() / 10) * 10] .= $husb->getSex();
-					}
-					$hage = Date::getAge($hdate, $mdate, 0);
-					if ($hage >= 0 && $hage <= $max_age) {
-						$marr_by_age[$hage] .= $husb->getSex();
-					}
-				}
-				?>
+                $mdate = $family->getMarriageDate();
+                $hdate = $husb->getBirthDate();
+                if ($hdate->isOK() && $mdate->isOK()) {
+                    if ($hdate->gregorianYear() >= 1550 && $hdate->gregorianYear() < 2030) {
+                        $birt_by_decade[(int) ($hdate->gregorianYear() / 10) * 10] .= $husb->getSex();
+                    }
+                    $hage = Date::getAge($hdate, $mdate, 0);
+                    if ($hage >= 0 && $hage <= $max_age) {
+                        $marr_by_age[$hage] .= $husb->getSex();
+                    }
+                }
+                ?>
 				<td class="center" data-sort="<?= Date::getAge($hdate, $mdate, 1) ?>">
 					<?= Date::getAge($hdate, $mdate, 2) ?>
 				</td>
@@ -280,17 +280,17 @@ 
 
 				<!-- Wife age -->
 				<?php
-				$wdate = $wife->getBirthDate();
-				if ($wdate->isOK() && $mdate->isOK()) {
-					if ($wdate->gregorianYear() >= 1550 && $wdate->gregorianYear() < 2030) {
-						$birt_by_decade[(int) ($wdate->gregorianYear() / 10) * 10] .= $wife->getSex();
-					}
-					$wage = Date::getAge($wdate, $mdate, 0);
-					if ($wage >= 0 && $wage <= $max_age) {
-						$marr_by_age[$wage] .= $wife->getSex();
-					}
-				}
-				?>
+                $wdate = $wife->getBirthDate();
+                if ($wdate->isOK() && $mdate->isOK()) {
+                    if ($wdate->gregorianYear() >= 1550 && $wdate->gregorianYear() < 2030) {
+                        $birt_by_decade[(int) ($wdate->gregorianYear() / 10) * 10] .= $wife->getSex();
+                    }
+                    $wage = Date::getAge($wdate, $mdate, 0);
+                    if ($wage >= 0 && $wage <= $max_age) {
+                        $marr_by_age[$wage] .= $wife->getSex();
+                    }
+                }
+                ?>
 
 				<td class="center" data-sort="<?= Date::getAge($wdate, $mdate, 1) ?>">
 					<?= Date::getAge($wdate, $mdate, 2) ?>

resources/views/lifespans-page.php

Indentation +3 added lines, -3 removed lines

@@ -20,9 +20,9 @@
 		</label>
 		<div class="col-sm-9 wt-page-options-value">
 			<?= FunctionsEdit::formControlIndividual($tree, null, [
-				'id'   => 'addxref',
-				'name' => 'addxref',
-			]) ?>
+                'id'   => 'addxref',
+                'name' => 'addxref',
+            ]) ?>
 
 			<?= Bootstrap4::checkbox(/* I18N: Label for a configuration option */ I18N::translate('Include the individual’s immediate family'), false, ['name' => 'addfam']) ?>
 		</div>

resources/views/layouts/default.php

Indentation +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
 				<?php if ($page_hits ?? 0 > 0): ?>
 				<div class="wt-page-views">
 					<?= I18N::plural('This page has been viewed %s time.', 'This page has been viewed %s times.', $page_hits,
-					'<span class="odometer">' . I18N::digits($page_hits) . '</span>') ?>
+                    '<span class="odometer">' . I18N::digits($page_hits) . '</span>') ?>
 				</div>
 				<?php endif ?>
 

resources/views/relationships-page.php

Indentation +14 added lines, -14 removed lines

@@ -17,12 +17,12 @@ 
 		</label>
 		<div class="col-sm-9 wt-page-options-value">
 			<?= FunctionsEdit::formControlIndividual($tree, $individual1, [
-				'id'   => 'xref1',
-				'name' => 'xref1',
-			]) ?>
+                'id'   => 'xref1',
+                'name' => 'xref1',
+            ]) ?>
 			<button class="btn btn-link small" id="btn-swap-individuals" type="button">
 				<?= /* I18N: Reverse the order of two individuals */
-				I18N::translate('Swap individuals') ?>
+                I18N::translate('Swap individuals') ?>
 			</button>
 		</div>
 	</div>
@@ -33,9 +33,9 @@ 
 		</label>
 		<div class="col-sm-9 wt-page-options-value">
 			<?= FunctionsEdit::formControlIndividual($tree, $individual2, [
-				'id'   => 'xref2',
-				'name' => 'xref2',
-			]) ?>
+                'id'   => 'xref2',
+                'name' => 'xref2',
+            ]) ?>
 		</div>
 	</div>
 
@@ -73,19 +73,19 @@ 
 		<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>
 
 <?php if ($individual1 !== null && $individual2 !== null): ?>
 	<div class="wt-ajax-load wt-page-content wt-chart wt-relationships-chart" data-ajax-url="<?= e(route('relationships-chart', [
-		'xref1'     => $individual1->getXref(),
-		'xref2'     => $individual2->getXref(),
-		'ged'       => $individual2->getTree()->getName(),
-		'recursion' => $recursion,
-		'ancestors' => $ancestors,
-	])) ?>"></div>
+        'xref1'     => $individual1->getXref(),
+        'xref2'     => $individual2->getXref(),
+        'ged'       => $individual2->getTree()->getName(),
+        'recursion' => $recursion,
+        'ancestors' => $ancestors,
+    ])) ?>"></div>
 <?php endif ?>
 
 <?php View::push('javascript') ?>