Completed
Push — develop ( 5642f6...fefac1 )
by Greg
09:02
created
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/Functions/FunctionsEdit.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -641,7 +641,7 @@
 block discarded – undo
641 641
 		} elseif ($fact === 'REPO') {
642 642
 			echo
643 643
 				'<div class="input-group">' .
644
-				'<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-target="#modal-create-repository" data-element-id="' . $element_id . '" title="' . I18N::translate('Create a repository') . '"><i class="fa fa-plus"></i></button></span>' .				self::formControlRepository(Individual::getInstance($value, $WT_TREE), ['id' => $element_id, 'name' => $element_name]) .
644
+				'<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-target="#modal-create-repository" data-element-id="' . $element_id . '" title="' . I18N::translate('Create a repository') . '"><i class="fa fa-plus"></i></button></span>' . self::formControlRepository(Individual::getInstance($value, $WT_TREE), ['id' => $element_id, 'name' => $element_name]) .
645 645
 				'</div>';
646 646
 		} elseif ($fact === 'RESN') {
647 647
 			echo Bootstrap4::select(FunctionsEdit::optionsRestrictions(true), $value, ['id' => $element_id, 'name' => $element_name]);
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.
app/Controller/IndividualController.php 1 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
 	public function getTabs() {
96 96
 		$active_tabs = Module::getActiveTabs($this->record->getTree());
97 97
 
98
-		return array_filter($active_tabs, function(ModuleTabInterface $tab) { return $tab->hasTabContent(); });
98
+		return array_filter($active_tabs, function (ModuleTabInterface $tab) { return $tab->hasTabContent(); });
99 99
 	}
100 100
 
101 101
 	/**
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 
144 144
 		if ($n === 0) {
145 145
 			$content_class = 'collapse show';
146
-			$aria  = 'true';
146
+			$aria = 'true';
147 147
 
148 148
 			// Display gender icon
149 149
 			foreach ($individual->getFacts('SEX') as $sex_fact) {
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 		echo '<dd class="field">', $dummy->getFullName();
163 163
 		if ($this->record->canEdit() && !$name_fact->isPendingDeletion()) {
164 164
 			echo "<div class=\"deletelink\"><a class=\"deleteicon\" href=\"#\" onclick=\"return delete_fact('" . I18N::translate('Are you sure you want to delete this fact?') . "', '" . $this->record->getXref() . "', '" . $name_fact->getFactId() . "');\" title=\"" . I18N::translate('Delete this name') . '"><span class="link_text">' . I18N::translate('Delete this name') . '</span></a></div>';
165
-			echo '<div class="editlink"><a href="edit_interface.php?action=editname&amp;xref=' . $this->record->getXref() . '&amp;fact_id=' . $name_fact->getFactId() . '&amp;ged=' . $this->record->getTree()->getNameHtml() .  '" class="editicon" title="' . I18N::translate('Edit the name') . '"><span class="link_text">' . I18N::translate('Edit the name') . '</span></a></div>';
165
+			echo '<div class="editlink"><a href="edit_interface.php?action=editname&amp;xref=' . $this->record->getXref() . '&amp;fact_id=' . $name_fact->getFactId() . '&amp;ged=' . $this->record->getTree()->getNameHtml() . '" class="editicon" title="' . I18N::translate('Edit the name') . '"><span class="link_text">' . I18N::translate('Edit the name') . '</span></a></div>';
166 166
 		}
167 167
 		echo '</dd>';
168 168
 		$ct = preg_match_all('/\n2 (\w+) (.*)/', $name_fact->getGedcom(), $nmatch, PREG_SET_ORDER);
Please login to merge, or discard this patch.