fisharebest / webtrees

resources/views/modules/openstreetmap/event-sidebar.php

Spacing +2 added lines, -2 removed lines

@@ -9,14 +9,14 @@
     </a>
 <?php endif ?>
 
-<?php if($value): ?>
+<?php if ($value): ?>
     <span>
         <?= $value ?>
     </span>
 <?php endif ?>
 
 <div>
-    <?php if($addtag): ?>
+    <?php if ($addtag): ?>
         <?= GedcomTag::getLabel('BIRT') ?>:
     <?php endif ?>
     <?= $date ?>

resources/views/modules/openstreetmap/admin-places.php

Indentation +9 added lines, -9 removed lines

@@ -19,7 +19,7 @@ 
 </div>
 <form method="POST"
 	  action="<?=e(route('admin-module',
-		  ['module' => $module, 'action' => 'AdminPlaces', 'parent_id' => $parent_id])) ?>">
+			['module' => $module, 'action' => 'AdminPlaces', 'parent_id' => $parent_id])) ?>">
 
 	<?= csrf_field() ?>
 	<?= Bootstrap4::checkbox(
@@ -54,12 +54,12 @@ 
 		<tr>
             <td>
                 <a href="<?= e(route('admin-module',
-					   ['module' => $module,
-					    'action' => 'AdminPlaces',
-					    'parent_id' => $place->pl_id,
-					    'inactive' => $inactive]
-				   )
-				   ) ?>">
+						 ['module' => $module,
+							'action' => 'AdminPlaces',
+							'parent_id' => $place->pl_id,
+							'inactive' => $inactive]
+					 )
+					 ) ?>">
 					<?= e($place->pl_place) ?>
                     <span class="badge badge-pill badge-<?= $place->badge ?>">
 				        <?= I18N::number($place->child_count) ?>
@@ -68,11 +68,11 @@ 
             </td>
 			<td>
 				<?= ($place->pl_lati === null) ? FontAwesome::decorativeIcon('warning') :
-                    strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?>
+										strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?>
 			</td>
 			<td>
 				<?= ($place->pl_long === null) ? FontAwesome::decorativeIcon('warning') :
-                    strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?>
+										strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?>
 			</td>
 			<td>
 				<?= $place->pl_long === null ? FontAwesome::decorativeIcon('warning') : $place->pl_zoom ?>

Spacing +3 added lines, -5 removed lines

@@ -67,12 +67,10 @@ 
                 </a>
             </td>
 			<td>
-				<?= ($place->pl_lati === null) ? FontAwesome::decorativeIcon('warning') :
-                    strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?>
+				<?= ($place->pl_lati === null) ? FontAwesome::decorativeIcon('warning') : strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?>
 			</td>
 			<td>
-				<?= ($place->pl_long === null) ? FontAwesome::decorativeIcon('warning') :
-                    strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?>
+				<?= ($place->pl_long === null) ? FontAwesome::decorativeIcon('warning') : strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?>
 			</td>
 			<td>
 				<?= $place->pl_long === null ? FontAwesome::decorativeIcon('warning') : $place->pl_zoom ?>
@@ -194,7 +192,7 @@ 
 	</tfoot>
 </table>
 
-<form method="POST" action="<?= e(route('admin-module',[
+<form method="POST" action="<?= e(route('admin-module', [
 		'module' => $module,
 		'action' => 'AdminImportPlaces'
 	])) ?>">

app/Module/OpenStreetmapModule.php

Braces +6 added lines, -3 removed lines

@@ -1067,9 +1067,11 @@ 
 		$delimiter   = '';
 		$field_names = ['pl_level', 'pl_long', 'pl_lati', 'pl_zoom', 'pl_icon', 'fqpn'];
 
-		if ($serverfile !== '') {  // first choice is file on server
+		if ($serverfile !== '') {
+// first choice is file on server
 			$filename = WT_MODULES_DIR . $this->getName() . '/extra/' . $serverfile;
-		} elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) { // 2nd choice is local file
+		} elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) {
+// 2nd choice is local file
 			$filename = $_FILES['localfile']['tmp_name'];
 		}
 
@@ -1090,7 +1092,8 @@ 
 					$delimiter = ',';
 				}
 				if ($delimiter !== '') {
-					if (!is_numeric($record[0])) { // lose the header
+					if (!is_numeric($record[0])) {
+// lose the header
 						array_shift($input_array);
 					}
 

Spacing +49 added lines, -49 removed lines

@@ -206,7 +206,7 @@ 
 	 */
 	public function getBaseDataAction(Request $request) {
 		$provider = $this->getMapProviderData($request);
-		$style    = $provider['selectedStyleName']    = '' ? '' : '.' . $provider['selectedStyleName'];
+		$style    = $provider['selectedStyleName'] = '' ? '' : '.' . $provider['selectedStyleName'];
 
 		switch ($provider['selectedProvIndex']) {
 			case 'mapbox':
@@ -293,7 +293,7 @@ 
 						$color            = self::LINE_COLORS[log($id, 2) % $color_count];
 						$icon['color']    = $color; //make icon color the same as the line
 						$sosa_points[$id] = $event->getLatLonJSArray();
-						$sosa_parent      = (int)floor($id / 2);
+						$sosa_parent      = (int) floor($id / 2);
 						if (array_key_exists($sosa_parent, $sosa_points)) {
 							// Would like to use a GeometryCollection to hold LineStrings
 							// rather than generate polylines but the MarkerCluster library
@@ -325,7 +325,7 @@ 
 								'modules/openstreetmap/event-sidebar',
 								$event->shortSummary($mapType, $id)
 							),
-							'zoom' => (int)$event->getZoom(),
+							'zoom' => (int) $event->getZoom(),
 						],
 					];
 				}
@@ -395,7 +395,7 @@ 
 							'stats'    => $placeStats,
 						]
 					),
-					'zoom' => (int)($location->getZoom() ?? 2),
+					'zoom' => (int) ($location->getZoom() ?? 2),
 				],
 			];
 		}
@@ -447,7 +447,7 @@ 
 		$xref        = $request->get('reference');
 		$tree        = $request->attributes->get('tree');
 		$individual  = Individual::getInstance($xref, $tree);
-		$generations = (int)$request->get(
+		$generations = (int) $request->get(
 			'generations',
 			$tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS')
 		);
@@ -496,14 +496,14 @@ 
 						function ($item) {
 							return preg_replace('/[^a-z\d]/i', '', strtolower($item));
 						},
-						(array)$provider->styles
+						(array) $provider->styles
 					);
 
-					$key = preg_replace('/[^a-z\d]/i', '', strtolower((string)$provider->name));
+					$key = preg_replace('/[^a-z\d]/i', '', strtolower((string) $provider->name));
 
 					self::$map_providers[$key] = [
-						'name'   => (string)$provider->name,
-						'styles' => array_combine($style_keys, (array)$provider->styles),
+						'name'   => (string) $provider->name,
+						'styles' => array_combine($style_keys, (array) $provider->styles),
 					];
 				}
 			} catch (\Exception $ex) {
@@ -565,7 +565,7 @@ 
 		$maxgenerations = $tree->getPreference('MAX_PEDIGREE_GENERATIONS');
 		$generations    = $request->get('generations', $tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS'));
 
-		return (object)[
+		return (object) [
 			'name' => 'modules/openstreetmap/pedigreemap',
 			'data' => [
 				'assets' => $this->assets(),
@@ -628,7 +628,7 @@ 
 	 * @return object
 	 */
 	public function getAdminConfigAction(Request $request) {
-		return (object)[
+		return (object) [
 			'name' => 'modules/openstreetmap/admin-config',
 			'data' => [
 				'title'        => I18N::translate('Open Street Maps (Configuration)'),
@@ -684,8 +684,8 @@ 
 	 * @throws \Exception
 	 */
 	public function getAdminPlacesAction(Request $request) {
-		$parent_id   = (int)$request->get('parent_id', 0);
-		$inactive    = (bool)$request->get('inactive');
+		$parent_id   = (int) $request->get('parent_id', 0);
+		$inactive    = (bool) $request->get('inactive');
 		$hierarchy   = $this->gethierarchy($parent_id);
 		$title       = I18N::translate('Open Street Maps (Geographic data)');
 		$breadcrumbs = [
@@ -708,7 +708,7 @@ 
 		}
 		$breadcrumbs[] = array_pop($breadcrumbs);
 
-		return (object)[
+		return (object) [
 			'name' => 'modules/openstreetmap/admin-places',
 			'data' => [
 				'title'       => $title,
@@ -729,9 +729,9 @@ 
 	 * @throws \Exception
 	 */
 	public function getAdminPlaceEditAction(Request $request) {
-		$parent_id = (int)$request->get('parent_id', 0);
-		$place_id  = (int)$request->get('place_id');
-		$inactive  = (int)$request->get('inactive');
+		$parent_id = (int) $request->get('parent_id', 0);
+		$place_id  = (int) $request->get('place_id');
+		$inactive  = (int) $request->get('inactive');
 		$hierarchy = $this->gethierarchy($place_id);
 		$fqpn      = empty($hierarchy) ? '' : $hierarchy[0]->fqpn;
 		$location  = new Location($fqpn);
@@ -767,7 +767,7 @@ 
 		}
 		$breadcrumbs[] = $place_id === 0 ? I18N::translate('Add') : I18N::translate('Edit');
 
-		return (object)[
+		return (object) [
 			'name' => 'modules/openstreetmap/admin-place-edit',
 			'data' => [
 				'module'      => $this->getName(),
@@ -793,9 +793,9 @@ 
 	 */
 	public function postAdminSaveAction(Request $request) {
 		if (Filter::checkCsrf()) {
-			$parent_id = (int)$request->get('parent_id');
-			$place_id  = (int)$request->get('place_id');
-			$inactive  = (int)$request->get('inactive');
+			$parent_id = (int) $request->get('parent_id');
+			$place_id  = (int) $request->get('place_id');
+			$inactive  = (int) $request->get('inactive');
 			$lat       = round($request->get('new_place_lati'), 5); // 5 decimal places (locate to within about 1 metre)
 			$lat       = ($lat < 0 ? 'S' : 'N') . abs($lat);
 			$lng       = round($request->get('new_place_long'), 5);
@@ -814,7 +814,7 @@ 
 						  VALUES (:id, :parent, :level, :place, :lng, :lat, :zoom, :icon)"
 				)->execute(
 					[
-					'id'     => (int)Database::prepare("SELECT MAX(pl_id)+1 FROM `##placelocation`")->fetchOne(),
+					'id'     => (int) Database::prepare("SELECT MAX(pl_id)+1 FROM `##placelocation`")->fetchOne(),
 					'parent' => $parent_id,
 					'level'  => $level,
 					'place'  => $request->get('new_place_name'),
@@ -833,7 +833,7 @@ 
 					'place' => $request->get('new_place_name'),
 					'lat'   => $request->get('lati_control') . $lat,
 					'lng'   => $request->get('long_control') . $lng,
-					'zoom'  => (int)$request->get('new_zoom_factor'),
+					'zoom'  => (int) $request->get('new_zoom_factor'),
 					'icon'  => $icon,
 				]
 				);
@@ -866,9 +866,9 @@ 
 	 */
 	public function postAdminDeleteRecordAction(Request $request): RedirectResponse {
 		if (Filter::checkCsrf()) {
-			$place_id  = (int)$request->get('place_id');
-			$parent_id = (int)$request->get('parent_id');
-			$inactive  = (int)$request->get('inactive');
+			$place_id  = (int) $request->get('place_id');
+			$parent_id = (int) $request->get('parent_id');
+			$inactive  = (int) $request->get('inactive');
 
 			try {
 				Database::prepare(
@@ -887,7 +887,7 @@ 
 				);
 			}
 			// If after deleting there are no more places at this level then go up a level
-			$children = (int)Database::prepare(
+			$children = (int) Database::prepare(
 				"SELECT COUNT(pl_id) FROM `##placelocation` WHERE pl_parent_id = :parent_id"
 			)
 				->execute(['parent_id' => $parent_id])
@@ -920,9 +920,9 @@ 
 	 * @throws \Exception
 	 */
 	public function getAdminExportAction(Request $request) {
-		$parent_id = (int)$request->get('parent_id');
+		$parent_id = (int) $request->get('parent_id');
 		$format    = $request->get('format', 'csv');
-		$maxlevel  = (int)Database::prepare("SELECT max(pl_level) FROM `##placelocation`")->execute()->fetchOne();
+		$maxlevel  = (int) Database::prepare("SELECT max(pl_level) FROM `##placelocation`")->execute()->fetchOne();
 		$startfqpn = [];
 		$hierarchy = $this->gethierarchy($parent_id);
 		$geojson   = [];
@@ -974,8 +974,8 @@ 
 							)
 						)
 					);
-					$long = (float)strtr($place['pl_long'], ['E' => '', 'W' => '-', ',' => '.']);
-					$lati = (float)strtr($place['pl_lati'], ['N' => '', 'S' => '-', ',' => '.']);
+					$long = (float) strtr($place['pl_long'], ['E' => '', 'W' => '-', ',' => '.']);
+					$lati = (float) strtr($place['pl_lati'], ['N' => '', 'S' => '-', ',' => '.']);
 
 					$geojson['features'][] = [
 						'type'     => 'Feature',
@@ -1007,8 +1007,8 @@ 
 	}
 
 	public function getAdminImportFormAction(Request $request) {
-		$parent_id   = (int)$request->get('parent_id');
-		$inactive    = (int)$request->get('inactive');
+		$parent_id   = (int) $request->get('parent_id');
+		$inactive    = (int) $request->get('inactive');
 		$breadcrumbs = [
 			route('admin-control-panel') => I18N::translate('Control panel'),
 			route('admin-modules')       => I18N::translate('Module administration'),
@@ -1034,7 +1034,7 @@ 
 			}
 		);
 
-		return (object)[
+		return (object) [
 			'name' => 'modules/openstreetmap/admin-import-form',
 			'data' => [
 				'title'       => I18N::translate('Import geographic data'),
@@ -1098,8 +1098,8 @@ 
 					$row    = explode($delimiter, $input_array[0]);
 					$fields = count($row);
 					if ($fields >= 6 &&
-						(bool)preg_match("/[SN][0-9]*\.?[0-9]*/", $row[$fields - 3]) &&
-						(bool)preg_match("/[EW][0-9]*\.?[0-9]*/", $row[$fields - 4])) {
+						(bool) preg_match("/[SN][0-9]*\.?[0-9]*/", $row[$fields - 3]) &&
+						(bool) preg_match("/[EW][0-9]*\.?[0-9]*/", $row[$fields - 4])) {
 						$filetype = 'csv';
 					}
 				}
@@ -1155,7 +1155,7 @@ 
 			}
 
 			if ($filetype !== '?') {
-				if ((bool)$request->get('cleardatabase')) {
+				if ((bool) $request->get('cleardatabase')) {
 					Database::exec("TRUNCATE TABLE `##placelocation`");
 				}
 				//process places
@@ -1166,10 +1166,10 @@ 
 				usort(
 					$places,
 					function (array $a, array $b) {
-						if ((int)$a['pl_level'] === (int)$b['pl_level']) {
+						if ((int) $a['pl_level'] === (int) $b['pl_level']) {
 							return I18N::strcasecmp($a['fqpn'], $b['fqpn']);
 						} else {
-							return (int)$a['pl_level'] - (int)$b['pl_level'];
+							return (int) $a['pl_level'] - (int) $b['pl_level'];
 						}
 					}
 				);
@@ -1189,7 +1189,7 @@ 
 						)) {
 
 						// overwrite
-						$location->update((object)$place);
+						$location->update((object) $place);
 						$updated++;
 					} elseif (!$valid && $options !== 'update') {
 						//add
@@ -1259,7 +1259,7 @@ 
 	 */
 	public function postAdminImportPlacesAction(Request $request) {
 		$gedcomName = $request->get('ged');
-		$inactive   = (int)$request->get('inactive');
+		$inactive   = (int) $request->get('inactive');
 		$tree       = Tree::findByName($gedcomName);
 
 		// Get all the places from the places table ...
@@ -1478,7 +1478,7 @@ 
 		$list = [];
 		/** @var array $rows */
 		foreach ($rows as $row) {
-			if ((bool)$row['inactive'] && !$show_inactive) {
+			if ((bool) $row['inactive'] && !$show_inactive) {
 				continue;
 			}
 
@@ -1489,20 +1489,20 @@ 
 				]
 			)->fetchOneRow();
 
-			if ((bool)$row['inactive']) {
+			if ((bool) $row['inactive']) {
 				$badge = 'danger';
-			} elseif ((int)$children->no_coord > 0) {
+			} elseif ((int) $children->no_coord > 0) {
 				$badge = 'warning';
-			} elseif ((int)$children->child_count > 0) {
+			} elseif ((int) $children->child_count > 0) {
 				$badge = 'info';
 			} else {
 				$badge = 'secondary';
 			}
 
-			$list[] = (object)array_merge(
+			$list[] = (object) array_merge(
 				$row,
 				[
-					'child_count' => (int)$children->child_count,
+					'child_count' => (int) $children->child_count,
 					'badge'       => $badge,
 				]
 			);
@@ -1524,7 +1524,7 @@ 
 			$row       = $statement->execute(['id' => $id])->fetchOneRow();
 			$fqpn[]    = $row->pl_place;
 			$row->fqpn = implode(Place::GEDCOM_SEPARATOR, $fqpn);
-			$id        = (int)$row->pl_parent_id;
+			$id        = (int) $row->pl_parent_id;
 			$arr[]     = $row;
 		}
 
@@ -1539,7 +1539,7 @@ 
 	 */
 	private function buildLevel($parent_id, $placename, &$places) {
 		$level = array_search('', $placename);
-		$rows  = (array)Database::prepare(
+		$rows  = (array) Database::prepare(
 			"SELECT pl_level, pl_id, pl_place, pl_long, pl_lati, pl_zoom, pl_icon FROM `##placelocation` WHERE pl_parent_id=? ORDER BY pl_place"
 		)
 			->execute([$parent_id])

resources/views/media-page.php

Spacing +2 added lines, -2 removed lines

@@ -10,13 +10,13 @@
 
 <?php if ($media->isPendingDeletion()): ?>
 	<?php if (Auth::isModerator($media->getTree())): ?>
-		<?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate( 'This media object has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?>
+		<?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This media object has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?>
 	<?php elseif (Auth::isEditor($media->getTree())): ?>
 		<?= view('alerts/warning-dissmissible', ['alert' => I18N::translate('This media object has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?>
 	<?php endif ?>
 <?php elseif ($media->isPendingAddition()): ?>
 	<?php if (Auth::isModerator($media->getTree())): ?>
-		<?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate( 'This media object has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>' ) . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?>
+		<?= view('alerts/warning-dissmissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This media object has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?>
 	<?php elseif (Auth::isEditor($media->getTree())): ?>
 		<?= view('alerts/warning-dissmissible', ['alert' => I18N::translate('This media object has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?>
 	<?php endif ?>

app/Location.php

Spacing +6 added lines, -8 removed lines

@@ -13,7 +13,7 @@ 
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Fisharebest\Webtrees;
 
@@ -30,14 +30,14 @@ 
 	 * @param array $record
 	 * @throws \Exception
 	 */
-	public function __construct($gedcomName, $record=[]) {
+	public function __construct($gedcomName, $record = []) {
 		$tmp = $this->getRecordFromName($gedcomName);
 		if ($tmp !== null) {
 			$this->record = $tmp;
 		} elseif (!empty($record)) {
-			$this->record = (object)$record;
+			$this->record = (object) $record;
 		} else {
-			$this->record = (object)[
+			$this->record = (object) [
 				'fqpn'         => '',
 				'pl_id'        => 0,
 				'pl_parent_id' => 0,
@@ -67,8 +67,7 @@ 
 		switch ($format) {
 			case 'signed':
 				return $this->record->pl_lati ?
-					(float)strtr($this->record->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) :
-					$this->record->pl_lati;
+					(float) strtr($this->record->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) : $this->record->pl_lati;
 			default:
 				return $this->record->pl_lati;
 		}
@@ -83,8 +82,7 @@ 
 		switch ($format) {
 			case 'signed':
 				return $this->record->pl_long ?
-					(float)strtr($this->record->pl_long, ['E' => '', 'W' => '-', ',' => '.']) :
-					$this->record->pl_long;
+					(float) strtr($this->record->pl_long, ['E' => '', 'W' => '-', ',' => '.']) : $this->record->pl_long;
 			default:
 				return $this->record->pl_long;
 		}

resources/views/tables/surnames.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>

app/Http/Controllers/SearchController.php

Spacing +39 added lines, -39 removed lines

@@ -603,7 +603,7 @@ 
 
 		foreach ($search_terms as $n => $q) {
 			$queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-			$sql                   .= " AND f_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+			$sql .= " AND f_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
 			$args['collate_' . $n] = I18N::collation();
 			$args['query_' . $n]   = Database::escapeLike($q);
 		}
@@ -650,7 +650,7 @@ 
 	 * @return Family[]
 	 */
 	private function searchFamilyNames(array $search_terms, array $search_trees): array {
-		$sql  =
+		$sql =
 			"SELECT DISTINCT f_id AS xref, f_file AS gedcom_id, f_gedcom AS gedcom" .
 			" FROM `##families`" .
 			" LEFT JOIN `##name` husb ON f_husb = husb.n_id AND f_file = husb.n_file" .
@@ -659,7 +659,7 @@ 
 		$args = [];
 
 		foreach ($search_terms as $n => $q) {
-			$sql                        .= " AND (husb.n_full COLLATE :husb_collate_" . $n . " LIKE CONCAT('%', :husb_query_" . $n . ", '%') OR wife.n_full COLLATE :wife_collate_" . $n . " LIKE CONCAT('%', :wife_query_" . $n . ", '%'))";
+			$sql .= " AND (husb.n_full COLLATE :husb_collate_" . $n . " LIKE CONCAT('%', :husb_query_" . $n . ", '%') OR wife.n_full COLLATE :wife_collate_" . $n . " LIKE CONCAT('%', :wife_query_" . $n . ", '%'))";
 			$args['husb_collate_' . $n] = I18N::collation();
 			$args['husb_query_' . $n]   = Database::escapeLike($q);
 			$args['wife_collate_' . $n] = I18N::collation();
@@ -710,7 +710,7 @@ 
 
 		foreach ($search_terms as $n => $q) {
 			$queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-			$sql                   .= " AND i_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+			$sql .= " AND i_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
 			$args['collate_' . $n] = I18N::collation();
 			$args['query_' . $n]   = Database::escapeLike($q);
 		}
@@ -855,7 +855,7 @@ 
 		}
 
 		// Add the where clause
-		$sql    .= " WHERE ind.i_file=?";
+		$sql .= " WHERE ind.i_file=?";
 		$bind[] = $this->tree()->getTreeId();
 
 		foreach ($fields as $field_name => $field_value) {
@@ -866,15 +866,15 @@ 
 					case 'GIVN':
 						switch ($modifiers[$field_name]) {
 							case 'EXACT':
-								$sql    .= " AND i_n.n_givn=?";
+								$sql .= " AND i_n.n_givn=?";
 								$bind[] = $field_value;
 								break;
 							case 'BEGINS':
-								$sql    .= " AND i_n.n_givn LIKE CONCAT(?, '%')";
+								$sql .= " AND i_n.n_givn LIKE CONCAT(?, '%')";
 								$bind[] = $field_value;
 								break;
 							case 'CONTAINS':
-								$sql    .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
+								$sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
 								$bind[] = $field_value;
 								break;
 							case 'SDX_STD':
@@ -888,7 +888,7 @@ 
 									$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
 								} else {
 									// No phonetic content? Use a substring match
-									$sql    .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
+									$sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
 									$bind[] = $field_value;
 								}
 								break;
@@ -904,7 +904,7 @@ 
 									$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
 								} else {
 									// No phonetic content? Use a substring match
-									$sql    .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
+									$sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
 									$bind[] = $field_value;
 								}
 								break;
@@ -913,15 +913,15 @@ 
 					case 'SURN':
 						switch ($modifiers[$field_name]) {
 							case 'EXACT':
-								$sql    .= " AND i_n.n_surname=?";
+								$sql .= " AND i_n.n_surname=?";
 								$bind[] = $field_value;
 								break;
 							case 'BEGINS':
-								$sql    .= " AND i_n.n_surname LIKE CONCAT(?, '%')";
+								$sql .= " AND i_n.n_surname LIKE CONCAT(?, '%')";
 								$bind[] = $field_value;
 								break;
 							case 'CONTAINS':
-								$sql    .= " AND i_n.n_surname LIKE CONCAT('%', ?, '%')";
+								$sql .= " AND i_n.n_surname LIKE CONCAT('%', ?, '%')";
 								$bind[] = $field_value;
 								break;
 							case 'SDX_STD':
@@ -935,7 +935,7 @@ 
 									$sql .= " AND (" . implode(' OR ', $sdx) . ")";
 								} else {
 									// No phonetic content? Use a substring match
-									$sql    .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
+									$sql .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
 									$bind[] = $field_value;
 								}
 								break;
@@ -952,7 +952,7 @@ 
 									break;
 								} else {
 									// No phonetic content? Use a substring match
-									$sql    .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
+									$sql .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
 									$bind[] = $field_value;
 								}
 						}
@@ -961,7 +961,7 @@ 
 					case '_MARNM':
 					case '_HEB':
 					case '_AKA':
-						$sql    .= " AND i_n.n_type=? AND i_n.n_full LIKE CONCAT('%', ?, '%')";
+						$sql .= " AND i_n.n_type=? AND i_n.n_full LIKE CONCAT('%', ?, '%')";
 						$bind[] = $parts[1];
 						$bind[] = $field_value;
 						break;
@@ -971,7 +971,7 @@ 
 				$date = new Date($field_value);
 				if ($date->isOK()) {
 					$delta  = 365 * ($modifiers[$field_name] ?? 0);
-					$sql    .= " AND i_d.d_fact=? AND i_d.d_julianday1>=? AND i_d.d_julianday2<=?";
+					$sql .= " AND i_d.d_fact=? AND i_d.d_julianday1>=? AND i_d.d_julianday2<=?";
 					$bind[] = $parts[0];
 					$bind[] = $date->minimumJulianDay() - $delta;
 					$bind[] = $date->maximumJulianDay() + $delta;
@@ -981,7 +981,7 @@ 
 				$date = new Date($field_value);
 				if ($date->isOK()) {
 					$delta  = 365 * $modifiers[$field_name];
-					$sql    .= " AND f_d.d_fact=? AND f_d.d_julianday1>=? AND f_d.d_julianday2<=?";
+					$sql .= " AND f_d.d_fact=? AND f_d.d_julianday1>=? AND f_d.d_julianday2<=?";
 					$bind[] = $parts[1];
 					$bind[] = $date->minimumJulianDay() - $delta;
 					$bind[] = $date->maximumJulianDay() + $delta;
@@ -989,12 +989,12 @@ 
 			} elseif ($parts[1] === 'PLAC') {
 				// *:PLAC
 				// SQL can only link a place to a person/family, not to an event.
-				$sql    .= " AND i_p.place LIKE CONCAT('%', ?, '%')";
+				$sql .= " AND i_p.place LIKE CONCAT('%', ?, '%')";
 				$bind[] = $field_value;
 			} elseif ($parts[0] === 'FAMS' && $parts[2] === 'PLAC') {
 				// FAMS:*:PLAC
 				// SQL can only link a place to a person/family, not to an event.
-				$sql    .= " AND f_p.place LIKE CONCAT('%', ?, '%')";
+				$sql .= " AND f_p.place LIKE CONCAT('%', ?, '%')";
 				$bind[] = $field_value;
 			} elseif ($parts[0] === 'FAMC' && $parts[2] === 'NAME') {
 				$table = $parts[1] === 'HUSB' ? 'f_n' : 'm_n';
@@ -1003,15 +1003,15 @@ 
 					case 'GIVN':
 						switch ($modifiers[$field_name]) {
 							case 'EXACT':
-								$sql    .= " AND {$table}.n_givn=?";
+								$sql .= " AND {$table}.n_givn=?";
 								$bind[] = $field_value;
 								break;
 							case 'BEGINS':
-								$sql    .= " AND {$table}.n_givn LIKE CONCAT(?, '%')";
+								$sql .= " AND {$table}.n_givn LIKE CONCAT(?, '%')";
 								$bind[] = $field_value;
 								break;
 							case 'CONTAINS':
-								$sql    .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
+								$sql .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
 								$bind[] = $field_value;
 								break;
 							case 'SDX_STD':
@@ -1025,7 +1025,7 @@ 
 									$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
 								} else {
 									// No phonetic content? Use a substring match
-									$sql    .= " AND {$table}.n_givn = LIKE CONCAT('%', ?, '%')";
+									$sql .= " AND {$table}.n_givn = LIKE CONCAT('%', ?, '%')";
 									$bind[] = $field_value;
 								}
 								break;
@@ -1042,7 +1042,7 @@ 
 									break;
 								} else {
 									// No phonetic content? Use a substring match
-									$sql    .= " AND {$table}.n_givn = LIKE CONCAT('%', ?, '%')";
+									$sql .= " AND {$table}.n_givn = LIKE CONCAT('%', ?, '%')";
 									$bind[] = $field_value;
 								}
 						}
@@ -1050,15 +1050,15 @@ 
 					case 'SURN':
 						switch ($modifiers[$field_name]) {
 							case 'EXACT':
-								$sql    .= " AND {$table}.n_surname=?";
+								$sql .= " AND {$table}.n_surname=?";
 								$bind[] = $field_value;
 								break;
 							case 'BEGINS':
-								$sql    .= " AND {$table}.n_surname LIKE CONCAT(?, '%')";
+								$sql .= " AND {$table}.n_surname LIKE CONCAT(?, '%')";
 								$bind[] = $field_value;
 								break;
 							case 'CONTAINS':
-								$sql    .= " AND {$table}.n_surname LIKE CONCAT('%', ?, '%')";
+								$sql .= " AND {$table}.n_surname LIKE CONCAT('%', ?, '%')";
 								$bind[] = $field_value;
 								break;
 							case 'SDX_STD':
@@ -1072,7 +1072,7 @@ 
 									$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
 								} else {
 									// No phonetic content? Use a substring match
-									$sql    .= " AND {$table}.n_surn = LIKE CONCAT('%', ?, '%')";
+									$sql .= " AND {$table}.n_surn = LIKE CONCAT('%', ?, '%')";
 									$bind[] = $field_value;
 								}
 								break;
@@ -1088,7 +1088,7 @@ 
 									$sql .= ' AND (' . implode(' OR ', $sdx) . ')';
 								} else {
 									// No phonetic content? Use a substring match
-									$sql    .= " AND {$table}.n_surn = LIKE CONCAT('%', ?, '%')";
+									$sql .= " AND {$table}.n_surn = LIKE CONCAT('%', ?, '%')";
 									$bind[] = $field_value;
 								}
 								break;
@@ -1097,17 +1097,17 @@ 
 				}
 			} elseif ($parts[0] === 'FAMS') {
 				// e.g. searches for occupation, religion, note, etc.
-				$sql    .= " AND fam.f_gedcom REGEXP CONCAT('\n[0-9] ', ?, '(.*\n[0-9] CONT)* [^\n]*', ?)";
+				$sql .= " AND fam.f_gedcom REGEXP CONCAT('\n[0-9] ', ?, '(.*\n[0-9] CONT)* [^\n]*', ?)";
 				$bind[] = $parts[1];
 				$bind[] = $field_value;
 			} elseif ($parts[1] === 'TYPE') {
 				// e.g. FACT:TYPE or EVEN:TYPE
-				$sql    .= " AND ind.i_gedcom REGEXP CONCAT('\n1 ', ?, '.*(\n[2-9] .*)*\n2 TYPE .*', ?)";
+				$sql .= " AND ind.i_gedcom REGEXP CONCAT('\n1 ', ?, '.*(\n[2-9] .*)*\n2 TYPE .*', ?)";
 				$bind[] = $parts[0];
 				$bind[] = $field_value;
 			} else {
 				// e.g. searches for occupation, religion, note, etc.
-				$sql    .= " AND ind.i_gedcom REGEXP CONCAT('\n[0-9] ', ?, '(.*\n[0-9] CONT)* [^\n]*', ?)";
+				$sql .= " AND ind.i_gedcom REGEXP CONCAT('\n[0-9] ', ?, '(.*\n[0-9] CONT)* [^\n]*', ?)";
 				$bind[] = $parts[0];
 				$bind[] = $field_value;
 			}
@@ -1185,7 +1185,7 @@ 
 		$sql .= ")";
 
 		if ($givn_sdx !== '') {
-			$sql      .= " AND (";
+			$sql .= " AND (";
 			$givn_sdx = explode(':', $givn_sdx);
 			foreach ($givn_sdx as $n => $sdx) {
 				$sql .= $n > 0 ? " OR " : "";
@@ -1203,7 +1203,7 @@ 
 		}
 
 		if ($surn_sdx !== '') {
-			$sql      .= " AND (";
+			$sql .= " AND (";
 			$surn_sdx = explode(':', $surn_sdx);
 			foreach ($surn_sdx as $n => $sdx) {
 				$sql .= $n ? " OR " : "";
@@ -1221,7 +1221,7 @@ 
 		}
 
 		if ($plac_sdx !== '') {
-			$sql      .= " AND (";
+			$sql .= " AND (";
 			$plac_sdx = explode(':', $plac_sdx);
 			foreach ($plac_sdx as $n => $sdx) {
 				$sql .= $n ? " OR " : "";
@@ -1267,7 +1267,7 @@ 
 
 		foreach ($search_terms as $n => $q) {
 			$queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-			$sql                   .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+			$sql .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
 			$args['collate_' . $n] = I18N::collation();
 			$args['query_' . $n]   = Database::escapeLike($q);
 		}
@@ -1322,7 +1322,7 @@ 
 
 		foreach ($search_terms as $n => $q) {
 			$queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-			$sql                   .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+			$sql .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
 			$args['collate_' . $n] = I18N::collation();
 			$args['query_' . $n]   = Database::escapeLike($q);
 		}
@@ -1377,7 +1377,7 @@ 
 
 		foreach ($search_terms as $n => $q) {
 			$queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-			$sql                   .= " AND s_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+			$sql .= " AND s_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
 			$args['collate_' . $n] = I18N::collation();
 			$args['query_' . $n]   = Database::escapeLike($q);
 		}

app/Http/Controllers/PlaceHierarchyController.php

Spacing +7 added lines, -7 removed lines

@@ -50,14 +50,14 @@ 
 		$osm_module = Module::getModuleByName(self::MAP_MODULE);
 		$method     = 'assets';
 		$showmap    = $osm_module &&
-			(bool)$osm_module->getPreference('place_hierarchy') &&
+			(bool) $osm_module->getPreference('place_hierarchy') &&
 			method_exists($osm_module, $method) &&
 			strpos($action, 'hierarchy') === 0;
 		$data       = null;
 		$note       = false;
 
 		if ($showmap) {
-			$note    = true;
+			$note = true;
 			$content .= view('modules/openstreetmap/map',
 				[
 					'assets' => $osm_module->$method(),
@@ -70,14 +70,14 @@ 
 
 		switch ($action) {
 			case 'list':
-				$nextaction      = ['hierarchy' => I18N::translate('Show place hierarchy')];
-				$content         .= view('place-list', $this->getList($tree));
+				$nextaction = ['hierarchy' => I18N::translate('Show place hierarchy')];
+				$content .= view('place-list', $this->getList($tree));
 				break;
 			case 'hierarchy':
 			case 'hierarchy-e':
 				$nextaction      = ['list' => I18N::translate('Show all places in a list')];
 				$data            = $this->getHierarchy($tree, $place, $parent);
-				$content         .= (null === $data || $showmap) ? '' : view('place-hierarchy', $data);
+				$content .= (null === $data || $showmap) ? '' : view('place-hierarchy', $data);
 				if (null === $data || $action === 'hierarchy-e') {
 					$content .= view('place-events', $this->getEvents($tree, $place));
 				}
@@ -117,7 +117,7 @@ 
 
 		return
 			[
-				'columns' => array_chunk($list_places, (int)ceil($numfound / $divisor)),
+				'columns' => array_chunk($list_places, (int) ceil($numfound / $divisor)),
 			];
 	}
 
@@ -139,7 +139,7 @@ 
 				[
 					'tree'      => $tree,
 					'col_class' => "w-" . ($divisor === 2 ? "25" : "50"),
-					'columns'   => array_chunk($child_places, (int)ceil($numfound / $divisor)),
+					'columns'   => array_chunk($child_places, (int) ceil($numfound / $divisor)),
 					'place'     => $place,
 					'parent'    => $parent,
 				];

app/Http/Controllers/FamilyBookChartController.php

Spacing +1 added lines, -1 removed lines

@@ -170,7 +170,7 @@
 				echo '<table cellspacing="0" cellpadding="0" border="0" >';
 				foreach ($children as $i => $child) {
 					echo '<tr><td>';
-					$kids    = $this->printDescendency($child, $generation + 1);
+					$kids = $this->printDescendency($child, $generation + 1);
 					$numkids += $kids;
 					echo '</td>';
 					// Print the lines