Completed
Branch develop (bfa16a)
by Greg
10:11
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.
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.
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.
app/Theme/AbstractTheme.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -819,7 +819,7 @@  discard block
 block discarded – undo
819 819
 				'<div class="icons">' .
820 820
 				'<span class="iconz icon-zoomin" title="' . I18N::translate('Zoom in/out on this box.') . '"></span>' .
821 821
 				'<div class="itr"><i class="icon-pedigree"></i><div class="popup">' .
822
-				'<ul class="' . $personBoxClass . '">' . implode('', array_map(function(Menu $menu) { return $menu->bootstrap4(); }, $this->individualBoxMenu($individual))) . '</ul>' .
822
+				'<ul class="' . $personBoxClass . '">' . implode('', array_map(function (Menu $menu) { return $menu->bootstrap4(); }, $this->individualBoxMenu($individual))) . '</ul>' .
823 823
 				'</div>' .
824 824
 				'</div>' .
825 825
 				'</div>';
@@ -871,7 +871,7 @@  discard block
 block discarded – undo
871 871
 				'<div class="icons">' .
872 872
 				'<span class="iconz icon-zoomin" title="' . I18N::translate('Zoom in/out on this box.') . '"></span>' .
873 873
 				'<div class="itr"><i class="icon-pedigree"></i><div class="popup">' .
874
-				'<ul class="' . $personBoxClass . '">' . implode('', array_map(function(Menu $menu) { return $menu->bootstrap4(); }, $this->individualBoxMenu($individual))) . '</ul>' .
874
+				'<ul class="' . $personBoxClass . '">' . implode('', array_map(function (Menu $menu) { return $menu->bootstrap4(); }, $this->individualBoxMenu($individual))) . '</ul>' .
875 875
 				'</div>' .
876 876
 				'</div>' .
877 877
 				'</div>';
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
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
343 343
 			// Check the script used by each name, so we can match cyrillic with cyrillic, greek with greek, etc.
344 344
 			$husb_names = [];
345 345
 			if ($this->husb) {
346
-				$husb_names = array_filter($this->husb->getAllNames(), function(array $x) { return $x['type'] !== '_MARNM'; } );
346
+				$husb_names = array_filter($this->husb->getAllNames(), function (array $x) { return $x['type'] !== '_MARNM'; } );
347 347
 			}
348 348
 			// If the individual only has married names, create a dummy birth name.
349 349
 			if (empty($husb_names)) {
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
 
360 360
 			$wife_names = [];
361 361
 			if ($this->wife) {
362
-				$wife_names = array_filter($this->wife->getAllNames(), function(array $x) { return $x['type'] !== '_MARNM'; } );
362
+				$wife_names = array_filter($this->wife->getAllNames(), function (array $x) { return $x['type'] !== '_MARNM'; } );
363 363
 			}
364 364
 			// If the individual only has married names, create a dummy birth name.
365 365
 			if (empty($wife_names)) {
Please login to merge, or discard this patch.
app/Theme/CloudsTheme.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@
 block discarded – undo
106 106
 			if (!empty($menu->getSubmenus())) {
107 107
 				// Insert a dummy menu / label into the submenu
108 108
 				$submenus = $menu->getSubmenus();
109
-				array_unshift($submenus, new Menu($menu->getLabel(), null, null, [ 'onclick' => 'return false;']));
109
+				array_unshift($submenus, new Menu($menu->getLabel(), null, null, ['onclick' => 'return false;']));
110 110
 				$menu->setSubmenus($submenus);
111 111
 			}
112 112
 
Please login to merge, or discard this patch.