Completed
Pull Request — master (#1777)
by Jonathan
11:56
created
app/Module.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -168,7 +168,7 @@
 block discarded – undo
168 168
 					DebugBar::addThrowable($ex);
169 169
 
170 170
 					// The module has been deleted or is broken? Disable it.
171
-					Log::addConfigurationLog("Module {$module_name} is missing or broken - disabling it. " . $ex->getMessage());
171
+					Log::addConfigurationLog("module {$module_name} is missing or broken - disabling it. " . $ex->getMessage());
172 172
 					Database::prepare(
173 173
 						"UPDATE `##module` SET status = 'disabled' WHERE module_name = :module_name"
174 174
 					)->execute([
Please login to merge, or discard this patch.
app/Database.php 1 patch
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -78,8 +78,7 @@
 block discarded – undo
78 78
 		// Create the underlying PDO object
79 79
 		self::$pdo = new PDO(
80 80
 			(substr($config['dbhost'], 0, 1) === '/' ?
81
-				"mysql:unix_socket={$config['dbhost']};dbname={$config['dbname']}" :
82
-				"mysql:host={$config['dbhost']};dbname={$config['dbname']};port={$config['dbport']}"
81
+				"mysql:unix_socket={$config['dbhost']};dbname={$config['dbname']}" : "mysql:host={$config['dbhost']};dbname={$config['dbname']};port={$config['dbport']}"
83 82
 			),
84 83
 			$config['dbuser'], $config['dbpass'],
85 84
 			[
Please login to merge, or discard this patch.
resources/views/blocks/changes-list.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,9 +3,12 @@
 block discarded – undo
3 3
 
4 4
 <?php if ($summary !== ''): ?>
5 5
 	<span class="details_label"><?= $summary ?></span>
6
-<?php else: ?>
6
+<?php else {
7
+	: ?>
7 8
 	<?php foreach ($facts as $fact): ?>
8
-		<?php $record = $fact->getParent(); ?>
9
+		<?php $record = $fact->getParent();
10
+}
11
+?>
9 12
 		<a href="<?= e($record->url()) ?>" class="list_item name2">
10 13
 			<?= $record->getFullName() ?>
11 14
 		</a>
Please login to merge, or discard this patch.
app/Module/ChartsBlockModule.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 					]);
86 86
 					break;
87 87
 				case 'descendants':
88
-					$title           = I18N::translate('Descendants of %s', $person->getFullName());
88
+					$title = I18N::translate('Descendants of %s', $person->getFullName());
89 89
 					$chart_url = route('descendants-chart', [
90 90
 						'xref'        => $person->getXref(),
91 91
 						'ged'         => $person->getTree()->getName(),
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 					]);
99 99
 					break;
100 100
 				case 'hourglass':
101
-					$title           = I18N::translate('Hourglass chart of %s', $person->getFullName());
101
+					$title = I18N::translate('Hourglass chart of %s', $person->getFullName());
102 102
 					$chart_url = route('hourglass-chart', [
103 103
 						'xref'        => $person->getXref(),
104 104
 						'ged'         => $person->getTree()->getName(),
Please login to merge, or discard this patch.
resources/views/edit-account-page.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 				<?= I18N::translate('Theme') ?>
147 147
 			</label>
148 148
 			<div class="col-sm-9 wt-page-options-value">
149
-				<?= Bootstrap4::select($themes, $user->getPreference('theme'), ['id' => 'theme', 'name' => 'theme', 'aria-describedby' => 'theme-description',]) ?>
149
+				<?= Bootstrap4::select($themes, $user->getPreference('theme'), ['id' => 'theme', 'name' => 'theme', 'aria-describedby' => 'theme-description', ]) ?>
150 150
 				<p class="small text-muted" id="theme-description">
151 151
 					<?= /* I18N: Help text for the "Default theme" site configuration setting */
152 152
 					I18N::translate('You can change the appearance of webtrees using “themes”. Each theme has a different style, layout, color scheme, etc.') ?>
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
 			<?= I18N::translate('Contact method') ?>
161 161
 		</label>
162 162
 		<div class="col-sm-9 wt-page-options-value">
163
-			<?= Bootstrap4::select($contact_methods, $user->getPreference('contactmethod'), ['id' => 'contact-method', 'name' => 'contact_method', 'aria-describedby' => 'contact-method-description',]) ?>
163
+			<?= Bootstrap4::select($contact_methods, $user->getPreference('contactmethod'), ['id' => 'contact-method', 'name' => 'contact_method', 'aria-describedby' => 'contact-method-description', ]) ?>
164 164
 			<p class="small text-muted" id="contact-method-description">
165 165
 			<?= I18N::translate('Site members can send each other messages. You can choose to how these messages are sent to you, or choose not receive them at all.') ?>
166 166
 			</p>
Please login to merge, or discard this patch.
app/Http/Controllers/BranchesController.php 2 patches
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -111,24 +111,24 @@
 block discarded – undo
111 111
 	 * @return Individual[]
112 112
 	 */
113 113
 	protected function allAncestors(Individual $individual): array {
114
-	    /** @var Individual[] $ancestors */
115
-        $ancestors = [
116
-            1 => $individual,
117
-        ];
114
+			/** @var Individual[] $ancestors */
115
+				$ancestors = [
116
+						1 => $individual,
117
+				];
118 118
 
119
-        do {
120
-            $sosa = key($ancestors);
119
+				do {
120
+						$sosa = key($ancestors);
121 121
 
122 122
 			$family = $ancestors[$sosa]->getPrimaryChildFamily();
123 123
 
124 124
 			if ($family !== null) {
125
-                if ($family->getHusband() !== null) {
126
-                    $ancestors[$sosa * 2] = $family->getHusband();
127
-                }
128
-                if ($family->getWife() !== null) {
129
-                    $ancestors[$sosa * 2 + 1] = $family->getWife();
130
-                }
131
-            }
125
+								if ($family->getHusband() !== null) {
126
+										$ancestors[$sosa * 2] = $family->getHusband();
127
+								}
128
+								if ($family->getWife() !== null) {
129
+										$ancestors[$sosa * 2 + 1] = $family->getWife();
130
+								}
131
+						}
132 132
 		} while (next($ancestors));
133 133
 
134 134
 		return $ancestors;
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 			$sdx = Soundex::russell($surname);
163 163
 			if ($sdx !== '') {
164 164
 				foreach (explode(':', $sdx) as $value) {
165
-					$sql    .= " OR n_soundex_surn_std LIKE CONCAT('%', ?, '%')";
165
+					$sql .= " OR n_soundex_surn_std LIKE CONCAT('%', ?, '%')";
166 166
 					$args[] = $value;
167 167
 				}
168 168
 			}
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 			$sdx = Soundex::daitchMokotoff($surname);
173 173
 			if ($sdx !== '') {
174 174
 				foreach (explode(':', $sdx) as $value) {
175
-					$sql    .= " OR n_soundex_surn_dm LIKE CONCAT('%', ?, '%')";
175
+					$sql .= " OR n_soundex_surn_dm LIKE CONCAT('%', ?, '%')";
176 176
 					$args[] = $value;
177 177
 				}
178 178
 			}
Please login to merge, or discard this patch.
app/Http/Controllers/CalendarController.php 2 patches
Upper-Lower-Casing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -73,14 +73,14 @@  discard block
 block discarded – undo
73 73
 				if (strlen($match[1]) > strlen($match[2])) {
74 74
 					$match[2] = substr($match[1], 0, strlen($match[1]) - strlen($match[2])) . $match[2];
75 75
 				}
76
-				$ged_date = new Date("FROM {$cal} {$match[1]} TO {$cal} {$match[2]}");
76
+				$ged_date = new Date("from {$cal} {$match[1]} TO {$cal} {$match[2]}");
77 77
 				$view     = 'year';
78 78
 			} else {
79 79
 				// advanced-year "decade/century wildcard"
80 80
 				if (preg_match('/^(\d+)(\?+)$/', $year, $match)) {
81 81
 					$y1       = $match[1] . str_replace('?', '0', $match[2]);
82 82
 					$y2       = $match[1] . str_replace('?', '9', $match[2]);
83
-					$ged_date = new Date("FROM {$cal} {$y1} TO {$cal} {$y2}");
83
+					$ged_date = new Date("from {$cal} {$y1} TO {$cal} {$y2}");
84 84
 					$view     = 'year';
85 85
 				} else {
86 86
 					if ($year < 0) {
@@ -192,14 +192,14 @@  discard block
 block discarded – undo
192 192
 				if (strlen($match[1]) > strlen($match[2])) {
193 193
 					$match[2] = substr($match[1], 0, strlen($match[1]) - strlen($match[2])) . $match[2];
194 194
 				}
195
-				$ged_date = new Date("FROM {$cal} {$match[1]} TO {$cal} {$match[2]}");
195
+				$ged_date = new Date("from {$cal} {$match[1]} TO {$cal} {$match[2]}");
196 196
 				$view     = 'year';
197 197
 			} else {
198 198
 				// advanced-year "decade/century wildcard"
199 199
 				if (preg_match('/^(\d+)(\?+)$/', $year, $match)) {
200 200
 					$y1       = $match[1] . str_replace('?', '0', $match[2]);
201 201
 					$y2       = $match[1] . str_replace('?', '9', $match[2]);
202
-					$ged_date = new Date("FROM {$cal} {$y1} TO {$cal} {$y2}");
202
+					$ged_date = new Date("from {$cal} {$y1} TO {$cal} {$y2}");
203 203
 					$view     = 'year';
204 204
 				} else {
205 205
 					if ($year < 0) {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -526,7 +526,7 @@
 block discarded – undo
526 526
 			$html = '';
527 527
 
528 528
 			foreach ($list as $id => $facts) {
529
-				$tmp  = GedcomRecord::getInstance($id, $tree);
529
+				$tmp = GedcomRecord::getInstance($id, $tree);
530 530
 				$html .= $tag1 . '<a href="' . e($tmp->url()) . '">' . $tmp->getFullName() . '</a> ';
531 531
 				$html .= '<div class="indent">' . $facts . '</div>' . $tag2;
532 532
 			}
Please login to merge, or discard this patch.
resources/views/pending-changes-page.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
74 74
 									<?php endforeach ?>
75 75
 								</td>
76 76
 								<td>
77
-									<a href="<?= e(route('message', ['to' => $record_change->user_name, 'subject' => I18N::translate('Pending changes') . ' - ' . strip_tags($record_change->record->getFullName()), 'body' => WT_BASE_URL . $record_change->record->url(), 'ged' => $record_change->gedcom_name,])) ?>" title="<?= I18N::translate('Send a message') ?>">
77
+									<a href="<?= e(route('message', ['to' => $record_change->user_name, 'subject' => I18N::translate('Pending changes') . ' - ' . strip_tags($record_change->record->getFullName()), 'body' => WT_BASE_URL . $record_change->record->url(), 'ged' => $record_change->gedcom_name, ])) ?>" title="<?= I18N::translate('Send a message') ?>">
78 78
 										<?= e($record_change->real_name) ?> - <?= e($record_change->user_name) ?>
79 79
 									</a>
80 80
 								</td>
Please login to merge, or discard this patch.
app/Module/GoogleMapsModule.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2787,7 +2787,7 @@
 block discarded – undo
2787 2787
 			<?php
2788 2788
 			if ($level < 3 && $record->pl_icon != '') {
2789 2789
 				echo 'var image = {
2790
-						"url"    : "' . WT_MODULES_DIR .  'googlemap/" + "' . $record->pl_icon . '",
2790
+						"url"    : "' . WT_MODULES_DIR . 'googlemap/" + "' . $record->pl_icon . '",
2791 2791
 						"size"   : new google.maps.Size(25, 15),
2792 2792
 						"origin" : new google.maps.Point(0, 0),
2793 2793
 						"anchor" : new google.maps.Point(12, 15)
Please login to merge, or discard this patch.