fisharebest / webtrees

admin_trees_renumber.php

Switch Indentation +137 added lines, -137 removed lines

@@ -86,143 +86,143 @@
 		);
 		$new_xref = $WT_TREE->getNewXref($type);
 		switch ($type) {
-		case 'INDI':
-			Database::prepare(
-				"UPDATE `##individuals` SET i_id = ?, i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_id = ? AND i_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ INDI\n", "0 @$new_xref@ INDI\n", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'HUSB') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " HUSB @$old_xref@", " HUSB @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'WIFE') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " WIFE @$old_xref@", " WIFE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'CHIL') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " CHIL @$old_xref@", " CHIL @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'ASSO') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " ASSO @$old_xref@", " ASSO @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = '_ASSO') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " _ASSO @$old_xref@", " _ASSO @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'ASSO') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " ASSO @$old_xref@", " ASSO @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = '_ASSO') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " _ASSO @$old_xref@", " _ASSO @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##placelinks` SET pl_gid = ? WHERE pl_gid = ? AND pl_file = ?"
-			)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##dates` SET d_gid = ? WHERE d_gid = ? AND d_file = ?"
-			)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##user_gedcom_setting` SET setting_value = ? WHERE setting_value = ? AND gedcom_id = ? AND setting_name IN ('gedcomid', 'rootid')"
-			)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-			break;
-		case 'FAM':
-			Database::prepare(
-				"UPDATE `##families` SET f_id = ?, f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_id = ? AND f_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ FAM\n", "0 @$new_xref@ FAM\n", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'FAMC') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " FAMC @$old_xref@", " FAMC @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'FAMS') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " FAMS @$old_xref@", " FAMS @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##placelinks` SET pl_gid = ? WHERE pl_gid = ? AND pl_file = ?"
-			)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##dates` SET d_gid = ? WHERE d_gid = ? AND d_file = ?"
-			)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-			break;
-		case 'SOUR':
-			Database::prepare(
-				"UPDATE `##sources` SET s_id = ?, s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_id = ? AND s_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ SOUR\n", "0 @$new_xref@ SOUR\n", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'SOUR') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'SOUR') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ? AND l_type = 'SOUR') SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
-			)->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ? AND l_type = 'SOUR') SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
-			)->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
-			break;
-		case 'REPO':
-			Database::prepare(
-				"UPDATE `##other` SET o_id = ?, o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_id = ? AND o_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ REPO\n", "0 @$new_xref@ REPO\n", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ? AND l_type = 'REPO') SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
-			)->execute(array($old_xref, " REPO @$old_xref@", " REPO @$new_xref@", $WT_TREE->getTreeId()));
-			break;
-		case 'NOTE':
-			Database::prepare(
-				"UPDATE `##other` SET o_id = ?, o_gedcom = REPLACE(REPLACE(o_gedcom, ?, ?), ?, ?) WHERE o_id = ? AND o_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ NOTE\n", "0 @$new_xref@ NOTE\n", "0 @$old_xref@ NOTE ", "0 @$new_xref@ NOTE ", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'NOTE') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'NOTE') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ? AND l_type = 'NOTE') SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
-			)->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ? AND l_type = 'NOTE') SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
-			)->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ? AND l_type = 'NOTE') SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
-			)->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
-			break;
-		case 'OBJE':
-			Database::prepare(
-				"UPDATE `##media` SET m_id = ?, m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_id = ? AND m_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ OBJE\n", "0 @$new_xref@ OBJE\n", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'OBJE') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'OBJE') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ? AND l_type = 'OBJE') SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
-			)->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ? AND l_type = 'OBJE') SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
-			)->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ? AND l_type = 'OBJE') SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
-			)->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
-			break;
-		default:
-			Database::prepare(
-				"UPDATE `##other` SET o_id = ?, o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_id = ? AND o_file = ?"
-			)->execute(array($new_xref, "0 @$old_xref@ $type\n", "0 @$new_xref@ $type\n", $old_xref, $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ?) SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
-			)->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ?) SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
-			)->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ?) SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
-			)->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ?) SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
-			)->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
-			Database::prepare(
-				"UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ?) SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
-			)->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
-			break;
+		    case 'INDI':
+			    Database::prepare(
+				    "UPDATE `##individuals` SET i_id = ?, i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_id = ? AND i_file = ?"
+			    )->execute(array($new_xref, "0 @$old_xref@ INDI\n", "0 @$new_xref@ INDI\n", $old_xref, $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'HUSB') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+			    )->execute(array($old_xref, " HUSB @$old_xref@", " HUSB @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'WIFE') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+			    )->execute(array($old_xref, " WIFE @$old_xref@", " WIFE @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'CHIL') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+			    )->execute(array($old_xref, " CHIL @$old_xref@", " CHIL @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'ASSO') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+			    )->execute(array($old_xref, " ASSO @$old_xref@", " ASSO @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = '_ASSO') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+			    )->execute(array($old_xref, " _ASSO @$old_xref@", " _ASSO @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'ASSO') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+			    )->execute(array($old_xref, " ASSO @$old_xref@", " ASSO @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = '_ASSO') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+			    )->execute(array($old_xref, " _ASSO @$old_xref@", " _ASSO @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##placelinks` SET pl_gid = ? WHERE pl_gid = ? AND pl_file = ?"
+			    )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##dates` SET d_gid = ? WHERE d_gid = ? AND d_file = ?"
+			    )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##user_gedcom_setting` SET setting_value = ? WHERE setting_value = ? AND gedcom_id = ? AND setting_name IN ('gedcomid', 'rootid')"
+			    )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+			    break;
+		    case 'FAM':
+			    Database::prepare(
+				    "UPDATE `##families` SET f_id = ?, f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_id = ? AND f_file = ?"
+			    )->execute(array($new_xref, "0 @$old_xref@ FAM\n", "0 @$new_xref@ FAM\n", $old_xref, $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'FAMC') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+			    )->execute(array($old_xref, " FAMC @$old_xref@", " FAMC @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'FAMS') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+			    )->execute(array($old_xref, " FAMS @$old_xref@", " FAMS @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##placelinks` SET pl_gid = ? WHERE pl_gid = ? AND pl_file = ?"
+			    )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##dates` SET d_gid = ? WHERE d_gid = ? AND d_file = ?"
+			    )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+			    break;
+		    case 'SOUR':
+			    Database::prepare(
+				    "UPDATE `##sources` SET s_id = ?, s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_id = ? AND s_file = ?"
+			    )->execute(array($new_xref, "0 @$old_xref@ SOUR\n", "0 @$new_xref@ SOUR\n", $old_xref, $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'SOUR') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+			    )->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'SOUR') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+			    )->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ? AND l_type = 'SOUR') SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
+			    )->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ? AND l_type = 'SOUR') SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
+			    )->execute(array($old_xref, " SOUR @$old_xref@", " SOUR @$new_xref@", $WT_TREE->getTreeId()));
+			    break;
+		    case 'REPO':
+			    Database::prepare(
+				    "UPDATE `##other` SET o_id = ?, o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_id = ? AND o_file = ?"
+			    )->execute(array($new_xref, "0 @$old_xref@ REPO\n", "0 @$new_xref@ REPO\n", $old_xref, $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ? AND l_type = 'REPO') SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
+			    )->execute(array($old_xref, " REPO @$old_xref@", " REPO @$new_xref@", $WT_TREE->getTreeId()));
+			    break;
+		    case 'NOTE':
+			    Database::prepare(
+				    "UPDATE `##other` SET o_id = ?, o_gedcom = REPLACE(REPLACE(o_gedcom, ?, ?), ?, ?) WHERE o_id = ? AND o_file = ?"
+			    )->execute(array($new_xref, "0 @$old_xref@ NOTE\n", "0 @$new_xref@ NOTE\n", "0 @$old_xref@ NOTE ", "0 @$new_xref@ NOTE ", $old_xref, $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'NOTE') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+			    )->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'NOTE') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+			    )->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ? AND l_type = 'NOTE') SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
+			    )->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ? AND l_type = 'NOTE') SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
+			    )->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ? AND l_type = 'NOTE') SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
+			    )->execute(array($old_xref, " NOTE @$old_xref@", " NOTE @$new_xref@", $WT_TREE->getTreeId()));
+			    break;
+		    case 'OBJE':
+			    Database::prepare(
+				    "UPDATE `##media` SET m_id = ?, m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_id = ? AND m_file = ?"
+			    )->execute(array($new_xref, "0 @$old_xref@ OBJE\n", "0 @$new_xref@ OBJE\n", $old_xref, $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ? AND l_type = 'OBJE') SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+			    )->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ? AND l_type = 'OBJE') SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+			    )->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ? AND l_type = 'OBJE') SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
+			    )->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ? AND l_type = 'OBJE') SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
+			    )->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ? AND l_type = 'OBJE') SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
+			    )->execute(array($old_xref, " OBJE @$old_xref@", " OBJE @$new_xref@", $WT_TREE->getTreeId()));
+			    break;
+		    default:
+			    Database::prepare(
+				    "UPDATE `##other` SET o_id = ?, o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_id = ? AND o_file = ?"
+			    )->execute(array($new_xref, "0 @$old_xref@ $type\n", "0 @$new_xref@ $type\n", $old_xref, $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##individuals` JOIN `##link` ON (l_file = i_file AND l_to = ?) SET i_gedcom = REPLACE(i_gedcom, ?, ?) WHERE i_file = ?"
+			    )->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##families` JOIN `##link` ON (l_file = f_file AND l_to = ?) SET f_gedcom = REPLACE(f_gedcom, ?, ?) WHERE f_file = ?"
+			    )->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##media` JOIN `##link` ON (l_file = m_file AND l_to = ?) SET m_gedcom = REPLACE(m_gedcom, ?, ?) WHERE m_file = ?"
+			    )->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##sources` JOIN `##link` ON (l_file = s_file AND l_to = ?) SET s_gedcom = REPLACE(s_gedcom, ?, ?) WHERE s_file = ?"
+			    )->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
+			    Database::prepare(
+				    "UPDATE `##other` JOIN `##link` ON (l_file = o_file AND l_to = ?) SET o_gedcom = REPLACE(o_gedcom, ?, ?) WHERE o_file = ?"
+			    )->execute(array($old_xref, " @$old_xref@", " @$new_xref@", $WT_TREE->getTreeId()));
+			    break;
 		}
 		Database::prepare(
 			"UPDATE `##name` SET n_id = ? WHERE n_id = ? AND n_file = ?"

editnews.php

Switch Indentation +38 added lines, -38 removed lines

@@ -44,44 +44,44 @@
 $text      = Filter::post('text');
 
 switch ($action) {
-case 'compose':
-	if (Module::getModuleByName('ckeditor')) {
-		CkeditorModule::enableEditor($controller);
-	}
+    case 'compose':
+	    if (Module::getModuleByName('ckeditor')) {
+		    CkeditorModule::enableEditor($controller);
+	    }
 
-	echo '<h3>' . I18N::translate('Add/edit a journal/news entry') . '</h3>';
-	echo '<form style="overflow: hidden;" name="messageform" method="post" action="editnews.php?action=save&news_id=' . $news_id . '">';
-	if ($news_id) {
-		$news = Database::prepare("SELECT news_id AS id, user_id, gedcom_id, UNIX_TIMESTAMP(updated) AS date, subject, body FROM `##news` WHERE news_id=?")->execute(array($news_id))->fetchOneRow(PDO::FETCH_ASSOC);
-	} else {
-		$news              = array();
-		$news['user_id']   = $user_id;
-		$news['gedcom_id'] = $gedcom_id;
-		$news['date']      = WT_TIMESTAMP;
-		$news['subject']   = '';
-		$news['body']      = '';
-	}
-	echo '<input type="hidden" name="user_id" value="' . $news['user_id'] . '">';
-	echo '<input type="hidden" name="gedcom_id" value="' . $news['gedcom_id'] . '">';
-	echo '<input type="hidden" name="date" value="' . $news['date'] . '">';
-	echo '<table>';
-	echo '<tr><th style="text-align:start;">' . I18N::translate('Title') . '</th><tr>';
-	echo '<tr><td><input type="text" name="title" size="50" dir="auto" autofocus value="' . $news['subject'] . '"></td></tr>';
-	echo '<tr><th style="text-align:start;">' . I18N::translate('Content') . '</th></tr>';
-	echo '<tr><td>';
-	echo '<textarea name="text" class="html-edit" cols="80" rows="10" dir="auto">' . Filter::escapeHtml($news['body']) . '</textarea>';
-	echo '</td></tr>';
-	echo '<tr><td><input type="submit" value="' . I18N::translate('save') . '"></td></tr>';
-	echo '</table>';
-	echo '</form>';
-	break;
-case 'save':
-	if ($news_id) {
-		Database::prepare("UPDATE `##news` SET subject=?, body=?, updated=FROM_UNIXTIME(?) WHERE news_id=?")->execute(array($title, $text, $date, $news_id));
-	} else {
-		Database::prepare("INSERT INTO `##news` (user_id, gedcom_id, subject, body, updated) VALUES (NULLIF(?, ''), NULLIF(?, '') ,? ,?, CURRENT_TIMESTAMP)")->execute(array($user_id, $gedcom_id, $title, $text));
-	}
+	    echo '<h3>' . I18N::translate('Add/edit a journal/news entry') . '</h3>';
+	    echo '<form style="overflow: hidden;" name="messageform" method="post" action="editnews.php?action=save&news_id=' . $news_id . '">';
+	    if ($news_id) {
+		    $news = Database::prepare("SELECT news_id AS id, user_id, gedcom_id, UNIX_TIMESTAMP(updated) AS date, subject, body FROM `##news` WHERE news_id=?")->execute(array($news_id))->fetchOneRow(PDO::FETCH_ASSOC);
+	    } else {
+		    $news              = array();
+		    $news['user_id']   = $user_id;
+		    $news['gedcom_id'] = $gedcom_id;
+		    $news['date']      = WT_TIMESTAMP;
+		    $news['subject']   = '';
+		    $news['body']      = '';
+	    }
+	    echo '<input type="hidden" name="user_id" value="' . $news['user_id'] . '">';
+	    echo '<input type="hidden" name="gedcom_id" value="' . $news['gedcom_id'] . '">';
+	    echo '<input type="hidden" name="date" value="' . $news['date'] . '">';
+	    echo '<table>';
+	    echo '<tr><th style="text-align:start;">' . I18N::translate('Title') . '</th><tr>';
+	    echo '<tr><td><input type="text" name="title" size="50" dir="auto" autofocus value="' . $news['subject'] . '"></td></tr>';
+	    echo '<tr><th style="text-align:start;">' . I18N::translate('Content') . '</th></tr>';
+	    echo '<tr><td>';
+	    echo '<textarea name="text" class="html-edit" cols="80" rows="10" dir="auto">' . Filter::escapeHtml($news['body']) . '</textarea>';
+	    echo '</td></tr>';
+	    echo '<tr><td><input type="submit" value="' . I18N::translate('save') . '"></td></tr>';
+	    echo '</table>';
+	    echo '</form>';
+	    break;
+    case 'save':
+	    if ($news_id) {
+		    Database::prepare("UPDATE `##news` SET subject=?, body=?, updated=FROM_UNIXTIME(?) WHERE news_id=?")->execute(array($title, $text, $date, $news_id));
+	    } else {
+		    Database::prepare("INSERT INTO `##news` (user_id, gedcom_id, subject, body, updated) VALUES (NULLIF(?, ''), NULLIF(?, '') ,? ,?, CURRENT_TIMESTAMP)")->execute(array($user_id, $gedcom_id, $title, $text));
+	    }
 
-	$controller->addInlineJavascript('window.opener.location.reload();window.close();');
-	break;
+	    $controller->addInlineJavascript('window.opener.location.reload();window.close();');
+	    break;
 }

includes/session.php

Switch Indentation +42 added lines, -42 removed lines

@@ -200,29 +200,29 @@ 
 		$frame += array('args' => array(), 'file' => 'unknown', 'line' => 'unknown');
 		array_walk($frame['args'], function (&$arg) {
 			switch (gettype($arg)) {
-			case 'boolean':
-			case 'integer':
-			case 'double':
-			case 'null':
-				$arg = var_export($arg, true);
-				break;
-			case 'string':
-				if (mb_strlen($arg) > 30) {
-					$arg = substr($arg, 0, 30) . '…';
-				}
-				$arg = var_export($arg, true);
-				break;
-			case 'object':
-				$reflection = new \ReflectionClass($arg);
-				if (is_object($arg) && method_exists($arg, '__toString')) {
-					$arg = '[' . $reflection->getShortName() . ' ' . (string) $arg . ']';
-				} else {
-					$arg = '[' . $reflection->getShortName() . ']';
-				}
-				break;
-			default:
-				$arg = '[' . gettype($arg) . ']';
-				break;
+			    case 'boolean':
+			    case 'integer':
+			    case 'double':
+			    case 'null':
+				    $arg = var_export($arg, true);
+				    break;
+			    case 'string':
+				    if (mb_strlen($arg) > 30) {
+					    $arg = substr($arg, 0, 30) . '…';
+				    }
+				    $arg = var_export($arg, true);
+				    break;
+			    case 'object':
+				    $reflection = new \ReflectionClass($arg);
+				    if (is_object($arg) && method_exists($arg, '__toString')) {
+					    $arg = '[' . $reflection->getShortName() . ' ' . (string) $arg . ']';
+				    } else {
+					    $arg = '[' . $reflection->getShortName() . ']';
+				    }
+				    break;
+			    default:
+				    $arg = '[' . gettype($arg) . ']';
+				    break;
 			}
 		});
 		$frame['file'] = str_replace(dirname(__DIR__), '', $frame['file']);
@@ -319,25 +319,25 @@ 
 )->execute(array(WT_CLIENT_IP, Filter::server('HTTP_USER_AGENT', null, '')))->fetchOne();
 
 switch ($rule) {
-case 'allow':
-	$SEARCH_SPIDER = false;
-	break;
-case 'deny':
-	http_response_code(403);
-	exit;
-case 'robot':
-case 'unknown':
-	// Search engines don’t send cookies, and so create a new session with every visit.
-	// Make sure they always use the same one
-	Session::setId('search-engine-' . str_replace('.', '-', WT_CLIENT_IP));
-	$SEARCH_SPIDER = true;
-	break;
-case '':
-	Database::prepare(
-		"INSERT INTO `##site_access_rule` (ip_address_start, ip_address_end, user_agent_pattern, comment) VALUES (IFNULL(INET_ATON(?), 0), IFNULL(INET_ATON(?), 4294967295), ?, '')"
-	)->execute(array(WT_CLIENT_IP, WT_CLIENT_IP, Filter::server('HTTP_USER_AGENT', null, '')));
-	$SEARCH_SPIDER = true;
-	break;
+    case 'allow':
+	    $SEARCH_SPIDER = false;
+	    break;
+    case 'deny':
+	    http_response_code(403);
+	    exit;
+    case 'robot':
+    case 'unknown':
+	    // Search engines don’t send cookies, and so create a new session with every visit.
+	    // Make sure they always use the same one
+	    Session::setId('search-engine-' . str_replace('.', '-', WT_CLIENT_IP));
+	    $SEARCH_SPIDER = true;
+	    break;
+    case '':
+	    Database::prepare(
+		    "INSERT INTO `##site_access_rule` (ip_address_start, ip_address_end, user_agent_pattern, comment) VALUES (IFNULL(INET_ATON(?), 0), IFNULL(INET_ATON(?), 4294967295), ?, '')"
+	    )->execute(array(WT_CLIENT_IP, WT_CLIENT_IP, Filter::server('HTTP_USER_AGENT', null, '')));
+	    $SEARCH_SPIDER = true;
+	    break;
 }
 
 // Store our session data in the database.

find.php

Switch Indentation +54 added lines, -54 removed lines

@@ -47,60 +47,60 @@
 $embed = substr($choose, 0, 1) === '1';
 
 switch ($type) {
-case 'indi':
-	$controller->setPageTitle(I18N::translate('Find an individual'));
-	break;
-case 'fam':
-	$controller->setPageTitle(I18N::translate('Find a family'));
-	break;
-case 'media':
-	$controller->setPageTitle(I18N::translate('Find a media object'));
-	break;
-case 'place':
-	$controller->setPageTitle(I18N::translate('Find a place'));
-	break;
-case 'repo':
-	$controller->setPageTitle(I18N::translate('Find a repository'));
-	break;
-case 'note':
-	$controller->setPageTitle(I18N::translate('Find a shared note'));
-	break;
-case 'source':
-	$controller->setPageTitle(I18N::translate('Find a source'));
-	break;
-case 'specialchar':
-	$controller->setPageTitle(I18N::translate('Find a special character'));
-	break;
-case 'factINDI':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("INDI");');
-	break;
-case 'factFAM':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("FAM");');
-	break;
-case 'factSOUR':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("SOUR");');
-	break;
-case 'factREPO':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("REPO");');
-	break;
-case 'factNAME':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("NAME");');
-	break;
-case 'factPLAC':
-	$controller
-		->setPageTitle(I18N::translate('Find a fact or event'))
-		->addInlineJavascript('initPickFact("PLAC");');
-	break;
+    case 'indi':
+	    $controller->setPageTitle(I18N::translate('Find an individual'));
+	    break;
+    case 'fam':
+	    $controller->setPageTitle(I18N::translate('Find a family'));
+	    break;
+    case 'media':
+	    $controller->setPageTitle(I18N::translate('Find a media object'));
+	    break;
+    case 'place':
+	    $controller->setPageTitle(I18N::translate('Find a place'));
+	    break;
+    case 'repo':
+	    $controller->setPageTitle(I18N::translate('Find a repository'));
+	    break;
+    case 'note':
+	    $controller->setPageTitle(I18N::translate('Find a shared note'));
+	    break;
+    case 'source':
+	    $controller->setPageTitle(I18N::translate('Find a source'));
+	    break;
+    case 'specialchar':
+	    $controller->setPageTitle(I18N::translate('Find a special character'));
+	    break;
+    case 'factINDI':
+	    $controller
+		    ->setPageTitle(I18N::translate('Find a fact or event'))
+		    ->addInlineJavascript('initPickFact("INDI");');
+	    break;
+    case 'factFAM':
+	    $controller
+		    ->setPageTitle(I18N::translate('Find a fact or event'))
+		    ->addInlineJavascript('initPickFact("FAM");');
+	    break;
+    case 'factSOUR':
+	    $controller
+		    ->setPageTitle(I18N::translate('Find a fact or event'))
+		    ->addInlineJavascript('initPickFact("SOUR");');
+	    break;
+    case 'factREPO':
+	    $controller
+		    ->setPageTitle(I18N::translate('Find a fact or event'))
+		    ->addInlineJavascript('initPickFact("REPO");');
+	    break;
+    case 'factNAME':
+	    $controller
+		    ->setPageTitle(I18N::translate('Find a fact or event'))
+		    ->addInlineJavascript('initPickFact("NAME");');
+	    break;
+    case 'factPLAC':
+	    $controller
+		    ->setPageTitle(I18N::translate('Find a fact or event'))
+		    ->addInlineJavascript('initPickFact("PLAC");');
+	    break;
 }
 $controller->pageHeader();
 

action.php

Switch Indentation +8 added lines, -8 removed lines

@@ -66,14 +66,14 @@
 		foreach ($record->getFacts() as $fact) {
 			if ($fact->getFactId() == $fact_id) {
 				switch ($fact->getTag()) {
-				case 'NOTE':
-				case 'SOUR':
-				case 'OBJE':
-					$type = 'all'; // paste this anywhere
-					break;
-				default:
-					$type = $record::RECORD_TYPE; // paste only to the same record type
-					break;
+				    case 'NOTE':
+				    case 'SOUR':
+				    case 'OBJE':
+					    $type = 'all'; // paste this anywhere
+					    break;
+				    default:
+					    $type = $record::RECORD_TYPE; // paste only to the same record type
+					    break;
 				}
 				$clipboard = Session::get('clipboard');
 				if (!is_array($clipboard)) {

statisticsplot.php

Switch Indentation +521 added lines, -521 removed lines

@@ -852,528 +852,528 @@
 echo '<div class="statistics_chart" title="', I18N::translate('Statistics chart'), '">';
 
 switch ($x_axis) {
-case '1':
-	echo $stats->chartDistribution(array(Filter::get('chart_shows'), Filter::get('chart_type'), Filter::get('SURN')));
-	break;
-case '2':
-	echo $stats->chartDistribution(array(Filter::get('chart_shows'), 'birth_distribution_chart'));
-	break;
-case '3':
-	echo $stats->chartDistribution(array(Filter::get('chart_shows'), 'death_distribution_chart'));
-	break;
-case '4':
-	echo $stats->chartDistribution(array(Filter::get('chart_shows'), 'marriage_distribution_chart'));
-	break;
-case '11':
-	$monthdata = array();
-	for ($i = 0; $i < 12; ++$i) {
-		$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
-	}
-	$xgiven            = true;
-	$zgiven            = false;
-	$title             = I18N::translate('Month of birth');
-	$xtitle            = I18N::translate('month');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	$xdata             = $monthdata;
-	$xmax              = 12;
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
-		$percentage = false;
-		$ytitle     = I18N::translate('Individuals');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-		$xtitle      = $xtitle . I18N::translate(' per gender');
-	} elseif ($z_axis === 302) {
-		$xtitle = $xtitle . I18N::translate(' per time period');
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
-		}
-	}
-	$total = month_of_birth($z_axis, $z_boundaries, $stats);
-	$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalIndividuals();
-	my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '12':
-	$monthdata = array();
-	for ($i = 0; $i < 12; ++$i) {
-		$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
-	}
-	$xgiven            = true;
-	$zgiven            = false;
-	$title             = I18N::translate('Month of death');
-	$xtitle            = I18N::translate('month');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	$xdata             = $monthdata;
-	$xmax              = 12;
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
-		$percentage = false;
-		$ytitle     = I18N::translate('Individuals');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-		$xtitle      = $xtitle . I18N::translate(' per gender');
-	} elseif ($z_axis === 302) {
-		$xtitle = $xtitle . I18N::translate(' per time period');
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
-		}
-	}
-	$total = month_of_death($z_axis, $z_boundaries, $stats);
-	$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalIndividuals();
-	my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '13':
-	$monthdata = array();
-	for ($i = 0; $i < 12; ++$i) {
-		$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
-	}
+    case '1':
+	    echo $stats->chartDistribution(array(Filter::get('chart_shows'), Filter::get('chart_type'), Filter::get('SURN')));
+	    break;
+    case '2':
+	    echo $stats->chartDistribution(array(Filter::get('chart_shows'), 'birth_distribution_chart'));
+	    break;
+    case '3':
+	    echo $stats->chartDistribution(array(Filter::get('chart_shows'), 'death_distribution_chart'));
+	    break;
+    case '4':
+	    echo $stats->chartDistribution(array(Filter::get('chart_shows'), 'marriage_distribution_chart'));
+	    break;
+    case '11':
+	    $monthdata = array();
+	    for ($i = 0; $i < 12; ++$i) {
+		    $monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
+	    }
+	    $xgiven            = true;
+	    $zgiven            = false;
+	    $title             = I18N::translate('Month of birth');
+	    $xtitle            = I18N::translate('month');
+	    $ytitle            = I18N::translate('numbers');
+	    $boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+	    $xdata             = $monthdata;
+	    $xmax              = 12;
+	    if ($z_axis !== 300 && $z_axis !== 301) {
+		    calculate_legend($boundaries_z_axis);
+	    }
+	    $percentage = false;
+	    if ($y_axis === 201) {
+		    $percentage = false;
+		    $ytitle     = I18N::translate('Individuals');
+	    } elseif ($y_axis === 202) {
+		    $percentage = true;
+		    $ytitle     = I18N::translate('percentage');
+	    }
+	    $male_female = false;
+	    if ($z_axis === 300) {
+		    $zgiven          = false;
+		    $legend[0]       = 'all';
+		    $zmax            = 1;
+		    $z_boundaries[0] = 100000;
+	    } elseif ($z_axis === 301) {
+		    $male_female = true;
+		    $zgiven      = true;
+		    $legend[0]   = I18N::translate('Male');
+		    $legend[1]   = I18N::translate('Female');
+		    $zmax        = 2;
+		    $xtitle      = $xtitle . I18N::translate(' per gender');
+	    } elseif ($z_axis === 302) {
+		    $xtitle = $xtitle . I18N::translate(' per time period');
+	    }
+	    //-- reset the data array
+	    for ($i = 0; $i < $zmax; $i++) {
+		    for ($j = 0; $j < $xmax; $j++) {
+			    $ydata[$i][$j] = 0;
+		    }
+	    }
+	    $total = month_of_birth($z_axis, $z_boundaries, $stats);
+	    $hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalIndividuals();
+	    my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
+	    break;
+    case '12':
+	    $monthdata = array();
+	    for ($i = 0; $i < 12; ++$i) {
+		    $monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
+	    }
+	    $xgiven            = true;
+	    $zgiven            = false;
+	    $title             = I18N::translate('Month of death');
+	    $xtitle            = I18N::translate('month');
+	    $ytitle            = I18N::translate('numbers');
+	    $boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+	    $xdata             = $monthdata;
+	    $xmax              = 12;
+	    if ($z_axis !== 300 && $z_axis !== 301) {
+		    calculate_legend($boundaries_z_axis);
+	    }
+	    $percentage = false;
+	    if ($y_axis === 201) {
+		    $percentage = false;
+		    $ytitle     = I18N::translate('Individuals');
+	    } elseif ($y_axis === 202) {
+		    $percentage = true;
+		    $ytitle     = I18N::translate('percentage');
+	    }
+	    $male_female = false;
+	    if ($z_axis === 300) {
+		    $zgiven          = false;
+		    $legend[0]       = 'all';
+		    $zmax            = 1;
+		    $z_boundaries[0] = 100000;
+	    } elseif ($z_axis === 301) {
+		    $male_female = true;
+		    $zgiven      = true;
+		    $legend[0]   = I18N::translate('Male');
+		    $legend[1]   = I18N::translate('Female');
+		    $zmax        = 2;
+		    $xtitle      = $xtitle . I18N::translate(' per gender');
+	    } elseif ($z_axis === 302) {
+		    $xtitle = $xtitle . I18N::translate(' per time period');
+	    }
+	    //-- reset the data array
+	    for ($i = 0; $i < $zmax; $i++) {
+		    for ($j = 0; $j < $xmax; $j++) {
+			    $ydata[$i][$j] = 0;
+		    }
+	    }
+	    $total = month_of_death($z_axis, $z_boundaries, $stats);
+	    $hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalIndividuals();
+	    my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
+	    break;
+    case '13':
+	    $monthdata = array();
+	    for ($i = 0; $i < 12; ++$i) {
+		    $monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
+	    }
 
-	if ($z_axis === 301) {
-		$z_axis = 300;
-	}
-	$xgiven            = true;
-	$zgiven            = false;
-	$title             = I18N::translate('Month of marriage');
-	$xtitle            = I18N::translate('month');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	$xdata             = $monthdata;
-	$xmax              = 12;
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
-		$percentage = false;
-		$ytitle     = I18N::translate('Families');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-		$xtitle      = $xtitle . I18N::translate(' per gender');
-	} elseif ($z_axis === 302) {
-		$xtitle = $xtitle . I18N::translate(' per time period');
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
-		}
-	}
-	$total = month_of_marriage($z_axis, $z_boundaries, $stats);
-	$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalFamilies();
-	my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '14':
-	$monthdata = array();
-	for ($i = 0; $i < 12; ++$i) {
-		$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
-	}
-	$xgiven            = true;
-	$zgiven            = false;
-	$title             = I18N::translate('Month of birth of first child in a relation');
-	$xtitle            = I18N::translate('month');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	$xdata             = $monthdata;
-	$xmax              = 12;
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
-		$percentage = false;
-		$ytitle     = I18N::translate('Children');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-		$xtitle      = $xtitle . I18N::translate(' per gender');
-	} elseif ($z_axis === 302) {
-		$xtitle = $xtitle . I18N::translate(' per time period');
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
-		}
-	}
-	$total = month_of_birth_of_first_child($z_axis, $z_boundaries, $stats);
-	$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalFamilies();
-	my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '15':
-	$monthdata = array();
-	for ($i = 0; $i < 12; ++$i) {
-		$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
-	}
+	    if ($z_axis === 301) {
+		    $z_axis = 300;
+	    }
+	    $xgiven            = true;
+	    $zgiven            = false;
+	    $title             = I18N::translate('Month of marriage');
+	    $xtitle            = I18N::translate('month');
+	    $ytitle            = I18N::translate('numbers');
+	    $boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+	    $xdata             = $monthdata;
+	    $xmax              = 12;
+	    if ($z_axis !== 300 && $z_axis !== 301) {
+		    calculate_legend($boundaries_z_axis);
+	    }
+	    $percentage = false;
+	    if ($y_axis === 201) {
+		    $percentage = false;
+		    $ytitle     = I18N::translate('Families');
+	    } elseif ($y_axis === 202) {
+		    $percentage = true;
+		    $ytitle     = I18N::translate('percentage');
+	    }
+	    $male_female = false;
+	    if ($z_axis === 300) {
+		    $zgiven          = false;
+		    $legend[0]       = 'all';
+		    $zmax            = 1;
+		    $z_boundaries[0] = 100000;
+	    } elseif ($z_axis === 301) {
+		    $male_female = true;
+		    $zgiven      = true;
+		    $legend[0]   = I18N::translate('Male');
+		    $legend[1]   = I18N::translate('Female');
+		    $zmax        = 2;
+		    $xtitle      = $xtitle . I18N::translate(' per gender');
+	    } elseif ($z_axis === 302) {
+		    $xtitle = $xtitle . I18N::translate(' per time period');
+	    }
+	    //-- reset the data array
+	    for ($i = 0; $i < $zmax; $i++) {
+		    for ($j = 0; $j < $xmax; $j++) {
+			    $ydata[$i][$j] = 0;
+		    }
+	    }
+	    $total = month_of_marriage($z_axis, $z_boundaries, $stats);
+	    $hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalFamilies();
+	    my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
+	    break;
+    case '14':
+	    $monthdata = array();
+	    for ($i = 0; $i < 12; ++$i) {
+		    $monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
+	    }
+	    $xgiven            = true;
+	    $zgiven            = false;
+	    $title             = I18N::translate('Month of birth of first child in a relation');
+	    $xtitle            = I18N::translate('month');
+	    $ytitle            = I18N::translate('numbers');
+	    $boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+	    $xdata             = $monthdata;
+	    $xmax              = 12;
+	    if ($z_axis !== 300 && $z_axis !== 301) {
+		    calculate_legend($boundaries_z_axis);
+	    }
+	    $percentage = false;
+	    if ($y_axis === 201) {
+		    $percentage = false;
+		    $ytitle     = I18N::translate('Children');
+	    } elseif ($y_axis === 202) {
+		    $percentage = true;
+		    $ytitle     = I18N::translate('percentage');
+	    }
+	    $male_female = false;
+	    if ($z_axis === 300) {
+		    $zgiven          = false;
+		    $legend[0]       = 'all';
+		    $zmax            = 1;
+		    $z_boundaries[0] = 100000;
+	    } elseif ($z_axis === 301) {
+		    $male_female = true;
+		    $zgiven      = true;
+		    $legend[0]   = I18N::translate('Male');
+		    $legend[1]   = I18N::translate('Female');
+		    $zmax        = 2;
+		    $xtitle      = $xtitle . I18N::translate(' per gender');
+	    } elseif ($z_axis === 302) {
+		    $xtitle = $xtitle . I18N::translate(' per time period');
+	    }
+	    //-- reset the data array
+	    for ($i = 0; $i < $zmax; $i++) {
+		    for ($j = 0; $j < $xmax; $j++) {
+			    $ydata[$i][$j] = 0;
+		    }
+	    }
+	    $total = month_of_birth_of_first_child($z_axis, $z_boundaries, $stats);
+	    $hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalFamilies();
+	    my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
+	    break;
+    case '15':
+	    $monthdata = array();
+	    for ($i = 0; $i < 12; ++$i) {
+		    $monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
+	    }
 
-	if ($z_axis === 301) {
-		$z_axis = 300;
-	}
-	$xgiven            = true;
-	$zgiven            = false;
-	$title             = I18N::translate('Month of first marriage');
-	$xtitle            = I18N::translate('month');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	$xdata             = $monthdata;
-	$xmax              = 12;
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
-		$percentage = false;
-		$ytitle     = I18N::translate('Families');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-		$xtitle      = $xtitle . I18N::translate(' per gender');
-	} elseif ($z_axis === 302) {
-		$xtitle = $xtitle . I18N::translate(' per time period');
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
-		}
-	}
-	$total = month_of_first_marriage($z_axis, $z_boundaries, $stats);
-	$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalFamilies();
-	my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '17':
-	$monthdata = array();
-	for ($i = 0; $i < 12; ++$i) {
-		$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
-	}
-	$xgiven            = false;
-	$zgiven            = false;
-	$title             = I18N::translate('Age related to birth year');
-	$xtitle            = I18N::translate('age');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_x_axis = Filter::get('x-axis-boundaries-ages');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	calculate_axis($boundaries_x_axis);
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
-		$percentage = false;
-		$ytitle     = I18N::translate('Individuals');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-		$xtitle      = $xtitle . I18N::translate(' per gender');
-	} elseif ($z_axis === 302) {
-		$xtitle = $xtitle . I18N::translate(' per time period');
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
-		}
-	}
-	$total = lifespan_by_birth_year($z_axis, $z_boundaries, $stats);
-	$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalIndividuals();
-	my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '18':
-	$monthdata = array();
-	for ($i = 0; $i < 12; ++$i) {
-		$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
-	}
-	$xgiven            = false;
-	$zgiven            = false;
-	$title             = I18N::translate('Age related to death year');
-	$xtitle            = I18N::translate('age');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_x_axis = Filter::get('x-axis-boundaries-ages');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	calculate_axis($boundaries_x_axis);
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
-		$percentage = false;
-		$ytitle     = I18N::translate('Individuals');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-		$xtitle      = $xtitle . I18N::translate(' per gender');
-	} elseif ($z_axis === 302) {
-		$xtitle = $xtitle . I18N::translate(' per time period');
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
-		}
-	}
-	$total = lifespan_by_death_year($z_axis, $z_boundaries, $stats);
-	$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalIndividuals();
-	my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '19':
-	$monthdata = array();
-	for ($i = 0; $i < 12; ++$i) {
-		$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
-	}
-	$xgiven            = false;
-	$zgiven            = false;
-	$title             = I18N::translate('Age in year of marriage');
-	$xtitle            = I18N::translate('age');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_x_axis = Filter::get('x-axis-boundaries-ages_m');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	calculate_axis($boundaries_x_axis);
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
-		$percentage = false;
-		$ytitle     = I18N::translate('Individuals');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female     = false;
-	$z_boundaries[0] = 100000;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-		$xtitle      = $xtitle . I18N::translate(' per gender');
-	} elseif ($z_axis === 302) {
-		$xtitle = $xtitle . I18N::translate(' per time period');
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
-		}
-	}
-	$total = age_at_marriage($z_axis, $z_boundaries, $stats);
-	$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalIndividuals();
-	my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '20':
-	$monthdata = array();
-	for ($i = 0; $i < 12; ++$i) {
-		$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
-	}
-	$xgiven            = false;
-	$zgiven            = false;
-	$title             = I18N::translate('Age in year of first marriage');
-	$xtitle            = I18N::translate('age');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_x_axis = Filter::get('x-axis-boundaries-ages_m');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	calculate_axis($boundaries_x_axis);
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
-		$percentage = false;
-		$ytitle     = I18N::translate('Individuals');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-		$xtitle      = $xtitle . I18N::translate(' per gender');
-	} elseif ($z_axis === 302) {
-		$xtitle = $xtitle . I18N::translate(' per time period');
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
-		}
-	}
-	$total = age_at_first_marriage($z_axis, $z_boundaries, $stats);
-	$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalIndividuals();
-	my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-case '21':
-	$monthdata = array();
-	for ($i = 0; $i < 12; ++$i) {
-		$monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
-	}
-	$xgiven            = false;
-	$zgiven            = false;
-	$title             = I18N::translate('Number of children');
-	$xtitle            = I18N::translate('children');
-	$ytitle            = I18N::translate('numbers');
-	$boundaries_x_axis = Filter::get('x-axis-boundaries-numbers');
-	$boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
-	calculate_axis($boundaries_x_axis);
-	if ($z_axis !== 300 && $z_axis !== 301) {
-		calculate_legend($boundaries_z_axis);
-	}
-	$percentage = false;
-	if ($y_axis === 201) {
-		$percentage = false;
-		$ytitle     = I18N::translate('Families');
-	} elseif ($y_axis === 202) {
-		$percentage = true;
-		$ytitle     = I18N::translate('percentage');
-	}
-	$male_female = false;
-	if ($z_axis === 300) {
-		$zgiven          = false;
-		$legend[0]       = 'all';
-		$zmax            = 1;
-		$z_boundaries[0] = 100000;
-	} elseif ($z_axis === 301) {
-		$male_female = true;
-		$zgiven      = true;
-		$legend[0]   = I18N::translate('Male');
-		$legend[1]   = I18N::translate('Female');
-		$zmax        = 2;
-		$xtitle      = $xtitle . I18N::translate(' per gender');
-	} elseif ($z_axis === 302) {
-		$xtitle = $xtitle . I18N::translate(' per time period');
-	}
-	//-- reset the data array
-	for ($i = 0; $i < $zmax; $i++) {
-		for ($j = 0; $j < $xmax; $j++) {
-			$ydata[$i][$j] = 0;
-		}
-	}
-	$total = number_of_children($z_axis, $z_boundaries, $stats);
-	$hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalChildren();
-	my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
-	break;
-default:
-	echo '<i class="icon-loading-large"></i>';
-	break;
+	    if ($z_axis === 301) {
+		    $z_axis = 300;
+	    }
+	    $xgiven            = true;
+	    $zgiven            = false;
+	    $title             = I18N::translate('Month of first marriage');
+	    $xtitle            = I18N::translate('month');
+	    $ytitle            = I18N::translate('numbers');
+	    $boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+	    $xdata             = $monthdata;
+	    $xmax              = 12;
+	    if ($z_axis !== 300 && $z_axis !== 301) {
+		    calculate_legend($boundaries_z_axis);
+	    }
+	    $percentage = false;
+	    if ($y_axis === 201) {
+		    $percentage = false;
+		    $ytitle     = I18N::translate('Families');
+	    } elseif ($y_axis === 202) {
+		    $percentage = true;
+		    $ytitle     = I18N::translate('percentage');
+	    }
+	    $male_female = false;
+	    if ($z_axis === 300) {
+		    $zgiven          = false;
+		    $legend[0]       = 'all';
+		    $zmax            = 1;
+		    $z_boundaries[0] = 100000;
+	    } elseif ($z_axis === 301) {
+		    $male_female = true;
+		    $zgiven      = true;
+		    $legend[0]   = I18N::translate('Male');
+		    $legend[1]   = I18N::translate('Female');
+		    $zmax        = 2;
+		    $xtitle      = $xtitle . I18N::translate(' per gender');
+	    } elseif ($z_axis === 302) {
+		    $xtitle = $xtitle . I18N::translate(' per time period');
+	    }
+	    //-- reset the data array
+	    for ($i = 0; $i < $zmax; $i++) {
+		    for ($j = 0; $j < $xmax; $j++) {
+			    $ydata[$i][$j] = 0;
+		    }
+	    }
+	    $total = month_of_first_marriage($z_axis, $z_boundaries, $stats);
+	    $hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalFamilies();
+	    my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
+	    break;
+    case '17':
+	    $monthdata = array();
+	    for ($i = 0; $i < 12; ++$i) {
+		    $monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
+	    }
+	    $xgiven            = false;
+	    $zgiven            = false;
+	    $title             = I18N::translate('Age related to birth year');
+	    $xtitle            = I18N::translate('age');
+	    $ytitle            = I18N::translate('numbers');
+	    $boundaries_x_axis = Filter::get('x-axis-boundaries-ages');
+	    $boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+	    calculate_axis($boundaries_x_axis);
+	    if ($z_axis !== 300 && $z_axis !== 301) {
+		    calculate_legend($boundaries_z_axis);
+	    }
+	    $percentage = false;
+	    if ($y_axis === 201) {
+		    $percentage = false;
+		    $ytitle     = I18N::translate('Individuals');
+	    } elseif ($y_axis === 202) {
+		    $percentage = true;
+		    $ytitle     = I18N::translate('percentage');
+	    }
+	    $male_female = false;
+	    if ($z_axis === 300) {
+		    $zgiven          = false;
+		    $legend[0]       = 'all';
+		    $zmax            = 1;
+		    $z_boundaries[0] = 100000;
+	    } elseif ($z_axis === 301) {
+		    $male_female = true;
+		    $zgiven      = true;
+		    $legend[0]   = I18N::translate('Male');
+		    $legend[1]   = I18N::translate('Female');
+		    $zmax        = 2;
+		    $xtitle      = $xtitle . I18N::translate(' per gender');
+	    } elseif ($z_axis === 302) {
+		    $xtitle = $xtitle . I18N::translate(' per time period');
+	    }
+	    //-- reset the data array
+	    for ($i = 0; $i < $zmax; $i++) {
+		    for ($j = 0; $j < $xmax; $j++) {
+			    $ydata[$i][$j] = 0;
+		    }
+	    }
+	    $total = lifespan_by_birth_year($z_axis, $z_boundaries, $stats);
+	    $hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalIndividuals();
+	    my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
+	    break;
+    case '18':
+	    $monthdata = array();
+	    for ($i = 0; $i < 12; ++$i) {
+		    $monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
+	    }
+	    $xgiven            = false;
+	    $zgiven            = false;
+	    $title             = I18N::translate('Age related to death year');
+	    $xtitle            = I18N::translate('age');
+	    $ytitle            = I18N::translate('numbers');
+	    $boundaries_x_axis = Filter::get('x-axis-boundaries-ages');
+	    $boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+	    calculate_axis($boundaries_x_axis);
+	    if ($z_axis !== 300 && $z_axis !== 301) {
+		    calculate_legend($boundaries_z_axis);
+	    }
+	    $percentage = false;
+	    if ($y_axis === 201) {
+		    $percentage = false;
+		    $ytitle     = I18N::translate('Individuals');
+	    } elseif ($y_axis === 202) {
+		    $percentage = true;
+		    $ytitle     = I18N::translate('percentage');
+	    }
+	    $male_female = false;
+	    if ($z_axis === 300) {
+		    $zgiven          = false;
+		    $legend[0]       = 'all';
+		    $zmax            = 1;
+		    $z_boundaries[0] = 100000;
+	    } elseif ($z_axis === 301) {
+		    $male_female = true;
+		    $zgiven      = true;
+		    $legend[0]   = I18N::translate('Male');
+		    $legend[1]   = I18N::translate('Female');
+		    $zmax        = 2;
+		    $xtitle      = $xtitle . I18N::translate(' per gender');
+	    } elseif ($z_axis === 302) {
+		    $xtitle = $xtitle . I18N::translate(' per time period');
+	    }
+	    //-- reset the data array
+	    for ($i = 0; $i < $zmax; $i++) {
+		    for ($j = 0; $j < $xmax; $j++) {
+			    $ydata[$i][$j] = 0;
+		    }
+	    }
+	    $total = lifespan_by_death_year($z_axis, $z_boundaries, $stats);
+	    $hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalIndividuals();
+	    my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
+	    break;
+    case '19':
+	    $monthdata = array();
+	    for ($i = 0; $i < 12; ++$i) {
+		    $monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
+	    }
+	    $xgiven            = false;
+	    $zgiven            = false;
+	    $title             = I18N::translate('Age in year of marriage');
+	    $xtitle            = I18N::translate('age');
+	    $ytitle            = I18N::translate('numbers');
+	    $boundaries_x_axis = Filter::get('x-axis-boundaries-ages_m');
+	    $boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+	    calculate_axis($boundaries_x_axis);
+	    if ($z_axis !== 300 && $z_axis !== 301) {
+		    calculate_legend($boundaries_z_axis);
+	    }
+	    $percentage = false;
+	    if ($y_axis === 201) {
+		    $percentage = false;
+		    $ytitle     = I18N::translate('Individuals');
+	    } elseif ($y_axis === 202) {
+		    $percentage = true;
+		    $ytitle     = I18N::translate('percentage');
+	    }
+	    $male_female     = false;
+	    $z_boundaries[0] = 100000;
+	    if ($z_axis === 300) {
+		    $zgiven          = false;
+		    $legend[0]       = 'all';
+		    $zmax            = 1;
+	    } elseif ($z_axis === 301) {
+		    $male_female = true;
+		    $zgiven      = true;
+		    $legend[0]   = I18N::translate('Male');
+		    $legend[1]   = I18N::translate('Female');
+		    $zmax        = 2;
+		    $xtitle      = $xtitle . I18N::translate(' per gender');
+	    } elseif ($z_axis === 302) {
+		    $xtitle = $xtitle . I18N::translate(' per time period');
+	    }
+	    //-- reset the data array
+	    for ($i = 0; $i < $zmax; $i++) {
+		    for ($j = 0; $j < $xmax; $j++) {
+			    $ydata[$i][$j] = 0;
+		    }
+	    }
+	    $total = age_at_marriage($z_axis, $z_boundaries, $stats);
+	    $hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalIndividuals();
+	    my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
+	    break;
+    case '20':
+	    $monthdata = array();
+	    for ($i = 0; $i < 12; ++$i) {
+		    $monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
+	    }
+	    $xgiven            = false;
+	    $zgiven            = false;
+	    $title             = I18N::translate('Age in year of first marriage');
+	    $xtitle            = I18N::translate('age');
+	    $ytitle            = I18N::translate('numbers');
+	    $boundaries_x_axis = Filter::get('x-axis-boundaries-ages_m');
+	    $boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+	    calculate_axis($boundaries_x_axis);
+	    if ($z_axis !== 300 && $z_axis !== 301) {
+		    calculate_legend($boundaries_z_axis);
+	    }
+	    $percentage = false;
+	    if ($y_axis === 201) {
+		    $percentage = false;
+		    $ytitle     = I18N::translate('Individuals');
+	    } elseif ($y_axis === 202) {
+		    $percentage = true;
+		    $ytitle     = I18N::translate('percentage');
+	    }
+	    $male_female = false;
+	    if ($z_axis === 300) {
+		    $zgiven          = false;
+		    $legend[0]       = 'all';
+		    $zmax            = 1;
+		    $z_boundaries[0] = 100000;
+	    } elseif ($z_axis === 301) {
+		    $male_female = true;
+		    $zgiven      = true;
+		    $legend[0]   = I18N::translate('Male');
+		    $legend[1]   = I18N::translate('Female');
+		    $zmax        = 2;
+		    $xtitle      = $xtitle . I18N::translate(' per gender');
+	    } elseif ($z_axis === 302) {
+		    $xtitle = $xtitle . I18N::translate(' per time period');
+	    }
+	    //-- reset the data array
+	    for ($i = 0; $i < $zmax; $i++) {
+		    for ($j = 0; $j < $xmax; $j++) {
+			    $ydata[$i][$j] = 0;
+		    }
+	    }
+	    $total = age_at_first_marriage($z_axis, $z_boundaries, $stats);
+	    $hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalIndividuals();
+	    my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
+	    break;
+    case '21':
+	    $monthdata = array();
+	    for ($i = 0; $i < 12; ++$i) {
+		    $monthdata[$i] = GregorianDate::monthNameNominativeCase($i + 1, false);
+	    }
+	    $xgiven            = false;
+	    $zgiven            = false;
+	    $title             = I18N::translate('Number of children');
+	    $xtitle            = I18N::translate('children');
+	    $ytitle            = I18N::translate('numbers');
+	    $boundaries_x_axis = Filter::get('x-axis-boundaries-numbers');
+	    $boundaries_z_axis = Filter::get('z-axis-boundaries-periods', null, '0');
+	    calculate_axis($boundaries_x_axis);
+	    if ($z_axis !== 300 && $z_axis !== 301) {
+		    calculate_legend($boundaries_z_axis);
+	    }
+	    $percentage = false;
+	    if ($y_axis === 201) {
+		    $percentage = false;
+		    $ytitle     = I18N::translate('Families');
+	    } elseif ($y_axis === 202) {
+		    $percentage = true;
+		    $ytitle     = I18N::translate('percentage');
+	    }
+	    $male_female = false;
+	    if ($z_axis === 300) {
+		    $zgiven          = false;
+		    $legend[0]       = 'all';
+		    $zmax            = 1;
+		    $z_boundaries[0] = 100000;
+	    } elseif ($z_axis === 301) {
+		    $male_female = true;
+		    $zgiven      = true;
+		    $legend[0]   = I18N::translate('Male');
+		    $legend[1]   = I18N::translate('Female');
+		    $zmax        = 2;
+		    $xtitle      = $xtitle . I18N::translate(' per gender');
+	    } elseif ($z_axis === 302) {
+		    $xtitle = $xtitle . I18N::translate(' per time period');
+	    }
+	    //-- reset the data array
+	    for ($i = 0; $i < $zmax; $i++) {
+		    for ($j = 0; $j < $xmax; $j++) {
+			    $ydata[$i][$j] = 0;
+		    }
+	    }
+	    $total = number_of_children($z_axis, $z_boundaries, $stats);
+	    $hstr  = $title . '|' . I18N::translate('Counts ') . ' ' . I18N::number($total) . ' ' . I18N::translate('of') . ' ' . $stats->totalChildren();
+	    my_plot($hstr, $xdata, $xtitle, $ydata, $ytitle, $legend);
+	    break;
+    default:
+	    echo '<i class="icon-loading-large"></i>';
+	    break;
 }
 echo '</div>';

admin_trees_manage.php

Switch Indentation +153 added lines, -153 removed lines

@@ -50,116 +50,116 @@ 
 }
 // Process POST actions
 switch (Filter::post('action')) {
-case 'delete':
-	$gedcom_id = Filter::postInteger('gedcom_id');
-	if (Filter::checkCsrf() && $gedcom_id) {
-		$tree = Tree::findById($gedcom_id);
-		FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” has been deleted.', $tree->getTitleHtml()), 'success');
-		$tree->delete();
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
-case 'setdefault':
-	if (Filter::checkCsrf()) {
-		Site::setPreference('DEFAULT_GEDCOM', Filter::post('ged'));
-		FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” will be shown to visitors when they first arrive at this website.', $WT_TREE->getTitleHtml()), 'success');
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
-case 'new_tree':
-	$basename   = basename(Filter::post('tree_name'));
-	$tree_title = Filter::post('tree_title');
-
-	if (Filter::checkCsrf() && $basename && $tree_title) {
-		if (Tree::findByName($basename)) {
-			FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” already exists.', Filter::escapeHtml($basename)), 'danger');
-		} else {
-			Tree::create($basename, $tree_title);
-			FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” has been created.', Filter::escapeHtml($basename)), 'success');
-		}
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?ged=' . Filter::escapeUrl($basename));
-
-	return;
-case 'replace_upload':
-	$gedcom_id          = Filter::postInteger('gedcom_id');
-	$keep_media         = Filter::post('keep_media', '1', '0');
-	$GEDCOM_MEDIA_PATH  = Filter::post('GEDCOM_MEDIA_PATH');
-	$WORD_WRAPPED_NOTES = Filter::post('WORD_WRAPPED_NOTES', '1', '0');
-	$tree               = Tree::findById($gedcom_id);
-
-	if (Filter::checkCsrf() && $tree) {
-		$tree->setPreference('keep_media', $keep_media);
-		$tree->setPreference('GEDCOM_MEDIA_PATH', $GEDCOM_MEDIA_PATH);
-		$tree->setPreference('WORD_WRAPPED_NOTES', $WORD_WRAPPED_NOTES);
-		if (isset($_FILES['tree_name'])) {
-			if ($_FILES['tree_name']['error'] == 0 && is_readable($_FILES['tree_name']['tmp_name'])) {
-				$tree->importGedcomFile($_FILES['tree_name']['tmp_name'], $_FILES['tree_name']['name']);
-			} else {
-				FlashMessages::addMessage(Functions::fileUploadErrorText($_FILES['tree_name']['error']), 'danger');
-			}
-		} else {
-			FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger');
-		}
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
-case 'replace_import':
-	$basename           = basename(Filter::post('tree_name'));
-	$gedcom_id          = Filter::postInteger('gedcom_id');
-	$keep_media         = Filter::post('keep_media', '1', '0');
-	$GEDCOM_MEDIA_PATH  = Filter::post('GEDCOM_MEDIA_PATH');
-	$WORD_WRAPPED_NOTES = Filter::post('WORD_WRAPPED_NOTES', '1', '0');
-	$tree               = Tree::findById($gedcom_id);
-
-	if (Filter::checkCsrf() && $tree) {
-		$tree->setPreference('keep_media', $keep_media);
-		$tree->setPreference('GEDCOM_MEDIA_PATH', $GEDCOM_MEDIA_PATH);
-		$tree->setPreference('WORD_WRAPPED_NOTES', $WORD_WRAPPED_NOTES);
-		if ($basename) {
-			$tree->importGedcomFile(WT_DATA_DIR . $basename, $basename);
-		} else {
-			FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger');
-		}
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
-
-case 'synchronize':
-	if (Filter::checkCsrf()) {
-		$basenames = array();
-
-		foreach ($gedcom_files as $gedcom_file) {
-			$filemtime   = filemtime($gedcom_file); // Only import files that have changed
-			$basename    = basename($gedcom_file);
-			$basenames[] = $basename;
-
-			$tree = Tree::findByName($basename);
-			if (!$tree) {
-				$tree = Tree::create($basename, $basename);
-			}
-			if ($tree->getPreference('filemtime') != $filemtime) {
-				$tree->importGedcomFile($gedcom_file, $basename);
-				$tree->setPreference('filemtime', $filemtime);
-				FlashMessages::addMessage(I18N::translate('The GEDCOM file “%s” has been imported.', Filter::escapeHtml($basename)), 'success');
-			}
-		}
-
-		foreach (Tree::getAll() as $tree) {
-			if (!in_array($tree->getName(), $basenames)) {
-				FlashMessages::addMessage(I18N::translate('The family tree “%s” has been deleted.', $tree->getTitleHtml()), 'success');
-				$tree->delete();
-			}
-		}
-
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
+    case 'delete':
+	    $gedcom_id = Filter::postInteger('gedcom_id');
+	    if (Filter::checkCsrf() && $gedcom_id) {
+		    $tree = Tree::findById($gedcom_id);
+		    FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” has been deleted.', $tree->getTitleHtml()), 'success');
+		    $tree->delete();
+	    }
+	    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+	    return;
+    case 'setdefault':
+	    if (Filter::checkCsrf()) {
+		    Site::setPreference('DEFAULT_GEDCOM', Filter::post('ged'));
+		    FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” will be shown to visitors when they first arrive at this website.', $WT_TREE->getTitleHtml()), 'success');
+	    }
+	    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+	    return;
+    case 'new_tree':
+	    $basename   = basename(Filter::post('tree_name'));
+	    $tree_title = Filter::post('tree_title');
+
+	    if (Filter::checkCsrf() && $basename && $tree_title) {
+		    if (Tree::findByName($basename)) {
+			    FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” already exists.', Filter::escapeHtml($basename)), 'danger');
+		    } else {
+			    Tree::create($basename, $tree_title);
+			    FlashMessages::addMessage(/* I18N: %s is the name of a family tree */ I18N::translate('The family tree “%s” has been created.', Filter::escapeHtml($basename)), 'success');
+		    }
+	    }
+	    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?ged=' . Filter::escapeUrl($basename));
+
+	    return;
+    case 'replace_upload':
+	    $gedcom_id          = Filter::postInteger('gedcom_id');
+	    $keep_media         = Filter::post('keep_media', '1', '0');
+	    $GEDCOM_MEDIA_PATH  = Filter::post('GEDCOM_MEDIA_PATH');
+	    $WORD_WRAPPED_NOTES = Filter::post('WORD_WRAPPED_NOTES', '1', '0');
+	    $tree               = Tree::findById($gedcom_id);
+
+	    if (Filter::checkCsrf() && $tree) {
+		    $tree->setPreference('keep_media', $keep_media);
+		    $tree->setPreference('GEDCOM_MEDIA_PATH', $GEDCOM_MEDIA_PATH);
+		    $tree->setPreference('WORD_WRAPPED_NOTES', $WORD_WRAPPED_NOTES);
+		    if (isset($_FILES['tree_name'])) {
+			    if ($_FILES['tree_name']['error'] == 0 && is_readable($_FILES['tree_name']['tmp_name'])) {
+				    $tree->importGedcomFile($_FILES['tree_name']['tmp_name'], $_FILES['tree_name']['name']);
+			    } else {
+				    FlashMessages::addMessage(Functions::fileUploadErrorText($_FILES['tree_name']['error']), 'danger');
+			    }
+		    } else {
+			    FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger');
+		    }
+	    }
+	    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+	    return;
+    case 'replace_import':
+	    $basename           = basename(Filter::post('tree_name'));
+	    $gedcom_id          = Filter::postInteger('gedcom_id');
+	    $keep_media         = Filter::post('keep_media', '1', '0');
+	    $GEDCOM_MEDIA_PATH  = Filter::post('GEDCOM_MEDIA_PATH');
+	    $WORD_WRAPPED_NOTES = Filter::post('WORD_WRAPPED_NOTES', '1', '0');
+	    $tree               = Tree::findById($gedcom_id);
+
+	    if (Filter::checkCsrf() && $tree) {
+		    $tree->setPreference('keep_media', $keep_media);
+		    $tree->setPreference('GEDCOM_MEDIA_PATH', $GEDCOM_MEDIA_PATH);
+		    $tree->setPreference('WORD_WRAPPED_NOTES', $WORD_WRAPPED_NOTES);
+		    if ($basename) {
+			    $tree->importGedcomFile(WT_DATA_DIR . $basename, $basename);
+		    } else {
+			    FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger');
+		    }
+	    }
+	    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+	    return;
+
+    case 'synchronize':
+	    if (Filter::checkCsrf()) {
+		    $basenames = array();
+
+		    foreach ($gedcom_files as $gedcom_file) {
+			    $filemtime   = filemtime($gedcom_file); // Only import files that have changed
+			    $basename    = basename($gedcom_file);
+			    $basenames[] = $basename;
+
+			    $tree = Tree::findByName($basename);
+			    if (!$tree) {
+				    $tree = Tree::create($basename, $basename);
+			    }
+			    if ($tree->getPreference('filemtime') != $filemtime) {
+				    $tree->importGedcomFile($gedcom_file, $basename);
+				    $tree->setPreference('filemtime', $filemtime);
+				    FlashMessages::addMessage(I18N::translate('The GEDCOM file “%s” has been imported.', Filter::escapeHtml($basename)), 'success');
+			    }
+		    }
+
+		    foreach (Tree::getAll() as $tree) {
+			    if (!in_array($tree->getName(), $basenames)) {
+				    FlashMessages::addMessage(I18N::translate('The family tree “%s” has been deleted.', $tree->getTitleHtml()), 'success');
+				    $tree->delete();
+			    }
+		    }
+
+	    }
+	    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+	    return;
 }
 
 $default_tree_title  = /* I18N: Default name for a new tree */ I18N::translate('My family tree');
@@ -173,12 +173,12 @@ 
 
 // Process GET actions
 switch (Filter::get('action')) {
-case 'importform':
-	$controller
-		->setPageTitle($WT_TREE->getTitleHtml() . ' — ' . I18N::translate('Import a GEDCOM file'))
-		->pageHeader();
+    case 'importform':
+	    $controller
+		    ->setPageTitle($WT_TREE->getTitleHtml() . ' — ' . I18N::translate('Import a GEDCOM file'))
+		    ->pageHeader();
 
-	?>
+	    ?>
 	<ol class="breadcrumb small">
 		<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 		<li><a href="admin_trees_manage.php"><?php echo I18N::translate('Manage family trees'); ?></a></li>
@@ -188,14 +188,14 @@ 
 	<h1><?php echo $controller->getPageTitle(); ?></h1>
 	<?php
 
-	$tree = Tree::findById(Filter::getInteger('gedcom_id'));
-	// Check it exists
-	if (!$tree) {
-		break;
-	}
-	$gedcom_filename = $tree->getPreference('gedcom_filename')
-	?>
-	<p>
+	    $tree = Tree::findById(Filter::getInteger('gedcom_id'));
+	    // Check it exists
+	    if (!$tree) {
+		    break;
+	    }
+	    $gedcom_filename = $tree->getPreference('gedcom_filename')
+	    ?>
+    	<p>
 		<?php echo /* I18N: %s is the name of a family tree */ I18N::translate('This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file.', $tree->getTitleHtml()); ?>
 	</p>
 	<form class="form form-horizontal" name="gedcomimportform" method="post" enctype="multipart/form-data" onsubmit="return checkGedcomImportForm('<?php echo Filter::escapeHtml(I18N::translate('You have selected a GEDCOM file with a different name. Is this correct?')); ?>');">
@@ -228,35 +228,35 @@ 
 						<div class="input-group">
 							<span class="input-group-addon">
 								<?php echo WT_DATA_DIR; ?>
-							</span>
+    							</span>
 							<?php
-							$d     = opendir(WT_DATA_DIR);
-							$files = array();
-							while (($f = readdir($d)) !== false) {
-								if (!is_dir(WT_DATA_DIR . $f) && is_readable(WT_DATA_DIR . $f)) {
-									$fp     = fopen(WT_DATA_DIR . $f, 'rb');
-									$header = fread($fp, 64);
-									fclose($fp);
-									if (preg_match('/^(' . WT_UTF8_BOM . ')?0 *HEAD/', $header)) {
-										$files[] = $f;
-									}
-								}
-							}
-							echo '<select name="tree_name" class="form-control" id="import-server-file">';
-							echo '<option value=""></option>';
-							sort($files);
-							foreach ($files as $gedcom_file) {
-								echo '<option value="', Filter::escapeHtml($gedcom_file), '" ';
-								if ($gedcom_file === $gedcom_filename) {
-									echo ' selected';
-								}
-								echo'>', Filter::escapeHtml($gedcom_file), '</option>';
-							}
-							if (!$files) {
-								echo '<option disabled selected>', I18N::translate('No GEDCOM files found.'), '</option>';
-							}
-							echo '</select>';
-							?>
+							    $d     = opendir(WT_DATA_DIR);
+							    $files = array();
+							    while (($f = readdir($d)) !== false) {
+								    if (!is_dir(WT_DATA_DIR . $f) && is_readable(WT_DATA_DIR . $f)) {
+									    $fp     = fopen(WT_DATA_DIR . $f, 'rb');
+									    $header = fread($fp, 64);
+									    fclose($fp);
+									    if (preg_match('/^(' . WT_UTF8_BOM . ')?0 *HEAD/', $header)) {
+										    $files[] = $f;
+									    }
+								    }
+							    }
+							    echo '<select name="tree_name" class="form-control" id="import-server-file">';
+							    echo '<option value=""></option>';
+							    sort($files);
+							    foreach ($files as $gedcom_file) {
+								    echo '<option value="', Filter::escapeHtml($gedcom_file), '" ';
+								    if ($gedcom_file === $gedcom_filename) {
+									    echo ' selected';
+								    }
+								    echo'>', Filter::escapeHtml($gedcom_file), '</option>';
+							    }
+							    if (!$files) {
+								    echo '<option disabled selected>', I18N::translate('No GEDCOM files found.'), '</option>';
+							    }
+							    echo '</select>';
+							    ?>
 						</div>
 					</div>
 				</div>
@@ -298,7 +298,7 @@ 
 					>
 				<p class="small text-muted">
 					<?php echo /* I18N: Help text for the “GEDCOM media path” configuration setting. A “path” is something like “C:\Documents\Genealogy\Photos\John_Smith.jpeg” */ I18N::translate('Some genealogy software creates GEDCOM files that contain media filenames with full paths. These paths will not exist on the web-server. To allow webtrees to find the file, the first part of the path must be removed.'); ?>
-					<?php echo /* I18N: Help text for the “GEDCOM media path” configuration setting. %s are all folder names */ I18N::translate('For example, if the GEDCOM file contains %1$s and webtrees expects to find %2$s in the media folder, then you would need to remove %3$s.', '<code>C:\\Documents\\family\\photo.jpeg</code>', '<code>family\\photo.jpeg</code>', '<code>C:\\Documents\\</code>'); ?>
+    					<?php echo /* I18N: Help text for the “GEDCOM media path” configuration setting. %s are all folder names */ I18N::translate('For example, if the GEDCOM file contains %1$s and webtrees expects to find %2$s in the media folder, then you would need to remove %3$s.', '<code>C:\\Documents\\family\\photo.jpeg</code>', '<code>family\\photo.jpeg</code>', '<code>C:\\Documents\\</code>'); ?>
 				</p>
 			</div>
 		</fieldset>
@@ -313,7 +313,7 @@ 
 	</form>
 	<?php
 
-	return;
+	    return;
 }
 
 if (!Tree::getAll()) {

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

indilist.php

Switch Indentation +41 added lines, -41 removed lines

@@ -46,12 +46,12 @@ 
 
 $show_marnm = Filter::get('show_marnm', 'no|yes');
 switch ($show_marnm) {
-case 'no':
-case 'yes':
-	Auth::user()->setPreference(WT_SCRIPT_NAME . '_show_marnm', $show_marnm);
-	break;
-default:
-	$show_marnm = Auth::user()->getPreference(WT_SCRIPT_NAME . '_show_marnm');
+    case 'no':
+    case 'yes':
+	    Auth::user()->setPreference(WT_SCRIPT_NAME . '_show_marnm', $show_marnm);
+	    break;
+    default:
+	    $show_marnm = Auth::user()->getPreference(WT_SCRIPT_NAME . '_show_marnm');
 }
 
 // Make sure selections are consistent.
@@ -91,16 +91,16 @@ 
 	}
 	$url = WT_SCRIPT_NAME . '?surname=' . rawurlencode($surname) . '&ged=' . $WT_TREE->getNameUrl();
 	switch ($falpha) {
-	case '':
-		break;
-	case '@':
-		$legend .= ', ' . I18N::translateContext('Unknown given name', '…');
-		$url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
-		break;
-	default:
-		$legend .= ', ' . Filter::escapeHtml($falpha) . '…';
-		$url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
-		break;
+	    case '':
+		    break;
+	    case '@':
+		    $legend .= ', ' . I18N::translateContext('Unknown given name', '…');
+		    $url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
+		    break;
+	    default:
+		    $legend .= ', ' . Filter::escapeHtml($falpha) . '…';
+		    $url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
+		    break;
 	}
 	$show = 'indi'; // SURN list makes no sense here
 } elseif ($alpha === '@') {
@@ -136,15 +136,15 @@ 
 $list = array();
 foreach (QueryName::surnameAlpha($WT_TREE, $show_marnm === 'yes', false) as $letter => $count) {
 	switch ($letter) {
-	case '@':
-		$html = I18N::translateContext('Unknown surname', '…');
-		break;
-	case ',':
-		$html = I18N::translate('None');
-		break;
-	default:
-		$html = Filter::escapeHtml($letter);
-		break;
+	    case '@':
+		    $html = I18N::translateContext('Unknown surname', '…');
+		    break;
+	    case ',':
+		    $html = I18N::translate('None');
+		    break;
+	    default:
+		    $html = Filter::escapeHtml($letter);
+		    break;
 	}
 	if ($count) {
 		if ($letter == $alpha) {
@@ -194,16 +194,16 @@ 
 	if ($show === 'surn') {
 		// Show the surname list
 		switch ($WT_TREE->getPreference('SURNAME_LIST_STYLE')) {
-		case 'style1':
-			echo FunctionsPrintLists::surnameList($surns, 3, true, WT_SCRIPT_NAME, $WT_TREE);
-			break;
-		case 'style3':
-			echo FunctionsPrintLists::surnameTagCloud($surns, WT_SCRIPT_NAME, true, $WT_TREE);
-			break;
-		case 'style2':
-		default:
-			echo FunctionsPrintLists::surnameTable($surns, WT_SCRIPT_NAME, $WT_TREE);
-			break;
+		    case 'style1':
+			    echo FunctionsPrintLists::surnameList($surns, 3, true, WT_SCRIPT_NAME, $WT_TREE);
+			    break;
+		    case 'style3':
+			    echo FunctionsPrintLists::surnameTagCloud($surns, WT_SCRIPT_NAME, true, $WT_TREE);
+			    break;
+		    case 'style2':
+		    default:
+			    echo FunctionsPrintLists::surnameTable($surns, WT_SCRIPT_NAME, $WT_TREE);
+			    break;
 		}
 	} else {
 		// Show the list
@@ -226,12 +226,12 @@ 
 				$list = array();
 				foreach ($givn_initials as $givn_initial => $count) {
 					switch ($givn_initial) {
-					case '@':
-						$html = I18N::translateContext('Unknown given name', '…');
-						break;
-					default:
-						$html = Filter::escapeHtml($givn_initial);
-						break;
+					    case '@':
+						    $html = I18N::translateContext('Unknown given name', '…');
+						    break;
+					    default:
+						    $html = Filter::escapeHtml($givn_initial);
+						    break;
 					}
 					if ($count) {
 						if ($show === 'indi' && $givn_initial === $falpha && $show_all_firstnames === 'no') {