Completed
Push — develop ( 0af8fe...beada1 )
by Greg
08:23
created
medialist.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@
 block discarded – undo
109 109
 						</option>
110 110
 					</select>
111 111
 				</td>
112
-				<?php else: ?>
112
+				<?php else : ?>
113 113
 					<td class="descriptionbox wrap"></td>
114 114
 					<td class="optionbox wrap"></td>
115 115
 				<?php endif ?>
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
@@ -148,7 +148,7 @@
 block discarded – undo
148 148
 	public static function createEditLinks($gedrec, GedcomRecord $record) {
149 149
 		return preg_replace(
150 150
 			"/@([^#@\n]+)@/m",
151
-			'<a href="edit_interface.php?action=editraw&amp;ged=' . $record->getTree()->getNameHtml() . '&amp;xref=' . $record->getXref() .'">@\\1@</a>',
151
+			'<a href="edit_interface.php?action=editraw&amp;ged=' . $record->getTree()->getNameHtml() . '&amp;xref=' . $record->getXref() . '">@\\1@</a>',
152 152
 			$gedrec
153 153
 		);
154 154
 	}
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
@@ -1089,7 +1089,7 @@  discard block
 block discarded – undo
1089 1089
 			"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"
1090 1090
 		)->fetchAssoc();
1091 1091
 
1092
-		$html     = '';
1092
+		$html = '';
1093 1093
 		$html .= '<table ' . Datatables::noteTableAttributes() . '><thead><tr>';
1094 1094
 		$html .= '<th>' . I18N::translate('Title') . '</th>';
1095 1095
 		$html .= '<th>' . I18N::translate('Individuals') . '</th>';
@@ -1155,7 +1155,7 @@  discard block
 block discarded – undo
1155 1155
 		)->fetchAssoc();
1156 1156
 
1157 1157
 		$html = '';
1158
-		$html .= '<table ' . Datatables::repositoryTableAttributes() . '"><thead><tr>';		$html .= '<th>' . I18N::translate('Repository name') . '</th>';
1158
+		$html .= '<table ' . Datatables::repositoryTableAttributes() . '"><thead><tr>'; $html .= '<th>' . I18N::translate('Repository name') . '</th>';
1159 1159
 		$html .= '<th>' . I18N::translate('Sources') . '</th>';
1160 1160
 		$html .= '<th>' . I18N::translate('Last change') . '</th>';
1161 1161
 		$html .= '<th>' . I18N::translate('Delete') . '</th>';
@@ -1585,7 +1585,7 @@  discard block
 block discarded – undo
1585 1585
 					if ($endjd === $startjd) {
1586 1586
 						$html .= I18N::translate('No events exist for tomorrow.');
1587 1587
 					} else {
1588
-						$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));
1588
+						$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));
1589 1589
 					}
1590 1590
 				} else {
1591 1591
 					if ($endjd === $startjd) {
Please login to merge, or discard this patch.
individual.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@
 block discarded – undo
89 89
 if (Auth::isAdmin()) {
90 90
 	$user = User::findByGenealogyRecord($controller->record);
91 91
 	if ($user) {
92
-		$user_link =  ' —  <a href="admin_users.php?filter=' . Filter::escapeHtml($user->getUserName()) . '">' . Filter::escapeHtml($user->getUserName()) . '</a>';
92
+		$user_link = ' —  <a href="admin_users.php?filter=' . Filter::escapeHtml($user->getUserName()) . '">' . Filter::escapeHtml($user->getUserName()) . '</a>';
93 93
 	};
94 94
 }
95 95
 
Please login to merge, or discard this patch.
index_edit.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@
 block discarded – undo
146 146
 			}
147 147
 		}
148 148
 	}
149
-	if ($user_id < 0 || $gedcom_id < 0 ) {
149
+	if ($user_id < 0 || $gedcom_id < 0) {
150 150
 		header('Location: ' . WT_BASE_URL . 'admin.php');
151 151
 	} elseif ($user_id > 0) {
152 152
 		header('Location: ' . WT_BASE_URL . 'index.php?ctype=user&ged=' . $WT_TREE->getNameUrl());
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
@@ -1470,7 +1470,7 @@
 block discarded – undo
1470 1470
 					'0' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'first'),
1471 1471
 					'1' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'last'),
1472 1472
 				], $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES_SUFFIX', ['name' => 'SHOW_PEDIGREE_PLACES_SUFFIX'])),
1473
-				Bootstrap4::select(FunctionsEdit::numericOptions(range(1,9)), $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES'), ['name' => 'SHOW_PEDIGREE_PLACES'])
1473
+				Bootstrap4::select(FunctionsEdit::numericOptions(range(1, 9)), $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES'), ['name' => 'SHOW_PEDIGREE_PLACES'])
1474 1474
 			) ?>
1475 1475
 			<p class="small text-muted">
1476 1476
 				<?= /* 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/Functions/FunctionsPrint.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -189,7 +189,7 @@
 block discarded – undo
189 189
 			    <div class="modal-content">
190 190
 			      <div class="modal-header">
191 191
 			        <h3 class="modal-title" id="wt-modal-title">' . $title . '</h3>
192
-			        <button type="button" class="close" data-dismiss="modal" aria-label="'. I18N::translate('close') .'">
192
+			        <button type="button" class="close" data-dismiss="modal" aria-label="'. I18N::translate('close') . '">
193 193
 			          <span aria-hidden="true">&times;</span>
194 194
 			        </button>
195 195
 			      </div>
Please login to merge, or discard this patch.
app/Module/UserMessagesModule.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -127,7 +127,7 @@
 block discarded – undo
127 127
 					$message->subject = I18N::translate('RE: ') . $message->subject;
128 128
 				}
129 129
 				if ($user) {
130
-					$content .= '<a class="btn btn-secondary" href="message.php?to=' . Filter::escapeUrl($message->sender) . '&amp;subject=' . Filter::escapeUrl($message->subject) . '&amp;ged=' . $WT_TREE->getNameUrl() .'" title="' . I18N::translate('Reply') .'">' . I18N::translate('Reply') . '</a> ';
130
+					$content .= '<a class="btn btn-secondary" href="message.php?to=' . Filter::escapeUrl($message->sender) . '&amp;subject=' . Filter::escapeUrl($message->subject) . '&amp;ged=' . $WT_TREE->getNameUrl() . '" title="' . I18N::translate('Reply') . '">' . I18N::translate('Reply') . '</a> ';
131 131
 				}
132 132
 				$content .= '<button type="button" onclick="if (confirm(\'' . I18N::translate('Are you sure you want to delete this message? It cannot be retrieved later.') . '\')) {$(\'#messageform :checkbox\').prop(\'checked\', false); $(\'#cb_message' . $message->message_id . '\').prop(\'checked\', true); document.messageform.submit();}">' . I18N::translate('Delete') . '</button></div></td></tr>';
133 133
 			}
Please login to merge, or discard this patch.
message.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 $controller->restrictAccess(!in_array($to, ['all', 'never_logged', 'last_6mo']) || Auth::isAdmin());
101 101
 $controller->pageHeader();
102 102
 
103
-$to_names = implode(I18N::$list_separator, array_map(function(User $user) { return $user->getRealName(); }, recipients($to)));
103
+$to_names = implode(I18N::$list_separator, array_map(function (User $user) { return $user->getRealName(); }, recipients($to)));
104 104
 
105 105
 ?>
106 106
 <h2><?= I18N::translate('Send a message') ?></h2>
@@ -185,13 +185,13 @@  discard block
 block discarded – undo
185 185
  */
186 186
 function recipients($to) {
187 187
 	if ($to === 'all') {
188
-		$recipients =	User::all();
188
+		$recipients = User::all();
189 189
 	} elseif ($to === 'last_6mo') {
190
-		$recipients = array_filter(User::all(), function(User $user) {
190
+		$recipients = array_filter(User::all(), function (User $user) {
191 191
 			return $user->getPreference('sessiontime') > 0 && WT_TIMESTAMP - $user->getPreference('sessiontime') > 60 * 60 * 24 * 30 * 6;
192 192
 		});
193 193
 	} elseif ($to === 'never_logged') {
194
-		$recipients = array_filter(User::all(), function(User $user) {
194
+		$recipients = array_filter(User::all(), function (User $user) {
195 195
 			return $user->getPreference('verified_by_admin') && $user->getPreference('reg_timestamp') > $user->getPreference('sessiontime');
196 196
 		});
197 197
 	} else {
Please login to merge, or discard this patch.