Completed
Pull Request — master (#1904)
by Rico
09:54
created
resources/views/admin/media.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@
 block discarded – undo
77 77
 <br>
78 78
 <br>
79 79
 
80
-<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 ])) ?>">
80
+<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])) ?>">
81 81
 	<thead>
82 82
 		<tr>
83 83
 			<th><?= I18N::translate('Media file') ?></th>
Please login to merge, or discard this patch.
resources/views/admin/trees-import.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 							<select name="tree_name" class="form-control" id="import-server-file">
47 47
 								<option value=""></option>
48 48
 								<?php foreach ($gedcom_files as $gedcom_file): ?>
49
-									<option value="<?= e($gedcom_file) ?>" <?= $gedcom_file === $default_gedcom_file? 'selected' : '' ?>>
49
+									<option value="<?= e($gedcom_file) ?>" <?= $gedcom_file === $default_gedcom_file ? 'selected' : '' ?>>
50 50
 										<?= e($gedcom_file) ?>
51 51
 									</option>
52 52
 								<?php endforeach ?>
Please login to merge, or discard this patch.
resources/views/lists/notes-table.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
 $count_media       = Database::prepare(
15 15
 	"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"
16 16
 )->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc();
17
-$count_sources       = Database::prepare(
17
+$count_sources = Database::prepare(
18 18
 	"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"
19 19
 )->execute(['tree_id' => $tree->getTreeId()])->fetchAssoc();
20 20
 ?>
Please login to merge, or discard this patch.
resources/views/lists/chart-by-decade.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
 }
25 25
 $chart_url .= '|1:||' . rawurlencode(I18N::percentage($vmax / $count)); // y axis
26 26
 $chart_url .= '|2:||';
27
-$step      = $vmax;
27
+$step = $vmax;
28 28
 for ($d = $vmax; $d > 0; $d--) {
29 29
 	if ($vmax < ($d * 10 + 1) && ($vmax % $d) == 0) {
30 30
 		$step = $d;
Please login to merge, or discard this patch.
resources/views/edit/edit-fact.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
 						'level'          => 2,
40 40
 						'full_citations' => $tree->getPreference('FULL_SOURCES'),
41 41
 						'tree'           => $tree,
42
-					]);				}
42
+					]); }
43 43
 				if ($level1type !== 'OBJE') {
44 44
 					if ($tree->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($tree)) {
45 45
 						echo view('cards/add-media-object', [
Please login to merge, or discard this patch.
app/FactLocation.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -165,7 +165,7 @@
 block discarded – undo
165 165
             $f1     = preg_match("/\d LATI (.*)/", $gedcom, $match1);
166 166
             $f2     = preg_match("/\d LONG (.*)/", $gedcom, $match2);
167 167
             if ($f1 && $f2) {
168
-                $coords = (object)[
168
+                $coords = (object) [
169 169
                     'latitude'  => $match1[1],
170 170
                     'longitude' => $match2[1],
171 171
                 ];
Please login to merge, or discard this patch.
app/Location.php 1 patch
Spacing   +6 added lines, -8 removed lines patch added patch discarded remove patch
@@ -47,9 +47,9 @@  discard block
 block discarded – undo
47 47
         if ($tmp !== null) {
48 48
             $this->record = $tmp;
49 49
         } elseif (!empty($record)) {
50
-            $this->record = (object)$record;
50
+            $this->record = (object) $record;
51 51
         } else {
52
-            $this->record = (object)[
52
+            $this->record = (object) [
53 53
                 'fqpn'         => '',
54 54
                 'pl_id'        => 0,
55 55
                 'pl_parent_id' => 0,
@@ -81,12 +81,11 @@  discard block
 block discarded – undo
81 81
         switch ($format) {
82 82
             case 'signed':
83 83
                 return $this->record->pl_lati ?
84
-                    (float)strtr($this->record->pl_lati, [
84
+                    (float) strtr($this->record->pl_lati, [
85 85
                         'N' => '',
86 86
                         'S' => '-',
87 87
                         ',' => '.',
88
-                    ]) :
89
-                    $this->record->pl_lati;
88
+                    ]) : $this->record->pl_lati;
90 89
             default:
91 90
                 return $this->record->pl_lati;
92 91
         }
@@ -102,12 +101,11 @@  discard block
 block discarded – undo
102 101
         switch ($format) {
103 102
             case 'signed':
104 103
                 return $this->record->pl_long ?
105
-                    (float)strtr($this->record->pl_long, [
104
+                    (float) strtr($this->record->pl_long, [
106 105
                         'E' => '',
107 106
                         'W' => '-',
108 107
                         ',' => '.',
109
-                    ]) :
110
-                    $this->record->pl_long;
108
+                    ]) : $this->record->pl_long;
111 109
             default:
112 110
                 return $this->record->pl_long;
113 111
         }
Please login to merge, or discard this patch.
app/Http/Controllers/Auth/VerifyEmailController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@
 block discarded – undo
60 60
 
61 61
             // Create a dummy user, so we can send messages from the tree.
62 62
             $sender = new User(
63
-                (object)[
63
+                (object) [
64 64
                     'user_id'   => null,
65 65
                     'user_name' => '',
66 66
                     'real_name' => $tree->getTitle(),
Please login to merge, or discard this patch.
app/Http/Controllers/AncestorsChartController.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -64,12 +64,12 @@  discard block
 block discarded – undo
64 64
         $this->checkIndividualAccess($individual);
65 65
 
66 66
         $minimum_generations = 2;
67
-        $maximum_generations = (int)$tree->getPreference('MAX_PEDIGREE_GENERATIONS', self::DEFAULT_MAXIMUM_GENERATIONS);
68
-        $default_generations = (int)$tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS', self::DEFAULT_GENERATIONS);
67
+        $maximum_generations = (int) $tree->getPreference('MAX_PEDIGREE_GENERATIONS', self::DEFAULT_MAXIMUM_GENERATIONS);
68
+        $default_generations = (int) $tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS', self::DEFAULT_GENERATIONS);
69 69
 
70
-        $show_cousins = (bool)$request->get('show_cousins', self::DEFAULT_COUSINS);
71
-        $chart_style  = (int)$request->get('chart_style', self::DEFAULT_STYLE);
72
-        $generations  = (int)$request->get('generations', $default_generations);
70
+        $show_cousins = (bool) $request->get('show_cousins', self::DEFAULT_COUSINS);
71
+        $chart_style  = (int) $request->get('chart_style', self::DEFAULT_STYLE);
72
+        $generations  = (int) $request->get('generations', $default_generations);
73 73
 
74 74
         $generations = min($generations, $maximum_generations);
75 75
         $generations = max($generations, $minimum_generations);
@@ -112,12 +112,12 @@  discard block
 block discarded – undo
112 112
         $this->checkIndividualAccess($individual);
113 113
 
114 114
         $minimum_generations = 2;
115
-        $maximum_generations = (int)$tree->getPreference('MAX_PEDIGREE_GENERATIONS', self::DEFAULT_MAXIMUM_GENERATIONS);
116
-        $default_generations = (int)$tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS', self::DEFAULT_GENERATIONS);
115
+        $maximum_generations = (int) $tree->getPreference('MAX_PEDIGREE_GENERATIONS', self::DEFAULT_MAXIMUM_GENERATIONS);
116
+        $default_generations = (int) $tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS', self::DEFAULT_GENERATIONS);
117 117
 
118
-        $show_cousins = (bool)$request->get('show_cousins', self::DEFAULT_COUSINS);
119
-        $chart_style  = (int)$request->get('chart_style', self::DEFAULT_STYLE);
120
-        $generations  = (int)$request->get('generations', $default_generations);
118
+        $show_cousins = (bool) $request->get('show_cousins', self::DEFAULT_COUSINS);
119
+        $chart_style  = (int) $request->get('chart_style', self::DEFAULT_STYLE);
120
+        $generations  = (int) $request->get('generations', $default_generations);
121 121
 
122 122
         $generations = min($generations, $maximum_generations);
123 123
         $generations = max($generations, $minimum_generations);
Please login to merge, or discard this patch.