Completed
Push — 1.7 ( 357bf4...bb708b )
by
unknown
10:46
created
app/Filter.php 1 patch
Switch Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -117,10 +117,10 @@
 block discarded – undo
117 117
 	 */
118 118
 	public static function formatText($text, Tree $WT_TREE) {
119 119
 		switch ($WT_TREE->getPreference('FORMAT_TEXT')) {
120
-		case 'markdown':
121
-			return '<div class="markdown" dir="auto">' . self::markdown($text) . '</div>';
122
-		default:
123
-			return '<div style="white-space: pre-wrap;" dir="auto">' . self::expandUrls($text) . '</div>';
120
+			case 'markdown':
121
+				return '<div class="markdown" dir="auto">' . self::markdown($text) . '</div>';
122
+			default:
123
+				return '<div style="white-space: pre-wrap;" dir="auto">' . self::expandUrls($text) . '</div>';
124 124
 		}
125 125
 	}
126 126
 
Please login to merge, or discard this patch.
app/GedcomRecord.php 1 patch
Switch Indentation   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -198,27 +198,27 @@  discard block
 block discarded – undo
198 198
 		}
199 199
 
200 200
 		switch ($type) {
201
-		case 'INDI':
202
-			$record = new Individual($xref, $gedcom, $pending, $tree);
203
-			break;
204
-		case 'FAM':
205
-			$record = new Family($xref, $gedcom, $pending, $tree);
206
-			break;
207
-		case 'SOUR':
208
-			$record = new Source($xref, $gedcom, $pending, $tree);
209
-			break;
210
-		case 'OBJE':
211
-			$record = new Media($xref, $gedcom, $pending, $tree);
212
-			break;
213
-		case 'REPO':
214
-			$record = new Repository($xref, $gedcom, $pending, $tree);
215
-			break;
216
-		case 'NOTE':
217
-			$record = new Note($xref, $gedcom, $pending, $tree);
218
-			break;
219
-		default:
220
-			$record = new self($xref, $gedcom, $pending, $tree);
221
-			break;
201
+			case 'INDI':
202
+				$record = new Individual($xref, $gedcom, $pending, $tree);
203
+				break;
204
+			case 'FAM':
205
+				$record = new Family($xref, $gedcom, $pending, $tree);
206
+				break;
207
+			case 'SOUR':
208
+				$record = new Source($xref, $gedcom, $pending, $tree);
209
+				break;
210
+			case 'OBJE':
211
+				$record = new Media($xref, $gedcom, $pending, $tree);
212
+				break;
213
+			case 'REPO':
214
+				$record = new Repository($xref, $gedcom, $pending, $tree);
215
+				break;
216
+			case 'NOTE':
217
+				$record = new Note($xref, $gedcom, $pending, $tree);
218
+				break;
219
+			default:
220
+				$record = new self($xref, $gedcom, $pending, $tree);
221
+				break;
222 222
 		}
223 223
 
224 224
 		// Store it in the cache
@@ -437,31 +437,31 @@  discard block
 block discarded – undo
437 437
 // CACHING: this function can take three different parameters,
438 438
 		// and therefore needs three different caches for the result.
439 439
 		switch ($access_level) {
440
-		case Auth::PRIV_PRIVATE: // visitor
441
-			if ($this->disp_public === null) {
442
-				$this->disp_public = $this->canShowRecord(Auth::PRIV_PRIVATE);
443
-			}
440
+			case Auth::PRIV_PRIVATE: // visitor
441
+				if ($this->disp_public === null) {
442
+					$this->disp_public = $this->canShowRecord(Auth::PRIV_PRIVATE);
443
+				}
444 444
 
445
-			return $this->disp_public;
446
-		case Auth::PRIV_USER: // member
447
-			if ($this->disp_user === null) {
448
-				$this->disp_user = $this->canShowRecord(Auth::PRIV_USER);
449
-			}
445
+				return $this->disp_public;
446
+			case Auth::PRIV_USER: // member
447
+				if ($this->disp_user === null) {
448
+					$this->disp_user = $this->canShowRecord(Auth::PRIV_USER);
449
+				}
450 450
 
451
-			return $this->disp_user;
452
-		case Auth::PRIV_NONE: // admin
453
-			if ($this->disp_none === null) {
454
-				$this->disp_none = $this->canShowRecord(Auth::PRIV_NONE);
455
-			}
451
+				return $this->disp_user;
452
+			case Auth::PRIV_NONE: // admin
453
+				if ($this->disp_none === null) {
454
+					$this->disp_none = $this->canShowRecord(Auth::PRIV_NONE);
455
+				}
456 456
 
457
-			return $this->disp_none;
458
-		case Auth::PRIV_HIDE: // hidden from admins
459
-			// We use this value to bypass privacy checks. For example,
460
-			// when downloading data or when calculating privacy itself.
461
-			return true;
462
-		default:
463
-			// Should never get here.
464
-			return false;
457
+				return $this->disp_none;
458
+			case Auth::PRIV_HIDE: // hidden from admins
459
+				// We use this value to bypass privacy checks. For example,
460
+				// when downloading data or when calculating privacy itself.
461
+				return true;
462
+			default:
463
+				// Should never get here.
464
+				return false;
465 465
 		}
466 466
 	}
467 467
 
@@ -816,10 +816,10 @@  discard block
 block discarded – undo
816 816
 			}
817 817
 			if ($event->getDate()->isOK() || !$event->getPlace()->isEmpty()) {
818 818
 				switch ($style) {
819
-				case 1:
820
-					return '<br><em>' . $event->getLabel() . ' ' . FunctionsPrint::formatFactDate($event, $this, false, false) . $joiner . FunctionsPrint::formatFactPlace($event) . '</em>';
821
-				case 2:
822
-					return '<dl><dt class="label">' . $event->getLabel() . '</dt><dd class="field">' . FunctionsPrint::formatFactDate($event, $this, false, false) . $joiner . FunctionsPrint::formatFactPlace($event) . '</dd></dl>';
819
+					case 1:
820
+						return '<br><em>' . $event->getLabel() . ' ' . FunctionsPrint::formatFactDate($event, $this, false, false) . $joiner . FunctionsPrint::formatFactPlace($event) . '</em>';
821
+					case 2:
822
+						return '<dl><dt class="label">' . $event->getLabel() . '</dt><dd class="field">' . FunctionsPrint::formatFactDate($event, $this, false, false) . $joiner . FunctionsPrint::formatFactPlace($event) . '</dd></dl>';
823 823
 				}
824 824
 			}
825 825
 		}
Please login to merge, or discard this patch.
app/Date.php 1 patch
Switch Indentation   +101 added lines, -101 removed lines patch added patch discarded remove patch
@@ -169,22 +169,22 @@  discard block
 block discarded – undo
169 169
 		}
170 170
 		// Now construct an object of the correct type
171 171
 		switch ($cal) {
172
-		case '@#DGREGORIAN@':
173
-			return new GregorianDate(array($y, $m, $d));
174
-		case '@#DJULIAN@':
175
-			return new JulianDate(array($y, $m, $d));
176
-		case '@#DHEBREW@':
177
-			return new JewishDate(array($y, $m, $d));
178
-		case '@#DHIJRI@':
179
-			return new HijriDate(array($y, $m, $d));
180
-		case '@#DFRENCH R@':
181
-			return new FrenchDate(array($y, $m, $d));
182
-		case '@#DJALALI@':
183
-			return new JalaliDate(array($y, $m, $d));
184
-		case '@#DROMAN@':
185
-			return new RomanDate(array($y, $m, $d));
186
-		default:
187
-			throw new \DomainException('Invalid calendar');
172
+			case '@#DGREGORIAN@':
173
+				return new GregorianDate(array($y, $m, $d));
174
+			case '@#DJULIAN@':
175
+				return new JulianDate(array($y, $m, $d));
176
+			case '@#DHEBREW@':
177
+				return new JewishDate(array($y, $m, $d));
178
+			case '@#DHIJRI@':
179
+				return new HijriDate(array($y, $m, $d));
180
+			case '@#DFRENCH R@':
181
+				return new FrenchDate(array($y, $m, $d));
182
+			case '@#DJALALI@':
183
+				return new JalaliDate(array($y, $m, $d));
184
+			case '@#DROMAN@':
185
+				return new RomanDate(array($y, $m, $d));
186
+			default:
187
+				throw new \DomainException('Invalid calendar');
188 188
 		}
189 189
 	}
190 190
 
@@ -291,42 +291,42 @@  discard block
 block discarded – undo
291 291
 
292 292
 		// Localise the date
293 293
 		switch ($q1 . $q2) {
294
-		case '':
295
-			$tmp = $d1 . $conv1;
296
-			break;
297
-		case 'ABT':
298
-			$tmp = /* I18N: Gedcom ABT dates */ I18N::translate('about %s', $d1 . $conv1);
299
-			break;
300
-		case 'CAL':
301
-			$tmp = /* I18N: Gedcom CAL dates */ I18N::translate('calculated %s', $d1 . $conv1);
302
-			break;
303
-		case 'EST':
304
-			$tmp = /* I18N: Gedcom EST dates */ I18N::translate('estimated %s', $d1 . $conv1);
305
-			break;
306
-		case 'INT':
307
-			$tmp = /* I18N: Gedcom INT dates */ I18N::translate('interpreted %s (%s)', $d1 . $conv1, $this->text);
308
-			break;
309
-		case 'BEF':
310
-			$tmp = /* I18N: Gedcom BEF dates */ I18N::translate('before %s', $d1 . $conv1);
311
-			break;
312
-		case 'AFT':
313
-			$tmp = /* I18N: Gedcom AFT dates */ I18N::translate('after %s', $d1 . $conv1);
314
-			break;
315
-		case 'FROM':
316
-			$tmp = /* I18N: Gedcom FROM dates */ I18N::translate('from %s', $d1 . $conv1);
317
-			break;
318
-		case 'TO':
319
-			$tmp = /* I18N: Gedcom TO dates */ I18N::translate('to %s', $d1 . $conv1);
320
-			break;
321
-		case 'BETAND':
322
-			$tmp = /* I18N: Gedcom BET-AND dates */ I18N::translate('between %s and %s', $d1 . $conv1, $d2 . $conv2);
323
-			break;
324
-		case 'FROMTO':
325
-			$tmp = /* I18N: Gedcom FROM-TO dates */ I18N::translate('from %s to %s', $d1 . $conv1, $d2 . $conv2);
326
-			break;
327
-		default:
328
-			$tmp = I18N::translate('Invalid date');
329
-			break; // e.g. BET without AND
294
+			case '':
295
+				$tmp = $d1 . $conv1;
296
+				break;
297
+			case 'ABT':
298
+				$tmp = /* I18N: Gedcom ABT dates */ I18N::translate('about %s', $d1 . $conv1);
299
+				break;
300
+			case 'CAL':
301
+				$tmp = /* I18N: Gedcom CAL dates */ I18N::translate('calculated %s', $d1 . $conv1);
302
+				break;
303
+			case 'EST':
304
+				$tmp = /* I18N: Gedcom EST dates */ I18N::translate('estimated %s', $d1 . $conv1);
305
+				break;
306
+			case 'INT':
307
+				$tmp = /* I18N: Gedcom INT dates */ I18N::translate('interpreted %s (%s)', $d1 . $conv1, $this->text);
308
+				break;
309
+			case 'BEF':
310
+				$tmp = /* I18N: Gedcom BEF dates */ I18N::translate('before %s', $d1 . $conv1);
311
+				break;
312
+			case 'AFT':
313
+				$tmp = /* I18N: Gedcom AFT dates */ I18N::translate('after %s', $d1 . $conv1);
314
+				break;
315
+			case 'FROM':
316
+				$tmp = /* I18N: Gedcom FROM dates */ I18N::translate('from %s', $d1 . $conv1);
317
+				break;
318
+			case 'TO':
319
+				$tmp = /* I18N: Gedcom TO dates */ I18N::translate('to %s', $d1 . $conv1);
320
+				break;
321
+			case 'BETAND':
322
+				$tmp = /* I18N: Gedcom BET-AND dates */ I18N::translate('between %s and %s', $d1 . $conv1, $d2 . $conv2);
323
+				break;
324
+			case 'FROMTO':
325
+				$tmp = /* I18N: Gedcom FROM-TO dates */ I18N::translate('from %s to %s', $d1 . $conv1, $d2 . $conv2);
326
+				break;
327
+			default:
328
+				$tmp = I18N::translate('Invalid date');
329
+				break; // e.g. BET without AND
330 330
 		}
331 331
 		if ($this->text && !$q1) {
332 332
 			$tmp = I18N::translate('%1$s (%2$s)', $tmp, $this->text);
@@ -445,33 +445,33 @@  discard block
 block discarded – undo
445 445
 		}
446 446
 
447 447
 		switch ($format) {
448
-		case 0:
449
-			// Years - integer only (for statistics, rather than for display)
450
-			if ($jd && $d1->minimumJulianDay() && $d1->minimumJulianDay() <= $jd) {
451
-				return $d1->minimumDate()->getAge(false, $jd, false);
452
-			} else {
453
-				return -1;
454
-			}
455
-		case 1:
456
-			// Days - integer only (for sorting, rather than for display)
457
-			if ($jd && $d1->minimumJulianDay()) {
458
-				return $jd - $d1->minimumJulianDay();
459
-			} else {
460
-				return -1;
461
-			}
462
-		case 2:
463
-			// Just years, in local digits, with warning for negative/
464
-			if ($jd && $d1->minimumJulianDay()) {
465
-				if ($d1->minimumJulianDay() > $jd) {
466
-					return '<i class="icon-warning"></i>';
448
+			case 0:
449
+				// Years - integer only (for statistics, rather than for display)
450
+				if ($jd && $d1->minimumJulianDay() && $d1->minimumJulianDay() <= $jd) {
451
+					return $d1->minimumDate()->getAge(false, $jd, false);
467 452
 				} else {
468
-					return I18N::number($d1->minimumDate()->getAge(false, $jd));
453
+					return -1;
469 454
 				}
470
-			} else {
471
-				return '';
472
-			}
473
-		default:
474
-			throw new \InvalidArgumentException('format: ' . $format);
455
+			case 1:
456
+				// Days - integer only (for sorting, rather than for display)
457
+				if ($jd && $d1->minimumJulianDay()) {
458
+					return $jd - $d1->minimumJulianDay();
459
+				} else {
460
+					return -1;
461
+				}
462
+			case 2:
463
+				// Just years, in local digits, with warning for negative/
464
+				if ($jd && $d1->minimumJulianDay()) {
465
+					if ($d1->minimumJulianDay() > $jd) {
466
+						return '<i class="icon-warning"></i>';
467
+					} else {
468
+						return I18N::number($d1->minimumDate()->getAge(false, $jd));
469
+					}
470
+				} else {
471
+					return '';
472
+				}
473
+			default:
474
+				throw new \InvalidArgumentException('format: ' . $format);
475 475
 		}
476 476
 	}
477 477
 
@@ -515,32 +515,32 @@  discard block
 block discarded – undo
515 515
 	public static function compare(Date $a, Date $b) {
516 516
 		// Get min/max JD for each date.
517 517
 		switch ($a->qual1) {
518
-		case 'BEF':
519
-			$amin = $a->minimumJulianDay() - 1;
520
-			$amax = $amin;
521
-			break;
522
-		case 'AFT':
523
-			$amax = $a->maximumJulianDay() + 1;
524
-			$amin = $amax;
525
-			break;
526
-		default:
527
-			$amin = $a->minimumJulianDay();
528
-			$amax = $a->maximumJulianDay();
529
-			break;
518
+			case 'BEF':
519
+				$amin = $a->minimumJulianDay() - 1;
520
+				$amax = $amin;
521
+				break;
522
+			case 'AFT':
523
+				$amax = $a->maximumJulianDay() + 1;
524
+				$amin = $amax;
525
+				break;
526
+			default:
527
+				$amin = $a->minimumJulianDay();
528
+				$amax = $a->maximumJulianDay();
529
+				break;
530 530
 		}
531 531
 		switch ($b->qual1) {
532
-		case 'BEF':
533
-			$bmin = $b->minimumJulianDay() - 1;
534
-			$bmax = $bmin;
535
-			break;
536
-		case 'AFT':
537
-			$bmax = $b->maximumJulianDay() + 1;
538
-			$bmin = $bmax;
539
-			break;
540
-		default:
541
-			$bmin = $b->minimumJulianDay();
542
-			$bmax = $b->maximumJulianDay();
543
-			break;
532
+			case 'BEF':
533
+				$bmin = $b->minimumJulianDay() - 1;
534
+				$bmax = $bmin;
535
+				break;
536
+			case 'AFT':
537
+				$bmax = $b->maximumJulianDay() + 1;
538
+				$bmin = $bmax;
539
+				break;
540
+			default:
541
+				$bmin = $b->minimumJulianDay();
542
+				$bmax = $b->maximumJulianDay();
543
+				break;
544 544
 		}
545 545
 		if ($amax < $bmin) {
546 546
 			return -1;
Please login to merge, or discard this patch.
edit_changes.php 1 patch
Switch Indentation   +85 added lines, -85 removed lines patch added patch discarded remove patch
@@ -49,72 +49,72 @@  discard block
 block discarded – undo
49 49
 echo '<div id="pending"><h2>', I18N::translate('Pending changes'), '</h2>';
50 50
 
51 51
 switch ($action) {
52
-case 'undo':
53
-	$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
54
-	$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
55
-	// Undo a change, and subsequent changes to the same record
56
-	Database::prepare(
57
-		"UPDATE `##change`" .
58
-		" SET   status     = 'rejected'" .
59
-		" WHERE status     = 'pending'" .
60
-		" AND   gedcom_id  = ?" .
61
-		" AND   xref       = ?" .
62
-		" AND   change_id >= ?"
63
-	)->execute(array($gedcom_id, $xref, $change_id));
64
-	break;
65
-case 'accept':
66
-	$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
67
-	$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
68
-	// Accept a change, and all previous changes to the same record
69
-	$changes = Database::prepare(
70
-		"SELECT change_id, gedcom_id, gedcom_name, xref, old_gedcom, new_gedcom" .
71
-		" FROM  `##change` c" .
72
-		" JOIN  `##gedcom` g USING (gedcom_id)" .
73
-		" WHERE c.status   = 'pending'" .
74
-		" AND   gedcom_id  = ?" .
75
-		" AND   xref       = ?" .
76
-		" AND   change_id <= ?" .
77
-		" ORDER BY change_id"
78
-	)->execute(array($gedcom_id, $xref, $change_id))->fetchAll();
79
-	foreach ($changes as $change) {
80
-		if (empty($change->new_gedcom)) {
81
-			// delete
82
-			FunctionsImport::updateRecord($change->old_gedcom, $gedcom_id, true);
83
-		} else {
84
-			// add/update
85
-			FunctionsImport::updateRecord($change->new_gedcom, $gedcom_id, false);
52
+	case 'undo':
53
+		$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
54
+		$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
55
+		// Undo a change, and subsequent changes to the same record
56
+		Database::prepare(
57
+			"UPDATE `##change`" .
58
+			" SET   status     = 'rejected'" .
59
+			" WHERE status     = 'pending'" .
60
+			" AND   gedcom_id  = ?" .
61
+			" AND   xref       = ?" .
62
+			" AND   change_id >= ?"
63
+		)->execute(array($gedcom_id, $xref, $change_id));
64
+		break;
65
+	case 'accept':
66
+		$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
67
+		$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
68
+		// Accept a change, and all previous changes to the same record
69
+		$changes = Database::prepare(
70
+			"SELECT change_id, gedcom_id, gedcom_name, xref, old_gedcom, new_gedcom" .
71
+			" FROM  `##change` c" .
72
+			" JOIN  `##gedcom` g USING (gedcom_id)" .
73
+			" WHERE c.status   = 'pending'" .
74
+			" AND   gedcom_id  = ?" .
75
+			" AND   xref       = ?" .
76
+			" AND   change_id <= ?" .
77
+			" ORDER BY change_id"
78
+		)->execute(array($gedcom_id, $xref, $change_id))->fetchAll();
79
+		foreach ($changes as $change) {
80
+			if (empty($change->new_gedcom)) {
81
+				// delete
82
+				FunctionsImport::updateRecord($change->old_gedcom, $gedcom_id, true);
83
+			} else {
84
+				// add/update
85
+				FunctionsImport::updateRecord($change->new_gedcom, $gedcom_id, false);
86
+			}
87
+			Database::prepare("UPDATE `##change` SET status='accepted' WHERE change_id=?")->execute(array($change->change_id));
88
+			Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
86 89
 		}
87
-		Database::prepare("UPDATE `##change` SET status='accepted' WHERE change_id=?")->execute(array($change->change_id));
88
-		Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
89
-	}
90
-	break;
91
-case 'undoall':
92
-	Database::prepare(
93
-		"UPDATE `##change`" .
94
-		" SET status='rejected'" .
95
-		" WHERE status='pending' AND gedcom_id=?"
96
-	)->execute(array($WT_TREE->getTreeId()));
97
-	break;
98
-case 'acceptall':
99
-	$changes = Database::prepare(
100
-		"SELECT change_id, gedcom_id, gedcom_name, xref, old_gedcom, new_gedcom" .
101
-		" FROM `##change` c" .
102
-		" JOIN `##gedcom` g USING (gedcom_id)" .
103
-		" WHERE c.status='pending' AND gedcom_id=?" .
104
-		" ORDER BY change_id"
105
-	)->execute(array($WT_TREE->getTreeId()))->fetchAll();
106
-	foreach ($changes as $change) {
107
-		if (empty($change->new_gedcom)) {
108
-			// delete
109
-			FunctionsImport::updateRecord($change->old_gedcom, $change->gedcom_id, true);
110
-		} else {
111
-			// add/update
112
-			FunctionsImport::updateRecord($change->new_gedcom, $change->gedcom_id, false);
90
+		break;
91
+	case 'undoall':
92
+		Database::prepare(
93
+			"UPDATE `##change`" .
94
+			" SET status='rejected'" .
95
+			" WHERE status='pending' AND gedcom_id=?"
96
+		)->execute(array($WT_TREE->getTreeId()));
97
+		break;
98
+	case 'acceptall':
99
+		$changes = Database::prepare(
100
+			"SELECT change_id, gedcom_id, gedcom_name, xref, old_gedcom, new_gedcom" .
101
+			" FROM `##change` c" .
102
+			" JOIN `##gedcom` g USING (gedcom_id)" .
103
+			" WHERE c.status='pending' AND gedcom_id=?" .
104
+			" ORDER BY change_id"
105
+		)->execute(array($WT_TREE->getTreeId()))->fetchAll();
106
+		foreach ($changes as $change) {
107
+			if (empty($change->new_gedcom)) {
108
+				// delete
109
+				FunctionsImport::updateRecord($change->old_gedcom, $change->gedcom_id, true);
110
+			} else {
111
+				// add/update
112
+				FunctionsImport::updateRecord($change->new_gedcom, $change->gedcom_id, false);
113
+			}
114
+			Database::prepare("UPDATE `##change` SET status='accepted' WHERE change_id=?")->execute(array($change->change_id));
115
+			Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
113 116
 		}
114
-		Database::prepare("UPDATE `##change` SET status='accepted' WHERE change_id=?")->execute(array($change->change_id));
115
-		Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
116
-	}
117
-	break;
117
+		break;
118 118
 }
119 119
 
120 120
 $changed_gedcoms = Database::prepare(
@@ -146,27 +146,27 @@  discard block
 block discarded – undo
146 146
 
147 147
 
148 148
 		switch ($match[1]) {
149
-		case 'INDI':
150
-			$record = new Individual($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
151
-			break;
152
-		case 'FAM':
153
-			$record = new Family($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
154
-			break;
155
-		case 'SOUR':
156
-			$record = new Source($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
157
-			break;
158
-		case 'REPO':
159
-			$record = new Repository($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
160
-			break;
161
-		case 'OBJE':
162
-			$record = new Media($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
163
-			break;
164
-		case 'NOTE':
165
-			$record = new Note($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
166
-			break;
167
-		default:
168
-			$record = new GedcomRecord($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
169
-			break;
149
+			case 'INDI':
150
+				$record = new Individual($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
151
+				break;
152
+			case 'FAM':
153
+				$record = new Family($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
154
+				break;
155
+			case 'SOUR':
156
+				$record = new Source($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
157
+				break;
158
+			case 'REPO':
159
+				$record = new Repository($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
160
+				break;
161
+			case 'OBJE':
162
+				$record = new Media($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
163
+				break;
164
+			case 'NOTE':
165
+				$record = new Note($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
166
+				break;
167
+			default:
168
+				$record = new GedcomRecord($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
169
+				break;
170 170
 		}
171 171
 		if ($change->xref != $prev_xref || $change->gedcom_id != $prev_gedcom_id) {
172 172
 			if ($prev_xref) {
Please login to merge, or discard this patch.
message.php 1 patch
Switch Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -65,20 +65,20 @@
 block discarded – undo
65 65
 // Ensure the user always visits this page twice - once to compose it and again to send it.
66 66
 // This makes it harder for spammers.
67 67
 switch ($action) {
68
-case 'compose':
69
-	Session::put('good_to_send', true);
70
-	break;
71
-case 'send':
72
-	// Only send messages if we've come straight from the compose page.
73
-	if (!Session::get('good_to_send')) {
74
-		Log::addAuthenticationLog('Attempt to send a message without visiting the compose page. Spam attack?');
75
-		$action = 'compose';
76
-	}
77
-	if (!Filter::checkCsrf()) {
78
-		$action = 'compose';
79
-	}
80
-	Session::forget('good_to_send');
81
-	break;
68
+	case 'compose':
69
+		Session::put('good_to_send', true);
70
+		break;
71
+	case 'send':
72
+		// Only send messages if we've come straight from the compose page.
73
+		if (!Session::get('good_to_send')) {
74
+			Log::addAuthenticationLog('Attempt to send a message without visiting the compose page. Spam attack?');
75
+			$action = 'compose';
76
+		}
77
+		if (!Filter::checkCsrf()) {
78
+			$action = 'compose';
79
+		}
80
+		Session::forget('good_to_send');
81
+		break;
82 82
 }
83 83
 
84 84
 switch ($action) {
Please login to merge, or discard this patch.
app/Theme/MinimalTheme.php 1 patch
Switch Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -41,10 +41,10 @@
 block discarded – undo
41 41
 	protected function flashMessageContainer(\stdClass $message) {
42 42
 		// This theme uses jQueryUI markup.
43 43
 		switch ($message->status) {
44
-		case 'danger':
45
-			return '<p class="ui-state-error">' . $message->text . '</p>';
46
-		default:
47
-			return '<p class="ui-state-highlight">' . $message->text . '</p>';
44
+			case 'danger':
45
+				return '<p class="ui-state-error">' . $message->text . '</p>';
46
+			default:
47
+				return '<p class="ui-state-highlight">' . $message->text . '</p>';
48 48
 		}
49 49
 	}
50 50
 
Please login to merge, or discard this patch.
app/Theme/FabTheme.php 1 patch
Switch Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -41,10 +41,10 @@
 block discarded – undo
41 41
 	protected function flashMessageContainer(\stdClass $message) {
42 42
 		// This theme uses jQueryUI markup.
43 43
 		switch ($message->status) {
44
-		case 'danger':
45
-			return '<p class="ui-state-error">' . $message->text . '</p>';
46
-		default:
47
-			return '<p class="ui-state-highlight">' . $message->text . '</p>';
44
+			case 'danger':
45
+				return '<p class="ui-state-error">' . $message->text . '</p>';
46
+			default:
47
+				return '<p class="ui-state-highlight">' . $message->text . '</p>';
48 48
 		}
49 49
 	}
50 50
 
Please login to merge, or discard this patch.
app/Theme/XeneaTheme.php 1 patch
Switch Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -41,10 +41,10 @@
 block discarded – undo
41 41
 	protected function flashMessageContainer(\stdClass $message) {
42 42
 		// This theme uses jQueryUI markup.
43 43
 		switch ($message->status) {
44
-		case 'danger':
45
-			return '<p class="ui-state-error">' . $message->text . '</p>';
46
-		default:
47
-			return '<p class="ui-state-highlight">' . $message->text . '</p>';
44
+			case 'danger':
45
+				return '<p class="ui-state-error">' . $message->text . '</p>';
46
+			default:
47
+				return '<p class="ui-state-highlight">' . $message->text . '</p>';
48 48
 		}
49 49
 	}
50 50
 
Please login to merge, or discard this patch.
app/Theme/CloudsTheme.php 1 patch
Switch Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -41,10 +41,10 @@
 block discarded – undo
41 41
 	protected function flashMessageContainer(\stdClass $message) {
42 42
 		// This theme uses jQueryUI markup.
43 43
 		switch ($message->status) {
44
-		case 'danger':
45
-			return '<p class="ui-state-error">' . $message->text . '</p>';
46
-		default:
47
-			return '<p class="ui-state-highlight">' . $message->text . '</p>';
44
+			case 'danger':
45
+				return '<p class="ui-state-error">' . $message->text . '</p>';
46
+			default:
47
+				return '<p class="ui-state-highlight">' . $message->text . '</p>';
48 48
 		}
49 49
 	}
50 50
 
Please login to merge, or discard this patch.