fisharebest / webtrees

app/Http/Controllers/Auth/RegisterController.php

Spacing +1 added lines, -1 removed lines

@@ -193,7 +193,7 @@
 
 		// Username already exists
 		if (User::findByUserName($username) !== null) {
-			throw new Exception(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.'.$username));
+			throw new Exception(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.' . $username));
 		}
 
 		// Email already exists

app/Http/Controllers/AdminTreesController.php

Spacing +2 added lines, -2 removed lines

@@ -975,8 +975,8 @@
 		// For backwards compatibility with webtrees 1.x we store the two calendar formats in one variable
 		// e.g. "gregorian_and_jewish"
 		$tree->setPreference('CALENDAR_FORMAT', implode('_and_', array_unique([
-			$request->get('CALENDAR_FORMAT0',  'none'),
-			$request->get('CALENDAR_FORMAT1',  'none'),
+			$request->get('CALENDAR_FORMAT0', 'none'),
+			$request->get('CALENDAR_FORMAT1', 'none'),
 		])));
 		$tree->setPreference('CHART_BOX_TAGS', implode(',', $request->get('CHART_BOX_TAGS', [])));
 		$tree->setPreference('CONTACT_USER_ID', $request->get('CONTACT_USER_ID'));

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 ?>

app/Report/ReportParserGenerate.php

Spacing +1 added lines, -1 removed lines

@@ -1604,7 +1604,7 @@
 			$height = (int) $attrs['height'];
 		}
 
-		$person      = Individual::getInstance($id, $this->tree);
+		$person = Individual::getInstance($id, $this->tree);
 		$media_file = $person->findHighlightedMediaFile();
 
 		if ($media_file !== null && $media_file->fileExists()) {

app/Http/Controllers/AdminSiteController.php

Spacing +25 added lines, -25 removed lines

@@ -255,35 +255,35 @@ 
 
 		$args = [];
 		if ($search) {
-			$sql            .= " AND log_message LIKE CONCAT('%', :search, '%')";
+			$sql .= " AND log_message LIKE CONCAT('%', :search, '%')";
 			$args['search'] = $search;
 		}
 		if ($from) {
-			$sql          .= " AND log_time >= :from";
+			$sql .= " AND log_time >= :from";
 			$args['from'] = $from;
 		}
 		if ($to) {
-			$sql        .= " AND log_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
+			$sql .= " AND log_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
 			$args['to'] = $to;
 		}
 		if ($type) {
-			$sql          .= " AND log_type = :type";
+			$sql .= " AND log_type = :type";
 			$args['type'] = $type;
 		}
 		if ($text) {
-			$sql          .= " AND log_message LIKE CONCAT('%', :text, '%')";
+			$sql .= " AND log_message LIKE CONCAT('%', :text, '%')";
 			$args['text'] = $text;
 		}
 		if ($ip) {
-			$sql        .= " AND ip_address LIKE CONCAT('%', :ip, '%')";
+			$sql .= " AND ip_address LIKE CONCAT('%', :ip, '%')";
 			$args['ip'] = $ip;
 		}
 		if ($username) {
-			$sql          .= " AND user_name LIKE CONCAT('%', :user, '%')";
+			$sql .= " AND user_name LIKE CONCAT('%', :user, '%')";
 			$args['user'] = $username;
 		}
 		if ($gedc) {
-			$sql          .= " AND gedcom_name = :gedc";
+			$sql .= " AND gedcom_name = :gedc";
 			$args['gedc'] = $gedc;
 		}
 
@@ -309,7 +309,7 @@ 
 		}
 
 		if ($length) {
-			$sql            .= " LIMIT :limit OFFSET :offset";
+			$sql .= " LIMIT :limit OFFSET :offset";
 			$args['limit']  = $length;
 			$args['offset'] = $start;
 		}
@@ -361,35 +361,35 @@ 
 
 		$args = [];
 		if ($search) {
-			$sql            .= " AND log_message LIKE CONCAT('%', :search, '%')";
+			$sql .= " AND log_message LIKE CONCAT('%', :search, '%')";
 			$args['search'] = $search;
 		}
 		if ($from) {
-			$sql          .= " AND log_time >= :from";
+			$sql .= " AND log_time >= :from";
 			$args['from'] = $from;
 		}
 		if ($to) {
-			$sql        .= " AND log_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
+			$sql .= " AND log_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
 			$args['to'] = $to;
 		}
 		if ($type) {
-			$sql          .= " AND log_type = :type";
+			$sql .= " AND log_type = :type";
 			$args['type'] = $type;
 		}
 		if ($text) {
-			$sql          .= " AND log_message LIKE CONCAT('%', :text, '%')";
+			$sql .= " AND log_message LIKE CONCAT('%', :text, '%')";
 			$args['text'] = $text;
 		}
 		if ($ip) {
-			$sql        .= " AND ip_address LIKE CONCAT('%', :ip, '%')";
+			$sql .= " AND ip_address LIKE CONCAT('%', :ip, '%')";
 			$args['ip'] = $ip;
 		}
 		if ($username) {
-			$sql          .= " AND user_name LIKE CONCAT('%', :user, '%')";
+			$sql .= " AND user_name LIKE CONCAT('%', :user, '%')";
 			$args['user'] = $username;
 		}
 		if ($gedc) {
-			$sql          .= " AND gedcom_name = :gedc";
+			$sql .= " AND gedcom_name = :gedc";
 			$args['gedc'] = $gedc;
 		}
 
@@ -421,37 +421,37 @@ 
 
 		$args = [];
 		if ($from) {
-			$sql          .= " AND log_time >= :from";
+			$sql .= " AND log_time >= :from";
 			$args['from'] = $from;
 		}
 		if ($to) {
-			$sql        .= " AND log_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
+			$sql .= " AND log_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
 			$args['to'] = $to;
 		}
 		if ($type) {
-			$sql          .= " AND log_type = :type";
+			$sql .= " AND log_type = :type";
 			$args['type'] = $type;
 		}
 		if ($text) {
-			$sql          .= " AND log_message LIKE CONCAT('%', :text, '%')";
+			$sql .= " AND log_message LIKE CONCAT('%', :text, '%')";
 			$args['text'] = $text;
 		}
 		if ($ip) {
-			$sql        .= " AND ip_address LIKE CONCAT('%', :ip, '%')";
+			$sql .= " AND ip_address LIKE CONCAT('%', :ip, '%')";
 			$args['ip'] = $ip;
 		}
 		if ($username) {
-			$sql          .= " AND user_name LIKE CONCAT('%', :user, '%')";
+			$sql .= " AND user_name LIKE CONCAT('%', :user, '%')";
 			$args['user'] = $username;
 		}
 		if ($gedc) {
-			$sql          .= " AND gedcom_name = :gedc";
+			$sql .= " AND gedcom_name = :gedc";
 			$args['gedc'] = $gedc;
 		}
 
 		$sql .= " ORDER BY log_id";
 
-		$rows = Database::prepare($sql )->execute($args)->fetchAll();
+		$rows = Database::prepare($sql)->execute($args)->fetchAll();
 
 		$data = '';
 

app/Module/SiteMapModule.php

Spacing +1 added lines, -1 removed lines

@@ -165,7 +165,7 @@
 	public function getFileAction(Request $request): Response {
 		$file = $request->get('file', '');
 
-		if (!preg_match('/^(\d+)-([imnrs])-(\d+)$/', $file, $match))		 {
+		if (!preg_match('/^(\d+)-([imnrs])-(\d+)$/', $file, $match)) {
 			throw new NotFoundHttpException('Bad sitemap file');
 		}
 

Braces +1 added lines, -1 removed lines

@@ -165,7 +165,7 @@
 	public function getFileAction(Request $request): Response {
 		$file = $request->get('file', '');
 
-		if (!preg_match('/^(\d+)-([imnrs])-(\d+)$/', $file, $match))		 {
+		if (!preg_match('/^(\d+)-([imnrs])-(\d+)$/', $file, $match)) {
 			throw new NotFoundHttpException('Bad sitemap file');
 		}
 

app/Module/ClippingsCartModule.php

Spacing +9 added lines, -9 removed lines

@@ -231,7 +231,7 @@ 
 
 		// Create a source, to indicate the source of the data.
 		$filetext .= "0 @WEBTREES@ SOUR\n1 TITL " . WT_BASE_URL . "\n";
-		$author   = User::find($tree->getPreference('CONTACT_EMAIL'));
+		$author = User::find($tree->getPreference('CONTACT_EMAIL'));
 		if ($author !== null) {
 			$filetext .= '1 AUTH ' . $author->getRealName() . "\n";
 		}
@@ -608,7 +608,7 @@ 
 
 		$xref = $request->get('xref');
 
-		$media  = Media::getInstance($xref, $tree);
+		$media = Media::getInstance($xref, $tree);
 
 		if ($media === null) {
 			throw new NotFoundHttpException;
@@ -649,7 +649,7 @@ 
 		/** @var Tree $tree */
 		$tree = $request->attributes->get('tree');
 
-		$xref   = $request->get('xref');
+		$xref = $request->get('xref');
 
 		$media = Media::getInstance($xref, $tree);
 
@@ -673,7 +673,7 @@ 
 
 		$xref = $request->get('xref');
 
-		$note  = Note::getInstance($xref, $tree);
+		$note = Note::getInstance($xref, $tree);
 
 		if ($note === null) {
 			throw new NotFoundHttpException;
@@ -714,7 +714,7 @@ 
 		/** @var Tree $tree */
 		$tree = $request->attributes->get('tree');
 
-		$xref   = $request->get('xref');
+		$xref = $request->get('xref');
 
 		$note = Note::getInstance($xref, $tree);
 
@@ -738,7 +738,7 @@ 
 
 		$xref = $request->get('xref');
 
-		$repository  = Repository::getInstance($xref, $tree);
+		$repository = Repository::getInstance($xref, $tree);
 
 		if ($repository === null) {
 			throw new NotFoundHttpException;
@@ -779,7 +779,7 @@ 
 		/** @var Tree $tree */
 		$tree = $request->attributes->get('tree');
 
-		$xref   = $request->get('xref');
+		$xref = $request->get('xref');
 
 		$repository = Repository::getInstance($xref, $tree);
 
@@ -803,7 +803,7 @@ 
 
 		$xref = $request->get('xref');
 
-		$source  = Source::getInstance($xref, $tree);
+		$source = Source::getInstance($xref, $tree);
 
 		if ($source === null) {
 			throw new NotFoundHttpException;
@@ -889,7 +889,7 @@ 
 		$records = array_filter($records);
 
 		// Group and sort.
-		uasort($records, function(GedcomRecord $x, GedcomRecord $y) {
+		uasort($records, function (GedcomRecord $x, GedcomRecord $y) {
 			return $x::RECORD_TYPE <=> $y::RECORD_TYPE ?: GedcomRecord::compare($x, $y);
 		});
 

app/Http/Controllers/EditIndividualController.php

Spacing +1 added lines, -1 removed lines

@@ -223,7 +223,7 @@
 		/** @var Tree $tree */
 		$tree = $request->attributes->get('tree');
 
-		$xref   = $request->get('xref', '');
+		$xref = $request->get('xref', '');
 
 		$individual = Individual::getInstance($xref, $tree);
 

app/Http/Controllers/DescendantsChartController.php

Spacing +3 added lines, -3 removed lines

@@ -101,7 +101,7 @@ 
 
 		$this->checkModuleIsActive($tree, 'descendancy_chart');
 
-		$xref         = $request->get('xref');
+		$xref = $request->get('xref');
 		$individual = Individual::getInstance($xref, $tree);
 
 		$this->checkIndividualAccess($individual);
@@ -118,7 +118,7 @@ 
 
 		$descendants = $this->descendants($individual, $generations, []);
 
-		switch($chart_style) {
+		switch ($chart_style) {
 			case self::CHART_STYLE_LIST:
 			default:
 				return $this->descendantsList($individual, $generations);
@@ -315,7 +315,7 @@ 
 	 * @return Response
 	 */
 	private function descendantsFamilies(Tree $tree, array $descendants): Response {
-		$families  = [];
+		$families = [];
 		foreach ($descendants as $individual) {
 			foreach ($individual->getChildFamilies() as $family) {
 				$families[$family->getXref()] = $family;