Completed
Pull Request — master (#1461)
by Rico
07:40
created
editnews.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
 
48 48
 switch ($action) {
49 49
 case 'delete':
50
-	Database::prepare("DELETE FROM `##news` WHERE news_id = :news_id")->execute(['news_id' => $news_id,]);
50
+	Database::prepare("DELETE FROM `##news` WHERE news_id = :news_id")->execute(['news_id' => $news_id, ]);
51 51
 
52 52
 	header('Location: index.php?ctype=' . $ctype . '&ged=' . $controller->tree()->getNameUrl());
53 53
 
Please login to merge, or discard this patch.
app/Select2.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -166,7 +166,7 @@
 block discarded – undo
166 166
 
167 167
 		$flag_files = [];
168 168
 		foreach ($it as $file) {
169
-			$file_path = substr($file->getPathname() , strlen($directory));
169
+			$file_path = substr($file->getPathname(), strlen($directory));
170 170
 			if ($file->getExtension() === 'png' && stripos($file_path, $query) !== false) {
171 171
 				if ($offset > 0) {
172 172
 					// Skip results
Please login to merge, or discard this patch.
app/Module/GoogleMapsModule.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -2247,7 +2247,7 @@  discard block
 block discarded – undo
2247 2247
 				'place_id' => $place_id,
2248 2248
 			]);
2249 2249
 		} catch (\Exception $ex) {
2250
-			FlashMessages::addMessage(I18N::translate('Location not removed: this location contains sub-locations'),'danger');
2250
+			FlashMessages::addMessage(I18N::translate('Location not removed: this location contains sub-locations'), 'danger');
2251 2251
 		}
2252 2252
 
2253 2253
 		header('Location: module.php?mod=googlemap&mod_action=admin_places&parent_id=' . $parent_id . '&inactive=' . $inactive);
@@ -3295,7 +3295,7 @@  discard block
 block discarded – undo
3295 3295
 								<?php endif ?>
3296 3296
 						</td>
3297 3297
 						<td>
3298
-							<?= FontAwesome::linkIcon('edit',  I18N::translate('Edit'), ['href' => 'module.php?mod=googlemap&mod_action=admin_place_edit&action=update&place_id=' . $place['place_id'] . '&parent_id=' . $place['parent_id'], 'class' => 'btn btn-primary']) ?>
3298
+							<?= FontAwesome::linkIcon('edit', I18N::translate('Edit'), ['href' => 'module.php?mod=googlemap&mod_action=admin_place_edit&action=update&place_id=' . $place['place_id'] . '&parent_id=' . $place['parent_id'], 'class' => 'btn btn-primary']) ?>
3299 3299
 						</td>
3300 3300
 						<td>
3301 3301
 							<?php if ($noRows == 0): ?>
@@ -3304,7 +3304,7 @@  discard block
 block discarded – undo
3304 3304
 									<input type="hidden" name="place_id" value="<?= $place['place_id'] ?>">
3305 3305
 									<input type="hidden" name="inactive" value="<?= $inactive ?>">
3306 3306
 									<button type="submit" class="btn btn-danger">
3307
-										<?= FontAwesome::semanticIcon('delete',  I18N::translate('Delete')) ?>
3307
+										<?= FontAwesome::semanticIcon('delete', I18N::translate('Delete')) ?>
3308 3308
 									</button>
3309 3309
 								</form>
3310 3310
 							<?php else: ?>
Please login to merge, or discard this patch.
app/Functions/FunctionsCharts.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 		$hfam = $husb->getPrimaryChildFamily();
113 113
 		if ($hfam) {
114 114
 			// remove the|| test for $sosa
115
-			echo '<td rowspan="2"><img src="' . Theme::theme()->parameter('image-hline') . '"></td><td rowspan="2"><img  src="' . Theme::theme()->parameter('image-vline') . '" width="3" height="' . ($pbheight - 14 ) . '"></td>';
115
+			echo '<td rowspan="2"><img src="' . Theme::theme()->parameter('image-hline') . '"></td><td rowspan="2"><img  src="' . Theme::theme()->parameter('image-vline') . '" width="3" height="' . ($pbheight - 14) . '"></td>';
116 116
 			echo '<td><img class="linea1 lined1"  src="' . Theme::theme()->parameter('image-hline') . '"></td><td>';
117 117
 			// husband’s father
118 118
 			if ($hfam && $hfam->getHusband()) {
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 		// wife’s parents
203 203
 		$hfam = $wife->getPrimaryChildFamily();
204 204
 		if ($hfam) {
205
-			echo '<td rowspan="2"><img src="' . Theme::theme()->parameter('image-hline') . '"></td><td rowspan="2"><img src="' . Theme::theme()->parameter('image-vline') . '" width="3" height="' . ($pbheight - 14 ) . '"></td>';
205
+			echo '<td rowspan="2"><img src="' . Theme::theme()->parameter('image-hline') . '"></td><td rowspan="2"><img src="' . Theme::theme()->parameter('image-vline') . '" width="3" height="' . ($pbheight - 14) . '"></td>';
206 206
 			echo '<td><img class="linea3 lined3" src="' . Theme::theme()->parameter('image-hline') . '"></td><td>';
207 207
 			// wife’s father
208 208
 			if ($hfam && $hfam->getHusband()) {
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
 							}
346 346
 
347 347
 							if ($f == $maxfam) {
348
-								echo '<img height="' . ((($bheight / 2)) ) . 'px"';
348
+								echo '<img height="' . ((($bheight / 2))) . 'px"';
349 349
 							} else {
350 350
 								echo '<img height="' . $pbheight . 'px"';
351 351
 							}
Please login to merge, or discard this patch.
mediafirewall.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
 	// Caution - $media_dir may contain relative paths: ../../
69 69
 	$source_dir = new Filesystem(new Local(WT_DATA_DIR . $media_dir));
70 70
 	$cache_dir  = new Filesystem(new Local(WT_DATA_DIR . 'thumbnail-cache/' . md5($media_dir)));
71
-	$assets_dir = new Filesystem(new Local( 'assets'));
71
+	$assets_dir = new Filesystem(new Local('assets'));
72 72
 
73 73
 	$server = ServerFactory::create([
74 74
 		'driver'     => $driver,
Please login to merge, or discard this patch.
app/Theme/AbstractTheme.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -840,7 +840,7 @@  discard block
 block discarded – undo
840 840
 			$icons = '<div class="icons">' .
841 841
 				'<span class="iconz icon-zoomin" title="' . I18N::translate('Zoom in/out on this box.') . '"></span>' .
842 842
 				'<div class="itr"><i class="icon-pedigree"></i><div class="popup">' .
843
-				'<ul class="' . $personBoxClass . '">' . implode('', array_map(function(Menu $menu) {
843
+				'<ul class="' . $personBoxClass . '">' . implode('', array_map(function (Menu $menu) {
844 844
 					return $menu->bootstrap4();
845 845
 				}, $this->individualBoxMenu($individual))) . '</ul>' .
846 846
 				'</div>' .
@@ -892,7 +892,7 @@  discard block
 block discarded – undo
892 892
 			$icons = '<div class="icons">' .
893 893
 				'<span class="iconz icon-zoomin" title="' . I18N::translate('Zoom in/out on this box.') . '"></span>' .
894 894
 				'<div class="itr"><i class="icon-pedigree"></i><div class="popup">' .
895
-				'<ul class="' . $personBoxClass . '">' . implode('', array_map(function(Menu $menu) {
895
+				'<ul class="' . $personBoxClass . '">' . implode('', array_map(function (Menu $menu) {
896 896
 					return $menu->bootstrap4();
897 897
 				}, $this->individualBoxMenu($individual))) . '</ul>' .
898 898
 				'</div>' .
Please login to merge, or discard this patch.
app/Controller/IndividualController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 	public function getTabs() {
98 98
 		$active_tabs = Module::getActiveTabs($this->record->getTree());
99 99
 
100
-		return array_filter($active_tabs, function(ModuleTabInterface $tab) {
100
+		return array_filter($active_tabs, function (ModuleTabInterface $tab) {
101 101
 			return $tab->hasTabContent();
102 102
 		});
103 103
 	}
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
 		}
248 248
 
249 249
 		if ($individual->canEdit() && !$fact->isPendingDeletion()) {
250
-			$edit_links = FontAwesome::linkIcon('edit', I18N::translate('Edit the gender'), ['class' => 'btn btn-link', 'href' => 'edit_interface.php?action=edit&xref=' . $individual->getXref() . '&fact_id=' . $fact->getFactId() . '&ged=' . $individual->getTree()->getNameHtml() ]);
250
+			$edit_links = FontAwesome::linkIcon('edit', I18N::translate('Edit the gender'), ['class' => 'btn btn-link', 'href' => 'edit_interface.php?action=edit&xref=' . $individual->getXref() . '&fact_id=' . $fact->getFactId() . '&ged=' . $individual->getTree()->getNameHtml()]);
251 251
 		} else {
252 252
 			$edit_links = '';
253 253
 		}
Please login to merge, or discard this patch.
app/Family.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
 			// Check the script used by each name, so we can match cyrillic with cyrillic, greek with greek, etc.
331 331
 			$husb_names = [];
332 332
 			if ($this->husb) {
333
-				$husb_names = array_filter($this->husb->getAllNames(), function(array $x) {
333
+				$husb_names = array_filter($this->husb->getAllNames(), function (array $x) {
334 334
 					return $x['type'] !== '_MARNM';
335 335
 				} );
336 336
 			}
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
 
349 349
 			$wife_names = [];
350 350
 			if ($this->wife) {
351
-				$wife_names = array_filter($this->wife->getAllNames(), function(array $x) {
351
+				$wife_names = array_filter($this->wife->getAllNames(), function (array $x) {
352 352
 					return $x['type'] !== '_MARNM';
353 353
 				} );
354 354
 			}
Please login to merge, or discard this patch.
app/User.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 			" ORDER BY real_name"
223 223
 		)->fetchAll();
224 224
 
225
-		return array_map(function($row) {
225
+		return array_map(function ($row) {
226 226
 			return new static($row);
227 227
 		}, $rows);
228 228
 	}
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
 			" ORDER BY real_name"
242 242
 		)->fetchAll();
243 243
 
244
-		return array_map(function($row) {
244
+		return array_map(function ($row) {
245 245
 			return new static($row);
246 246
 		}, $rows);
247 247
 	}
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
 			" ORDER BY real_name"
282 282
 		)->fetchAll();
283 283
 
284
-		return array_map(function($row) {
284
+		return array_map(function ($row) {
285 285
 			return new static($row);
286 286
 		}, $rows);
287 287
 	}
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
 			" ORDER BY real_name"
301 301
 		)->fetchAll();
302 302
 
303
-		return array_map(function($row) {
303
+		return array_map(function ($row) {
304 304
 			return new static($row);
305 305
 		}, $rows);
306 306
 	}
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
 			" ORDER BY real_name"
319 319
 		)->fetchAll();
320 320
 
321
-		return array_map(function($row) {
321
+		return array_map(function ($row) {
322 322
 			return new static($row);
323 323
 		}, $rows);
324 324
 	}
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
 			" ORDER BY real_name"
337 337
 		)->fetchAll();
338 338
 
339
-		return array_map(function($row) {
339
+		return array_map(function ($row) {
340 340
 			return new static($row);
341 341
 		}, $rows);
342 342
 	}
@@ -353,7 +353,7 @@  discard block
 block discarded – undo
353 353
 			" JOIN `##session` USING (user_id)"
354 354
 		)->fetchAll();
355 355
 
356
-		return array_map(function($row) {
356
+		return array_map(function ($row) {
357 357
 			return new static($row);
358 358
 		}, $rows);
359 359
 	}
Please login to merge, or discard this patch.