Completed
Pull Request — master (#1854)
by Rico
149:06 queued 135:36
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/Module/BatchUpdate/BatchUpdateBasePlugin.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
     public function getOptions(Request $request)
62 62
     {
63
-        $this->chan = (bool)$request->get('chan');
63
+        $this->chan = (bool) $request->get('chan');
64 64
     }
65 65
 
66 66
     /**
Please login to merge, or discard this patch.
app/Module/HtmlBlockModule.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
74 74
         $content = $stats->embedTags($content);
75 75
 
76 76
         if ($show_timestamp === '1') {
77
-            $content .= '<br>' . FunctionsDate::formatTimestamp((int)$this->getBlockSetting($block_id, 'timestamp', WT_TIMESTAMP) + WT_TIMESTAMP_OFFSET);
77
+            $content .= '<br>' . FunctionsDate::formatTimestamp((int) $this->getBlockSetting($block_id, 'timestamp', WT_TIMESTAMP) + WT_TIMESTAMP_OFFSET);
78 78
         }
79 79
 
80 80
         if ($template) {
Please login to merge, or discard this patch.
app/Module/ClippingsCartModule.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
         $this->checkModuleAccess($tree);
162 162
 
163 163
         $privatize_export = $request->get('privatize_export');
164
-        $convert          = (bool)$request->get('convert');
164
+        $convert          = (bool) $request->get('convert');
165 165
 
166 166
         $cart = Session::get('cart', []);
167 167
 
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
 
275 275
         // Create a source, to indicate the source of the data.
276 276
         $filetext .= "0 @WEBTREES@ SOUR\n1 TITL " . WT_BASE_URL . "\n";
277
-        $author   = User::find($tree->getPreference('CONTACT_EMAIL'));
277
+        $author = User::find($tree->getPreference('CONTACT_EMAIL'));
278 278
         if ($author !== null) {
279 279
             $filetext .= '1 AUTH ' . $author->getRealName() . "\n";
280 280
         }
Please login to merge, or discard this patch.
app/Module/SiteMapModule.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -110,8 +110,8 @@  discard block
 block discarded – undo
110 110
     public function postAdminAction(Request $request): RedirectResponse
111 111
     {
112 112
         foreach (Tree::getAll() as $tree) {
113
-            $include_in_sitemap = (bool)$request->get('sitemap' . $tree->getTreeId());
114
-            $tree->setPreference('include_in_sitemap', (string)$include_in_sitemap);
113
+            $include_in_sitemap = (bool) $request->get('sitemap' . $tree->getTreeId());
114
+            $tree->setPreference('include_in_sitemap', (string) $include_in_sitemap);
115 115
         }
116 116
 
117 117
         FlashMessages::addMessage(I18N::translate('The preferences for the module ā€œ%sā€ have been updated.', $this->getTitle()), 'success');
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
      */
127 127
     public function getIndexAction(Request $request): Response
128 128
     {
129
-        $timestamp = (int)$this->getPreference('sitemap.timestamp');
129
+        $timestamp = (int) $this->getPreference('sitemap.timestamp');
130 130
 
131 131
         if ($timestamp > WT_TIMESTAMP - self::CACHE_LIFE) {
132 132
             $content = $this->getPreference('sitemap.xml');
@@ -183,12 +183,12 @@  discard block
 block discarded – undo
183 183
             throw new NotFoundHttpException('Bad sitemap file');
184 184
         }
185 185
 
186
-        $timestamp = (int)$this->getPreference('sitemap-' . $file . '.timestamp');
186
+        $timestamp = (int) $this->getPreference('sitemap-' . $file . '.timestamp');
187 187
 
188 188
         if ($timestamp > WT_TIMESTAMP - self::CACHE_LIFE) {
189 189
             $content = $this->getPreference('sitemap-' . $file . '.xml');
190 190
         } else {
191
-            $tree = Tree::findById((int)$match[1]);
191
+            $tree = Tree::findById((int) $match[1]);
192 192
 
193 193
             if ($tree === null) {
194 194
                 throw new NotFoundHttpException('No such tree');
Please login to merge, or discard this patch.