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 = ?"

admin_module_reports.php

Braces +5 added lines, -2 removed lines

@@ -74,8 +74,11 @@
 				<td class="col-xs-2">
 					<?php if ($module instanceof ModuleConfigInterface): ?>
 						<a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a>
-					<?php else: ?>
-						<?php echo $module->getTitle(); ?>
+					<?php else {
+    : ?>
+						<?php echo $module->getTitle();
+}
+?>
 					<?php endif; ?>
 				</td>
 				<td class="col-xs-5"><?php echo $module->getDescription(); ?></td>

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

themes/_custom/theme.php

Braces +10 added lines, -5 removed lines

@@ -31,14 +31,16 @@ 
  * Only the first two functions are required: themeId() and themeName().
  * The rest are just examples, and should be removed in actual themes.
  */
-class MyTheme extends WebtreesTheme {
+class MyTheme extends WebtreesTheme
+{
 	/**
 	 * Give your theme a unique identifier. Themes beginning with an underscore
 	 * are reserved for internal use.
 	 *
 	 * {@inheritdoc}
 	 */
-	public function themeId() {
+	public function themeId()
+	{
 		return '_custom';
 	}
 
@@ -51,7 +53,8 @@ 
 	 *
 	 * {@inheritdoc}
 	 */
-	public function themeName() {
+	public function themeName()
+	{
 		return 'Custom theme';
 	}
 
@@ -60,7 +63,8 @@ 
 	 *
 	 * {@inheritdoc}
 	 */
-	public function stylesheets() {
+	public function stylesheets()
+	{
 		$css_files   = parent::stylesheets();
 		// Put a version number in the URL, to prevent browsers from caching old versions.
 		$css_files[] = WT_BASE_URL . 'themes/_custom/custom-v1.0.css';
@@ -75,7 +79,8 @@ 
 	 *
 	 * {@inheritdoc}
 	 */
-	public function menuLists($surname) {
+	public function menuLists($surname)
+	{
 		// Start with the default "Lists" menu.
 		$menu = parent::menuLists($surname);
 		// Remove the "notes" sub-menu.

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

Braces +30 added lines, -15 removed lines

@@ -36,7 +36,8 @@ 
  *
  * @return int
  */
-function month_of_birth($z_axis, array $z_boundaries, Stats $stats) {
+function month_of_birth($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -92,7 +93,8 @@ 
  *
  * @return int
  */
-function month_of_birth_of_first_child($z_axis, array $z_boundaries, Stats $stats) {
+function month_of_birth_of_first_child($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -148,7 +150,8 @@ 
  *
  * @return int
  */
-function month_of_death($z_axis, array $z_boundaries, Stats $stats) {
+function month_of_death($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -204,7 +207,8 @@ 
  *
  * @return int
  */
-function month_of_marriage($z_axis, array $z_boundaries, Stats $stats) {
+function month_of_marriage($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -245,7 +249,8 @@ 
  *
  * @return int
  */
-function month_of_first_marriage($z_axis, array $z_boundaries, Stats $stats) {
+function month_of_first_marriage($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -298,7 +303,8 @@ 
  *
  * @return int
  */
-function lifespan_by_birth_year($z_axis, array $z_boundaries, Stats $stats) {
+function lifespan_by_birth_year($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -350,7 +356,8 @@ 
  *
  * @return int
  */
-function lifespan_by_death_year($z_axis, array $z_boundaries, Stats $stats) {
+function lifespan_by_death_year($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -402,7 +409,8 @@ 
  *
  * @return int
  */
-function age_at_marriage($z_axis, array $z_boundaries, Stats $stats) {
+function age_at_marriage($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -456,7 +464,8 @@ 
  *
  * @return int
  */
-function age_at_first_marriage($z_axis, array $z_boundaries, Stats $stats) {
+function age_at_first_marriage($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -533,7 +542,8 @@ 
  *
  * @return int
  */
-function number_of_children($z_axis, array $z_boundaries, Stats $stats) {
+function number_of_children($z_axis, array $z_boundaries, Stats $stats)
+{
 	$total = 0;
 
 	if ($z_axis === 300) {
@@ -575,7 +585,8 @@ 
  * @param int $x
  * @param int $val
  */
-function fill_y_data($z, $x, $val) {
+function fill_y_data($z, $x, $val)
+{
 	global $ydata, $xmax, $x_boundaries, $zmax, $z_boundaries, $xgiven, $zgiven;
 	//-- calculate index $i out of given z value
 	//-- calculate index $j out of given x value
@@ -612,7 +623,8 @@ 
  * @param string      $ytitle
  * @param string[]    $legend
  */
-function my_plot($mytitle, $xdata, $xtitle, $ydata, $ytitle, $legend) {
+function my_plot($mytitle, $xdata, $xtitle, $ydata, $ytitle, $legend)
+{
 	global $percentage, $male_female, $ymax, $scalefactor, $datastring, $imgurl;
 
 	// Google Chart API only allows text encoding for numbers less than 100
@@ -752,7 +764,8 @@ 
  *
  * @param string $x_axis_boundaries
  */
-function calculate_axis($x_axis_boundaries) {
+function calculate_axis($x_axis_boundaries)
+{
 	global $x_axis, $xdata, $xmax, $x_boundaries;
 
 	// Calculate xdata and zdata elements out of chart values
@@ -801,7 +814,8 @@ 
  *
  * @return string
  */
-function format_range_of_numbers($x, $y) {
+function format_range_of_numbers($x, $y)
+{
 	return /* I18N: A range of numbers */ I18N::translate(
 		'%1$s–%2$s',
 		I18N::number($x),
@@ -814,7 +828,8 @@ 
  *
  * @param string $boundaries_z_axis
  */
-function calculate_legend($boundaries_z_axis) {
+function calculate_legend($boundaries_z_axis)
+{
 	global $legend, $zmax, $z_boundaries;
 
 	// calculate the legend values

admin_trees_check.php

Braces +10 added lines, -5 removed lines

@@ -223,7 +223,8 @@ 
  *
  * @return string
  */
-function link_message($type1, $xref1, $type2, $xref2) {
+function link_message($type1, $xref1, $type2, $xref2)
+{
 	return /* I18N: The placeholders are GEDCOM XREFs and tags. e.g. “INDI I123 contains a FAMC link to F234.” */ I18N::translate(
 		'%1$s %2$s has a %3$s link to %4$s.',
 		format_type($type1),
@@ -240,7 +241,8 @@ 
  *
  * @return string
  */
-function format_link($xref) {
+function format_link($xref)
+{
 	return '<b><a href="gedrecord.php?pid=' . $xref . '">' . $xref . '</a></b>';
 }
 
@@ -251,7 +253,8 @@ 
  *
  * @return string
  */
-function format_type($type) {
+function format_type($type)
+{
 	return '<b title="' . strip_tags(GedcomTag::getLabel($type)) . '">' . $type . '</b>';
 }
 
@@ -262,7 +265,8 @@ 
  *
  * @return string
  */
-function error($message) {
+function error($message)
+{
 	global $errors;
 	$errors = true;
 
@@ -276,7 +280,8 @@ 
  *
  * @return string
  */
-function warning($message) {
+function warning($message)
+{
 	global $errors;
 	$errors = true;