fisharebest / webtrees

resources/views/admin/media.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 <br>
 <br>
 
-<table class="table table-bordered table-sm" id="media-table-<?= e($table_id) ?>" data-ajax="<?= e(route('admin-media-data', ['files' => $files, 'media_folder' => $media_folder, 'media_path' => $media_path, 'subfolders' => $subfolders ])) ?>">
+<table class="table table-bordered table-sm" id="media-table-<?= e($table_id) ?>" data-ajax="<?= e(route('admin-media-data', ['files' => $files, 'media_folder' => $media_folder, 'media_path' => $media_path, 'subfolders' => $subfolders])) ?>">
 	<thead>
 		<tr>
 			<th><?= I18N::translate('Media file') ?></th>

resources/views/admin/trees-import.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 							<select name="tree_name" class="form-control" id="import-server-file">
 								<option value=""></option>
 								<?php foreach ($gedcom_files as $gedcom_file): ?>
-									<option value="<?= e($gedcom_file) ?>" <?= $gedcom_file === $default_gedcom_file? 'selected' : '' ?>>
+									<option value="<?= e($gedcom_file) ?>" <?= $gedcom_file === $default_gedcom_file ? 'selected' : '' ?>>
 										<?= e($gedcom_file) ?>
 									</option>
 								<?php endforeach ?>

resources/views/lists/notes-table.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 $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 = 'NOTE' AND l_file = :tree_id GROUP BY l_to"
 )->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc();
-$count_sources       = Database::prepare(
+$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"
 )->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc();
 ?>

Indentation +11 added lines, -11 removed lines

@@ -6,29 +6,29 @@
 // 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_media       = Database::prepare(
-	"SELECT l_to, COUNT(*) FROM `##media` JOIN `##link` ON l_from = m_id AND l_file = m_file AND l_type = 'NOTE' 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 = '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-note datatables"
 	data-columns="<?= e(json_encode([
-		null,
-		['visible' => array_sum($count_individuals) > 0],
-		['visible' => array_sum($count_families) > 0],
-		['visible' => array_sum($count_media) > 0],
-		['visible' => array_sum($count_sources) > 0],
-		['visible' => (bool) $tree->getPreference('SHOW_LAST_CHANGE'), 'searchable' => false],
-	])) ?>"
+        null,
+        ['visible' => array_sum($count_individuals) > 0],
+        ['visible' => array_sum($count_families) > 0],
+        ['visible' => array_sum($count_media) > 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/chart-by-decade.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 }
 $chart_url .= '|1:||' . rawurlencode(I18N::percentage($vmax / $count)); // y axis
 $chart_url .= '|2:||';
-$step      = $vmax;
+$step = $vmax;
 for ($d = $vmax; $d > 0; $d--) {
 	if ($vmax < ($d * 10 + 1) && ($vmax % $d) == 0) {
 		$step = $d;

Indentation +16 added lines, -16 removed lines

@@ -4,12 +4,12 @@ 
 $count = 0;
 $vmax  = 0;
 foreach ($data as $v) {
-	$n     = strlen($v);
-	$vmax  = max($vmax, $n);
-	$count += $n;
+    $n     = strlen($v);
+    $vmax  = max($vmax, $n);
+    $count += $n;
 }
 if ($count < 1) {
-	return '';
+    return '';
 }
 $chart_url = 'https://chart.googleapis.com/chart?cht=bvs'; // chart type
 $chart_url .= '&amp;chs=360x150'; // size
@@ -20,36 +20,36 @@ 
 $chart_url .= '&amp;chxt=x,y,r'; // axis labels specification
 $chart_url .= '&amp;chxl=0:|&lt;|||'; // <1570
 for ($y = 1600; $y < 2030; $y += 50) {
-	$chart_url .= $y . '|||||'; // x axis
+    $chart_url .= $y . '|||||'; // 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 ($y = 1570; $y < 2030; $y += 10) {
-	$chart_url .= $CHART_ENCODING61[(int) (substr_count($data[$y], 'M') * 61 / $vmax)];
+    $chart_url .= $CHART_ENCODING61[(int) (substr_count($data[$y], 'M') * 61 / $vmax)];
 }
 $chart_url .= ',';
 for ($y = 1570; $y < 2030; $y += 10) {
-	$chart_url .= $CHART_ENCODING61[(int) (substr_count($data[$y], 'F') * 61 / $vmax)];
+    $chart_url .= $CHART_ENCODING61[(int) (substr_count($data[$y], 'F') * 61 / $vmax)];
 }
 $html = '<img src="' . $chart_url . '" alt="' . $title . '" title="' . $title . '" class="gchart">';
 

resources/views/lists/surnames-table.php

Spacing +2 added lines, -2 removed lines

@@ -43,14 +43,14 @@
 					<?php endforeach ?>
 				</td>
 
-				<td class="text-center" data-sort="<?= array_sum(array_map(function(array $x) { return count($x); }, $surns)) ?>">
+				<td class="text-center" data-sort="<?= array_sum(array_map(function (array $x) { return count($x); }, $surns)) ?>">
 					<?php foreach ($surns as $indis): ?>
 						<?= I18N::number(count($indis)) ?>
 						<br>
 					<?php endforeach ?>
 
 					<?php if (count($surns) > 1): ?>
-						<?= I18N::number(array_sum(array_map(function(array $x) { return count($x); }, $surns))) ?>
+						<?= I18N::number(array_sum(array_map(function (array $x) { return count($x); }, $surns))) ?>
 					<?php endif ?>
 				</td>
 			</tr>

Braces +5 added lines, -2 removed lines

@@ -12,7 +12,8 @@ 
 			<th>
 				<?php if ($route == 'family-list'):?>
 					<?= I18N::translate('Spouses') ?>
-				<?php else: ?>
+				<?php else {
+    : ?>
 					<?= I18N::translate('Individuals') ?>
 				<?php endif ?>
 			</th>
@@ -43,7 +44,9 @@ 
 					<?php endforeach ?>
 				</td>
 
-				<td class="text-center" data-sort="<?= array_sum(array_map(function(array $x) { return count($x); }, $surns)) ?>">
+				<td class="text-center" data-sort="<?= array_sum(array_map(function(array $x) { return count($x);
+}
+}, $surns)) ?>">
 					<?php foreach ($surns as $indis): ?>
 						<?= I18N::number(count($indis)) ?>
 						<br>

resources/views/edit/edit-fact.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 						'level'          => 2,
 						'full_citations' => $tree->getPreference('FULL_SOURCES'),
 						'tree'           => $tree,
-					]);				}
+					]); }
 				if ($level1type !== 'OBJE') {
 					if ($tree->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($tree)) {
 						echo view('cards/add-media-object', [

Indentation +71 added lines, -71 removed lines

@@ -14,76 +14,76 @@ 
 	<?php FunctionsEdit::createEditForm($edit_fact) ?>
 
 	<?php
-	$level1type = $edit_fact->getTag();
-	switch ($record::RECORD_TYPE) {
-		case 'REPO':
-			// REPO:NAME facts may take a NOTE (but the REPO record may not).
-			if ($level1type === 'NAME') {
-				echo view('cards/add-note', [
-					'level' => 2,
-					'tree' => $tree,
-				]);
-				echo view('addSimpleTag($tree, ', [
-					'level' => 2,
-					'tree' => $tree,
-				]);
-			}
-			break;
-		case 'FAM':
-		case 'INDI':
-			// FAM and INDI records have real facts. They can take NOTE/SOUR/OBJE/etc.
-			if ($level1type !== 'SEX' && $level1type !== 'NOTE' && $level1type !== 'ALIA') {
-				if ($level1type !== 'SOUR') {
-					echo view('cards/add-source-citation', [
-						'level'          => 2,
-						'full_citations' => $tree->getPreference('FULL_SOURCES'),
-						'tree'           => $tree,
-					]);				}
-				if ($level1type !== 'OBJE') {
-					if ($tree->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($tree)) {
-						echo view('cards/add-media-object', [
-							'level' => 2,
-							'tree'  => $tree,
-						]);
-					}
-				}
-				echo view('cards/add-note', [
-					'level' => 2,
-					'tree' => $tree,
-				]);
-				echo view('cards/add-shared-note', [
-					'level' => 2,
-					'tree' => $tree,
-				]);
-				if ($level1type !== 'ASSO' && $level1type !== 'NOTE' && $level1type !== 'SOUR') {
-					echo view('cards/add-associate', [
-						'id'    => Uuid::uuid4()->toString(),
-						'level' => 2,
-						'tree' => $tree,
-					]);
-				}
-				// allow to add godfather and godmother for CHR fact or best man and bridesmaid  for MARR fact in one window
-				if (in_array($level1type, Config::twoAssociates())) {
-					echo view('cards/add-associate', [
-						'id'    => Uuid::uuid4()->toString(),
-						'level' => 2,
-						'tree' => $tree,
-					]);
-				}
-				if ($level1type !== 'SOUR') {
-					echo view('cards/add-restriction', [
-						'level' => 2,
-						'tree' => $tree,
-					]);
-				}
-			}
-			break;
-		default:
-			// Other types of record do not have these lower-level records
-			break;
-	}
+    $level1type = $edit_fact->getTag();
+    switch ($record::RECORD_TYPE) {
+        case 'REPO':
+            // REPO:NAME facts may take a NOTE (but the REPO record may not).
+            if ($level1type === 'NAME') {
+                echo view('cards/add-note', [
+                    'level' => 2,
+                    'tree' => $tree,
+                ]);
+                echo view('addSimpleTag($tree, ', [
+                    'level' => 2,
+                    'tree' => $tree,
+                ]);
+            }
+            break;
+        case 'FAM':
+        case 'INDI':
+            // FAM and INDI records have real facts. They can take NOTE/SOUR/OBJE/etc.
+            if ($level1type !== 'SEX' && $level1type !== 'NOTE' && $level1type !== 'ALIA') {
+                if ($level1type !== 'SOUR') {
+                    echo view('cards/add-source-citation', [
+                        'level'          => 2,
+                        'full_citations' => $tree->getPreference('FULL_SOURCES'),
+                        'tree'           => $tree,
+                    ]);				}
+                if ($level1type !== 'OBJE') {
+                    if ($tree->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($tree)) {
+                        echo view('cards/add-media-object', [
+                            'level' => 2,
+                            'tree'  => $tree,
+                        ]);
+                    }
+                }
+                echo view('cards/add-note', [
+                    'level' => 2,
+                    'tree' => $tree,
+                ]);
+                echo view('cards/add-shared-note', [
+                    'level' => 2,
+                    'tree' => $tree,
+                ]);
+                if ($level1type !== 'ASSO' && $level1type !== 'NOTE' && $level1type !== 'SOUR') {
+                    echo view('cards/add-associate', [
+                        'id'    => Uuid::uuid4()->toString(),
+                        'level' => 2,
+                        'tree' => $tree,
+                    ]);
+                }
+                // allow to add godfather and godmother for CHR fact or best man and bridesmaid  for MARR fact in one window
+                if (in_array($level1type, Config::twoAssociates())) {
+                    echo view('cards/add-associate', [
+                        'id'    => Uuid::uuid4()->toString(),
+                        'level' => 2,
+                        'tree' => $tree,
+                    ]);
+                }
+                if ($level1type !== 'SOUR') {
+                    echo view('cards/add-restriction', [
+                        'level' => 2,
+                        'tree' => $tree,
+                    ]);
+                }
+            }
+            break;
+        default:
+            // Other types of record do not have these lower-level records
+            break;
+    }
 
-	?>
+    ?>
 
 	<div class="form-group row">
 		<label class="col-sm-3 col-form-label" for="keep_chan">
@@ -103,12 +103,12 @@ 
 			<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($record->url()) ?>">
 				<?= FontAwesome::decorativeIcon('cancel') ?>
 				<?= /* I18N: A button label. */
-				I18N::translate('cancel') ?>
+                I18N::translate('cancel') ?>
 			</a>
 			<?php if ($can_edit_raw): ?>
 				<a class="btn btn-link" href="<?= e(route('edit-raw-fact', ['xref' => $record->getXref(), 'fact_id' => $edit_fact->getFactId(), 'ged' => $tree->getName()])) ?>">

app/Module/LoggedInUsersModule.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
             }
         }
         $count_logged_in = count($logged_in);
-        $content         .= '<div class="logged_in_count">';
+        $content .= '<div class="logged_in_count">';
         if ($anonymous) {
             $content .= I18N::plural('%s anonymous signed-in user', '%s anonymous signed-in users', $anonymous, I18N::number($anonymous));
             if ($count_logged_in) {

app/Module/BatchUpdate/BatchUpdateBasePlugin.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
      */
     public function getOptions(Request $request)
     {
-        $this->chan = (bool)$request->get('chan');
+        $this->chan = (bool) $request->get('chan');
     }
 
     /**

app/Module/UpcomingAnniversariesModule.php

Spacing +2 added lines, -2 removed lines

@@ -116,7 +116,7 @@ 
         $default_events = implode(',', self::DEFAULT_EVENTS);
 
         $days      = $this->getBlockSetting($block_id, 'days', self::DEFAULT_DAYS);
-        $filter    = (bool)$this->getBlockSetting($block_id, 'filter', self::DEFAULT_FILTER);
+        $filter    = (bool) $this->getBlockSetting($block_id, 'filter', self::DEFAULT_FILTER);
         $infoStyle = $this->getBlockSetting($block_id, 'infoStyle', self::DEFAULT_STYLE);
         $sortStyle = $this->getBlockSetting($block_id, 'sortStyle', self::DEFAULT_SORT);
         $events    = $this->getBlockSetting($block_id, 'events', $default_events);
@@ -134,7 +134,7 @@ 
         $events_filter = implode('|', $event_array);
 
         $startjd = WT_CLIENT_JD + 1;
-        $endjd   = WT_CLIENT_JD + (int)$days;
+        $endjd   = WT_CLIENT_JD + (int) $days;
 
         $facts = FunctionsDb::getEventsList($startjd, $endjd, $events_filter, $filter, $sortStyle, $tree);