Completed
Push — openstreetmap ( 1a7f91...755e02 )
by Greg
11:07 queued 58s
created
resources/views/modules/openstreetmap/map.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,14 +10,14 @@
 block discarded – undo
10 10
 
11 11
 	<?php if (Auth::isAdmin()): ?>
12 12
 		<p class="center">
13
-			<a href="<?= e(route('admin-module',[
13
+			<a href="<?= e(route('admin-module', [
14 14
 				'module' => $module,
15 15
 				'action' => 'AdminConfig',
16 16
 			])) ?>">
17 17
 				<?= I18N::translate('Map module preferences') ?>
18 18
 			</a>
19 19
 			|
20
-			<a href="<?= e(route('admin-module',[
20
+			<a href="<?= e(route('admin-module', [
21 21
 				'module' => $module,
22 22
 				'action' => 'AdminPlaces',
23 23
 			])) ?>">
Please login to merge, or discard this patch.
resources/views/modules/openstreetmap/admin-import-form.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -6,10 +6,10 @@
 block discarded – undo
6 6
 
7 7
 <h3><?= $title ?></h3>
8 8
 <form id="upload_form" method="post" enctype="multipart/form-data" action="<?=
9
-    e(route('admin-module',[
10
-        'module' => $module,
11
-        'action' => 'AdminImport',
12
-    ])) ?>">
9
+		e(route('admin-module',[
10
+				'module' => $module,
11
+				'action' => 'AdminImport',
12
+		])) ?>">
13 13
 	<?= csrf_field() ?>
14 14
 	<input type="hidden" name="parent_id" value="<?= $parent_id ?>">
15 15
 	<input type="hidden" name="inactive" value="<?= $inactive ?>">
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
 
7 7
 <h3><?= $title ?></h3>
8 8
 <form id="upload_form" method="post" enctype="multipart/form-data" action="<?=
9
-    e(route('admin-module',[
9
+    e(route('admin-module', [
10 10
         'module' => $module,
11 11
         'action' => 'AdminImport',
12 12
     ])) ?>">
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 				</div>
30 30
 				<select id="serverfile" name="serverfile" class="form-control">
31 31
                     <option class='custom-select' selected disabled value=''><?= I18N::translate('choose a file&hellip;') ?></option>
32
-                    <?php foreach($files as $file): ?>
32
+                    <?php foreach ($files as $file): ?>
33 33
                         <option value="<?= e($file) ?>"><?= $file ?></option>
34 34
                     <?php endforeach ?>
35 35
 				</select>
Please login to merge, or discard this patch.
app/Http/Controllers/StatisticsChartController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1147,7 +1147,7 @@
 block discarded – undo
1147 1147
 				}
1148 1148
 			}
1149 1149
 		}
1150
-		$colors      = [
1150
+		$colors = [
1151 1151
 			'0000FF',
1152 1152
 			'FFA0CB',
1153 1153
 			'9F00FF',
Please login to merge, or discard this patch.
app/Http/Controllers/AdminController.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -745,7 +745,7 @@  discard block
 block discarded – undo
745 745
 	 * @return Response
746 746
 	 */
747 747
 	public function changesLogData(Request $request): Response {
748
-		list($select, , $where, $args1) = $this->changesQuery($request);
748
+		list($select,, $where, $args1) = $this->changesQuery($request);
749 749
 		list($order_by, $limit, $args2) = $this->dataTablesPagination($request);
750 750
 
751 751
 		$rows = Database::prepare(
@@ -819,7 +819,7 @@  discard block
 block discarded – undo
819 819
 	 * @return Response
820 820
 	 */
821 821
 	public function changesLogDownload(Request $request): Response {
822
-		list($select, , $where, $args) = $this->changesQuery($request);
822
+		list($select,, $where, $args) = $this->changesQuery($request);
823 823
 
824 824
 		$rows = Database::prepare($select . $where)->execute($args)->fetchAll();
825 825
 
@@ -970,7 +970,7 @@  discard block
 block discarded – undo
970 970
 		$args  = [];
971 971
 
972 972
 		if ($search !== '') {
973
-			$where           .= " AND (multimedia_file_refn LIKE CONCAT('%', :search1, '%') OR multimedia_file_refn LIKE CONCAT('%', :search2, '%'))";
973
+			$where .= " AND (multimedia_file_refn LIKE CONCAT('%', :search1, '%') OR multimedia_file_refn LIKE CONCAT('%', :search2, '%'))";
974 974
 			$args['search1'] = $search;
975 975
 			$args['search2'] = $search;
976 976
 		}
@@ -1151,7 +1151,7 @@  discard block
 block discarded – undo
1151 1151
 		$data = array_map(function (string $thumbnail) {
1152 1152
 			$original = $this->findOriginalFileFromThumbnail($thumbnail);
1153 1153
 
1154
-			$original_url  = route('unused-media-thumbnail', [
1154
+			$original_url = route('unused-media-thumbnail', [
1155 1155
 				'folder' => dirname($original),
1156 1156
 				'file'   => basename($original),
1157 1157
 				'w'      => 100,
@@ -1691,36 +1691,36 @@  discard block
 block discarded – undo
1691 1691
 		$where = ' WHERE 1';
1692 1692
 		$args  = [];
1693 1693
 		if ($search !== '') {
1694
-			$where            .= " AND (old_gedcom LIKE CONCAT('%', :search_1, '%') OR new_gedcom LIKE CONCAT('%', :search_2, '%'))";
1694
+			$where .= " AND (old_gedcom LIKE CONCAT('%', :search_1, '%') OR new_gedcom LIKE CONCAT('%', :search_2, '%'))";
1695 1695
 			$args['search_1'] = $search;
1696 1696
 			$args['search_2'] = $search;
1697 1697
 		}
1698 1698
 		if ($from !== '') {
1699
-			$where        .= " AND change_time >= :from";
1699
+			$where .= " AND change_time >= :from";
1700 1700
 			$args['from'] = $from;
1701 1701
 		}
1702 1702
 		if ($to !== '') {
1703
-			$where      .= ' AND change_time < TIMESTAMPADD(DAY, 1 , :to)'; // before end of the day
1703
+			$where .= ' AND change_time < TIMESTAMPADD(DAY, 1 , :to)'; // before end of the day
1704 1704
 			$args['to'] = $to;
1705 1705
 		}
1706 1706
 		if ($type !== '') {
1707
-			$where          .= ' AND status = :status';
1707
+			$where .= ' AND status = :status';
1708 1708
 			$args['status'] = $type;
1709 1709
 		}
1710 1710
 		if ($oldged !== '') {
1711
-			$where           .= " AND old_gedcom LIKE CONCAT('%', :old_ged, '%')";
1711
+			$where .= " AND old_gedcom LIKE CONCAT('%', :old_ged, '%')";
1712 1712
 			$args['old_ged'] = $oldged;
1713 1713
 		}
1714 1714
 		if ($newged !== '') {
1715
-			$where           .= " AND new_gedcom LIKE CONCAT('%', :new_ged, '%')";
1715
+			$where .= " AND new_gedcom LIKE CONCAT('%', :new_ged, '%')";
1716 1716
 			$args['new_ged'] = $newged;
1717 1717
 		}
1718 1718
 		if ($xref !== '') {
1719
-			$where        .= " AND xref = :xref";
1719
+			$where .= " AND xref = :xref";
1720 1720
 			$args['xref'] = $xref;
1721 1721
 		}
1722 1722
 		if ($username !== '') {
1723
-			$where        .= " AND user_name LIKE CONCAT('%', :user, '%')";
1723
+			$where .= " AND user_name LIKE CONCAT('%', :user, '%')";
1724 1724
 			$args['user'] = $username;
1725 1725
 		}
1726 1726
 		if ($ged !== '') {
Please login to merge, or discard this patch.
app/Http/Controllers/DescendantsChartController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 
103 103
 		$this->checkModuleIsActive($tree, 'descendancy_chart');
104 104
 
105
-		$xref         = $request->get('xref');
105
+		$xref = $request->get('xref');
106 106
 		$individual = Individual::getInstance($xref, $tree);
107 107
 
108 108
 		$this->checkIndividualAccess($individual);
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 
120 120
 		$descendants = $this->descendants($individual, $generations, []);
121 121
 
122
-		switch($chart_style) {
122
+		switch ($chart_style) {
123 123
 			case self::CHART_STYLE_LIST:
124 124
 			default:
125 125
 				return $this->descendantsList($individual, $generations);
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
 	 * @return Response
311 311
 	 */
312 312
 	private function descendantsFamilies(array $descendants): Response {
313
-		$families  = [];
313
+		$families = [];
314 314
 		foreach ($descendants as $individual) {
315 315
 			foreach ($individual->getChildFamilies() as $family) {
316 316
 				$families[$family->getXref()] = $family;
Please login to merge, or discard this patch.
app/Http/Controllers/LifespansChartController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@
 block discarded – undo
68 68
 		if ($individual !== null) {
69 69
 			$xrefs[] = $addxref;
70 70
 			if ($addfam) {
71
-				$xrefs = array_merge($xrefs,  $this->closeFamily($individual));
71
+				$xrefs = array_merge($xrefs, $this->closeFamily($individual));
72 72
 			}
73 73
 		}
74 74
 
Please login to merge, or discard this patch.
app/Http/Controllers/PedigreeChartController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
 			$html = sprintf('<div id="childarrow"><a href="#" class="menuselect %s"></a><div id="childbox-pedigree">', $this->arrows->menu);
367 367
 
368 368
 			foreach ($families as $family) {
369
-				$html   .= '<span class="name1">' . I18N::translate('Family') . '</span>';
369
+				$html .= '<span class="name1">' . I18N::translate('Family') . '</span>';
370 370
 				$spouse = $family->getSpouse($this->root);
371 371
 				if ($spouse) {
372 372
 					$html .= '<a class="name1" href="' . e(route('pedigree', [
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
 		$html = '';
427 427
 		if ($this->chartHasAncestors) {
428 428
 			if ($this->nodes[$index]['indi'] && $this->nodes[$index]['indi']->getChildFamilies()) {
429
-				$html         .= '<div class="ancestorarrow">';
429
+				$html .= '<div class="ancestorarrow">';
430 430
 				$rootParentId = 1;
431 431
 				if ($index > (int) ($this->treesize / 2) + (int) ($this->treesize / 4)) {
432 432
 					$rootParentId++;
Please login to merge, or discard this patch.
app/Http/Controllers/AccountController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -130,7 +130,7 @@
 block discarded – undo
130 130
 			->setPreference('TIMEZONE', $time_zone)
131 131
 			->setPreference('visibleonline', $visible_online);
132 132
 
133
-		$tree->setUserPreference($user,'rootid', $rootid);
133
+		$tree->setUserPreference($user, 'rootid', $rootid);
134 134
 
135 135
 		// Switch to the new theme now
136 136
 		Session::put('theme_id', $theme);
Please login to merge, or discard this patch.
app/Http/Controllers/AncestorsChartController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 
105 105
 		$this->checkModuleIsActive($tree, 'ancestors_chart');
106 106
 
107
-		$xref         = $request->get('xref');
107
+		$xref = $request->get('xref');
108 108
 		$individual = Individual::getInstance($xref, $tree);
109 109
 
110 110
 		$this->checkIndividualAccess($individual);
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 
123 123
 		$ancestors = $this->sosaStradonitzAncestors($individual, $generations);
124 124
 
125
-		switch($chart_style) {
125
+		switch ($chart_style) {
126 126
 			case self::CHART_STYLE_LIST:
127 127
 			default:
128 128
 				return $this->ancestorsList($individual, $generations);
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 			}
240 240
 		}
241 241
 
242
-		$html =  FunctionsPrintLists::familyTable($families);
242
+		$html = FunctionsPrintLists::familyTable($families);
243 243
 
244 244
 		return new Response($html);
245 245
 	}
Please login to merge, or discard this patch.