Completed
Branch develop (bfa16a)
by Greg
10:11
created
app/Functions/FunctionsCharts.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -297,9 +297,9 @@
 block discarded – undo
297 297
 
298 298
 		if ($sosa == 0 && Auth::isEditor($family->getTree())) {
299 299
 			echo '<br>';
300
-			echo '<a href="edit_interface.php?action=add_child_to_family&amp;ged=' . $family->getTree()->getNameHtml() .'&amp;xref=' . $family->getXref() . '&amp;gender=U">' . I18N::translate('Add a child to this family') . '</a>';
301
-			echo ' <a class="icon-sex_m_15x15" href="edit_interface.php?action=add_child_to_family&amp;ged=' . $family->getTree()->getNameHtml() .'&amp;xref=' . $family->getXref() . '&amp;gender=M" title="', I18N::translate('son'), '"></a>';
302
-			echo ' <a class="icon-sex_f_15x15" href="edit_interface.php?action=add_child_to_family&amp;ged=' . $family->getTree()->getNameHtml() .'&amp;xref=' . $family->getXref() . '&amp;gender=F" title="', I18N::translate('daughter'), '"></a>';
300
+			echo '<a href="edit_interface.php?action=add_child_to_family&amp;ged=' . $family->getTree()->getNameHtml() . '&amp;xref=' . $family->getXref() . '&amp;gender=U">' . I18N::translate('Add a child to this family') . '</a>';
301
+			echo ' <a class="icon-sex_m_15x15" href="edit_interface.php?action=add_child_to_family&amp;ged=' . $family->getTree()->getNameHtml() . '&amp;xref=' . $family->getXref() . '&amp;gender=M" title="', I18N::translate('son'), '"></a>';
302
+			echo ' <a class="icon-sex_f_15x15" href="edit_interface.php?action=add_child_to_family&amp;ged=' . $family->getTree()->getNameHtml() . '&amp;xref=' . $family->getXref() . '&amp;gender=F" title="', I18N::translate('daughter'), '"></a>';
303 303
 			echo '<br><br>';
304 304
 		}
305 305
 		echo '</td>';
Please login to merge, or discard this patch.
app/Controller/FamilyController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -77,11 +77,11 @@
 block discarded – undo
77 77
 			$menu->addSubmenu(new Menu(I18N::translate('Change family members'), 'edit_interface.php?action=changefamily&ged=' . $this->record->getTree()->getNameHtml() . '&amp;xref=' . $this->record->getXref(), 'menu-fam-change'));
78 78
 
79 79
 			// edit_fam / add child
80
-			$menu->addSubmenu(new Menu(I18N::translate('Add a child to this family'), 'edit_interface.php?action=add_child_to_family&amp;ged=' . $this->record->getTree()->getNameHtml() .'&amp;xref=' . $this->record->getXref() . '&amp;gender=U', 'menu-fam-addchil'));
80
+			$menu->addSubmenu(new Menu(I18N::translate('Add a child to this family'), 'edit_interface.php?action=add_child_to_family&amp;ged=' . $this->record->getTree()->getNameHtml() . '&amp;xref=' . $this->record->getXref() . '&amp;gender=U', 'menu-fam-addchil'));
81 81
 
82 82
 			// edit_fam / reorder_children
83 83
 			if ($this->record->getNumberOfChildren() > 1) {
84
-				$menu->addSubmenu(new Menu(I18N::translate('Re-order children'), 'edit_interface.php?action=reorder_children&amp;ged=' . $this->record->getTree()->getNameHtml() .'&amp;xref=' . $this->record->getXref(), 'menu-fam-orderchil'));
84
+				$menu->addSubmenu(new Menu(I18N::translate('Re-order children'), 'edit_interface.php?action=reorder_children&amp;ged=' . $this->record->getTree()->getNameHtml() . '&amp;xref=' . $this->record->getXref(), 'menu-fam-orderchil'));
85 85
 			}
86 86
 
87 87
 			// delete
Please login to merge, or discard this patch.
app/Functions/FunctionsPrintLists.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1080,7 +1080,7 @@  discard block
 block discarded – undo
1080 1080
 			"SELECT CONCAT(l_to, '@', l_file), COUNT(*) FROM `##sources` JOIN `##link` ON l_from = s_id AND l_file = s_file AND l_type = 'NOTE' GROUP BY l_to, l_file"
1081 1081
 		)->fetchAssoc();
1082 1082
 
1083
-		$html     = '';
1083
+		$html = '';
1084 1084
 		$html .= '<table ' . Datatables::noteTableAttributes() . '><thead><tr>';
1085 1085
 		$html .= '<th>' . I18N::translate('Title') . '</th>';
1086 1086
 		$html .= '<th>' . I18N::translate('Individuals') . '</th>';
@@ -1146,7 +1146,7 @@  discard block
 block discarded – undo
1146 1146
 		)->fetchAssoc();
1147 1147
 
1148 1148
 		$html = '';
1149
-		$html .= '<table ' . Datatables::repositoryTableAttributes() . '><thead><tr>';		$html .= '<th>' . I18N::translate('Repository name') . '</th>';
1149
+		$html .= '<table ' . Datatables::repositoryTableAttributes() . '><thead><tr>'; $html .= '<th>' . I18N::translate('Repository name') . '</th>';
1150 1150
 		$html .= '<th>' . I18N::translate('Sources') . '</th>';
1151 1151
 		$html .= '<th>' . I18N::translate('Last change') . '</th>';
1152 1152
 		$html .= '<th>' . I18N::translate('Delete') . '</th>';
@@ -1573,7 +1573,7 @@  discard block
 block discarded – undo
1573 1573
 					if ($endjd === $startjd) {
1574 1574
 						$html .= I18N::translate('No events exist for tomorrow.');
1575 1575
 					} else {
1576
-						$html .=  /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
1576
+						$html .= /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
1577 1577
 					}
1578 1578
 				} else {
1579 1579
 					if ($endjd === $startjd) {
Please login to merge, or discard this patch.
admin_trees_config.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1505,7 +1505,7 @@
 block discarded – undo
1505 1505
 						'0' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'first'),
1506 1506
 						'1' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'last'),
1507 1507
 					], $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES_SUFFIX', ['name' => 'SHOW_PEDIGREE_PLACES_SUFFIX'])),
1508
-					Bootstrap4::select(FunctionsEdit::numericOptions(range(1,9)), $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES'), ['name' => 'SHOW_PEDIGREE_PLACES'])
1508
+					Bootstrap4::select(FunctionsEdit::numericOptions(range(1, 9)), $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES'), ['name' => 'SHOW_PEDIGREE_PLACES'])
1509 1509
 				) ?>
1510 1510
 				<p class="small text-muted">
1511 1511
 					<?= /* I18N: Help text for the “Abbreviate place names” configuration setting */ I18N::translate('Place names are frequently too long to fit on charts, lists, etc. They can be abbreviated by showing just the first few parts of the name, such as <i>village, county</i>, or the last few part of it, such as <i>region, country</i>.') ?>
Please login to merge, or discard this patch.
app/Controller/IndividualController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 	public function getTabs() {
97 97
 		$active_tabs = Module::getActiveTabs($this->record->getTree());
98 98
 
99
-		return array_filter($active_tabs, function(ModuleTabInterface $tab) { return $tab->hasTabContent(); });
99
+		return array_filter($active_tabs, function (ModuleTabInterface $tab) { return $tab->hasTabContent(); });
100 100
 	}
101 101
 
102 102
 	/**
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 
142 142
 		if ($n === 0) {
143 143
 			$content_class = 'collapse show';
144
-			$aria  = 'true';
144
+			$aria = 'true';
145 145
 		}
146 146
 		if ($fact->isPendingDeletion()) {
147 147
 			$container_class .= ' old';
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
 		}
244 244
 
245 245
 		if ($individual->canEdit() && !$fact->isPendingDeletion()) {
246
-			$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() ]);
246
+			$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()]);
247 247
 
248 248
 		} else {
249 249
 			$edit_links = '';
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
 		<div class="' . $container_class . '">
254 254
 			<div class="card-header" role="tab" id="name-header-add">
255 255
 				<div class="card-title mb-0">
256
-					<b>' . I18N::translate('Gender') . '</b> ' .  $sex . $edit_links . '
256
+					<b>' . I18N::translate('Gender') . '</b> ' . $sex . $edit_links . '
257 257
 				</div>
258 258
 			</div>
259 259
 		</div>';
Please login to merge, or discard this patch.
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: ' . WT_BASE_URL . 'index.php?ctype=' . $ctype . '&ged=' . $controller->tree()->getNameUrl());
53 53
 
Please login to merge, or discard this patch.
action.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 
96 96
 	// Create a media object, and return parameters needed by Select2
97 97
 	header('Content-type: application/json');
98
-	$filename   = 'eek.jpg';
98
+	$filename = 'eek.jpg';
99 99
 	$auto   = Filter::post('auto');
100 100
 	$folder = Filter::post('folder');
101 101
 	$note   = Filter::post('note');
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 	}
146 146
 
147 147
 
148
-	$gedcom = "0 @new@ OBJE\n1 FILE " . $folder . $file . "\n2 FORM " .  $format;
148
+	$gedcom = "0 @new@ OBJE\n1 FILE " . $folder . $file . "\n2 FORM " . $format;
149 149
 	if ($type !== '') {
150 150
 		$gedcom .= "\n3 TYPE " . $type;
151 151
 	}
Please login to merge, or discard this patch.
index_edit.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 			}
128 128
 		}
129 129
 	}
130
-	if ($user_id < 0 || $gedcom_id < 0 ) {
130
+	if ($user_id < 0 || $gedcom_id < 0) {
131 131
 		header('Location: ' . WT_BASE_URL . 'admin.php');
132 132
 	} elseif ($user_id > 0) {
133 133
 		header('Location: ' . WT_BASE_URL . 'index.php?ctype=user&ged=' . $WT_TREE->getNameUrl());
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
371 371
 						<?= FontAwesome::decorativeIcon('save') ?>
372 372
 						<?= I18N::translate('save') ?>
373 373
 					</button>
374
-					<?php if ($user_id < 0 || $gedcom_id < 0 ): ?>
374
+					<?php if ($user_id < 0 || $gedcom_id < 0): ?>
375 375
 						<a class="btn btn-secondary" href="admin.php">
376 376
 					<?php elseif ($user_id > 0): ?>
377 377
 						<a class="btn btn-secondary" href="index.php?ctype=user&amp;ged=<?= $WT_TREE->getNameHtml() ?>">
Please login to merge, or discard this patch.
app/Module/GoogleMapsModule.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -2235,7 +2235,7 @@  discard block
 block discarded – undo
2235 2235
 				'place_id' => $place_id,
2236 2236
 			]);
2237 2237
 		} catch (\Exception $ex) {
2238
-			FlashMessages::addMessage(I18N::translate('Location not removed: this location contains sub-locations'),'danger');
2238
+			FlashMessages::addMessage(I18N::translate('Location not removed: this location contains sub-locations'), 'danger');
2239 2239
 		}
2240 2240
 
2241 2241
 		header('Location: ' . WT_BASE_URL . 'module.php?mod=googlemap&mod_action=admin_places&parent_id=' . $parent_id . '&inactive=' . $inactive);
@@ -2582,7 +2582,7 @@  discard block
 block discarded – undo
2582 2582
 			[0 => I18N::translate('Geographic data')] +
2583 2583
 			$this->placeIdToHierarchy($place_id === 0 ? $parent_id : $place_id);
2584 2584
 		foreach ($hierarchy as $id => $name) {
2585
-				$breadcrumbs += ['module.php?mod=googlemap&mod_action=admin_places&parent_id=' . $id .'&inactive=' . $inactive => Filter::escapeHtml($name)];
2585
+				$breadcrumbs += ['module.php?mod=googlemap&mod_action=admin_places&parent_id=' . $id . '&inactive=' . $inactive => Filter::escapeHtml($name)];
2586 2586
 		}
2587 2587
 		echo Bootstrap4::breadcrumbs($breadcrumbs, $place_id === 0 ? I18N::translate('Add') : I18N::translate('Edit'));
2588 2588
 
@@ -3088,7 +3088,7 @@  discard block
 block discarded – undo
3088 3088
 			[0 => I18N::translate('Geographic data')] +
3089 3089
 			$this->placeIdToHierarchy($parent_id);
3090 3090
 		foreach (array_slice($hierarchy, 0, -1, true) as $id => $name) {
3091
-				$breadcrumbs += ['module.php?mod=googlemap&mod_action=admin_places&parent_id=' . $id .'&inactive=' . $inactive => Filter::escapeHtml($name)];
3091
+				$breadcrumbs += ['module.php?mod=googlemap&mod_action=admin_places&parent_id=' . $id . '&inactive=' . $inactive => Filter::escapeHtml($name)];
3092 3092
 		}
3093 3093
 		echo Bootstrap4::breadcrumbs($breadcrumbs, end($hierarchy));
3094 3094
 
@@ -3280,7 +3280,7 @@  discard block
 block discarded – undo
3280 3280
 								<?php endif ?>
3281 3281
 						</td>
3282 3282
 						<td>
3283
-							<?= 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']) ?>
3283
+							<?= 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']) ?>
3284 3284
 						</td>
3285 3285
 						<td>
3286 3286
 							<?php if ($noRows == 0): ?>
@@ -3289,7 +3289,7 @@  discard block
 block discarded – undo
3289 3289
 									<input type="hidden" name="place_id" value="<?= $place['place_id'] ?>">
3290 3290
 									<input type="hidden" name="inactive" value="<?= $inactive ?>">
3291 3291
 									<button type="submit" class="btn btn-danger">
3292
-										<?= FontAwesome::semanticIcon('delete',  I18N::translate('Delete')) ?>
3292
+										<?= FontAwesome::semanticIcon('delete', I18N::translate('Delete')) ?>
3293 3293
 									</button>
3294 3294
 								</form>
3295 3295
 							<?php else: ?>
Please login to merge, or discard this patch.