fisharebest / webtrees

app/Controller/LifespanController.php

Switch Indentation +17 added lines, -17 removed lines

@@ -506,23 +506,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/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;

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);
 			}
 		}
 

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)

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);

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;
 		}
 	}
 

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);

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];

admin_site_change.php

Switch Indentation +8 added lines, -8 removed lines

@@ -207,14 +207,14 @@
 
 		foreach ($differences as $difference) {
 			switch ($difference[1]) {
-				case MyersDiff::DELETE:
-					$diff_lines[] = '<del>' . $difference[0] . '</del>';
-					break;
-				case MyersDiff::INSERT:
-					$diff_lines[] = '<ins>' . $difference[0] . '</ins>';
-					break;
-				default:
-					$diff_lines[] = $difference[0];
+			case MyersDiff::DELETE:
+				$diff_lines[] = '<del>' . $difference[0] . '</del>';
+				break;
+			case MyersDiff::INSERT:
+				$diff_lines[] = '<ins>' . $difference[0] . '</ins>';
+				break;
+			default:
+				$diff_lines[] = $difference[0];
 			}
 		}