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;
-				}
-				// -- compact the tree
-				if ($curgen < $this->generations) {
-					if ($i % 2 == 0) {
-						$yoffset = $yoffset - (($boxspacing / 2) * ($curgen - 1));
-					} else {
-						$yoffset = $yoffset + (($boxspacing / 2) * ($curgen - 1));
+				case self::PORTRAIT:
+					$xoffset = ($this->generations - $curgen) * (($this->getBoxDimensions()->width + $bxspacing) / 1.8);
+					if (!$i && $this->root->getSpouseFamilies()) {
+						$xoffset -= self::ARROW_SIZE;
 					}
-					$parent = (int) (($i - 1) / 2);
-					$pgen   = $curgen;
-					while ($parent > 0) {
-						if ($parent % 2 == 0) {
-							$yoffset = $yoffset - (($boxspacing / 2) * $pgen);
+					// -- compact the tree
+					if ($curgen < $this->generations) {
+						if ($i % 2 == 0) {
+							$yoffset = $yoffset - (($boxspacing / 2) * ($curgen - 1));
 						} else {
-							$yoffset = $yoffset + (($boxspacing / 2) * $pgen);
+							$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);
 						}
-						$pgen++;
-						if ($pgen > 3) {
+						if ($curgen > 3) {
 							$temp = 0;
-							for ($j = 1; $j < ($pgen - 2); $j++) {
+							for ($j = 1; $j < ($curgen - 2); $j++) {
 								$temp += (pow(2, $j) - 1);
 							}
-							if ($parent % 2 == 0) {
+							if ($i % 2 == 0) {
 								$yoffset = $yoffset - (($boxspacing / 2) * $temp);
 							} else {
 								$yoffset = $yoffset + (($boxspacing / 2) * $temp);
 							}
 						}
-						$parent = (int) (($parent - 1) / 2);
 					}
-					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);
-						}
+					$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;
 					}
-				}
-				$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;
+					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;

app/Controller/IndividualController.php

Switch Indentation +52 added lines, -52 removed lines

@@ -182,22 +182,22 @@ 
 							$name = str_replace('/', '', $name);
 							$name = preg_replace('/(\S*)\*/', '<span class="starredname">\\1</span>', $name);
 							switch ($fact) {
-							case 'TYPE':
-								echo GedcomCodeName::getValue($name, $this->record);
-								break;
-							case 'SURN':
-								// The SURN field is not necessarily the surname.
-								// Where it is not a substring of the real surname, show it after the real surname.
-								$surname = Filter::escapeHtml($primary_name['surname']);
-								if (strpos($primary_name['surname'], str_replace(',', ' ', $nmatch[$i][2])) !== false) {
-									echo '<span dir="auto">' . $surname . '</span>';
-								} else {
-									echo I18N::translate('%1$s (%2$s)', '<span dir="auto">' . $surname . '</span>', '<span dir="auto">' . $name . '</span>');
-								}
-								break;
-							default:
-								echo '<span dir="auto">' . $name . '</span>';
-								break;
+								case 'TYPE':
+									echo GedcomCodeName::getValue($name, $this->record);
+									break;
+								case 'SURN':
+									// The SURN field is not necessarily the surname.
+									// Where it is not a substring of the real surname, show it after the real surname.
+									$surname = Filter::escapeHtml($primary_name['surname']);
+									if (strpos($primary_name['surname'], str_replace(',', ' ', $nmatch[$i][2])) !== false) {
+										echo '<span dir="auto">' . $surname . '</span>';
+									} else {
+										echo I18N::translate('%1$s (%2$s)', '<span dir="auto">' . $surname . '</span>', '<span dir="auto">' . $name . '</span>');
+									}
+									break;
+								default:
+									echo '<span dir="auto">' . $name . '</span>';
+									break;
 							}
 						}
 					echo '</dd>';
@@ -232,33 +232,33 @@ 
 			echo 'new ';
 		}
 		switch ($sex) {
-		case 'M':
-			echo 'male_gender"';
-			if ($event->canEdit()) {
-				echo ' title="', I18N::translate('Male'), ' - ', I18N::translate('Edit'), '"';
-				echo ' onclick="edit_record(\'' . $this->record->getXref() . '\', \'' . $event->getFactId() . '\'); return false;">';
-			 } else {
-				echo ' title="', I18N::translate('Male'), '">';
-			 }
-			break;
-		case 'F':
-			echo 'female_gender"';
-			if ($event->canEdit()) {
-				echo ' title="', I18N::translate('Female'), ' - ', I18N::translate('Edit'), '"';
-				echo ' onclick="edit_record(\'' . $this->record->getXref() . '\', \'' . $event->getFactId() . '\'); return false;">';
-			 } else {
-				echo ' title="', I18N::translate('Female'), '">';
-			 }
-			break;
-		default:
-			echo 'unknown_gender"';
-			if ($event->canEdit()) {
-				echo ' title="', I18N::translateContext('unknown gender', 'Unknown'), ' - ', I18N::translate('Edit'), '"';
-				echo ' onclick="edit_record(\'' . $this->record->getXref() . '\', \'' . $event->getFactId() . '\'); return false;">';
-			 } else {
-				echo ' title="', I18N::translateContext('unknown gender', 'Unknown'), '">';
-			 }
-			break;
+			case 'M':
+				echo 'male_gender"';
+				if ($event->canEdit()) {
+					echo ' title="', I18N::translate('Male'), ' - ', I18N::translate('Edit'), '"';
+					echo ' onclick="edit_record(\'' . $this->record->getXref() . '\', \'' . $event->getFactId() . '\'); return false;">';
+			 	} else {
+					echo ' title="', I18N::translate('Male'), '">';
+			 	}
+				break;
+			case 'F':
+				echo 'female_gender"';
+				if ($event->canEdit()) {
+					echo ' title="', I18N::translate('Female'), ' - ', I18N::translate('Edit'), '"';
+					echo ' onclick="edit_record(\'' . $this->record->getXref() . '\', \'' . $event->getFactId() . '\'); return false;">';
+			 	} else {
+					echo ' title="', I18N::translate('Female'), '">';
+			 	}
+				break;
+			default:
+				echo 'unknown_gender"';
+				if ($event->canEdit()) {
+					echo ' title="', I18N::translateContext('unknown gender', 'Unknown'), ' - ', I18N::translate('Edit'), '"';
+					echo ' onclick="edit_record(\'' . $this->record->getXref() . '\', \'' . $event->getFactId() . '\'); return false;">';
+			 	} else {
+					echo ' title="', I18N::translateContext('unknown gender', 'Unknown'), '">';
+			 	}
+				break;
 		}
 		echo '</span>';
 	}
@@ -324,15 +324,15 @@ 
 	 */
 	public function getPersonStyle($person) {
 		switch ($person->getSex()) {
-		case 'M':
-			$class = 'person_box';
-			break;
-		case 'F':
-			$class = 'person_boxF';
-			break;
-		default:
-			$class = 'person_boxNN';
-			break;
+			case 'M':
+				$class = 'person_box';
+				break;
+			case 'F':
+				$class = 'person_boxF';
+				break;
+			default:
+				$class = 'person_boxNN';
+				break;
 		}
 		if ($person->isPendingDeletion()) {
 			$class .= ' old';

app/Controller/FanchartController.php

Switch Indentation +19 added lines, -19 removed lines

@@ -247,15 +247,15 @@ 
 					$text .= "\n" . I18N::reverseText($person->getLifeSpan());
 
 					switch ($person->getSex()) {
-					case 'M':
-						$bg = $bgcolorM;
-						break;
-					case 'F':
-						$bg = $bgcolorF;
-						break;
-					default:
-						$bg = $bgcolor;
-						break;
+						case 'M':
+							$bg = $bgcolorM;
+							break;
+						case 'F':
+							$bg = $bgcolorF;
+							break;
+						default:
+							$bg = $bgcolor;
+							break;
 					}
 
 					imagefilledarc($image, $cx, $cy, $rx, $rx, $deg1, $deg2, $bg, IMG_ARC_PIE);
@@ -366,19 +366,19 @@ 
 		$imagemap .= '</map>';
 
 		switch ($what) {
-		case 'html':
-			return $html . $imagemap . '<div id="fan_chart_img"><img src="' . WT_SCRIPT_NAME . '?rootid=' . $this->root->getXref() . '&amp;fan_style=' . $this->fan_style . '&amp;generations=' . $this->generations . '&amp;fan_width=' . $this->fan_width . '&amp;img=1" width="' . $fanw . '" height="' . $fanh . '" alt="' . strip_tags($this->getPageTitle()) . '" usemap="#fanmap"></div>';
+			case 'html':
+				return $html . $imagemap . '<div id="fan_chart_img"><img src="' . WT_SCRIPT_NAME . '?rootid=' . $this->root->getXref() . '&amp;fan_style=' . $this->fan_style . '&amp;generations=' . $this->generations . '&amp;fan_width=' . $this->fan_width . '&amp;img=1" width="' . $fanw . '" height="' . $fanh . '" alt="' . strip_tags($this->getPageTitle()) . '" usemap="#fanmap"></div>';
 
-		case 'png':
-			imagestringup($image, 1, $fanw - 10, $fanh / 3, WT_BASE_URL, $color);
-			ob_start();
-			imagepng($image);
-			imagedestroy($image);
+			case 'png':
+				imagestringup($image, 1, $fanw - 10, $fanh / 3, WT_BASE_URL, $color);
+				ob_start();
+				imagepng($image);
+				imagedestroy($image);
 
-			return ob_get_clean();
+				return ob_get_clean();
 
-		default:
-			throw new \InvalidArgumentException(__METHOD__ . ' ' . $what);
+			default:
+				throw new \InvalidArgumentException(__METHOD__ . ' ' . $what);
 		}
 	}
 }

app/Controller/SearchController.php

Switch Indentation +38 added lines, -38 removed lines

@@ -170,46 +170,46 @@
 
 		// If we want to show associated persons, build the list
 		switch ($this->action) {
-		case 'header':
-			// We can type in an XREF into the header search, and jump straight to it.
-			// Otherwise, the header search is the same as the general search
-			if (preg_match('/' . WT_REGEX_XREF . '/', $this->query)) {
-				$record = GedcomRecord::getInstance($this->query, $WT_TREE);
-				if ($record && $record->canShowName()) {
-					header('Location: ' . WT_BASE_URL . $record->getRawUrl());
+			case 'header':
+				// We can type in an XREF into the header search, and jump straight to it.
+				// Otherwise, the header search is the same as the general search
+				if (preg_match('/' . WT_REGEX_XREF . '/', $this->query)) {
+					$record = GedcomRecord::getInstance($this->query, $WT_TREE);
+					if ($record && $record->canShowName()) {
+						header('Location: ' . WT_BASE_URL . $record->getRawUrl());
+						exit;
+					}
+				}
+				$this->action = 'general';
+				$this->srindi = 'checked';
+				$this->srfams = 'checked';
+				$this->srsour = 'checked';
+				$this->srnote = 'checked';
+				$this->setPageTitle(I18N::translate('General search'));
+				$this->generalSearch();
+				break;
+			case 'general':
+				$this->setPageTitle(I18N::translate('General search'));
+				$this->generalSearch();
+				break;
+			case 'soundex':
+				// Create a dummy search query to use as a title to the results list
+				$this->query = trim($this->firstname . ' ' . $this->lastname . ' ' . $this->place);
+				$this->setPageTitle(I18N::translate('Phonetic search'));
+				$this->soundexSearch();
+				break;
+			case 'replace':
+				$this->setPageTitle(I18N::translate('Search and replace'));
+				$this->search_trees = array($WT_TREE);
+				$this->srindi       = 'checked';
+				$this->srfams       = 'checked';
+				$this->srsour       = 'checked';
+				$this->srnote       = 'checked';
+				if (Filter::post('query')) {
+					$this->searchAndReplace($WT_TREE);
+					header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=replace&query=' . Filter::escapeUrl($this->query) . '&replace=' . Filter::escapeUrl($this->replace) . '&replaceAll=' . $this->replaceAll . '&replaceNames=' . $this->replaceNames . '&replacePlaces=' . $this->replacePlaces . '&replacePlacesWord=' . $this->replacePlacesWord);
 					exit;
 				}
-			}
-			$this->action = 'general';
-			$this->srindi = 'checked';
-			$this->srfams = 'checked';
-			$this->srsour = 'checked';
-			$this->srnote = 'checked';
-			$this->setPageTitle(I18N::translate('General search'));
-			$this->generalSearch();
-			break;
-		case 'general':
-			$this->setPageTitle(I18N::translate('General search'));
-			$this->generalSearch();
-			break;
-		case 'soundex':
-			// Create a dummy search query to use as a title to the results list
-			$this->query = trim($this->firstname . ' ' . $this->lastname . ' ' . $this->place);
-			$this->setPageTitle(I18N::translate('Phonetic search'));
-			$this->soundexSearch();
-			break;
-		case 'replace':
-			$this->setPageTitle(I18N::translate('Search and replace'));
-			$this->search_trees = array($WT_TREE);
-			$this->srindi       = 'checked';
-			$this->srfams       = 'checked';
-			$this->srsour       = 'checked';
-			$this->srnote       = 'checked';
-			if (Filter::post('query')) {
-				$this->searchAndReplace($WT_TREE);
-				header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=replace&query=' . Filter::escapeUrl($this->query) . '&replace=' . Filter::escapeUrl($this->replace) . '&replaceAll=' . $this->replaceAll . '&replaceNames=' . $this->replaceNames . '&replacePlaces=' . $this->replacePlaces . '&replacePlacesWord=' . $this->replacePlacesWord);
-				exit;
-			}
 		}
 	}
 

app/Controller/LifespanController.php

Switch Indentation +17 added lines, -17 removed lines

@@ -509,23 +509,23 @@
 	 */
 	public function getCalendarDate($date) {
 		switch ($this->calendar) {
-		case 'julian':
-			$caldate = new JulianDate($date);
-			break;
-		case 'french':
-			$caldate = new FrenchDate($date);
-			break;
-		case 'jewish':
-			$caldate = new JewishDate($date);
-			break;
-		case 'hijri':
-			$caldate = new HijriDate($date);
-			break;
-		case 'jalali':
-			$caldate = new JalaliDate($date);
-			break;
-		default:
-			$caldate = new GregorianDate($date);
+			case 'julian':
+				$caldate = new JulianDate($date);
+				break;
+			case 'french':
+				$caldate = new FrenchDate($date);
+				break;
+			case 'jewish':
+				$caldate = new JewishDate($date);
+				break;
+			case 'hijri':
+				$caldate = new HijriDate($date);
+				break;
+			case 'jalali':
+				$caldate = new JalaliDate($date);
+				break;
+			default:
+				$caldate = new GregorianDate($date);
 		}
 
 		return $caldate;

app/Report/ReportHtmlImage.php

Switch Indentation +14 added lines, -14 removed lines

@@ -43,20 +43,20 @@
 
 		// Image alignment
 		switch ($this->align) {
-		case "L":
-			echo "<div style=\"position:absolute;top:", $this->y, "pt;left:0pt;width:", $renderer->getRemainingWidth(), "pt;text-align:left;\">\n";
-			echo "<img src=\"", $this->file, "\" style=\"width:", $this->width, "pt;height:", $this->height, "pt;\" alt=\"\">\n</div>\n";
-			break;
-		case "C":
-			echo "<div style=\"position:absolute;top:", $this->y, "pt;left:0pt;width:", $renderer->getRemainingWidth(), "pt;text-align:center;\">\n";
-			echo "<img src=\"", $this->file, "\" style=\"width:", $this->width, "pt;height:", $this->height, "pt;\" alt=\"\">\n</div>\n";
-			break;
-		case "R":
-			echo "<div style=\"position:absolute;top:", $this->y, "pt;left:0pt;width:", $renderer->getRemainingWidth(), "pt;text-align:right;\">\n";
-			echo "<img src=\"", $this->file, "\" style=\"width:", $this->width, "pt;height:", $this->height, "pt;\" alt=\"\">\n</div>\n";
-			break;
-		default:
-			echo "<img src=\"", $this->file, "\" style=\"position:absolute;", $renderer->alignRTL, ":", $this->x, "pt;top:", $this->y, "pt;width:", $this->width, "pt;height:", $this->height, "pt;\" alt=\"\">\n";
+			case "L":
+				echo "<div style=\"position:absolute;top:", $this->y, "pt;left:0pt;width:", $renderer->getRemainingWidth(), "pt;text-align:left;\">\n";
+				echo "<img src=\"", $this->file, "\" style=\"width:", $this->width, "pt;height:", $this->height, "pt;\" alt=\"\">\n</div>\n";
+				break;
+			case "C":
+				echo "<div style=\"position:absolute;top:", $this->y, "pt;left:0pt;width:", $renderer->getRemainingWidth(), "pt;text-align:center;\">\n";
+				echo "<img src=\"", $this->file, "\" style=\"width:", $this->width, "pt;height:", $this->height, "pt;\" alt=\"\">\n</div>\n";
+				break;
+			case "R":
+				echo "<div style=\"position:absolute;top:", $this->y, "pt;left:0pt;width:", $renderer->getRemainingWidth(), "pt;text-align:right;\">\n";
+				echo "<img src=\"", $this->file, "\" style=\"width:", $this->width, "pt;height:", $this->height, "pt;\" alt=\"\">\n</div>\n";
+				break;
+			default:
+				echo "<img src=\"", $this->file, "\" style=\"position:absolute;", $renderer->alignRTL, ":", $this->x, "pt;top:", $this->y, "pt;width:", $this->width, "pt;height:", $this->height, "pt;\" alt=\"\">\n";
 		}
 
 		$lastpicpage   = $renderer->pageNo();

app/Report/ReportHtmlCell.php

Switch Indentation +9 added lines, -9 removed lines

@@ -147,15 +147,15 @@
 
 		// Text alignment
 		switch ($this->align) {
-		case "C":
-			echo " text-align:center;";
-			break;
-		case "L":
-			echo " text-align:left;";
-			break;
-		case "R":
-			echo " text-align:right;";
-			break;
+			case "C":
+				echo " text-align:center;";
+				break;
+			case "L":
+				echo " text-align:left;";
+				break;
+			case "R":
+				echo " text-align:right;";
+				break;
 		}
 
 		// Print the collected HTML code

app/Report/ReportBase.php

Switch Indentation +252 added lines, -252 removed lines

@@ -139,258 +139,258 @@
 			 */
 			switch ($this->pageFormat) {
 				// ISO A series
-			case '4A0': // ISO 216, 1682 mm x 2378 mm
-				$sizes = array(4767.86, 6740.79);
-				break;
-			case '2A0': // ISO 216, 1189 mm x 1682 mm
-				$sizes = array(3370.39, 4767.86);
-				break;
-			case 'A0': // ISO 216, 841 mm x 1189mm
-				$sizes = array(2383.94, 3370.39);
-				break;
-			case 'A1': // ISO 216, 594 mm x 841 mm
-				$sizes = array(1683.78, 2383.94);
-				break;
-			case 'A2': // ISO 216, 420 mm x 594 mm
-				$sizes = array(1190.55, 1683.78);
-				break;
-			case 'A3': // ISO 216, 297 mm x 420 mm
-				$sizes = array(841.89, 1190.55);
-				break;
-			case 'A4': // ISO 216, 210 mm 297 mm
-				$sizes = array(595.28, 841.89);
-				break;
-			case 'A5': // ISO 216, 148 mm x 210 mm
-				$sizes = array(419.53, 595.28);
-				break;
-			case 'A6': // ISO 216, 105 mm x 148 mm
-				$sizes = array(297.64, 419.53);
-				break;
-			case 'A7': // ISO 216, 74 mm x 105 mm
-				$sizes = array(209.76, 297.64);
-				break;
-			case 'A8': // ISO 216, 52 mm x 74 mm
-				$sizes = array(147.40, 209.76);
-				break;
-			case 'A9': // ISO 216, 37 mm x 52 mm
-				$sizes = array(104.88, 147.40);
-				break;
-			case 'A10': // ISO 216, 26 mm x 37 mm
-				$sizes = array(73.70, 104.88);
-				break;
-
-			// ISO B series
-			case 'B0': // ISO 216, 1000 mm x 1414 mm
-				$sizes = array(2834.65, 4008.19);
-				break;
-			case 'B1': // ISO 216, 707 mm x 1000 mm
-				$sizes = array(2004.09, 2834.65);
-				break;
-			case 'B2': // ISO 216, 500 mm x 707 mm
-				$sizes = array(1417.32, 2004.09);
-				break;
-			case 'B3': // ISO 216, 353 mm x 500 mm
-				$sizes = array(1000.63, 1417.32);
-				break;
-			case 'B4': // ISO 216, 250 mm x 353 mm
-				$sizes = array(708.66, 1000.63);
-				break;
-			case 'B5': // ISO 216, 176 mm x 250 mm
-				$sizes = array(498.90, 708.66);
-				break;
-			case 'B6': // ISO 216, 125 mm x 176 mm
-				$sizes = array(354.33, 498.90);
-				break;
-			case 'B7': // ISO 216, 88 mm x 125 mm
-				$sizes = array(249.45, 354.33);
-				break;
-			case 'B8': // ISO 216, 62 mm x 88 mm
-				$sizes = array(175.75, 249.45);
-				break;
-			case 'B9': // ISO 216, 44 mm x 62 mm
-				$sizes = array(124.72, 175.75);
-				break;
-			case 'B10': // ISO 216, 31 mm x 44 mm
-				$sizes = array(87.87, 124.72);
-				break;
-
-			// ISO C series, Envelope
-			case 'C0': // ISO 269, 917 mm x 1297 mm, For flat A0 sheet
-				$sizes = array(2599.37, 3676.54);
-				break;
-			case 'C1': // ISO 269, 648 mm x 917 mm, For flat A1 sheet
-				$sizes = array(1836.85, 2599.37);
-				break;
-			case 'C2': // ISO 269, 458 mm x 648 mm, For flat A2 sheet, A1 folded in half
-				$sizes = array(1298.27, 1836.85);
-				break;
-			case 'C3': // ISO 269, 324 mm x 458 mm, For flat A3 sheet, A2 folded in half
-				$sizes = array(918.43, 1298.27);
-				break;
-			case 'C4': // ISO 269, 229 mm x 324 mm, For flat A4 sheet, A3 folded in half
-				$sizes = array(649.13, 918.43);
-				break;
-			case 'C5': // ISO 269, 162 mm x 229 mm, For flat A5 sheet, A4 folded in half
-				$sizes = array(459.21, 649.13);
-				break;
-			case 'C6/5': // ISO 269, 114 mm x 229 mm. A5 folded twice = 1/3 A4. Alternative for the DL envelope
-				$sizes = array(323.15, 649.13);
-				break;
-			case 'C6': // ISO 269, 114 mm x 162 mm, For A5 folded in half
-				$sizes = array(323.15, 459.21);
-				break;
-			case 'C7/6': // ISO 269, 81 mm x 162 mm, For A5 sheet folded in thirds
-				$sizes = array(229.61, 459.21);
-				break;
-			case 'C7': // ISO 269, 81 mm x 114 mm, For A5 folded in quarters
-				$sizes = array(229.61, 323.15);
-				break;
-			case 'C8': // ISO 269, 57 mm x 81 mm
-				$sizes = array(161.57, 229.61);
-				break;
-			case 'C9': // ISO 269, 40 mm x 57 mm
-				$sizes = array(113.39, 161.57);
-				break;
-			case 'C10': // ISO 269, 28 mm x 40 mm
-				$sizes = array(79.37, 113.39);
-				break;
-			case 'DL': // Original DIN 678 but ISO 269 now has this C6/5 , 110 mm x 220 mm, For A4 sheet folded in thirds, A5 in half
-				$sizes = array(311.81, 623.62);
-				break;
-
-			// Untrimmed stock sizes for the ISO-A Series - ISO primary range
-			case 'RA0': // ISO 478, 860 mm x 1220 mm
-				$sizes = array(2437.80, 3458.27);
-				break;
-			case 'RA1': // ISO 478, 610 mm x 860 mm
-				$sizes = array(1729.13, 2437.80);
-				break;
-			case 'RA2': // ISO 478, 430 mm x 610 mm
-				$sizes = array(1218.90, 1729.13);
-				break;
-			case 'RA3': // ISO 478, 305 mm x 430 mm
-				$sizes = array(864.57, 1218.90);
-				break;
-			case 'RA4': // ISO 478, 215 mm x 305 mm
-				$sizes = array(609.45, 864.57);
-				break;
-
-			// Untrimmed stock sizes for the ISO-A Series - ISO supplementary range
-			case 'SRA0': // ISO 593, 900 mm x 1280 mm
-				$sizes = array(2551.18, 3628.35);
-				break;
-			case 'SRA1': // ISO 593, 640 mm x 900 mm
-				$sizes = array(1814.17, 2551.18);
-				break;
-			case 'SRA2': // ISO 593, 450 mm x 640 mm
-				$sizes = array(1275.59, 1814.17);
-				break;
-			case 'SRA3': // ISO 593, 320 mm x 450 mm
-				$sizes = array(907.09, 1275.59);
-				break;
-			case 'SRA4': // ISO 593, 225 mm x 320 mm
-				$sizes = array(637.80, 907.09);
-				break;
-
-			// ISO size variations
-			case 'A2EXTRA': // ISO 216, 445 mm x 619 mm
-				$sizes = array(1261.42, 1754.65);
-				break;
-			case 'A2SUPER': // ISO 216, 305 mm x 508 mm
-				$sizes = array(864.57, 1440.00);
-				break;
-			case 'A3EXTRA': // ISO 216, 322 mm x 445 mm
-				$sizes = array(912.76, 1261.42);
-				break;
-			case 'SUPERA3': // ISO 216, 305 mm x 487 mm
-				$sizes = array(864.57, 1380.47);
-				break;
-			case 'A4EXTRA': // ISO 216, 235 mm x 322 mm
-				$sizes = array(666.14, 912.76);
-				break;
-			case 'A4LONG': // ISO 216, 210 mm x 348 mm
-				$sizes = array(595.28, 986.46);
-				break;
-			case 'A4SUPER': // ISO 216, 229 mm x 322 mm
-				$sizes = array(649.13, 912.76);
-				break;
-			case 'SUPERA4': // ISO 216, 227 mm x 356 mm
-				$sizes = array(643.46, 1009.13);
-				break;
-			case 'A5EXTRA': // ISO 216, 173 mm x 235 mm
-				$sizes = array(490.39, 666.14);
-				break;
-			case 'SOB5EXTRA': // ISO 216, 202 mm x 276 mm
-				$sizes = array(572.60, 782.36);
-				break;
-
-			// Japanese version of the ISO 216 B series
-			case 'JB0': // JIS P 0138-61, 1030 mm x 1456 mm
-				$sizes = array(2919.69, 4127.24);
-				break;
-			case 'JB1': // JIS P 0138-61, 728 mm x 1030 mm
-				$sizes = array(2063.62, 2919.69);
-				break;
-			case 'JB2': // JIS P 0138-61, 515 mm x 728 mm
-				$sizes = array(1459.84, 2063.62);
-				break;
-			case 'JB3': // JIS P 0138-61, 364 mm x 515 mm
-				$sizes = array(1031.81, 1459.84);
-				break;
-			case 'JB4': // JIS P 0138-61, 257 mm x 364 mm
-				$sizes = array(728.50, 1031.81);
-				break;
-			case 'JB5': // JIS P 0138-61, 182 mm x 257 mm
-				$sizes = array(515.91, 728.50);
-				break;
-			case 'JB6': // JIS P 0138-61, 128 mm x 182 mm
-				$sizes = array(362.83, 515.91);
-				break;
-			case 'JB7': // JIS P 0138-61, 91 mm x 128 mm
-				$sizes = array(257.95, 362.83);
-				break;
-			case 'JB8': // JIS P 0138-61, 64 mm x 91 mm
-				$sizes = array(181.42, 257.95);
-				break;
-			case 'JB9': // JIS P 0138-61, 45 mm x 64 mm
-				$sizes = array(127.56, 181.42);
-				break;
-			case 'JB10': // JIS P 0138-61, 32 mm x 45 mm
-				$sizes = array(90.71, 127.56);
-				break;
-
-			// US pages
-			case 'EXECUTIVE': // 7.25 in x 10.5 in
-				$sizes = array(522.00, 756.00);
-				break;
-			case 'FOLIO': // 8.5 in x 13 in
-				$sizes = array(612.00, 936.00);
-				break;
-			case 'FOOLSCAP': // 13.5 in x 17 in
-				$sizes = array(972.00, 1224.00);
-				break;
-			case 'LEDGER': // 11 in x 17 in
-				$sizes = array(792.00, 1224.00);
-				break;
-			case 'LEGAL': // 8.5 in x 14 in
-				$sizes = array(612.00, 1008.00);
-				break;
-			case 'LETTER': // 8.5 in x 11 in
-				$sizes = array(612.00, 792.00);
-				break;
-			case 'QUARTO': // 8.46 in x 10.8 in
-				$sizes = array(609.12, 777.50);
-				break;
-			case 'STATEMENT': // 5.5 in x 8.5 in
-				$sizes = array(396.00, 612.00);
-				break;
-			case 'USGOVT': // 8 in x 11 in
-				$sizes = array(576.00, 792.00);
-				break;
-			default:
-				$this->pageFormat = 'A4';
-				$sizes            = array(595.28, 841.89);
-				break;
+				case '4A0': // ISO 216, 1682 mm x 2378 mm
+					$sizes = array(4767.86, 6740.79);
+					break;
+				case '2A0': // ISO 216, 1189 mm x 1682 mm
+					$sizes = array(3370.39, 4767.86);
+					break;
+				case 'A0': // ISO 216, 841 mm x 1189mm
+					$sizes = array(2383.94, 3370.39);
+					break;
+				case 'A1': // ISO 216, 594 mm x 841 mm
+					$sizes = array(1683.78, 2383.94);
+					break;
+				case 'A2': // ISO 216, 420 mm x 594 mm
+					$sizes = array(1190.55, 1683.78);
+					break;
+				case 'A3': // ISO 216, 297 mm x 420 mm
+					$sizes = array(841.89, 1190.55);
+					break;
+				case 'A4': // ISO 216, 210 mm 297 mm
+					$sizes = array(595.28, 841.89);
+					break;
+				case 'A5': // ISO 216, 148 mm x 210 mm
+					$sizes = array(419.53, 595.28);
+					break;
+				case 'A6': // ISO 216, 105 mm x 148 mm
+					$sizes = array(297.64, 419.53);
+					break;
+				case 'A7': // ISO 216, 74 mm x 105 mm
+					$sizes = array(209.76, 297.64);
+					break;
+				case 'A8': // ISO 216, 52 mm x 74 mm
+					$sizes = array(147.40, 209.76);
+					break;
+				case 'A9': // ISO 216, 37 mm x 52 mm
+					$sizes = array(104.88, 147.40);
+					break;
+				case 'A10': // ISO 216, 26 mm x 37 mm
+					$sizes = array(73.70, 104.88);
+					break;
+
+				// ISO B series
+				case 'B0': // ISO 216, 1000 mm x 1414 mm
+					$sizes = array(2834.65, 4008.19);
+					break;
+				case 'B1': // ISO 216, 707 mm x 1000 mm
+					$sizes = array(2004.09, 2834.65);
+					break;
+				case 'B2': // ISO 216, 500 mm x 707 mm
+					$sizes = array(1417.32, 2004.09);
+					break;
+				case 'B3': // ISO 216, 353 mm x 500 mm
+					$sizes = array(1000.63, 1417.32);
+					break;
+				case 'B4': // ISO 216, 250 mm x 353 mm
+					$sizes = array(708.66, 1000.63);
+					break;
+				case 'B5': // ISO 216, 176 mm x 250 mm
+					$sizes = array(498.90, 708.66);
+					break;
+				case 'B6': // ISO 216, 125 mm x 176 mm
+					$sizes = array(354.33, 498.90);
+					break;
+				case 'B7': // ISO 216, 88 mm x 125 mm
+					$sizes = array(249.45, 354.33);
+					break;
+				case 'B8': // ISO 216, 62 mm x 88 mm
+					$sizes = array(175.75, 249.45);
+					break;
+				case 'B9': // ISO 216, 44 mm x 62 mm
+					$sizes = array(124.72, 175.75);
+					break;
+				case 'B10': // ISO 216, 31 mm x 44 mm
+					$sizes = array(87.87, 124.72);
+					break;
+
+				// ISO C series, Envelope
+				case 'C0': // ISO 269, 917 mm x 1297 mm, For flat A0 sheet
+					$sizes = array(2599.37, 3676.54);
+					break;
+				case 'C1': // ISO 269, 648 mm x 917 mm, For flat A1 sheet
+					$sizes = array(1836.85, 2599.37);
+					break;
+				case 'C2': // ISO 269, 458 mm x 648 mm, For flat A2 sheet, A1 folded in half
+					$sizes = array(1298.27, 1836.85);
+					break;
+				case 'C3': // ISO 269, 324 mm x 458 mm, For flat A3 sheet, A2 folded in half
+					$sizes = array(918.43, 1298.27);
+					break;
+				case 'C4': // ISO 269, 229 mm x 324 mm, For flat A4 sheet, A3 folded in half
+					$sizes = array(649.13, 918.43);
+					break;
+				case 'C5': // ISO 269, 162 mm x 229 mm, For flat A5 sheet, A4 folded in half
+					$sizes = array(459.21, 649.13);
+					break;
+				case 'C6/5': // ISO 269, 114 mm x 229 mm. A5 folded twice = 1/3 A4. Alternative for the DL envelope
+					$sizes = array(323.15, 649.13);
+					break;
+				case 'C6': // ISO 269, 114 mm x 162 mm, For A5 folded in half
+					$sizes = array(323.15, 459.21);
+					break;
+				case 'C7/6': // ISO 269, 81 mm x 162 mm, For A5 sheet folded in thirds
+					$sizes = array(229.61, 459.21);
+					break;
+				case 'C7': // ISO 269, 81 mm x 114 mm, For A5 folded in quarters
+					$sizes = array(229.61, 323.15);
+					break;
+				case 'C8': // ISO 269, 57 mm x 81 mm
+					$sizes = array(161.57, 229.61);
+					break;
+				case 'C9': // ISO 269, 40 mm x 57 mm
+					$sizes = array(113.39, 161.57);
+					break;
+				case 'C10': // ISO 269, 28 mm x 40 mm
+					$sizes = array(79.37, 113.39);
+					break;
+				case 'DL': // Original DIN 678 but ISO 269 now has this C6/5 , 110 mm x 220 mm, For A4 sheet folded in thirds, A5 in half
+					$sizes = array(311.81, 623.62);
+					break;
+
+				// Untrimmed stock sizes for the ISO-A Series - ISO primary range
+				case 'RA0': // ISO 478, 860 mm x 1220 mm
+					$sizes = array(2437.80, 3458.27);
+					break;
+				case 'RA1': // ISO 478, 610 mm x 860 mm
+					$sizes = array(1729.13, 2437.80);
+					break;
+				case 'RA2': // ISO 478, 430 mm x 610 mm
+					$sizes = array(1218.90, 1729.13);
+					break;
+				case 'RA3': // ISO 478, 305 mm x 430 mm
+					$sizes = array(864.57, 1218.90);
+					break;
+				case 'RA4': // ISO 478, 215 mm x 305 mm
+					$sizes = array(609.45, 864.57);
+					break;
+
+				// Untrimmed stock sizes for the ISO-A Series - ISO supplementary range
+				case 'SRA0': // ISO 593, 900 mm x 1280 mm
+					$sizes = array(2551.18, 3628.35);
+					break;
+				case 'SRA1': // ISO 593, 640 mm x 900 mm
+					$sizes = array(1814.17, 2551.18);
+					break;
+				case 'SRA2': // ISO 593, 450 mm x 640 mm
+					$sizes = array(1275.59, 1814.17);
+					break;
+				case 'SRA3': // ISO 593, 320 mm x 450 mm
+					$sizes = array(907.09, 1275.59);
+					break;
+				case 'SRA4': // ISO 593, 225 mm x 320 mm
+					$sizes = array(637.80, 907.09);
+					break;
+
+				// ISO size variations
+				case 'A2EXTRA': // ISO 216, 445 mm x 619 mm
+					$sizes = array(1261.42, 1754.65);
+					break;
+				case 'A2SUPER': // ISO 216, 305 mm x 508 mm
+					$sizes = array(864.57, 1440.00);
+					break;
+				case 'A3EXTRA': // ISO 216, 322 mm x 445 mm
+					$sizes = array(912.76, 1261.42);
+					break;
+				case 'SUPERA3': // ISO 216, 305 mm x 487 mm
+					$sizes = array(864.57, 1380.47);
+					break;
+				case 'A4EXTRA': // ISO 216, 235 mm x 322 mm
+					$sizes = array(666.14, 912.76);
+					break;
+				case 'A4LONG': // ISO 216, 210 mm x 348 mm
+					$sizes = array(595.28, 986.46);
+					break;
+				case 'A4SUPER': // ISO 216, 229 mm x 322 mm
+					$sizes = array(649.13, 912.76);
+					break;
+				case 'SUPERA4': // ISO 216, 227 mm x 356 mm
+					$sizes = array(643.46, 1009.13);
+					break;
+				case 'A5EXTRA': // ISO 216, 173 mm x 235 mm
+					$sizes = array(490.39, 666.14);
+					break;
+				case 'SOB5EXTRA': // ISO 216, 202 mm x 276 mm
+					$sizes = array(572.60, 782.36);
+					break;
+
+				// Japanese version of the ISO 216 B series
+				case 'JB0': // JIS P 0138-61, 1030 mm x 1456 mm
+					$sizes = array(2919.69, 4127.24);
+					break;
+				case 'JB1': // JIS P 0138-61, 728 mm x 1030 mm
+					$sizes = array(2063.62, 2919.69);
+					break;
+				case 'JB2': // JIS P 0138-61, 515 mm x 728 mm
+					$sizes = array(1459.84, 2063.62);
+					break;
+				case 'JB3': // JIS P 0138-61, 364 mm x 515 mm
+					$sizes = array(1031.81, 1459.84);
+					break;
+				case 'JB4': // JIS P 0138-61, 257 mm x 364 mm
+					$sizes = array(728.50, 1031.81);
+					break;
+				case 'JB5': // JIS P 0138-61, 182 mm x 257 mm
+					$sizes = array(515.91, 728.50);
+					break;
+				case 'JB6': // JIS P 0138-61, 128 mm x 182 mm
+					$sizes = array(362.83, 515.91);
+					break;
+				case 'JB7': // JIS P 0138-61, 91 mm x 128 mm
+					$sizes = array(257.95, 362.83);
+					break;
+				case 'JB8': // JIS P 0138-61, 64 mm x 91 mm
+					$sizes = array(181.42, 257.95);
+					break;
+				case 'JB9': // JIS P 0138-61, 45 mm x 64 mm
+					$sizes = array(127.56, 181.42);
+					break;
+				case 'JB10': // JIS P 0138-61, 32 mm x 45 mm
+					$sizes = array(90.71, 127.56);
+					break;
+
+				// US pages
+				case 'EXECUTIVE': // 7.25 in x 10.5 in
+					$sizes = array(522.00, 756.00);
+					break;
+				case 'FOLIO': // 8.5 in x 13 in
+					$sizes = array(612.00, 936.00);
+					break;
+				case 'FOOLSCAP': // 13.5 in x 17 in
+					$sizes = array(972.00, 1224.00);
+					break;
+				case 'LEDGER': // 11 in x 17 in
+					$sizes = array(792.00, 1224.00);
+					break;
+				case 'LEGAL': // 8.5 in x 14 in
+					$sizes = array(612.00, 1008.00);
+					break;
+				case 'LETTER': // 8.5 in x 11 in
+					$sizes = array(612.00, 792.00);
+					break;
+				case 'QUARTO': // 8.46 in x 10.8 in
+					$sizes = array(609.12, 777.50);
+					break;
+				case 'STATEMENT': // 5.5 in x 8.5 in
+					$sizes = array(396.00, 612.00);
+					break;
+				case 'USGOVT': // 8 in x 11 in
+					$sizes = array(576.00, 792.00);
+					break;
+				default:
+					$this->pageFormat = 'A4';
+					$sizes            = array(595.28, 841.89);
+					break;
 			}
 			$this->pagew = $sizes[0];
 			$this->pageh = $sizes[1];

app/Note.php

Switch Indentation +4 added lines, -4 removed lines

@@ -97,10 +97,10 @@
 
 		if ($text) {
 			switch ($this->getTree()->getPreference('FORMAT_TEXT')) {
-			case 'markdown':
-				$text = Filter::markdown($text);
-				$text = Filter::unescapeHtml($text);
-				break;
+				case 'markdown':
+					$text = Filter::markdown($text);
+					$text = Filter::unescapeHtml($text);
+					break;
 			}
 
 			list($text) = explode("\n", $text);