fisharebest / webtrees

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

app/Filter.php

Switch Indentation +4 added lines, -4 removed lines

@@ -117,10 +117,10 @@
 	 */
 	public static function formatText($text, Tree $WT_TREE) {
 		switch ($WT_TREE->getPreference('FORMAT_TEXT')) {
-		case 'markdown':
-			return '<div class="markdown" dir="auto">' . self::markdown($text) . '</div>';
-		default:
-			return '<div style="white-space: pre-wrap;" dir="auto">' . self::expandUrls($text) . '</div>';
+			case 'markdown':
+				return '<div class="markdown" dir="auto">' . self::markdown($text) . '</div>';
+			default:
+				return '<div style="white-space: pre-wrap;" dir="auto">' . self::expandUrls($text) . '</div>';
 		}
 	}
 

app/GedcomRecord.php

Switch Indentation +47 added lines, -47 removed lines

@@ -198,27 +198,27 @@ 
 		}
 
 		switch ($type) {
-		case 'INDI':
-			$record = new Individual($xref, $gedcom, $pending, $tree);
-			break;
-		case 'FAM':
-			$record = new Family($xref, $gedcom, $pending, $tree);
-			break;
-		case 'SOUR':
-			$record = new Source($xref, $gedcom, $pending, $tree);
-			break;
-		case 'OBJE':
-			$record = new Media($xref, $gedcom, $pending, $tree);
-			break;
-		case 'REPO':
-			$record = new Repository($xref, $gedcom, $pending, $tree);
-			break;
-		case 'NOTE':
-			$record = new Note($xref, $gedcom, $pending, $tree);
-			break;
-		default:
-			$record = new self($xref, $gedcom, $pending, $tree);
-			break;
+			case 'INDI':
+				$record = new Individual($xref, $gedcom, $pending, $tree);
+				break;
+			case 'FAM':
+				$record = new Family($xref, $gedcom, $pending, $tree);
+				break;
+			case 'SOUR':
+				$record = new Source($xref, $gedcom, $pending, $tree);
+				break;
+			case 'OBJE':
+				$record = new Media($xref, $gedcom, $pending, $tree);
+				break;
+			case 'REPO':
+				$record = new Repository($xref, $gedcom, $pending, $tree);
+				break;
+			case 'NOTE':
+				$record = new Note($xref, $gedcom, $pending, $tree);
+				break;
+			default:
+				$record = new self($xref, $gedcom, $pending, $tree);
+				break;
 		}
 
 		// Store it in the cache
@@ -437,31 +437,31 @@ 
 // CACHING: this function can take three different parameters,
 		// and therefore needs three different caches for the result.
 		switch ($access_level) {
-		case Auth::PRIV_PRIVATE: // visitor
-			if ($this->disp_public === null) {
-				$this->disp_public = $this->canShowRecord(Auth::PRIV_PRIVATE);
-			}
+			case Auth::PRIV_PRIVATE: // visitor
+				if ($this->disp_public === null) {
+					$this->disp_public = $this->canShowRecord(Auth::PRIV_PRIVATE);
+				}
 
-			return $this->disp_public;
-		case Auth::PRIV_USER: // member
-			if ($this->disp_user === null) {
-				$this->disp_user = $this->canShowRecord(Auth::PRIV_USER);
-			}
+				return $this->disp_public;
+			case Auth::PRIV_USER: // member
+				if ($this->disp_user === null) {
+					$this->disp_user = $this->canShowRecord(Auth::PRIV_USER);
+				}
 
-			return $this->disp_user;
-		case Auth::PRIV_NONE: // admin
-			if ($this->disp_none === null) {
-				$this->disp_none = $this->canShowRecord(Auth::PRIV_NONE);
-			}
+				return $this->disp_user;
+			case Auth::PRIV_NONE: // admin
+				if ($this->disp_none === null) {
+					$this->disp_none = $this->canShowRecord(Auth::PRIV_NONE);
+				}
 
-			return $this->disp_none;
-		case Auth::PRIV_HIDE: // hidden from admins
-			// We use this value to bypass privacy checks. For example,
-			// when downloading data or when calculating privacy itself.
-			return true;
-		default:
-			// Should never get here.
-			return false;
+				return $this->disp_none;
+			case Auth::PRIV_HIDE: // hidden from admins
+				// We use this value to bypass privacy checks. For example,
+				// when downloading data or when calculating privacy itself.
+				return true;
+			default:
+				// Should never get here.
+				return false;
 		}
 	}
 
@@ -816,10 +816,10 @@ 
 			}
 			if ($event->getDate()->isOK() || !$event->getPlace()->isEmpty()) {
 				switch ($style) {
-				case 1:
-					return '<br><em>' . $event->getLabel() . ' ' . FunctionsPrint::formatFactDate($event, $this, false, false) . $joiner . FunctionsPrint::formatFactPlace($event) . '</em>';
-				case 2:
-					return '<dl><dt class="label">' . $event->getLabel() . '</dt><dd class="field">' . FunctionsPrint::formatFactDate($event, $this, false, false) . $joiner . FunctionsPrint::formatFactPlace($event) . '</dd></dl>';
+					case 1:
+						return '<br><em>' . $event->getLabel() . ' ' . FunctionsPrint::formatFactDate($event, $this, false, false) . $joiner . FunctionsPrint::formatFactPlace($event) . '</em>';
+					case 2:
+						return '<dl><dt class="label">' . $event->getLabel() . '</dt><dd class="field">' . FunctionsPrint::formatFactDate($event, $this, false, false) . $joiner . FunctionsPrint::formatFactPlace($event) . '</dd></dl>';
 				}
 			}
 		}

edit_changes.php

Switch Indentation +85 added lines, -85 removed lines

@@ -49,72 +49,72 @@ 
 echo '<div id="pending"><h2>', I18N::translate('Pending changes'), '</h2>';
 
 switch ($action) {
-case 'undo':
-	$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
-	$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
-	// Undo a change, and subsequent changes to the same record
-	Database::prepare(
-		"UPDATE `##change`" .
-		" SET   status     = 'rejected'" .
-		" WHERE status     = 'pending'" .
-		" AND   gedcom_id  = ?" .
-		" AND   xref       = ?" .
-		" AND   change_id >= ?"
-	)->execute(array($gedcom_id, $xref, $change_id));
-	break;
-case 'accept':
-	$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
-	$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
-	// Accept a change, and all previous changes to the same record
-	$changes = Database::prepare(
-		"SELECT change_id, gedcom_id, gedcom_name, xref, old_gedcom, new_gedcom" .
-		" FROM  `##change` c" .
-		" JOIN  `##gedcom` g USING (gedcom_id)" .
-		" WHERE c.status   = 'pending'" .
-		" AND   gedcom_id  = ?" .
-		" AND   xref       = ?" .
-		" AND   change_id <= ?" .
-		" ORDER BY change_id"
-	)->execute(array($gedcom_id, $xref, $change_id))->fetchAll();
-	foreach ($changes as $change) {
-		if (empty($change->new_gedcom)) {
-			// delete
-			FunctionsImport::updateRecord($change->old_gedcom, $gedcom_id, true);
-		} else {
-			// add/update
-			FunctionsImport::updateRecord($change->new_gedcom, $gedcom_id, false);
+	case 'undo':
+		$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
+		$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
+		// Undo a change, and subsequent changes to the same record
+		Database::prepare(
+			"UPDATE `##change`" .
+			" SET   status     = 'rejected'" .
+			" WHERE status     = 'pending'" .
+			" AND   gedcom_id  = ?" .
+			" AND   xref       = ?" .
+			" AND   change_id >= ?"
+		)->execute(array($gedcom_id, $xref, $change_id));
+		break;
+	case 'accept':
+		$gedcom_id = Database::prepare("SELECT gedcom_id FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
+		$xref      = Database::prepare("SELECT xref      FROM `##change` WHERE change_id=?")->execute(array($change_id))->fetchOne();
+		// Accept a change, and all previous changes to the same record
+		$changes = Database::prepare(
+			"SELECT change_id, gedcom_id, gedcom_name, xref, old_gedcom, new_gedcom" .
+			" FROM  `##change` c" .
+			" JOIN  `##gedcom` g USING (gedcom_id)" .
+			" WHERE c.status   = 'pending'" .
+			" AND   gedcom_id  = ?" .
+			" AND   xref       = ?" .
+			" AND   change_id <= ?" .
+			" ORDER BY change_id"
+		)->execute(array($gedcom_id, $xref, $change_id))->fetchAll();
+		foreach ($changes as $change) {
+			if (empty($change->new_gedcom)) {
+				// delete
+				FunctionsImport::updateRecord($change->old_gedcom, $gedcom_id, true);
+			} else {
+				// add/update
+				FunctionsImport::updateRecord($change->new_gedcom, $gedcom_id, false);
+			}
+			Database::prepare("UPDATE `##change` SET status='accepted' WHERE change_id=?")->execute(array($change->change_id));
+			Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
 		}
-		Database::prepare("UPDATE `##change` SET status='accepted' WHERE change_id=?")->execute(array($change->change_id));
-		Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
-	}
-	break;
-case 'undoall':
-	Database::prepare(
-		"UPDATE `##change`" .
-		" SET status='rejected'" .
-		" WHERE status='pending' AND gedcom_id=?"
-	)->execute(array($WT_TREE->getTreeId()));
-	break;
-case 'acceptall':
-	$changes = Database::prepare(
-		"SELECT change_id, gedcom_id, gedcom_name, xref, old_gedcom, new_gedcom" .
-		" FROM `##change` c" .
-		" JOIN `##gedcom` g USING (gedcom_id)" .
-		" WHERE c.status='pending' AND gedcom_id=?" .
-		" ORDER BY change_id"
-	)->execute(array($WT_TREE->getTreeId()))->fetchAll();
-	foreach ($changes as $change) {
-		if (empty($change->new_gedcom)) {
-			// delete
-			FunctionsImport::updateRecord($change->old_gedcom, $change->gedcom_id, true);
-		} else {
-			// add/update
-			FunctionsImport::updateRecord($change->new_gedcom, $change->gedcom_id, false);
+		break;
+	case 'undoall':
+		Database::prepare(
+			"UPDATE `##change`" .
+			" SET status='rejected'" .
+			" WHERE status='pending' AND gedcom_id=?"
+		)->execute(array($WT_TREE->getTreeId()));
+		break;
+	case 'acceptall':
+		$changes = Database::prepare(
+			"SELECT change_id, gedcom_id, gedcom_name, xref, old_gedcom, new_gedcom" .
+			" FROM `##change` c" .
+			" JOIN `##gedcom` g USING (gedcom_id)" .
+			" WHERE c.status='pending' AND gedcom_id=?" .
+			" ORDER BY change_id"
+		)->execute(array($WT_TREE->getTreeId()))->fetchAll();
+		foreach ($changes as $change) {
+			if (empty($change->new_gedcom)) {
+				// delete
+				FunctionsImport::updateRecord($change->old_gedcom, $change->gedcom_id, true);
+			} else {
+				// add/update
+				FunctionsImport::updateRecord($change->new_gedcom, $change->gedcom_id, false);
+			}
+			Database::prepare("UPDATE `##change` SET status='accepted' WHERE change_id=?")->execute(array($change->change_id));
+			Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
 		}
-		Database::prepare("UPDATE `##change` SET status='accepted' WHERE change_id=?")->execute(array($change->change_id));
-		Log::addEditLog("Accepted change {$change->change_id} for {$change->xref} / {$change->gedcom_name} into database");
-	}
-	break;
+		break;
 }
 
 $changed_gedcoms = Database::prepare(
@@ -146,27 +146,27 @@ 
 
 
 		switch ($match[1]) {
-		case 'INDI':
-			$record = new Individual($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
-		case 'FAM':
-			$record = new Family($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
-		case 'SOUR':
-			$record = new Source($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
-		case 'REPO':
-			$record = new Repository($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
-		case 'OBJE':
-			$record = new Media($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
-		case 'NOTE':
-			$record = new Note($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
-		default:
-			$record = new GedcomRecord($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
-			break;
+			case 'INDI':
+				$record = new Individual($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+				break;
+			case 'FAM':
+				$record = new Family($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+				break;
+			case 'SOUR':
+				$record = new Source($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+				break;
+			case 'REPO':
+				$record = new Repository($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+				break;
+			case 'OBJE':
+				$record = new Media($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+				break;
+			case 'NOTE':
+				$record = new Note($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+				break;
+			default:
+				$record = new GedcomRecord($change->xref, $change->old_gedcom, $change->new_gedcom, $tree);
+				break;
 		}
 		if ($change->xref != $prev_xref || $change->gedcom_id != $prev_gedcom_id) {
 			if ($prev_xref) {

message.php

Switch Indentation +14 added lines, -14 removed lines

@@ -65,20 +65,20 @@
 // Ensure the user always visits this page twice - once to compose it and again to send it.
 // This makes it harder for spammers.
 switch ($action) {
-case 'compose':
-	Session::put('good_to_send', true);
-	break;
-case 'send':
-	// Only send messages if we've come straight from the compose page.
-	if (!Session::get('good_to_send')) {
-		Log::addAuthenticationLog('Attempt to send a message without visiting the compose page. Spam attack?');
-		$action = 'compose';
-	}
-	if (!Filter::checkCsrf()) {
-		$action = 'compose';
-	}
-	Session::forget('good_to_send');
-	break;
+	case 'compose':
+		Session::put('good_to_send', true);
+		break;
+	case 'send':
+		// Only send messages if we've come straight from the compose page.
+		if (!Session::get('good_to_send')) {
+			Log::addAuthenticationLog('Attempt to send a message without visiting the compose page. Spam attack?');
+			$action = 'compose';
+		}
+		if (!Filter::checkCsrf()) {
+			$action = 'compose';
+		}
+		Session::forget('good_to_send');
+		break;
 }
 
 switch ($action) {