Inspection of "Use fully qualified global function calls" - fisharebest/webtrees - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#1854)

by Rico

created 2018-08-27 07:44 UTC

Status

Indentation +79 added lines, -79 removed lines patch added patch discarded remove patch

@@ -13,18 +13,18 @@  discard block
 block discarded – undo
 
 	<tbody>
 		<?php
-		$found = false;
-		foreach ($family->getFacts('HUSB', false, $fam_access_level) as $fact) {
-			$found |= !$fact->isPendingDeletion();
-			$person = $fact->getTarget();
-			if ($person instanceof Individual) {
-				$row_class = 'wt-gender-' . $person->getSex();
-				if ($fact->isPendingAddition()) {
-					$row_class .= ' new';
-				} elseif ($fact->isPendingDeletion()) {
-					$row_class .= ' old';
-				}
-				?>
+        $found = false;
+        foreach ($family->getFacts('HUSB', false, $fam_access_level) as $fact) {
+            $found |= !$fact->isPendingDeletion();
+            $person = $fact->getTarget();
+            if ($person instanceof Individual) {
+                $row_class = 'wt-gender-' . $person->getSex();
+                if ($fact->isPendingAddition()) {
+                    $row_class .= ' new';
+                } elseif ($fact->isPendingDeletion()) {
+                    $row_class .= ' old';
+                }
+                ?>
 				<tr class="<?= $row_class ?>">
 					<th scope="row">
 						<?= $individual === $person ? '<i class="icon-selected"></i>' : '' ?>
@@ -35,10 +35,10 @@  discard block
 block discarded – undo
 					</td>
 				</tr>
 				<?php
-			}
-		}
-		if (!$found && $family->canEdit()) {
-			?>
+            }
+        }
+        if (!$found && $family->canEdit()) {
+            ?>
 			<tr>
 				<th scope="row"></th>
 				<td>
@@ -48,20 +48,20 @@  discard block
 block discarded – undo
 				</td>
 			</tr>
 			<?php
-		}
-
-		$found = false;
-		foreach ($family->getFacts('WIFE', false, $fam_access_level) as $fact) {
-			$person = $fact->getTarget();
-			if ($person instanceof Individual) {
-				$found |= !$fact->isPendingDeletion();
-				$row_class = 'wt-gender-' . $person->getSex();
-				if ($fact->isPendingAddition()) {
-					$row_class .= ' new';
-				} elseif ($fact->isPendingDeletion()) {
-					$row_class .= ' old';
-				}
-				?>
+        }
+
+        $found = false;
+        foreach ($family->getFacts('WIFE', false, $fam_access_level) as $fact) {
+            $person = $fact->getTarget();
+            if ($person instanceof Individual) {
+                $found |= !$fact->isPendingDeletion();
+                $row_class = 'wt-gender-' . $person->getSex();
+                if ($fact->isPendingAddition()) {
+                    $row_class .= ' new';
+                } elseif ($fact->isPendingDeletion()) {
+                    $row_class .= ' old';
+                }
+                ?>
 
 				<tr class="<?= $row_class ?>">
 					<th scope="row">
@@ -73,9 +73,9 @@  discard block
 block discarded – undo
 					</td>
 				</tr>
 				<?php
-			}
-		}
-		if (!$found && $family->canEdit()) { ?>
+            }
+        }
+        if (!$found && $family->canEdit()) { ?>
 			<tr>
 				<th scope="row"></th>
 				<td>
@@ -88,19 +88,19 @@  discard block
 block discarded – undo
 			<?php } ?>
 
 		<?php
-		///// MARR /////
-		$found = false;
-		$prev  = new Date('');
-		foreach ($family->getFacts(WT_EVENTS_MARR . '|' . WT_EVENTS_DIV, true) as $fact) {
-			$found |= !$fact->isPendingDeletion();
-			if ($fact->isPendingAddition()) {
-				$row_class = 'new';
-			} elseif ($fact->isPendingDeletion()) {
-				$row_class = 'old';
-			} else {
-				$row_class = '';
-			}
-			?>
+        ///// MARR /////
+        $found = false;
+        $prev  = new Date('');
+        foreach ($family->getFacts(WT_EVENTS_MARR . '|' . WT_EVENTS_DIV, true) as $fact) {
+            $found |= !$fact->isPendingDeletion();
+            if ($fact->isPendingAddition()) {
+                $row_class = 'new';
+            } elseif ($fact->isPendingDeletion()) {
+                $row_class = 'old';
+            } else {
+                $row_class = '';
+            }
+            ?>
 
 			<tr class="<?= $row_class ?>">
 				<th scope="row">
@@ -111,13 +111,13 @@  discard block
 block discarded – undo
 			</tr>
 
 			<?php
-			if (!$prev->isOK() && $fact->getDate()->isOK()) {
-				$prev = $fact->getDate();
-			}
-		}
+            if (!$prev->isOK() && $fact->getDate()->isOK()) {
+                $prev = $fact->getDate();
+            }
+        }
 
-		if (!$found && $family->canShow() && $family->canEdit()) {
-			?>
+        if (!$found && $family->canShow() && $family->canEdit()) {
+            ?>
 			<tr>
 				<th scope="row">
 				</th>
@@ -128,30 +128,30 @@  discard block
 block discarded – undo
 				</td>
 			</tr>
 			<?php
-		}
-
-		///// CHIL /////
-		$child_number = 0;
-		foreach ($family->getFacts('CHIL', false, $fam_access_level) as $fact) {
-			$person = $fact->getTarget();
-			if ($person instanceof Individual) {
-				$row_class = 'wt-gender-' . $person->getSex();
-				if ($fact->isPendingAddition()) {
-					$child_number++;
-					$row_class .= ' new';
-				} elseif ($fact->isPendingDeletion()) {
-					$row_class .= ' old';
-				} else {
-					$child_number++;
-				}
-				$next = new Date('');
-				foreach ($person->getFacts(WT_EVENTS_BIRT, true) as $bfact) {
-					if ($bfact->getDate()->isOK()) {
-						$next = $bfact->getDate();
-						break;
-					}
-				}
-				?>
+        }
+
+        ///// CHIL /////
+        $child_number = 0;
+        foreach ($family->getFacts('CHIL', false, $fam_access_level) as $fact) {
+            $person = $fact->getTarget();
+            if ($person instanceof Individual) {
+                $row_class = 'wt-gender-' . $person->getSex();
+                if ($fact->isPendingAddition()) {
+                    $child_number++;
+                    $row_class .= ' new';
+                } elseif ($fact->isPendingDeletion()) {
+                    $row_class .= ' old';
+                } else {
+                    $child_number++;
+                }
+                $next = new Date('');
+                foreach ($person->getFacts(WT_EVENTS_BIRT, true) as $bfact) {
+                    if ($bfact->getDate()->isOK()) {
+                        $next = $bfact->getDate();
+                        break;
+                    }
+                }
+                ?>
 
 				<tr class="<?= $row_class ?>">
 					<th scope="row">
@@ -182,9 +182,9 @@  discard block
 block discarded – undo
 					</td>
 				</tr>
 				<?php
-				$prev = $next;
-			}
-		} ?>
+                $prev = $next;
+            }
+        } ?>
 
 		<?php if ($family->canEdit()): ?>
 			<tr>

Please login to merge, or discard this patch.

resources/views/modules/relatives/tab.php 1 patch

Indentation +24 added lines, -24 removed lines patch added patch discarded remove patch

@@ -39,45 +39,45 @@
 block discarded – undo
 <!-- Parents -->
 <?php foreach ($parent_families as $family): ?>
 	<?= view('modules/relatives/family', [
-		'individual'       => $individual,
-		'family'           => $family,
-		'type'             => 'FAMC',
-		'label'            => $individual->getChildFamilyLabel($family),
-		'fam_access_level' => $fam_access_level,
-	]) ?>
+        'individual'       => $individual,
+        'family'           => $family,
+        'type'             => 'FAMC',
+        'label'            => $individual->getChildFamilyLabel($family),
+        'fam_access_level' => $fam_access_level,
+    ]) ?>
 <?php endforeach ?>
 
 <!-- step-parents -->
 <?php foreach ($step_parent_families as $family): ?>
 	<?= view('modules/relatives/family', [
-		'individual'       => $individual,
-		'family'           => $family,
-		'type'             => 'FAMC',
-		'label'            => $individual->getStepFamilyLabel($family),
-		'fam_access_level' => $fam_access_level,
-	]) ?>
+        'individual'       => $individual,
+        'family'           => $family,
+        'type'             => 'FAMC',
+        'label'            => $individual->getStepFamilyLabel($family),
+        'fam_access_level' => $fam_access_level,
+    ]) ?>
 <?php endforeach ?>
 
 <!-- spouses -->
 <?php foreach ($spouse_families as $family): ?>
 	<?= view('modules/relatives/family', [
-		'individual'       => $individual,
-		'family'           => $family,
-		'type'             => 'FAMS',
-		'label'            => $individual->getSpouseFamilyLabel($family),
-		'fam_access_level' => $fam_access_level,
-	]) ?>
+        'individual'       => $individual,
+        'family'           => $family,
+        'type'             => 'FAMS',
+        'label'            => $individual->getSpouseFamilyLabel($family),
+        'fam_access_level' => $fam_access_level,
+    ]) ?>
 <?php endforeach ?>
 
 <!-- step-children -->
 <?php foreach ($step_child_familiess as $family): ?>
 	<?= view('modules/relatives/family', [
-		'individual'       => $individual,
-		'family'           => $family,
-		'type'             => 'FAMS',
-		'label'            => $family->getFullName(),
-		'fam_access_level' => $fam_access_level,
-	]) ?>
+        'individual'       => $individual,
+        'family'           => $family,
+        'type'             => 'FAMS',
+        'label'            => $family->getFullName(),
+        'fam_access_level' => $fam_access_level,
+    ]) ?>
 <?php endforeach ?>
 
 <?php if ($can_edit): ?>

Please login to merge, or discard this patch.

resources/views/modules/gedcom_stats/config.php 1 patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -8,7 +8,7 @@  discard block
 block discarded – undo
 		</legend>
 		<div class="col-sm-9">
 			<?= Bootstrap4::checkbox(/* I18N: label for yes/no option */
-				I18N::translate('Show date of last update'), false, ['name' => 'show_last_update', 'checked' => (bool) $show_last_update]) ?>
+                I18N::translate('Show date of last update'), false, ['name' => 'show_last_update', 'checked' => (bool) $show_last_update]) ?>
 		</div>
 	</div>
 </fieldset>
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
 			<?= Bootstrap4::checkbox(I18N::translate('Most common surnames'), false, ['name' => 'show_common_surnames', 'checked' => (bool) $show_common_surnames]) ?>
 			<label for="number_of_surnames">
 				<?= /* I18N: ... to show in a list */
-				I18N::translate('Number of surnames') ?>
+                I18N::translate('Number of surnames') ?>
 				<input
 					class="form-control"
 					id="number_of_surnames"

Please login to merge, or discard this patch.

resources/views/modules/faq/edit.php 1 patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -34,7 +34,7 @@  discard block
 block discarded – undo
 	<div class="row form-group">
 		<label for="xref" class="col-sm-3 col-form-label">
 			<?= /* I18N: Label for a configuration option */
-			I18N::translate('Show this block for which languages') ?>
+            I18N::translate('Show this block for which languages') ?>
 		</label>
 
 		<div class="col-sm-9">
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
 			<?= Bootstrap4::select(['' => I18N::translate('All')] + $tree_names, $tree->getName(), ['id' => 'gedcom_id', 'name' => 'gedcom_id']) ?>
 			<p class="small text-muted">
 				<?= /* I18N: FAQ = “Frequently Asked Question” */
-				I18N::translate('An FAQ can be displayed on just one of the family trees, or on all the family trees.') ?>
+                I18N::translate('An FAQ can be displayed on just one of the family trees, or on all the family trees.') ?>
 			</p>
 		</div>
 	</div>

Please login to merge, or discard this patch.

resources/views/modules/relationships_chart/config.php 1 patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -15,7 +15,7 @@  discard block
 block discarded – undo
 		<div class="row form-group">
 			<label class="col-sm-3 col-form-label" for="relationship-ancestors-<?= $tree->getTreeId() ?>">
 				<?= /* I18N: Configuration option */
-				I18N::translate('Relationships') ?>
+                I18N::translate('Relationships') ?>
 			</label>
 			<div class="col-sm-9">
 				<?= Bootstrap4::select($ancestors_options, $tree->getPreference('RELATIONSHIP_ANCESTORS', $default_ancestors), ['id' => 'relationship-ancestors-' . $tree->getTreeId(), 'name' => 'relationship-ancestors-' . $tree->getTreeId()]) ?>
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
 			<div class="row">
 				<legend class="col-form-label col-sm-3">
 					<?= /* I18N: Configuration option */
-					I18N::translate('How much recursion to use when searching for relationships') ?>
+                    I18N::translate('How much recursion to use when searching for relationships') ?>
 				</legend>
 				<div class="col-sm-9">
 					<?= Bootstrap4::radioButtons('relationship-recursion-' . $tree->getTreeId(), $recursion_options, $tree->getPreference('RELATIONSHIP_RECURSION', $default_recursion), true) ?>

Please login to merge, or discard this patch.

resources/views/calendar-page.php 1 patch

Indentation +28 added lines, -28 removed lines patch added patch discarded remove patch

@@ -42,24 +42,24 @@  discard block
 block discarded – undo
 			</th>
 			<td class="wt-page-options-value" colspan="3">
 				<?php
-					for ($n = 1, $months_in_year = $cal_date->monthsInYear(); $n <= $months_in_year; ++$n) {
-						$month_name = $cal_date->monthNameNominativeCase($n, $cal_date->isLeapYear());
-						$m          = array_search($n, $cal_date::$MONTH_ABBREV);
-						if ($n === 6 && $cal_date instanceof JewishDate && !$cal_date->isLeapYear()) {
-							// No month 6 in Jewish non-leap years.
-							continue;
-						}
-						if ($n === 7 && $cal_date instanceof JewishDate && !$cal_date->isLeapYear()) {
-							// Month 7 is ADR in Jewish non-leap years.
-							$m = 'ADR';
-						}
-						if ($n === $cal_date->m) {
-							$month_name = '<span class="error">' . $month_name . '</span>';
-						}
-						echo '<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">', $month_name, '</a>';
-						echo ' | ';
-					}
-				?>
+                    for ($n = 1, $months_in_year = $cal_date->monthsInYear(); $n <= $months_in_year; ++$n) {
+                        $month_name = $cal_date->monthNameNominativeCase($n, $cal_date->isLeapYear());
+                        $m          = array_search($n, $cal_date::$MONTH_ABBREV);
+                        if ($n === 6 && $cal_date instanceof JewishDate && !$cal_date->isLeapYear()) {
+                            // No month 6 in Jewish non-leap years.
+                            continue;
+                        }
+                        if ($n === 7 && $cal_date instanceof JewishDate && !$cal_date->isLeapYear()) {
+                            // Month 7 is ADR in Jewish non-leap years.
+                            $m = 'ADR';
+                        }
+                        if ($n === $cal_date->m) {
+                            $month_name = '<span class="error">' . $month_name . '</span>';
+                        }
+                        echo '<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">', $month_name, '</a>';
+                        echo ' | ';
+                    }
+                ?>
 				<a href="<?= e(route('calendar', ['cal' => $cal, 'day' => min($cal_date->d, $today->daysInMonth()), 'month' => $today_month, 'year' => $today->y, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'month', 'ged' => $tree->getName()])) ?>" rel="nofollow">
 					<b><?= $today->format('%F %Y') ?></b>
 				</a>
@@ -169,16 +169,16 @@  discard block
 block discarded – undo
 			</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>

Please login to merge, or discard this patch.

resources/views/place-events.php 1 patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -21,10 +21,10 @@  discard block
 block discarded – undo
 			<p><?= I18N::translate('No results found.') ?></p>
 		<?php else: ?>
 			<?= view('lists/individuals-table', [
-			'individuals' => $indilist,
-			'sosa'        => false,
-			'tree'        => $tree,
-			]) ?>
+            'individuals' => $indilist,
+            'sosa'        => false,
+            'tree'        => $tree,
+            ]) ?>
 		<?php endif ?>
 	</div>
 
@@ -33,8 +33,8 @@  discard block
 block discarded – undo
 			<p><?= I18N::translate('No results found.') ?></p>
 		<?php else: ?>
 			<?= view('lists/families-table', [
-				'families' => $famlist,
-			]) ?>
+                'families' => $famlist,
+            ]) ?>
 		<?php endif ?>
 	</div>
 </div>

Please login to merge, or discard this patch.

resources/views/interactive-tree-page.php 1 patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -25,7 +25,7 @@
 block discarded – undo
 		<div class="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>

Please login to merge, or discard this patch.

resources/views/edit/link-spouse-to-individual.php 1 patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -25,12 +25,12 @@
 block discarded – undo
 			<button class="btn btn-primary" type="submit">
 				<?= FontAwesome::decorativeIcon('save') ?>
 				<?= /* I18N: A button label. */
-				I18N::translate('save') ?>
+                I18N::translate('save') ?>
 			</button>
 			<a class="btn btn-secondary" href="<?= e($individual->url()) ?>">
 				<?= FontAwesome::decorativeIcon('cancel') ?>
 				<?= /* I18N: A button label. */
-				I18N::translate('cancel') ?>
+                I18N::translate('cancel') ?>
 			</a>
 		</div>
 	</div>

Please login to merge, or discard this patch.

		@@ -13,18 +13,18 @@ discard block
		block discarded – undo
13	13
14	14	<tbody>
15	15	<?php
16		- $found = false;
17		- foreach ($family->getFacts('HUSB', false, $fam_access_level) as $fact) {
18		- $found \|= !$fact->isPendingDeletion();
19		- $person = $fact->getTarget();
20		- if ($person instanceof Individual) {
21		- $row_class = 'wt-gender-' . $person->getSex();
22		- if ($fact->isPendingAddition()) {
23		- $row_class .= ' new';
24		- } elseif ($fact->isPendingDeletion()) {
25		- $row_class .= ' old';
26		- }
27		- ?>
	16	+ $found = false;
	17	+ foreach ($family->getFacts('HUSB', false, $fam_access_level) as $fact) {
	18	+ $found \|= !$fact->isPendingDeletion();
	19	+ $person = $fact->getTarget();
	20	+ if ($person instanceof Individual) {
	21	+ $row_class = 'wt-gender-' . $person->getSex();
	22	+ if ($fact->isPendingAddition()) {
	23	+ $row_class .= ' new';
	24	+ } elseif ($fact->isPendingDeletion()) {
	25	+ $row_class .= ' old';
	26	+ }
	27	+ ?>
28	28	<tr class="<?= $row_class ?>">
29	29	<th scope="row">
30	30	<?= $individual === $person ? '<i class="icon-selected"></i>' : '' ?>
		@@ -35,10 +35,10 @@ discard block
		block discarded – undo
35	35	</td>
36	36	</tr>
37	37	<?php
38		- }
39		- }
40		- if (!$found && $family->canEdit()) {
41		- ?>
	38	+ }
	39	+ }
	40	+ if (!$found && $family->canEdit()) {
	41	+ ?>
42	42	<tr>
43	43	<th scope="row"></th>
44	44	<td>
		@@ -48,20 +48,20 @@ discard block
		block discarded – undo
48	48	</td>
49	49	</tr>
50	50	<?php
51		- }
52		-
53		- $found = false;
54		- foreach ($family->getFacts('WIFE', false, $fam_access_level) as $fact) {
55		- $person = $fact->getTarget();
56		- if ($person instanceof Individual) {
57		- $found \|= !$fact->isPendingDeletion();
58		- $row_class = 'wt-gender-' . $person->getSex();
59		- if ($fact->isPendingAddition()) {
60		- $row_class .= ' new';
61		- } elseif ($fact->isPendingDeletion()) {
62		- $row_class .= ' old';
63		- }
64		- ?>
	51	+ }
	52	+
	53	+ $found = false;
	54	+ foreach ($family->getFacts('WIFE', false, $fam_access_level) as $fact) {
	55	+ $person = $fact->getTarget();
	56	+ if ($person instanceof Individual) {
	57	+ $found \|= !$fact->isPendingDeletion();
	58	+ $row_class = 'wt-gender-' . $person->getSex();
	59	+ if ($fact->isPendingAddition()) {
	60	+ $row_class .= ' new';
	61	+ } elseif ($fact->isPendingDeletion()) {
	62	+ $row_class .= ' old';
	63	+ }
	64	+ ?>
65	65
66	66	<tr class="<?= $row_class ?>">
67	67	<th scope="row">
		@@ -73,9 +73,9 @@ discard block
		block discarded – undo
73	73	</td>
74	74	</tr>
75	75	<?php
76		- }
77		- }
78		- if (!$found && $family->canEdit()) { ?>
	76	+ }
	77	+ }
	78	+ if (!$found && $family->canEdit()) { ?>
79	79	<tr>
80	80	<th scope="row"></th>
81	81	<td>
		@@ -88,19 +88,19 @@ discard block
		block discarded – undo
88	88	<?php } ?>
89	89
90	90	<?php
91		- ///// MARR /////
92		- $found = false;
93		- $prev = new Date('');
94		- foreach ($family->getFacts(WT_EVENTS_MARR . '\|' . WT_EVENTS_DIV, true) as $fact) {
95		- $found \|= !$fact->isPendingDeletion();
96		- if ($fact->isPendingAddition()) {
97		- $row_class = 'new';
98		- } elseif ($fact->isPendingDeletion()) {
99		- $row_class = 'old';
100		- } else {
101		- $row_class = '';
102		- }
103		- ?>
	91	+ ///// MARR /////
	92	+ $found = false;
	93	+ $prev = new Date('');
	94	+ foreach ($family->getFacts(WT_EVENTS_MARR . '\|' . WT_EVENTS_DIV, true) as $fact) {
	95	+ $found \|= !$fact->isPendingDeletion();
	96	+ if ($fact->isPendingAddition()) {
	97	+ $row_class = 'new';
	98	+ } elseif ($fact->isPendingDeletion()) {
	99	+ $row_class = 'old';
	100	+ } else {
	101	+ $row_class = '';
	102	+ }
	103	+ ?>
104	104
105	105	<tr class="<?= $row_class ?>">
106	106	<th scope="row">
		@@ -111,13 +111,13 @@ discard block
		block discarded – undo
111	111	</tr>
112	112
113	113	<?php
114		- if (!$prev->isOK() && $fact->getDate()->isOK()) {
115		- $prev = $fact->getDate();
116		- }
117		- }
	114	+ if (!$prev->isOK() && $fact->getDate()->isOK()) {
	115	+ $prev = $fact->getDate();
	116	+ }
	117	+ }
118	118
119		- if (!$found && $family->canShow() && $family->canEdit()) {
120		- ?>
	119	+ if (!$found && $family->canShow() && $family->canEdit()) {
	120	+ ?>
121	121	<tr>
122	122	<th scope="row">
123	123	</th>
		@@ -128,30 +128,30 @@ discard block
		block discarded – undo
128	128	</td>
129	129	</tr>
130	130	<?php
131		- }
132		-
133		- ///// CHIL /////
134		- $child_number = 0;
135		- foreach ($family->getFacts('CHIL', false, $fam_access_level) as $fact) {
136		- $person = $fact->getTarget();
137		- if ($person instanceof Individual) {
138		- $row_class = 'wt-gender-' . $person->getSex();
139		- if ($fact->isPendingAddition()) {
140		- $child_number++;
141		- $row_class .= ' new';
142		- } elseif ($fact->isPendingDeletion()) {
143		- $row_class .= ' old';
144		- } else {
145		- $child_number++;
146		- }
147		- $next = new Date('');
148		- foreach ($person->getFacts(WT_EVENTS_BIRT, true) as $bfact) {
149		- if ($bfact->getDate()->isOK()) {
150		- $next = $bfact->getDate();
151		- break;
152		- }
153		- }
154		- ?>
	131	+ }
	132	+
	133	+ ///// CHIL /////
	134	+ $child_number = 0;
	135	+ foreach ($family->getFacts('CHIL', false, $fam_access_level) as $fact) {
	136	+ $person = $fact->getTarget();
	137	+ if ($person instanceof Individual) {
	138	+ $row_class = 'wt-gender-' . $person->getSex();
	139	+ if ($fact->isPendingAddition()) {
	140	+ $child_number++;
	141	+ $row_class .= ' new';
	142	+ } elseif ($fact->isPendingDeletion()) {
	143	+ $row_class .= ' old';
	144	+ } else {
	145	+ $child_number++;
	146	+ }
	147	+ $next = new Date('');
	148	+ foreach ($person->getFacts(WT_EVENTS_BIRT, true) as $bfact) {
	149	+ if ($bfact->getDate()->isOK()) {
	150	+ $next = $bfact->getDate();
	151	+ break;
	152	+ }
	153	+ }
	154	+ ?>
155	155
156	156	<tr class="<?= $row_class ?>">
157	157	<th scope="row">
		@@ -182,9 +182,9 @@ discard block
		block discarded – undo
182	182	</td>
183	183	</tr>
184	184	<?php
185		- $prev = $next;
186		- }
187		- } ?>
	185	+ $prev = $next;
	186	+ }
	187	+ } ?>
188	188
189	189	<?php if ($family->canEdit()): ?>
190	190	<tr>

		@@ -39,45 +39,45 @@
		block discarded – undo
39	39	<!-- Parents -->
40	40	<?php foreach ($parent_families as $family): ?>
41	41	<?= view('modules/relatives/family', [
42		- 'individual' => $individual,
43		- 'family' => $family,
44		- 'type' => 'FAMC',
45		- 'label' => $individual->getChildFamilyLabel($family),
46		- 'fam_access_level' => $fam_access_level,
47		- ]) ?>
	42	+ 'individual' => $individual,
	43	+ 'family' => $family,
	44	+ 'type' => 'FAMC',
	45	+ 'label' => $individual->getChildFamilyLabel($family),
	46	+ 'fam_access_level' => $fam_access_level,
	47	+ ]) ?>
48	48	<?php endforeach ?>
49	49
50	50	<!-- step-parents -->
51	51	<?php foreach ($step_parent_families as $family): ?>
52	52	<?= view('modules/relatives/family', [
53		- 'individual' => $individual,
54		- 'family' => $family,
55		- 'type' => 'FAMC',
56		- 'label' => $individual->getStepFamilyLabel($family),
57		- 'fam_access_level' => $fam_access_level,
58		- ]) ?>
	53	+ 'individual' => $individual,
	54	+ 'family' => $family,
	55	+ 'type' => 'FAMC',
	56	+ 'label' => $individual->getStepFamilyLabel($family),
	57	+ 'fam_access_level' => $fam_access_level,
	58	+ ]) ?>
59	59	<?php endforeach ?>
60	60
61	61	<!-- spouses -->
62	62	<?php foreach ($spouse_families as $family): ?>
63	63	<?= view('modules/relatives/family', [
64		- 'individual' => $individual,
65		- 'family' => $family,
66		- 'type' => 'FAMS',
67		- 'label' => $individual->getSpouseFamilyLabel($family),
68		- 'fam_access_level' => $fam_access_level,
69		- ]) ?>
	64	+ 'individual' => $individual,
	65	+ 'family' => $family,
	66	+ 'type' => 'FAMS',
	67	+ 'label' => $individual->getSpouseFamilyLabel($family),
	68	+ 'fam_access_level' => $fam_access_level,
	69	+ ]) ?>
70	70	<?php endforeach ?>
71	71
72	72	<!-- step-children -->
73	73	<?php foreach ($step_child_familiess as $family): ?>
74	74	<?= view('modules/relatives/family', [
75		- 'individual' => $individual,
76		- 'family' => $family,
77		- 'type' => 'FAMS',
78		- 'label' => $family->getFullName(),
79		- 'fam_access_level' => $fam_access_level,
80		- ]) ?>
	75	+ 'individual' => $individual,
	76	+ 'family' => $family,
	77	+ 'type' => 'FAMS',
	78	+ 'label' => $family->getFullName(),
	79	+ 'fam_access_level' => $fam_access_level,
	80	+ ]) ?>
81	81	<?php endforeach ?>
82	82
83	83	<?php if ($can_edit): ?>

		@@ -8,7 +8,7 @@ discard block
		block discarded – undo
8	8	</legend>
9	9	<div class="col-sm-9">
10	10	<?= Bootstrap4::checkbox(/* I18N: label for yes/no option */
11		- I18N::translate('Show date of last update'), false, ['name' => 'show_last_update', 'checked' => (bool) $show_last_update]) ?>
	11	+ I18N::translate('Show date of last update'), false, ['name' => 'show_last_update', 'checked' => (bool) $show_last_update]) ?>
12	12	</div>
13	13	</div>
14	14	</fieldset>
		@@ -50,7 +50,7 @@ discard block
		block discarded – undo
50	50	<?= Bootstrap4::checkbox(I18N::translate('Most common surnames'), false, ['name' => 'show_common_surnames', 'checked' => (bool) $show_common_surnames]) ?>
51	51	<label for="number_of_surnames">
52	52	<?= /* I18N: ... to show in a list */
53		- I18N::translate('Number of surnames') ?>
	53	+ I18N::translate('Number of surnames') ?>
54	54	<input
55	55	class="form-control"
56	56	id="number_of_surnames"

		@@ -34,7 +34,7 @@ discard block
		block discarded – undo
34	34	<div class="row form-group">
35	35	<label for="xref" class="col-sm-3 col-form-label">
36	36	<?= /* I18N: Label for a configuration option */
37		- I18N::translate('Show this block for which languages') ?>
	37	+ I18N::translate('Show this block for which languages') ?>
38	38	</label>
39	39
40	40	<div class="col-sm-9">
		@@ -61,7 +61,7 @@ discard block
		block discarded – undo
61	61	<?= Bootstrap4::select(['' => I18N::translate('All')] + $tree_names, $tree->getName(), ['id' => 'gedcom_id', 'name' => 'gedcom_id']) ?>
62	62	<p class="small text-muted">
63	63	<?= /* I18N: FAQ = “Frequently Asked Question” */
64		- I18N::translate('An FAQ can be displayed on just one of the family trees, or on all the family trees.') ?>
	64	+ I18N::translate('An FAQ can be displayed on just one of the family trees, or on all the family trees.') ?>
65	65	</p>
66	66	</div>
67	67	</div>

		@@ -15,7 +15,7 @@ discard block
		block discarded – undo
15	15	<div class="row form-group">
16	16	<label class="col-sm-3 col-form-label" for="relationship-ancestors-<?= $tree->getTreeId() ?>">
17	17	<?= /* I18N: Configuration option */
18		- I18N::translate('Relationships') ?>
	18	+ I18N::translate('Relationships') ?>
19	19	</label>
20	20	<div class="col-sm-9">
21	21	<?= Bootstrap4::select($ancestors_options, $tree->getPreference('RELATIONSHIP_ANCESTORS', $default_ancestors), ['id' => 'relationship-ancestors-' . $tree->getTreeId(), 'name' => 'relationship-ancestors-' . $tree->getTreeId()]) ?>
		@@ -26,7 +26,7 @@ discard block
		block discarded – undo
26	26	<div class="row">
27	27	<legend class="col-form-label col-sm-3">
28	28	<?= /* I18N: Configuration option */
29		- I18N::translate('How much recursion to use when searching for relationships') ?>
	29	+ I18N::translate('How much recursion to use when searching for relationships') ?>
30	30	</legend>
31	31	<div class="col-sm-9">
32	32	<?= Bootstrap4::radioButtons('relationship-recursion-' . $tree->getTreeId(), $recursion_options, $tree->getPreference('RELATIONSHIP_RECURSION', $default_recursion), true) ?>

		@@ -42,24 +42,24 @@ discard block
		block discarded – undo
42	42	</th>
43	43	<td class="wt-page-options-value" colspan="3">
44	44	<?php
45		- for ($n = 1, $months_in_year = $cal_date->monthsInYear(); $n <= $months_in_year; ++$n) {
46		- $month_name = $cal_date->monthNameNominativeCase($n, $cal_date->isLeapYear());
47		- $m = array_search($n, $cal_date::$MONTH_ABBREV);
48		- if ($n === 6 && $cal_date instanceof JewishDate && !$cal_date->isLeapYear()) {
49		- // No month 6 in Jewish non-leap years.
50		- continue;
51		- }
52		- if ($n === 7 && $cal_date instanceof JewishDate && !$cal_date->isLeapYear()) {
53		- // Month 7 is ADR in Jewish non-leap years.
54		- $m = 'ADR';
55		- }
56		- if ($n === $cal_date->m) {
57		- $month_name = '<span class="error">' . $month_name . '</span>';
58		- }
59		- echo '<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">', $month_name, '</a>';
60		- echo ' \| ';
61		- }
62		- ?>
	45	+ for ($n = 1, $months_in_year = $cal_date->monthsInYear(); $n <= $months_in_year; ++$n) {
	46	+ $month_name = $cal_date->monthNameNominativeCase($n, $cal_date->isLeapYear());
	47	+ $m = array_search($n, $cal_date::$MONTH_ABBREV);
	48	+ if ($n === 6 && $cal_date instanceof JewishDate && !$cal_date->isLeapYear()) {
	49	+ // No month 6 in Jewish non-leap years.
	50	+ continue;
	51	+ }
	52	+ if ($n === 7 && $cal_date instanceof JewishDate && !$cal_date->isLeapYear()) {
	53	+ // Month 7 is ADR in Jewish non-leap years.
	54	+ $m = 'ADR';
	55	+ }
	56	+ if ($n === $cal_date->m) {
	57	+ $month_name = '<span class="error">' . $month_name . '</span>';
	58	+ }
	59	+ echo '<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">', $month_name, '</a>';
	60	+ echo ' \| ';
	61	+ }
	62	+ ?>
63	63	<a href="<?= e(route('calendar', ['cal' => $cal, 'day' => min($cal_date->d, $today->daysInMonth()), 'month' => $today_month, 'year' => $today->y, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'month', 'ged' => $tree->getName()])) ?>" rel="nofollow">
64	64	<b><?= $today->format('%F %Y') ?></b>
65	65	</a>
		@@ -169,16 +169,16 @@ discard block
		block discarded – undo
169	169	</td>
170	170	<td class="topbottombar width50">
171	171	<?php
172		- $n = 0;
173		- foreach (Date::calendarNames() as $newcal => $cal_name) {
174		- $tmp = $cal_date->convertToCalendar($newcal);
175		- if ($tmp->inValidRange()) {
176		- if ($n++) {
177		- echo ' \| ';
178		- }
179		- 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>';
180		- }
181		- } ?>
	172	+ $n = 0;
	173	+ foreach (Date::calendarNames() as $newcal => $cal_name) {
	174	+ $tmp = $cal_date->convertToCalendar($newcal);
	175	+ if ($tmp->inValidRange()) {
	176	+ if ($n++) {
	177	+ echo ' \| ';
	178	+ }
	179	+ 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>';
	180	+ }
	181	+ } ?>
182	182	</td>
183	183	</tr>
184	184	</table>

		@@ -21,10 +21,10 @@ discard block
		block discarded – undo
21	21	<p><?= I18N::translate('No results found.') ?></p>
22	22	<?php else: ?>
23	23	<?= view('lists/individuals-table', [
24		- 'individuals' => $indilist,
25		- 'sosa' => false,
26		- 'tree' => $tree,
27		- ]) ?>
	24	+ 'individuals' => $indilist,
	25	+ 'sosa' => false,
	26	+ 'tree' => $tree,
	27	+ ]) ?>
28	28	<?php endif ?>
29	29	</div>
30	30
		@@ -33,8 +33,8 @@ discard block
		block discarded – undo
33	33	<p><?= I18N::translate('No results found.') ?></p>
34	34	<?php else: ?>
35	35	<?= view('lists/families-table', [
36		- 'families' => $famlist,
37		- ]) ?>
	36	+ 'families' => $famlist,
	37	+ ]) ?>
38	38	<?php endif ?>
39	39	</div>
40	40	</div>

		@@ -25,7 +25,7 @@
		block discarded – undo
25	25	<div class="col-sm-3 wt-page-options-label"></div>
26	26	<div class="col-sm-9 wt-page-options-value">
27	27	<input class="btn btn-primary" type="submit" value="<?= /* I18N: A button label. */
28		- I18N::translate('view') ?>">
	28	+ I18N::translate('view') ?>">
29	29	</div>
30	30	</div>
31	31	</form>

		@@ -25,12 +25,12 @@
		block discarded – undo
25	25	<button class="btn btn-primary" type="submit">
26	26	<?= FontAwesome::decorativeIcon('save') ?>
27	27	<?= /* I18N: A button label. */
28		- I18N::translate('save') ?>
	28	+ I18N::translate('save') ?>
29	29	</button>
30	30	<a class="btn btn-secondary" href="<?= e($individual->url()) ?>">
31	31	<?= FontAwesome::decorativeIcon('cancel') ?>
32	32	<?= /* I18N: A button label. */
33		- I18N::translate('cancel') ?>
	33	+ I18N::translate('cancel') ?>
34	34	</a>
35	35	</div>
36	36	</div>

fisharebest / webtrees

Pull Request — master (#1854)

Status

Category

Indentation +79 added lines, -79 removed lines patch added patch discarded remove patch

Indentation +24 added lines, -24 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +28 added lines, -28 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch