fisharebest / webtrees

app/Controller/PedigreeController.php

Switch Indentation +74 added lines, -74 removed lines

@@ -102,26 +102,26 @@ 
 
 		$this->arrows = new \stdClass();
 		switch ($this->orientation) {
-			case self::PORTRAIT:
-				//drop through
-			case self::LANDSCAPE:
-				$this->arrows->prevGen = I18N::direction() === 'rtl' ? 'icon-larrow' : 'icon-rarrow';
-				$this->arrows->menu    = I18N::direction() === 'rtl' ? 'icon-rarrow' : 'icon-larrow';
-				$addoffset['x']        = $this->chartHasAncestors ? self::ARROW_SIZE : 0;
-				$addoffset['y']        = 0;
-				break;
-			case self::OLDEST_AT_TOP:
-				$this->arrows->prevGen = 'icon-uarrow';
-				$this->arrows->menu    = 'icon-darrow';
-				$addoffset['x']        = 0;
-				$addoffset['y']        = $this->root->getSpouseFamilies() ? self::ARROW_SIZE : 0;
-				break;
-			case self::OLDEST_AT_BOTTOM:
-				$this->arrows->prevGen = 'icon-darrow';
-				$this->arrows->menu    = 'icon-uarrow';
-				$addoffset['x']        = 0;
-				$addoffset['y']        = $this->chartHasAncestors ? self::ARROW_SIZE : 0;
-				break;
+		case self::PORTRAIT:
+			//drop through
+		case self::LANDSCAPE:
+			$this->arrows->prevGen = I18N::direction() === 'rtl' ? 'icon-larrow' : 'icon-rarrow';
+			$this->arrows->menu    = I18N::direction() === 'rtl' ? 'icon-rarrow' : 'icon-larrow';
+			$addoffset['x']        = $this->chartHasAncestors ? self::ARROW_SIZE : 0;
+			$addoffset['y']        = 0;
+			break;
+		case self::OLDEST_AT_TOP:
+			$this->arrows->prevGen = 'icon-uarrow';
+			$this->arrows->menu    = 'icon-darrow';
+			$addoffset['x']        = 0;
+			$addoffset['y']        = $this->root->getSpouseFamilies() ? self::ARROW_SIZE : 0;
+			break;
+		case self::OLDEST_AT_BOTTOM:
+			$this->arrows->prevGen = 'icon-darrow';
+			$this->arrows->menu    = 'icon-uarrow';
+			$addoffset['x']        = 0;
+			$addoffset['y']        = $this->chartHasAncestors ? self::ARROW_SIZE : 0;
+			break;
 		}
 
 		// -- this next section will create and position the DIV layers for the pedigree tree
@@ -150,73 +150,73 @@ 
 
 			// -- calculate the xoffset
 			switch ($this->orientation) {
-				case self::PORTRAIT:
-					$xoffset = ($this->generations - $curgen) * (($this->getBoxDimensions()->width + $bxspacing) / 1.8);
-					if(!$i && $this->root->getSpouseFamilies()) {
-						$xoffset -= self::ARROW_SIZE;
+			case self::PORTRAIT:
+				$xoffset = ($this->generations - $curgen) * (($this->getBoxDimensions()->width + $bxspacing) / 1.8);
+				if(!$i && $this->root->getSpouseFamilies()) {
+					$xoffset -= self::ARROW_SIZE;
+				}
+				// -- compact the tree
+				if ($curgen < $this->generations) {
+					if ($i % 2 == 0) {
+						$yoffset = $yoffset - (($boxspacing / 2) * ($curgen - 1));
+					} else {
+						$yoffset = $yoffset + (($boxspacing / 2) * ($curgen - 1));
 					}
-					// -- compact the tree
-					if ($curgen < $this->generations) {
-						if ($i % 2 == 0) {
-							$yoffset = $yoffset - (($boxspacing / 2) * ($curgen - 1));
+					$parent = (int) (($i - 1) / 2);
+					$pgen   = $curgen;
+					while ($parent > 0) {
+						if ($parent % 2 == 0) {
+							$yoffset = $yoffset - (($boxspacing / 2) * $pgen);
 						} else {
-							$yoffset = $yoffset + (($boxspacing / 2) * ($curgen - 1));
-						}
-						$parent = (int) (($i - 1) / 2);
-						$pgen   = $curgen;
-						while ($parent > 0) {
-							if ($parent % 2 == 0) {
-								$yoffset = $yoffset - (($boxspacing / 2) * $pgen);
-							} else {
-								$yoffset = $yoffset + (($boxspacing / 2) * $pgen);
-							}
-							$pgen++;
-							if ($pgen > 3) {
-								$temp = 0;
-								for ($j = 1; $j < ($pgen - 2); $j++) {
-									$temp += (pow(2, $j) - 1);
-								}
-								if ($parent % 2 == 0) {
-									$yoffset = $yoffset - (($boxspacing / 2) * $temp);
-								} else {
-									$yoffset = $yoffset + (($boxspacing / 2) * $temp);
-								}
-							}
-							$parent = (int) (($parent - 1) / 2);
+							$yoffset = $yoffset + (($boxspacing / 2) * $pgen);
 						}
-						if ($curgen > 3) {
+						$pgen++;
+						if ($pgen > 3) {
 							$temp = 0;
-							for ($j = 1; $j < ($curgen - 2); $j++) {
+							for ($j = 1; $j < ($pgen - 2); $j++) {
 								$temp += (pow(2, $j) - 1);
 							}
-							if ($i % 2 == 0) {
+							if ($parent % 2 == 0) {
 								$yoffset = $yoffset - (($boxspacing / 2) * $temp);
 							} else {
 								$yoffset = $yoffset + (($boxspacing / 2) * $temp);
 							}
 						}
+						$parent = (int) (($parent - 1) / 2);
 					}
-					$yoffset -= (($boxspacing / 2) * pow(2, ($this->generations - 2)) - ($boxspacing / 2));
-					break;
-				case self::LANDSCAPE:
-					$xoffset = ($this->generations - $curgen) * ($this->getBoxDimensions()->width + $bxspacing);
-					if ($curgen == 1) {
-						$xoffset += 10;
-					}
-					break;
-				case self::OLDEST_AT_TOP:
-					//swap x & y offsets as chart is rotated
-					$xoffset = $yoffset;
-					$yoffset = $curgen  * ($this->getBoxDimensions()->height + ($byspacing * 4));
-					break;
-				case self::OLDEST_AT_BOTTOM:
-					//swap x & y offsets as chart is rotated
-					$xoffset = $yoffset;
-					$yoffset = ($this->generations - $curgen) * ($this->getBoxDimensions()->height + ($byspacing * 2));
-					if ($i && $this->root->getSpouseFamilies()) {
-						$yoffset += self::ARROW_SIZE;
+					if ($curgen > 3) {
+						$temp = 0;
+						for ($j = 1; $j < ($curgen - 2); $j++) {
+							$temp += (pow(2, $j) - 1);
+						}
+						if ($i % 2 == 0) {
+							$yoffset = $yoffset - (($boxspacing / 2) * $temp);
+						} else {
+							$yoffset = $yoffset + (($boxspacing / 2) * $temp);
+						}
 					}
-					break;
+				}
+				$yoffset -= (($boxspacing / 2) * pow(2, ($this->generations - 2)) - ($boxspacing / 2));
+				break;
+			case self::LANDSCAPE:
+				$xoffset = ($this->generations - $curgen) * ($this->getBoxDimensions()->width + $bxspacing);
+				if ($curgen == 1) {
+					$xoffset += 10;
+				}
+				break;
+			case self::OLDEST_AT_TOP:
+				//swap x & y offsets as chart is rotated
+				$xoffset = $yoffset;
+				$yoffset = $curgen  * ($this->getBoxDimensions()->height + ($byspacing * 4));
+				break;
+			case self::OLDEST_AT_BOTTOM:
+				//swap x & y offsets as chart is rotated
+				$xoffset = $yoffset;
+				$yoffset = ($this->generations - $curgen) * ($this->getBoxDimensions()->height + ($byspacing * 2));
+				if ($i && $this->root->getSpouseFamilies()) {
+					$yoffset += self::ARROW_SIZE;
+				}
+				break;
 			}
 			$this->nodes[$i]["x"] = (int) $xoffset;
 			$this->nodes[$i]["y"] = (int) $yoffset;

Spacing +3 added lines, -3 removed lines

@@ -152,7 +152,7 @@ 
 			switch ($this->orientation) {
 				case self::PORTRAIT:
 					$xoffset = ($this->generations - $curgen) * (($this->getBoxDimensions()->width + $bxspacing) / 1.8);
-					if(!$i && $this->root->getSpouseFamilies()) {
+					if (!$i && $this->root->getSpouseFamilies()) {
 						$xoffset -= self::ARROW_SIZE;
 					}
 					// -- compact the tree
@@ -207,7 +207,7 @@ 
 				case self::OLDEST_AT_TOP:
 					//swap x & y offsets as chart is rotated
 					$xoffset = $yoffset;
-					$yoffset = $curgen  * ($this->getBoxDimensions()->height + ($byspacing * 4));
+					$yoffset = $curgen * ($this->getBoxDimensions()->height + ($byspacing * 4));
 					break;
 				case self::OLDEST_AT_BOTTOM:
 					//swap x & y offsets as chart is rotated
@@ -245,7 +245,7 @@ 
 			return $item['y'];
 		}, $this->nodes));
 
-		$this->chartsize['x'] = $max_xoffset + $bxspacing + $this->getBoxDimensions()->width  + $addoffset['x'];
+		$this->chartsize['x'] = $max_xoffset + $bxspacing + $this->getBoxDimensions()->width + $addoffset['x'];
 		$this->chartsize['y'] = $max_yoffset + $byspacing + $this->getBoxDimensions()->height + $addoffset['y'];
 	}
 

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2016 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+	 * webtrees: online genealogy
+	 * Copyright (C) 2016 webtrees development team
+	 * This program is free software: you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License as published by
+	 * the Free Software Foundation, either version 3 of the License, or
+	 * (at your option) any later version.
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	 * GNU General Public License for more details.
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program. If not, see <http://www.gnu.org/licenses/>.
+	 */
 namespace Fisharebest\Webtrees;
 
 use Fisharebest\Webtrees\Theme\AdministrationTheme;

app/Controller/RepositoryController.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 		$menu = new Menu(I18N::translate('Edit'), '#', 'menu-repo');
 
 		if (Auth::isEditor($this->record->getTree())) {
-			$fact    = $this->record->getFirstFact('NAME');
+			$fact = $this->record->getFirstFact('NAME');
 			if ($fact) {
 				// Edit existing name
 				$menu->addSubmenu(new Menu(I18N::translate('Edit repository'), '#', 'menu-repo-edit', array(

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2016 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+	 * webtrees: online genealogy
+	 * Copyright (C) 2016 webtrees development team
+	 * This program is free software: you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License as published by
+	 * the Free Software Foundation, either version 3 of the License, or
+	 * (at your option) any later version.
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	 * GNU General Public License for more details.
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program. If not, see <http://www.gnu.org/licenses/>.
+	 */
 namespace Fisharebest\Webtrees;
 
 use Fisharebest\Webtrees\Theme\AdministrationTheme;

app/File.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 		try {
 			$fp = fsockopen($scheme . $host, $port, $errno, $errstr, 5);
 
-			fputs($fp, "GET $path?$query HTTP/1.0\r\nHost: $host\r\nConnection: Close\r\n\r\n");
+			fputs($fp, "get $path?$query HTTP/1.0\r\nHost: $host\r\nConnection: Close\r\n\r\n");
 
 			// The first part of the response include the HTTP headers
 			$response = fread($fp, 65536);

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2016 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+	 * webtrees: online genealogy
+	 * Copyright (C) 2016 webtrees development team
+	 * This program is free software: you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License as published by
+	 * the Free Software Foundation, either version 3 of the License, or
+	 * (at your option) any later version.
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	 * GNU General Public License for more details.
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program. If not, see <http://www.gnu.org/licenses/>.
+	 */
 namespace Fisharebest\Webtrees;
 
 use Fisharebest\Webtrees\Theme\AdministrationTheme;

app/Functions/FunctionsDate.php

Switch Indentation +60 added lines, -60 removed lines

@@ -32,32 +32,32 @@ 
 	 */
 	public static function getAgeAtEvent($age_string, $show_years) {
 		switch (strtoupper($age_string)) {
-			case 'CHILD':
-				return I18N::translate('Child');
-			case 'INFANT':
-				return I18N::translate('Infant');
-			case 'STILLBORN':
-				return I18N::translate('Stillborn');
-			default:
-				return preg_replace_callback(
-					array(
-						'/(\d+)([ymwd])/',
-					),
-					function ($match) use ($age_string, $show_years) {
-						switch ($match[2]) {
-							case 'y':
-								if ($show_years || preg_match('/[dm]/', $age_string)) {
-									return I18N::plural('%s year', '%s years', $match[1], I18N::digits($match[1]));
-								} else {
-									return I18N::digits($match[1]);
-								}
-							case 'm':
-								return I18N::plural('%s month', '%s months', $match[1], I18N::digits($match[1]));
-							case 'w':
-								return I18N::plural('%s week', '%s weeks', $match[1], I18N::digits($match[1]));
-							case 'd':
-								return I18N::plural('%s day', '%s days', $match[1], I18N::digits($match[1]));
-						}
+		case 'CHILD':
+			return I18N::translate('Child');
+		case 'INFANT':
+			return I18N::translate('Infant');
+		case 'STILLBORN':
+			return I18N::translate('Stillborn');
+		default:
+			return preg_replace_callback(
+				array(
+					'/(\d+)([ymwd])/',
+				),
+				function ($match) use ($age_string, $show_years) {
+					switch ($match[2]) {
+					case 'y':
+					if ($show_years || preg_match('/[dm]/', $age_string)) {
+					return I18N::plural('%s year', '%s years', $match[1], I18N::digits($match[1]));
+					} else {
+					return I18N::digits($match[1]);
+					}
+					case 'm':
+					return I18N::plural('%s month', '%s months', $match[1], I18N::digits($match[1]));
+					case 'w':
+					return I18N::plural('%s week', '%s weeks', $match[1], I18N::digits($match[1]));
+					case 'd':
+					return I18N::plural('%s day', '%s days', $match[1], I18N::digits($match[1]));
+					}
 					},
 					$age_string
 				);
@@ -79,40 +79,40 @@ 
 		preg_match_all('/%[^%]/', $time_fmt, $matches);
 		foreach ($matches[0] as $match) {
 			switch ($match) {
-				case '%a':
-					$t = gmdate('His', $time);
-					if ($t == '000000') {
-						$time_fmt = str_replace($match, /* I18N: time format “%a” - exactly 00:00:00 */
-							I18N::translate('midnight'), $time_fmt);
-					} elseif ($t < '120000') {
-						$time_fmt = str_replace($match, /* I18N: time format “%a” - between 00:00:01 and 11:59:59 */
-							I18N::translate('a.m.'), $time_fmt);
-					} elseif ($t == '120000') {
-						$time_fmt = str_replace($match, /* I18N: time format “%a” - exactly 12:00:00 */
-							I18N::translate('noon'), $time_fmt);
-					} else {
-						$time_fmt = str_replace($match, /* I18N: time format “%a” - between 12:00:01 and 23:59:59 */
-							I18N::translate('p.m.'), $time_fmt);
-					}
-					break;
-				case '%A':
-					$t = gmdate('His', $time);
-					if ($t == '000000') {
-						$time_fmt = str_replace($match, /* I18N: time format “%A” - exactly 00:00:00 */
-							I18N::translate('Midnight'), $time_fmt);
-					} elseif ($t < '120000') {
-						$time_fmt = str_replace($match, /* I18N: time format “%A” - between 00:00:01 and 11:59:59 */
-							I18N::translate('A.M.'), $time_fmt);
-					} elseif ($t == '120000') {
-						$time_fmt = str_replace($match, /* I18N: time format “%A” - exactly 12:00:00 */
-							I18N::translate('Noon'), $time_fmt);
-					} else {
-						$time_fmt = str_replace($match, /* I18N: time format “%A” - between 12:00:01 and 23:59:59 */
-							I18N::translate('P.M.'), $time_fmt);
-					}
-					break;
-				default:
-					$time_fmt = str_replace($match, I18N::digits(gmdate(substr($match, -1), $time)), $time_fmt);
+			case '%a':
+				$t = gmdate('His', $time);
+				if ($t == '000000') {
+					$time_fmt = str_replace($match, /* I18N: time format “%a” - exactly 00:00:00 */
+						I18N::translate('midnight'), $time_fmt);
+				} elseif ($t < '120000') {
+					$time_fmt = str_replace($match, /* I18N: time format “%a” - between 00:00:01 and 11:59:59 */
+						I18N::translate('a.m.'), $time_fmt);
+				} elseif ($t == '120000') {
+					$time_fmt = str_replace($match, /* I18N: time format “%a” - exactly 12:00:00 */
+						I18N::translate('noon'), $time_fmt);
+				} else {
+					$time_fmt = str_replace($match, /* I18N: time format “%a” - between 12:00:01 and 23:59:59 */
+						I18N::translate('p.m.'), $time_fmt);
+				}
+				break;
+			case '%A':
+				$t = gmdate('His', $time);
+				if ($t == '000000') {
+					$time_fmt = str_replace($match, /* I18N: time format “%A” - exactly 00:00:00 */
+						I18N::translate('Midnight'), $time_fmt);
+				} elseif ($t < '120000') {
+					$time_fmt = str_replace($match, /* I18N: time format “%A” - between 00:00:01 and 11:59:59 */
+						I18N::translate('A.M.'), $time_fmt);
+				} elseif ($t == '120000') {
+					$time_fmt = str_replace($match, /* I18N: time format “%A” - exactly 12:00:00 */
+						I18N::translate('Noon'), $time_fmt);
+				} else {
+					$time_fmt = str_replace($match, /* I18N: time format “%A” - between 12:00:01 and 23:59:59 */
+						I18N::translate('P.M.'), $time_fmt);
+				}
+				break;
+			default:
+				$time_fmt = str_replace($match, I18N::digits(gmdate(substr($match, -1), $time)), $time_fmt);
 			}
 		}
 

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2016 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+	 * webtrees: online genealogy
+	 * Copyright (C) 2016 webtrees development team
+	 * This program is free software: you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License as published by
+	 * the Free Software Foundation, either version 3 of the License, or
+	 * (at your option) any later version.
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	 * GNU General Public License for more details.
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program. If not, see <http://www.gnu.org/licenses/>.
+	 */
 namespace Fisharebest\Webtrees;
 
 use Fisharebest\Webtrees\Theme\AdministrationTheme;

app/Functions/FunctionsDb.php

Switch Indentation +100 added lines, -100 removed lines

@@ -248,18 +248,18 @@ 
 	 */
 	public static function searchIndividualsPhonetic($soundex, $lastname, $firstname, $place, array $trees) {
 		switch ($soundex) {
-			case 'Russell':
-				$givn_sdx = Soundex::russell($firstname);
-				$surn_sdx = Soundex::russell($lastname);
-				$plac_sdx = Soundex::russell($place);
-				break;
-			case 'DaitchM':
-				$givn_sdx = Soundex::daitchMokotoff($firstname);
-				$surn_sdx = Soundex::daitchMokotoff($lastname);
-				$plac_sdx = Soundex::daitchMokotoff($place);
-				break;
-			default:
-				throw new \DomainException('soundex: ' . $soundex);
+		case 'Russell':
+			$givn_sdx = Soundex::russell($firstname);
+			$surn_sdx = Soundex::russell($lastname);
+			$plac_sdx = Soundex::russell($place);
+			break;
+		case 'DaitchM':
+			$givn_sdx = Soundex::daitchMokotoff($firstname);
+			$surn_sdx = Soundex::daitchMokotoff($lastname);
+			$plac_sdx = Soundex::daitchMokotoff($place);
+			break;
+		default:
+			throw new \DomainException('soundex: ' . $soundex);
 		}
 
 		// Nothing to search for?  Return nothing.
@@ -291,12 +291,12 @@ 
 			foreach ($givn_sdx as $n => $sdx) {
 				$sql .= $n ? " OR " : "";
 				switch ($soundex) {
-					case 'Russell':
-						$sql .= "n_soundex_givn_std LIKE CONCAT('%', :given_name_" . $n . ", '%')";
-						break;
-					case 'DaitchM':
-						$sql .= "n_soundex_givn_dm LIKE CONCAT('%', :given_name_" . $n . ", '%')";
-						break;
+				case 'Russell':
+					$sql .= "n_soundex_givn_std LIKE CONCAT('%', :given_name_" . $n . ", '%')";
+					break;
+				case 'DaitchM':
+					$sql .= "n_soundex_givn_dm LIKE CONCAT('%', :given_name_" . $n . ", '%')";
+					break;
 				}
 				$args['given_name_' . $n] = $sdx;
 			}
@@ -309,12 +309,12 @@ 
 			foreach ($surn_sdx as $n => $sdx) {
 				$sql .= $n ? " OR " : "";
 				switch ($soundex) {
-					case 'Russell':
-						$sql .= "n_soundex_surn_std LIKE CONCAT('%', :surname_" . $n . ", '%')";
-						break;
-					case 'DaitchM':
-						$sql .= "n_soundex_surn_dm LIKE CONCAT('%', :surname_" . $n . ", '%')";
-						break;
+				case 'Russell':
+					$sql .= "n_soundex_surn_std LIKE CONCAT('%', :surname_" . $n . ", '%')";
+					break;
+				case 'DaitchM':
+					$sql .= "n_soundex_surn_dm LIKE CONCAT('%', :surname_" . $n . ", '%')";
+					break;
 				}
 				$args['surname_' . $n] = $sdx;
 			}
@@ -327,12 +327,12 @@ 
 			foreach ($plac_sdx as $n => $sdx) {
 				$sql .= $n ? " OR " : "";
 				switch ($soundex) {
-					case 'Russell':
-						$sql .= "p_std_soundex LIKE CONCAT('%', :place_" . $n . ", '%')";
-						break;
-					case 'DaitchM':
-						$sql .= "p_dm_soundex LIKE CONCAT('%', :place_" . $n . ", '%')";
-						break;
+				case 'Russell':
+					$sql .= "p_std_soundex LIKE CONCAT('%', :place_" . $n . ", '%')";
+					break;
+				case 'DaitchM':
+					$sql .= "p_dm_soundex LIKE CONCAT('%', :place_" . $n . ", '%')";
+					break;
 				}
 				$args['place_' . $n] = $sdx;
 			}
@@ -790,82 +790,82 @@ 
 			} else {
 				// SPECIAL CASES:
 				switch ($anniv->m) {
-					case 2:
-						// 29 CSH does not include 30 CSH (but would include an invalid 31 CSH if there were no 30 CSH)
-						if ($anniv->d === 1) {
-							$where .= " AND d_day <= 1 AND d_mon = 2";
-						} elseif ($anniv->d === 30) {
-							$where .= " AND d_day >= 30 AND d_mon = 2";
-						} elseif ($anniv->d === 29 && $anniv->daysInMonth() === 29) {
-							$where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 2";
-						} else {
-							$where .= " AND d_day = :day AND d_mon = 2";
-							$args['day'] = $anniv->d;
-						}
-						break;
-					case 3:
-						// 1 KSL includes 30 CSH (if this year didn’t have 30 CSH)
-						// 29 KSL does not include 30 KSL (but would include an invalid 31 KSL if there were no 30 KSL)
-						if ($anniv->d === 1) {
-							$tmp = new JewishDate(array($anniv->y, 'CSH', 1));
-							if ($tmp->daysInMonth() === 29) {
-								$where .= " AND (d_day <= 1 AND d_mon = 3 OR d_day = 30 AND d_mon = 2)";
-							} else {
-								$where .= " AND d_day <= 1 AND d_mon = 3";
-							}
-						} elseif ($anniv->d === 30) {
-							$where .= " AND d_day >= 30 AND d_mon = 3";
-						} elseif ($anniv->d == 29 && $anniv->daysInMonth() === 29) {
-							$where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 3";
-						} else {
-							$where .= " AND d_day = :day AND d_mon = 3";
-							$args['day'] = $anniv->d;
-						}
-						break;
-					case 4:
-						// 1 TVT includes 30 KSL (if this year didn’t have 30 KSL)
-						if ($anniv->d === 1) {
-							$tmp = new JewishDate(array($anniv->y, 'KSL', 1));
-							if ($tmp->daysInMonth() === 29) {
-								$where .= " AND (d_day <=1 AND d_mon = 4 OR d_day = 30 AND d_mon = 3)";
-							} else {
-								$where .= " AND d_day <= 1 AND d_mon = 4";
-							}
-						} elseif ($anniv->d === $anniv->daysInMonth()) {
-							$where .= " AND d_day >= :day AND d_mon=4";
-							$args['day'] = $anniv->d;
+				case 2:
+					// 29 CSH does not include 30 CSH (but would include an invalid 31 CSH if there were no 30 CSH)
+					if ($anniv->d === 1) {
+						$where .= " AND d_day <= 1 AND d_mon = 2";
+					} elseif ($anniv->d === 30) {
+						$where .= " AND d_day >= 30 AND d_mon = 2";
+					} elseif ($anniv->d === 29 && $anniv->daysInMonth() === 29) {
+						$where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 2";
+					} else {
+						$where .= " AND d_day = :day AND d_mon = 2";
+						$args['day'] = $anniv->d;
+					}
+					break;
+				case 3:
+					// 1 KSL includes 30 CSH (if this year didn’t have 30 CSH)
+					// 29 KSL does not include 30 KSL (but would include an invalid 31 KSL if there were no 30 KSL)
+					if ($anniv->d === 1) {
+						$tmp = new JewishDate(array($anniv->y, 'CSH', 1));
+						if ($tmp->daysInMonth() === 29) {
+							$where .= " AND (d_day <= 1 AND d_mon = 3 OR d_day = 30 AND d_mon = 2)";
 						} else {
-							$where .= " AND d_day = :day AND d_mon=4";
-							$args['day'] = $anniv->d;
+							$where .= " AND d_day <= 1 AND d_mon = 3";
 						}
-						break;
-					case 7: // ADS includes ADR (non-leap)
-						if ($anniv->d === 1) {
-							$where .= " AND d_day <= 1";
-						} elseif ($anniv->d === $anniv->daysInMonth()) {
-							$where .= " AND d_day >= :day";
-							$args['day'] = $anniv->d;
+					} elseif ($anniv->d === 30) {
+						$where .= " AND d_day >= 30 AND d_mon = 3";
+					} elseif ($anniv->d == 29 && $anniv->daysInMonth() === 29) {
+						$where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 3";
+					} else {
+						$where .= " AND d_day = :day AND d_mon = 3";
+						$args['day'] = $anniv->d;
+					}
+					break;
+				case 4:
+					// 1 TVT includes 30 KSL (if this year didn’t have 30 KSL)
+					if ($anniv->d === 1) {
+						$tmp = new JewishDate(array($anniv->y, 'KSL', 1));
+						if ($tmp->daysInMonth() === 29) {
+							$where .= " AND (d_day <=1 AND d_mon = 4 OR d_day = 30 AND d_mon = 3)";
 						} else {
-							$where .= " AND d_day = :day";
-							$args['day'] = $anniv->d;
+							$where .= " AND d_day <= 1 AND d_mon = 4";
 						}
-						$where .= " AND (d_mon = 6 AND MOD(7 * d_year + 1, 19) >= 7 OR d_mon = 7)";
-						break;
-					case 8: // 1 NSN includes 30 ADR, if this year is non-leap
-						if ($anniv->d === 1) {
-							if ($anniv->isLeapYear()) {
-								$where .= " AND d_day <= 1 AND d_mon = 8";
-							} else {
-								$where .= " AND (d_day <= 1 AND d_mon = 8 OR d_day = 30 AND d_mon = 6)";
-							}
-						} elseif ($anniv->d === $anniv->daysInMonth()) {
-							$where .= " AND d_day >= :day AND d_mon = 8";
-							$args['day'] = $anniv->d;
+					} elseif ($anniv->d === $anniv->daysInMonth()) {
+						$where .= " AND d_day >= :day AND d_mon=4";
+						$args['day'] = $anniv->d;
+					} else {
+						$where .= " AND d_day = :day AND d_mon=4";
+						$args['day'] = $anniv->d;
+					}
+					break;
+				case 7: // ADS includes ADR (non-leap)
+					if ($anniv->d === 1) {
+						$where .= " AND d_day <= 1";
+					} elseif ($anniv->d === $anniv->daysInMonth()) {
+						$where .= " AND d_day >= :day";
+						$args['day'] = $anniv->d;
+					} else {
+						$where .= " AND d_day = :day";
+						$args['day'] = $anniv->d;
+					}
+					$where .= " AND (d_mon = 6 AND MOD(7 * d_year + 1, 19) >= 7 OR d_mon = 7)";
+					break;
+				case 8: // 1 NSN includes 30 ADR, if this year is non-leap
+					if ($anniv->d === 1) {
+						if ($anniv->isLeapYear()) {
+							$where .= " AND d_day <= 1 AND d_mon = 8";
 						} else {
-							$where .= " AND d_day = :day AND d_mon = 8";
-							$args['day'] = $anniv->d;
+							$where .= " AND (d_day <= 1 AND d_mon = 8 OR d_day = 30 AND d_mon = 6)";
 						}
-						break;
+					} elseif ($anniv->d === $anniv->daysInMonth()) {
+						$where .= " AND d_day >= :day AND d_mon = 8";
+						$args['day'] = $anniv->d;
+					} else {
+						$where .= " AND d_day = :day AND d_mon = 8";
+						$args['day'] = $anniv->d;
+					}
+					break;
 				}
 			}
 			// Only events in the past (includes dates without a year)

Indentation +20 added lines, -20 removed lines

@@ -1,18 +1,18 @@ 
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2016 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+	 * webtrees: online genealogy
+	 * Copyright (C) 2016 webtrees development team
+	 * This program is free software: you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License as published by
+	 * the Free Software Foundation, either version 3 of the License, or
+	 * (at your option) any later version.
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	 * GNU General Public License for more details.
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program. If not, see <http://www.gnu.org/licenses/>.
+	 */
 namespace Fisharebest\Webtrees\Functions;
 
 use Fisharebest\Webtrees\Auth;
@@ -749,13 +749,13 @@ 
 	public static function getAnniversaryEvents($jd, $facts, Tree $tree) {
 		$found_facts = array();
 		foreach (array(
-			         new GregorianDate($jd),
-			         new JulianDate($jd),
-			         new FrenchDate($jd),
-			         new JewishDate($jd),
-			         new HijriDate($jd),
-			         new JalaliDate($jd),
-		         ) as $anniv) {
+							 new GregorianDate($jd),
+							 new JulianDate($jd),
+							 new FrenchDate($jd),
+							 new JewishDate($jd),
+							 new HijriDate($jd),
+							 new JalaliDate($jd),
+						 ) as $anniv) {
 			// Build a SQL where clause to match anniversaries in the appropriate calendar.
 			$ind_sql =
 				"SELECT DISTINCT i_id AS xref, i_gedcom AS gedcom, d_type, d_day, d_month, d_year, d_fact" .

app/Functions/FunctionsExport.php

Switch Indentation +21 added lines, -21 removed lines

@@ -183,18 +183,18 @@ 
 	 */
 	public static function exportGedcom(Tree $tree, $gedout, $exportOptions) {
 		switch ($exportOptions['privatize']) {
-			case 'gedadmin':
-				$access_level = Auth::PRIV_NONE;
-				break;
-			case 'user':
-				$access_level = Auth::PRIV_USER;
-				break;
-			case 'visitor':
-				$access_level = Auth::PRIV_PRIVATE;
-				break;
-			case 'none':
-				$access_level = Auth::PRIV_HIDE;
-				break;
+		case 'gedadmin':
+			$access_level = Auth::PRIV_NONE;
+			break;
+		case 'user':
+			$access_level = Auth::PRIV_USER;
+			break;
+		case 'visitor':
+			$access_level = Auth::PRIV_PRIVATE;
+			break;
+		case 'none':
+			$access_level = Auth::PRIV_HIDE;
+			break;
 		}
 
 		$head = self::gedcomHeader($tree);
@@ -251,15 +251,15 @@ 
 
 		foreach ($rows as $row) {
 			switch ($row->type) {
-				case 'NOTE':
-					$record = Note::getInstance($row->xref, $tree, $row->gedcom);
-					break;
-				case 'REPO':
-					$record = Repository::getInstance($row->xref, $tree, $row->gedcom);
-					break;
-				default:
-					$record = GedcomRecord::getInstance($row->xref, $tree, $row->gedcom);
-					break;
+			case 'NOTE':
+				$record = Note::getInstance($row->xref, $tree, $row->gedcom);
+				break;
+			case 'REPO':
+				$record = Repository::getInstance($row->xref, $tree, $row->gedcom);
+				break;
+			default:
+				$record = GedcomRecord::getInstance($row->xref, $tree, $row->gedcom);
+				break;
 			}
 
 			$rec = $record->privatizeGedcom($access_level);

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2016 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+	 * webtrees: online genealogy
+	 * Copyright (C) 2016 webtrees development team
+	 * This program is free software: you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License as published by
+	 * the Free Software Foundation, either version 3 of the License, or
+	 * (at your option) any later version.
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	 * GNU General Public License for more details.
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program. If not, see <http://www.gnu.org/licenses/>.
+	 */
 namespace Fisharebest\Webtrees;
 
 use Fisharebest\Webtrees\Theme\AdministrationTheme;

app/Functions/FunctionsMedia.php

Switch Indentation +11 added lines, -11 removed lines

@@ -34,17 +34,17 @@
 			$val = -1;
 		}
 		switch (substr($val, -1)) {
-			case 'g':
-			case 'G':
-				return (int) $val * 1024 * 1024 * 1024;
-			case 'm':
-			case 'M':
-				return (int) $val * 1024 * 1024;
-			case 'k':
-			case 'K':
-				return (int) $val * 1024;
-			default:
-				return (int) $val;
+		case 'g':
+		case 'G':
+			return (int) $val * 1024 * 1024 * 1024;
+		case 'm':
+		case 'M':
+			return (int) $val * 1024 * 1024;
+		case 'k':
+		case 'K':
+			return (int) $val * 1024;
+		default:
+			return (int) $val;
 		}
 	}
 

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2016 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+	 * webtrees: online genealogy
+	 * Copyright (C) 2016 webtrees development team
+	 * This program is free software: you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License as published by
+	 * the Free Software Foundation, either version 3 of the License, or
+	 * (at your option) any later version.
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	 * GNU General Public License for more details.
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program. If not, see <http://www.gnu.org/licenses/>.
+	 */
 namespace Fisharebest\Webtrees;
 
 use Fisharebest\Webtrees\Theme\AdministrationTheme;

app/Functions/FunctionsPrint.php

Switch Indentation +60 added lines, -60 removed lines

@@ -50,20 +50,20 @@ 
 	public static function printPedigreePerson(Individual $person = null, $show_full = 1) {
 
 		switch ($show_full) {
-			case 0:
-				if ($person) {
-					echo Theme::theme()->individualBoxSmall($person);
-				} else {
-					echo Theme::theme()->individualBoxSmallEmpty();
-				}
-				break;
-			case 1:
-				if ($person) {
-					echo Theme::theme()->individualBox($person);
-				} else {
-					echo Theme::theme()->individualBoxEmpty();
-				}
-				break;
+		case 0:
+			if ($person) {
+				echo Theme::theme()->individualBoxSmall($person);
+			} else {
+				echo Theme::theme()->individualBoxSmallEmpty();
+			}
+			break;
+		case 1:
+			if ($person) {
+				echo Theme::theme()->individualBox($person);
+			} else {
+				echo Theme::theme()->individualBoxEmpty();
+			}
+			break;
 		}
 	}
 
@@ -259,25 +259,25 @@ 
 					$age      = Date::getAge($parent->getBirthDate(), $birth_date, 2);
 					$deatdate = $parent->getDeathDate();
 					switch ($parent->getSex()) {
-						case 'F':
-							// Highlight mothers who die in childbirth or shortly afterwards
-							if ($deatdate->isOK() && $deatdate->maximumJulianDay() < $birth_date->minimumJulianDay() + 90) {
-								$html .= ' <span title="' . GedcomTag::getLabel('_DEAT_PARE', $parent) . '" class="parentdeath">' . $sex . $age . '</span>';
-							} else {
-								$html .= ' <span title="' . I18N::translate('Mother’s age') . '">' . $sex . $age . '</span>';
-							}
-							break;
-						case 'M':
-							// Highlight fathers who die before the birth
-							if ($deatdate->isOK() && $deatdate->maximumJulianDay() < $birth_date->minimumJulianDay()) {
-								$html .= ' <span title="' . GedcomTag::getLabel('_DEAT_PARE', $parent) . '" class="parentdeath">' . $sex . $age . '</span>';
-							} else {
-								$html .= ' <span title="' . I18N::translate('Father’s age') . '">' . $sex . $age . '</span>';
-							}
-							break;
-						default:
-							$html .= ' <span title="' . I18N::translate('Parent’s age') . '">' . $sex . $age . '</span>';
-							break;
+					case 'F':
+						// Highlight mothers who die in childbirth or shortly afterwards
+						if ($deatdate->isOK() && $deatdate->maximumJulianDay() < $birth_date->minimumJulianDay() + 90) {
+							$html .= ' <span title="' . GedcomTag::getLabel('_DEAT_PARE', $parent) . '" class="parentdeath">' . $sex . $age . '</span>';
+						} else {
+							$html .= ' <span title="' . I18N::translate('Mother’s age') . '">' . $sex . $age . '</span>';
+						}
+						break;
+					case 'M':
+						// Highlight fathers who die before the birth
+						if ($deatdate->isOK() && $deatdate->maximumJulianDay() < $birth_date->minimumJulianDay()) {
+							$html .= ' <span title="' . GedcomTag::getLabel('_DEAT_PARE', $parent) . '" class="parentdeath">' . $sex . $age . '</span>';
+						} else {
+							$html .= ' <span title="' . I18N::translate('Father’s age') . '">' . $sex . $age . '</span>';
+						}
+						break;
+					default:
+						$html .= ' <span title="' . I18N::translate('Parent’s age') . '">' . $sex . $age . '</span>';
+						break;
 					}
 				}
 			}
@@ -578,33 +578,33 @@ 
 
 		// -- Add from pick list
 		switch ($type) {
-			case "INDI":
-				$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('INDI_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
-				$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('INDI_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
-				$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('INDI_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
-				break;
-			case "FAM":
-				$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('FAM_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
-				$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('FAM_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
-				$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('FAM_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
-				break;
-			case "SOUR":
-				$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('SOUR_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
-				$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('SOUR_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
-				$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('SOUR_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
-				break;
-			case "NOTE":
-				$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('NOTE_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
-				$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('NOTE_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
-				$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('NOTE_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
-				break;
-			case "REPO":
-				$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('REPO_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
-				$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('REPO_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
-				$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('REPO_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
-				break;
-			default:
-				return;
+		case "INDI":
+			$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('INDI_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
+			$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('INDI_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
+			$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('INDI_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
+			break;
+		case "FAM":
+			$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('FAM_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
+			$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('FAM_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
+			$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('FAM_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
+			break;
+		case "SOUR":
+			$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('SOUR_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
+			$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('SOUR_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
+			$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('SOUR_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
+			break;
+		case "NOTE":
+			$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('NOTE_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
+			$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('NOTE_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
+			$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('NOTE_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
+			break;
+		case "REPO":
+			$addfacts    = preg_split("/[, ;:]+/", $WT_TREE->getPreference('REPO_FACTS_ADD'), -1, PREG_SPLIT_NO_EMPTY);
+			$uniquefacts = preg_split("/[, ;:]+/", $WT_TREE->getPreference('REPO_FACTS_UNIQUE'), -1, PREG_SPLIT_NO_EMPTY);
+			$quickfacts  = preg_split("/[, ;:]+/", $WT_TREE->getPreference('REPO_FACTS_QUICK'), -1, PREG_SPLIT_NO_EMPTY);
+			break;
+		default:
+			return;
 		}
 		$addfacts            = array_merge(self::checkFactUnique($uniquefacts, $usedfacts, $type), $addfacts);
 		$quickfacts          = array_intersect($quickfacts, $addfacts);

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2016 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+	 * webtrees: online genealogy
+	 * Copyright (C) 2016 webtrees development team
+	 * This program is free software: you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License as published by
+	 * the Free Software Foundation, either version 3 of the License, or
+	 * (at your option) any later version.
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	 * GNU General Public License for more details.
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program. If not, see <http://www.gnu.org/licenses/>.
+	 */
 namespace Fisharebest\Webtrees;
 
 use Fisharebest\Webtrees\Theme\AdministrationTheme;

app/Module/CensusAssistantModule.php

Spacing +3 added lines, -3 removed lines

@@ -425,10 +425,10 @@ 
 	 * @return string
 	 */
 	public static function censusNavigatorFamily(CensusInterface $census, Family $family, Individual $head) {
-		$headImg2  = '<i class="icon-button_head" title="' . I18N::translate('Click to choose individual as head of family.') . '"></i>';
+		$headImg2 = '<i class="icon-button_head" title="' . I18N::translate('Click to choose individual as head of family.') . '"></i>';
 
 		foreach ($family->getSpouses() as $spouse) {
-			$menu  = new Menu(Functions::getCloseRelationshipName($head, $spouse));
+			$menu = new Menu(Functions::getCloseRelationshipName($head, $spouse));
 			foreach ($spouse->getChildFamilies() as $grandparents) {
 				foreach ($grandparents->getSpouses() as $grandparent) {
 					$submenu = new Menu(
@@ -463,7 +463,7 @@ 
 		}
 
 		foreach ($family->getChildren() as $child) {
-			$menu  = new Menu(Functions::getCloseRelationshipName($head, $child));
+			$menu = new Menu(Functions::getCloseRelationshipName($head, $child));
 			foreach ($child->getSpouseFamilies() as $spouse_family) {
 				foreach ($spouse_family->getSpouses() as $spouse_family_spouse) {
 					if ($spouse_family_spouse != $child) {

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2016 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+	 * webtrees: online genealogy
+	 * Copyright (C) 2016 webtrees development team
+	 * This program is free software: you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License as published by
+	 * the Free Software Foundation, either version 3 of the License, or
+	 * (at your option) any later version.
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	 * GNU General Public License for more details.
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program. If not, see <http://www.gnu.org/licenses/>.
+	 */
 namespace Fisharebest\Webtrees;
 
 use Fisharebest\Webtrees\Theme\AdministrationTheme;