Completed
Pull Request — master (#1464)
by Rico
07:53
created
app/Theme/AbstractTheme.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -101,9 +101,9 @@
 block discarded – undo
101 101
 		'info'    => 'fa fa-info-circle',
102 102
 		'warning' => 'fa fa-exclamation-circle',
103 103
 
104
-	  // Icons for file types
105
-	  'mime-application-pdf' => '',
106
-	  'mime-text-html'       => '',
104
+		// Icons for file types
105
+		'mime-application-pdf' => '',
106
+		'mime-text-html'       => '',
107 107
 
108 108
 		// Other icons
109 109
 		'mail'   => 'fa fa-envelope-o',
Please login to merge, or discard this 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/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.
message.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -123,7 +123,8 @@  discard block
 block discarded – undo
123 123
 				<div class="form-control"><?= Html::escape(Auth::user()->getRealName()) ?></div>
124 124
 			</div>
125 125
 		</div>
126
-	<?php else: ?>
126
+	<?php else {
127
+	: ?>
127 128
 		<div class="form-group row">
128 129
 			<label class="col-sm-3 col-form-label" for="from-name">
129 130
 				<?= I18N::translate('Your name') ?>
@@ -181,6 +182,7 @@  discard block
 block discarded – undo
181 182
 function recipients($to) {
182 183
 	if ($to === 'all') {
183 184
 		$recipients = User::all();
185
+}
184 186
 	} elseif ($to === 'last_6mo') {
185 187
 		$recipients = array_filter(User::all(), function(User $user) {
186 188
 			return $user->getPreference('sessiontime') > 0 && WT_TIMESTAMP - $user->getPreference('sessiontime') > 60 * 60 * 24 * 30 * 6;
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 $controller->restrictAccess(!in_array($to, ['all', 'never_logged', 'last_6mo']) || Auth::isAdmin());
96 96
 $controller->pageHeader();
97 97
 
98
-$to_names = implode(I18N::$list_separator, array_map(function(User $user) {
98
+$to_names = implode(I18N::$list_separator, array_map(function (User $user) {
99 99
 	return $user->getRealName();
100 100
 }, recipients($to)));
101 101
 
@@ -184,11 +184,11 @@  discard block
 block discarded – undo
184 184
 	if ($to === 'all') {
185 185
 		$recipients = User::all();
186 186
 	} elseif ($to === 'last_6mo') {
187
-		$recipients = array_filter(User::all(), function(User $user) {
187
+		$recipients = array_filter(User::all(), function (User $user) {
188 188
 			return $user->getPreference('sessiontime') > 0 && WT_TIMESTAMP - $user->getPreference('sessiontime') > 60 * 60 * 24 * 30 * 6;
189 189
 		});
190 190
 	} elseif ($to === 'never_logged') {
191
-		$recipients = array_filter(User::all(), function(User $user) {
191
+		$recipients = array_filter(User::all(), function (User $user) {
192 192
 			return $user->getPreference('verified_by_admin') && $user->getPreference('reg_timestamp') > $user->getPreference('sessiontime');
193 193
 		});
194 194
 	} else {
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/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.
app/Controller/BaseController.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -17,9 +17,7 @@
 block discarded – undo
17 17
 
18 18
 use Fisharebest\Webtrees\Html;
19 19
 use Fisharebest\Webtrees\Tree;
20
-use Fisharebest\Webtrees\View;
21 20
 use Symfony\Component\HttpFoundation\RedirectResponse;
22
-use Symfony\Component\HttpFoundation\Response;
23 21
 
24 22
 /**
25 23
  * Base controller for all other controllers
Please login to merge, or discard this patch.
app/Controller/SetupController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -392,7 +392,7 @@
 block discarded – undo
392 392
 
393 393
 		foreach ($extensions as $extension => $features) {
394 394
 			if (!extension_loaded($extension)) {
395
-				$warnings[] =  I18N::translate('PHP extension “%1$s” is disabled. Without it, the following features will not work: %2$s. Please ask your server’s administrator to enable it.', $extension, $features);
395
+				$warnings[] = I18N::translate('PHP extension “%1$s” is disabled. Without it, the following features will not work: %2$s. Please ask your server’s administrator to enable it.', $extension, $features);
396 396
 			}
397 397
 		}
398 398
 
Please login to merge, or discard this patch.