fisharebest / webtrees

app/Http/Controllers/AdminUsersController.php

Spacing +2 added lines, -2 removed lines

@@ -169,7 +169,7 @@ 
 		$args = [];
 
 		if ($search) {
-			$sql_select       .= " AND (user_name LIKE CONCAT('%', :search_1, '%') OR real_name LIKE CONCAT('%', :search_2, '%') OR email LIKE CONCAT('%', :search_3, '%'))";
+			$sql_select .= " AND (user_name LIKE CONCAT('%', :search_1, '%') OR real_name LIKE CONCAT('%', :search_2, '%') OR email LIKE CONCAT('%', :search_3, '%'))";
 			$args['search_1'] = $search;
 			$args['search_2'] = $search;
 			$args['search_3'] = $search;
@@ -198,7 +198,7 @@ 
 
 		if ($length) {
 			$user->setPreference('admin_users_page_size', $length);
-			$sql_select     .= " LIMIT :limit OFFSET :offset";
+			$sql_select .= " LIMIT :limit OFFSET :offset";
 			$args['limit']  = $length;
 			$args['offset'] = $start;
 		}

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>

app/Http/Controllers/AdminMediaController.php

Spacing +6 added lines, -6 removed lines

@@ -152,7 +152,7 @@ 
 					"  OR   descriptive_title LIKE CONCAT('%', :search_2, '%'))" .
 					" AND   multimedia_file_refn NOT LIKE 'http://%'" .
 					" AND   multimedia_file_refn NOT LIKE 'https://%'";
-				$ARGS1   = [
+				$ARGS1 = [
 					'media_path_1' => $media_path,
 					'media_folder' => $media_folder,
 					'media_path_2' => Database::escapeLike($media_path),
@@ -169,7 +169,7 @@ 
 					" AND   multimedia_file_refn LIKE CONCAT(:media_path_3, '%')" .
 					" AND   multimedia_file_refn NOT LIKE 'http://%'" .
 					" AND   multimedia_file_refn NOT LIKE 'https://%'";
-				$ARGS2   = [
+				$ARGS2 = [
 					'media_folder' => $media_folder,
 					'media_path_3' => $media_path,
 				];
@@ -181,7 +181,7 @@ 
 					$ARGS2['media_path_4'] = Database::escapeLike($media_path);
 				}
 
-				$order   = $request->get('order', []);
+				$order = $request->get('order', []);
 				$SELECT1 .= " ORDER BY ";
 				if ($order) {
 					foreach ($order as $key => $value) {
@@ -205,7 +205,7 @@ 
 				}
 
 				if ($length > 0) {
-					$SELECT1         .= " LIMIT :length OFFSET :start";
+					$SELECT1 .= " LIMIT :length OFFSET :start";
 					$ARGS1['length'] = $length;
 					$ARGS1['start']  = $start;
 				}
@@ -238,7 +238,7 @@ 
 					" JOIN  `##media_file` USING (m_id, m_file)" .
 					" WHERE (multimedia_file_refn LIKE 'http://%' OR multimedia_file_refn LIKE 'https://%')" .
 					" AND   (multimedia_file_refn LIKE CONCAT('%', :search_1, '%') OR descriptive_title LIKE CONCAT('%', :search_2, '%'))";
-				$ARGS1   = [
+				$ARGS1 = [
 					'search_1' => Database::escapeLike($search),
 					'search_2' => Database::escapeLike($search),
 				];
@@ -274,7 +274,7 @@ 
 				}
 
 				if ($length > 0) {
-					$SELECT1         .= " LIMIT :length OFFSET :start";
+					$SELECT1 .= " LIMIT :length OFFSET :start";
 					$ARGS1['length'] = $length;
 					$ARGS1['start']  = $start;
 				}

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/Module/OpenStreetMap/Schema/Migration3.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
 			" DROP COLUMN sv_long," .
 			" DROP COLUMN sv_lati," .
 			" DROP COLUMN sv_bearing," .
-			" DROP COLUMN sv_elevation,".
+			" DROP COLUMN sv_elevation," .
 			" DROP COLUMN sv_zoom," .
 			" DROP INDEX ix1," .
 			" DROP INDEX ix2," .
@@ -56,7 +56,7 @@ 
 			"DELETE FROM `##module_setting` WHERE module_name='openstreetmap' AND setting_name=''"
 			];
 
-		foreach($queries as $query) {
+		foreach ($queries as $query) {
 			try {
 				Database::exec($query);
 			} catch (PDOException $ex) {

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 = '';