fisharebest / webtrees

resources/views/calendar-page.php

Indentation +10 added lines, -10 removed lines

@@ -159,16 +159,16 @@
 			</td>
 			<td class="topbottombar width50">
 				<?php
-					$n = 0;
-					foreach (Date::calendarNames() as $newcal => $cal_name) {
-						$tmp = $cal_date->convertToCalendar($newcal);
-						if ($tmp->inValidRange()) {
-							if ($n++) {
-								echo ' | ';
-							}
-							echo '<a ' . (get_class($tmp) === get_class($cal_date) ? 'class="error"' : '') . 'href="' . e(route('calendar', ['cal' => $tmp->format('%@'), 'day' => $tmp->d, 'month' => $tmp->format('%O'), 'year' => $tmp->y, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => $view, 'ged' => $tree->getName()])) . '" rel="nofollow">', $cal_name, '</a>';
-						}
-					} ?>
+                    $n = 0;
+                    foreach (Date::calendarNames() as $newcal => $cal_name) {
+                        $tmp = $cal_date->convertToCalendar($newcal);
+                        if ($tmp->inValidRange()) {
+                            if ($n++) {
+                                echo ' | ';
+                            }
+                            echo '<a ' . (get_class($tmp) === get_class($cal_date) ? 'class="error"' : '') . 'href="' . e(route('calendar', ['cal' => $tmp->format('%@'), 'day' => $tmp->d, 'month' => $tmp->format('%O'), 'year' => $tmp->y, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => $view, 'ged' => $tree->getName()])) . '" rel="nofollow">', $cal_name, '</a>';
+                        }
+                    } ?>
 			</td>
 		</tr>
 	</table>

resources/views/admin/site-preferences.php

Indentation +15 added lines, -15 removed lines

@@ -14,17 +14,17 @@ 
 	<div class="row form-group">
 		<label for="INDEX_DIRECTORY" class="col-sm-3 col-form-label">
 			<?= /* I18N: A configuration setting */
-			I18N::translate('Data folder') ?>
+            I18N::translate('Data folder') ?>
 		</label>
 		<div class="col-sm-9">
 			<input type="text" class="form-control" dir="ltr" id="INDEX_DIRECTORY" name="INDEX_DIRECTORY" value="<?= e(Site::getPreference('INDEX_DIRECTORY')) ?>" maxlength="255" placeholder="data/" required>
 			<p class="small text-muted">
 				<?= /* I18N: Help text for the "Data folder" site configuration setting */
-				I18N::translate('This folder will be used by webtrees to store media files, GEDCOM files, temporary files, etc. These files may contain private data, and should not be made available over the internet.') ?>
+                I18N::translate('This folder will be used by webtrees to store media files, GEDCOM files, temporary files, etc. These files may contain private data, and should not be made available over the internet.') ?>
 			</p>
 			<p class="small text-muted">
 				<?= /* I18N: “Apache” is a software program. */
-				I18N::translate('To protect this private data, webtrees uses an Apache configuration file (.htaccess) which blocks all access to this folder. If your web-server does not support .htaccess files, and you cannot restrict access to this folder, then you can select another folder, away from your web documents.') ?>
+                I18N::translate('To protect this private data, webtrees uses an Apache configuration file (.htaccess) which blocks all access to this folder. If your web-server does not support .htaccess files, and you cannot restrict access to this folder, then you can select another folder, away from your web documents.') ?>
 			</p>
 			<p class="small text-muted">
 				<?= I18N::translate('If you select a different folder, you must also move all files (except config.ini.php, index.php, and .htaccess) from the existing folder to the new folder.') ?>
@@ -39,13 +39,13 @@ 
 	<div class="row form-group">
 		<label for="MEMORY_LIMIT" class="col-sm-3 col-form-label">
 			<?= /* I18N: A configuration setting */
-			I18N::translate('Memory limit') ?>
+            I18N::translate('Memory limit') ?>
 		</label>
 		<div class="col-sm-9">
 			<input type="text" class="form-control" id="MEMORY_LIMIT" name="MEMORY_LIMIT" value="<?= e(Site::getPreference('MEMORY_LIMIT')) ?>" pattern="[0-9]+[KMG]" placeholder="<?= get_cfg_var('memory_limit') ?>" maxlength="255">
 			<p class="small text-muted">
 				<?= /* I18N: %s is an amount of memory, such as 32MB */
-				I18N::translate('By default, your server allows scripts to use %s of memory.', get_cfg_var('memory_limit')) ?>
+                I18N::translate('By default, your server allows scripts to use %s of memory.', get_cfg_var('memory_limit')) ?>
 				<?= I18N::translate('You can request a higher or lower limit, although the server may ignore this request.') ?>
 				<?= I18N::translate('Leave this blank to use the default value.') ?>
 			</p>
@@ -56,16 +56,16 @@ 
 	<div class="row form-group">
 		<label for="MAX_EXECUTION_TIME" class="col-sm-3 col-form-label">
 			<?= /* I18N: A configuration setting */
-			I18N::translate('PHP time limit') ?>
+            I18N::translate('PHP time limit') ?>
 		</label>
 		<div class="col-sm-9">
 			<input type="text" class="form-control" id="MAX_EXECUTION_TIME" name="MAX_EXECUTION_TIME" value="<?= e(Site::getPreference('MAX_EXECUTION_TIME')) ?>" pattern="[0-9]*" placeholder="<?= get_cfg_var('max_execution_time') ?>" maxlength="255">
 			<p class="small text-muted">
 				<?= I18N::plural(
-					'By default, your server allows scripts to run for %s second.',
-					'By default, your server allows scripts to run for %s seconds.',
-					get_cfg_var('max_execution_time'), I18N::number((float) get_cfg_var('max_execution_time')));
-				?>
+                    'By default, your server allows scripts to run for %s second.',
+                    'By default, your server allows scripts to run for %s seconds.',
+                    get_cfg_var('max_execution_time'), I18N::number((float) get_cfg_var('max_execution_time')));
+                ?>
 				<?= I18N::translate('You can request a higher or lower limit, although the server may ignore this request.') ?>
 				<?= I18N::translate('Leave this blank to use the default value.') ?>
 			</p>
@@ -89,13 +89,13 @@ 
 	<div class="row form-group">
 		<label for="THEME_DIR" class="col-sm-3 col-form-label">
 			<?= /* I18N: A configuration setting */
-			I18N::translate('Default theme') ?>
+            I18N::translate('Default theme') ?>
 		</label>
 		<div class="col-sm-9">
 			<?= Bootstrap4::select($all_themes, Site::getPreference('THEME_DIR', 'webtrees'), ['id' => 'THEME_DIR', 'name' => 'THEME_DIR']) ?>
 			<p class="small text-muted">
 				<?= /* I18N: Help text for the "Default theme" site configuration setting */
-				I18N::translate('You can change the appearance of webtrees using “themes”. Each theme has a different style, layout, color scheme, etc.') ?>
+                I18N::translate('You can change the appearance of webtrees using “themes”. Each theme has a different style, layout, color scheme, etc.') ?>
 			</p>
 			<p class="small text-muted">
 				<?= I18N::translate('Themes can be selected at three levels: user, family tree, and website. User preferences take priority over family tree preferences, which in turn take priority over the website preferences. Selecting “default theme” at one level will use the theme at the next level.') ?>
@@ -108,7 +108,7 @@ 
 		<div class="row">
 			<legend class="col-form-label col-sm-3">
 				<?= /* I18N: A configuration setting */
-				I18N::translate('Allow users to select their own theme') ?>
+                I18N::translate('Allow users to select their own theme') ?>
 			</legend>
 			<div class="col-sm-9">
 				<?= Bootstrap4::radioButtons('ALLOW_USER_THEMES', FunctionsEdit::optionsNoYes(), (string) (int) Site::getPreference('ALLOW_USER_THEMES'), true) ?>
@@ -121,13 +121,13 @@ 
 		<div class="row">
 			<legend class="col-form-label col-sm-3">
 				<?= /* I18N: A configuration setting */
-				I18N::translate('Show list of family trees') ?>
+                I18N::translate('Show list of family trees') ?>
 			</legend>
 			<div class="col-sm-9">
 				<?= Bootstrap4::radioButtons('ALLOW_CHANGE_GEDCOM', FunctionsEdit::optionsNoYes(), (string) (int) Site::getPreference('ALLOW_CHANGE_GEDCOM'), true) ?>
 				<p class="small text-muted">
 					<?= /* I18N: Help text for the “Show list of family trees” site configuration setting */
-					I18N::translate('For websites with more than one family tree, this option will show the list of family trees in the main menu, the search pages, etc.') ?>
+                    I18N::translate('For websites with more than one family tree, this option will show the list of family trees in the main menu, the search pages, etc.') ?>
 				</p>
 			</div>
 		</div>

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::getAgeYears($hdate, $mdate);
-					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::getAgeYears($hdate, $mdate);
+                    if ($hage >= 0 && $hage <= $max_age) {
+                        $marr_by_age[$hage] .= $husb->getSex();
+                    }
+                }
+                ?>
 				<td class="center" data-sort="<?= Date::getAgeDays($hdate, $mdate) ?>">
 					<?= Date::getAge($hdate, $mdate) ?>
 				</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::getAgeYears($wdate, $mdate);
-					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::getAgeYears($wdate, $mdate);
+                    if ($wage >= 0 && $wage <= $max_age) {
+                        $marr_by_age[$wage] .= $wife->getSex();
+                    }
+                }
+                ?>
 
 				<td class="center" data-sort="<?= Date::getAgeDays($wdate, $mdate) ?>">
 					<?= Date::getAge($wdate, $mdate) ?>