fisharebest / webtrees

app/Census/CensusColumnAgeFemale.php

Spacing +1 added lines, -1 removed lines

@@ -38,6 +38,6 @@
             return '';
         }
 
-        return (string)Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
+        return (string) Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
     }
 }

app/I18N.php

Spacing +5 added lines, -5 removed lines

@@ -836,31 +836,31 @@
         $year   = 365 * $day;
 
         if ($seconds > $year) {
-            $years = (int)($seconds / $year);
+            $years = (int) ($seconds / $year);
 
             return self::plural('%s year ago', '%s years ago', $years, self::number($years));
         }
 
         if ($seconds > $month) {
-            $months = (int)($seconds / $month);
+            $months = (int) ($seconds / $month);
 
             return self::plural('%s month ago', '%s months ago', $months, self::number($months));
         }
 
         if ($seconds > $day) {
-            $days = (int)($seconds / $day);
+            $days = (int) ($seconds / $day);
 
             return self::plural('%s day ago', '%s days ago', $days, self::number($days));
         }
 
         if ($seconds > $hour) {
-            $hours = (int)($seconds / $hour);
+            $hours = (int) ($seconds / $hour);
 
             return self::plural('%s hour ago', '%s hours ago', $hours, self::number($hours));
         }
 
         if ($seconds > $minute) {
-            $minutes = (int)($seconds / $minute);
+            $minutes = (int) ($seconds / $minute);
 
             return self::plural('%s minute ago', '%s minutes ago', $minutes, self::number($minutes));
         }

resources/views/media-list-page.php

Indentation +32 added lines, -32 removed lines

@@ -123,49 +123,49 @@
 
 							<p class="card-text">
 								<?php
-								// Show file details
-								$mediatype = $media_file->type();
-								if ($mediatype) {
-									echo GedcomTag::getLabelValue('TYPE', GedcomTag::getFileFormTypeValue($mediatype));
-								}
-								echo FunctionsPrintFacts::printFactSources($tree, $media_object->getGedcom(), 1);
-								echo FunctionsPrint::printFactNotes($tree, $media_object->getGedcom(), 1);
-								if ($media_file->isExternal()) {
-									echo GedcomTag::getLabelValue('URL', $media_file->filename());
-								} elseif ($media_file->fileExists()) {
-									?>
+                                // Show file details
+                                $mediatype = $media_file->type();
+                                if ($mediatype) {
+                                    echo GedcomTag::getLabelValue('TYPE', GedcomTag::getFileFormTypeValue($mediatype));
+                                }
+                                echo FunctionsPrintFacts::printFactSources($tree, $media_object->getGedcom(), 1);
+                                echo FunctionsPrint::printFactNotes($tree, $media_object->getGedcom(), 1);
+                                if ($media_file->isExternal()) {
+                                    echo GedcomTag::getLabelValue('URL', $media_file->filename());
+                                } elseif ($media_file->fileExists()) {
+                                    ?>
 								<button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#details-<?= e($n) ?>" aria-expanded="false" aria-controls="details-<?= e($n) ?>">
 									<?= I18N::translate('Media file') ?>
 								</button>
 							<div class="collapse" id="details-<?= e($n) ?>">
 								<?php
-								if (Auth::isEditor($tree)) {
-									echo GedcomTag::getLabelValue('FILE', $media_file->filename());
-								}
-								echo GedcomTag::getLabelValue('FORM', $media_file->mimeType());
-								foreach ($media_file->attributes() as $tag => $value) {
-									echo GedcomTag::getLabelValue($tag, $value);
-								}
-								?>
+                                if (Auth::isEditor($tree)) {
+                                    echo GedcomTag::getLabelValue('FILE', $media_file->filename());
+                                }
+                                echo GedcomTag::getLabelValue('FORM', $media_file->mimeType());
+                                foreach ($media_file->attributes() as $tag => $value) {
+                                    echo GedcomTag::getLabelValue($tag, $value);
+                                }
+                                ?>
 							</div>
 						<?php
-								} else {
-									echo '<p class="alert alert-danger">', /* I18N: %s is a filename */ I18N::translate('The file “%s” does not exist.', $media_file->filename()), '</p>';
-								}
-								?>
+                                } else {
+                                    echo '<p class="alert alert-danger">', /* I18N: %s is a filename */ I18N::translate('The file “%s” does not exist.', $media_file->filename()), '</p>';
+                                }
+                                ?>
 							</p>
 						</div>
 						<div class="card-footer">
 							<?php
-							foreach ($media_object->linkedIndividuals('OBJE') as $individual) {
-								echo '<a href="' . e($individual->url()) . '">' . FontAwesome::semanticIcon('individual', I18N::translate('Individual')) . ' ' . $individual->getFullName() . '</a><br>';
-							}
-							foreach ($media_object->linkedFamilies('OBJE') as $family) {
-								echo '<a href="' . e($family->url()) . '">' . FontAwesome::semanticIcon('family', I18N::translate('Family')) . ' ' . $family->getFullName() . '</a><br>';
-							}
-							foreach ($media_object->linkedSources('OBJE') as $source) {
-								echo '<a href="' . e($source->url()) . '">' . FontAwesome::semanticIcon('source', I18N::translate('Source')) . ' ' . $source->getFullName() . '</a><br>';
-							} ?>
+                            foreach ($media_object->linkedIndividuals('OBJE') as $individual) {
+                                echo '<a href="' . e($individual->url()) . '">' . FontAwesome::semanticIcon('individual', I18N::translate('Individual')) . ' ' . $individual->getFullName() . '</a><br>';
+                            }
+                            foreach ($media_object->linkedFamilies('OBJE') as $family) {
+                                echo '<a href="' . e($family->url()) . '">' . FontAwesome::semanticIcon('family', I18N::translate('Family')) . ' ' . $family->getFullName() . '</a><br>';
+                            }
+                            foreach ($media_object->linkedSources('OBJE') as $source) {
+                                echo '<a href="' . e($source->url()) . '">' . FontAwesome::semanticIcon('source', I18N::translate('Source')) . ' ' . $source->getFullName() . '</a><br>';
+                            } ?>
 						</div>
 					</div>
 				</div>

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>

Braces +3 added lines, -1 removed lines

@@ -45,7 +45,8 @@ 
                     <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->d, 'month' => $m, 'year' => $cal_date->y, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'month', 'ged' => $tree->getName()])) ?>" rel="nofollow">
                         <?php if ($m === $cal_month): ?>
                             <span class="error"><?= e($month_name) ?></span>
-                        <?php else: ?>
+                        <?php else {
+    : ?>
                             <?= e($month_name) ?>
                         <?php endif ?>
                     </a> |
@@ -160,6 +161,7 @@ 
 			<td class="topbottombar width50">
 				<?php
 					$n = 0;
+}
 					foreach (Date::calendarNames() as $newcal => $cal_name) {
 						$tmp = $cal_date->convertToCalendar($newcal);
 						if ($tmp->inValidRange()) {