fisharebest / webtrees

app/Database.php

Spacing +1 added lines, -2 removed lines

@@ -85,8 +85,7 @@
 		// Create the underlying PDO object
 		self::$pdo = new PDO(
 			(substr($DBHOST, 0, 1) === '/' ?
-				"mysql:unix_socket={$DBHOST};dbname={$DBNAME}" :
-				"mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
+				"mysql:unix_socket={$DBHOST};dbname={$DBNAME}" : "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
 			),
 			$DBUSER, $DBPASS,
 			array(

Indentation +268 added lines, -268 removed lines

@@ -23,299 +23,299 @@
  * Extend PHP's native PDO class.
  */
 class Database {
-	/** @var Database Implement the singleton pattern */
-	private static $instance;
+    /** @var Database Implement the singleton pattern */
+    private static $instance;
 
-	/** @var PDO Native PHP database driver */
-	private static $pdo;
+    /** @var PDO Native PHP database driver */
+    private static $pdo;
 
-	/** @var array Keep a log of all the SQL statements that we execute */
-	private static $log;
+    /** @var array Keep a log of all the SQL statements that we execute */
+    private static $log;
 
-	/** @var Statement[] Cache of prepared statements */
-	private static $prepared = array();
+    /** @var Statement[] Cache of prepared statements */
+    private static $prepared = array();
 
-	/**
-	 * Prevent instantiation via new Database
-	 */
-	private function __construct() {
-		self::$log = array();
-	}
+    /**
+     * Prevent instantiation via new Database
+     */
+    private function __construct() {
+        self::$log = array();
+    }
 
-	/**
-	 * Begin a transaction.
-	 *
-	 * @return bool
-	 */
-	public static function beginTransaction() {
-		return self::$pdo->beginTransaction();
-	}
+    /**
+     * Begin a transaction.
+     *
+     * @return bool
+     */
+    public static function beginTransaction() {
+        return self::$pdo->beginTransaction();
+    }
 
-	/**
-	 * Commit this transaction.
-	 *
-	 * @return bool
-	 */
-	public static function commit() {
-		return self::$pdo->commit();
-	}
+    /**
+     * Commit this transaction.
+     *
+     * @return bool
+     */
+    public static function commit() {
+        return self::$pdo->commit();
+    }
 
-	/**
-	 * Disconnect from the server, so we can connect to another one
-	 */
-	public static function disconnect() {
-		self::$pdo = null;
-	}
+    /**
+     * Disconnect from the server, so we can connect to another one
+     */
+    public static function disconnect() {
+        self::$pdo = null;
+    }
 
-	/**
-	 * Implement the singleton pattern, using a static accessor.
-	 *
-	 * @param string $DBHOST
-	 * @param string $DBPORT
-	 * @param string $DBNAME
-	 * @param string $DBUSER
-	 * @param string $DBPASS
-	 *
-	 * @throws \Exception
-	 */
-	public static function createInstance($DBHOST, $DBPORT, $DBNAME, $DBUSER, $DBPASS) {
-		if (self::$pdo instanceof PDO) {
-			throw new \Exception('Database::createInstance() can only be called once.');
-		}
-		// Create the underlying PDO object
-		self::$pdo = new PDO(
-			(substr($DBHOST, 0, 1) === '/' ?
-				"mysql:unix_socket={$DBHOST};dbname={$DBNAME}" :
-				"mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
-			),
-			$DBUSER, $DBPASS,
-			array(
-				PDO::ATTR_ERRMODE            => PDO::ERRMODE_EXCEPTION,
-				PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_OBJ,
-				PDO::ATTR_CASE               => PDO::CASE_LOWER,
-				PDO::ATTR_AUTOCOMMIT         => true,
-			)
-		);
-		self::$pdo->exec("SET NAMES UTF8");
-		self::$pdo->prepare("SET time_zone = :time_zone")->execute(array('time_zone' => date('P')));
+    /**
+     * Implement the singleton pattern, using a static accessor.
+     *
+     * @param string $DBHOST
+     * @param string $DBPORT
+     * @param string $DBNAME
+     * @param string $DBUSER
+     * @param string $DBPASS
+     *
+     * @throws \Exception
+     */
+    public static function createInstance($DBHOST, $DBPORT, $DBNAME, $DBUSER, $DBPASS) {
+        if (self::$pdo instanceof PDO) {
+            throw new \Exception('Database::createInstance() can only be called once.');
+        }
+        // Create the underlying PDO object
+        self::$pdo = new PDO(
+            (substr($DBHOST, 0, 1) === '/' ?
+                "mysql:unix_socket={$DBHOST};dbname={$DBNAME}" :
+                "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
+            ),
+            $DBUSER, $DBPASS,
+            array(
+                PDO::ATTR_ERRMODE            => PDO::ERRMODE_EXCEPTION,
+                PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_OBJ,
+                PDO::ATTR_CASE               => PDO::CASE_LOWER,
+                PDO::ATTR_AUTOCOMMIT         => true,
+            )
+        );
+        self::$pdo->exec("SET NAMES UTF8");
+        self::$pdo->prepare("SET time_zone = :time_zone")->execute(array('time_zone' => date('P')));
 
-		self::$instance = new self;
-	}
+        self::$instance = new self;
+    }
 
-	/**
-	 * We don't access $instance directly, only via query(), exec() and prepare()
-	 *
-	 * @throws \Exception
-	 *
-	 * @return Database
-	 */
-	public static function getInstance() {
-		if (self::$pdo instanceof PDO) {
-			return self::$instance;
-		} else {
-			throw new \Exception('createInstance() must be called before getInstance().');
-		}
-	}
+    /**
+     * We don't access $instance directly, only via query(), exec() and prepare()
+     *
+     * @throws \Exception
+     *
+     * @return Database
+     */
+    public static function getInstance() {
+        if (self::$pdo instanceof PDO) {
+            return self::$instance;
+        } else {
+            throw new \Exception('createInstance() must be called before getInstance().');
+        }
+    }
 
-	/**
-	 * Are we currently connected to a database?
-	 *
-	 * @return bool
-	 */
-	public static function isConnected() {
-		return self::$pdo instanceof PDO;
-	}
+    /**
+     * Are we currently connected to a database?
+     *
+     * @return bool
+     */
+    public static function isConnected() {
+        return self::$pdo instanceof PDO;
+    }
 
-	/**
-	 * Log the details of a query, for debugging and analysis.
-	 *
-	 * @param string   $query
-	 * @param int      $rows
-	 * @param float    $microtime
-	 * @param string[] $bind_variables
-	 */
-	public static function logQuery($query, $rows, $microtime, $bind_variables) {
-		if (WT_DEBUG_SQL) {
-			// Full logging
-			// Trace
-			$trace = debug_backtrace();
-			array_shift($trace);
-			array_shift($trace);
-			foreach ($trace as $n => $frame) {
-				if (isset($frame['file']) && isset($frame['line'])) {
-					$trace[$n] = basename($frame['file']) . ':' . $frame['line'] . ' ' . $frame['function'];
-				} else {
-					unset($trace[$n]);
-				}
-			}
-			$stack = '<abbr title="' . Filter::escapeHtml(implode(" / ", $trace)) . '">' . (count(self::$log) + 1) . '</abbr>';
-			// Bind variables
-			foreach ($bind_variables as $key => $value) {
-				if (is_null($value)) {
-					$value = 'NULL';
-				} elseif (!is_integer($value)) {
-					$value = '\'' . $value . '\'';
-				}
-				if (is_integer($key)) {
-					$query = preg_replace('/\?/', $value, $query, 1);
-				} else {
-					$query = str_replace(':' . $key, $value, $query);
-				}
-			}
-			// Highlight slow queries
-			$microtime *= 1000; // convert to milliseconds
-			if ($microtime > 1000) {
-				$microtime = sprintf('<span style="background-color: #ff0000;">%.3f</span>', $microtime);
-			} elseif ($microtime > 100) {
-				$microtime = sprintf('<span style="background-color: #ffa500;">%.3f</span>', $microtime);
-			} elseif ($microtime > 1) {
-				$microtime = sprintf('<span style="background-color: #ffff00;">%.3f</span>', $microtime);
-			} else {
-				$microtime = sprintf('%.3f', $microtime);
-			}
-			self::$log[] = "<tr><td>{$stack}</td><td>{$query}</td><td>{$rows}</td><td>{$microtime}</td></tr>";
-		} else {
-			// Just log query count for statistics
-			self::$log[] = true;
-		}
-	}
+    /**
+     * Log the details of a query, for debugging and analysis.
+     *
+     * @param string   $query
+     * @param int      $rows
+     * @param float    $microtime
+     * @param string[] $bind_variables
+     */
+    public static function logQuery($query, $rows, $microtime, $bind_variables) {
+        if (WT_DEBUG_SQL) {
+            // Full logging
+            // Trace
+            $trace = debug_backtrace();
+            array_shift($trace);
+            array_shift($trace);
+            foreach ($trace as $n => $frame) {
+                if (isset($frame['file']) && isset($frame['line'])) {
+                    $trace[$n] = basename($frame['file']) . ':' . $frame['line'] . ' ' . $frame['function'];
+                } else {
+                    unset($trace[$n]);
+                }
+            }
+            $stack = '<abbr title="' . Filter::escapeHtml(implode(" / ", $trace)) . '">' . (count(self::$log) + 1) . '</abbr>';
+            // Bind variables
+            foreach ($bind_variables as $key => $value) {
+                if (is_null($value)) {
+                    $value = 'NULL';
+                } elseif (!is_integer($value)) {
+                    $value = '\'' . $value . '\'';
+                }
+                if (is_integer($key)) {
+                    $query = preg_replace('/\?/', $value, $query, 1);
+                } else {
+                    $query = str_replace(':' . $key, $value, $query);
+                }
+            }
+            // Highlight slow queries
+            $microtime *= 1000; // convert to milliseconds
+            if ($microtime > 1000) {
+                $microtime = sprintf('<span style="background-color: #ff0000;">%.3f</span>', $microtime);
+            } elseif ($microtime > 100) {
+                $microtime = sprintf('<span style="background-color: #ffa500;">%.3f</span>', $microtime);
+            } elseif ($microtime > 1) {
+                $microtime = sprintf('<span style="background-color: #ffff00;">%.3f</span>', $microtime);
+            } else {
+                $microtime = sprintf('%.3f', $microtime);
+            }
+            self::$log[] = "<tr><td>{$stack}</td><td>{$query}</td><td>{$rows}</td><td>{$microtime}</td></tr>";
+        } else {
+            // Just log query count for statistics
+            self::$log[] = true;
+        }
+    }
 
-	/**
-	 * Determine the number of queries executed, for the page statistics.
-	 *
-	 * @return int
-	 */
-	public static function getQueryCount() {
-		return count(self::$log);
-	}
+    /**
+     * Determine the number of queries executed, for the page statistics.
+     *
+     * @return int
+     */
+    public static function getQueryCount() {
+        return count(self::$log);
+    }
 
-	/**
-	 * Convert the query log into an HTML table.
-	 *
-	 * @return string
-	 */
-	public static function getQueryLog() {
-		$html      = '<table border="1" style="table-layout: fixed; width: 960px;word-wrap: break-word;"><col span="3"><col align="char"><thead><tr><th>#</th><th style="width: 800px;">Query</th><th>Rows</th><th>Time (ms)</th></tr></thead><tbody>' . implode('', self::$log) . '</tbody></table>';
-		self::$log = array();
+    /**
+     * Convert the query log into an HTML table.
+     *
+     * @return string
+     */
+    public static function getQueryLog() {
+        $html      = '<table border="1" style="table-layout: fixed; width: 960px;word-wrap: break-word;"><col span="3"><col align="char"><thead><tr><th>#</th><th style="width: 800px;">Query</th><th>Rows</th><th>Time (ms)</th></tr></thead><tbody>' . implode('', self::$log) . '</tbody></table>';
+        self::$log = array();
 
-		return $html;
-	}
+        return $html;
+    }
 
-	/**
-	 * Determine the most recently created value of an AUTO_INCREMENT field.
-	 *
-	 * @return string
-	 */
-	public static function lastInsertId() {
-		return self::$pdo->lastInsertId();
-	}
+    /**
+     * Determine the most recently created value of an AUTO_INCREMENT field.
+     *
+     * @return string
+     */
+    public static function lastInsertId() {
+        return self::$pdo->lastInsertId();
+    }
 
-	/**
-	 * Quote a string for embedding in a MySQL statement.
-	 *
-	 * The native quote() function does not convert PHP nulls to DB nulls
-	 *
-	 * @param  string $string
-	 *
-	 * @return string
-	 *
-	 * @deprecated We should use bind-variables instead.
-	 */
-	public static function quote($string) {
-		if (is_null($string)) {
-			return 'NULL';
-		} else {
-			return self::$pdo->quote($string, PDO::PARAM_STR);
-		}
-	}
+    /**
+     * Quote a string for embedding in a MySQL statement.
+     *
+     * The native quote() function does not convert PHP nulls to DB nulls
+     *
+     * @param  string $string
+     *
+     * @return string
+     *
+     * @deprecated We should use bind-variables instead.
+     */
+    public static function quote($string) {
+        if (is_null($string)) {
+            return 'NULL';
+        } else {
+            return self::$pdo->quote($string, PDO::PARAM_STR);
+        }
+    }
 
-	/**
-	 * Execute an SQL statement, and log the result.
-	 *
-	 * @param string $sql The SQL statement to execute
-	 *
-	 * @return int The number of rows affected by this SQL query
-	 */
-	public static function exec($sql) {
-		$sql   = str_replace('##', WT_TBLPREFIX, $sql);
-		$start = microtime(true);
-		$rows  = self::$pdo->exec($sql);
-		$end   = microtime(true);
-		self::logQuery($sql, $rows, $end - $start, array());
+    /**
+     * Execute an SQL statement, and log the result.
+     *
+     * @param string $sql The SQL statement to execute
+     *
+     * @return int The number of rows affected by this SQL query
+     */
+    public static function exec($sql) {
+        $sql   = str_replace('##', WT_TBLPREFIX, $sql);
+        $start = microtime(true);
+        $rows  = self::$pdo->exec($sql);
+        $end   = microtime(true);
+        self::logQuery($sql, $rows, $end - $start, array());
 
-		return $rows;
-	}
+        return $rows;
+    }
 
-	/**
-	 * Prepare an SQL statement for execution.
-	 *
-	 * @param $sql
-	 *
-	 * @throws \Exception
-	 *
-	 * @return Statement
-	 */
-	public static function prepare($sql) {
-		if (!self::$pdo instanceof PDO) {
-			throw new \Exception("No Connection Established");
-		}
-		$sql = str_replace('##', WT_TBLPREFIX, $sql);
+    /**
+     * Prepare an SQL statement for execution.
+     *
+     * @param $sql
+     *
+     * @throws \Exception
+     *
+     * @return Statement
+     */
+    public static function prepare($sql) {
+        if (!self::$pdo instanceof PDO) {
+            throw new \Exception("No Connection Established");
+        }
+        $sql = str_replace('##', WT_TBLPREFIX, $sql);
 
-		$hash = md5($sql);
-		if (!array_key_exists($hash, self::$prepared)) {
-			self::$prepared[$hash] = new Statement(self::$pdo->prepare($sql));
-		}
+        $hash = md5($sql);
+        if (!array_key_exists($hash, self::$prepared)) {
+            self::$prepared[$hash] = new Statement(self::$pdo->prepare($sql));
+        }
 
-		return self::$prepared[$hash];
-	}
+        return self::$prepared[$hash];
+    }
 
-	/**
-	 * Roll back this transaction.
-	 *
-	 * @return bool
-	 */
-	public static function rollBack() {
-		return self::$pdo->rollBack();
-	}
+    /**
+     * Roll back this transaction.
+     *
+     * @return bool
+     */
+    public static function rollBack() {
+        return self::$pdo->rollBack();
+    }
 
-	/**
-	 * Run a series of scripts to bring the database schema up to date.
-	 *
-	 * @param string $namespace      Where to find our MigrationXXX classes
-	 * @param string $schema_name    Where to find our MigrationXXX classes
-	 * @param int    $target_version updade/downgrade to this version
-	 *
-	 * @throws PDOException
-	 *
-	 * @return bool  Were any updates applied
-	 */
-	public static function updateSchema($namespace, $schema_name, $target_version) {
-		try {
-			$current_version = (int) Site::getPreference($schema_name);
-		} catch (PDOException $e) {
-			// During initial installation, the site_preference table won’t exist.
-			$current_version = 0;
-		}
+    /**
+     * Run a series of scripts to bring the database schema up to date.
+     *
+     * @param string $namespace      Where to find our MigrationXXX classes
+     * @param string $schema_name    Where to find our MigrationXXX classes
+     * @param int    $target_version updade/downgrade to this version
+     *
+     * @throws PDOException
+     *
+     * @return bool  Were any updates applied
+     */
+    public static function updateSchema($namespace, $schema_name, $target_version) {
+        try {
+            $current_version = (int) Site::getPreference($schema_name);
+        } catch (PDOException $e) {
+            // During initial installation, the site_preference table won’t exist.
+            $current_version = 0;
+        }
 
-		$updates_applied = false;
+        $updates_applied = false;
 
-		try {
-			// Update the schema, one version at a time.
-			while ($current_version < $target_version) {
-				$class = $namespace . '\\Migration' . $current_version;
-				/** @var MigrationInterface $migration */
-				$migration = new $class;
-				$migration->upgrade();
-				Site::setPreference($schema_name, ++$current_version);
-				$updates_applied = true;
-			}
-		} catch (PDOException $ex) {
-			// The schema update scripts should never fail. If they do, there is no clean recovery.
-			FlashMessages::addMessage($ex->getMessage(), 'danger');
-			header('Location: ' . WT_BASE_URL . 'site-unavailable.php');
-			throw $ex;
-		}
+        try {
+            // Update the schema, one version at a time.
+            while ($current_version < $target_version) {
+                $class = $namespace . '\\Migration' . $current_version;
+                /** @var MigrationInterface $migration */
+                $migration = new $class;
+                $migration->upgrade();
+                Site::setPreference($schema_name, ++$current_version);
+                $updates_applied = true;
+            }
+        } catch (PDOException $ex) {
+            // The schema update scripts should never fail. If they do, there is no clean recovery.
+            FlashMessages::addMessage($ex->getMessage(), 'danger');
+            header('Location: ' . WT_BASE_URL . 'site-unavailable.php');
+            throw $ex;
+        }
 
-		return $updates_applied;
-	}
+        return $updates_applied;
+    }
 }

app/Report/ReportParserGenerate.php

Spacing +1 added lines, -1 removed lines

@@ -2743,7 +2743,7 @@
 		$tags      = explode(':', $tag);
 		$origlevel = $level;
 		if ($level == 0) {
-			$level = $gedrec{0} + 1;
+			$level = $gedrec{0} +1;
 		}
 
 		$subrec = $gedrec;

Indentation +2790 added lines, -2790 removed lines

@@ -35,2799 +35,2799 @@
  * Class ReportParserGenerate - parse a report.xml file and generate the report.
  */
 class ReportParserGenerate extends ReportParserBase {
-	/** @var bool Are we collecting data from <Footnote> elements  */
-	private $process_footnote = true;
+    /** @var bool Are we collecting data from <Footnote> elements  */
+    private $process_footnote = true;
 
-	/** @var bool Are we currently outputing data? */
-	private $print_data = false;
+    /** @var bool Are we currently outputing data? */
+    private $print_data = false;
 
-	/** @var bool[] Push-down stack of $print_data */
-	private $print_data_stack = array();
+    /** @var bool[] Push-down stack of $print_data */
+    private $print_data_stack = array();
 
-	/** @var int Are we processing GEDCOM data */
-	private $process_gedcoms = 0;
+    /** @var int Are we processing GEDCOM data */
+    private $process_gedcoms = 0;
 
-	/** @var int Are we processing conditionals */
-	private $process_ifs = 0;
+    /** @var int Are we processing conditionals */
+    private $process_ifs = 0;
 
-	/** @var int Are we processing repeats*/
-	private $process_repeats = 0;
-
-	/** @var int Quantity of data to repeat during loops */
-	private $repeat_bytes = 0;
-
-	/** @var array[] Repeated data when iterating over loops */
-	private $repeats = array();
-
-	/** @var array[] Nested repeating data */
-	private $repeats_stack = array();
-
-	/** @var ReportBase[] Nested repeating data */
-	private $wt_report_stack = array();
-
-	/** @var resource Nested repeating data */
-	private $parser;
-
-	/** @var resource[] Nested repeating data */
-	private $parser_stack = array();
-
-	/** @var string The current GEDCOM record */
-	private $gedrec = '';
-
-	/** @var string[] Nested GEDCOM records */
-	private $gedrec_stack = array();
-
-	/** @var ReportBaseElement The currently processed element */
-	private $current_element;
-
-	/** @var ReportBaseElement The currently processed element */
-	private $footnote_element;
-
-	/** @var string The GEDCOM fact currently being processed */
-	private $fact = '';
-
-	/** @var string The GEDCOM value currently being processed */
-	private $desc = '';
-
-	/** @var string The GEDCOM type currently being processed */
-	private $type = '';
-
-	/** @var int The current generational level */
-	private $generation = 1;
-
-	/** @var array Source data for processing lists */
-	private $list = array();
-
-	/** @var int Number of items in lists */
-	private $list_total = 0;
-
-	/** @var int Number of items filtered from lists */
-	private $list_private = 0;
-
-	/** @var ReportBase A factory for creating report elements */
-	private $report_root;
-
-	/** @var ReportBase Nested report elements */
-	private $wt_report;
-
-	/** @todo This attribute is public to support the PHP5.3 closure workaround. */
-	/** @var string[][] Variables defined in the report at run-time */
-	public $vars;
-
-	/**
-	 * Create a parser for a report
-	 *
-	 * @param string     $report     The XML filename
-	 * @param ReportBase $report_root
-	 * @param string[][] $vars
-	 */
-	public function __construct($report, ReportBase $report_root = null, array $vars = array()) {
-		$this->report_root     = $report_root;
-		$this->wt_report       = $report_root;
-		$this->current_element = new ReportBaseElement;
-		$this->vars            = $vars;
-		parent::__construct($report);
-	}
-
-	/**
-	 * XML start element handler
-	 *
-	 * This function is called whenever a starting element is reached
-	 * The element handler will be called if found, otherwise it must be HTML
-	 *
-	 * @param resource $parser the resource handler for the XML parser
-	 * @param string   $name   the name of the XML element parsed
-	 * @param array    $attrs  an array of key value pairs for the attributes
-	 */
-	protected function startElement($parser, $name, $attrs) {
-		$newattrs = array();
-
-		foreach ($attrs as $key => $value) {
-			if (preg_match("/^\\$(\w+)$/", $value, $match)) {
-				if ((isset($this->vars[$match[1]]['id'])) && (!isset($this->vars[$match[1]]['gedcom']))) {
-					$value = $this->vars[$match[1]]['id'];
-				}
-			}
-			$newattrs[$key] = $value;
-		}
-		$attrs = $newattrs;
-		if ($this->process_footnote && ($this->process_ifs === 0 || $name === "if") && ($this->process_gedcoms === 0 || $name === "Gedcom") && ($this->process_repeats === 0 || $name === "Facts" || $name === "RepeatTag")) {
-			$start_method = $name . 'StartHandler';
-			$end_method   = $name . 'EndHandler';
-			if (method_exists($this, $start_method)) {
-				$this->$start_method($attrs);
-			} elseif (!method_exists($this, $end_method)) {
-				$this->htmlStartHandler($name, $attrs);
-			}
-		}
-	}
-
-	/**
-	 * XML end element handler
-	 *
-	 * This function is called whenever an ending element is reached
-	 * The element handler will be called if found, otherwise it must be HTML
-	 *
-	 * @param resource $parser the resource handler for the XML parser
-	 * @param string   $name   the name of the XML element parsed
-	 */
-	protected function endElement($parser, $name) {
-		if (($this->process_footnote || $name === "Footnote") && ($this->process_ifs === 0 || $name === "if") && ($this->process_gedcoms === 0 || $name === "Gedcom") && ($this->process_repeats === 0 || $name === "Facts" || $name === "RepeatTag" || $name === "List" || $name === "Relatives")) {
-			$start_method = $name . 'StartHandler';
-			$end_method   = $name . 'EndHandler';
-			if (method_exists($this, $end_method)) {
-				$this->$end_method();
-			} elseif (!method_exists($this, $start_method)) {
-				$this->htmlEndHandler($name);
-			}
-		}
-	}
-
-	/**
-	 * XML character data handler
-	 *
-	 * @param resource $parser the resource handler for the XML parser
-	 * @param string   $data   the name of the XML element parsed
-	 */
-	protected function characterData($parser, $data) {
-		if ($this->print_data && $this->process_gedcoms === 0 && $this->process_ifs === 0 && $this->process_repeats === 0) {
-			$this->current_element->addText($data);
-		}
-	}
-
-	/**
-	 * XML <style>
-	 *
-	 * @param array $attrs an array of key value pairs for the attributes
-	 */
-	private function styleStartHandler($attrs) {
-		if (empty($attrs['name'])) {
-			throw new \DomainException('REPORT ERROR Style: The "name" of the style is missing or not set in the XML file.');
-		}
-
-		// array Style that will be passed on
-		$s = array();
-
-		// string Name af the style
-		$s['name'] = $attrs['name'];
-
-		// string Name of the DEFAULT font
-		$s['font'] = $this->wt_report->defaultFont;
-		if (!empty($attrs['font'])) {
-			$s['font'] = $attrs['font'];
-		}
-
-		// int The size of the font in points
-		$s['size'] = $this->wt_report->defaultFontSize;
-		if (!empty($attrs['size'])) {
-			$s['size'] = (int) $attrs['size'];
-		} // Get it as int to ignore all decimal points or text (if any text then int(0))
-
-		// string B: bold, I: italic, U: underline, D: line trough, The default value is regular.
-		$s['style'] = "";
-		if (!empty($attrs['style'])) {
-			$s['style'] = $attrs['style'];
-		}
-
-		$this->wt_report->addStyle($s);
-	}
-
-	/**
-	 * XML <Doc>
-	 *
-	 * Sets up the basics of the document proparties
-	 *
-	 * @param array $attrs an array of key value pairs for the attributes
-	 */
-	private function docStartHandler($attrs) {
-		$this->parser = $this->xml_parser;
-
-		// Custom page width
-		if (!empty($attrs['customwidth'])) {
-			$this->wt_report->pagew = (int) $attrs['customwidth'];
-		} // Get it as int to ignore all decimal points or text (if any text then int(0))
-		// Custom Page height
-		if (!empty($attrs['customheight'])) {
-			$this->wt_report->pageh = (int) $attrs['customheight'];
-		} // Get it as int to ignore all decimal points or text (if any text then int(0))
-
-		// Left Margin
-		if (isset($attrs['leftmargin'])) {
-			if ($attrs['leftmargin'] === "0") {
-				$this->wt_report->leftmargin = 0;
-			} elseif (!empty($attrs['leftmargin'])) {
-				$this->wt_report->leftmargin = (int) $attrs['leftmargin']; // Get it as int to ignore all decimal points or text (if any text then int(0))
-			}
-		}
-		// Right Margin
-		if (isset($attrs['rightmargin'])) {
-			if ($attrs['rightmargin'] === "0") {
-				$this->wt_report->rightmargin = 0;
-			} elseif (!empty($attrs['rightmargin'])) {
-				$this->wt_report->rightmargin = (int) $attrs['rightmargin']; // Get it as int to ignore all decimal points or text (if any text then int(0))
-			}
-		}
-		// Top Margin
-		if (isset($attrs['topmargin'])) {
-			if ($attrs['topmargin'] === "0") {
-				$this->wt_report->topmargin = 0;
-			} elseif (!empty($attrs['topmargin'])) {
-				$this->wt_report->topmargin = (int) $attrs['topmargin']; // Get it as int to ignore all decimal points or text (if any text then int(0))
-			}
-		}
-		// Bottom Margin
-		if (isset($attrs['bottommargin'])) {
-			if ($attrs['bottommargin'] === "0") {
-				$this->wt_report->bottommargin = 0;
-			} elseif (!empty($attrs['bottommargin'])) {
-				$this->wt_report->bottommargin = (int) $attrs['bottommargin']; // Get it as int to ignore all decimal points or text (if any text then int(0))
-			}
-		}
-		// Header Margin
-		if (isset($attrs['headermargin'])) {
-			if ($attrs['headermargin'] === "0") {
-				$this->wt_report->headermargin = 0;
-			} elseif (!empty($attrs['headermargin'])) {
-				$this->wt_report->headermargin = (int) $attrs['headermargin']; // Get it as int to ignore all decimal points or text (if any text then int(0))
-			}
-		}
-		// Footer Margin
-		if (isset($attrs['footermargin'])) {
-			if ($attrs['footermargin'] === "0") {
-				$this->wt_report->footermargin = 0;
-			} elseif (!empty($attrs['footermargin'])) {
-				$this->wt_report->footermargin = (int) $attrs['footermargin']; // Get it as int to ignore all decimal points or text (if any text then int(0))
-			}
-		}
-
-		// Page Orientation
-		if (!empty($attrs['orientation'])) {
-			if ($attrs['orientation'] == "landscape") {
-				$this->wt_report->orientation = "landscape";
-			} elseif ($attrs['orientation'] == "portrait") {
-				$this->wt_report->orientation = "portrait";
-			}
-		}
-		// Page Size
-		if (!empty($attrs['pageSize'])) {
-			$this->wt_report->pageFormat = strtoupper($attrs['pageSize']);
-		}
-
-		// Show Generated By...
-		if (isset($attrs['showGeneratedBy'])) {
-			if ($attrs['showGeneratedBy'] === "0") {
-				$this->wt_report->showGenText = false;
-			} elseif ($attrs['showGeneratedBy'] === "1") {
-				$this->wt_report->showGenText = true;
-			}
-		}
-
-		$this->wt_report->setup();
-	}
-
-	/**
-	 * XML </Doc>
-	 */
-	private function docEndHandler() {
-		$this->wt_report->run();
-	}
-
-	/**
-	 * XML <Header>
-	 */
-	private function headerStartHandler() {
-		// Clear the Header before any new elements are added
-		$this->wt_report->clearHeader();
-		$this->wt_report->setProcessing("H");
-	}
-
-	/**
-	 * XML <PageHeader>
-	 */
-	private function pageHeaderStartHandler() {
-		array_push($this->print_data_stack, $this->print_data);
-		$this->print_data = false;
-		array_push($this->wt_report_stack, $this->wt_report);
-		$this->wt_report = $this->report_root->createPageHeader();
-	}
-
-	/**
-	 * XML <pageHeaderEndHandler>
-	 */
-	private function pageHeaderEndHandler() {
-		$this->print_data        = array_pop($this->print_data_stack);
-		$this->current_element   = $this->wt_report;
-		$this->wt_report         = array_pop($this->wt_report_stack);
-		$this->wt_report->addElement($this->current_element);
-	}
-
-	/**
-	 * XML <bodyStartHandler>
-	 */
-	private function bodyStartHandler() {
-		$this->wt_report->setProcessing("B");
-	}
-
-	/**
-	 * XML <footerStartHandler>
-	 */
-	private function footerStartHandler() {
-		$this->wt_report->setProcessing("F");
-	}
-
-	/**
-	 * XML <Cell>
-	 *
-	 * @param array $attrs an array of key value pairs for the attributes
-	 */
-	private function cellStartHandler($attrs) {
-		// string The text alignment of the text in this box.
-		$align = "";
-		if (!empty($attrs['align'])) {
-			$align = $attrs['align'];
-			// RTL supported left/right alignment
-			if ($align == "rightrtl") {
-				if ($this->wt_report->rtl) {
-					$align = "left";
-				} else {
-					$align = "right";
-				}
-			} elseif ($align == "leftrtl") {
-				if ($this->wt_report->rtl) {
-					$align = "right";
-				} else {
-					$align = "left";
-				}
-			}
-		}
-
-		// string The color to fill the background of this cell
-		$bgcolor = "";
-		if (!empty($attrs['bgcolor'])) {
-			$bgcolor = $attrs['bgcolor'];
-		}
-
-		// int Whether or not the background should be painted
-		$fill = 1;
-		if (isset($attrs['fill'])) {
-			if ($attrs['fill'] === "0") {
-				$fill = 0;
-			} elseif ($attrs['fill'] === "1") {
-				$fill = 1;
-			}
-		}
-
-		$reseth = true;
-		// boolean   if true reset the last cell height (default true)
-		if (isset($attrs['reseth'])) {
-			if ($attrs['reseth'] === "0") {
-				$reseth = false;
-			} elseif ($attrs['reseth'] === "1") {
-				$reseth = true;
-			}
-		}
-
-		// mixed Whether or not a border should be printed around this box
-		$border = 0;
-		if (!empty($attrs['border'])) {
-			$border = $attrs['border'];
-		}
-		// string Border color in HTML code
-		$bocolor = "";
-		if (!empty($attrs['bocolor'])) {
-			$bocolor = $attrs['bocolor'];
-		}
-
-		// int Cell height (expressed in points) The starting height of this cell. If the text wraps the height will automatically be adjusted.
-		$height = 0;
-		if (!empty($attrs['height'])) {
-			$height = (int) $attrs['height'];
-		}
-		// int Cell width (expressed in points) Setting the width to 0 will make it the width from the current location to the right margin.
-		$width = 0;
-		if (!empty($attrs['width'])) {
-			$width = (int) $attrs['width'];
-		}
-
-		// int Stretch carachter mode
-		$stretch = 0;
-		if (!empty($attrs['stretch'])) {
-			$stretch = (int) $attrs['stretch'];
-		}
-
-		// mixed Position the left corner of this box on the page. The default is the current position.
-		$left = ".";
-		if (isset($attrs['left'])) {
-			if ($attrs['left'] === ".") {
-				$left = ".";
-			} elseif (!empty($attrs['left'])) {
-				$left = (int) $attrs['left'];
-			} elseif ($attrs['left'] === "0") {
-				$left = 0;
-			}
-		}
-		// mixed Position the top corner of this box on the page. the default is the current position
-		$top = ".";
-		if (isset($attrs['top'])) {
-			if ($attrs['top'] === ".") {
-				$top = ".";
-			} elseif (!empty($attrs['top'])) {
-				$top = (int) $attrs['top'];
-			} elseif ($attrs['top'] === "0") {
-				$top = 0;
-			}
-		}
-
-		// string The name of the Style that should be used to render the text.
-		$style = "";
-		if (!empty($attrs['style'])) {
-			$style = $attrs['style'];
-		}
-
-		// string Text color in html code
-		$tcolor = "";
-		if (!empty($attrs['tcolor'])) {
-			$tcolor = $attrs['tcolor'];
-		}
-
-		// int Indicates where the current position should go after the call.
-		$ln = 0;
-		if (isset($attrs['newline'])) {
-			if (!empty($attrs['newline'])) {
-				$ln = (int) $attrs['newline'];
-			} elseif ($attrs['newline'] === "0") {
-				$ln = 0;
-			}
-		}
-
-		if ($align == "left") {
-			$align = "L";
-		} elseif ($align == "right") {
-			$align = "R";
-		} elseif ($align == "center") {
-			$align = "C";
-		} elseif ($align == "justify") {
-			$align = "J";
-		}
-
-		array_push($this->print_data_stack, $this->print_data);
-		$this->print_data = true;
-
-		$this->current_element = $this->report_root->createCell(
-			$width,
-			$height,
-			$border,
-			$align,
-			$bgcolor,
-			$style,
-			$ln,
-			$top,
-			$left,
-			$fill,
-			$stretch,
-			$bocolor,
-			$tcolor,
-			$reseth
-		);
-	}
-
-	/**
-	 * XML </Cell>
-	 */
-	private function cellEndHandler() {
-		$this->print_data = array_pop($this->print_data_stack);
-		$this->wt_report->addElement($this->current_element);
-	}
-
-	/**
-	 * XML <Now /> element handler
-	 */
-	private function nowStartHandler() {
-		$g = FunctionsDate::timestampToGedcomDate(WT_TIMESTAMP + WT_TIMESTAMP_OFFSET);
-		$this->current_element->addText($g->display());
-	}
-
-	/**
-	 * XML <PageNum /> element handler
-	 */
-	private function pageNumStartHandler() {
-		$this->current_element->addText("#PAGENUM#");
-	}
-
-	/**
-	 * XML <TotalPages /> element handler
-	 */
-	private function totalPagesStartHandler() {
-		$this->current_element->addText("{{:ptp:}}");
-	}
-
-	/**
-	 * Called at the start of an element.
-	 *
-	 * @param array $attrs an array of key value pairs for the attributes
-	 */
-	private function gedcomStartHandler($attrs) {
-		global $WT_TREE;
-
-		if ($this->process_gedcoms > 0) {
-			$this->process_gedcoms++;
-
-			return;
-		}
-
-		$tag       = $attrs['id'];
-		$tag       = str_replace("@fact", $this->fact, $tag);
-		$tags      = explode(":", $tag);
-		$newgedrec = '';
-		if (count($tags) < 2) {
-			$tmp       = GedcomRecord::getInstance($attrs['id'], $WT_TREE);
-			$newgedrec = $tmp ? $tmp->privatizeGedcom(Auth::accessLevel($WT_TREE)) : '';
-		}
-		if (empty($newgedrec)) {
-			$tgedrec   = $this->gedrec;
-			$newgedrec = '';
-			foreach ($tags as $tag) {
-				if (preg_match("/\\$(.+)/", $tag, $match)) {
-					if (isset($this->vars[$match[1]]['gedcom'])) {
-						$newgedrec = $this->vars[$match[1]]['gedcom'];
-					} else {
-						$tmp       = GedcomRecord::getInstance($match[1], $WT_TREE);
-						$newgedrec = $tmp ? $tmp->privatizeGedcom(Auth::accessLevel($WT_TREE)) : '';
-					}
-				} else {
-					if (preg_match("/@(.+)/", $tag, $match)) {
-						$gmatch = array();
-						if (preg_match("/\d $match[1] @([^@]+)@/", $tgedrec, $gmatch)) {
-							$tmp       = GedcomRecord::getInstance($gmatch[1], $WT_TREE);
-							$newgedrec = $tmp ? $tmp->privatizeGedcom(Auth::accessLevel($WT_TREE)) : '';
-							$tgedrec   = $newgedrec;
-						} else {
-							$newgedrec = '';
-							break;
-						}
-					} else {
-						$temp      = explode(" ", trim($tgedrec));
-						$level     = $temp[0] + 1;
-						$newgedrec = Functions::getSubRecord($level, "$level $tag", $tgedrec);
-						$tgedrec   = $newgedrec;
-					}
-				}
-			}
-		}
-		if (!empty($newgedrec)) {
-			array_push($this->gedrec_stack, array($this->gedrec, $this->fact, $this->desc));
-			$this->gedrec = $newgedrec;
-			if (preg_match("/(\d+) (_?[A-Z0-9]+) (.*)/", $this->gedrec, $match)) {
-				$this->fact = $match[2];
-				$this->desc = trim($match[3]);
-			}
-		} else {
-			$this->process_gedcoms++;
-		}
-	}
-
-	/**
-	 * Called at the end of an element.
-	 */
-	private function gedcomEndHandler() {
-		if ($this->process_gedcoms > 0) {
-			$this->process_gedcoms--;
-		} else {
-			list($this->gedrec, $this->fact, $this->desc) = array_pop($this->gedrec_stack);
-		}
-	}
-
-	/**
-	 * XML <textBoxStartHandler>
-	 *
-	 * @param array $attrs an array of key value pairs for the attributes
-	 */
-	private function textBoxStartHandler($attrs) {
-		// string Background color code
-		$bgcolor = "";
-		if (!empty($attrs['bgcolor'])) {
-			$bgcolor = $attrs['bgcolor'];
-		}
-
-		// boolean Wether or not fill the background color
-		$fill = true;
-		if (isset($attrs['fill'])) {
-			if ($attrs['fill'] === "0") {
-				$fill = false;
-			} elseif ($attrs['fill'] === "1") {
-				$fill = true;
-			}
-		}
-
-		// var boolean Whether or not a border should be printed around this box. 0 = no border, 1 = border. Default is 0
-		$border = false;
-		if (isset($attrs['border'])) {
-			if ($attrs['border'] === "1") {
-				$border = true;
-			} elseif ($attrs['border'] === "0") {
-				$border = false;
-			}
-		}
-
-		// int The starting height of this cell. If the text wraps the height will automatically be adjusted
-		$height = 0;
-		if (!empty($attrs['height'])) {
-			$height = (int) $attrs['height'];
-		}
-		// int Setting the width to 0 will make it the width from the current location to the margin
-		$width = 0;
-		if (!empty($attrs['width'])) {
-			$width = (int) $attrs['width'];
-		}
-
-		// mixed Position the left corner of this box on the page. The default is the current position.
-		$left = ".";
-		if (isset($attrs['left'])) {
-			if ($attrs['left'] === ".") {
-				$left = ".";
-			} elseif (!empty($attrs['left'])) {
-				$left = (int) $attrs['left'];
-			} elseif ($attrs['left'] === "0") {
-				$left = 0;
-			}
-		}
-		// mixed Position the top corner of this box on the page. the default is the current position
-		$top = ".";
-		if (isset($attrs['top'])) {
-			if ($attrs['top'] === ".") {
-				$top = ".";
-			} elseif (!empty($attrs['top'])) {
-				$top = (int) $attrs['top'];
-			} elseif ($attrs['top'] === "0") {
-				$top = 0;
-			}
-		}
-		// boolean After this box is finished rendering, should the next section of text start immediately after the this box or should it start on a new line under this box. 0 = no new line, 1 = force new line. Default is 0
-		$newline = false;
-		if (isset($attrs['newline'])) {
-			if ($attrs['newline'] === "1") {
-				$newline = true;
-			} elseif ($attrs['newline'] === "0") {
-				$newline = false;
-			}
-		}
-		// boolean
-		$pagecheck = true;
-		if (isset($attrs['pagecheck'])) {
-			if ($attrs['pagecheck'] === "0") {
-				$pagecheck = false;
-			} elseif ($attrs['pagecheck'] === "1") {
-				$pagecheck = true;
-			}
-		}
-		// boolean Cell padding
-		$padding = true;
-		if (isset($attrs['padding'])) {
-			if ($attrs['padding'] === "0") {
-				$padding = false;
-			} elseif ($attrs['padding'] === "1") {
-				$padding = true;
-			}
-		}
-		// boolean Reset this box Height
-		$reseth = false;
-		if (isset($attrs['reseth'])) {
-			if ($attrs['reseth'] === "1") {
-				$reseth = true;
-			} elseif ($attrs['reseth'] === "0") {
-				$reseth = false;
-			}
-		}
-
-		// string Style of rendering
-		$style = "";
-
-		array_push($this->print_data_stack, $this->print_data);
-		$this->print_data = false;
-
-		array_push($this->wt_report_stack, $this->wt_report);
-		$this->wt_report = $this->report_root->createTextBox(
-			$width,
-			$height,
-			$border,
-			$bgcolor,
-			$newline,
-			$left,
-			$top,
-			$pagecheck,
-			$style,
-			$fill,
-			$padding,
-			$reseth
-		);
-	}
-
-	/**
-	 * XML <textBoxEndHandler>
-	 */
-	private function textBoxEndHandler() {
-		$this->print_data      = array_pop($this->print_data_stack);
-		$this->current_element = $this->wt_report;
-		$this->wt_report       = array_pop($this->wt_report_stack);
-		$this->wt_report->addElement($this->current_element);
-	}
-
-	/**
-	 * XLM <Text>.
-	 *
-	 * @param array $attrs an array of key value pairs for the attributes
-	 */
-	private function textStartHandler($attrs) {
-		array_push($this->print_data_stack, $this->print_data);
-		$this->print_data = true;
-
-		// string The name of the Style that should be used to render the text.
-		$style = "";
-		if (!empty($attrs['style'])) {
-			$style = $attrs['style'];
-		}
-
-		// string  The color of the text - Keep the black color as default
-		$color = "";
-		if (!empty($attrs['color'])) {
-			$color = $attrs['color'];
-		}
-
-		$this->current_element = $this->report_root->createText($style, $color);
-	}
-
-	/**
-	 * XML </Text>
-	 */
-	private function textEndHandler() {
-		$this->print_data = array_pop($this->print_data_stack);
-		$this->wt_report->addElement($this->current_element);
-	}
-
-	/**
-	 * XML <GetPersonName/>
-	 *
-	 * Get the name
-	 * 1. id is empty - current GEDCOM record
-	 * 2. id is set with a record id
-	 *
-	 * @param array $attrs an array of key value pairs for the attributes
-	 */
-	private function getPersonNameStartHandler($attrs) {
-		global $WT_TREE;
-
-		$id    = "";
-		$match = array();
-		if (empty($attrs['id'])) {
-			if (preg_match("/0 @(.+)@/", $this->gedrec, $match)) {
-				$id = $match[1];
-			}
-		} else {
-			if (preg_match("/\\$(.+)/", $attrs['id'], $match)) {
-				if (isset($this->vars[$match[1]]['id'])) {
-					$id = $this->vars[$match[1]]['id'];
-				}
-			} else {
-				if (preg_match("/@(.+)/", $attrs['id'], $match)) {
-					$gmatch = array();
-					if (preg_match("/\d $match[1] @([^@]+)@/", $this->gedrec, $gmatch)) {
-						$id = $gmatch[1];
-					}
-				} else {
-					$id = $attrs['id'];
-				}
-			}
-		}
-		if (!empty($id)) {
-			$record = GedcomRecord::getInstance($id, $WT_TREE);
-			if (is_null($record)) {
-				return;
-			}
-			if (!$record->canShowName()) {
-				$this->current_element->addText(I18N::translate('Private'));
-			} else {
-				$name = $record->getFullName();
-				$name = preg_replace(
-					array('/<span class="starredname">/', '/<\/span><\/span>/', '/<\/span>/'),
-					array('«', '', '»'),
-					$name
-				);
-				$name = strip_tags($name);
-				if (!empty($attrs['truncate'])) {
-					if (mb_strlen($name) > $attrs['truncate']) {
-						$name  = preg_replace("/\(.*\) ?/", '', $name); //removes () and text inbetween - what about ", [ and { etc?
-						$words = preg_split('/[, -]+/', $name); // names separated with space, comma or hyphen - any others?
-						$name  = $words[count($words) - 1];
-						for ($i = count($words) - 2; $i >= 0; $i--) {
-							$len = mb_strlen($name);
-							for ($j = count($words) - 3; $j >= 0; $j--) {
-								$len += mb_strlen($words[$j]);
-							}
-							if ($len > $attrs['truncate']) {
-								$first_letter = mb_substr($words[$i], 0, 1);
-								// Do not show " of nick-names
-								if ($first_letter != "\"") {
-									$name = mb_substr($words[$i], 0, 1) . '. ' . $name;
-								}
-							} else {
-								$name = $words[$i] . ' ' . $name;
-							}
-						}
-					}
-				} else {
-					$addname = $record->getAddName();
-					$addname = preg_replace(
-						array('/<span class="starredname">/', '/<\/span><\/span>/', '/<\/span>/'),
-						array('«', '', '»'),
-						$addname
-					);
-					$addname = strip_tags($addname);
-					if (!empty($addname)) {
-						$name .= " " . $addname;
-					}
-				}
-				$this->current_element->addText(trim($name));
-			}
-		}
-	}
-
-	/**
-	 * XML <GedcomValue/>
-	 *
-	 * @param array $attrs an array of key value pairs for the attributes
-	 */
-	private function gedcomValueStartHandler($attrs) {
-		global $WT_TREE;
-
-		$id    = "";
-		$match = array();
-		if (preg_match("/0 @(.+)@/", $this->gedrec, $match)) {
-			$id = $match[1];
-		}
-
-		if (isset($attrs['newline']) && $attrs['newline'] == "1") {
-			$useBreak = "1";
-		} else {
-			$useBreak = "0";
-		}
-
-		$tag = $attrs['tag'];
-		if (!empty($tag)) {
-			if ($tag == "@desc") {
-				$value = $this->desc;
-				$value = trim($value);
-				$this->current_element->addText($value);
-			}
-			if ($tag == "@id") {
-				$this->current_element->addText($id);
-			} else {
-				$tag = str_replace("@fact", $this->fact, $tag);
-				if (empty($attrs['level'])) {
-					$temp  = explode(" ", trim($this->gedrec));
-					$level = $temp[0];
-					if ($level == 0) {
-						$level++;
-					}
-				} else {
-					$level = $attrs['level'];
-				}
-				$tags  = preg_split('/[: ]/', $tag);
-				$value = $this->getGedcomValue($tag, $level, $this->gedrec);
-				switch (end($tags)) {
-				case 'DATE':
-					$tmp   = new Date($value);
-					$value = $tmp->display();
-					break;
-				case 'PLAC':
-					$tmp   = new Place($value, $WT_TREE);
-					$value = $tmp->getShortName();
-					break;
-				}
-				if ($useBreak == "1") {
-					// Insert <br> when multiple dates exist.
-					// This works around a TCPDF bug that incorrectly wraps RTL dates on LTR pages
-					$value = str_replace('(', '<br>(', $value);
-					$value = str_replace('<span dir="ltr"><br>', '<br><span dir="ltr">', $value);
-					$value = str_replace('<span dir="rtl"><br>', '<br><span dir="rtl">', $value);
-					if (substr($value, 0, 6) == '<br>') {
-						$value = substr($value, 6);
-					}
-				}
-				$tmp = explode(':', $tag);
-				if (in_array(end($tmp), array('NOTE', 'TEXT'))) {
-					$value = Filter::formatText($value, $WT_TREE); // We'll strip HTML in addText()
-				}
-				$this->current_element->addText($value);
-			}
-		}
-	}
-
-	/**
-	 * XML <RepeatTag>
-	 *
-	 * @param array $attrs an array of key value pairs for the attributes
-	 */
-	private function repeatTagStartHandler($attrs) {
-		global $WT_TREE;
-
-		$this->process_repeats++;
-		if ($this->process_repeats > 1) {
-			return;
-		}
-
-		array_push($this->repeats_stack, array($this->repeats, $this->repeat_bytes));
-		$this->repeats      = array();
-		$this->repeat_bytes = xml_get_current_line_number($this->parser);
-
-		$tag = "";
-		if (isset($attrs['tag'])) {
-			$tag = $attrs['tag'];
-		}
-		if (!empty($tag)) {
-			if ($tag == "@desc") {
-				$value = $this->desc;
-				$value = trim($value);
-				$this->current_element->addText($value);
-			} else {
-				$tag   = str_replace("@fact", $this->fact, $tag);
-				$tags  = explode(":", $tag);
-				$temp  = explode(" ", trim($this->gedrec));
-				$level = $temp[0];
-				if ($level == 0) {
-					$level++;
-				}
-				$subrec = $this->gedrec;
-				$t      = $tag;
-				$count  = count($tags);
-				$i      = 0;
-				while ($i < $count) {
-					$t = $tags[$i];
-					if (!empty($t)) {
-						if ($i < ($count - 1)) {
-							$subrec = Functions::getSubRecord($level, "$level $t", $subrec);
-							if (empty($subrec)) {
-								$level--;
-								$subrec = Functions::getSubRecord($level, "@ $t", $this->gedrec);
-								if (empty($subrec)) {
-									return;
-								}
-							}
-						}
-						$level++;
-					}
-					$i++;
-				}
-				$level--;
-				$count = preg_match_all("/$level $t(.*)/", $subrec, $match, PREG_SET_ORDER);
-				$i     = 0;
-				while ($i < $count) {
-					$i++;
-					// Privacy check - is this a link, and are we allowed to view the linked object?
-					$subrecord = Functions::getSubRecord($level, "$level $t", $subrec, $i);
-					if (preg_match('/^\d ' . WT_REGEX_TAG . ' @(' . WT_REGEX_XREF . ')@/', $subrecord, $xref_match)) {
-						$linked_object = GedcomRecord::getInstance($xref_match[1], $WT_TREE);
-						if ($linked_object && !$linked_object->canShow()) {
-							continue;
-						}
-					}
-					$this->repeats[] = $subrecord;
-				}
-			}
-		}
-	}
-
-	/**
-	 * XML </ RepeatTag>
-	 */
-	private function repeatTagEndHandler() {
-		global $report;
-
-		$this->process_repeats--;
-		if ($this->process_repeats > 0) {
-			return;
-		}
-
-		// Check if there is anything to repeat
-		if (count($this->repeats) > 0) {
-			// No need to load them if not used...
-
-			$lineoffset = 0;
-			foreach ($this->repeats_stack as $rep) {
-				$lineoffset += $rep[1];
-			}
-			//-- read the xml from the file
-			$lines = file($report);
-			while (strpos($lines[$lineoffset + $this->repeat_bytes], "<RepeatTag") === false) {
-				$lineoffset--;
-			}
-			$lineoffset++;
-			$reportxml = "<tempdoc>\n";
-			$line_nr   = $lineoffset + $this->repeat_bytes;
-			// RepeatTag Level counter
-			$count = 1;
-			while (0 < $count) {
-				if (strstr($lines[$line_nr], "<RepeatTag") !== false) {
-					$count++;
-				} elseif (strstr($lines[$line_nr], "</RepeatTag") !== false) {
-					$count--;
-				}
-				if (0 < $count) {
-					$reportxml .= $lines[$line_nr];
-				}
-				$line_nr++;
-			}
-			// No need to drag this
-			unset($lines);
-			$reportxml .= "</tempdoc>\n";
-			// Save original values
-			array_push($this->parser_stack, $this->parser);
-			$oldgedrec = $this->gedrec;
-			foreach ($this->repeats as $gedrec) {
-				$this->gedrec  = $gedrec;
-				$repeat_parser = xml_parser_create();
-				$this->parser  = $repeat_parser;
-				xml_parser_set_option($repeat_parser, XML_OPTION_CASE_FOLDING, false);
-				xml_set_element_handler($repeat_parser, array($this, 'startElement'), array($this, 'endElement'));
-				xml_set_character_data_handler($repeat_parser, array($this, 'characterData'));
-				if (!xml_parse($repeat_parser, $reportxml, true)) {
-					throw new \DomainException(sprintf(
-						'RepeatTagEHandler XML error: %s at line %d',
-						xml_error_string(xml_get_error_code($repeat_parser)),
-						xml_get_current_line_number($repeat_parser)
-					));
-				}
-				xml_parser_free($repeat_parser);
-			}
-			// Restore original values
-			$this->gedrec = $oldgedrec;
-			$this->parser = array_pop($this->parser_stack);
-		}
-		list($this->repeats, $this->repeat_bytes) = array_pop($this->repeats_stack);
-	}
-
-	/**
-	 * Variable lookup
-	 *
-	 * Retrieve predefined variables :
-	 *
-	 * @ desc GEDCOM fact description, example:
-	 *        1 EVEN This is a description
-	 * @ fact GEDCOM fact tag, such as BIRT, DEAT etc.
-	 * $ I18N::translate('....')
-	 * $ language_settings[]
-	 *
-	 * @param array $attrs an array of key value pairs for the attributes
-	 */
-	private function varStartHandler($attrs) {
-		if (empty($attrs['var'])) {
-			throw new \DomainException('REPORT ERROR var: The attribute "var=" is missing or not set in the XML file on line: ' . xml_get_current_line_number($this->parser));
-		}
-
-		$var = $attrs['var'];
-		// SetVar element preset variables
-		if (!empty($this->vars[$var]['id'])) {
-			$var = $this->vars[$var]['id'];
-		} else {
-			$tfact = $this->fact;
-			if (($this->fact === "EVEN" || $this->fact === "FACT") && $this->type !== " ") {
-				// Use :
-				// n TYPE This text if string
-				$tfact = $this->type;
-			}
-			$var = str_replace(array("@fact", "@desc"), array(GedcomTag::getLabel($tfact), $this->desc), $var);
-			if (preg_match('/^I18N::number\((.+)\)$/', $var, $match)) {
-				$var = I18N::number($match[1]);
-			} elseif (preg_match('/^I18N::translate\(\'(.+)\'\)$/', $var, $match)) {
-				$var = I18N::translate($match[1]);
-			} elseif (preg_match('/^I18N::translateContext\(\'(.+)\', *\'(.+)\'\)$/', $var, $match)) {
-				$var = I18N::translateContext($match[1], $match[2]);
-			}
-		}
-		// Check if variable is set as a date and reformat the date
-		if (isset($attrs['date'])) {
-			if ($attrs['date'] === "1") {
-				$g   = new Date($var);
-				$var = $g->display();
-			}
-		}
-		$this->current_element->addText($var);
-		$this->text = $var; // Used for title/descriptio
-	}
-
-	/**
-	 * XML <Facts>
-	 *
-	 * @param array $attrs an array of key value pairs for the attributes
-	 */
-	private function factsStartHandler($attrs) {
-		global $WT_TREE;
-
-		$this->process_repeats++;
-		if ($this->process_repeats > 1) {
-			return;
-		}
-
-		array_push($this->repeats_stack, array($this->repeats, $this->repeat_bytes));
-		$this->repeats      = array();
-		$this->repeat_bytes = xml_get_current_line_number($this->parser);
-
-		$id    = "";
-		$match = array();
-		if (preg_match("/0 @(.+)@/", $this->gedrec, $match)) {
-			$id = $match[1];
-		}
-		$tag = "";
-		if (isset($attrs['ignore'])) {
-			$tag .= $attrs['ignore'];
-		}
-		if (preg_match("/\\$(.+)/", $tag, $match)) {
-			$tag = $this->vars[$match[1]]['id'];
-		}
-
-		$record = GedcomRecord::getInstance($id, $WT_TREE);
-		if (empty($attrs['diff']) && !empty($id)) {
-			$facts = $record->getFacts();
-			Functions::sortFacts($facts);
-			$this->repeats  = array();
-			$nonfacts       = explode(',', $tag);
-			foreach ($facts as $event) {
-				if (!in_array($event->getTag(), $nonfacts)) {
-					$this->repeats[] = $event->getGedcom();
-				}
-			}
-		} else {
-			foreach ($record->getFacts() as $fact) {
-				if ($fact->isPendingAddition() && $fact->getTag() !== 'CHAN') {
-					$this->repeats[] = $fact->getGedcom();
-				}
-			}
-		}
-	}
-
-	/**
-	 * XML </Facts>
-	 */
-	private function factsEndHandler() {
-		global $report;
-
-		$this->process_repeats--;
-		if ($this->process_repeats > 0) {
-			return;
-		}
-
-		// Check if there is anything to repeat
-		if (count($this->repeats) > 0) {
-
-			$line       = xml_get_current_line_number($this->parser) - 1;
-			$lineoffset = 0;
-			foreach ($this->repeats_stack as $rep) {
-				$lineoffset += $rep[1];
-			}
-
-			//-- read the xml from the file
-			$lines = file($report);
-			while ($lineoffset + $this->repeat_bytes > 0 && strpos($lines[$lineoffset + $this->repeat_bytes], '<Facts ') === false) {
-				$lineoffset--;
-			}
-			$lineoffset++;
-			$reportxml = "<tempdoc>\n";
-			$i         = $line + $lineoffset;
-			$line_nr   = $this->repeat_bytes + $lineoffset;
-			while ($line_nr < $i) {
-				$reportxml .= $lines[$line_nr];
-				$line_nr++;
-			}
-			// No need to drag this
-			unset($lines);
-			$reportxml .= "</tempdoc>\n";
-			// Save original values
-			array_push($this->parser_stack, $this->parser);
-			$oldgedrec = $this->gedrec;
-			$count     = count($this->repeats);
-			$i         = 0;
-			while ($i < $count) {
-				$this->gedrec = $this->repeats[$i];
-				$this->fact   = '';
-				$this->desc   = '';
-				if (preg_match('/1 (\w+)(.*)/', $this->gedrec, $match)) {
-					$this->fact = $match[1];
-					if ($this->fact === 'EVEN' || $this->fact === 'FACT') {
-						$tmatch = array();
-						if (preg_match('/2 TYPE (.+)/', $this->gedrec, $tmatch)) {
-							$this->type = trim($tmatch[1]);
-						} else {
-							$this->type = ' ';
-						}
-					}
-					$this->desc = trim($match[2]);
-					$this->desc .= Functions::getCont(2, $this->gedrec);
-				}
-				$repeat_parser = xml_parser_create();
-				$this->parser  = $repeat_parser;
-				xml_parser_set_option($repeat_parser, XML_OPTION_CASE_FOLDING, false);
-				xml_set_element_handler($repeat_parser, array($this, 'startElement'), array($this, 'endElement'));
-				xml_set_character_data_handler($repeat_parser, array($this, 'characterData'));
-				if (!xml_parse($repeat_parser, $reportxml, true)) {
-					throw new \DomainException(sprintf(
-						'FactsEHandler XML error: %s at line %d',
-						xml_error_string(xml_get_error_code($repeat_parser)),
-						xml_get_current_line_number($repeat_parser)
-					));
-				}
-				xml_parser_free($repeat_parser);
-				$i++;
-			}
-			// Restore original values
-			$this->parser = array_pop($this->parser_stack);
-			$this->gedrec = $oldgedrec;
-		}
-		list($this->repeats, $this->repeat_bytes) = array_pop($this->repeats_stack);
-	}
-
-	/**
-	 * Setting upp or changing variables in the XML
-	 * The XML variable name and value is stored in $this->vars
-	 *
-	 * @param array $attrs an array of key value pairs for the attributes
-	 */
-	private function setVarStartHandler($attrs) {
-		if (empty($attrs['name'])) {
-			throw new \DomainException('REPORT ERROR var: The attribute "name" is missing or not set in the XML file');
-		}
-
-		$name  = $attrs['name'];
-		$value = $attrs['value'];
-		$match = array();
-		// Current GEDCOM record strings
-		if ($value == "@ID") {
-			if (preg_match("/0 @(.+)@/", $this->gedrec, $match)) {
-				$value = $match[1];
-			}
-		} elseif ($value == "@fact") {
-			$value = $this->fact;
-		} elseif ($value == "@desc") {
-			$value = $this->desc;
-		} elseif ($value == "@generation") {
-			$value = $this->generation;
-		} elseif (preg_match("/@(\w+)/", $value, $match)) {
-			$gmatch = array();
-			if (preg_match("/\d $match[1] (.+)/", $this->gedrec, $gmatch)) {
-				$value = str_replace("@", "", trim($gmatch[1]));
-			}
-		}
-		if (preg_match("/\\$(\w+)/", $name, $match)) {
-			$name = $this->vars["'" . $match[1] . "'"]['id'];
-		}
-		$count = preg_match_all("/\\$(\w+)/", $value, $match, PREG_SET_ORDER);
-		$i     = 0;
-		while ($i < $count) {
-			$t     = $this->vars[$match[$i][1]]['id'];
-			$value = preg_replace("/\\$" . $match[$i][1] . "/", $t, $value, 1);
-			$i++;
-		}
-		if (preg_match('/^I18N::number\((.+)\)$/', $value, $match)) {
-			$value = I18N::number($match[1]);
-		} elseif (preg_match('/^I18N::translate\(\'(.+)\'\)$/', $value, $match)) {
-			$value = I18N::translate($match[1]);
-		} elseif (preg_match('/^I18N::translateContext\(\'(.+)\', *\'(.+)\'\)$/', $value, $match)) {
-			$value = I18N::translateContext($match[1], $match[2]);
-		}
-		// Arithmetic functions
-		if (preg_match("/(\d+)\s*([\-\+\*\/])\s*(\d+)/", $value, $match)) {
-			switch ($match[2]) {
-			case "+":
-				$t     = $match[1] + $match[3];
-				$value = preg_replace("/" . $match[1] . "\s*([\-\+\*\/])\s*" . $match[3] . "/", $t, $value);
-				break;
-			case "-":
-				$t     = $match[1] - $match[3];
-				$value = preg_replace("/" . $match[1] . "\s*([\-\+\*\/])\s*" . $match[3] . "/", $t, $value);
-				break;
-			case "*":
-				$t     = $match[1] * $match[3];
-				$value = preg_replace("/" . $match[1] . "\s*([\-\+\*\/])\s*" . $match[3] . "/", $t, $value);
-				break;
-			case "/":
-				$t     = $match[1] / $match[3];
-				$value = preg_replace("/" . $match[1] . "\s*([\-\+\*\/])\s*" . $match[3] . "/", $t, $value);
-				break;
-			}
-		}
-		if (strpos($value, "@") !== false) {
-			$value = "";
-		}
-		$this->vars[$name]['id'] = $value;
-	}
-
-	/**
-	 * XML <if > start element
-	 *
-	 * @param array $attrs an array of key value pairs for the attributes
-	 */
-	private function ifStartHandler($attrs) {
-		if ($this->process_ifs > 0) {
-			$this->process_ifs++;
-
-			return;
-		}
-
-		$condition = $attrs['condition'];
-		$condition = $this->substituteVars($condition, true);
-		$condition = str_replace(array(" LT ", " GT "), array("<", ">"), $condition);
-		// Replace the first accurance only once of @fact:DATE or in any other combinations to the current fact, such as BIRT
-		$condition = str_replace("@fact:", $this->fact . ':', $condition);
-		$match     = array();
-		$count     = preg_match_all("/@([\w:\.]+)/", $condition, $match, PREG_SET_ORDER);
-		$i         = 0;
-		while ($i < $count) {
-			$id    = $match[$i][1];
-			$value = '""';
-			if ($id == "ID") {
-				if (preg_match("/0 @(.+)@/", $this->gedrec, $match)) {
-					$value = "'" . $match[1] . "'";
-				}
-			} elseif ($id === "fact") {
-				$value = '"' . $this->fact . '"';
-			} elseif ($id === "desc") {
-				$value = '"' . addslashes($this->desc) . '"';
-			} elseif ($id === "generation") {
-				$value = '"' . $this->generation . '"';
-			} else {
-
-				$temp  = explode(" ", trim($this->gedrec));
-				$level = $temp[0];
-				if ($level == 0) {
-					$level++;
-				}
-				$value = $this->getGedcomValue($id, $level, $this->gedrec);
-				if (empty($value)) {
-					$level++;
-					$value = $this->getGedcomValue($id, $level, $this->gedrec);
-				}
-				$value = preg_replace('/^@(' . WT_REGEX_XREF . ')@$/', '$1', $value);
-				$value = '"' . addslashes($value) . '"';
-			}
-			$condition = str_replace("@$id", $value, $condition);
-			$i++;
-		}
-		$ret = eval("return (bool) ($condition);");
-		if (!$ret) {
-			$this->process_ifs++;
-		}
-	}
-
-	/**
-	 * XML <if /> end element
-	 */
-	private function ifEndHandler() {
-		if ($this->process_ifs > 0) {
-			$this->process_ifs--;
-		}
-	}
-
-	/**
-	 * XML <Footnote > start element
-	 * Collect the Footnote links
-	 * GEDCOM Records that are protected by Privacy setting will be ignore
-	 *
-	 * @param array $attrs an array of key value pairs for the attributes
-	 */
-	private function footnoteStartHandler($attrs) {
-		global $WT_TREE;
-
-		$id = "";
-		if (preg_match("/[0-9] (.+) @(.+)@/", $this->gedrec, $match)) {
-			$id = $match[2];
-		}
-		$record = GedcomRecord::getInstance($id, $WT_TREE);
-		if ($record && $record->canShow()) {
-			array_push($this->print_data_stack, $this->print_data);
-			$this->print_data = true;
-			$style            = "";
-			if (!empty($attrs['style'])) {
-				$style = $attrs['style'];
-			}
-			$this->footnote_element = $this->current_element;
-			$this->current_element  = $this->report_root->createFootnote($style);
-		} else {
-			$this->print_data       = false;
-			$this->process_footnote = false;
-		}
-	}
-
-	/**
-	 * XML <Footnote /> end element
-	 * Print the collected Footnote data
-	 */
-	private function footnoteEndHandler() {
-		if ($this->process_footnote) {
-			$this->print_data = array_pop($this->print_data_stack);
-			$temp             = trim($this->current_element->getValue());
-			if (strlen($temp) > 3) {
-				$this->wt_report->addElement($this->current_element);
-			}
-			$this->current_element = $this->footnote_element;
-		} else {
-			$this->process_footnote = true;
-		}
-	}
-
-	/**
-	 * XML <FootnoteTexts /> element
-	 */
-	private function footnoteTextsStartHandler() {
-		$temp = "footnotetexts";
-		$this->wt_report->addElement($temp);
-	}
-
-	/**
-	 * XML <AgeAtDeath /> element handler
-	 */
-	private function ageAtDeathStartHandler() {
-		// This duplicates functionality in FunctionsPrint::format_fact_date()
-		global $factrec, $WT_TREE;
-
-		$match = array();
-		if (preg_match("/0 @(.+)@/", $this->gedrec, $match)) {
-			$person = Individual::getInstance($match[1], $WT_TREE);
-			// Recorded age
-			if (preg_match('/\n2 AGE (.+)/', $factrec, $match)) {
-				$fact_age = $match[1];
-			} else {
-				$fact_age = '';
-			}
-			if (preg_match('/\n2 HUSB\n3 AGE (.+)/', $factrec, $match)) {
-				$husb_age = $match[1];
-			} else {
-				$husb_age = '';
-			}
-			if (preg_match('/\n2 WIFE\n3 AGE (.+)/', $factrec, $match)) {
-				$wife_age = $match[1];
-			} else {
-				$wife_age = '';
-			}
-
-			// Calculated age
-			$birth_date = $person->getBirthDate();
-			// Can't use getDeathDate(), as this also gives BURI/CREM events, which
-			// wouldn't give the correct "days after death" result for people with
-			// no DEAT.
-			$death_event = $person->getFirstFact('DEAT');
-			if ($death_event) {
-				$death_date = $death_event->getDate();
-			} else {
-				$death_date = new Date('');
-			}
-			$value = '';
-			if (Date::compare($birth_date, $death_date) <= 0 || !$person->isDead()) {
-				$age = Date::getAgeGedcom($birth_date, $death_date);
-				// Only show calculated age if it differs from recorded age
-				if ($age != '' && $age != "0d") {
-					if ($fact_age != '' && $fact_age != $age || $fact_age == '' && $husb_age == '' && $wife_age == '' || $husb_age != '' && $person->getSex() == 'M' && $husb_age != $age || $wife_age != '' && $person->getSex() == 'F' && $wife_age != $age
-					) {
-						$value  = FunctionsDate::getAgeAtEvent($age);
-						$abbrev = substr($value, 0, strpos($value, ' ') + 5);
-						if ($value !== $abbrev) {
-							$value = $abbrev . '.';
-						}
-					}
-				}
-			}
-			$this->current_element->addText($value);
-		}
-	}
-
-	/**
-	 * XML element Forced line break handler - HTML code
-	 */
-	private function brStartHandler() {
-		if ($this->print_data && $this->process_gedcoms === 0) {
-			$this->current_element->addText('<br>');
-		}
-	}
-
-	/**
-	 * XML <sp />element Forced space handler
-	 */
-	private function spStartHandler() {
-		if ($this->print_data && $this->process_gedcoms === 0) {
-			$this->current_element->addText(' ');
-		}
-	}
-
-	/**
-	 * XML <HighlightedImage/>
-	 *
-	 * @param array $attrs an array of key value pairs for the attributes
-	 */
-	private function highlightedImageStartHandler($attrs) {
-		global $WT_TREE;
-
-		$id    = '';
-		$match = array();
-		if (preg_match("/0 @(.+)@/", $this->gedrec, $match)) {
-			$id = $match[1];
-		}
-
-		// mixed Position the top corner of this box on the page. the default is the current position
-		$top = '.';
-		if (isset($attrs['top'])) {
-			if ($attrs['top'] === '0') {
-				$top = 0;
-			} elseif ($attrs['top'] === '.') {
-				$top = '.';
-			} elseif (!empty($attrs['top'])) {
-				$top = (int) $attrs['top'];
-			}
-		}
-
-		// mixed Position the left corner of this box on the page. the default is the current position
-		$left = '.';
-		if (isset($attrs['left'])) {
-			if ($attrs['left'] === '0') {
-				$left = 0;
-			} elseif ($attrs['left'] === '.') {
-				$left = '.';
-			} elseif (!empty($attrs['left'])) {
-				$left = (int) $attrs['left'];
-			}
-		}
-
-		// string Align the image in left, center, right
-		$align = '';
-		if (!empty($attrs['align'])) {
-			$align = $attrs['align'];
-		}
-
-		// string Next Line should be T:next to the image, N:next line
-		$ln = '';
-		if (!empty($attrs['ln'])) {
-			$ln = $attrs['ln'];
-		}
-
-		$width  = 0;
-		$height = 0;
-		if (!empty($attrs['width'])) {
-			$width = (int) $attrs['width'];
-		}
-		if (!empty($attrs['height'])) {
-			$height = (int) $attrs['height'];
-		}
-
-		$person      = Individual::getInstance($id, $WT_TREE);
-		$mediaobject = $person->findHighlightedMedia();
-		if ($mediaobject) {
-			$attributes = $mediaobject->getImageAttributes('thumb');
-			if (in_array(
-					$attributes['ext'],
-					array(
-						'GIF',
-						'JPG',
-						'PNG',
-						'SWF',
-						'PSD',
-						'BMP',
-						'TIFF',
-						'TIFF',
-						'JPC',
-						'JP2',
-						'JPX',
-						'JB2',
-						'SWC',
-						'IFF',
-						'WBMP',
-						'XBM',
-					)
-				) && $mediaobject->canShow() && $mediaobject->fileExists('thumb')
-			) {
-				if ($width > 0 && $height == 0) {
-					$perc   = $width / $attributes['adjW'];
-					$height = round($attributes['adjH'] * $perc);
-				} elseif ($height > 0 && $width == 0) {
-					$perc  = $height / $attributes['adjH'];
-					$width = round($attributes['adjW'] * $perc);
-				} else {
-					$width  = $attributes['adjW'];
-					$height = $attributes['adjH'];
-				}
-				$image = $this->report_root->createImageFromObject($mediaobject, $left, $top, $width, $height, $align, $ln);
-				$this->wt_report->addElement($image);
-			}
-		}
-	}
-
-	/**
-	 * XML <Image/>
-	 *
-	 * @param array $attrs an array of key value pairs for the attributes
-	 */
-	private function imageStartHandler($attrs) {
-		global $WT_TREE;
-
-		// mixed Position the top corner of this box on the page. the default is the current position
-		$top = '.';
-		if (isset($attrs['top'])) {
-			if ($attrs['top'] === "0") {
-				$top = 0;
-			} elseif ($attrs['top'] === '.') {
-				$top = '.';
-			} elseif (!empty($attrs['top'])) {
-				$top = (int) $attrs['top'];
-			}
-		}
-
-		// mixed Position the left corner of this box on the page. the default is the current position
-		$left = '.';
-		if (isset($attrs['left'])) {
-			if ($attrs['left'] === '0') {
-				$left = 0;
-			} elseif ($attrs['left'] === '.') {
-				$left = '.';
-			} elseif (!empty($attrs['left'])) {
-				$left = (int) $attrs['left'];
-			}
-		}
-
-		// string Align the image in left, center, right
-		$align = '';
-		if (!empty($attrs['align'])) {
-			$align = $attrs['align'];
-		}
-
-		// string Next Line should be T:next to the image, N:next line
-		$ln = 'T';
-		if (!empty($attrs['ln'])) {
-			$ln = $attrs['ln'];
-		}
-
-		$width  = 0;
-		$height = 0;
-		if (!empty($attrs['width'])) {
-			$width = (int) $attrs['width'];
-		}
-		if (!empty($attrs['height'])) {
-			$height = (int) $attrs['height'];
-		}
-
-		$file = '';
-		if (!empty($attrs['file'])) {
-			$file = $attrs['file'];
-		}
-		if ($file == "@FILE") {
-			$match = array();
-			if (preg_match("/\d OBJE @(.+)@/", $this->gedrec, $match)) {
-				$mediaobject = Media::getInstance($match[1], $WT_TREE);
-				$attributes  = $mediaobject->getImageAttributes('thumb');
-				if (in_array(
-						$attributes['ext'],
-						array(
-							'GIF',
-							'JPG',
-							'PNG',
-							'SWF',
-							'PSD',
-							'BMP',
-							'TIFF',
-							'TIFF',
-							'JPC',
-							'JP2',
-							'JPX',
-							'JB2',
-							'SWC',
-							'IFF',
-							'WBMP',
-							'XBM',
-						)
-					) && $mediaobject->canShow() && $mediaobject->fileExists('thumb')
-				) {
-					if ($width > 0 && $height == 0) {
-						$perc   = $width / $attributes['adjW'];
-						$height = round($attributes['adjH'] * $perc);
-					} elseif ($height > 0 && $width == 0) {
-						$perc  = $height / $attributes['adjH'];
-						$width = round($attributes['adjW'] * $perc);
-					} else {
-						$width  = $attributes['adjW'];
-						$height = $attributes['adjH'];
-					}
-					$image = $this->report_root->createImageFromObject($mediaobject, $left, $top, $width, $height, $align, $ln);
-					$this->wt_report->addElement($image);
-				}
-			}
-		} else {
-			if (file_exists($file) && preg_match("/(jpg|jpeg|png|gif)$/i", $file)) {
-				$size = getimagesize($file);
-				if ($width > 0 && $height == 0) {
-					$perc   = $width / $size[0];
-					$height = round($size[1] * $perc);
-				} elseif ($height > 0 && $width == 0) {
-					$perc  = $height / $size[1];
-					$width = round($size[0] * $perc);
-				} else {
-					$width  = $size[0];
-					$height = $size[1];
-				}
-				$image = $this->report_root->createImage($file, $left, $top, $width, $height, $align, $ln);
-				$this->wt_report->addElement($image);
-			}
-		}
-	}
-
-	/**
-	 * XML <Line> element handler
-	 *
-	 * @param array $attrs an array of key value pairs for the attributes
-	 */
-	private function lineStartHandler($attrs) {
-		// Start horizontal position, current position (default)
-		$x1 = ".";
-		if (isset($attrs['x1'])) {
-			if ($attrs['x1'] === "0") {
-				$x1 = 0;
-			} elseif ($attrs['x1'] === ".") {
-				$x1 = ".";
-			} elseif (!empty($attrs['x1'])) {
-				$x1 = (int) $attrs['x1'];
-			}
-		}
-		// Start vertical position, current position (default)
-		$y1 = ".";
-		if (isset($attrs['y1'])) {
-			if ($attrs['y1'] === "0") {
-				$y1 = 0;
-			} elseif ($attrs['y1'] === ".") {
-				$y1 = ".";
-			} elseif (!empty($attrs['y1'])) {
-				$y1 = (int) $attrs['y1'];
-			}
-		}
-		// End horizontal position, maximum width (default)
-		$x2 = ".";
-		if (isset($attrs['x2'])) {
-			if ($attrs['x2'] === "0") {
-				$x2 = 0;
-			} elseif ($attrs['x2'] === ".") {
-				$x2 = ".";
-			} elseif (!empty($attrs['x2'])) {
-				$x2 = (int) $attrs['x2'];
-			}
-		}
-		// End vertical position
-		$y2 = ".";
-		if (isset($attrs['y2'])) {
-			if ($attrs['y2'] === "0") {
-				$y2 = 0;
-			} elseif ($attrs['y2'] === ".") {
-				$y2 = ".";
-			} elseif (!empty($attrs['y2'])) {
-				$y2 = (int) $attrs['y2'];
-			}
-		}
-
-		$line = $this->report_root->createLine($x1, $y1, $x2, $y2);
-		$this->wt_report->addElement($line);
-	}
-
-	/**
-	 * XML <List>
-	 *
-	 * @param array $attrs an array of key value pairs for the attributes
-	 */
-	private function listStartHandler($attrs) {
-		global $WT_TREE;
-
-		$this->process_repeats++;
-		if ($this->process_repeats > 1) {
-			return;
-		}
-
-		$match = array();
-		if (isset($attrs['sortby'])) {
-			$sortby = $attrs['sortby'];
-			if (preg_match("/\\$(\w+)/", $sortby, $match)) {
-				$sortby = $this->vars[$match[1]]['id'];
-				$sortby = trim($sortby);
-			}
-		} else {
-			$sortby = "NAME";
-		}
-
-		if (isset($attrs['list'])) {
-			$listname = $attrs['list'];
-		} else {
-			$listname = "individual";
-		}
-		// Some filters/sorts can be applied using SQL, while others require PHP
-		switch ($listname) {
-		case "pending":
-			$rows = Database::prepare(
-				"SELECT xref, CASE new_gedcom WHEN '' THEN old_gedcom ELSE new_gedcom END AS gedcom" .
-				" FROM `##change`" . " WHERE (xref, change_id) IN (" .
-				"  SELECT xref, MAX(change_id)" .
-				"  FROM `##change`" .
-				"  WHERE status = 'pending' AND gedcom_id = :tree_id" .
-				"  GROUP BY xref" .
-				" )"
-			)->execute(array(
-				'tree_id' => $WT_TREE->getTreeId(),
-			))->fetchAll();
-			$this->list = array();
-			foreach ($rows as $row) {
-				$this->list[] = GedcomRecord::getInstance($row->xref, $WT_TREE, $row->gedcom);
-			}
-			break;
-		case 'individual':
-			$sql_select   = "SELECT i_id AS xref, i_gedcom AS gedcom FROM `##individuals` ";
-			$sql_join     = "";
-			$sql_where    = " WHERE i_file = :tree_id";
-			$sql_order_by = "";
-			$sql_params   = array('tree_id' => $WT_TREE->getTreeId());
-			foreach ($attrs as $attr => $value) {
-				if (strpos($attr, 'filter') === 0 && $value) {
-					$value = $this->substituteVars($value, false);
-					// Convert the various filters into SQL
-					if (preg_match('/^(\w+):DATE (LTE|GTE) (.+)$/', $value, $match)) {
-						$sql_join .= " JOIN `##dates` AS {$attr} ON ({$attr}.d_file=i_file AND {$attr}.d_gid=i_id)";
-						$sql_where .= " AND {$attr}.d_fact = :{$attr}fact";
-						$sql_params[$attr . 'fact'] = $match[1];
-						$date                       = new Date($match[3]);
-						if ($match[2] == "LTE") {
-							$sql_where .= " AND {$attr}.d_julianday2 <= :{$attr}date";
-							$sql_params[$attr . 'date'] = $date->maximumJulianDay();
-						} else {
-							$sql_where .= " AND {$attr}.d_julianday1 >= :{$attr}date";
-							$sql_params[$attr . 'date'] = $date->minimumJulianDay();
-						}
-						if ($sortby == $match[1]) {
-							$sortby = "";
-							$sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.d_julianday1";
-						}
-						unset($attrs[$attr]); // This filter has been fully processed
-					} elseif (preg_match('/^NAME CONTAINS (.*)$/', $value, $match)) {
-						// Do nothing, unless you have to
-						if ($match[1] != '' || $sortby == 'NAME') {
-							$sql_join .= " JOIN `##name` AS {$attr} ON (n_file=i_file AND n_id=i_id)";
-							// Search the DB only if there is any name supplied
-							if ($match[1] != "") {
-								$names = explode(" ", $match[1]);
-								foreach ($names as $n => $name) {
-									$sql_where .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
-									$sql_params[$attr . 'name' . $n] = $name;
-								}
-							}
-							// Let the DB do the name sorting even when no name was entered
-							if ($sortby == "NAME") {
-								$sortby = "";
-								$sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.n_sort";
-							}
-						}
-						unset($attrs[$attr]); // This filter has been fully processed
-					} elseif (preg_match('/^REGEXP \/(.+)\//', $value, $match)) {
-						$sql_where .= " AND i_gedcom REGEXP :{$attr}gedcom";
-						// PDO helpfully escapes backslashes for us, preventing us from matching "\n1 FACT"
-						$sql_params[$attr . 'gedcom'] = str_replace('\n', "\n", $match[1]);
-						unset($attrs[$attr]); // This filter has been fully processed
-					} elseif (preg_match('/^(?:\w+):PLAC CONTAINS (.+)$/', $value, $match)) {
-						$sql_join .= " JOIN `##places` AS {$attr}a ON ({$attr}a.p_file = i_file)";
-						$sql_join .= " JOIN `##placelinks` AS {$attr}b ON ({$attr}a.p_file = {$attr}b.pl_file AND {$attr}b.pl_p_id = {$attr}a.p_id AND {$attr}b.pl_gid = i_id)";
-						$sql_where .= " AND {$attr}a.p_place LIKE CONCAT('%', :{$attr}place, '%')";
-						$sql_params[$attr . 'place'] = $match[1];
-						// Don't unset this filter. This is just initial filtering
-					} elseif (preg_match('/^(\w*):*(\w*) CONTAINS (.+)$/', $value, $match)) {
-						$sql_where .= " AND i_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
-						$sql_params[$attr . 'contains1'] = $match[1];
-						$sql_params[$attr . 'contains2'] = $match[2];
-						$sql_params[$attr . 'contains3'] = $match[3];
-						// Don't unset this filter. This is just initial filtering
-					}
-				}
-			}
-
-			$this->list = array();
-			$rows       = Database::prepare(
-				$sql_select . $sql_join . $sql_where . $sql_order_by
-			)->execute($sql_params)->fetchAll();
-
-			foreach ($rows as $row) {
-				$this->list[$row->xref] = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-			}
-			break;
-
-		case 'family':
-			$sql_select   = "SELECT f_id AS xref, f_gedcom AS gedcom FROM `##families`";
-			$sql_join     = "";
-			$sql_where    = " WHERE f_file = :tree_id";
-			$sql_order_by = "";
-			$sql_params   = array('tree_id' => $WT_TREE->getTreeId());
-			foreach ($attrs as $attr => $value) {
-				if (strpos($attr, 'filter') === 0 && $value) {
-					$value = $this->substituteVars($value, false);
-					// Convert the various filters into SQL
-					if (preg_match('/^(\w+):DATE (LTE|GTE) (.+)$/', $value, $match)) {
-						$sql_join .= " JOIN `##dates` AS {$attr} ON ({$attr}.d_file=f_file AND {$attr}.d_gid=f_id)";
-						$sql_where .= " AND {$attr}.d_fact = :{$attr}fact";
-						$sql_params[$attr . 'fact'] = $match[1];
-						$date                       = new Date($match[3]);
-						if ($match[2] == "LTE") {
-							$sql_where .= " AND {$attr}.d_julianday2 <= :{$attr}date";
-							$sql_params[$attr . 'date'] = $date->maximumJulianDay();
-						} else {
-							$sql_where .= " AND {$attr}.d_julianday1 >= :{$attr}date";
-							$sql_params[$attr . 'date'] = $date->minimumJulianDay();
-						}
-						if ($sortby == $match[1]) {
-							$sortby = "";
-							$sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.d_julianday1";
-						}
-						unset($attrs[$attr]); // This filter has been fully processed
-					} elseif (preg_match('/^REGEXP \/(.+)\//', $value, $match)) {
-						$sql_where .= " AND f_gedcom REGEXP :{$attr}gedcom";
-						// PDO helpfully escapes backslashes for us, preventing us from matching "\n1 FACT"
-						$sql_params[$attr . 'gedcom'] = str_replace('\n', "\n", $match[1]);
-						unset($attrs[$attr]); // This filter has been fully processed
-					} elseif (preg_match('/^NAME CONTAINS (.+)$/', $value, $match)) {
-						// Do nothing, unless you have to
-						if ($match[1] != '' || $sortby == 'NAME') {
-							$sql_join .= " JOIN `##name` AS {$attr} ON n_file = f_file AND n_id IN (f_husb, f_wife)";
-							// Search the DB only if there is any name supplied
-							if ($match[1] != "") {
-								$names = explode(" ", $match[1]);
-								foreach ($names as $n => $name) {
-									$sql_where .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
-									$sql_params[$attr . 'name' . $n] = $name;
-								}
-							}
-							// Let the DB do the name sorting even when no name was entered
-							if ($sortby == "NAME") {
-								$sortby = "";
-								$sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.n_sort";
-							}
-						}
-						unset($attrs[$attr]); // This filter has been fully processed
-
-					} elseif (preg_match('/^(?:\w+):PLAC CONTAINS (.+)$/', $value, $match)) {
-						$sql_join .= " JOIN `##places` AS {$attr}a ON ({$attr}a.p_file=f_file)";
-						$sql_join .= " JOIN `##placelinks` AS {$attr}b ON ({$attr}a.p_file={$attr}b.pl_file AND {$attr}b.pl_p_id={$attr}a.p_id AND {$attr}b.pl_gid=f_id)";
-						$sql_where .= " AND {$attr}a.p_place LIKE CONCAT('%', :{$attr}place, '%')";
-						$sql_params[$attr . 'place'] = $match[1];
-						// Don't unset this filter. This is just initial filtering
-					} elseif (preg_match('/^(\w*):*(\w*) CONTAINS (.+)$/', $value, $match)) {
-						$sql_where .= " AND f_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
-						$sql_params[$attr . 'contains1'] = $match[1];
-						$sql_params[$attr . 'contains2'] = $match[2];
-						$sql_params[$attr . 'contains3'] = $match[3];
-						// Don't unset this filter. This is just initial filtering
-					}
-				}
-			}
-
-			$this->list = array();
-			$rows       = Database::prepare(
-				$sql_select . $sql_join . $sql_where . $sql_order_by
-			)->execute($sql_params)->fetchAll();
-
-			foreach ($rows as $row) {
-				$this->list[$row->xref] = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-			}
-			break;
-
-		default:
-			throw new \DomainException('Invalid list name: ' . $listname);
-		}
-
-		$filters  = array();
-		$filters2 = array();
-		if (isset($attrs['filter1']) && count($this->list) > 0) {
-			foreach ($attrs as $key => $value) {
-				if (preg_match("/filter(\d)/", $key)) {
-					$condition = $value;
-					if (preg_match("/@(\w+)/", $condition, $match)) {
-						$id    = $match[1];
-						$value = "''";
-						if ($id == "ID") {
-							if (preg_match("/0 @(.+)@/", $this->gedrec, $match)) {
-								$value = "'" . $match[1] . "'";
-							}
-						} elseif ($id == "fact") {
-							$value = "'" . $this->fact . "'";
-						} elseif ($id == "desc") {
-							$value = "'" . $this->desc . "'";
-						} else {
-							if (preg_match("/\d $id (.+)/", $this->gedrec, $match)) {
-								$value = "'" . str_replace("@", "", trim($match[1])) . "'";
-							}
-						}
-						$condition = preg_replace("/@$id/", $value, $condition);
-					}
-					//-- handle regular expressions
-					if (preg_match("/([A-Z:]+)\s*([^\s]+)\s*(.+)/", $condition, $match)) {
-						$tag  = trim($match[1]);
-						$expr = trim($match[2]);
-						$val  = trim($match[3]);
-						if (preg_match("/\\$(\w+)/", $val, $match)) {
-							$val = $this->vars[$match[1]]['id'];
-							$val = trim($val);
-						}
-						if ($val) {
-							$searchstr = "";
-							$tags      = explode(":", $tag);
-							//-- only limit to a level number if we are specifically looking at a level
-							if (count($tags) > 1) {
-								$level = 1;
-								foreach ($tags as $t) {
-									if (!empty($searchstr)) {
-										$searchstr .= "[^\n]*(\n[2-9][^\n]*)*\n";
-									}
-									//-- search for both EMAIL and _EMAIL... silly double gedcom standard
-									if ($t == "EMAIL" || $t == "_EMAIL") {
-										$t = "_?EMAIL";
-									}
-									$searchstr .= $level . " " . $t;
-									$level++;
-								}
-							} else {
-								if ($tag == "EMAIL" || $tag == "_EMAIL") {
-									$tag = "_?EMAIL";
-								}
-								$t         = $tag;
-								$searchstr = "1 " . $tag;
-							}
-							switch ($expr) {
-							case "CONTAINS":
-								if ($t == "PLAC") {
-									$searchstr .= "[^\n]*[, ]*" . $val;
-								} else {
-									$searchstr .= "[^\n]*" . $val;
-								}
-								$filters[] = $searchstr;
-								break;
-							default:
-								$filters2[] = array("tag" => $tag, "expr" => $expr, "val" => $val);
-								break;
-							}
-						}
-					}
-				}
-			}
-		}
-		//-- apply other filters to the list that could not be added to the search string
-		if ($filters) {
-			foreach ($this->list as $key => $record) {
-				foreach ($filters as $filter) {
-					if (!preg_match("/" . $filter . "/i", $record->privatizeGedcom(Auth::accessLevel($WT_TREE)))) {
-						unset($this->list[$key]);
-						break;
-					}
-				}
-			}
-		}
-		if ($filters2) {
-			$mylist = array();
-			foreach ($this->list as $indi) {
-				$key  = $indi->getXref();
-				$grec = $indi->privatizeGedcom(Auth::accessLevel($WT_TREE));
-				$keep = true;
-				foreach ($filters2 as $filter) {
-					if ($keep) {
-						$tag  = $filter['tag'];
-						$expr = $filter['expr'];
-						$val  = $filter['val'];
-						if ($val == "''") {
-							$val = "";
-						}
-						$tags = explode(":", $tag);
-						$t    = end($tags);
-						$v    = $this->getGedcomValue($tag, 1, $grec);
-						//-- check for EMAIL and _EMAIL (silly double gedcom standard :P)
-						if ($t == "EMAIL" && empty($v)) {
-							$tag  = str_replace("EMAIL", "_EMAIL", $tag);
-							$tags = explode(":", $tag);
-							$t    = end($tags);
-							$v    = Functions::getSubRecord(1, $tag, $grec);
-						}
-
-						switch ($expr) {
-						case "GTE":
-							if ($t == "DATE") {
-								$date1 = new Date($v);
-								$date2 = new Date($val);
-								$keep  = (Date::compare($date1, $date2) >= 0);
-							} elseif ($val >= $v) {
-								$keep = true;
-							}
-							break;
-						case "LTE":
-							if ($t == "DATE") {
-								$date1 = new Date($v);
-								$date2 = new Date($val);
-								$keep  = (Date::compare($date1, $date2) <= 0);
-							} elseif ($val >= $v) {
-								$keep = true;
-							}
-							break;
-						default:
-							if ($v == $val) {
-								$keep = true;
-							} else {
-								$keep = false;
-							}
-							break;
-						}
-					}
-				}
-				if ($keep) {
-					$mylist[$key] = $indi;
-				}
-			}
-			$this->list = $mylist;
-		}
-
-		switch ($sortby) {
-		case 'NAME':
-			uasort($this->list, '\Fisharebest\Webtrees\GedcomRecord::compare');
-			break;
-		case 'CHAN':
-			uasort($this->list, function (GedcomRecord $x, GedcomRecord $y) {
-				return $y->lastChangeTimestamp(true) - $x->lastChangeTimestamp(true);
-			});
-			break;
-		case 'BIRT:DATE':
-			uasort($this->list, '\Fisharebest\Webtrees\Individual::compareBirthDate');
-			break;
-		case 'DEAT:DATE':
-			uasort($this->list, '\Fisharebest\Webtrees\Individual::compareDeathDate');
-			break;
-		case 'MARR:DATE':
-			uasort($this->list, '\Fisharebest\Webtrees\Family::compareMarrDate');
-			break;
-		default:
-			// unsorted or already sorted by SQL
-			break;
-		}
-
-		array_push($this->repeats_stack, array($this->repeats, $this->repeat_bytes));
-		$this->repeat_bytes = xml_get_current_line_number($this->parser) + 1;
-	}
-
-	/**
-	 * XML <List>
-	 */
-	private function listEndHandler() {
-		global $report;
-
-		$this->process_repeats--;
-		if ($this->process_repeats > 0) {
-			return;
-		}
-
-		// Check if there is any list
-		if (count($this->list) > 0) {
-			$lineoffset = 0;
-			foreach ($this->repeats_stack as $rep) {
-				$lineoffset += $rep[1];
-			}
-			//-- read the xml from the file
-			$lines = file($report);
-			while ((strpos($lines[$lineoffset + $this->repeat_bytes], "<List") === false) && (($lineoffset + $this->repeat_bytes) > 0)) {
-				$lineoffset--;
-			}
-			$lineoffset++;
-			$reportxml = "<tempdoc>\n";
-			$line_nr   = $lineoffset + $this->repeat_bytes;
-			// List Level counter
-			$count = 1;
-			while (0 < $count) {
-				if (strpos($lines[$line_nr], "<List") !== false) {
-					$count++;
-				} elseif (strpos($lines[$line_nr], "</List") !== false) {
-					$count--;
-				}
-				if (0 < $count) {
-					$reportxml .= $lines[$line_nr];
-				}
-				$line_nr++;
-			}
-			// No need to drag this
-			unset($lines);
-			$reportxml .= "</tempdoc>";
-			// Save original values
-			array_push($this->parser_stack, $this->parser);
-			$oldgedrec = $this->gedrec;
-
-			$this->list_total   = count($this->list);
-			$this->list_private = 0;
-			foreach ($this->list as $record) {
-				if ($record->canShow()) {
-					$this->gedrec = $record->privatizeGedcom(Auth::accessLevel($record->getTree()));
-					//-- start the sax parser
-					$repeat_parser = xml_parser_create();
-					$this->parser  = $repeat_parser;
-					xml_parser_set_option($repeat_parser, XML_OPTION_CASE_FOLDING, false);
-					xml_set_element_handler($repeat_parser, array($this, 'startElement'), array($this, 'endElement'));
-					xml_set_character_data_handler($repeat_parser, array($this, 'characterData'));
-					if (!xml_parse($repeat_parser, $reportxml, true)) {
-						throw new \DomainException(sprintf(
-							'ListEHandler XML error: %s at line %d',
-							xml_error_string(xml_get_error_code($repeat_parser)),
-							xml_get_current_line_number($repeat_parser)
-						));
-					}
-					xml_parser_free($repeat_parser);
-				} else {
-					$this->list_private++;
-				}
-			}
-			$this->list   = array();
-			$this->parser = array_pop($this->parser_stack);
-			$this->gedrec = $oldgedrec;
-		}
-		list($this->repeats, $this->repeat_bytes) = array_pop($this->repeats_stack);
-	}
-
-	/**
-	 * XML <ListTotal> element handler
-	 *
-	 * Prints the total number of records in a list
-	 * The total number is collected from
-	 * List and Relatives
-	 */
-	private function listTotalStartHandler() {
-		if ($this->list_private == 0) {
-			$this->current_element->addText($this->list_total);
-		} else {
-			$this->current_element->addText(($this->list_total - $this->list_private) . " / " . $this->list_total);
-		}
-	}
-
-	/**
-	 * XML <Relatives>
-	 *
-	 * @param array $attrs an array of key value pairs for the attributes
-	 */
-	private function relativesStartHandler($attrs) {
-		global $WT_TREE;
-
-		$this->process_repeats++;
-		if ($this->process_repeats > 1) {
-			return;
-		}
-
-		$sortby = "NAME";
-		if (isset($attrs['sortby'])) {
-			$sortby = $attrs['sortby'];
-		}
-		$match = array();
-		if (preg_match("/\\$(\w+)/", $sortby, $match)) {
-			$sortby = $this->vars[$match[1]]['id'];
-			$sortby = trim($sortby);
-		}
-
-		$maxgen = -1;
-		if (isset($attrs['maxgen'])) {
-			$maxgen = $attrs['maxgen'];
-		}
-		if ($maxgen == "*") {
-			$maxgen = -1;
-		}
-
-		$group = "child-family";
-		if (isset($attrs['group'])) {
-			$group = $attrs['group'];
-		}
-		if (preg_match("/\\$(\w+)/", $group, $match)) {
-			$group = $this->vars[$match[1]]['id'];
-			$group = trim($group);
-		}
-
-		$id = "";
-		if (isset($attrs['id'])) {
-			$id = $attrs['id'];
-		}
-		if (preg_match("/\\$(\w+)/", $id, $match)) {
-			$id = $this->vars[$match[1]]['id'];
-			$id = trim($id);
-		}
-
-		$this->list = array();
-		$person     = Individual::getInstance($id, $WT_TREE);
-		if (!empty($person)) {
-			$this->list[$id] = $person;
-			switch ($group) {
-			case "child-family":
-				foreach ($person->getChildFamilies() as $family) {
-					$husband = $family->getHusband();
-					$wife    = $family->getWife();
-					if (!empty($husband)) {
-						$this->list[$husband->getXref()] = $husband;
-					}
-					if (!empty($wife)) {
-						$this->list[$wife->getXref()] = $wife;
-					}
-					$children = $family->getChildren();
-					foreach ($children as $child) {
-						if (!empty($child)) {
-							$this->list[$child->getXref()] = $child;
-						}
-					}
-				}
-				break;
-			case "spouse-family":
-				foreach ($person->getSpouseFamilies() as $family) {
-					$husband = $family->getHusband();
-					$wife    = $family->getWife();
-					if (!empty($husband)) {
-						$this->list[$husband->getXref()] = $husband;
-					}
-					if (!empty($wife)) {
-						$this->list[$wife->getXref()] = $wife;
-					}
-					$children = $family->getChildren();
-					foreach ($children as $child) {
-						if (!empty($child)) {
-							$this->list[$child->getXref()] = $child;
-						}
-					}
-				}
-				break;
-			case "direct-ancestors":
-				$this->addAncestors($this->list, $id, false, $maxgen);
-				break;
-			case "ancestors":
-				$this->addAncestors($this->list, $id, true, $maxgen);
-				break;
-			case "descendants":
-				$this->list[$id]->generation = 1;
-				$this->addDescendancy($this->list, $id, false, $maxgen);
-				break;
-			case "all":
-				$this->addAncestors($this->list, $id, true, $maxgen);
-				$this->addDescendancy($this->list, $id, true, $maxgen);
-				break;
-			}
-		}
-
-		switch ($sortby) {
-		case 'NAME':
-			uasort($this->list, '\Fisharebest\Webtrees\GedcomRecord::compare');
-			break;
-		case 'BIRT:DATE':
-			uasort($this->list, '\Fisharebest\Webtrees\Individual::compareBirthDate');
-			break;
-		case 'DEAT:DATE':
-			uasort($this->list, '\Fisharebest\Webtrees\Individual::compareDeathDate');
-			break;
-		case 'generation':
-			$newarray = array();
-			reset($this->list);
-			$genCounter = 1;
-			while (count($newarray) < count($this->list)) {
-				foreach ($this->list as $key => $value) {
-					$this->generation = $value->generation;
-					if ($this->generation == $genCounter) {
-						$newarray[$key]             = new \stdClass;
-						$newarray[$key]->generation = $this->generation;
-					}
-				}
-				$genCounter++;
-			}
-			$this->list = $newarray;
-			break;
-		default:
-			// unsorted
-			break;
-		}
-		array_push($this->repeats_stack, array($this->repeats, $this->repeat_bytes));
-		$this->repeat_bytes = xml_get_current_line_number($this->parser) + 1;
-	}
-
-	/**
-	 * XML </ Relatives>
-	 */
-	private function relativesEndHandler() {
-		global $report, $WT_TREE;
-
-		$this->process_repeats--;
-		if ($this->process_repeats > 0) {
-			return;
-		}
-
-		// Check if there is any relatives
-		if (count($this->list) > 0) {
-			$lineoffset = 0;
-			foreach ($this->repeats_stack as $rep) {
-				$lineoffset += $rep[1];
-			}
-			//-- read the xml from the file
-			$lines = file($report);
-			while ((strpos($lines[$lineoffset + $this->repeat_bytes], "<Relatives") === false) && (($lineoffset + $this->repeat_bytes) > 0)) {
-				$lineoffset--;
-			}
-			$lineoffset++;
-			$reportxml = "<tempdoc>\n";
-			$line_nr   = $lineoffset + $this->repeat_bytes;
-			// Relatives Level counter
-			$count = 1;
-			while (0 < $count) {
-				if (strpos($lines[$line_nr], "<Relatives") !== false) {
-					$count++;
-				} elseif (strpos($lines[$line_nr], "</Relatives") !== false) {
-					$count--;
-				}
-				if (0 < $count) {
-					$reportxml .= $lines[$line_nr];
-				}
-				$line_nr++;
-			}
-			// No need to drag this
-			unset($lines);
-			$reportxml .= "</tempdoc>\n";
-			// Save original values
-			array_push($this->parser_stack, $this->parser);
-			$oldgedrec = $this->gedrec;
-
-			$this->list_total   = count($this->list);
-			$this->list_private = 0;
-			foreach ($this->list as $key => $value) {
-				if (isset($value->generation)) {
-					$this->generation = $value->generation;
-				}
-				$tmp          = GedcomRecord::getInstance($key, $WT_TREE);
-				$this->gedrec = $tmp->privatizeGedcom(Auth::accessLevel($WT_TREE));
-
-				$repeat_parser = xml_parser_create();
-				$this->parser  = $repeat_parser;
-				xml_parser_set_option($repeat_parser, XML_OPTION_CASE_FOLDING, false);
-				xml_set_element_handler($repeat_parser, array($this, 'startElement'), array($this, 'endElement'));
-				xml_set_character_data_handler($repeat_parser, array($this, 'characterData'));
-
-				if (!xml_parse($repeat_parser, $reportxml, true)) {
-					throw new \DomainException(sprintf("RelativesEHandler XML error: %s at line %d", xml_error_string(xml_get_error_code($repeat_parser)), xml_get_current_line_number($repeat_parser)));
-				}
-				xml_parser_free($repeat_parser);
-			}
-			// Clean up the list array
-			$this->list   = array();
-			$this->parser = array_pop($this->parser_stack);
-			$this->gedrec = $oldgedrec;
-		}
-		list($this->repeats, $this->repeat_bytes) = array_pop($this->repeats_stack);
-	}
-
-	/**
-	 * XML <Generation /> element handler
-	 *
-	 * Prints the number of generations
-	 */
-	private function generationStartHandler() {
-		$this->current_element->addText($this->generation);
-	}
-
-	/**
-	 * XML <NewPage /> element handler
-	 *
-	 * Has to be placed in an element (header, pageheader, body or footer)
-	 */
-	private function newPageStartHandler() {
-		$temp = "addpage";
-		$this->wt_report->addElement($temp);
-	}
-
-	/**
-	 * XML <html>
-	 *
-	 * @param string  $tag   HTML tag name
-	 * @param array[] $attrs an array of key value pairs for the attributes
-	 */
-	private function htmlStartHandler($tag, $attrs) {
-		if ($tag === "tempdoc") {
-			return;
-		}
-		array_push($this->wt_report_stack, $this->wt_report);
-		$this->wt_report       = $this->report_root->createHTML($tag, $attrs);
-		$this->current_element = $this->wt_report;
-
-		array_push($this->print_data_stack, $this->print_data);
-		$this->print_data = true;
-	}
-
-	/**
-	 * XML </html>
-	 *
-	 * @param string $tag
-	 */
-	private function htmlEndHandler($tag) {
-		if ($tag === "tempdoc") {
-			return;
-		}
-
-		$this->print_data      = array_pop($this->print_data_stack);
-		$this->current_element = $this->wt_report;
-		$this->wt_report       = array_pop($this->wt_report_stack);
-		if (!is_null($this->wt_report)) {
-			$this->wt_report->addElement($this->current_element);
-		} else {
-			$this->wt_report = $this->current_element;
-		}
-	}
-
-	/**
-	 * Handle <Input>
-	 */
-	private function inputStartHandler() {
-		// Dummy function, to prevent the default HtmlStartHandler() being called
-	}
-
-	/**
-	 * Handle </Input>
-	 */
-	private function inputEndHandler() {
-		// Dummy function, to prevent the default HtmlEndHandler() being called
-	}
-
-	/**
-	 * Handle <Report>
-	 */
-	private function reportStartHandler() {
-		// Dummy function, to prevent the default HtmlStartHandler() being called
-	}
-
-	/**
-	 * Handle </Report>
-	 */
-	private function reportEndHandler() {
-		// Dummy function, to prevent the default HtmlEndHandler() being called
-	}
-
-	/**
-	 * XML </titleEndHandler>
-	 */
-	private function titleEndHandler() {
-		$this->report_root->addTitle($this->text);
-	}
-
-	/**
-	 * XML </descriptionEndHandler>
-	 */
-	private function descriptionEndHandler() {
-		$this->report_root->addDescription($this->text);
-	}
-
-	/**
-	 * Create a list of all descendants.
-	 *
-	 * @param string[] $list
-	 * @param string   $pid
-	 * @param bool  $parents
-	 * @param int  $generations
-	 */
-	private function addDescendancy(&$list, $pid, $parents = false, $generations = -1) {
-		global $WT_TREE;
-
-		$person = Individual::getInstance($pid, $WT_TREE);
-		if ($person === null) {
-			return;
-		}
-		if (!isset($list[$pid])) {
-			$list[$pid] = $person;
-		}
-		if (!isset($list[$pid]->generation)) {
-			$list[$pid]->generation = 0;
-		}
-		foreach ($person->getSpouseFamilies() as $family) {
-			if ($parents) {
-				$husband = $family->getHusband();
-				$wife    = $family->getWife();
-				if ($husband) {
-					$list[$husband->getXref()] = $husband;
-					if (isset($list[$pid]->generation)) {
-						$list[$husband->getXref()]->generation = $list[$pid]->generation - 1;
-					} else {
-						$list[$husband->getXref()]->generation = 1;
-					}
-				}
-				if ($wife) {
-					$list[$wife->getXref()] = $wife;
-					if (isset($list[$pid]->generation)) {
-						$list[$wife->getXref()]->generation = $list[$pid]->generation - 1;
-					} else {
-						$list[$wife->getXref()]->generation = 1;
-					}
-				}
-			}
-			$children = $family->getChildren();
-			foreach ($children as $child) {
-				if ($child) {
-					$list[$child->getXref()] = $child;
-					if (isset($list[$pid]->generation)) {
-						$list[$child->getXref()]->generation = $list[$pid]->generation + 1;
-					} else {
-						$list[$child->getXref()]->generation = 2;
-					}
-				}
-			}
-			if ($generations == -1 || $list[$pid]->generation + 1 < $generations) {
-				foreach ($children as $child) {
-					$this->addDescendancy($list, $child->getXref(), $parents, $generations); // recurse on the childs family
-				}
-			}
-		}
-	}
-
-	/**
-	 * Create a list of all ancestors.
-	 *
-	 * @param string[] $list
-	 * @param string   $pid
-	 * @param bool  $children
-	 * @param int  $generations
-	 */
-	private function addAncestors(&$list, $pid, $children = false, $generations = -1) {
-		global $WT_TREE;
-
-		$genlist                = array($pid);
-		$list[$pid]->generation = 1;
-		while (count($genlist) > 0) {
-			$id = array_shift($genlist);
-			if (strpos($id, 'empty') === 0) {
-				continue; // id can be something like “empty7”
-			}
-			$person = Individual::getInstance($id, $WT_TREE);
-			foreach ($person->getChildFamilies() as $family) {
-				$husband = $family->getHusband();
-				$wife    = $family->getWife();
-				if ($husband) {
-					$list[$husband->getXref()]             = $husband;
-					$list[$husband->getXref()]->generation = $list[$id]->generation + 1;
-				}
-				if ($wife) {
-					$list[$wife->getXref()]             = $wife;
-					$list[$wife->getXref()]->generation = $list[$id]->generation + 1;
-				}
-				if ($generations == -1 || $list[$id]->generation + 1 < $generations) {
-					if ($husband) {
-						array_push($genlist, $husband->getXref());
-					}
-					if ($wife) {
-						array_push($genlist, $wife->getXref());
-					}
-				}
-				if ($children) {
-					foreach ($family->getChildren() as $child) {
-						$list[$child->getXref()] = $child;
-						if (isset($list[$id]->generation)) {
-							$list[$child->getXref()]->generation = $list[$id]->generation;
-						} else {
-							$list[$child->getXref()]->generation = 1;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * get gedcom tag value
-	 *
-	 * @param string  $tag    The tag to find, use : to delineate subtags
-	 * @param int $level  The gedcom line level of the first tag to find, setting level to 0 will cause it to use 1+ the level of the incoming record
-	 * @param string  $gedrec The gedcom record to get the value from
-	 *
-	 * @return string the value of a gedcom tag from the given gedcom record
-	 */
-	private function getGedcomValue($tag, $level, $gedrec) {
-		global $WT_TREE;
-
-		if (empty($gedrec)) {
-			return '';
-		}
-		$tags      = explode(':', $tag);
-		$origlevel = $level;
-		if ($level == 0) {
-			$level = $gedrec{0} + 1;
-		}
-
-		$subrec = $gedrec;
-		foreach ($tags as $t) {
-			$lastsubrec = $subrec;
-			$subrec     = Functions::getSubRecord($level, "$level $t", $subrec);
-			if (empty($subrec) && $origlevel == 0) {
-				$level--;
-				$subrec = Functions::getSubRecord($level, "$level $t", $lastsubrec);
-			}
-			if (empty($subrec)) {
-				if ($t == "TITL") {
-					$subrec = Functions::getSubRecord($level, "$level ABBR", $lastsubrec);
-					if (!empty($subrec)) {
-						$t = "ABBR";
-					}
-				}
-				if (empty($subrec)) {
-					if ($level > 0) {
-						$level--;
-					}
-					$subrec = Functions::getSubRecord($level, "@ $t", $gedrec);
-					if (empty($subrec)) {
-						return '';
-					}
-				}
-			}
-			$level++;
-		}
-		$level--;
-		$ct = preg_match("/$level $t(.*)/", $subrec, $match);
-		if ($ct == 0) {
-			$ct = preg_match("/$level @.+@ (.+)/", $subrec, $match);
-		}
-		if ($ct == 0) {
-			$ct = preg_match("/@ $t (.+)/", $subrec, $match);
-		}
-		if ($ct > 0) {
-			$value = trim($match[1]);
-			if ($t == 'NOTE' && preg_match('/^@(.+)@$/', $value, $match)) {
-				$note = Note::getInstance($match[1], $WT_TREE);
-				if ($note) {
-					$value = $note->getNote();
-				} else {
-					//-- set the value to the id without the @
-					$value = $match[1];
-				}
-			}
-			if ($level != 0 || $t != "NOTE") {
-				$value .= Functions::getCont($level + 1, $subrec);
-			}
-
-			return $value;
-		}
-
-		return "";
-	}
-
-	/**
-	 * Replace variable identifiers with their values.
-	 *
-	 * @param string $expression An expression such as "$foo == 123"
-	 * @param bool   $quote      Whether to add quotation marks
-	 *
-	 * @return string
-	 */
-	private function substituteVars($expression, $quote) {
-		$that = $this; // PHP5.3 cannot access $this inside a closure
-		return preg_replace_callback(
-			'/\$(\w+)/',
-			function ($matches) use ($that, $quote) {
-				if (isset($that->vars[$matches[1]]['id'])) {
-					if ($quote) {
-						return "'" . addcslashes($that->vars[$matches[1]]['id'], "'") . "'";
-					} else {
-						return $that->vars[$matches[1]]['id'];
-					}
-				} else {
-					Log::addErrorLog(sprintf('Undefined variable $%s in report', $matches[1]));
-
-					return '$' . $matches[1];
-				}
-			},
-			$expression
-		);
-	}
+    /** @var int Are we processing repeats*/
+    private $process_repeats = 0;
+
+    /** @var int Quantity of data to repeat during loops */
+    private $repeat_bytes = 0;
+
+    /** @var array[] Repeated data when iterating over loops */
+    private $repeats = array();
+
+    /** @var array[] Nested repeating data */
+    private $repeats_stack = array();
+
+    /** @var ReportBase[] Nested repeating data */
+    private $wt_report_stack = array();
+
+    /** @var resource Nested repeating data */
+    private $parser;
+
+    /** @var resource[] Nested repeating data */
+    private $parser_stack = array();
+
+    /** @var string The current GEDCOM record */
+    private $gedrec = '';
+
+    /** @var string[] Nested GEDCOM records */
+    private $gedrec_stack = array();
+
+    /** @var ReportBaseElement The currently processed element */
+    private $current_element;
+
+    /** @var ReportBaseElement The currently processed element */
+    private $footnote_element;
+
+    /** @var string The GEDCOM fact currently being processed */
+    private $fact = '';
+
+    /** @var string The GEDCOM value currently being processed */
+    private $desc = '';
+
+    /** @var string The GEDCOM type currently being processed */
+    private $type = '';
+
+    /** @var int The current generational level */
+    private $generation = 1;
+
+    /** @var array Source data for processing lists */
+    private $list = array();
+
+    /** @var int Number of items in lists */
+    private $list_total = 0;
+
+    /** @var int Number of items filtered from lists */
+    private $list_private = 0;
+
+    /** @var ReportBase A factory for creating report elements */
+    private $report_root;
+
+    /** @var ReportBase Nested report elements */
+    private $wt_report;
+
+    /** @todo This attribute is public to support the PHP5.3 closure workaround. */
+    /** @var string[][] Variables defined in the report at run-time */
+    public $vars;
+
+    /**
+     * Create a parser for a report
+     *
+     * @param string     $report     The XML filename
+     * @param ReportBase $report_root
+     * @param string[][] $vars
+     */
+    public function __construct($report, ReportBase $report_root = null, array $vars = array()) {
+        $this->report_root     = $report_root;
+        $this->wt_report       = $report_root;
+        $this->current_element = new ReportBaseElement;
+        $this->vars            = $vars;
+        parent::__construct($report);
+    }
+
+    /**
+     * XML start element handler
+     *
+     * This function is called whenever a starting element is reached
+     * The element handler will be called if found, otherwise it must be HTML
+     *
+     * @param resource $parser the resource handler for the XML parser
+     * @param string   $name   the name of the XML element parsed
+     * @param array    $attrs  an array of key value pairs for the attributes
+     */
+    protected function startElement($parser, $name, $attrs) {
+        $newattrs = array();
+
+        foreach ($attrs as $key => $value) {
+            if (preg_match("/^\\$(\w+)$/", $value, $match)) {
+                if ((isset($this->vars[$match[1]]['id'])) && (!isset($this->vars[$match[1]]['gedcom']))) {
+                    $value = $this->vars[$match[1]]['id'];
+                }
+            }
+            $newattrs[$key] = $value;
+        }
+        $attrs = $newattrs;
+        if ($this->process_footnote && ($this->process_ifs === 0 || $name === "if") && ($this->process_gedcoms === 0 || $name === "Gedcom") && ($this->process_repeats === 0 || $name === "Facts" || $name === "RepeatTag")) {
+            $start_method = $name . 'StartHandler';
+            $end_method   = $name . 'EndHandler';
+            if (method_exists($this, $start_method)) {
+                $this->$start_method($attrs);
+            } elseif (!method_exists($this, $end_method)) {
+                $this->htmlStartHandler($name, $attrs);
+            }
+        }
+    }
+
+    /**
+     * XML end element handler
+     *
+     * This function is called whenever an ending element is reached
+     * The element handler will be called if found, otherwise it must be HTML
+     *
+     * @param resource $parser the resource handler for the XML parser
+     * @param string   $name   the name of the XML element parsed
+     */
+    protected function endElement($parser, $name) {
+        if (($this->process_footnote || $name === "Footnote") && ($this->process_ifs === 0 || $name === "if") && ($this->process_gedcoms === 0 || $name === "Gedcom") && ($this->process_repeats === 0 || $name === "Facts" || $name === "RepeatTag" || $name === "List" || $name === "Relatives")) {
+            $start_method = $name . 'StartHandler';
+            $end_method   = $name . 'EndHandler';
+            if (method_exists($this, $end_method)) {
+                $this->$end_method();
+            } elseif (!method_exists($this, $start_method)) {
+                $this->htmlEndHandler($name);
+            }
+        }
+    }
+
+    /**
+     * XML character data handler
+     *
+     * @param resource $parser the resource handler for the XML parser
+     * @param string   $data   the name of the XML element parsed
+     */
+    protected function characterData($parser, $data) {
+        if ($this->print_data && $this->process_gedcoms === 0 && $this->process_ifs === 0 && $this->process_repeats === 0) {
+            $this->current_element->addText($data);
+        }
+    }
+
+    /**
+     * XML <style>
+     *
+     * @param array $attrs an array of key value pairs for the attributes
+     */
+    private function styleStartHandler($attrs) {
+        if (empty($attrs['name'])) {
+            throw new \DomainException('REPORT ERROR Style: The "name" of the style is missing or not set in the XML file.');
+        }
+
+        // array Style that will be passed on
+        $s = array();
+
+        // string Name af the style
+        $s['name'] = $attrs['name'];
+
+        // string Name of the DEFAULT font
+        $s['font'] = $this->wt_report->defaultFont;
+        if (!empty($attrs['font'])) {
+            $s['font'] = $attrs['font'];
+        }
+
+        // int The size of the font in points
+        $s['size'] = $this->wt_report->defaultFontSize;
+        if (!empty($attrs['size'])) {
+            $s['size'] = (int) $attrs['size'];
+        } // Get it as int to ignore all decimal points or text (if any text then int(0))
+
+        // string B: bold, I: italic, U: underline, D: line trough, The default value is regular.
+        $s['style'] = "";
+        if (!empty($attrs['style'])) {
+            $s['style'] = $attrs['style'];
+        }
+
+        $this->wt_report->addStyle($s);
+    }
+
+    /**
+     * XML <Doc>
+     *
+     * Sets up the basics of the document proparties
+     *
+     * @param array $attrs an array of key value pairs for the attributes
+     */
+    private function docStartHandler($attrs) {
+        $this->parser = $this->xml_parser;
+
+        // Custom page width
+        if (!empty($attrs['customwidth'])) {
+            $this->wt_report->pagew = (int) $attrs['customwidth'];
+        } // Get it as int to ignore all decimal points or text (if any text then int(0))
+        // Custom Page height
+        if (!empty($attrs['customheight'])) {
+            $this->wt_report->pageh = (int) $attrs['customheight'];
+        } // Get it as int to ignore all decimal points or text (if any text then int(0))
+
+        // Left Margin
+        if (isset($attrs['leftmargin'])) {
+            if ($attrs['leftmargin'] === "0") {
+                $this->wt_report->leftmargin = 0;
+            } elseif (!empty($attrs['leftmargin'])) {
+                $this->wt_report->leftmargin = (int) $attrs['leftmargin']; // Get it as int to ignore all decimal points or text (if any text then int(0))
+            }
+        }
+        // Right Margin
+        if (isset($attrs['rightmargin'])) {
+            if ($attrs['rightmargin'] === "0") {
+                $this->wt_report->rightmargin = 0;
+            } elseif (!empty($attrs['rightmargin'])) {
+                $this->wt_report->rightmargin = (int) $attrs['rightmargin']; // Get it as int to ignore all decimal points or text (if any text then int(0))
+            }
+        }
+        // Top Margin
+        if (isset($attrs['topmargin'])) {
+            if ($attrs['topmargin'] === "0") {
+                $this->wt_report->topmargin = 0;
+            } elseif (!empty($attrs['topmargin'])) {
+                $this->wt_report->topmargin = (int) $attrs['topmargin']; // Get it as int to ignore all decimal points or text (if any text then int(0))
+            }
+        }
+        // Bottom Margin
+        if (isset($attrs['bottommargin'])) {
+            if ($attrs['bottommargin'] === "0") {
+                $this->wt_report->bottommargin = 0;
+            } elseif (!empty($attrs['bottommargin'])) {
+                $this->wt_report->bottommargin = (int) $attrs['bottommargin']; // Get it as int to ignore all decimal points or text (if any text then int(0))
+            }
+        }
+        // Header Margin
+        if (isset($attrs['headermargin'])) {
+            if ($attrs['headermargin'] === "0") {
+                $this->wt_report->headermargin = 0;
+            } elseif (!empty($attrs['headermargin'])) {
+                $this->wt_report->headermargin = (int) $attrs['headermargin']; // Get it as int to ignore all decimal points or text (if any text then int(0))
+            }
+        }
+        // Footer Margin
+        if (isset($attrs['footermargin'])) {
+            if ($attrs['footermargin'] === "0") {
+                $this->wt_report->footermargin = 0;
+            } elseif (!empty($attrs['footermargin'])) {
+                $this->wt_report->footermargin = (int) $attrs['footermargin']; // Get it as int to ignore all decimal points or text (if any text then int(0))
+            }
+        }
+
+        // Page Orientation
+        if (!empty($attrs['orientation'])) {
+            if ($attrs['orientation'] == "landscape") {
+                $this->wt_report->orientation = "landscape";
+            } elseif ($attrs['orientation'] == "portrait") {
+                $this->wt_report->orientation = "portrait";
+            }
+        }
+        // Page Size
+        if (!empty($attrs['pageSize'])) {
+            $this->wt_report->pageFormat = strtoupper($attrs['pageSize']);
+        }
+
+        // Show Generated By...
+        if (isset($attrs['showGeneratedBy'])) {
+            if ($attrs['showGeneratedBy'] === "0") {
+                $this->wt_report->showGenText = false;
+            } elseif ($attrs['showGeneratedBy'] === "1") {
+                $this->wt_report->showGenText = true;
+            }
+        }
+
+        $this->wt_report->setup();
+    }
+
+    /**
+     * XML </Doc>
+     */
+    private function docEndHandler() {
+        $this->wt_report->run();
+    }
+
+    /**
+     * XML <Header>
+     */
+    private function headerStartHandler() {
+        // Clear the Header before any new elements are added
+        $this->wt_report->clearHeader();
+        $this->wt_report->setProcessing("H");
+    }
+
+    /**
+     * XML <PageHeader>
+     */
+    private function pageHeaderStartHandler() {
+        array_push($this->print_data_stack, $this->print_data);
+        $this->print_data = false;
+        array_push($this->wt_report_stack, $this->wt_report);
+        $this->wt_report = $this->report_root->createPageHeader();
+    }
+
+    /**
+     * XML <pageHeaderEndHandler>
+     */
+    private function pageHeaderEndHandler() {
+        $this->print_data        = array_pop($this->print_data_stack);
+        $this->current_element   = $this->wt_report;
+        $this->wt_report         = array_pop($this->wt_report_stack);
+        $this->wt_report->addElement($this->current_element);
+    }
+
+    /**
+     * XML <bodyStartHandler>
+     */
+    private function bodyStartHandler() {
+        $this->wt_report->setProcessing("B");
+    }
+
+    /**
+     * XML <footerStartHandler>
+     */
+    private function footerStartHandler() {
+        $this->wt_report->setProcessing("F");
+    }
+
+    /**
+     * XML <Cell>
+     *
+     * @param array $attrs an array of key value pairs for the attributes
+     */
+    private function cellStartHandler($attrs) {
+        // string The text alignment of the text in this box.
+        $align = "";
+        if (!empty($attrs['align'])) {
+            $align = $attrs['align'];
+            // RTL supported left/right alignment
+            if ($align == "rightrtl") {
+                if ($this->wt_report->rtl) {
+                    $align = "left";
+                } else {
+                    $align = "right";
+                }
+            } elseif ($align == "leftrtl") {
+                if ($this->wt_report->rtl) {
+                    $align = "right";
+                } else {
+                    $align = "left";
+                }
+            }
+        }
+
+        // string The color to fill the background of this cell
+        $bgcolor = "";
+        if (!empty($attrs['bgcolor'])) {
+            $bgcolor = $attrs['bgcolor'];
+        }
+
+        // int Whether or not the background should be painted
+        $fill = 1;
+        if (isset($attrs['fill'])) {
+            if ($attrs['fill'] === "0") {
+                $fill = 0;
+            } elseif ($attrs['fill'] === "1") {
+                $fill = 1;
+            }
+        }
+
+        $reseth = true;
+        // boolean   if true reset the last cell height (default true)
+        if (isset($attrs['reseth'])) {
+            if ($attrs['reseth'] === "0") {
+                $reseth = false;
+            } elseif ($attrs['reseth'] === "1") {
+                $reseth = true;
+            }
+        }
+
+        // mixed Whether or not a border should be printed around this box
+        $border = 0;
+        if (!empty($attrs['border'])) {
+            $border = $attrs['border'];
+        }
+        // string Border color in HTML code
+        $bocolor = "";
+        if (!empty($attrs['bocolor'])) {
+            $bocolor = $attrs['bocolor'];
+        }
+
+        // int Cell height (expressed in points) The starting height of this cell. If the text wraps the height will automatically be adjusted.
+        $height = 0;
+        if (!empty($attrs['height'])) {
+            $height = (int) $attrs['height'];
+        }
+        // int Cell width (expressed in points) Setting the width to 0 will make it the width from the current location to the right margin.
+        $width = 0;
+        if (!empty($attrs['width'])) {
+            $width = (int) $attrs['width'];
+        }
+
+        // int Stretch carachter mode
+        $stretch = 0;
+        if (!empty($attrs['stretch'])) {
+            $stretch = (int) $attrs['stretch'];
+        }
+
+        // mixed Position the left corner of this box on the page. The default is the current position.
+        $left = ".";
+        if (isset($attrs['left'])) {
+            if ($attrs['left'] === ".") {
+                $left = ".";
+            } elseif (!empty($attrs['left'])) {
+                $left = (int) $attrs['left'];
+            } elseif ($attrs['left'] === "0") {
+                $left = 0;
+            }
+        }
+        // mixed Position the top corner of this box on the page. the default is the current position
+        $top = ".";
+        if (isset($attrs['top'])) {
+            if ($attrs['top'] === ".") {
+                $top = ".";
+            } elseif (!empty($attrs['top'])) {
+                $top = (int) $attrs['top'];
+            } elseif ($attrs['top'] === "0") {
+                $top = 0;
+            }
+        }
+
+        // string The name of the Style that should be used to render the text.
+        $style = "";
+        if (!empty($attrs['style'])) {
+            $style = $attrs['style'];
+        }
+
+        // string Text color in html code
+        $tcolor = "";
+        if (!empty($attrs['tcolor'])) {
+            $tcolor = $attrs['tcolor'];
+        }
+
+        // int Indicates where the current position should go after the call.
+        $ln = 0;
+        if (isset($attrs['newline'])) {
+            if (!empty($attrs['newline'])) {
+                $ln = (int) $attrs['newline'];
+            } elseif ($attrs['newline'] === "0") {
+                $ln = 0;
+            }
+        }
+
+        if ($align == "left") {
+            $align = "L";
+        } elseif ($align == "right") {
+            $align = "R";
+        } elseif ($align == "center") {
+            $align = "C";
+        } elseif ($align == "justify") {
+            $align = "J";
+        }
+
+        array_push($this->print_data_stack, $this->print_data);
+        $this->print_data = true;
+
+        $this->current_element = $this->report_root->createCell(
+            $width,
+            $height,
+            $border,
+            $align,
+            $bgcolor,
+            $style,
+            $ln,
+            $top,
+            $left,
+            $fill,
+            $stretch,
+            $bocolor,
+            $tcolor,
+            $reseth
+        );
+    }
+
+    /**
+     * XML </Cell>
+     */
+    private function cellEndHandler() {
+        $this->print_data = array_pop($this->print_data_stack);
+        $this->wt_report->addElement($this->current_element);
+    }
+
+    /**
+     * XML <Now /> element handler
+     */
+    private function nowStartHandler() {
+        $g = FunctionsDate::timestampToGedcomDate(WT_TIMESTAMP + WT_TIMESTAMP_OFFSET);
+        $this->current_element->addText($g->display());
+    }
+
+    /**
+     * XML <PageNum /> element handler
+     */
+    private function pageNumStartHandler() {
+        $this->current_element->addText("#PAGENUM#");
+    }
+
+    /**
+     * XML <TotalPages /> element handler
+     */
+    private function totalPagesStartHandler() {
+        $this->current_element->addText("{{:ptp:}}");
+    }
+
+    /**
+     * Called at the start of an element.
+     *
+     * @param array $attrs an array of key value pairs for the attributes
+     */
+    private function gedcomStartHandler($attrs) {
+        global $WT_TREE;
+
+        if ($this->process_gedcoms > 0) {
+            $this->process_gedcoms++;
+
+            return;
+        }
+
+        $tag       = $attrs['id'];
+        $tag       = str_replace("@fact", $this->fact, $tag);
+        $tags      = explode(":", $tag);
+        $newgedrec = '';
+        if (count($tags) < 2) {
+            $tmp       = GedcomRecord::getInstance($attrs['id'], $WT_TREE);
+            $newgedrec = $tmp ? $tmp->privatizeGedcom(Auth::accessLevel($WT_TREE)) : '';
+        }
+        if (empty($newgedrec)) {
+            $tgedrec   = $this->gedrec;
+            $newgedrec = '';
+            foreach ($tags as $tag) {
+                if (preg_match("/\\$(.+)/", $tag, $match)) {
+                    if (isset($this->vars[$match[1]]['gedcom'])) {
+                        $newgedrec = $this->vars[$match[1]]['gedcom'];
+                    } else {
+                        $tmp       = GedcomRecord::getInstance($match[1], $WT_TREE);
+                        $newgedrec = $tmp ? $tmp->privatizeGedcom(Auth::accessLevel($WT_TREE)) : '';
+                    }
+                } else {
+                    if (preg_match("/@(.+)/", $tag, $match)) {
+                        $gmatch = array();
+                        if (preg_match("/\d $match[1] @([^@]+)@/", $tgedrec, $gmatch)) {
+                            $tmp       = GedcomRecord::getInstance($gmatch[1], $WT_TREE);
+                            $newgedrec = $tmp ? $tmp->privatizeGedcom(Auth::accessLevel($WT_TREE)) : '';
+                            $tgedrec   = $newgedrec;
+                        } else {
+                            $newgedrec = '';
+                            break;
+                        }
+                    } else {
+                        $temp      = explode(" ", trim($tgedrec));
+                        $level     = $temp[0] + 1;
+                        $newgedrec = Functions::getSubRecord($level, "$level $tag", $tgedrec);
+                        $tgedrec   = $newgedrec;
+                    }
+                }
+            }
+        }
+        if (!empty($newgedrec)) {
+            array_push($this->gedrec_stack, array($this->gedrec, $this->fact, $this->desc));
+            $this->gedrec = $newgedrec;
+            if (preg_match("/(\d+) (_?[A-Z0-9]+) (.*)/", $this->gedrec, $match)) {
+                $this->fact = $match[2];
+                $this->desc = trim($match[3]);
+            }
+        } else {
+            $this->process_gedcoms++;
+        }
+    }
+
+    /**
+     * Called at the end of an element.
+     */
+    private function gedcomEndHandler() {
+        if ($this->process_gedcoms > 0) {
+            $this->process_gedcoms--;
+        } else {
+            list($this->gedrec, $this->fact, $this->desc) = array_pop($this->gedrec_stack);
+        }
+    }
+
+    /**
+     * XML <textBoxStartHandler>
+     *
+     * @param array $attrs an array of key value pairs for the attributes
+     */
+    private function textBoxStartHandler($attrs) {
+        // string Background color code
+        $bgcolor = "";
+        if (!empty($attrs['bgcolor'])) {
+            $bgcolor = $attrs['bgcolor'];
+        }
+
+        // boolean Wether or not fill the background color
+        $fill = true;
+        if (isset($attrs['fill'])) {
+            if ($attrs['fill'] === "0") {
+                $fill = false;
+            } elseif ($attrs['fill'] === "1") {
+                $fill = true;
+            }
+        }
+
+        // var boolean Whether or not a border should be printed around this box. 0 = no border, 1 = border. Default is 0
+        $border = false;
+        if (isset($attrs['border'])) {
+            if ($attrs['border'] === "1") {
+                $border = true;
+            } elseif ($attrs['border'] === "0") {
+                $border = false;
+            }
+        }
+
+        // int The starting height of this cell. If the text wraps the height will automatically be adjusted
+        $height = 0;
+        if (!empty($attrs['height'])) {
+            $height = (int) $attrs['height'];
+        }
+        // int Setting the width to 0 will make it the width from the current location to the margin
+        $width = 0;
+        if (!empty($attrs['width'])) {
+            $width = (int) $attrs['width'];
+        }
+
+        // mixed Position the left corner of this box on the page. The default is the current position.
+        $left = ".";
+        if (isset($attrs['left'])) {
+            if ($attrs['left'] === ".") {
+                $left = ".";
+            } elseif (!empty($attrs['left'])) {
+                $left = (int) $attrs['left'];
+            } elseif ($attrs['left'] === "0") {
+                $left = 0;
+            }
+        }
+        // mixed Position the top corner of this box on the page. the default is the current position
+        $top = ".";
+        if (isset($attrs['top'])) {
+            if ($attrs['top'] === ".") {
+                $top = ".";
+            } elseif (!empty($attrs['top'])) {
+                $top = (int) $attrs['top'];
+            } elseif ($attrs['top'] === "0") {
+                $top = 0;
+            }
+        }
+        // boolean After this box is finished rendering, should the next section of text start immediately after the this box or should it start on a new line under this box. 0 = no new line, 1 = force new line. Default is 0
+        $newline = false;
+        if (isset($attrs['newline'])) {
+            if ($attrs['newline'] === "1") {
+                $newline = true;
+            } elseif ($attrs['newline'] === "0") {
+                $newline = false;
+            }
+        }
+        // boolean
+        $pagecheck = true;
+        if (isset($attrs['pagecheck'])) {
+            if ($attrs['pagecheck'] === "0") {
+                $pagecheck = false;
+            } elseif ($attrs['pagecheck'] === "1") {
+                $pagecheck = true;
+            }
+        }
+        // boolean Cell padding
+        $padding = true;
+        if (isset($attrs['padding'])) {
+            if ($attrs['padding'] === "0") {
+                $padding = false;
+            } elseif ($attrs['padding'] === "1") {
+                $padding = true;
+            }
+        }
+        // boolean Reset this box Height
+        $reseth = false;
+        if (isset($attrs['reseth'])) {
+            if ($attrs['reseth'] === "1") {
+                $reseth = true;
+            } elseif ($attrs['reseth'] === "0") {
+                $reseth = false;
+            }
+        }
+
+        // string Style of rendering
+        $style = "";
+
+        array_push($this->print_data_stack, $this->print_data);
+        $this->print_data = false;
+
+        array_push($this->wt_report_stack, $this->wt_report);
+        $this->wt_report = $this->report_root->createTextBox(
+            $width,
+            $height,
+            $border,
+            $bgcolor,
+            $newline,
+            $left,
+            $top,
+            $pagecheck,
+            $style,
+            $fill,
+            $padding,
+            $reseth
+        );
+    }
+
+    /**
+     * XML <textBoxEndHandler>
+     */
+    private function textBoxEndHandler() {
+        $this->print_data      = array_pop($this->print_data_stack);
+        $this->current_element = $this->wt_report;
+        $this->wt_report       = array_pop($this->wt_report_stack);
+        $this->wt_report->addElement($this->current_element);
+    }
+
+    /**
+     * XLM <Text>.
+     *
+     * @param array $attrs an array of key value pairs for the attributes
+     */
+    private function textStartHandler($attrs) {
+        array_push($this->print_data_stack, $this->print_data);
+        $this->print_data = true;
+
+        // string The name of the Style that should be used to render the text.
+        $style = "";
+        if (!empty($attrs['style'])) {
+            $style = $attrs['style'];
+        }
+
+        // string  The color of the text - Keep the black color as default
+        $color = "";
+        if (!empty($attrs['color'])) {
+            $color = $attrs['color'];
+        }
+
+        $this->current_element = $this->report_root->createText($style, $color);
+    }
+
+    /**
+     * XML </Text>
+     */
+    private function textEndHandler() {
+        $this->print_data = array_pop($this->print_data_stack);
+        $this->wt_report->addElement($this->current_element);
+    }
+
+    /**
+     * XML <GetPersonName/>
+     *
+     * Get the name
+     * 1. id is empty - current GEDCOM record
+     * 2. id is set with a record id
+     *
+     * @param array $attrs an array of key value pairs for the attributes
+     */
+    private function getPersonNameStartHandler($attrs) {
+        global $WT_TREE;
+
+        $id    = "";
+        $match = array();
+        if (empty($attrs['id'])) {
+            if (preg_match("/0 @(.+)@/", $this->gedrec, $match)) {
+                $id = $match[1];
+            }
+        } else {
+            if (preg_match("/\\$(.+)/", $attrs['id'], $match)) {
+                if (isset($this->vars[$match[1]]['id'])) {
+                    $id = $this->vars[$match[1]]['id'];
+                }
+            } else {
+                if (preg_match("/@(.+)/", $attrs['id'], $match)) {
+                    $gmatch = array();
+                    if (preg_match("/\d $match[1] @([^@]+)@/", $this->gedrec, $gmatch)) {
+                        $id = $gmatch[1];
+                    }
+                } else {
+                    $id = $attrs['id'];
+                }
+            }
+        }
+        if (!empty($id)) {
+            $record = GedcomRecord::getInstance($id, $WT_TREE);
+            if (is_null($record)) {
+                return;
+            }
+            if (!$record->canShowName()) {
+                $this->current_element->addText(I18N::translate('Private'));
+            } else {
+                $name = $record->getFullName();
+                $name = preg_replace(
+                    array('/<span class="starredname">/', '/<\/span><\/span>/', '/<\/span>/'),
+                    array('«', '', '»'),
+                    $name
+                );
+                $name = strip_tags($name);
+                if (!empty($attrs['truncate'])) {
+                    if (mb_strlen($name) > $attrs['truncate']) {
+                        $name  = preg_replace("/\(.*\) ?/", '', $name); //removes () and text inbetween - what about ", [ and { etc?
+                        $words = preg_split('/[, -]+/', $name); // names separated with space, comma or hyphen - any others?
+                        $name  = $words[count($words) - 1];
+                        for ($i = count($words) - 2; $i >= 0; $i--) {
+                            $len = mb_strlen($name);
+                            for ($j = count($words) - 3; $j >= 0; $j--) {
+                                $len += mb_strlen($words[$j]);
+                            }
+                            if ($len > $attrs['truncate']) {
+                                $first_letter = mb_substr($words[$i], 0, 1);
+                                // Do not show " of nick-names
+                                if ($first_letter != "\"") {
+                                    $name = mb_substr($words[$i], 0, 1) . '. ' . $name;
+                                }
+                            } else {
+                                $name = $words[$i] . ' ' . $name;
+                            }
+                        }
+                    }
+                } else {
+                    $addname = $record->getAddName();
+                    $addname = preg_replace(
+                        array('/<span class="starredname">/', '/<\/span><\/span>/', '/<\/span>/'),
+                        array('«', '', '»'),
+                        $addname
+                    );
+                    $addname = strip_tags($addname);
+                    if (!empty($addname)) {
+                        $name .= " " . $addname;
+                    }
+                }
+                $this->current_element->addText(trim($name));
+            }
+        }
+    }
+
+    /**
+     * XML <GedcomValue/>
+     *
+     * @param array $attrs an array of key value pairs for the attributes
+     */
+    private function gedcomValueStartHandler($attrs) {
+        global $WT_TREE;
+
+        $id    = "";
+        $match = array();
+        if (preg_match("/0 @(.+)@/", $this->gedrec, $match)) {
+            $id = $match[1];
+        }
+
+        if (isset($attrs['newline']) && $attrs['newline'] == "1") {
+            $useBreak = "1";
+        } else {
+            $useBreak = "0";
+        }
+
+        $tag = $attrs['tag'];
+        if (!empty($tag)) {
+            if ($tag == "@desc") {
+                $value = $this->desc;
+                $value = trim($value);
+                $this->current_element->addText($value);
+            }
+            if ($tag == "@id") {
+                $this->current_element->addText($id);
+            } else {
+                $tag = str_replace("@fact", $this->fact, $tag);
+                if (empty($attrs['level'])) {
+                    $temp  = explode(" ", trim($this->gedrec));
+                    $level = $temp[0];
+                    if ($level == 0) {
+                        $level++;
+                    }
+                } else {
+                    $level = $attrs['level'];
+                }
+                $tags  = preg_split('/[: ]/', $tag);
+                $value = $this->getGedcomValue($tag, $level, $this->gedrec);
+                switch (end($tags)) {
+                case 'DATE':
+                    $tmp   = new Date($value);
+                    $value = $tmp->display();
+                    break;
+                case 'PLAC':
+                    $tmp   = new Place($value, $WT_TREE);
+                    $value = $tmp->getShortName();
+                    break;
+                }
+                if ($useBreak == "1") {
+                    // Insert <br> when multiple dates exist.
+                    // This works around a TCPDF bug that incorrectly wraps RTL dates on LTR pages
+                    $value = str_replace('(', '<br>(', $value);
+                    $value = str_replace('<span dir="ltr"><br>', '<br><span dir="ltr">', $value);
+                    $value = str_replace('<span dir="rtl"><br>', '<br><span dir="rtl">', $value);
+                    if (substr($value, 0, 6) == '<br>') {
+                        $value = substr($value, 6);
+                    }
+                }
+                $tmp = explode(':', $tag);
+                if (in_array(end($tmp), array('NOTE', 'TEXT'))) {
+                    $value = Filter::formatText($value, $WT_TREE); // We'll strip HTML in addText()
+                }
+                $this->current_element->addText($value);
+            }
+        }
+    }
+
+    /**
+     * XML <RepeatTag>
+     *
+     * @param array $attrs an array of key value pairs for the attributes
+     */
+    private function repeatTagStartHandler($attrs) {
+        global $WT_TREE;
+
+        $this->process_repeats++;
+        if ($this->process_repeats > 1) {
+            return;
+        }
+
+        array_push($this->repeats_stack, array($this->repeats, $this->repeat_bytes));
+        $this->repeats      = array();
+        $this->repeat_bytes = xml_get_current_line_number($this->parser);
+
+        $tag = "";
+        if (isset($attrs['tag'])) {
+            $tag = $attrs['tag'];
+        }
+        if (!empty($tag)) {
+            if ($tag == "@desc") {
+                $value = $this->desc;
+                $value = trim($value);
+                $this->current_element->addText($value);
+            } else {
+                $tag   = str_replace("@fact", $this->fact, $tag);
+                $tags  = explode(":", $tag);
+                $temp  = explode(" ", trim($this->gedrec));
+                $level = $temp[0];
+                if ($level == 0) {
+                    $level++;
+                }
+                $subrec = $this->gedrec;
+                $t      = $tag;
+                $count  = count($tags);
+                $i      = 0;
+                while ($i < $count) {
+                    $t = $tags[$i];
+                    if (!empty($t)) {
+                        if ($i < ($count - 1)) {
+                            $subrec = Functions::getSubRecord($level, "$level $t", $subrec);
+                            if (empty($subrec)) {
+                                $level--;
+                                $subrec = Functions::getSubRecord($level, "@ $t", $this->gedrec);
+                                if (empty($subrec)) {
+                                    return;
+                                }
+                            }
+                        }
+                        $level++;
+                    }
+                    $i++;
+                }
+                $level--;
+                $count = preg_match_all("/$level $t(.*)/", $subrec, $match, PREG_SET_ORDER);
+                $i     = 0;
+                while ($i < $count) {
+                    $i++;
+                    // Privacy check - is this a link, and are we allowed to view the linked object?
+                    $subrecord = Functions::getSubRecord($level, "$level $t", $subrec, $i);
+                    if (preg_match('/^\d ' . WT_REGEX_TAG . ' @(' . WT_REGEX_XREF . ')@/', $subrecord, $xref_match)) {
+                        $linked_object = GedcomRecord::getInstance($xref_match[1], $WT_TREE);
+                        if ($linked_object && !$linked_object->canShow()) {
+                            continue;
+                        }
+                    }
+                    $this->repeats[] = $subrecord;
+                }
+            }
+        }
+    }
+
+    /**
+     * XML </ RepeatTag>
+     */
+    private function repeatTagEndHandler() {
+        global $report;
+
+        $this->process_repeats--;
+        if ($this->process_repeats > 0) {
+            return;
+        }
+
+        // Check if there is anything to repeat
+        if (count($this->repeats) > 0) {
+            // No need to load them if not used...
+
+            $lineoffset = 0;
+            foreach ($this->repeats_stack as $rep) {
+                $lineoffset += $rep[1];
+            }
+            //-- read the xml from the file
+            $lines = file($report);
+            while (strpos($lines[$lineoffset + $this->repeat_bytes], "<RepeatTag") === false) {
+                $lineoffset--;
+            }
+            $lineoffset++;
+            $reportxml = "<tempdoc>\n";
+            $line_nr   = $lineoffset + $this->repeat_bytes;
+            // RepeatTag Level counter
+            $count = 1;
+            while (0 < $count) {
+                if (strstr($lines[$line_nr], "<RepeatTag") !== false) {
+                    $count++;
+                } elseif (strstr($lines[$line_nr], "</RepeatTag") !== false) {
+                    $count--;
+                }
+                if (0 < $count) {
+                    $reportxml .= $lines[$line_nr];
+                }
+                $line_nr++;
+            }
+            // No need to drag this
+            unset($lines);
+            $reportxml .= "</tempdoc>\n";
+            // Save original values
+            array_push($this->parser_stack, $this->parser);
+            $oldgedrec = $this->gedrec;
+            foreach ($this->repeats as $gedrec) {
+                $this->gedrec  = $gedrec;
+                $repeat_parser = xml_parser_create();
+                $this->parser  = $repeat_parser;
+                xml_parser_set_option($repeat_parser, XML_OPTION_CASE_FOLDING, false);
+                xml_set_element_handler($repeat_parser, array($this, 'startElement'), array($this, 'endElement'));
+                xml_set_character_data_handler($repeat_parser, array($this, 'characterData'));
+                if (!xml_parse($repeat_parser, $reportxml, true)) {
+                    throw new \DomainException(sprintf(
+                        'RepeatTagEHandler XML error: %s at line %d',
+                        xml_error_string(xml_get_error_code($repeat_parser)),
+                        xml_get_current_line_number($repeat_parser)
+                    ));
+                }
+                xml_parser_free($repeat_parser);
+            }
+            // Restore original values
+            $this->gedrec = $oldgedrec;
+            $this->parser = array_pop($this->parser_stack);
+        }
+        list($this->repeats, $this->repeat_bytes) = array_pop($this->repeats_stack);
+    }
+
+    /**
+     * Variable lookup
+     *
+     * Retrieve predefined variables :
+     *
+     * @ desc GEDCOM fact description, example:
+     *        1 EVEN This is a description
+     * @ fact GEDCOM fact tag, such as BIRT, DEAT etc.
+     * $ I18N::translate('....')
+     * $ language_settings[]
+     *
+     * @param array $attrs an array of key value pairs for the attributes
+     */
+    private function varStartHandler($attrs) {
+        if (empty($attrs['var'])) {
+            throw new \DomainException('REPORT ERROR var: The attribute "var=" is missing or not set in the XML file on line: ' . xml_get_current_line_number($this->parser));
+        }
+
+        $var = $attrs['var'];
+        // SetVar element preset variables
+        if (!empty($this->vars[$var]['id'])) {
+            $var = $this->vars[$var]['id'];
+        } else {
+            $tfact = $this->fact;
+            if (($this->fact === "EVEN" || $this->fact === "FACT") && $this->type !== " ") {
+                // Use :
+                // n TYPE This text if string
+                $tfact = $this->type;
+            }
+            $var = str_replace(array("@fact", "@desc"), array(GedcomTag::getLabel($tfact), $this->desc), $var);
+            if (preg_match('/^I18N::number\((.+)\)$/', $var, $match)) {
+                $var = I18N::number($match[1]);
+            } elseif (preg_match('/^I18N::translate\(\'(.+)\'\)$/', $var, $match)) {
+                $var = I18N::translate($match[1]);
+            } elseif (preg_match('/^I18N::translateContext\(\'(.+)\', *\'(.+)\'\)$/', $var, $match)) {
+                $var = I18N::translateContext($match[1], $match[2]);
+            }
+        }
+        // Check if variable is set as a date and reformat the date
+        if (isset($attrs['date'])) {
+            if ($attrs['date'] === "1") {
+                $g   = new Date($var);
+                $var = $g->display();
+            }
+        }
+        $this->current_element->addText($var);
+        $this->text = $var; // Used for title/descriptio
+    }
+
+    /**
+     * XML <Facts>
+     *
+     * @param array $attrs an array of key value pairs for the attributes
+     */
+    private function factsStartHandler($attrs) {
+        global $WT_TREE;
+
+        $this->process_repeats++;
+        if ($this->process_repeats > 1) {
+            return;
+        }
+
+        array_push($this->repeats_stack, array($this->repeats, $this->repeat_bytes));
+        $this->repeats      = array();
+        $this->repeat_bytes = xml_get_current_line_number($this->parser);
+
+        $id    = "";
+        $match = array();
+        if (preg_match("/0 @(.+)@/", $this->gedrec, $match)) {
+            $id = $match[1];
+        }
+        $tag = "";
+        if (isset($attrs['ignore'])) {
+            $tag .= $attrs['ignore'];
+        }
+        if (preg_match("/\\$(.+)/", $tag, $match)) {
+            $tag = $this->vars[$match[1]]['id'];
+        }
+
+        $record = GedcomRecord::getInstance($id, $WT_TREE);
+        if (empty($attrs['diff']) && !empty($id)) {
+            $facts = $record->getFacts();
+            Functions::sortFacts($facts);
+            $this->repeats  = array();
+            $nonfacts       = explode(',', $tag);
+            foreach ($facts as $event) {
+                if (!in_array($event->getTag(), $nonfacts)) {
+                    $this->repeats[] = $event->getGedcom();
+                }
+            }
+        } else {
+            foreach ($record->getFacts() as $fact) {
+                if ($fact->isPendingAddition() && $fact->getTag() !== 'CHAN') {
+                    $this->repeats[] = $fact->getGedcom();
+                }
+            }
+        }
+    }
+
+    /**
+     * XML </Facts>
+     */
+    private function factsEndHandler() {
+        global $report;
+
+        $this->process_repeats--;
+        if ($this->process_repeats > 0) {
+            return;
+        }
+
+        // Check if there is anything to repeat
+        if (count($this->repeats) > 0) {
+
+            $line       = xml_get_current_line_number($this->parser) - 1;
+            $lineoffset = 0;
+            foreach ($this->repeats_stack as $rep) {
+                $lineoffset += $rep[1];
+            }
+
+            //-- read the xml from the file
+            $lines = file($report);
+            while ($lineoffset + $this->repeat_bytes > 0 && strpos($lines[$lineoffset + $this->repeat_bytes], '<Facts ') === false) {
+                $lineoffset--;
+            }
+            $lineoffset++;
+            $reportxml = "<tempdoc>\n";
+            $i         = $line + $lineoffset;
+            $line_nr   = $this->repeat_bytes + $lineoffset;
+            while ($line_nr < $i) {
+                $reportxml .= $lines[$line_nr];
+                $line_nr++;
+            }
+            // No need to drag this
+            unset($lines);
+            $reportxml .= "</tempdoc>\n";
+            // Save original values
+            array_push($this->parser_stack, $this->parser);
+            $oldgedrec = $this->gedrec;
+            $count     = count($this->repeats);
+            $i         = 0;
+            while ($i < $count) {
+                $this->gedrec = $this->repeats[$i];
+                $this->fact   = '';
+                $this->desc   = '';
+                if (preg_match('/1 (\w+)(.*)/', $this->gedrec, $match)) {
+                    $this->fact = $match[1];
+                    if ($this->fact === 'EVEN' || $this->fact === 'FACT') {
+                        $tmatch = array();
+                        if (preg_match('/2 TYPE (.+)/', $this->gedrec, $tmatch)) {
+                            $this->type = trim($tmatch[1]);
+                        } else {
+                            $this->type = ' ';
+                        }
+                    }
+                    $this->desc = trim($match[2]);
+                    $this->desc .= Functions::getCont(2, $this->gedrec);
+                }
+                $repeat_parser = xml_parser_create();
+                $this->parser  = $repeat_parser;
+                xml_parser_set_option($repeat_parser, XML_OPTION_CASE_FOLDING, false);
+                xml_set_element_handler($repeat_parser, array($this, 'startElement'), array($this, 'endElement'));
+                xml_set_character_data_handler($repeat_parser, array($this, 'characterData'));
+                if (!xml_parse($repeat_parser, $reportxml, true)) {
+                    throw new \DomainException(sprintf(
+                        'FactsEHandler XML error: %s at line %d',
+                        xml_error_string(xml_get_error_code($repeat_parser)),
+                        xml_get_current_line_number($repeat_parser)
+                    ));
+                }
+                xml_parser_free($repeat_parser);
+                $i++;
+            }
+            // Restore original values
+            $this->parser = array_pop($this->parser_stack);
+            $this->gedrec = $oldgedrec;
+        }
+        list($this->repeats, $this->repeat_bytes) = array_pop($this->repeats_stack);
+    }
+
+    /**
+     * Setting upp or changing variables in the XML
+     * The XML variable name and value is stored in $this->vars
+     *
+     * @param array $attrs an array of key value pairs for the attributes
+     */
+    private function setVarStartHandler($attrs) {
+        if (empty($attrs['name'])) {
+            throw new \DomainException('REPORT ERROR var: The attribute "name" is missing or not set in the XML file');
+        }
+
+        $name  = $attrs['name'];
+        $value = $attrs['value'];
+        $match = array();
+        // Current GEDCOM record strings
+        if ($value == "@ID") {
+            if (preg_match("/0 @(.+)@/", $this->gedrec, $match)) {
+                $value = $match[1];
+            }
+        } elseif ($value == "@fact") {
+            $value = $this->fact;
+        } elseif ($value == "@desc") {
+            $value = $this->desc;
+        } elseif ($value == "@generation") {
+            $value = $this->generation;
+        } elseif (preg_match("/@(\w+)/", $value, $match)) {
+            $gmatch = array();
+            if (preg_match("/\d $match[1] (.+)/", $this->gedrec, $gmatch)) {
+                $value = str_replace("@", "", trim($gmatch[1]));
+            }
+        }
+        if (preg_match("/\\$(\w+)/", $name, $match)) {
+            $name = $this->vars["'" . $match[1] . "'"]['id'];
+        }
+        $count = preg_match_all("/\\$(\w+)/", $value, $match, PREG_SET_ORDER);
+        $i     = 0;
+        while ($i < $count) {
+            $t     = $this->vars[$match[$i][1]]['id'];
+            $value = preg_replace("/\\$" . $match[$i][1] . "/", $t, $value, 1);
+            $i++;
+        }
+        if (preg_match('/^I18N::number\((.+)\)$/', $value, $match)) {
+            $value = I18N::number($match[1]);
+        } elseif (preg_match('/^I18N::translate\(\'(.+)\'\)$/', $value, $match)) {
+            $value = I18N::translate($match[1]);
+        } elseif (preg_match('/^I18N::translateContext\(\'(.+)\', *\'(.+)\'\)$/', $value, $match)) {
+            $value = I18N::translateContext($match[1], $match[2]);
+        }
+        // Arithmetic functions
+        if (preg_match("/(\d+)\s*([\-\+\*\/])\s*(\d+)/", $value, $match)) {
+            switch ($match[2]) {
+            case "+":
+                $t     = $match[1] + $match[3];
+                $value = preg_replace("/" . $match[1] . "\s*([\-\+\*\/])\s*" . $match[3] . "/", $t, $value);
+                break;
+            case "-":
+                $t     = $match[1] - $match[3];
+                $value = preg_replace("/" . $match[1] . "\s*([\-\+\*\/])\s*" . $match[3] . "/", $t, $value);
+                break;
+            case "*":
+                $t     = $match[1] * $match[3];
+                $value = preg_replace("/" . $match[1] . "\s*([\-\+\*\/])\s*" . $match[3] . "/", $t, $value);
+                break;
+            case "/":
+                $t     = $match[1] / $match[3];
+                $value = preg_replace("/" . $match[1] . "\s*([\-\+\*\/])\s*" . $match[3] . "/", $t, $value);
+                break;
+            }
+        }
+        if (strpos($value, "@") !== false) {
+            $value = "";
+        }
+        $this->vars[$name]['id'] = $value;
+    }
+
+    /**
+     * XML <if > start element
+     *
+     * @param array $attrs an array of key value pairs for the attributes
+     */
+    private function ifStartHandler($attrs) {
+        if ($this->process_ifs > 0) {
+            $this->process_ifs++;
+
+            return;
+        }
+
+        $condition = $attrs['condition'];
+        $condition = $this->substituteVars($condition, true);
+        $condition = str_replace(array(" LT ", " GT "), array("<", ">"), $condition);
+        // Replace the first accurance only once of @fact:DATE or in any other combinations to the current fact, such as BIRT
+        $condition = str_replace("@fact:", $this->fact . ':', $condition);
+        $match     = array();
+        $count     = preg_match_all("/@([\w:\.]+)/", $condition, $match, PREG_SET_ORDER);
+        $i         = 0;
+        while ($i < $count) {
+            $id    = $match[$i][1];
+            $value = '""';
+            if ($id == "ID") {
+                if (preg_match("/0 @(.+)@/", $this->gedrec, $match)) {
+                    $value = "'" . $match[1] . "'";
+                }
+            } elseif ($id === "fact") {
+                $value = '"' . $this->fact . '"';
+            } elseif ($id === "desc") {
+                $value = '"' . addslashes($this->desc) . '"';
+            } elseif ($id === "generation") {
+                $value = '"' . $this->generation . '"';
+            } else {
+
+                $temp  = explode(" ", trim($this->gedrec));
+                $level = $temp[0];
+                if ($level == 0) {
+                    $level++;
+                }
+                $value = $this->getGedcomValue($id, $level, $this->gedrec);
+                if (empty($value)) {
+                    $level++;
+                    $value = $this->getGedcomValue($id, $level, $this->gedrec);
+                }
+                $value = preg_replace('/^@(' . WT_REGEX_XREF . ')@$/', '$1', $value);
+                $value = '"' . addslashes($value) . '"';
+            }
+            $condition = str_replace("@$id", $value, $condition);
+            $i++;
+        }
+        $ret = eval("return (bool) ($condition);");
+        if (!$ret) {
+            $this->process_ifs++;
+        }
+    }
+
+    /**
+     * XML <if /> end element
+     */
+    private function ifEndHandler() {
+        if ($this->process_ifs > 0) {
+            $this->process_ifs--;
+        }
+    }
+
+    /**
+     * XML <Footnote > start element
+     * Collect the Footnote links
+     * GEDCOM Records that are protected by Privacy setting will be ignore
+     *
+     * @param array $attrs an array of key value pairs for the attributes
+     */
+    private function footnoteStartHandler($attrs) {
+        global $WT_TREE;
+
+        $id = "";
+        if (preg_match("/[0-9] (.+) @(.+)@/", $this->gedrec, $match)) {
+            $id = $match[2];
+        }
+        $record = GedcomRecord::getInstance($id, $WT_TREE);
+        if ($record && $record->canShow()) {
+            array_push($this->print_data_stack, $this->print_data);
+            $this->print_data = true;
+            $style            = "";
+            if (!empty($attrs['style'])) {
+                $style = $attrs['style'];
+            }
+            $this->footnote_element = $this->current_element;
+            $this->current_element  = $this->report_root->createFootnote($style);
+        } else {
+            $this->print_data       = false;
+            $this->process_footnote = false;
+        }
+    }
+
+    /**
+     * XML <Footnote /> end element
+     * Print the collected Footnote data
+     */
+    private function footnoteEndHandler() {
+        if ($this->process_footnote) {
+            $this->print_data = array_pop($this->print_data_stack);
+            $temp             = trim($this->current_element->getValue());
+            if (strlen($temp) > 3) {
+                $this->wt_report->addElement($this->current_element);
+            }
+            $this->current_element = $this->footnote_element;
+        } else {
+            $this->process_footnote = true;
+        }
+    }
+
+    /**
+     * XML <FootnoteTexts /> element
+     */
+    private function footnoteTextsStartHandler() {
+        $temp = "footnotetexts";
+        $this->wt_report->addElement($temp);
+    }
+
+    /**
+     * XML <AgeAtDeath /> element handler
+     */
+    private function ageAtDeathStartHandler() {
+        // This duplicates functionality in FunctionsPrint::format_fact_date()
+        global $factrec, $WT_TREE;
+
+        $match = array();
+        if (preg_match("/0 @(.+)@/", $this->gedrec, $match)) {
+            $person = Individual::getInstance($match[1], $WT_TREE);
+            // Recorded age
+            if (preg_match('/\n2 AGE (.+)/', $factrec, $match)) {
+                $fact_age = $match[1];
+            } else {
+                $fact_age = '';
+            }
+            if (preg_match('/\n2 HUSB\n3 AGE (.+)/', $factrec, $match)) {
+                $husb_age = $match[1];
+            } else {
+                $husb_age = '';
+            }
+            if (preg_match('/\n2 WIFE\n3 AGE (.+)/', $factrec, $match)) {
+                $wife_age = $match[1];
+            } else {
+                $wife_age = '';
+            }
+
+            // Calculated age
+            $birth_date = $person->getBirthDate();
+            // Can't use getDeathDate(), as this also gives BURI/CREM events, which
+            // wouldn't give the correct "days after death" result for people with
+            // no DEAT.
+            $death_event = $person->getFirstFact('DEAT');
+            if ($death_event) {
+                $death_date = $death_event->getDate();
+            } else {
+                $death_date = new Date('');
+            }
+            $value = '';
+            if (Date::compare($birth_date, $death_date) <= 0 || !$person->isDead()) {
+                $age = Date::getAgeGedcom($birth_date, $death_date);
+                // Only show calculated age if it differs from recorded age
+                if ($age != '' && $age != "0d") {
+                    if ($fact_age != '' && $fact_age != $age || $fact_age == '' && $husb_age == '' && $wife_age == '' || $husb_age != '' && $person->getSex() == 'M' && $husb_age != $age || $wife_age != '' && $person->getSex() == 'F' && $wife_age != $age
+                    ) {
+                        $value  = FunctionsDate::getAgeAtEvent($age);
+                        $abbrev = substr($value, 0, strpos($value, ' ') + 5);
+                        if ($value !== $abbrev) {
+                            $value = $abbrev . '.';
+                        }
+                    }
+                }
+            }
+            $this->current_element->addText($value);
+        }
+    }
+
+    /**
+     * XML element Forced line break handler - HTML code
+     */
+    private function brStartHandler() {
+        if ($this->print_data && $this->process_gedcoms === 0) {
+            $this->current_element->addText('<br>');
+        }
+    }
+
+    /**
+     * XML <sp />element Forced space handler
+     */
+    private function spStartHandler() {
+        if ($this->print_data && $this->process_gedcoms === 0) {
+            $this->current_element->addText(' ');
+        }
+    }
+
+    /**
+     * XML <HighlightedImage/>
+     *
+     * @param array $attrs an array of key value pairs for the attributes
+     */
+    private function highlightedImageStartHandler($attrs) {
+        global $WT_TREE;
+
+        $id    = '';
+        $match = array();
+        if (preg_match("/0 @(.+)@/", $this->gedrec, $match)) {
+            $id = $match[1];
+        }
+
+        // mixed Position the top corner of this box on the page. the default is the current position
+        $top = '.';
+        if (isset($attrs['top'])) {
+            if ($attrs['top'] === '0') {
+                $top = 0;
+            } elseif ($attrs['top'] === '.') {
+                $top = '.';
+            } elseif (!empty($attrs['top'])) {
+                $top = (int) $attrs['top'];
+            }
+        }
+
+        // mixed Position the left corner of this box on the page. the default is the current position
+        $left = '.';
+        if (isset($attrs['left'])) {
+            if ($attrs['left'] === '0') {
+                $left = 0;
+            } elseif ($attrs['left'] === '.') {
+                $left = '.';
+            } elseif (!empty($attrs['left'])) {
+                $left = (int) $attrs['left'];
+            }
+        }
+
+        // string Align the image in left, center, right
+        $align = '';
+        if (!empty($attrs['align'])) {
+            $align = $attrs['align'];
+        }
+
+        // string Next Line should be T:next to the image, N:next line
+        $ln = '';
+        if (!empty($attrs['ln'])) {
+            $ln = $attrs['ln'];
+        }
+
+        $width  = 0;
+        $height = 0;
+        if (!empty($attrs['width'])) {
+            $width = (int) $attrs['width'];
+        }
+        if (!empty($attrs['height'])) {
+            $height = (int) $attrs['height'];
+        }
+
+        $person      = Individual::getInstance($id, $WT_TREE);
+        $mediaobject = $person->findHighlightedMedia();
+        if ($mediaobject) {
+            $attributes = $mediaobject->getImageAttributes('thumb');
+            if (in_array(
+                    $attributes['ext'],
+                    array(
+                        'GIF',
+                        'JPG',
+                        'PNG',
+                        'SWF',
+                        'PSD',
+                        'BMP',
+                        'TIFF',
+                        'TIFF',
+                        'JPC',
+                        'JP2',
+                        'JPX',
+                        'JB2',
+                        'SWC',
+                        'IFF',
+                        'WBMP',
+                        'XBM',
+                    )
+                ) && $mediaobject->canShow() && $mediaobject->fileExists('thumb')
+            ) {
+                if ($width > 0 && $height == 0) {
+                    $perc   = $width / $attributes['adjW'];
+                    $height = round($attributes['adjH'] * $perc);
+                } elseif ($height > 0 && $width == 0) {
+                    $perc  = $height / $attributes['adjH'];
+                    $width = round($attributes['adjW'] * $perc);
+                } else {
+                    $width  = $attributes['adjW'];
+                    $height = $attributes['adjH'];
+                }
+                $image = $this->report_root->createImageFromObject($mediaobject, $left, $top, $width, $height, $align, $ln);
+                $this->wt_report->addElement($image);
+            }
+        }
+    }
+
+    /**
+     * XML <Image/>
+     *
+     * @param array $attrs an array of key value pairs for the attributes
+     */
+    private function imageStartHandler($attrs) {
+        global $WT_TREE;
+
+        // mixed Position the top corner of this box on the page. the default is the current position
+        $top = '.';
+        if (isset($attrs['top'])) {
+            if ($attrs['top'] === "0") {
+                $top = 0;
+            } elseif ($attrs['top'] === '.') {
+                $top = '.';
+            } elseif (!empty($attrs['top'])) {
+                $top = (int) $attrs['top'];
+            }
+        }
+
+        // mixed Position the left corner of this box on the page. the default is the current position
+        $left = '.';
+        if (isset($attrs['left'])) {
+            if ($attrs['left'] === '0') {
+                $left = 0;
+            } elseif ($attrs['left'] === '.') {
+                $left = '.';
+            } elseif (!empty($attrs['left'])) {
+                $left = (int) $attrs['left'];
+            }
+        }
+
+        // string Align the image in left, center, right
+        $align = '';
+        if (!empty($attrs['align'])) {
+            $align = $attrs['align'];
+        }
+
+        // string Next Line should be T:next to the image, N:next line
+        $ln = 'T';
+        if (!empty($attrs['ln'])) {
+            $ln = $attrs['ln'];
+        }
+
+        $width  = 0;
+        $height = 0;
+        if (!empty($attrs['width'])) {
+            $width = (int) $attrs['width'];
+        }
+        if (!empty($attrs['height'])) {
+            $height = (int) $attrs['height'];
+        }
+
+        $file = '';
+        if (!empty($attrs['file'])) {
+            $file = $attrs['file'];
+        }
+        if ($file == "@FILE") {
+            $match = array();
+            if (preg_match("/\d OBJE @(.+)@/", $this->gedrec, $match)) {
+                $mediaobject = Media::getInstance($match[1], $WT_TREE);
+                $attributes  = $mediaobject->getImageAttributes('thumb');
+                if (in_array(
+                        $attributes['ext'],
+                        array(
+                            'GIF',
+                            'JPG',
+                            'PNG',
+                            'SWF',
+                            'PSD',
+                            'BMP',
+                            'TIFF',
+                            'TIFF',
+                            'JPC',
+                            'JP2',
+                            'JPX',
+                            'JB2',
+                            'SWC',
+                            'IFF',
+                            'WBMP',
+                            'XBM',
+                        )
+                    ) && $mediaobject->canShow() && $mediaobject->fileExists('thumb')
+                ) {
+                    if ($width > 0 && $height == 0) {
+                        $perc   = $width / $attributes['adjW'];
+                        $height = round($attributes['adjH'] * $perc);
+                    } elseif ($height > 0 && $width == 0) {
+                        $perc  = $height / $attributes['adjH'];
+                        $width = round($attributes['adjW'] * $perc);
+                    } else {
+                        $width  = $attributes['adjW'];
+                        $height = $attributes['adjH'];
+                    }
+                    $image = $this->report_root->createImageFromObject($mediaobject, $left, $top, $width, $height, $align, $ln);
+                    $this->wt_report->addElement($image);
+                }
+            }
+        } else {
+            if (file_exists($file) && preg_match("/(jpg|jpeg|png|gif)$/i", $file)) {
+                $size = getimagesize($file);
+                if ($width > 0 && $height == 0) {
+                    $perc   = $width / $size[0];
+                    $height = round($size[1] * $perc);
+                } elseif ($height > 0 && $width == 0) {
+                    $perc  = $height / $size[1];
+                    $width = round($size[0] * $perc);
+                } else {
+                    $width  = $size[0];
+                    $height = $size[1];
+                }
+                $image = $this->report_root->createImage($file, $left, $top, $width, $height, $align, $ln);
+                $this->wt_report->addElement($image);
+            }
+        }
+    }
+
+    /**
+     * XML <Line> element handler
+     *
+     * @param array $attrs an array of key value pairs for the attributes
+     */
+    private function lineStartHandler($attrs) {
+        // Start horizontal position, current position (default)
+        $x1 = ".";
+        if (isset($attrs['x1'])) {
+            if ($attrs['x1'] === "0") {
+                $x1 = 0;
+            } elseif ($attrs['x1'] === ".") {
+                $x1 = ".";
+            } elseif (!empty($attrs['x1'])) {
+                $x1 = (int) $attrs['x1'];
+            }
+        }
+        // Start vertical position, current position (default)
+        $y1 = ".";
+        if (isset($attrs['y1'])) {
+            if ($attrs['y1'] === "0") {
+                $y1 = 0;
+            } elseif ($attrs['y1'] === ".") {
+                $y1 = ".";
+            } elseif (!empty($attrs['y1'])) {
+                $y1 = (int) $attrs['y1'];
+            }
+        }
+        // End horizontal position, maximum width (default)
+        $x2 = ".";
+        if (isset($attrs['x2'])) {
+            if ($attrs['x2'] === "0") {
+                $x2 = 0;
+            } elseif ($attrs['x2'] === ".") {
+                $x2 = ".";
+            } elseif (!empty($attrs['x2'])) {
+                $x2 = (int) $attrs['x2'];
+            }
+        }
+        // End vertical position
+        $y2 = ".";
+        if (isset($attrs['y2'])) {
+            if ($attrs['y2'] === "0") {
+                $y2 = 0;
+            } elseif ($attrs['y2'] === ".") {
+                $y2 = ".";
+            } elseif (!empty($attrs['y2'])) {
+                $y2 = (int) $attrs['y2'];
+            }
+        }
+
+        $line = $this->report_root->createLine($x1, $y1, $x2, $y2);
+        $this->wt_report->addElement($line);
+    }
+
+    /**
+     * XML <List>
+     *
+     * @param array $attrs an array of key value pairs for the attributes
+     */
+    private function listStartHandler($attrs) {
+        global $WT_TREE;
+
+        $this->process_repeats++;
+        if ($this->process_repeats > 1) {
+            return;
+        }
+
+        $match = array();
+        if (isset($attrs['sortby'])) {
+            $sortby = $attrs['sortby'];
+            if (preg_match("/\\$(\w+)/", $sortby, $match)) {
+                $sortby = $this->vars[$match[1]]['id'];
+                $sortby = trim($sortby);
+            }
+        } else {
+            $sortby = "NAME";
+        }
+
+        if (isset($attrs['list'])) {
+            $listname = $attrs['list'];
+        } else {
+            $listname = "individual";
+        }
+        // Some filters/sorts can be applied using SQL, while others require PHP
+        switch ($listname) {
+        case "pending":
+            $rows = Database::prepare(
+                "SELECT xref, CASE new_gedcom WHEN '' THEN old_gedcom ELSE new_gedcom END AS gedcom" .
+                " FROM `##change`" . " WHERE (xref, change_id) IN (" .
+                "  SELECT xref, MAX(change_id)" .
+                "  FROM `##change`" .
+                "  WHERE status = 'pending' AND gedcom_id = :tree_id" .
+                "  GROUP BY xref" .
+                " )"
+            )->execute(array(
+                'tree_id' => $WT_TREE->getTreeId(),
+            ))->fetchAll();
+            $this->list = array();
+            foreach ($rows as $row) {
+                $this->list[] = GedcomRecord::getInstance($row->xref, $WT_TREE, $row->gedcom);
+            }
+            break;
+        case 'individual':
+            $sql_select   = "SELECT i_id AS xref, i_gedcom AS gedcom FROM `##individuals` ";
+            $sql_join     = "";
+            $sql_where    = " WHERE i_file = :tree_id";
+            $sql_order_by = "";
+            $sql_params   = array('tree_id' => $WT_TREE->getTreeId());
+            foreach ($attrs as $attr => $value) {
+                if (strpos($attr, 'filter') === 0 && $value) {
+                    $value = $this->substituteVars($value, false);
+                    // Convert the various filters into SQL
+                    if (preg_match('/^(\w+):DATE (LTE|GTE) (.+)$/', $value, $match)) {
+                        $sql_join .= " JOIN `##dates` AS {$attr} ON ({$attr}.d_file=i_file AND {$attr}.d_gid=i_id)";
+                        $sql_where .= " AND {$attr}.d_fact = :{$attr}fact";
+                        $sql_params[$attr . 'fact'] = $match[1];
+                        $date                       = new Date($match[3]);
+                        if ($match[2] == "LTE") {
+                            $sql_where .= " AND {$attr}.d_julianday2 <= :{$attr}date";
+                            $sql_params[$attr . 'date'] = $date->maximumJulianDay();
+                        } else {
+                            $sql_where .= " AND {$attr}.d_julianday1 >= :{$attr}date";
+                            $sql_params[$attr . 'date'] = $date->minimumJulianDay();
+                        }
+                        if ($sortby == $match[1]) {
+                            $sortby = "";
+                            $sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.d_julianday1";
+                        }
+                        unset($attrs[$attr]); // This filter has been fully processed
+                    } elseif (preg_match('/^NAME CONTAINS (.*)$/', $value, $match)) {
+                        // Do nothing, unless you have to
+                        if ($match[1] != '' || $sortby == 'NAME') {
+                            $sql_join .= " JOIN `##name` AS {$attr} ON (n_file=i_file AND n_id=i_id)";
+                            // Search the DB only if there is any name supplied
+                            if ($match[1] != "") {
+                                $names = explode(" ", $match[1]);
+                                foreach ($names as $n => $name) {
+                                    $sql_where .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
+                                    $sql_params[$attr . 'name' . $n] = $name;
+                                }
+                            }
+                            // Let the DB do the name sorting even when no name was entered
+                            if ($sortby == "NAME") {
+                                $sortby = "";
+                                $sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.n_sort";
+                            }
+                        }
+                        unset($attrs[$attr]); // This filter has been fully processed
+                    } elseif (preg_match('/^REGEXP \/(.+)\//', $value, $match)) {
+                        $sql_where .= " AND i_gedcom REGEXP :{$attr}gedcom";
+                        // PDO helpfully escapes backslashes for us, preventing us from matching "\n1 FACT"
+                        $sql_params[$attr . 'gedcom'] = str_replace('\n', "\n", $match[1]);
+                        unset($attrs[$attr]); // This filter has been fully processed
+                    } elseif (preg_match('/^(?:\w+):PLAC CONTAINS (.+)$/', $value, $match)) {
+                        $sql_join .= " JOIN `##places` AS {$attr}a ON ({$attr}a.p_file = i_file)";
+                        $sql_join .= " JOIN `##placelinks` AS {$attr}b ON ({$attr}a.p_file = {$attr}b.pl_file AND {$attr}b.pl_p_id = {$attr}a.p_id AND {$attr}b.pl_gid = i_id)";
+                        $sql_where .= " AND {$attr}a.p_place LIKE CONCAT('%', :{$attr}place, '%')";
+                        $sql_params[$attr . 'place'] = $match[1];
+                        // Don't unset this filter. This is just initial filtering
+                    } elseif (preg_match('/^(\w*):*(\w*) CONTAINS (.+)$/', $value, $match)) {
+                        $sql_where .= " AND i_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
+                        $sql_params[$attr . 'contains1'] = $match[1];
+                        $sql_params[$attr . 'contains2'] = $match[2];
+                        $sql_params[$attr . 'contains3'] = $match[3];
+                        // Don't unset this filter. This is just initial filtering
+                    }
+                }
+            }
+
+            $this->list = array();
+            $rows       = Database::prepare(
+                $sql_select . $sql_join . $sql_where . $sql_order_by
+            )->execute($sql_params)->fetchAll();
+
+            foreach ($rows as $row) {
+                $this->list[$row->xref] = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+            }
+            break;
+
+        case 'family':
+            $sql_select   = "SELECT f_id AS xref, f_gedcom AS gedcom FROM `##families`";
+            $sql_join     = "";
+            $sql_where    = " WHERE f_file = :tree_id";
+            $sql_order_by = "";
+            $sql_params   = array('tree_id' => $WT_TREE->getTreeId());
+            foreach ($attrs as $attr => $value) {
+                if (strpos($attr, 'filter') === 0 && $value) {
+                    $value = $this->substituteVars($value, false);
+                    // Convert the various filters into SQL
+                    if (preg_match('/^(\w+):DATE (LTE|GTE) (.+)$/', $value, $match)) {
+                        $sql_join .= " JOIN `##dates` AS {$attr} ON ({$attr}.d_file=f_file AND {$attr}.d_gid=f_id)";
+                        $sql_where .= " AND {$attr}.d_fact = :{$attr}fact";
+                        $sql_params[$attr . 'fact'] = $match[1];
+                        $date                       = new Date($match[3]);
+                        if ($match[2] == "LTE") {
+                            $sql_where .= " AND {$attr}.d_julianday2 <= :{$attr}date";
+                            $sql_params[$attr . 'date'] = $date->maximumJulianDay();
+                        } else {
+                            $sql_where .= " AND {$attr}.d_julianday1 >= :{$attr}date";
+                            $sql_params[$attr . 'date'] = $date->minimumJulianDay();
+                        }
+                        if ($sortby == $match[1]) {
+                            $sortby = "";
+                            $sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.d_julianday1";
+                        }
+                        unset($attrs[$attr]); // This filter has been fully processed
+                    } elseif (preg_match('/^REGEXP \/(.+)\//', $value, $match)) {
+                        $sql_where .= " AND f_gedcom REGEXP :{$attr}gedcom";
+                        // PDO helpfully escapes backslashes for us, preventing us from matching "\n1 FACT"
+                        $sql_params[$attr . 'gedcom'] = str_replace('\n', "\n", $match[1]);
+                        unset($attrs[$attr]); // This filter has been fully processed
+                    } elseif (preg_match('/^NAME CONTAINS (.+)$/', $value, $match)) {
+                        // Do nothing, unless you have to
+                        if ($match[1] != '' || $sortby == 'NAME') {
+                            $sql_join .= " JOIN `##name` AS {$attr} ON n_file = f_file AND n_id IN (f_husb, f_wife)";
+                            // Search the DB only if there is any name supplied
+                            if ($match[1] != "") {
+                                $names = explode(" ", $match[1]);
+                                foreach ($names as $n => $name) {
+                                    $sql_where .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
+                                    $sql_params[$attr . 'name' . $n] = $name;
+                                }
+                            }
+                            // Let the DB do the name sorting even when no name was entered
+                            if ($sortby == "NAME") {
+                                $sortby = "";
+                                $sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.n_sort";
+                            }
+                        }
+                        unset($attrs[$attr]); // This filter has been fully processed
+
+                    } elseif (preg_match('/^(?:\w+):PLAC CONTAINS (.+)$/', $value, $match)) {
+                        $sql_join .= " JOIN `##places` AS {$attr}a ON ({$attr}a.p_file=f_file)";
+                        $sql_join .= " JOIN `##placelinks` AS {$attr}b ON ({$attr}a.p_file={$attr}b.pl_file AND {$attr}b.pl_p_id={$attr}a.p_id AND {$attr}b.pl_gid=f_id)";
+                        $sql_where .= " AND {$attr}a.p_place LIKE CONCAT('%', :{$attr}place, '%')";
+                        $sql_params[$attr . 'place'] = $match[1];
+                        // Don't unset this filter. This is just initial filtering
+                    } elseif (preg_match('/^(\w*):*(\w*) CONTAINS (.+)$/', $value, $match)) {
+                        $sql_where .= " AND f_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
+                        $sql_params[$attr . 'contains1'] = $match[1];
+                        $sql_params[$attr . 'contains2'] = $match[2];
+                        $sql_params[$attr . 'contains3'] = $match[3];
+                        // Don't unset this filter. This is just initial filtering
+                    }
+                }
+            }
+
+            $this->list = array();
+            $rows       = Database::prepare(
+                $sql_select . $sql_join . $sql_where . $sql_order_by
+            )->execute($sql_params)->fetchAll();
+
+            foreach ($rows as $row) {
+                $this->list[$row->xref] = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+            }
+            break;
+
+        default:
+            throw new \DomainException('Invalid list name: ' . $listname);
+        }
+
+        $filters  = array();
+        $filters2 = array();
+        if (isset($attrs['filter1']) && count($this->list) > 0) {
+            foreach ($attrs as $key => $value) {
+                if (preg_match("/filter(\d)/", $key)) {
+                    $condition = $value;
+                    if (preg_match("/@(\w+)/", $condition, $match)) {
+                        $id    = $match[1];
+                        $value = "''";
+                        if ($id == "ID") {
+                            if (preg_match("/0 @(.+)@/", $this->gedrec, $match)) {
+                                $value = "'" . $match[1] . "'";
+                            }
+                        } elseif ($id == "fact") {
+                            $value = "'" . $this->fact . "'";
+                        } elseif ($id == "desc") {
+                            $value = "'" . $this->desc . "'";
+                        } else {
+                            if (preg_match("/\d $id (.+)/", $this->gedrec, $match)) {
+                                $value = "'" . str_replace("@", "", trim($match[1])) . "'";
+                            }
+                        }
+                        $condition = preg_replace("/@$id/", $value, $condition);
+                    }
+                    //-- handle regular expressions
+                    if (preg_match("/([A-Z:]+)\s*([^\s]+)\s*(.+)/", $condition, $match)) {
+                        $tag  = trim($match[1]);
+                        $expr = trim($match[2]);
+                        $val  = trim($match[3]);
+                        if (preg_match("/\\$(\w+)/", $val, $match)) {
+                            $val = $this->vars[$match[1]]['id'];
+                            $val = trim($val);
+                        }
+                        if ($val) {
+                            $searchstr = "";
+                            $tags      = explode(":", $tag);
+                            //-- only limit to a level number if we are specifically looking at a level
+                            if (count($tags) > 1) {
+                                $level = 1;
+                                foreach ($tags as $t) {
+                                    if (!empty($searchstr)) {
+                                        $searchstr .= "[^\n]*(\n[2-9][^\n]*)*\n";
+                                    }
+                                    //-- search for both EMAIL and _EMAIL... silly double gedcom standard
+                                    if ($t == "EMAIL" || $t == "_EMAIL") {
+                                        $t = "_?EMAIL";
+                                    }
+                                    $searchstr .= $level . " " . $t;
+                                    $level++;
+                                }
+                            } else {
+                                if ($tag == "EMAIL" || $tag == "_EMAIL") {
+                                    $tag = "_?EMAIL";
+                                }
+                                $t         = $tag;
+                                $searchstr = "1 " . $tag;
+                            }
+                            switch ($expr) {
+                            case "CONTAINS":
+                                if ($t == "PLAC") {
+                                    $searchstr .= "[^\n]*[, ]*" . $val;
+                                } else {
+                                    $searchstr .= "[^\n]*" . $val;
+                                }
+                                $filters[] = $searchstr;
+                                break;
+                            default:
+                                $filters2[] = array("tag" => $tag, "expr" => $expr, "val" => $val);
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        //-- apply other filters to the list that could not be added to the search string
+        if ($filters) {
+            foreach ($this->list as $key => $record) {
+                foreach ($filters as $filter) {
+                    if (!preg_match("/" . $filter . "/i", $record->privatizeGedcom(Auth::accessLevel($WT_TREE)))) {
+                        unset($this->list[$key]);
+                        break;
+                    }
+                }
+            }
+        }
+        if ($filters2) {
+            $mylist = array();
+            foreach ($this->list as $indi) {
+                $key  = $indi->getXref();
+                $grec = $indi->privatizeGedcom(Auth::accessLevel($WT_TREE));
+                $keep = true;
+                foreach ($filters2 as $filter) {
+                    if ($keep) {
+                        $tag  = $filter['tag'];
+                        $expr = $filter['expr'];
+                        $val  = $filter['val'];
+                        if ($val == "''") {
+                            $val = "";
+                        }
+                        $tags = explode(":", $tag);
+                        $t    = end($tags);
+                        $v    = $this->getGedcomValue($tag, 1, $grec);
+                        //-- check for EMAIL and _EMAIL (silly double gedcom standard :P)
+                        if ($t == "EMAIL" && empty($v)) {
+                            $tag  = str_replace("EMAIL", "_EMAIL", $tag);
+                            $tags = explode(":", $tag);
+                            $t    = end($tags);
+                            $v    = Functions::getSubRecord(1, $tag, $grec);
+                        }
+
+                        switch ($expr) {
+                        case "GTE":
+                            if ($t == "DATE") {
+                                $date1 = new Date($v);
+                                $date2 = new Date($val);
+                                $keep  = (Date::compare($date1, $date2) >= 0);
+                            } elseif ($val >= $v) {
+                                $keep = true;
+                            }
+                            break;
+                        case "LTE":
+                            if ($t == "DATE") {
+                                $date1 = new Date($v);
+                                $date2 = new Date($val);
+                                $keep  = (Date::compare($date1, $date2) <= 0);
+                            } elseif ($val >= $v) {
+                                $keep = true;
+                            }
+                            break;
+                        default:
+                            if ($v == $val) {
+                                $keep = true;
+                            } else {
+                                $keep = false;
+                            }
+                            break;
+                        }
+                    }
+                }
+                if ($keep) {
+                    $mylist[$key] = $indi;
+                }
+            }
+            $this->list = $mylist;
+        }
+
+        switch ($sortby) {
+        case 'NAME':
+            uasort($this->list, '\Fisharebest\Webtrees\GedcomRecord::compare');
+            break;
+        case 'CHAN':
+            uasort($this->list, function (GedcomRecord $x, GedcomRecord $y) {
+                return $y->lastChangeTimestamp(true) - $x->lastChangeTimestamp(true);
+            });
+            break;
+        case 'BIRT:DATE':
+            uasort($this->list, '\Fisharebest\Webtrees\Individual::compareBirthDate');
+            break;
+        case 'DEAT:DATE':
+            uasort($this->list, '\Fisharebest\Webtrees\Individual::compareDeathDate');
+            break;
+        case 'MARR:DATE':
+            uasort($this->list, '\Fisharebest\Webtrees\Family::compareMarrDate');
+            break;
+        default:
+            // unsorted or already sorted by SQL
+            break;
+        }
+
+        array_push($this->repeats_stack, array($this->repeats, $this->repeat_bytes));
+        $this->repeat_bytes = xml_get_current_line_number($this->parser) + 1;
+    }
+
+    /**
+     * XML <List>
+     */
+    private function listEndHandler() {
+        global $report;
+
+        $this->process_repeats--;
+        if ($this->process_repeats > 0) {
+            return;
+        }
+
+        // Check if there is any list
+        if (count($this->list) > 0) {
+            $lineoffset = 0;
+            foreach ($this->repeats_stack as $rep) {
+                $lineoffset += $rep[1];
+            }
+            //-- read the xml from the file
+            $lines = file($report);
+            while ((strpos($lines[$lineoffset + $this->repeat_bytes], "<List") === false) && (($lineoffset + $this->repeat_bytes) > 0)) {
+                $lineoffset--;
+            }
+            $lineoffset++;
+            $reportxml = "<tempdoc>\n";
+            $line_nr   = $lineoffset + $this->repeat_bytes;
+            // List Level counter
+            $count = 1;
+            while (0 < $count) {
+                if (strpos($lines[$line_nr], "<List") !== false) {
+                    $count++;
+                } elseif (strpos($lines[$line_nr], "</List") !== false) {
+                    $count--;
+                }
+                if (0 < $count) {
+                    $reportxml .= $lines[$line_nr];
+                }
+                $line_nr++;
+            }
+            // No need to drag this
+            unset($lines);
+            $reportxml .= "</tempdoc>";
+            // Save original values
+            array_push($this->parser_stack, $this->parser);
+            $oldgedrec = $this->gedrec;
+
+            $this->list_total   = count($this->list);
+            $this->list_private = 0;
+            foreach ($this->list as $record) {
+                if ($record->canShow()) {
+                    $this->gedrec = $record->privatizeGedcom(Auth::accessLevel($record->getTree()));
+                    //-- start the sax parser
+                    $repeat_parser = xml_parser_create();
+                    $this->parser  = $repeat_parser;
+                    xml_parser_set_option($repeat_parser, XML_OPTION_CASE_FOLDING, false);
+                    xml_set_element_handler($repeat_parser, array($this, 'startElement'), array($this, 'endElement'));
+                    xml_set_character_data_handler($repeat_parser, array($this, 'characterData'));
+                    if (!xml_parse($repeat_parser, $reportxml, true)) {
+                        throw new \DomainException(sprintf(
+                            'ListEHandler XML error: %s at line %d',
+                            xml_error_string(xml_get_error_code($repeat_parser)),
+                            xml_get_current_line_number($repeat_parser)
+                        ));
+                    }
+                    xml_parser_free($repeat_parser);
+                } else {
+                    $this->list_private++;
+                }
+            }
+            $this->list   = array();
+            $this->parser = array_pop($this->parser_stack);
+            $this->gedrec = $oldgedrec;
+        }
+        list($this->repeats, $this->repeat_bytes) = array_pop($this->repeats_stack);
+    }
+
+    /**
+     * XML <ListTotal> element handler
+     *
+     * Prints the total number of records in a list
+     * The total number is collected from
+     * List and Relatives
+     */
+    private function listTotalStartHandler() {
+        if ($this->list_private == 0) {
+            $this->current_element->addText($this->list_total);
+        } else {
+            $this->current_element->addText(($this->list_total - $this->list_private) . " / " . $this->list_total);
+        }
+    }
+
+    /**
+     * XML <Relatives>
+     *
+     * @param array $attrs an array of key value pairs for the attributes
+     */
+    private function relativesStartHandler($attrs) {
+        global $WT_TREE;
+
+        $this->process_repeats++;
+        if ($this->process_repeats > 1) {
+            return;
+        }
+
+        $sortby = "NAME";
+        if (isset($attrs['sortby'])) {
+            $sortby = $attrs['sortby'];
+        }
+        $match = array();
+        if (preg_match("/\\$(\w+)/", $sortby, $match)) {
+            $sortby = $this->vars[$match[1]]['id'];
+            $sortby = trim($sortby);
+        }
+
+        $maxgen = -1;
+        if (isset($attrs['maxgen'])) {
+            $maxgen = $attrs['maxgen'];
+        }
+        if ($maxgen == "*") {
+            $maxgen = -1;
+        }
+
+        $group = "child-family";
+        if (isset($attrs['group'])) {
+            $group = $attrs['group'];
+        }
+        if (preg_match("/\\$(\w+)/", $group, $match)) {
+            $group = $this->vars[$match[1]]['id'];
+            $group = trim($group);
+        }
+
+        $id = "";
+        if (isset($attrs['id'])) {
+            $id = $attrs['id'];
+        }
+        if (preg_match("/\\$(\w+)/", $id, $match)) {
+            $id = $this->vars[$match[1]]['id'];
+            $id = trim($id);
+        }
+
+        $this->list = array();
+        $person     = Individual::getInstance($id, $WT_TREE);
+        if (!empty($person)) {
+            $this->list[$id] = $person;
+            switch ($group) {
+            case "child-family":
+                foreach ($person->getChildFamilies() as $family) {
+                    $husband = $family->getHusband();
+                    $wife    = $family->getWife();
+                    if (!empty($husband)) {
+                        $this->list[$husband->getXref()] = $husband;
+                    }
+                    if (!empty($wife)) {
+                        $this->list[$wife->getXref()] = $wife;
+                    }
+                    $children = $family->getChildren();
+                    foreach ($children as $child) {
+                        if (!empty($child)) {
+                            $this->list[$child->getXref()] = $child;
+                        }
+                    }
+                }
+                break;
+            case "spouse-family":
+                foreach ($person->getSpouseFamilies() as $family) {
+                    $husband = $family->getHusband();
+                    $wife    = $family->getWife();
+                    if (!empty($husband)) {
+                        $this->list[$husband->getXref()] = $husband;
+                    }
+                    if (!empty($wife)) {
+                        $this->list[$wife->getXref()] = $wife;
+                    }
+                    $children = $family->getChildren();
+                    foreach ($children as $child) {
+                        if (!empty($child)) {
+                            $this->list[$child->getXref()] = $child;
+                        }
+                    }
+                }
+                break;
+            case "direct-ancestors":
+                $this->addAncestors($this->list, $id, false, $maxgen);
+                break;
+            case "ancestors":
+                $this->addAncestors($this->list, $id, true, $maxgen);
+                break;
+            case "descendants":
+                $this->list[$id]->generation = 1;
+                $this->addDescendancy($this->list, $id, false, $maxgen);
+                break;
+            case "all":
+                $this->addAncestors($this->list, $id, true, $maxgen);
+                $this->addDescendancy($this->list, $id, true, $maxgen);
+                break;
+            }
+        }
+
+        switch ($sortby) {
+        case 'NAME':
+            uasort($this->list, '\Fisharebest\Webtrees\GedcomRecord::compare');
+            break;
+        case 'BIRT:DATE':
+            uasort($this->list, '\Fisharebest\Webtrees\Individual::compareBirthDate');
+            break;
+        case 'DEAT:DATE':
+            uasort($this->list, '\Fisharebest\Webtrees\Individual::compareDeathDate');
+            break;
+        case 'generation':
+            $newarray = array();
+            reset($this->list);
+            $genCounter = 1;
+            while (count($newarray) < count($this->list)) {
+                foreach ($this->list as $key => $value) {
+                    $this->generation = $value->generation;
+                    if ($this->generation == $genCounter) {
+                        $newarray[$key]             = new \stdClass;
+                        $newarray[$key]->generation = $this->generation;
+                    }
+                }
+                $genCounter++;
+            }
+            $this->list = $newarray;
+            break;
+        default:
+            // unsorted
+            break;
+        }
+        array_push($this->repeats_stack, array($this->repeats, $this->repeat_bytes));
+        $this->repeat_bytes = xml_get_current_line_number($this->parser) + 1;
+    }
+
+    /**
+     * XML </ Relatives>
+     */
+    private function relativesEndHandler() {
+        global $report, $WT_TREE;
+
+        $this->process_repeats--;
+        if ($this->process_repeats > 0) {
+            return;
+        }
+
+        // Check if there is any relatives
+        if (count($this->list) > 0) {
+            $lineoffset = 0;
+            foreach ($this->repeats_stack as $rep) {
+                $lineoffset += $rep[1];
+            }
+            //-- read the xml from the file
+            $lines = file($report);
+            while ((strpos($lines[$lineoffset + $this->repeat_bytes], "<Relatives") === false) && (($lineoffset + $this->repeat_bytes) > 0)) {
+                $lineoffset--;
+            }
+            $lineoffset++;
+            $reportxml = "<tempdoc>\n";
+            $line_nr   = $lineoffset + $this->repeat_bytes;
+            // Relatives Level counter
+            $count = 1;
+            while (0 < $count) {
+                if (strpos($lines[$line_nr], "<Relatives") !== false) {
+                    $count++;
+                } elseif (strpos($lines[$line_nr], "</Relatives") !== false) {
+                    $count--;
+                }
+                if (0 < $count) {
+                    $reportxml .= $lines[$line_nr];
+                }
+                $line_nr++;
+            }
+            // No need to drag this
+            unset($lines);
+            $reportxml .= "</tempdoc>\n";
+            // Save original values
+            array_push($this->parser_stack, $this->parser);
+            $oldgedrec = $this->gedrec;
+
+            $this->list_total   = count($this->list);
+            $this->list_private = 0;
+            foreach ($this->list as $key => $value) {
+                if (isset($value->generation)) {
+                    $this->generation = $value->generation;
+                }
+                $tmp          = GedcomRecord::getInstance($key, $WT_TREE);
+                $this->gedrec = $tmp->privatizeGedcom(Auth::accessLevel($WT_TREE));
+
+                $repeat_parser = xml_parser_create();
+                $this->parser  = $repeat_parser;
+                xml_parser_set_option($repeat_parser, XML_OPTION_CASE_FOLDING, false);
+                xml_set_element_handler($repeat_parser, array($this, 'startElement'), array($this, 'endElement'));
+                xml_set_character_data_handler($repeat_parser, array($this, 'characterData'));
+
+                if (!xml_parse($repeat_parser, $reportxml, true)) {
+                    throw new \DomainException(sprintf("RelativesEHandler XML error: %s at line %d", xml_error_string(xml_get_error_code($repeat_parser)), xml_get_current_line_number($repeat_parser)));
+                }
+                xml_parser_free($repeat_parser);
+            }
+            // Clean up the list array
+            $this->list   = array();
+            $this->parser = array_pop($this->parser_stack);
+            $this->gedrec = $oldgedrec;
+        }
+        list($this->repeats, $this->repeat_bytes) = array_pop($this->repeats_stack);
+    }
+
+    /**
+     * XML <Generation /> element handler
+     *
+     * Prints the number of generations
+     */
+    private function generationStartHandler() {
+        $this->current_element->addText($this->generation);
+    }
+
+    /**
+     * XML <NewPage /> element handler
+     *
+     * Has to be placed in an element (header, pageheader, body or footer)
+     */
+    private function newPageStartHandler() {
+        $temp = "addpage";
+        $this->wt_report->addElement($temp);
+    }
+
+    /**
+     * XML <html>
+     *
+     * @param string  $tag   HTML tag name
+     * @param array[] $attrs an array of key value pairs for the attributes
+     */
+    private function htmlStartHandler($tag, $attrs) {
+        if ($tag === "tempdoc") {
+            return;
+        }
+        array_push($this->wt_report_stack, $this->wt_report);
+        $this->wt_report       = $this->report_root->createHTML($tag, $attrs);
+        $this->current_element = $this->wt_report;
+
+        array_push($this->print_data_stack, $this->print_data);
+        $this->print_data = true;
+    }
+
+    /**
+     * XML </html>
+     *
+     * @param string $tag
+     */
+    private function htmlEndHandler($tag) {
+        if ($tag === "tempdoc") {
+            return;
+        }
+
+        $this->print_data      = array_pop($this->print_data_stack);
+        $this->current_element = $this->wt_report;
+        $this->wt_report       = array_pop($this->wt_report_stack);
+        if (!is_null($this->wt_report)) {
+            $this->wt_report->addElement($this->current_element);
+        } else {
+            $this->wt_report = $this->current_element;
+        }
+    }
+
+    /**
+     * Handle <Input>
+     */
+    private function inputStartHandler() {
+        // Dummy function, to prevent the default HtmlStartHandler() being called
+    }
+
+    /**
+     * Handle </Input>
+     */
+    private function inputEndHandler() {
+        // Dummy function, to prevent the default HtmlEndHandler() being called
+    }
+
+    /**
+     * Handle <Report>
+     */
+    private function reportStartHandler() {
+        // Dummy function, to prevent the default HtmlStartHandler() being called
+    }
+
+    /**
+     * Handle </Report>
+     */
+    private function reportEndHandler() {
+        // Dummy function, to prevent the default HtmlEndHandler() being called
+    }
+
+    /**
+     * XML </titleEndHandler>
+     */
+    private function titleEndHandler() {
+        $this->report_root->addTitle($this->text);
+    }
+
+    /**
+     * XML </descriptionEndHandler>
+     */
+    private function descriptionEndHandler() {
+        $this->report_root->addDescription($this->text);
+    }
+
+    /**
+     * Create a list of all descendants.
+     *
+     * @param string[] $list
+     * @param string   $pid
+     * @param bool  $parents
+     * @param int  $generations
+     */
+    private function addDescendancy(&$list, $pid, $parents = false, $generations = -1) {
+        global $WT_TREE;
+
+        $person = Individual::getInstance($pid, $WT_TREE);
+        if ($person === null) {
+            return;
+        }
+        if (!isset($list[$pid])) {
+            $list[$pid] = $person;
+        }
+        if (!isset($list[$pid]->generation)) {
+            $list[$pid]->generation = 0;
+        }
+        foreach ($person->getSpouseFamilies() as $family) {
+            if ($parents) {
+                $husband = $family->getHusband();
+                $wife    = $family->getWife();
+                if ($husband) {
+                    $list[$husband->getXref()] = $husband;
+                    if (isset($list[$pid]->generation)) {
+                        $list[$husband->getXref()]->generation = $list[$pid]->generation - 1;
+                    } else {
+                        $list[$husband->getXref()]->generation = 1;
+                    }
+                }
+                if ($wife) {
+                    $list[$wife->getXref()] = $wife;
+                    if (isset($list[$pid]->generation)) {
+                        $list[$wife->getXref()]->generation = $list[$pid]->generation - 1;
+                    } else {
+                        $list[$wife->getXref()]->generation = 1;
+                    }
+                }
+            }
+            $children = $family->getChildren();
+            foreach ($children as $child) {
+                if ($child) {
+                    $list[$child->getXref()] = $child;
+                    if (isset($list[$pid]->generation)) {
+                        $list[$child->getXref()]->generation = $list[$pid]->generation + 1;
+                    } else {
+                        $list[$child->getXref()]->generation = 2;
+                    }
+                }
+            }
+            if ($generations == -1 || $list[$pid]->generation + 1 < $generations) {
+                foreach ($children as $child) {
+                    $this->addDescendancy($list, $child->getXref(), $parents, $generations); // recurse on the childs family
+                }
+            }
+        }
+    }
+
+    /**
+     * Create a list of all ancestors.
+     *
+     * @param string[] $list
+     * @param string   $pid
+     * @param bool  $children
+     * @param int  $generations
+     */
+    private function addAncestors(&$list, $pid, $children = false, $generations = -1) {
+        global $WT_TREE;
+
+        $genlist                = array($pid);
+        $list[$pid]->generation = 1;
+        while (count($genlist) > 0) {
+            $id = array_shift($genlist);
+            if (strpos($id, 'empty') === 0) {
+                continue; // id can be something like “empty7”
+            }
+            $person = Individual::getInstance($id, $WT_TREE);
+            foreach ($person->getChildFamilies() as $family) {
+                $husband = $family->getHusband();
+                $wife    = $family->getWife();
+                if ($husband) {
+                    $list[$husband->getXref()]             = $husband;
+                    $list[$husband->getXref()]->generation = $list[$id]->generation + 1;
+                }
+                if ($wife) {
+                    $list[$wife->getXref()]             = $wife;
+                    $list[$wife->getXref()]->generation = $list[$id]->generation + 1;
+                }
+                if ($generations == -1 || $list[$id]->generation + 1 < $generations) {
+                    if ($husband) {
+                        array_push($genlist, $husband->getXref());
+                    }
+                    if ($wife) {
+                        array_push($genlist, $wife->getXref());
+                    }
+                }
+                if ($children) {
+                    foreach ($family->getChildren() as $child) {
+                        $list[$child->getXref()] = $child;
+                        if (isset($list[$id]->generation)) {
+                            $list[$child->getXref()]->generation = $list[$id]->generation;
+                        } else {
+                            $list[$child->getXref()]->generation = 1;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * get gedcom tag value
+     *
+     * @param string  $tag    The tag to find, use : to delineate subtags
+     * @param int $level  The gedcom line level of the first tag to find, setting level to 0 will cause it to use 1+ the level of the incoming record
+     * @param string  $gedrec The gedcom record to get the value from
+     *
+     * @return string the value of a gedcom tag from the given gedcom record
+     */
+    private function getGedcomValue($tag, $level, $gedrec) {
+        global $WT_TREE;
+
+        if (empty($gedrec)) {
+            return '';
+        }
+        $tags      = explode(':', $tag);
+        $origlevel = $level;
+        if ($level == 0) {
+            $level = $gedrec{0} + 1;
+        }
+
+        $subrec = $gedrec;
+        foreach ($tags as $t) {
+            $lastsubrec = $subrec;
+            $subrec     = Functions::getSubRecord($level, "$level $t", $subrec);
+            if (empty($subrec) && $origlevel == 0) {
+                $level--;
+                $subrec = Functions::getSubRecord($level, "$level $t", $lastsubrec);
+            }
+            if (empty($subrec)) {
+                if ($t == "TITL") {
+                    $subrec = Functions::getSubRecord($level, "$level ABBR", $lastsubrec);
+                    if (!empty($subrec)) {
+                        $t = "ABBR";
+                    }
+                }
+                if (empty($subrec)) {
+                    if ($level > 0) {
+                        $level--;
+                    }
+                    $subrec = Functions::getSubRecord($level, "@ $t", $gedrec);
+                    if (empty($subrec)) {
+                        return '';
+                    }
+                }
+            }
+            $level++;
+        }
+        $level--;
+        $ct = preg_match("/$level $t(.*)/", $subrec, $match);
+        if ($ct == 0) {
+            $ct = preg_match("/$level @.+@ (.+)/", $subrec, $match);
+        }
+        if ($ct == 0) {
+            $ct = preg_match("/@ $t (.+)/", $subrec, $match);
+        }
+        if ($ct > 0) {
+            $value = trim($match[1]);
+            if ($t == 'NOTE' && preg_match('/^@(.+)@$/', $value, $match)) {
+                $note = Note::getInstance($match[1], $WT_TREE);
+                if ($note) {
+                    $value = $note->getNote();
+                } else {
+                    //-- set the value to the id without the @
+                    $value = $match[1];
+                }
+            }
+            if ($level != 0 || $t != "NOTE") {
+                $value .= Functions::getCont($level + 1, $subrec);
+            }
+
+            return $value;
+        }
+
+        return "";
+    }
+
+    /**
+     * Replace variable identifiers with their values.
+     *
+     * @param string $expression An expression such as "$foo == 123"
+     * @param bool   $quote      Whether to add quotation marks
+     *
+     * @return string
+     */
+    private function substituteVars($expression, $quote) {
+        $that = $this; // PHP5.3 cannot access $this inside a closure
+        return preg_replace_callback(
+            '/\$(\w+)/',
+            function ($matches) use ($that, $quote) {
+                if (isset($that->vars[$matches[1]]['id'])) {
+                    if ($quote) {
+                        return "'" . addcslashes($that->vars[$matches[1]]['id'], "'") . "'";
+                    } else {
+                        return $that->vars[$matches[1]]['id'];
+                    }
+                } else {
+                    Log::addErrorLog(sprintf('Undefined variable $%s in report', $matches[1]));
+
+                    return '$' . $matches[1];
+                }
+            },
+            $expression
+        );
+    }
 }

app/GedcomCode/GedcomCodeTemp.php

Spacing +6 added lines, -6 removed lines

@@ -57,14 +57,14 @@
 			'MADRI', 'MANAU', 'MANHA', 'MANIL', 'MANTI', 'MEDFO', 'MELBO', 'MEMPH',
 			'MERID', 'MEXIC', 'MNTVD', 'MONTE', 'MONTI', 'MONTR', 'MTIMP', 'NASHV',
 			'NAUV2', 'NAUVO', 'NBEAC', 'NUKUA', 'NYORK', 'NZEAL', 'OAKLA', 'OAXAC',
-			'OGDEN', 'OKLAH',	'OQUIR', 'ORLAN', 'PALEG', 'PALMY', 'PANAM', 'PAPEE',
-			'PAYSO', 'PERTH',	'PHOEN', 'POFFI', 'PORTL', 'PREST', 'PROCC', 'PROVO',
+			'OGDEN', 'OKLAH', 'OQUIR', 'ORLAN', 'PALEG', 'PALMY', 'PANAM', 'PAPEE',
+			'PAYSO', 'PERTH', 'PHOEN', 'POFFI', 'PORTL', 'PREST', 'PROCC', 'PROVO',
 			'QUETZ', 'RALEI', 'RECIF', 'REDLA', 'REGIN', 'RENO', 'REXBU', 'SACRA',
-			'SAMOA', 'SANTI',	'SANSA', 'SANTO', 'SDIEG', 'SDOMI', 'SEATT', 'SEOUL',
-			'SGEOR', 'SJOSE',	'SLAKE', 'SLOUI', 'SNOWF','SPAUL', 'SPMIN', 'SPOKA',
+			'SAMOA', 'SANTI', 'SANSA', 'SANTO', 'SDIEG', 'SDOMI', 'SEATT', 'SEOUL',
+			'SGEOR', 'SJOSE', 'SLAKE', 'SLOUI', 'SNOWF', 'SPAUL', 'SPMIN', 'SPOKA',
 			'STOCK', 'SUVA', 'SWISS', 'SYDNE', 'TAIPE', 'TAMPI', 'TEGUC', 'TGUTI',
-			'TIHUA', 'TOKYO',	'TORNO', 'TRUJI', 'TWINF', 'VANCO', 'VERAC', 'VERNA',
-			'VILLA', 'WASHI',	'WINTE',
+			'TIHUA', 'TOKYO', 'TORNO', 'TRUJI', 'TWINF', 'VANCO', 'VERAC', 'VERNA',
+			'VILLA', 'WASHI', 'WINTE',
 		);
 	}
 

Indentation +381 added lines, -381 removed lines

@@ -21,389 +21,389 @@
  * Class GedcomCodeTemp - Functions and logic for GEDCOM "TEMP" codes
  */
 class GedcomCodeTemp {
-	/**
-	 * A list of GEDCOM tags that require a TEMP subtag
-	 *
-	 * @param string $tag
-	 *
-	 * @return bool
-	 */
-	public static function isTagLDS($tag) {
-		return $tag === 'BAPL' || $tag === 'CONL' || $tag === 'ENDL' || $tag === 'SLGC' || $tag === 'SLGS';
-	}
+    /**
+     * A list of GEDCOM tags that require a TEMP subtag
+     *
+     * @param string $tag
+     *
+     * @return bool
+     */
+    public static function isTagLDS($tag) {
+        return $tag === 'BAPL' || $tag === 'CONL' || $tag === 'ENDL' || $tag === 'SLGC' || $tag === 'SLGS';
+    }
 
-	/**
-	 * A list of all temple codes, from the GEDCOM 5.5.1 specification
-	 *
-	 * Note that this list is out-of-date. We could add recently built
-	 * temples, but what codes would we use?
-	 *
-	 * @link http://en.wikipedia.org/wiki/List_of_temples_of_The_Church_of_Jesus_Christ_of_Latter-day_Saints
-	 * @link http://www.ldschurchtemples.com/codes/
-	 *
-	 * @return string[]
-	 */
-	public static function templeCodes() {
-		return array(
-			'ABA', 'ACCRA', 'ADELA', 'ALBER', 'ALBUQ', 'ANCHO', 'ARIZO', 'ASUNC',
-			'ATLAN', 'BAIRE', 'BILLI', 'BIRMI', 'BISMA', 'BOGOT', 'BOISE', 'BOSTO',
-			'BOUNT', 'BRIGH', 'BRISB', 'BROUG', 'CALGA', 'CAMPI', 'CARAC', 'CEBUP',
-			'CHICA', 'CIUJU', 'COCHA', 'COLJU', 'COLSC', 'COLUM', 'COPEN', 'CORDO',
-			'CRIVE', 'CURIT', 'DALLA', 'DENVE', 'DETRO', 'DRAPE', 'EDMON', 'EHOUS',
-			'FORTL', 'FRANK', 'FREIB', 'FRESN', 'FUKUO', 'GILAV', 'GILBE', 'GUADA',
-			'GUATE', 'GUAYA', 'HAGUE', 'HALIF', 'HARTF', 'HAWAI', 'HELSI', 'HERMO',
-			'HKONG', 'HOUST', 'IFALL', 'INDIA', 'JOHAN', 'JRIVE', 'KANSA', 'KONA',
-			'KYIV', 'LANGE', 'LIMA', 'LOGAN', 'LONDO', 'LOUIS', 'LUBBO', 'LVEGA',
-			'MADRI', 'MANAU', 'MANHA', 'MANIL', 'MANTI', 'MEDFO', 'MELBO', 'MEMPH',
-			'MERID', 'MEXIC', 'MNTVD', 'MONTE', 'MONTI', 'MONTR', 'MTIMP', 'NASHV',
-			'NAUV2', 'NAUVO', 'NBEAC', 'NUKUA', 'NYORK', 'NZEAL', 'OAKLA', 'OAXAC',
-			'OGDEN', 'OKLAH',	'OQUIR', 'ORLAN', 'PALEG', 'PALMY', 'PANAM', 'PAPEE',
-			'PAYSO', 'PERTH',	'PHOEN', 'POFFI', 'PORTL', 'PREST', 'PROCC', 'PROVO',
-			'QUETZ', 'RALEI', 'RECIF', 'REDLA', 'REGIN', 'RENO', 'REXBU', 'SACRA',
-			'SAMOA', 'SANTI',	'SANSA', 'SANTO', 'SDIEG', 'SDOMI', 'SEATT', 'SEOUL',
-			'SGEOR', 'SJOSE',	'SLAKE', 'SLOUI', 'SNOWF','SPAUL', 'SPMIN', 'SPOKA',
-			'STOCK', 'SUVA', 'SWISS', 'SYDNE', 'TAIPE', 'TAMPI', 'TEGUC', 'TGUTI',
-			'TIHUA', 'TOKYO',	'TORNO', 'TRUJI', 'TWINF', 'VANCO', 'VERAC', 'VERNA',
-			'VILLA', 'WASHI',	'WINTE',
-		);
-	}
+    /**
+     * A list of all temple codes, from the GEDCOM 5.5.1 specification
+     *
+     * Note that this list is out-of-date. We could add recently built
+     * temples, but what codes would we use?
+     *
+     * @link http://en.wikipedia.org/wiki/List_of_temples_of_The_Church_of_Jesus_Christ_of_Latter-day_Saints
+     * @link http://www.ldschurchtemples.com/codes/
+     *
+     * @return string[]
+     */
+    public static function templeCodes() {
+        return array(
+            'ABA', 'ACCRA', 'ADELA', 'ALBER', 'ALBUQ', 'ANCHO', 'ARIZO', 'ASUNC',
+            'ATLAN', 'BAIRE', 'BILLI', 'BIRMI', 'BISMA', 'BOGOT', 'BOISE', 'BOSTO',
+            'BOUNT', 'BRIGH', 'BRISB', 'BROUG', 'CALGA', 'CAMPI', 'CARAC', 'CEBUP',
+            'CHICA', 'CIUJU', 'COCHA', 'COLJU', 'COLSC', 'COLUM', 'COPEN', 'CORDO',
+            'CRIVE', 'CURIT', 'DALLA', 'DENVE', 'DETRO', 'DRAPE', 'EDMON', 'EHOUS',
+            'FORTL', 'FRANK', 'FREIB', 'FRESN', 'FUKUO', 'GILAV', 'GILBE', 'GUADA',
+            'GUATE', 'GUAYA', 'HAGUE', 'HALIF', 'HARTF', 'HAWAI', 'HELSI', 'HERMO',
+            'HKONG', 'HOUST', 'IFALL', 'INDIA', 'JOHAN', 'JRIVE', 'KANSA', 'KONA',
+            'KYIV', 'LANGE', 'LIMA', 'LOGAN', 'LONDO', 'LOUIS', 'LUBBO', 'LVEGA',
+            'MADRI', 'MANAU', 'MANHA', 'MANIL', 'MANTI', 'MEDFO', 'MELBO', 'MEMPH',
+            'MERID', 'MEXIC', 'MNTVD', 'MONTE', 'MONTI', 'MONTR', 'MTIMP', 'NASHV',
+            'NAUV2', 'NAUVO', 'NBEAC', 'NUKUA', 'NYORK', 'NZEAL', 'OAKLA', 'OAXAC',
+            'OGDEN', 'OKLAH',	'OQUIR', 'ORLAN', 'PALEG', 'PALMY', 'PANAM', 'PAPEE',
+            'PAYSO', 'PERTH',	'PHOEN', 'POFFI', 'PORTL', 'PREST', 'PROCC', 'PROVO',
+            'QUETZ', 'RALEI', 'RECIF', 'REDLA', 'REGIN', 'RENO', 'REXBU', 'SACRA',
+            'SAMOA', 'SANTI',	'SANSA', 'SANTO', 'SDIEG', 'SDOMI', 'SEATT', 'SEOUL',
+            'SGEOR', 'SJOSE',	'SLAKE', 'SLOUI', 'SNOWF','SPAUL', 'SPMIN', 'SPOKA',
+            'STOCK', 'SUVA', 'SWISS', 'SYDNE', 'TAIPE', 'TAMPI', 'TEGUC', 'TGUTI',
+            'TIHUA', 'TOKYO',	'TORNO', 'TRUJI', 'TWINF', 'VANCO', 'VERAC', 'VERNA',
+            'VILLA', 'WASHI',	'WINTE',
+        );
+    }
 
-	/**
-	 * Get the localized name for a temple code
-	 *
-	 * @param string $temple_code
-	 *
-	 * @return string
-	 */
-	public static function templeName($temple_code) {
-		switch ($temple_code) {
-		case 'ABA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Aba, Nigeria');
-		case 'ACCRA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Accra, Ghana');
-		case 'ADELA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Adelaide, Australia');
-		case 'ALBER':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Cardston, Alberta, Canada');
-		case 'ALBUQ':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Albuquerque, New Mexico, United States');
-		case 'ANCHO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Anchorage, Alaska, United States');
-		case 'APIA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Apia, Samoa');
-		case 'ARIZO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Mesa, Arizona, United States');
-		case 'ASUNC':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Asuncion, Paraguay');
-		case 'ATLAN':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Atlanta, Georgia, United States');
-		case 'BAIRE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Buenos Aires, Argentina');
-		case 'BILLI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Billings, Montana, United States');
-		case 'BIRMI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Birmingham, Alabama, United States');
-		case 'BISMA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Bismarck, North Dakota, United States');
-		case 'BOGOT':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Bogota, Colombia');
-		case 'BOISE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Boise, Idaho, United States');
-		case 'BOSTO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Boston, Massachusetts, United States');
-		case 'BOUNT':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Bountiful, Utah, United States');
-		case 'BRIGH':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Brigham City, Utah, United States');
-		case 'BRISB':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Brisbane, Australia');
-		case 'BROUG':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Baton Rouge, Louisiana, United States');
-		case 'CALGA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Calgary, Alberta, Canada');
-		case 'CAMPI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Campinas, Brazil');
-		case 'CARAC':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Caracas, Venezuela');
-		case 'CEBUP':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Cebu City, Philippines');
-		case 'CHICA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Chicago, Illinois, United States');
-		case 'CIUJU':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Ciudad Juarez, Mexico');
-		case 'COCHA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Cochabamba, Bolivia');
-		case 'COLJU':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Colonia Juarez, Mexico');
-		case 'COLSC':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Columbia, South Carolina, United States');
-		case 'COLUM':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Columbus, Ohio, United States');
-		case 'COPEN':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Copenhagen, Denmark');
-		case 'CORDO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Cordoba, Argentina');
-		case 'CRIVE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Columbia River, Washington, United States');
-		case 'CURIT':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Curitiba, Brazil');
-		case 'DALLA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Dallas, Texas, United States');
-		case 'DENVE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Denver, Colorado, United States');
-		case 'DETRO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Detroit, Michigan, United States');
-		case 'DRAPE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Draper, Utah, United States');
-		case 'EDMON':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Edmonton, Alberta, Canada');
-		case 'EHOUS':
-			return /* I18N: Location of an historic LDS church temple - http://en.wikipedia.org/wiki/Endowment_house */ I18N::translate('Endowment House');
-		case 'FORTL':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Fort Lauderdale, Florida, United States');
-		case 'FRANK':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Frankfurt am Main, Germany');
-		case 'FREIB':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Freiburg, Germany');
-		case 'FRESN':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Fresno, California, United States');
-		case 'FUKUO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Fukuoka, Japan');
-		case 'GILAV':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Gila Valley, Arizona, United States');
-		case 'GILBE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Gilbert, Arizona, United States');
-		case 'GUADA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Guadalajara, Mexico');
-		case 'GUATE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Guatemala City, Guatemala');
-		case 'GUAYA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Guayaquil, Ecuador');
-		case 'HAGUE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('The Hague, Netherlands');
-		case 'HALIF':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Halifax, Nova Scotia, Canada');
-		case 'HARTF':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Hartford, Connecticut, United States');
-		case 'HAWAI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Laie, Hawaii, United States');
-		case 'HELSI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Helsinki, Finland');
-		case 'HERMO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Hermosillo, Mexico');
-		case 'HKONG':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Hong Kong');
-		case 'HOUST':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Houston, Texas, United States');
-		case 'IFALL':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Idaho Falls, Idaho, United States');
-		case 'INDIA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Indianapolis, Indiana, United States');
-		case 'JOHAN':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Johannesburg, South Africa');
-		case 'JRIVE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Jordan River, Utah, United States');
-		case 'KANSA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Kansas City, Missouri, United States');
-		case 'KONA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Kona, Hawaii, United States');
-		case 'KYIV':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Kiev, Ukraine');
-		case 'LANGE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Los Angeles, California, United States');
-		case 'LIMA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Lima, Peru');
-		case 'LOGAN':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Logan, Utah, United States');
-		case 'LONDO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('London, England');
-		case 'LOUIS':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Louisville, Kentucky, United States');
-		case 'LUBBO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Lubbock, Texas, United States');
-		case 'LVEGA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Las Vegas, Nevada, United States');
-		case 'MADRI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Madrid, Spain');
-		case 'MANAU':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Manaus, Brazil');
-		case 'MANHA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Manhattan, New York, United States');
-		case 'MANIL':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Manila, Philippines');
-		case 'MANTI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Manti, Utah, United States');
-		case 'MEDFO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Medford, Oregon, United States');
-		case 'MELBO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Melbourne, Australia');
-		case 'MEMPH':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Memphis, Tennessee, United States');
-		case 'MERID':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Merida, Mexico');
-		case 'MEXIC':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Mexico City, Mexico');
-		case 'MNTVD':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Montevideo, Uruguay');
-		case 'MONTE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Monterrey, Mexico');
-		case 'MONTI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Monticello, Utah, United States');
-		case 'MONTR':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Montreal, Quebec, Canada');
-		case 'MTIMP':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Mount Timpanogos, Utah, United States');
-		case 'NASHV':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Nashville, Tennessee, United States');
-		case 'NAUV2':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Nauvoo (new), Illinois, United States');
-		case 'NAUVO':
-			return /* I18N: Location of an historic LDS church temple */ I18N::translate('Nauvoo (original), Illinois, United States');
-		case 'NBEAC':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Newport Beach, California, United States');
-		case 'NUKUA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Nuku’Alofa, Tonga');
-		case 'NYORK':
-			return /* I18N: Location of an historic LDS church temple */ I18N::translate('New York, New York, United States');
-		case 'NZEAL':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Hamilton, New Zealand');
-		case 'OAKLA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Oakland, California, United States');
-		case 'OAXAC':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Oaxaca, Mexico');
-		case 'OGDEN':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Ogden, Utah, United States');
-		case 'OKLAH':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Oklahoma City, Oklahoma, United States');
-		case 'OQUIR':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Oquirrh Mountain, Utah, United States');
-		case 'ORLAN':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Orlando, Florida, United States');
-		case 'PALEG':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Porto Alegre, Brazil');
-		case 'PALMY':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Palmyra, New York, United States');
-		case 'PANAM':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Panama City, Panama');
-		case 'PAPEE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Papeete, Tahiti');
-		case 'PAYSO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Payson, Utah, United States');
-		case 'PERTH':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Perth, Australia');
-		case 'PHOEN':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Phoenix, Arizona, United States');
-		case 'POFFI':
-			return /* I18N: I18N: Location of an historic LDS church temple - http://en.wikipedia.org/wiki/President_of_the_Church */ I18N::translate('President’s Office');
-		case 'PORTL':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Portland, Oregon, United States');
-		case 'PREST':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Preston, England');
-		case 'PROCC':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Provo City Center, Utah, United States');
-		case 'PROVO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Provo, Utah, United States');
-		case 'QUETZ':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Quetzaltenango, Guatemala');
-		case 'RALEI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Raleigh, North Carolina, United States');
-		case 'RECIF':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Recife, Brazil');
-		case 'REDLA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Redlands, California, United States');
-		case 'REGIN':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Regina, Saskatchewan, Canada');
-		case 'RENO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Reno, Nevada, United States');
-		case 'REXBU':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Rexburg, Idaho, United States');
-		case 'SACRA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Sacramento, California, United States');
-		case 'SANSA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('San Salvador, El Salvador');
-		case 'SANTI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Santiago, Chile');
-		case 'SANTO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('San Antonio, Texas, United States');
-		case 'SDIEG':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('San Diego, California, United States');
-		case 'SDOMI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Santo Domingo, Dominican Republic');
-		case 'SEATT':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Seattle, Washington, United States');
-		case 'SEOUL':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Seoul, Korea');
-		case 'SGEOR':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('St. George, Utah, United States');
-		case 'SJOSE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('San Jose, Costa Rica');
-		case 'SLAKE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Salt Lake City, Utah, United States');
-		case 'SLOUI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('St. Louis, Missouri, United States');
-		case 'SNOWF':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Snowflake, Arizona, United States');
-		case 'SPAUL':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Sao Paulo, Brazil');
-		case 'SPMIN':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('St. Paul, Minnesota, United States');
-		case 'SPOKA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Spokane, Washington, United States');
-		case 'STOCK':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Stockholm, Sweden');
-		case 'SUVA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Suva, Fiji');
-		case 'SWISS':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Bern, Switzerland');
-		case 'SYDNE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Sydney, Australia');
-		case 'TAIPE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Taipei, Taiwan');
-		case 'TAMPI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Tampico, Mexico');
-		case 'TEGUC':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Tegucigalpa, Honduras');
-		case 'TGUTI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Tuxtla Gutierrez, Mexico');
-		case 'TIJUA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Tijuana, Mexico');
-		case 'TOKYO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Tokyo, Japan');
-		case 'TORNO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Toronto, Ontario, Canada');
-		case 'TRUJI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Trujillo, Peru');
-		case 'TWINF':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Twin Falls, Idaho, United States');
-		case 'VANCO':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Vancouver, British Columbia, Canada');
-		case 'VERAC':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Veracruz, Mexico');
-		case 'VERNA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Vernal, Utah, United States');
-		case 'VILLA':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Villa Hermosa, Mexico');
-		case 'WASHI':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Washington, District of Columbia, United States');
-		case 'WINTE':
-			return /* I18N: Location of an LDS church temple */ I18N::translate('Winter Quarters, Nebraska, United States');
-		default:
-			return $temple_code;
-		}
-	}
+    /**
+     * Get the localized name for a temple code
+     *
+     * @param string $temple_code
+     *
+     * @return string
+     */
+    public static function templeName($temple_code) {
+        switch ($temple_code) {
+        case 'ABA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Aba, Nigeria');
+        case 'ACCRA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Accra, Ghana');
+        case 'ADELA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Adelaide, Australia');
+        case 'ALBER':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Cardston, Alberta, Canada');
+        case 'ALBUQ':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Albuquerque, New Mexico, United States');
+        case 'ANCHO':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Anchorage, Alaska, United States');
+        case 'APIA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Apia, Samoa');
+        case 'ARIZO':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Mesa, Arizona, United States');
+        case 'ASUNC':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Asuncion, Paraguay');
+        case 'ATLAN':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Atlanta, Georgia, United States');
+        case 'BAIRE':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Buenos Aires, Argentina');
+        case 'BILLI':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Billings, Montana, United States');
+        case 'BIRMI':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Birmingham, Alabama, United States');
+        case 'BISMA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Bismarck, North Dakota, United States');
+        case 'BOGOT':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Bogota, Colombia');
+        case 'BOISE':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Boise, Idaho, United States');
+        case 'BOSTO':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Boston, Massachusetts, United States');
+        case 'BOUNT':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Bountiful, Utah, United States');
+        case 'BRIGH':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Brigham City, Utah, United States');
+        case 'BRISB':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Brisbane, Australia');
+        case 'BROUG':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Baton Rouge, Louisiana, United States');
+        case 'CALGA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Calgary, Alberta, Canada');
+        case 'CAMPI':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Campinas, Brazil');
+        case 'CARAC':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Caracas, Venezuela');
+        case 'CEBUP':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Cebu City, Philippines');
+        case 'CHICA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Chicago, Illinois, United States');
+        case 'CIUJU':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Ciudad Juarez, Mexico');
+        case 'COCHA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Cochabamba, Bolivia');
+        case 'COLJU':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Colonia Juarez, Mexico');
+        case 'COLSC':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Columbia, South Carolina, United States');
+        case 'COLUM':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Columbus, Ohio, United States');
+        case 'COPEN':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Copenhagen, Denmark');
+        case 'CORDO':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Cordoba, Argentina');
+        case 'CRIVE':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Columbia River, Washington, United States');
+        case 'CURIT':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Curitiba, Brazil');
+        case 'DALLA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Dallas, Texas, United States');
+        case 'DENVE':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Denver, Colorado, United States');
+        case 'DETRO':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Detroit, Michigan, United States');
+        case 'DRAPE':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Draper, Utah, United States');
+        case 'EDMON':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Edmonton, Alberta, Canada');
+        case 'EHOUS':
+            return /* I18N: Location of an historic LDS church temple - http://en.wikipedia.org/wiki/Endowment_house */ I18N::translate('Endowment House');
+        case 'FORTL':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Fort Lauderdale, Florida, United States');
+        case 'FRANK':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Frankfurt am Main, Germany');
+        case 'FREIB':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Freiburg, Germany');
+        case 'FRESN':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Fresno, California, United States');
+        case 'FUKUO':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Fukuoka, Japan');
+        case 'GILAV':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Gila Valley, Arizona, United States');
+        case 'GILBE':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Gilbert, Arizona, United States');
+        case 'GUADA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Guadalajara, Mexico');
+        case 'GUATE':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Guatemala City, Guatemala');
+        case 'GUAYA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Guayaquil, Ecuador');
+        case 'HAGUE':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('The Hague, Netherlands');
+        case 'HALIF':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Halifax, Nova Scotia, Canada');
+        case 'HARTF':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Hartford, Connecticut, United States');
+        case 'HAWAI':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Laie, Hawaii, United States');
+        case 'HELSI':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Helsinki, Finland');
+        case 'HERMO':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Hermosillo, Mexico');
+        case 'HKONG':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Hong Kong');
+        case 'HOUST':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Houston, Texas, United States');
+        case 'IFALL':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Idaho Falls, Idaho, United States');
+        case 'INDIA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Indianapolis, Indiana, United States');
+        case 'JOHAN':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Johannesburg, South Africa');
+        case 'JRIVE':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Jordan River, Utah, United States');
+        case 'KANSA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Kansas City, Missouri, United States');
+        case 'KONA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Kona, Hawaii, United States');
+        case 'KYIV':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Kiev, Ukraine');
+        case 'LANGE':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Los Angeles, California, United States');
+        case 'LIMA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Lima, Peru');
+        case 'LOGAN':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Logan, Utah, United States');
+        case 'LONDO':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('London, England');
+        case 'LOUIS':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Louisville, Kentucky, United States');
+        case 'LUBBO':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Lubbock, Texas, United States');
+        case 'LVEGA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Las Vegas, Nevada, United States');
+        case 'MADRI':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Madrid, Spain');
+        case 'MANAU':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Manaus, Brazil');
+        case 'MANHA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Manhattan, New York, United States');
+        case 'MANIL':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Manila, Philippines');
+        case 'MANTI':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Manti, Utah, United States');
+        case 'MEDFO':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Medford, Oregon, United States');
+        case 'MELBO':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Melbourne, Australia');
+        case 'MEMPH':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Memphis, Tennessee, United States');
+        case 'MERID':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Merida, Mexico');
+        case 'MEXIC':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Mexico City, Mexico');
+        case 'MNTVD':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Montevideo, Uruguay');
+        case 'MONTE':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Monterrey, Mexico');
+        case 'MONTI':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Monticello, Utah, United States');
+        case 'MONTR':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Montreal, Quebec, Canada');
+        case 'MTIMP':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Mount Timpanogos, Utah, United States');
+        case 'NASHV':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Nashville, Tennessee, United States');
+        case 'NAUV2':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Nauvoo (new), Illinois, United States');
+        case 'NAUVO':
+            return /* I18N: Location of an historic LDS church temple */ I18N::translate('Nauvoo (original), Illinois, United States');
+        case 'NBEAC':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Newport Beach, California, United States');
+        case 'NUKUA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Nuku’Alofa, Tonga');
+        case 'NYORK':
+            return /* I18N: Location of an historic LDS church temple */ I18N::translate('New York, New York, United States');
+        case 'NZEAL':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Hamilton, New Zealand');
+        case 'OAKLA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Oakland, California, United States');
+        case 'OAXAC':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Oaxaca, Mexico');
+        case 'OGDEN':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Ogden, Utah, United States');
+        case 'OKLAH':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Oklahoma City, Oklahoma, United States');
+        case 'OQUIR':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Oquirrh Mountain, Utah, United States');
+        case 'ORLAN':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Orlando, Florida, United States');
+        case 'PALEG':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Porto Alegre, Brazil');
+        case 'PALMY':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Palmyra, New York, United States');
+        case 'PANAM':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Panama City, Panama');
+        case 'PAPEE':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Papeete, Tahiti');
+        case 'PAYSO':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Payson, Utah, United States');
+        case 'PERTH':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Perth, Australia');
+        case 'PHOEN':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Phoenix, Arizona, United States');
+        case 'POFFI':
+            return /* I18N: I18N: Location of an historic LDS church temple - http://en.wikipedia.org/wiki/President_of_the_Church */ I18N::translate('President’s Office');
+        case 'PORTL':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Portland, Oregon, United States');
+        case 'PREST':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Preston, England');
+        case 'PROCC':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Provo City Center, Utah, United States');
+        case 'PROVO':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Provo, Utah, United States');
+        case 'QUETZ':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Quetzaltenango, Guatemala');
+        case 'RALEI':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Raleigh, North Carolina, United States');
+        case 'RECIF':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Recife, Brazil');
+        case 'REDLA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Redlands, California, United States');
+        case 'REGIN':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Regina, Saskatchewan, Canada');
+        case 'RENO':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Reno, Nevada, United States');
+        case 'REXBU':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Rexburg, Idaho, United States');
+        case 'SACRA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Sacramento, California, United States');
+        case 'SANSA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('San Salvador, El Salvador');
+        case 'SANTI':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Santiago, Chile');
+        case 'SANTO':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('San Antonio, Texas, United States');
+        case 'SDIEG':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('San Diego, California, United States');
+        case 'SDOMI':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Santo Domingo, Dominican Republic');
+        case 'SEATT':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Seattle, Washington, United States');
+        case 'SEOUL':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Seoul, Korea');
+        case 'SGEOR':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('St. George, Utah, United States');
+        case 'SJOSE':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('San Jose, Costa Rica');
+        case 'SLAKE':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Salt Lake City, Utah, United States');
+        case 'SLOUI':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('St. Louis, Missouri, United States');
+        case 'SNOWF':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Snowflake, Arizona, United States');
+        case 'SPAUL':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Sao Paulo, Brazil');
+        case 'SPMIN':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('St. Paul, Minnesota, United States');
+        case 'SPOKA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Spokane, Washington, United States');
+        case 'STOCK':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Stockholm, Sweden');
+        case 'SUVA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Suva, Fiji');
+        case 'SWISS':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Bern, Switzerland');
+        case 'SYDNE':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Sydney, Australia');
+        case 'TAIPE':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Taipei, Taiwan');
+        case 'TAMPI':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Tampico, Mexico');
+        case 'TEGUC':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Tegucigalpa, Honduras');
+        case 'TGUTI':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Tuxtla Gutierrez, Mexico');
+        case 'TIJUA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Tijuana, Mexico');
+        case 'TOKYO':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Tokyo, Japan');
+        case 'TORNO':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Toronto, Ontario, Canada');
+        case 'TRUJI':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Trujillo, Peru');
+        case 'TWINF':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Twin Falls, Idaho, United States');
+        case 'VANCO':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Vancouver, British Columbia, Canada');
+        case 'VERAC':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Veracruz, Mexico');
+        case 'VERNA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Vernal, Utah, United States');
+        case 'VILLA':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Villa Hermosa, Mexico');
+        case 'WASHI':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Washington, District of Columbia, United States');
+        case 'WINTE':
+            return /* I18N: Location of an LDS church temple */ I18N::translate('Winter Quarters, Nebraska, United States');
+        default:
+            return $temple_code;
+        }
+    }
 
-	/**
-	 * A sorted list of all temple names
-	 *
-	 * @return string[]
-	 */
-	public static function templeNames() {
-		$temple_names = array();
-		foreach (self::templeCodes() as $temple_code) {
-			$temple_names[$temple_code] = self::templeName($temple_code);
-		}
-		uasort($temple_names, '\Fisharebest\Webtrees\I18N::strcasecmp');
+    /**
+     * A sorted list of all temple names
+     *
+     * @return string[]
+     */
+    public static function templeNames() {
+        $temple_names = array();
+        foreach (self::templeCodes() as $temple_code) {
+            $temple_names[$temple_code] = self::templeName($temple_code);
+        }
+        uasort($temple_names, '\Fisharebest\Webtrees\I18N::strcasecmp');
 
-		return $temple_names;
-	}
+        return $temple_names;
+    }
 }

edituser.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 $form_pass2          = Filter::post('form_pass2', WT_REGEX_PASSWORD);
 $form_email          = Filter::postEmail('form_email');
 $form_rootid         = Filter::post('form_rootid', WT_REGEX_XREF);
-$form_theme          = Filter::post('form_theme', implode('|', array_keys(Theme::themeNames())), '');;
+$form_theme          = Filter::post('form_theme', implode('|', array_keys(Theme::themeNames())), ''); ;
 $form_language       = Filter::post('form_language');
 $form_timezone       = Filter::post('form_timezone');
 $form_contact_method = Filter::post('form_contact_method');

Indentation +58 added lines, -58 removed lines

@@ -31,9 +31,9 @@ 
 
 // Need to be logged in
 if (!Auth::check()) {
-	header('Location: ' . WT_BASE_URL);
+    header('Location: ' . WT_BASE_URL);
 
-	return;
+    return;
 }
 
 // Extract form variables
@@ -52,66 +52,66 @@ 
 
 // Respond to form action
 if ($form_action && Filter::checkCsrf()) {
-	switch ($form_action) {
-	case 'update':
-		if ($form_username !== Auth::user()->getUserName() && User::findByUserName($form_username)) {
-			FlashMessages::addMessage(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.'));
-		} elseif ($form_email !== Auth::user()->getEmail() && User::findByEmail($form_email)) {
-			FlashMessages::addMessage(I18N::translate('Duplicate email address. A user with that email already exists.'));
-		} else {
-			// Change username
-			if ($form_username !== Auth::user()->getUserName()) {
-				Log::addAuthenticationLog('User ' . Auth::user()->getUserName() . ' renamed to ' . $form_username);
-				Auth::user()->setUserName($form_username);
-			}
-
-			// Change password
-			if ($form_pass1 && $form_pass1 === $form_pass2) {
-				Auth::user()->setPassword($form_pass1);
-			}
-
-			// Change other settings
-			Auth::user()
-				->setRealName($form_realname)
-				->setEmail($form_email)
-				->setPreference('language', $form_language)
-				->setPreference('TIMEZONE', $form_timezone)
-				->setPreference('contactmethod', $form_contact_method)
-				->setPreference('visibleonline', $form_visible_online ? '1' : '0');
-
-			if ($form_theme === null) {
-				Auth::user()->deletePreference('theme');
-			} else {
-				Auth::user()->setPreference('theme', $form_theme);
-			}
-
-			$WT_TREE->setUserPreference(Auth::user(), 'rootid', $form_rootid);
-		}
-		break;
-
-	case 'delete':
-		// An administrator can only be deleted by another administrator
-		if (!Auth::user()->getPreference('canadmin')) {
-			// Keep a reference to the currently logged in user because after logging out this user,
-			// a call to Auth::user() will not return this user anymore
-			$currentUser = Auth::user();
-			Auth::logout();
-			$currentUser->delete();
-		}
-		break;
-	}
-
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
+    switch ($form_action) {
+    case 'update':
+        if ($form_username !== Auth::user()->getUserName() && User::findByUserName($form_username)) {
+            FlashMessages::addMessage(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.'));
+        } elseif ($form_email !== Auth::user()->getEmail() && User::findByEmail($form_email)) {
+            FlashMessages::addMessage(I18N::translate('Duplicate email address. A user with that email already exists.'));
+        } else {
+            // Change username
+            if ($form_username !== Auth::user()->getUserName()) {
+                Log::addAuthenticationLog('User ' . Auth::user()->getUserName() . ' renamed to ' . $form_username);
+                Auth::user()->setUserName($form_username);
+            }
+
+            // Change password
+            if ($form_pass1 && $form_pass1 === $form_pass2) {
+                Auth::user()->setPassword($form_pass1);
+            }
+
+            // Change other settings
+            Auth::user()
+                ->setRealName($form_realname)
+                ->setEmail($form_email)
+                ->setPreference('language', $form_language)
+                ->setPreference('TIMEZONE', $form_timezone)
+                ->setPreference('contactmethod', $form_contact_method)
+                ->setPreference('visibleonline', $form_visible_online ? '1' : '0');
+
+            if ($form_theme === null) {
+                Auth::user()->deletePreference('theme');
+            } else {
+                Auth::user()->setPreference('theme', $form_theme);
+            }
+
+            $WT_TREE->setUserPreference(Auth::user(), 'rootid', $form_rootid);
+        }
+        break;
+
+    case 'delete':
+        // An administrator can only be deleted by another administrator
+        if (!Auth::user()->getPreference('canadmin')) {
+            // Keep a reference to the currently logged in user because after logging out this user,
+            // a call to Auth::user() will not return this user anymore
+            $currentUser = Auth::user();
+            Auth::logout();
+            $currentUser->delete();
+        }
+        break;
+    }
+
+    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+    return;
 }
 
 $controller = new PageController;
 $controller
-	->setPageTitle(I18N::translate('My account'))
-	->pageHeader()
-	->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-	->addInlineJavascript('autocomplete();');
+    ->setPageTitle(I18N::translate('My account'))
+    ->pageHeader()
+    ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+    ->addInlineJavascript('autocomplete();');
 
 $my_individual_record = Individual::getInstance($WT_TREE->getUserPreference(Auth::user(), 'gedcomid'), $WT_TREE);
 $default_individual   = Individual::getInstance($WT_TREE->getUserPreference(Auth::user(), 'rootid'), $WT_TREE);

app/Functions/FunctionsPrintLists.php

Spacing +6 added lines, -6 removed lines

@@ -1820,24 +1820,24 @@
 			if ($endjd === WT_CLIENT_JD) {
 				// We're dealing with the Today’s Events block
 				if ($filter === 0) {
-					$html .=  I18N::translate('No events exist for today.');
+					$html .= I18N::translate('No events exist for today.');
 				} else {
-					$html .=  I18N::translate('No events for living individuals exist for today.');
+					$html .= I18N::translate('No events for living individuals exist for today.');
 				}
 			} else {
 				// We're dealing with the Upcoming Events block
 				if ($filter === 0) {
 					if ($endjd === $startjd) {
-						$html .=  I18N::translate('No events exist for tomorrow.');
+						$html .= I18N::translate('No events exist for tomorrow.');
 					} else {
-						$html .=  /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
+						$html .= /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
 					}
 				} else {
 					if ($endjd === $startjd) {
-						$html .=  I18N::translate('No events for living individuals exist for tomorrow.');
+						$html .= I18N::translate('No events for living individuals exist for tomorrow.');
 					} else {
 						// I18N: translation for %s==1 is unused; it is translated separately as “tomorrow”
-						$html .=  I18N::plural('No events for living people exist for the next %s day.', 'No events for living people exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
+						$html .= I18N::plural('No events for living people exist for the next %s day.', 'No events for living people exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
 					}
 				}
 			}

Indentation +1341 added lines, -1341 removed lines

@@ -37,49 +37,49 @@ 
  * Class FunctionsPrintLists - create sortable lists using datatables.net
  */
 class FunctionsPrintLists {
-	/**
-	 * Generate a SURN,GIVN and GIVN,SURN sortable name for an individual.
-	 * This allows table data to sort by surname or given names.
-	 *
-	 * Use AAAA as a separator (instead of ","), as Javascript localeCompare()
-	 * ignores punctuation and "ANN,ROACH" would sort after "ANNE,ROACH",
-	 * instead of before it.
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return string[]
-	 */
-	private static function sortableNames(Individual $individual) {
-		$names   = $individual->getAllNames();
-		$primary = $individual->getPrimaryName();
-
-		list($surn, $givn) = explode(',', $names[$primary]['sort']);
-
-		$givn = str_replace('@P.N.', 'AAAA', $givn);
-		$surn = str_replace('@N.N.', 'AAAA', $surn);
-
-		return array(
-			$surn . 'AAAA' . $givn,
-			$givn . 'AAAA' . $surn,
-		);
-	}
-
-	/**
-	 * Print a table of individuals
-	 *
-	 * @param Individual[] $indiviudals
-	 * @param string       $option
-	 *
-	 * @return string
-	 */
-	public static function individualTable($indiviudals, $option = '') {
-		global $controller, $WT_TREE;
-
-		$table_id = 'table-indi-' . Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
-
-		$controller
-			->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-			->addInlineJavascript('
+    /**
+     * Generate a SURN,GIVN and GIVN,SURN sortable name for an individual.
+     * This allows table data to sort by surname or given names.
+     *
+     * Use AAAA as a separator (instead of ","), as Javascript localeCompare()
+     * ignores punctuation and "ANN,ROACH" would sort after "ANNE,ROACH",
+     * instead of before it.
+     *
+     * @param Individual $individual
+     *
+     * @return string[]
+     */
+    private static function sortableNames(Individual $individual) {
+        $names   = $individual->getAllNames();
+        $primary = $individual->getPrimaryName();
+
+        list($surn, $givn) = explode(',', $names[$primary]['sort']);
+
+        $givn = str_replace('@P.N.', 'AAAA', $givn);
+        $surn = str_replace('@N.N.', 'AAAA', $surn);
+
+        return array(
+            $surn . 'AAAA' . $givn,
+            $givn . 'AAAA' . $surn,
+        );
+    }
+
+    /**
+     * Print a table of individuals
+     *
+     * @param Individual[] $indiviudals
+     * @param string       $option
+     *
+     * @return string
+     */
+    public static function individualTable($indiviudals, $option = '') {
+        global $controller, $WT_TREE;
+
+        $table_id = 'table-indi-' . Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
+
+        $controller
+            ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+            ->addInlineJavascript('
 				jQuery.fn.dataTableExt.oSort["text-asc"] = textCompareAsc;
 				jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
 				jQuery("#' . $table_id . '").dataTable( {
@@ -143,21 +143,21 @@ 
 				jQuery(".loading-image").css("display", "none");
 			');
 
-		$max_age = (int) $WT_TREE->getPreference('MAX_ALIVE_AGE');
-
-		// Inititialise chart data
-		$deat_by_age = array();
-		for ($age = 0; $age <= $max_age; $age++) {
-			$deat_by_age[$age] = '';
-		}
-		$birt_by_decade = array();
-		$deat_by_decade = array();
-		for ($year = 1550; $year < 2030; $year += 10) {
-			$birt_by_decade[$year] = '';
-			$deat_by_decade[$year] = '';
-		}
-
-		$html = '
+        $max_age = (int) $WT_TREE->getPreference('MAX_ALIVE_AGE');
+
+        // Inititialise chart data
+        $deat_by_age = array();
+        for ($age = 0; $age <= $max_age; $age++) {
+            $deat_by_age[$age] = '';
+        }
+        $birt_by_decade = array();
+        $deat_by_decade = array();
+        for ($year = 1550; $year < 2030; $year += 10) {
+            $birt_by_decade[$year] = '';
+            $deat_by_decade[$year] = '';
+        }
+
+        $html = '
 			<div class="loading-image"></div>
 			<div class="indi-list">
 				<table id="' . $table_id . '">
@@ -312,175 +312,175 @@ 
 					</tfoot>
 					<tbody>';
 
-		$hundred_years_ago = new Date(date('Y') - 100);
-		$unique_indis      = array(); // Don't double-count indis with multiple names.
-
-		foreach ($indiviudals as $key => $individual) {
-			if (!$individual->canShowName()) {
-				continue;
-			}
-			if ($individual->isPendingAddtion()) {
-				$class = ' class="new"';
-			} elseif ($individual->isPendingDeletion()) {
-				$class = ' class="old"';
-			} else {
-				$class = '';
-			}
-			$html .= '<tr' . $class . '>';
-			// Extract Given names and Surnames for sorting
-			list($surn_givn, $givn_surn) = self::sortableNames($individual);
-
-			$html .= '<td colspan="2" data-sort="' . Filter::escapeHtml($givn_surn) . '">';
-			foreach ($individual->getAllNames() as $num => $name) {
-				if ($name['type'] == 'NAME') {
-					$title = '';
-				} else {
-					$title = 'title="' . strip_tags(GedcomTag::getLabel($name['type'], $individual)) . '"';
-				}
-				if ($num == $individual->getPrimaryName()) {
-					$class             = ' class="name2"';
-					$sex_image         = $individual->getSexImage();
-				} else {
-					$class     = '';
-					$sex_image = '';
-				}
-				$html .= '<a ' . $title . ' href="' . $individual->getHtmlUrl() . '"' . $class . '>' . FunctionsPrint::highlightSearchHits($name['full']) . '</a>' . $sex_image . '<br>';
-			}
-			$html .= $individual->getPrimaryParentsNames('parents details1', 'none');
-			$html .= '</td>';
-
-			// Hidden column for sortable name
-			$html .= '<td hidden data-sort="' . Filter::escapeHtml($surn_givn) . '"></td>';
-
-			// SOSA
-			$html .= '<td class="center" data-sort="' . $key . '">';
-			if ($option === 'sosa') {
-				$html .= '<a href="relationship.php?pid1=' . $indiviudals[1] . '&amp;pid2=' . $individual->getXref() . '" title="' . I18N::translate('Relationships') . '">' . I18N::number($key) . '</a>';
-			}
-			$html .= '</td>';
-
-			// Birth date
-			$birth_dates = $individual->getAllBirthDates();
-			$html .= '<td data-sort="' . $individual->getEstimatedBirthDate()->julianDay() . '">';
-			foreach ($birth_dates as $n => $birth_date) {
-				if ($n > 0) {
-					$html .= '<br>';
-				}
-				$html .= $birth_date->display(true);
-			}
-			$html .= '</td>';
-
-			// Birth anniversary
-			if (isset($birth_dates[0]) && $birth_dates[0]->gregorianYear() >= 1550 && $birth_dates[0]->gregorianYear() < 2030 && !isset($unique_indis[$individual->getXref()])) {
-				$birt_by_decade[(int) ($birth_dates[0]->gregorianYear() / 10) * 10] .= $individual->getSex();
-				$anniversary = Date::getAge($birth_dates[0], null, 2);
-			} else {
-				$anniversary = '';
-			}
-			$html .= '<td class="center" data-sort="' . -$individual->getEstimatedBirthDate()->julianDay() . '">' . $anniversary . '</td>';
-
-			// Birth place
-			$html .= '<td>';
-			foreach ($individual->getAllBirthPlaces() as $n => $birth_place) {
-				$tmp = new Place($birth_place, $individual->getTree());
-				if ($n > 0) {
-					$html .= '<br>';
-				}
-				$html .= '<a href="' . $tmp->getURL() . '" title="' . strip_tags($tmp->getFullName()) . '">';
-				$html .= FunctionsPrint::highlightSearchHits($tmp->getShortName()) . '</a>';
-			}
-			$html .= '</td>';
-
-			// Number of children
-			$number_of_children = $individual->getNumberOfChildren();
-			$html .= '<td class="center" data-sort="' . $number_of_children . '">' . I18N::number($number_of_children) . '</td>';
-
-			// Death date
-			$death_dates = $individual->getAllDeathDates();
-			$html .= '<td data-sort="' . $individual->getEstimatedDeathDate()->julianDay() . '">';
-			foreach ($death_dates as $num => $death_date) {
-				if ($num) {
-					$html .= '<br>';
-				}
-				$html .= $death_date->display(true);
-			}
-			$html .= '</td>';
-
-			// Death anniversary
-			if (isset($death_dates[0]) && $death_dates[0]->gregorianYear() >= 1550 && $death_dates[0]->gregorianYear() < 2030 && !isset($unique_indis[$individual->getXref()])) {
-				$birt_by_decade[(int) ($death_dates[0]->gregorianYear() / 10) * 10] .= $individual->getSex();
-				$anniversary = Date::getAge($death_dates[0], null, 2);
-			} else {
-				$anniversary = '';
-			}
-			$html .= '<td class="center" data-sort="' . -$individual->getEstimatedDeathDate()->julianDay() . '">' . $anniversary . '</td>';
-
-			// Age at death
-			if (isset($birth_dates[0]) && isset($death_dates[0])) {
-				$age_at_death      = Date::getAge($birth_dates[0], $death_dates[0], 0);
-				$age_at_death_sort = Date::getAge($birth_dates[0], $death_dates[0], 2);
-				if (!isset($unique_indis[$individual->getXref()]) && $age >= 0 && $age <= $max_age) {
-					$deat_by_age[$age_at_death] .= $individual->getSex();
-				}
-			} else {
-				$age_at_death      = '';
-				$age_at_death_sort = PHP_INT_MAX;
-			}
-			$html .= '<td class="center" data-sort="' . $age_at_death_sort . '">' . $age_at_death . '</td>';
-
-			// Death place
-			$html .= '<td>';
-			foreach ($individual->getAllDeathPlaces() as $n => $death_place) {
-				$tmp = new Place($death_place, $individual->getTree());
-				if ($n > 0) {
-					$html .= '<br>';
-				}
-				$html .= '<a href="' . $tmp->getURL() . '" title="' . strip_tags($tmp->getFullName()) . '">';
-				$html .= FunctionsPrint::highlightSearchHits($tmp->getShortName()) . '</a>';
-			}
-			$html .= '</td>';
-
-			// Last change
-			$html .= '<td data-sort="' . $individual->lastChangeTimestamp(true) . '">' . $individual->lastChangeTimestamp() . '</td>';
-
-			// Filter by sex
-			$html .= '<td hidden>' . $individual->getSex() . '</td>';
-
-			// Filter by birth date
-			$html .= '<td hidden>';
-			if (!$individual->canShow() || Date::compare($individual->getEstimatedBirthDate(), $hundred_years_ago) > 0) {
-				$html .= 'Y100';
-			} else {
-				$html .= 'YES';
-			}
-			$html .= '</td>';
-
-			// Filter by death date
-			$html .= '<td hidden>';
-			// Died in last 100 years? Died? Not dead?
-			if (isset($death_dates[0]) && Date::compare($death_dates[0], $hundred_years_ago) > 0) {
-				$html .= 'Y100';
-			} elseif ($individual->isDead()) {
-				$html .= 'YES';
-			} else {
-				$html .= 'N';
-			}
-			$html .= '</td>';
-
-			// Filter by roots/leaves
-			$html .= '<td hidden>';
-			if (!$individual->getChildFamilies()) {
-				$html .= 'R';
-			} elseif (!$individual->isDead() && $individual->getNumberOfChildren() < 1) {
-				$html .= 'L';
-				$html .= '&nbsp;';
-			}
-			$html .= '</td>';
-			$html .= '</tr>';
-
-			$unique_indis[$individual->getXref()] = true;
-		}
-		$html .= '
+        $hundred_years_ago = new Date(date('Y') - 100);
+        $unique_indis      = array(); // Don't double-count indis with multiple names.
+
+        foreach ($indiviudals as $key => $individual) {
+            if (!$individual->canShowName()) {
+                continue;
+            }
+            if ($individual->isPendingAddtion()) {
+                $class = ' class="new"';
+            } elseif ($individual->isPendingDeletion()) {
+                $class = ' class="old"';
+            } else {
+                $class = '';
+            }
+            $html .= '<tr' . $class . '>';
+            // Extract Given names and Surnames for sorting
+            list($surn_givn, $givn_surn) = self::sortableNames($individual);
+
+            $html .= '<td colspan="2" data-sort="' . Filter::escapeHtml($givn_surn) . '">';
+            foreach ($individual->getAllNames() as $num => $name) {
+                if ($name['type'] == 'NAME') {
+                    $title = '';
+                } else {
+                    $title = 'title="' . strip_tags(GedcomTag::getLabel($name['type'], $individual)) . '"';
+                }
+                if ($num == $individual->getPrimaryName()) {
+                    $class             = ' class="name2"';
+                    $sex_image         = $individual->getSexImage();
+                } else {
+                    $class     = '';
+                    $sex_image = '';
+                }
+                $html .= '<a ' . $title . ' href="' . $individual->getHtmlUrl() . '"' . $class . '>' . FunctionsPrint::highlightSearchHits($name['full']) . '</a>' . $sex_image . '<br>';
+            }
+            $html .= $individual->getPrimaryParentsNames('parents details1', 'none');
+            $html .= '</td>';
+
+            // Hidden column for sortable name
+            $html .= '<td hidden data-sort="' . Filter::escapeHtml($surn_givn) . '"></td>';
+
+            // SOSA
+            $html .= '<td class="center" data-sort="' . $key . '">';
+            if ($option === 'sosa') {
+                $html .= '<a href="relationship.php?pid1=' . $indiviudals[1] . '&amp;pid2=' . $individual->getXref() . '" title="' . I18N::translate('Relationships') . '">' . I18N::number($key) . '</a>';
+            }
+            $html .= '</td>';
+
+            // Birth date
+            $birth_dates = $individual->getAllBirthDates();
+            $html .= '<td data-sort="' . $individual->getEstimatedBirthDate()->julianDay() . '">';
+            foreach ($birth_dates as $n => $birth_date) {
+                if ($n > 0) {
+                    $html .= '<br>';
+                }
+                $html .= $birth_date->display(true);
+            }
+            $html .= '</td>';
+
+            // Birth anniversary
+            if (isset($birth_dates[0]) && $birth_dates[0]->gregorianYear() >= 1550 && $birth_dates[0]->gregorianYear() < 2030 && !isset($unique_indis[$individual->getXref()])) {
+                $birt_by_decade[(int) ($birth_dates[0]->gregorianYear() / 10) * 10] .= $individual->getSex();
+                $anniversary = Date::getAge($birth_dates[0], null, 2);
+            } else {
+                $anniversary = '';
+            }
+            $html .= '<td class="center" data-sort="' . -$individual->getEstimatedBirthDate()->julianDay() . '">' . $anniversary . '</td>';
+
+            // Birth place
+            $html .= '<td>';
+            foreach ($individual->getAllBirthPlaces() as $n => $birth_place) {
+                $tmp = new Place($birth_place, $individual->getTree());
+                if ($n > 0) {
+                    $html .= '<br>';
+                }
+                $html .= '<a href="' . $tmp->getURL() . '" title="' . strip_tags($tmp->getFullName()) . '">';
+                $html .= FunctionsPrint::highlightSearchHits($tmp->getShortName()) . '</a>';
+            }
+            $html .= '</td>';
+
+            // Number of children
+            $number_of_children = $individual->getNumberOfChildren();
+            $html .= '<td class="center" data-sort="' . $number_of_children . '">' . I18N::number($number_of_children) . '</td>';
+
+            // Death date
+            $death_dates = $individual->getAllDeathDates();
+            $html .= '<td data-sort="' . $individual->getEstimatedDeathDate()->julianDay() . '">';
+            foreach ($death_dates as $num => $death_date) {
+                if ($num) {
+                    $html .= '<br>';
+                }
+                $html .= $death_date->display(true);
+            }
+            $html .= '</td>';
+
+            // Death anniversary
+            if (isset($death_dates[0]) && $death_dates[0]->gregorianYear() >= 1550 && $death_dates[0]->gregorianYear() < 2030 && !isset($unique_indis[$individual->getXref()])) {
+                $birt_by_decade[(int) ($death_dates[0]->gregorianYear() / 10) * 10] .= $individual->getSex();
+                $anniversary = Date::getAge($death_dates[0], null, 2);
+            } else {
+                $anniversary = '';
+            }
+            $html .= '<td class="center" data-sort="' . -$individual->getEstimatedDeathDate()->julianDay() . '">' . $anniversary . '</td>';
+
+            // Age at death
+            if (isset($birth_dates[0]) && isset($death_dates[0])) {
+                $age_at_death      = Date::getAge($birth_dates[0], $death_dates[0], 0);
+                $age_at_death_sort = Date::getAge($birth_dates[0], $death_dates[0], 2);
+                if (!isset($unique_indis[$individual->getXref()]) && $age >= 0 && $age <= $max_age) {
+                    $deat_by_age[$age_at_death] .= $individual->getSex();
+                }
+            } else {
+                $age_at_death      = '';
+                $age_at_death_sort = PHP_INT_MAX;
+            }
+            $html .= '<td class="center" data-sort="' . $age_at_death_sort . '">' . $age_at_death . '</td>';
+
+            // Death place
+            $html .= '<td>';
+            foreach ($individual->getAllDeathPlaces() as $n => $death_place) {
+                $tmp = new Place($death_place, $individual->getTree());
+                if ($n > 0) {
+                    $html .= '<br>';
+                }
+                $html .= '<a href="' . $tmp->getURL() . '" title="' . strip_tags($tmp->getFullName()) . '">';
+                $html .= FunctionsPrint::highlightSearchHits($tmp->getShortName()) . '</a>';
+            }
+            $html .= '</td>';
+
+            // Last change
+            $html .= '<td data-sort="' . $individual->lastChangeTimestamp(true) . '">' . $individual->lastChangeTimestamp() . '</td>';
+
+            // Filter by sex
+            $html .= '<td hidden>' . $individual->getSex() . '</td>';
+
+            // Filter by birth date
+            $html .= '<td hidden>';
+            if (!$individual->canShow() || Date::compare($individual->getEstimatedBirthDate(), $hundred_years_ago) > 0) {
+                $html .= 'Y100';
+            } else {
+                $html .= 'YES';
+            }
+            $html .= '</td>';
+
+            // Filter by death date
+            $html .= '<td hidden>';
+            // Died in last 100 years? Died? Not dead?
+            if (isset($death_dates[0]) && Date::compare($death_dates[0], $hundred_years_ago) > 0) {
+                $html .= 'Y100';
+            } elseif ($individual->isDead()) {
+                $html .= 'YES';
+            } else {
+                $html .= 'N';
+            }
+            $html .= '</td>';
+
+            // Filter by roots/leaves
+            $html .= '<td hidden>';
+            if (!$individual->getChildFamilies()) {
+                $html .= 'R';
+            } elseif (!$individual->isDead() && $individual->getNumberOfChildren() < 1) {
+                $html .= 'L';
+                $html .= '&nbsp;';
+            }
+            $html .= '</td>';
+            $html .= '</tr>';
+
+            $unique_indis[$individual->getXref()] = true;
+        }
+        $html .= '
 					</tbody>
 				</table>
 				<div id="indi_list_table-charts_' . $table_id . '" style="display:none">
@@ -502,24 +502,24 @@ 
 				</div>
 			</div>';
 
-		return $html;
-	}
+        return $html;
+    }
 
-	/**
-	 * Print a table of families
-	 *
-	 * @param Family[] $families
-	 *
-	 * @return string
-	 */
-	public static function familyTable($families) {
-		global $WT_TREE, $controller;
+    /**
+     * Print a table of families
+     *
+     * @param Family[] $families
+     *
+     * @return string
+     */
+    public static function familyTable($families) {
+        global $WT_TREE, $controller;
 
-		$table_id = 'table-fam-' . Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
+        $table_id = 'table-fam-' . Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
 
-		$controller
-			->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-			->addInlineJavascript('
+        $controller
+            ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+            ->addInlineJavascript('
 				jQuery.fn.dataTableExt.oSort["text-asc"] = textCompareAsc;
 				jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
 				jQuery("#' . $table_id . '").dataTable( {
@@ -581,21 +581,21 @@ 
 				jQuery(".loading-image").css("display", "none");
 		');
 
-		$max_age = (int) $WT_TREE->getPreference('MAX_ALIVE_AGE');
-
-		// init chart data
-		$marr_by_age = array();
-		for ($age = 0; $age <= $max_age; $age++) {
-			$marr_by_age[$age] = '';
-		}
-		$birt_by_decade = array();
-		$marr_by_decade = array();
-		for ($year = 1550; $year < 2030; $year += 10) {
-			$birt_by_decade[$year] = '';
-			$marr_by_decade[$year] = '';
-		}
-
-		$html = '
+        $max_age = (int) $WT_TREE->getPreference('MAX_ALIVE_AGE');
+
+        // init chart data
+        $marr_by_age = array();
+        for ($age = 0; $age <= $max_age; $age++) {
+            $marr_by_age[$age] = '';
+        }
+        $birt_by_decade = array();
+        $marr_by_decade = array();
+        for ($year = 1550; $year < 2030; $year += 10) {
+            $birt_by_decade[$year] = '';
+            $marr_by_decade[$year] = '';
+        }
+
+        $html = '
 			<div class="loading-image"></div>
 			<div class="fam-list">
 				<table id="' . $table_id . '">
@@ -746,215 +746,215 @@ 
 					</tfoot>
 					<tbody>';
 
-		$hundred_years_ago = new Date(date('Y') - 100);
-
-		foreach ($families as $family) {
-			// Retrieve husband and wife
-			$husb = $family->getHusband();
-			if (is_null($husb)) {
-				$husb = new Individual('H', '0 @H@ INDI', null, $family->getTree());
-			}
-			$wife = $family->getWife();
-			if (is_null($wife)) {
-				$wife = new Individual('W', '0 @W@ INDI', null, $family->getTree());
-			}
-			if (!$family->canShow()) {
-				continue;
-			}
-			if ($family->isPendingAddtion()) {
-				$class = ' class="new"';
-			} elseif ($family->isPendingDeletion()) {
-				$class = ' class="old"';
-			} else {
-				$class = '';
-			}
-			$html .= '<tr' . $class . '>';
-			// Husband name(s)
-			// Extract Given names and Surnames for sorting
-			list($surn_givn, $givn_surn) = self::sortableNames($husb);
-
-			$html .= '<td colspan="2" data-sort="' . Filter::escapeHtml($givn_surn) . '">';
-			foreach ($husb->getAllNames() as $num => $name) {
-				if ($name['type'] == 'NAME') {
-					$title = '';
-				} else {
-					$title = 'title="' . strip_tags(GedcomTag::getLabel($name['type'], $husb)) . '"';
-				}
-				if ($num == $husb->getPrimaryName()) {
-					$class             = ' class="name2"';
-					$sex_image         = $husb->getSexImage();
-				} else {
-					$class     = '';
-					$sex_image = '';
-				}
-				// Only show married names if they are the name we are filtering by.
-				if ($name['type'] != '_MARNM' || $num == $husb->getPrimaryName()) {
-					$html .= '<a ' . $title . ' href="' . $family->getHtmlUrl() . '"' . $class . '>' . FunctionsPrint::highlightSearchHits($name['full']) . '</a>' . $sex_image . '<br>';
-				}
-			}
-			// Husband parents
-			$html .= $husb->getPrimaryParentsNames('parents details1', 'none');
-			$html .= '</td>';
-
-			// Hidden column for sortable name
-			$html .= '<td hidden data-sort="' . Filter::escapeHtml($surn_givn) . '"></td>';
-
-			// Husband age
-			$mdate = $family->getMarriageDate();
-			$hdate = $husb->getBirthDate();
-			if ($hdate->isOK() && $mdate->isOK()) {
-				if ($hdate->gregorianYear() >= 1550 && $hdate->gregorianYear() < 2030) {
-					$birt_by_decade[(int) ($hdate->gregorianYear() / 10) * 10] .= $husb->getSex();
-				}
-				$hage = Date::getAge($hdate, $mdate, 0);
-				if ($hage >= 0 && $hage <= $max_age) {
-					$marr_by_age[$hage] .= $husb->getSex();
-				}
-			}
-			$html .= '<td class="center" data=-sort="' . Date::getAge($hdate, $mdate, 1) . '">' . Date::getAge($hdate, $mdate, 2) . '</td>';
-
-			// Wife name(s)
-			// Extract Given names and Surnames for sorting
-			list($surn_givn, $givn_surn) = self::sortableNames($wife);
-			$html .= '<td colspan="2" data-sort="' . Filter::escapeHtml($givn_surn) . '">';
-			foreach ($wife->getAllNames() as $num => $name) {
-				if ($name['type'] == 'NAME') {
-					$title = '';
-				} else {
-					$title = 'title="' . strip_tags(GedcomTag::getLabel($name['type'], $wife)) . '"';
-				}
-				if ($num == $wife->getPrimaryName()) {
-					$class             = ' class="name2"';
-					$sex_image         = $wife->getSexImage();
-				} else {
-					$class     = '';
-					$sex_image = '';
-				}
-				// Only show married names if they are the name we are filtering by.
-				if ($name['type'] != '_MARNM' || $num == $wife->getPrimaryName()) {
-					$html .= '<a ' . $title . ' href="' . $family->getHtmlUrl() . '"' . $class . '>' . FunctionsPrint::highlightSearchHits($name['full']) . '</a>' . $sex_image . '<br>';
-				}
-			}
-			// Wife parents
-			$html .= $wife->getPrimaryParentsNames('parents details1', 'none');
-			$html .= '</td>';
-
-			// Hidden column for sortable name
-			$html .= '<td hidden data-sort="' . Filter::escapeHtml($surn_givn) . '"></td>';
-
-			// Wife age
-			$mdate = $family->getMarriageDate();
-			$wdate = $wife->getBirthDate();
-			if ($wdate->isOK() && $mdate->isOK()) {
-				if ($wdate->gregorianYear() >= 1550 && $wdate->gregorianYear() < 2030) {
-					$birt_by_decade[(int) ($wdate->gregorianYear() / 10) * 10] .= $wife->getSex();
-				}
-				$wage = Date::getAge($wdate, $mdate, 0);
-				if ($wage >= 0 && $wage <= $max_age) {
-					$marr_by_age[$wage] .= $wife->getSex();
-				}
-			}
-			$html .= '<td class="center" data-sort="' . Date::getAge($wdate, $mdate, 1) . '">' . Date::getAge($wdate, $mdate, 2) . '</td>';
-
-			// Marriage date
-			$html .= '<td data-sort="' . $family->getMarriageDate()->julianDay() . '">';
-			if ($marriage_dates = $family->getAllMarriageDates()) {
-				foreach ($marriage_dates as $n => $marriage_date) {
-					if ($n) {
-						$html .= '<br>';
-					}
-					$html .= '<div>' . $marriage_date->display(true) . '</div>';
-				}
-				if ($marriage_dates[0]->gregorianYear() >= 1550 && $marriage_dates[0]->gregorianYear() < 2030) {
-					$marr_by_decade[(int) ($marriage_dates[0]->gregorianYear() / 10) * 10] .= $husb->getSex() . $wife->getSex();
-				}
-			} elseif ($family->getFacts('_NMR')) {
-				$html .= I18N::translate('no');
-			} elseif ($family->getFacts('MARR')) {
-				$html .= I18N::translate('yes');
-			} else {
-				$html .= '&nbsp;';
-			}
-			$html .= '</td>';
-
-			// Marriage anniversary
-			$html .= '<td class="center" data-sort="' . -$family->getMarriageDate()->julianDay() . '">' . Date::getAge($family->getMarriageDate(), null, 2) . '</td>';
-
-			// Marriage place
-			$html .= '<td>';
-			foreach ($family->getAllMarriagePlaces() as $n => $marriage_place) {
-				$tmp = new Place($marriage_place, $family->getTree());
-				if ($n) {
-					$html .= '<br>';
-				}
-				$html .= '<a href="' . $tmp->getURL() . '" title="' . strip_tags($tmp->getFullName()) . '">';
-				$html .= FunctionsPrint::highlightSearchHits($tmp->getShortName()) . '</a>';
-			}
-			$html .= '</td>';
-
-			// Number of children
-			$html .= '<td class="center" data-sort="' . $family->getNumberOfChildren() . '">' . I18N::number($family->getNumberOfChildren()) . '</td>';
-
-			// Last change
-			$html .= '<td data-sort="' . $family->lastChangeTimestamp(true) . '">' . $family->lastChangeTimestamp() . '</td>';
-
-			// Filter by marriage date
-			$html .= '<td hidden>';
-			if (!$family->canShow() || !$mdate->isOK()) {
-				$html .= 'U';
-			} else {
-				if (Date::compare($mdate, $hundred_years_ago) > 0) {
-					$html .= 'Y100';
-				} else {
-					$html .= 'YES';
-				}
-			}
-			if ($family->getFacts(WT_EVENTS_DIV)) {
-				$html .= 'D';
-			}
-			if (count($husb->getSpouseFamilies()) > 1 || count($wife->getSpouseFamilies()) > 1) {
-				$html .= 'M';
-			}
-			$html .= '</td>';
-
-			// Filter by alive/dead
-			$html .= '<td hidden>';
-			if ($husb->isDead() && $wife->isDead()) {
-				$html .= 'Y';
-			}
-			if ($husb->isDead() && !$wife->isDead()) {
-				if ($wife->getSex() == 'F') {
-					$html .= 'H';
-				}
-				if ($wife->getSex() == 'M') {
-					$html .= 'W';
-				} // male partners
-			}
-			if (!$husb->isDead() && $wife->isDead()) {
-				if ($husb->getSex() == 'M') {
-					$html .= 'W';
-				}
-				if ($husb->getSex() == 'F') {
-					$html .= 'H';
-				} // female partners
-			}
-			if (!$husb->isDead() && !$wife->isDead()) {
-				$html .= 'N';
-			}
-			$html .= '</td>';
-
-			// Filter by roots/leaves
-			$html .= '<td hidden>';
-			if (!$husb->getChildFamilies() && !$wife->getChildFamilies()) {
-				$html .= 'R';
-			} elseif (!$husb->isDead() && !$wife->isDead() && $family->getNumberOfChildren() === 0) {
-				$html .= 'L';
-			}
-			$html .= '</td>
+        $hundred_years_ago = new Date(date('Y') - 100);
+
+        foreach ($families as $family) {
+            // Retrieve husband and wife
+            $husb = $family->getHusband();
+            if (is_null($husb)) {
+                $husb = new Individual('H', '0 @H@ INDI', null, $family->getTree());
+            }
+            $wife = $family->getWife();
+            if (is_null($wife)) {
+                $wife = new Individual('W', '0 @W@ INDI', null, $family->getTree());
+            }
+            if (!$family->canShow()) {
+                continue;
+            }
+            if ($family->isPendingAddtion()) {
+                $class = ' class="new"';
+            } elseif ($family->isPendingDeletion()) {
+                $class = ' class="old"';
+            } else {
+                $class = '';
+            }
+            $html .= '<tr' . $class . '>';
+            // Husband name(s)
+            // Extract Given names and Surnames for sorting
+            list($surn_givn, $givn_surn) = self::sortableNames($husb);
+
+            $html .= '<td colspan="2" data-sort="' . Filter::escapeHtml($givn_surn) . '">';
+            foreach ($husb->getAllNames() as $num => $name) {
+                if ($name['type'] == 'NAME') {
+                    $title = '';
+                } else {
+                    $title = 'title="' . strip_tags(GedcomTag::getLabel($name['type'], $husb)) . '"';
+                }
+                if ($num == $husb->getPrimaryName()) {
+                    $class             = ' class="name2"';
+                    $sex_image         = $husb->getSexImage();
+                } else {
+                    $class     = '';
+                    $sex_image = '';
+                }
+                // Only show married names if they are the name we are filtering by.
+                if ($name['type'] != '_MARNM' || $num == $husb->getPrimaryName()) {
+                    $html .= '<a ' . $title . ' href="' . $family->getHtmlUrl() . '"' . $class . '>' . FunctionsPrint::highlightSearchHits($name['full']) . '</a>' . $sex_image . '<br>';
+                }
+            }
+            // Husband parents
+            $html .= $husb->getPrimaryParentsNames('parents details1', 'none');
+            $html .= '</td>';
+
+            // Hidden column for sortable name
+            $html .= '<td hidden data-sort="' . Filter::escapeHtml($surn_givn) . '"></td>';
+
+            // Husband age
+            $mdate = $family->getMarriageDate();
+            $hdate = $husb->getBirthDate();
+            if ($hdate->isOK() && $mdate->isOK()) {
+                if ($hdate->gregorianYear() >= 1550 && $hdate->gregorianYear() < 2030) {
+                    $birt_by_decade[(int) ($hdate->gregorianYear() / 10) * 10] .= $husb->getSex();
+                }
+                $hage = Date::getAge($hdate, $mdate, 0);
+                if ($hage >= 0 && $hage <= $max_age) {
+                    $marr_by_age[$hage] .= $husb->getSex();
+                }
+            }
+            $html .= '<td class="center" data=-sort="' . Date::getAge($hdate, $mdate, 1) . '">' . Date::getAge($hdate, $mdate, 2) . '</td>';
+
+            // Wife name(s)
+            // Extract Given names and Surnames for sorting
+            list($surn_givn, $givn_surn) = self::sortableNames($wife);
+            $html .= '<td colspan="2" data-sort="' . Filter::escapeHtml($givn_surn) . '">';
+            foreach ($wife->getAllNames() as $num => $name) {
+                if ($name['type'] == 'NAME') {
+                    $title = '';
+                } else {
+                    $title = 'title="' . strip_tags(GedcomTag::getLabel($name['type'], $wife)) . '"';
+                }
+                if ($num == $wife->getPrimaryName()) {
+                    $class             = ' class="name2"';
+                    $sex_image         = $wife->getSexImage();
+                } else {
+                    $class     = '';
+                    $sex_image = '';
+                }
+                // Only show married names if they are the name we are filtering by.
+                if ($name['type'] != '_MARNM' || $num == $wife->getPrimaryName()) {
+                    $html .= '<a ' . $title . ' href="' . $family->getHtmlUrl() . '"' . $class . '>' . FunctionsPrint::highlightSearchHits($name['full']) . '</a>' . $sex_image . '<br>';
+                }
+            }
+            // Wife parents
+            $html .= $wife->getPrimaryParentsNames('parents details1', 'none');
+            $html .= '</td>';
+
+            // Hidden column for sortable name
+            $html .= '<td hidden data-sort="' . Filter::escapeHtml($surn_givn) . '"></td>';
+
+            // Wife age
+            $mdate = $family->getMarriageDate();
+            $wdate = $wife->getBirthDate();
+            if ($wdate->isOK() && $mdate->isOK()) {
+                if ($wdate->gregorianYear() >= 1550 && $wdate->gregorianYear() < 2030) {
+                    $birt_by_decade[(int) ($wdate->gregorianYear() / 10) * 10] .= $wife->getSex();
+                }
+                $wage = Date::getAge($wdate, $mdate, 0);
+                if ($wage >= 0 && $wage <= $max_age) {
+                    $marr_by_age[$wage] .= $wife->getSex();
+                }
+            }
+            $html .= '<td class="center" data-sort="' . Date::getAge($wdate, $mdate, 1) . '">' . Date::getAge($wdate, $mdate, 2) . '</td>';
+
+            // Marriage date
+            $html .= '<td data-sort="' . $family->getMarriageDate()->julianDay() . '">';
+            if ($marriage_dates = $family->getAllMarriageDates()) {
+                foreach ($marriage_dates as $n => $marriage_date) {
+                    if ($n) {
+                        $html .= '<br>';
+                    }
+                    $html .= '<div>' . $marriage_date->display(true) . '</div>';
+                }
+                if ($marriage_dates[0]->gregorianYear() >= 1550 && $marriage_dates[0]->gregorianYear() < 2030) {
+                    $marr_by_decade[(int) ($marriage_dates[0]->gregorianYear() / 10) * 10] .= $husb->getSex() . $wife->getSex();
+                }
+            } elseif ($family->getFacts('_NMR')) {
+                $html .= I18N::translate('no');
+            } elseif ($family->getFacts('MARR')) {
+                $html .= I18N::translate('yes');
+            } else {
+                $html .= '&nbsp;';
+            }
+            $html .= '</td>';
+
+            // Marriage anniversary
+            $html .= '<td class="center" data-sort="' . -$family->getMarriageDate()->julianDay() . '">' . Date::getAge($family->getMarriageDate(), null, 2) . '</td>';
+
+            // Marriage place
+            $html .= '<td>';
+            foreach ($family->getAllMarriagePlaces() as $n => $marriage_place) {
+                $tmp = new Place($marriage_place, $family->getTree());
+                if ($n) {
+                    $html .= '<br>';
+                }
+                $html .= '<a href="' . $tmp->getURL() . '" title="' . strip_tags($tmp->getFullName()) . '">';
+                $html .= FunctionsPrint::highlightSearchHits($tmp->getShortName()) . '</a>';
+            }
+            $html .= '</td>';
+
+            // Number of children
+            $html .= '<td class="center" data-sort="' . $family->getNumberOfChildren() . '">' . I18N::number($family->getNumberOfChildren()) . '</td>';
+
+            // Last change
+            $html .= '<td data-sort="' . $family->lastChangeTimestamp(true) . '">' . $family->lastChangeTimestamp() . '</td>';
+
+            // Filter by marriage date
+            $html .= '<td hidden>';
+            if (!$family->canShow() || !$mdate->isOK()) {
+                $html .= 'U';
+            } else {
+                if (Date::compare($mdate, $hundred_years_ago) > 0) {
+                    $html .= 'Y100';
+                } else {
+                    $html .= 'YES';
+                }
+            }
+            if ($family->getFacts(WT_EVENTS_DIV)) {
+                $html .= 'D';
+            }
+            if (count($husb->getSpouseFamilies()) > 1 || count($wife->getSpouseFamilies()) > 1) {
+                $html .= 'M';
+            }
+            $html .= '</td>';
+
+            // Filter by alive/dead
+            $html .= '<td hidden>';
+            if ($husb->isDead() && $wife->isDead()) {
+                $html .= 'Y';
+            }
+            if ($husb->isDead() && !$wife->isDead()) {
+                if ($wife->getSex() == 'F') {
+                    $html .= 'H';
+                }
+                if ($wife->getSex() == 'M') {
+                    $html .= 'W';
+                } // male partners
+            }
+            if (!$husb->isDead() && $wife->isDead()) {
+                if ($husb->getSex() == 'M') {
+                    $html .= 'W';
+                }
+                if ($husb->getSex() == 'F') {
+                    $html .= 'H';
+                } // female partners
+            }
+            if (!$husb->isDead() && !$wife->isDead()) {
+                $html .= 'N';
+            }
+            $html .= '</td>';
+
+            // Filter by roots/leaves
+            $html .= '<td hidden>';
+            if (!$husb->getChildFamilies() && !$wife->getChildFamilies()) {
+                $html .= 'R';
+            } elseif (!$husb->isDead() && !$wife->isDead() && $family->getNumberOfChildren() === 0) {
+                $html .= 'L';
+            }
+            $html .= '</td>
 			</tr>';
-		}
+        }
 
-		$html .= '
+        $html .= '
 					</tbody>
 				</table>
 				<div id="fam_list_table-charts_' . $table_id . '" style="display:none">
@@ -970,40 +970,40 @@ 
 				</div>
 			</div>';
 
-		return $html;
-	}
-
-	/**
-	 * Print a table of sources
-	 *
-	 * @param Source[] $sources
-	 *
-	 * @return string
-	 */
-	public static function sourceTable($sources) {
-		global $WT_TREE, $controller;
-
-		// Count the number of linked records. These numbers include private records.
-		// It is not good to bypass privacy, but many servers do not have the resources
-		// to process privacy for every record in the tree
-		$count_individuals = Database::prepare(
-			"SELECT CONCAT(l_to, '@', l_file), COUNT(*) FROM `##individuals` JOIN `##link` ON l_from = i_id AND l_file = i_file AND l_type = 'SOUR' GROUP BY l_to, l_file"
-		)->fetchAssoc();
-		$count_families = Database::prepare(
-			"SELECT CONCAT(l_to, '@', l_file), COUNT(*) FROM `##families` JOIN `##link` ON l_from = f_id AND l_file = f_file AND l_type = 'SOUR' GROUP BY l_to, l_file"
-		)->fetchAssoc();
-		$count_media = Database::prepare(
-			"SELECT CONCAT(l_to, '@', l_file), COUNT(*) FROM `##media` JOIN `##link` ON l_from = m_id AND l_file = m_file AND l_type = 'SOUR' GROUP BY l_to, l_file"
-		)->fetchAssoc();
-		$count_notes = Database::prepare(
-			"SELECT CONCAT(l_to, '@', l_file), COUNT(*) FROM `##other` JOIN `##link` ON l_from = o_id AND l_file = o_file AND o_type = 'NOTE' AND l_type = 'SOUR' GROUP BY l_to, l_file"
-		)->fetchAssoc();
-
-		$html     = '';
-		$table_id = 'table-sour-' . Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
-		$controller
-			->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-			->addInlineJavascript('
+        return $html;
+    }
+
+    /**
+     * Print a table of sources
+     *
+     * @param Source[] $sources
+     *
+     * @return string
+     */
+    public static function sourceTable($sources) {
+        global $WT_TREE, $controller;
+
+        // Count the number of linked records. These numbers include private records.
+        // It is not good to bypass privacy, but many servers do not have the resources
+        // to process privacy for every record in the tree
+        $count_individuals = Database::prepare(
+            "SELECT CONCAT(l_to, '@', l_file), COUNT(*) FROM `##individuals` JOIN `##link` ON l_from = i_id AND l_file = i_file AND l_type = 'SOUR' GROUP BY l_to, l_file"
+        )->fetchAssoc();
+        $count_families = Database::prepare(
+            "SELECT CONCAT(l_to, '@', l_file), COUNT(*) FROM `##families` JOIN `##link` ON l_from = f_id AND l_file = f_file AND l_type = 'SOUR' GROUP BY l_to, l_file"
+        )->fetchAssoc();
+        $count_media = Database::prepare(
+            "SELECT CONCAT(l_to, '@', l_file), COUNT(*) FROM `##media` JOIN `##link` ON l_from = m_id AND l_file = m_file AND l_type = 'SOUR' GROUP BY l_to, l_file"
+        )->fetchAssoc();
+        $count_notes = Database::prepare(
+            "SELECT CONCAT(l_to, '@', l_file), COUNT(*) FROM `##other` JOIN `##link` ON l_from = o_id AND l_file = o_file AND o_type = 'NOTE' AND l_type = 'SOUR' GROUP BY l_to, l_file"
+        )->fetchAssoc();
+
+        $html     = '';
+        $table_id = 'table-sour-' . Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
+        $controller
+            ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+            ->addInlineJavascript('
 				jQuery.fn.dataTableExt.oSort["text-asc"] = textCompareAsc;
 				jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
 				jQuery("#' . $table_id . '").dataTable( {
@@ -1029,108 +1029,108 @@ 
 				jQuery(".loading-image").css("display", "none");
 			');
 
-		$html .= '<div class="loading-image"></div>';
-		$html .= '<div class="source-list">';
-		$html .= '<table id="' . $table_id . '"><thead><tr>';
-		$html .= '<th>' . GedcomTag::getLabel('TITL') . '</th>';
-		$html .= '<th>' . GedcomTag::getLabel('AUTH') . '</th>';
-		$html .= '<th>' . I18N::translate('Individuals') . '</th>';
-		$html .= '<th>' . I18N::translate('Families') . '</th>';
-		$html .= '<th>' . I18N::translate('Media objects') . '</th>';
-		$html .= '<th>' . I18N::translate('Shared notes') . '</th>';
-		$html .= '<th>' . GedcomTag::getLabel('CHAN') . '</th>';
-		$html .= '<th>' . I18N::translate('Delete') . '</th>';
-		$html .= '</tr></thead>';
-		$html .= '<tbody>';
-
-		foreach ($sources as $source) {
-			if (!$source->canShow()) {
-				continue;
-			}
-			if ($source->isPendingAddtion()) {
-				$class = ' class="new"';
-			} elseif ($source->isPendingDeletion()) {
-				$class = ' class="old"';
-			} else {
-				$class = '';
-			}
-			$html .= '<tr' . $class . '>';
-			// Source name(s)
-			$html .= '<td data-sort="' . Filter::escapeHtml($source->getSortName()) . '">';
-			foreach ($source->getAllNames() as $n => $name) {
-				if ($n) {
-					$html .= '<br>';
-				}
-				if ($n == $source->getPrimaryName()) {
-					$html .= '<a class="name2" href="' . $source->getHtmlUrl() . '">' . FunctionsPrint::highlightSearchHits($name['full']) . '</a>';
-				} else {
-					$html .= '<a href="' . $source->getHtmlUrl() . '">' . FunctionsPrint::highlightSearchHits($name['full']) . '</a>';
-				}
-			}
-			$html .= '</td>';
-			// Author
-			$auth = $source->getFirstFact('AUTH');
-			if ($auth) {
-				$author = $auth->getValue();
-			} else {
-				$author = '';
-			}
-			$html .= '<td data-sort="' . Filter::escapeHtml($author) . '">' . FunctionsPrint::highlightSearchHits($author) . '</td>';
-			$key = $source->getXref() . '@' . $source->getTree()->getTreeId();
-			// Count of linked individuals
-			$num = array_key_exists($key, $count_individuals) ? $count_individuals[$key] : 0;
-			$html .= '<td class="center" data-sort="' . $num . '">' . I18N::number($num) . '</td>';
-			// Count of linked families
-			$num = array_key_exists($key, $count_families) ? $count_families[$key] : 0;
-			$html .= '<td class="center" data-sort="' . $num . '">' . I18N::number($num) . '</td>';
-			// Count of linked media objects
-			$num = array_key_exists($key, $count_media) ? $count_media[$key] : 0;
-			$html .= '<td class="center" data-sort="' . $num . '">' . I18N::number($num) . '</td>';
-			// Count of linked notes
-			$num = array_key_exists($key, $count_notes) ? $count_notes[$key] : 0;
-			$html .= '<td class="center" data-sort="' . $num . '">' . I18N::number($num) . '</td>';
-			// Last change
-			$html .= '<td data-sort="' . $source->lastChangeTimestamp(true) . '">' . $source->lastChangeTimestamp() . '</td>';
-			// Delete
-			$html .= '<td><a href="#" title="' . I18N::translate('Delete') . '" class="deleteicon" onclick="return delete_record(\'' . I18N::translate('Are you sure you want to delete “%s”?', Filter::escapeJs(Filter::unescapeHtml($source->getFullName()))) . "', '" . $source->getXref() . '\');"><span class="link_text">' . I18N::translate('Delete') . '</span></a></td>';
-			$html .= '</tr>';
-		}
-		$html .= '</tbody></table></div>';
-
-		return $html;
-	}
-
-	/**
-	 * Print a table of shared notes
-	 *
-	 * @param Note[] $notes
-	 *
-	 * @return string
-	 */
-	public static function noteTable($notes) {
-		global $WT_TREE, $controller;
-
-		// Count the number of linked records. These numbers include private records.
-		// It is not good to bypass privacy, but many servers do not have the resources
-		// to process privacy for every record in the tree
-		$count_individuals = Database::prepare(
-			"SELECT CONCAT(l_to, '@', l_file), COUNT(*) FROM `##individuals` JOIN `##link` ON l_from = i_id AND l_file = i_file AND l_type = 'NOTE' GROUP BY l_to, l_file"
-		)->fetchAssoc();
-		$count_families = Database::prepare(
-			"SELECT CONCAT(l_to, '@', l_file), COUNT(*) FROM `##families` JOIN `##link` ON l_from = f_id AND l_file = f_file AND l_type = 'NOTE' GROUP BY l_to, l_file"
-		)->fetchAssoc();
-		$count_media = Database::prepare(
-			"SELECT CONCAT(l_to, '@', l_file), COUNT(*) FROM `##media` JOIN `##link` ON l_from = m_id AND l_file = m_file AND l_type = 'NOTE' GROUP BY l_to, l_file"
-		)->fetchAssoc();
-		$count_sources = Database::prepare(
-			"SELECT CONCAT(l_to, '@', l_file), COUNT(*) FROM `##sources` JOIN `##link` ON l_from = s_id AND l_file = s_file AND l_type = 'NOTE' GROUP BY l_to, l_file"
-		)->fetchAssoc();
-
-		$html     = '';
-		$table_id = 'table-note-' . Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
-		$controller
-			->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-			->addInlineJavascript('
+        $html .= '<div class="loading-image"></div>';
+        $html .= '<div class="source-list">';
+        $html .= '<table id="' . $table_id . '"><thead><tr>';
+        $html .= '<th>' . GedcomTag::getLabel('TITL') . '</th>';
+        $html .= '<th>' . GedcomTag::getLabel('AUTH') . '</th>';
+        $html .= '<th>' . I18N::translate('Individuals') . '</th>';
+        $html .= '<th>' . I18N::translate('Families') . '</th>';
+        $html .= '<th>' . I18N::translate('Media objects') . '</th>';
+        $html .= '<th>' . I18N::translate('Shared notes') . '</th>';
+        $html .= '<th>' . GedcomTag::getLabel('CHAN') . '</th>';
+        $html .= '<th>' . I18N::translate('Delete') . '</th>';
+        $html .= '</tr></thead>';
+        $html .= '<tbody>';
+
+        foreach ($sources as $source) {
+            if (!$source->canShow()) {
+                continue;
+            }
+            if ($source->isPendingAddtion()) {
+                $class = ' class="new"';
+            } elseif ($source->isPendingDeletion()) {
+                $class = ' class="old"';
+            } else {
+                $class = '';
+            }
+            $html .= '<tr' . $class . '>';
+            // Source name(s)
+            $html .= '<td data-sort="' . Filter::escapeHtml($source->getSortName()) . '">';
+            foreach ($source->getAllNames() as $n => $name) {
+                if ($n) {
+                    $html .= '<br>';
+                }
+                if ($n == $source->getPrimaryName()) {
+                    $html .= '<a class="name2" href="' . $source->getHtmlUrl() . '">' . FunctionsPrint::highlightSearchHits($name['full']) . '</a>';
+                } else {
+                    $html .= '<a href="' . $source->getHtmlUrl() . '">' . FunctionsPrint::highlightSearchHits($name['full']) . '</a>';
+                }
+            }
+            $html .= '</td>';
+            // Author
+            $auth = $source->getFirstFact('AUTH');
+            if ($auth) {
+                $author = $auth->getValue();
+            } else {
+                $author = '';
+            }
+            $html .= '<td data-sort="' . Filter::escapeHtml($author) . '">' . FunctionsPrint::highlightSearchHits($author) . '</td>';
+            $key = $source->getXref() . '@' . $source->getTree()->getTreeId();
+            // Count of linked individuals
+            $num = array_key_exists($key, $count_individuals) ? $count_individuals[$key] : 0;
+            $html .= '<td class="center" data-sort="' . $num . '">' . I18N::number($num) . '</td>';
+            // Count of linked families
+            $num = array_key_exists($key, $count_families) ? $count_families[$key] : 0;
+            $html .= '<td class="center" data-sort="' . $num . '">' . I18N::number($num) . '</td>';
+            // Count of linked media objects
+            $num = array_key_exists($key, $count_media) ? $count_media[$key] : 0;
+            $html .= '<td class="center" data-sort="' . $num . '">' . I18N::number($num) . '</td>';
+            // Count of linked notes
+            $num = array_key_exists($key, $count_notes) ? $count_notes[$key] : 0;
+            $html .= '<td class="center" data-sort="' . $num . '">' . I18N::number($num) . '</td>';
+            // Last change
+            $html .= '<td data-sort="' . $source->lastChangeTimestamp(true) . '">' . $source->lastChangeTimestamp() . '</td>';
+            // Delete
+            $html .= '<td><a href="#" title="' . I18N::translate('Delete') . '" class="deleteicon" onclick="return delete_record(\'' . I18N::translate('Are you sure you want to delete “%s”?', Filter::escapeJs(Filter::unescapeHtml($source->getFullName()))) . "', '" . $source->getXref() . '\');"><span class="link_text">' . I18N::translate('Delete') . '</span></a></td>';
+            $html .= '</tr>';
+        }
+        $html .= '</tbody></table></div>';
+
+        return $html;
+    }
+
+    /**
+     * Print a table of shared notes
+     *
+     * @param Note[] $notes
+     *
+     * @return string
+     */
+    public static function noteTable($notes) {
+        global $WT_TREE, $controller;
+
+        // Count the number of linked records. These numbers include private records.
+        // It is not good to bypass privacy, but many servers do not have the resources
+        // to process privacy for every record in the tree
+        $count_individuals = Database::prepare(
+            "SELECT CONCAT(l_to, '@', l_file), COUNT(*) FROM `##individuals` JOIN `##link` ON l_from = i_id AND l_file = i_file AND l_type = 'NOTE' GROUP BY l_to, l_file"
+        )->fetchAssoc();
+        $count_families = Database::prepare(
+            "SELECT CONCAT(l_to, '@', l_file), COUNT(*) FROM `##families` JOIN `##link` ON l_from = f_id AND l_file = f_file AND l_type = 'NOTE' GROUP BY l_to, l_file"
+        )->fetchAssoc();
+        $count_media = Database::prepare(
+            "SELECT CONCAT(l_to, '@', l_file), COUNT(*) FROM `##media` JOIN `##link` ON l_from = m_id AND l_file = m_file AND l_type = 'NOTE' GROUP BY l_to, l_file"
+        )->fetchAssoc();
+        $count_sources = Database::prepare(
+            "SELECT CONCAT(l_to, '@', l_file), COUNT(*) FROM `##sources` JOIN `##link` ON l_from = s_id AND l_file = s_file AND l_type = 'NOTE' GROUP BY l_to, l_file"
+        )->fetchAssoc();
+
+        $html     = '';
+        $table_id = 'table-note-' . Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
+        $controller
+            ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+            ->addInlineJavascript('
 				jQuery.fn.dataTableExt.oSort["text-asc"] = textCompareAsc;
 				jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
 				jQuery("#' . $table_id . '").dataTable({
@@ -1155,79 +1155,79 @@ 
 				jQuery(".loading-image").css("display", "none");
 			');
 
-		$html .= '<div class="loading-image"></div>';
-		$html .= '<div class="note-list">';
-		$html .= '<table id="' . $table_id . '"><thead><tr>';
-		$html .= '<th>' . GedcomTag::getLabel('TITL') . '</th>';
-		$html .= '<th>' . I18N::translate('Individuals') . '</th>';
-		$html .= '<th>' . I18N::translate('Families') . '</th>';
-		$html .= '<th>' . I18N::translate('Media objects') . '</th>';
-		$html .= '<th>' . I18N::translate('Sources') . '</th>';
-		$html .= '<th>' . GedcomTag::getLabel('CHAN') . '</th>';
-		$html .= '<th>' . I18N::translate('Delete') . '</th>';
-		$html .= '</tr></thead>';
-		$html .= '<tbody>';
-
-		foreach ($notes as $note) {
-			if (!$note->canShow()) {
-				continue;
-			}
-			if ($note->isPendingAddtion()) {
-				$class = ' class="new"';
-			} elseif ($note->isPendingDeletion()) {
-				$class = ' class="old"';
-			} else {
-				$class = '';
-			}
-			$html .= '<tr' . $class . '>';
-			// Count of linked notes
-			$html .= '<td data-sort="' . Filter::escapeHtml($note->getSortName()) . '"><a class="name2" href="' . $note->getHtmlUrl() . '">' . FunctionsPrint::highlightSearchHits($note->getFullName()) . '</a></td>';
-			$key = $note->getXref() . '@' . $note->getTree()->getTreeId();
-			// Count of linked individuals
-			$num = array_key_exists($key, $count_individuals) ? $count_individuals[$key] : 0;
-			$html .= '<td class="center" data-sort="' . $num . '">' . I18N::number($num) . '</td>';
-			// Count of linked families
-			$num = array_key_exists($key, $count_families) ? $count_families[$key] : 0;
-			$html .= '<td class="center" data-sort="' . $num . '">' . I18N::number($num) . '</td>';
-			// Count of linked media objects
-			$num = array_key_exists($key, $count_media) ? $count_media[$key] : 0;
-			$html .= '<td class="center" data-sort="' . $num . '">' . I18N::number($num) . '</td>';
-			// Count of linked sources
-			$num = array_key_exists($key, $count_sources) ? $count_sources[$key] : 0;
-			$html .= '<td class="center" data-sort="' . $num . '">' . I18N::number($num) . '</td>';
-			// Last change
-			$html .= '<td data-sort="' . $note->lastChangeTimestamp(true) . '">' . $note->lastChangeTimestamp() . '</td>';
-			// Delete
-			$html .= '<td><a href="#" title="' . I18N::translate('Delete') . '" class="deleteicon" onclick="return delete_record(\'' . I18N::translate('Are you sure you want to delete “%s”?', Filter::escapeJs(Filter::unescapeHtml($note->getFullName()))) . "', '" . $note->getXref() . '\');"><span class="link_text">' . I18N::translate('Delete') . '</span></a></td>';
-			$html .= '</tr>';
-		}
-		$html .= '</tbody></table></div>';
-
-		return $html;
-	}
-
-	/**
-	 * Print a table of repositories
-	 *
-	 * @param Repository[] $repositories
-	 *
-	 * @return string
-	 */
-	public static function repositoryTable($repositories) {
-		global $WT_TREE, $controller;
-
-		// Count the number of linked records. These numbers include private records.
-		// It is not good to bypass privacy, but many servers do not have the resources
-		// to process privacy for every record in the tree
-		$count_sources = Database::prepare(
-			"SELECT CONCAT(l_to, '@', l_file), COUNT(*) FROM `##sources` JOIN `##link` ON l_from = s_id AND l_file = s_file AND l_type = 'REPO' GROUP BY l_to, l_file"
-		)->fetchAssoc();
-
-		$html     = '';
-		$table_id = 'table-repo-' . Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
-		$controller
-			->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-			->addInlineJavascript('
+        $html .= '<div class="loading-image"></div>';
+        $html .= '<div class="note-list">';
+        $html .= '<table id="' . $table_id . '"><thead><tr>';
+        $html .= '<th>' . GedcomTag::getLabel('TITL') . '</th>';
+        $html .= '<th>' . I18N::translate('Individuals') . '</th>';
+        $html .= '<th>' . I18N::translate('Families') . '</th>';
+        $html .= '<th>' . I18N::translate('Media objects') . '</th>';
+        $html .= '<th>' . I18N::translate('Sources') . '</th>';
+        $html .= '<th>' . GedcomTag::getLabel('CHAN') . '</th>';
+        $html .= '<th>' . I18N::translate('Delete') . '</th>';
+        $html .= '</tr></thead>';
+        $html .= '<tbody>';
+
+        foreach ($notes as $note) {
+            if (!$note->canShow()) {
+                continue;
+            }
+            if ($note->isPendingAddtion()) {
+                $class = ' class="new"';
+            } elseif ($note->isPendingDeletion()) {
+                $class = ' class="old"';
+            } else {
+                $class = '';
+            }
+            $html .= '<tr' . $class . '>';
+            // Count of linked notes
+            $html .= '<td data-sort="' . Filter::escapeHtml($note->getSortName()) . '"><a class="name2" href="' . $note->getHtmlUrl() . '">' . FunctionsPrint::highlightSearchHits($note->getFullName()) . '</a></td>';
+            $key = $note->getXref() . '@' . $note->getTree()->getTreeId();
+            // Count of linked individuals
+            $num = array_key_exists($key, $count_individuals) ? $count_individuals[$key] : 0;
+            $html .= '<td class="center" data-sort="' . $num . '">' . I18N::number($num) . '</td>';
+            // Count of linked families
+            $num = array_key_exists($key, $count_families) ? $count_families[$key] : 0;
+            $html .= '<td class="center" data-sort="' . $num . '">' . I18N::number($num) . '</td>';
+            // Count of linked media objects
+            $num = array_key_exists($key, $count_media) ? $count_media[$key] : 0;
+            $html .= '<td class="center" data-sort="' . $num . '">' . I18N::number($num) . '</td>';
+            // Count of linked sources
+            $num = array_key_exists($key, $count_sources) ? $count_sources[$key] : 0;
+            $html .= '<td class="center" data-sort="' . $num . '">' . I18N::number($num) . '</td>';
+            // Last change
+            $html .= '<td data-sort="' . $note->lastChangeTimestamp(true) . '">' . $note->lastChangeTimestamp() . '</td>';
+            // Delete
+            $html .= '<td><a href="#" title="' . I18N::translate('Delete') . '" class="deleteicon" onclick="return delete_record(\'' . I18N::translate('Are you sure you want to delete “%s”?', Filter::escapeJs(Filter::unescapeHtml($note->getFullName()))) . "', '" . $note->getXref() . '\');"><span class="link_text">' . I18N::translate('Delete') . '</span></a></td>';
+            $html .= '</tr>';
+        }
+        $html .= '</tbody></table></div>';
+
+        return $html;
+    }
+
+    /**
+     * Print a table of repositories
+     *
+     * @param Repository[] $repositories
+     *
+     * @return string
+     */
+    public static function repositoryTable($repositories) {
+        global $WT_TREE, $controller;
+
+        // Count the number of linked records. These numbers include private records.
+        // It is not good to bypass privacy, but many servers do not have the resources
+        // to process privacy for every record in the tree
+        $count_sources = Database::prepare(
+            "SELECT CONCAT(l_to, '@', l_file), COUNT(*) FROM `##sources` JOIN `##link` ON l_from = s_id AND l_file = s_file AND l_type = 'REPO' GROUP BY l_to, l_file"
+        )->fetchAssoc();
+
+        $html     = '';
+        $table_id = 'table-repo-' . Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
+        $controller
+            ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+            ->addInlineJavascript('
 				jQuery.fn.dataTableExt.oSort["text-asc"] = textCompareAsc;
 				jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
 				jQuery("#' . $table_id . '").dataTable({
@@ -1249,71 +1249,71 @@ 
 				jQuery(".loading-image").css("display", "none");
 			');
 
-		$html .= '<div class="loading-image"></div>';
-		$html .= '<div class="repo-list">';
-		$html .= '<table id="' . $table_id . '"><thead><tr>';
-		$html .= '<th>' . I18N::translate('Repository name') . '</th>';
-		$html .= '<th>' . I18N::translate('Sources') . '</th>';
-		$html .= '<th>' . GedcomTag::getLabel('CHAN') . '</th>';
-		$html .= '<th>' . I18N::translate('Delete') . '</th>';
-		$html .= '</tr></thead>';
-		$html .= '<tbody>';
-
-		foreach ($repositories as $repository) {
-			if (!$repository->canShow()) {
-				continue;
-			}
-			if ($repository->isPendingAddtion()) {
-				$class = ' class="new"';
-			} elseif ($repository->isPendingDeletion()) {
-				$class = ' class="old"';
-			} else {
-				$class = '';
-			}
-			$html .= '<tr' . $class . '>';
-			// Repository name(s)
-			$html .= '<td data-sort="' . Filter::escapeHtml($repository->getSortName()) . '">';
-			foreach ($repository->getAllNames() as $n => $name) {
-				if ($n) {
-					$html .= '<br>';
-				}
-				if ($n == $repository->getPrimaryName()) {
-					$html .= '<a class="name2" href="' . $repository->getHtmlUrl() . '">' . FunctionsPrint::highlightSearchHits($name['full']) . '</a>';
-				} else {
-					$html .= '<a href="' . $repository->getHtmlUrl() . '">' . FunctionsPrint::highlightSearchHits($name['full']) . '</a>';
-				}
-			}
-			$html .= '</td>';
-			$key = $repository->getXref() . '@' . $repository->getTree()->getTreeId();
-			// Count of linked sources
-			$num = array_key_exists($key, $count_sources) ? $count_sources[$key] : 0;
-			$html .= '<td class="center" data-sort="' . $num . '">' . I18N::number($num) . '</td>';
-			// Last change
-			$html .= '<td data-sort="' . $repository->lastChangeTimestamp(true) . '">' . $repository->lastChangeTimestamp() . '</td>';
-			// Delete
-			$html .= '<td><a href="#" title="' . I18N::translate('Delete') . '" class="deleteicon" onclick="return delete_record(\'' . I18N::translate('Are you sure you want to delete “%s”?', Filter::escapeJs(Filter::unescapeHtml($repository->getFullName()))) . "', '" . $repository->getXref() . '\');"><span class="link_text">' . I18N::translate('Delete') . '</span></a></td>';
-			$html .= '</tr>';
-		}
-		$html .= '</tbody></table></div>';
-
-		return $html;
-	}
-
-	/**
-	 * Print a table of media objects
-	 *
-	 * @param Media[] $media_objects
-	 *
-	 * @return string
-	 */
-	public static function mediaTable($media_objects) {
-		global $WT_TREE, $controller;
-
-		$html     = '';
-		$table_id = 'table-obje-' . Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
-		$controller
-			->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-			->addInlineJavascript('
+        $html .= '<div class="loading-image"></div>';
+        $html .= '<div class="repo-list">';
+        $html .= '<table id="' . $table_id . '"><thead><tr>';
+        $html .= '<th>' . I18N::translate('Repository name') . '</th>';
+        $html .= '<th>' . I18N::translate('Sources') . '</th>';
+        $html .= '<th>' . GedcomTag::getLabel('CHAN') . '</th>';
+        $html .= '<th>' . I18N::translate('Delete') . '</th>';
+        $html .= '</tr></thead>';
+        $html .= '<tbody>';
+
+        foreach ($repositories as $repository) {
+            if (!$repository->canShow()) {
+                continue;
+            }
+            if ($repository->isPendingAddtion()) {
+                $class = ' class="new"';
+            } elseif ($repository->isPendingDeletion()) {
+                $class = ' class="old"';
+            } else {
+                $class = '';
+            }
+            $html .= '<tr' . $class . '>';
+            // Repository name(s)
+            $html .= '<td data-sort="' . Filter::escapeHtml($repository->getSortName()) . '">';
+            foreach ($repository->getAllNames() as $n => $name) {
+                if ($n) {
+                    $html .= '<br>';
+                }
+                if ($n == $repository->getPrimaryName()) {
+                    $html .= '<a class="name2" href="' . $repository->getHtmlUrl() . '">' . FunctionsPrint::highlightSearchHits($name['full']) . '</a>';
+                } else {
+                    $html .= '<a href="' . $repository->getHtmlUrl() . '">' . FunctionsPrint::highlightSearchHits($name['full']) . '</a>';
+                }
+            }
+            $html .= '</td>';
+            $key = $repository->getXref() . '@' . $repository->getTree()->getTreeId();
+            // Count of linked sources
+            $num = array_key_exists($key, $count_sources) ? $count_sources[$key] : 0;
+            $html .= '<td class="center" data-sort="' . $num . '">' . I18N::number($num) . '</td>';
+            // Last change
+            $html .= '<td data-sort="' . $repository->lastChangeTimestamp(true) . '">' . $repository->lastChangeTimestamp() . '</td>';
+            // Delete
+            $html .= '<td><a href="#" title="' . I18N::translate('Delete') . '" class="deleteicon" onclick="return delete_record(\'' . I18N::translate('Are you sure you want to delete “%s”?', Filter::escapeJs(Filter::unescapeHtml($repository->getFullName()))) . "', '" . $repository->getXref() . '\');"><span class="link_text">' . I18N::translate('Delete') . '</span></a></td>';
+            $html .= '</tr>';
+        }
+        $html .= '</tbody></table></div>';
+
+        return $html;
+    }
+
+    /**
+     * Print a table of media objects
+     *
+     * @param Media[] $media_objects
+     *
+     * @return string
+     */
+    public static function mediaTable($media_objects) {
+        global $WT_TREE, $controller;
+
+        $html     = '';
+        $table_id = 'table-obje-' . Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
+        $controller
+            ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+            ->addInlineJavascript('
 				jQuery.fn.dataTableExt.oSort["text-asc"] = textCompareAsc;
 				jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
 				jQuery("#' . $table_id . '").dataTable({
@@ -1337,75 +1337,75 @@ 
 				jQuery(".loading-image").css("display", "none");
 			');
 
-		$html .= '<div class="loading-image"></div>';
-		$html .= '<div class="media-list">';
-		$html .= '<table id="' . $table_id . '"><thead><tr>';
-		$html .= '<th>' . I18N::translate('Media') . '</th>';
-		$html .= '<th>' . GedcomTag::getLabel('TITL') . '</th>';
-		$html .= '<th>' . I18N::translate('Individuals') . '</th>';
-		$html .= '<th>' . I18N::translate('Families') . '</th>';
-		$html .= '<th>' . I18N::translate('Sources') . '</th>';
-		$html .= '<th>' . GedcomTag::getLabel('CHAN') . '</th>';
-		$html .= '</tr></thead>';
-		$html .= '<tbody>';
-
-		foreach ($media_objects as $media_object) {
-			if ($media_object->canShow()) {
-				$name = $media_object->getFullName();
-				if ($media_object->isPendingAddtion()) {
-					$class = ' class="new"';
-				} elseif ($media_object->isPendingDeletion()) {
-					$class = ' class="old"';
-				} else {
-					$class = '';
-				}
-				$html .= '<tr' . $class . '>';
-				// Media object thumbnail
-				$html .= '<td>' . $media_object->displayImage() . '</td>';
-				// Media object name(s)
-				$html .= '<td data-sort="' . Filter::escapeHtml($media_object->getSortName()) . '">';
-				$html .= '<a href="' . $media_object->getHtmlUrl() . '" class="list_item name2">';
-				$html .= FunctionsPrint::highlightSearchHits($name) . '</a>';
-				if (Auth::isEditor($media_object->getTree())) {
-					$html .= '<br><a href="' . $media_object->getHtmlUrl() . '">' . basename($media_object->getFilename()) . '</a>';
-				}
-				$html .= '</td>';
-
-				// Count of linked individuals
-				$num = count($media_object->linkedIndividuals('OBJE'));
-				$html .= '<td class="center" data-sort="' . $num . '">' . I18N::number($num) . '</td>';
-				// Count of linked families
-				$num = count($media_object->linkedFamilies('OBJE'));
-				$html .= '<td class="center" data-sort="' . $num . '">' . I18N::number($num) . '</td>';
-				// Count of linked sources
-				$num = count($media_object->linkedSources('OBJE'));
-				$html .= '<td class="center" data-sort="' . $num . '">' . I18N::number($num) . '</td>';
-				// Last change
-				$html .= '<td data-sort="' . $media_object->lastChangeTimestamp(true) . '">' . $media_object->lastChangeTimestamp() . '</td>';
-				$html .= '</tr>';
-			}
-		}
-		$html .= '</tbody></table></div>';
-
-		return $html;
-	}
-
-	/**
-	 * Print a table of surnames, for the top surnames block, the indi/fam lists, etc.
-	 *
-	 * @param string[][] $surnames array (of SURN, of array of SPFX_SURN, of array of PID)
-	 * @param string $script "indilist.php" (counts of individuals) or "famlist.php" (counts of spouses)
-	 * @param Tree $tree generate links for this tree
-	 *
-	 * @return string
-	 */
-	public static function surnameTable($surnames, $script, Tree $tree) {
-		global $controller;
-
-		$html = '';
-		$controller
-			->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-			->addInlineJavascript('
+        $html .= '<div class="loading-image"></div>';
+        $html .= '<div class="media-list">';
+        $html .= '<table id="' . $table_id . '"><thead><tr>';
+        $html .= '<th>' . I18N::translate('Media') . '</th>';
+        $html .= '<th>' . GedcomTag::getLabel('TITL') . '</th>';
+        $html .= '<th>' . I18N::translate('Individuals') . '</th>';
+        $html .= '<th>' . I18N::translate('Families') . '</th>';
+        $html .= '<th>' . I18N::translate('Sources') . '</th>';
+        $html .= '<th>' . GedcomTag::getLabel('CHAN') . '</th>';
+        $html .= '</tr></thead>';
+        $html .= '<tbody>';
+
+        foreach ($media_objects as $media_object) {
+            if ($media_object->canShow()) {
+                $name = $media_object->getFullName();
+                if ($media_object->isPendingAddtion()) {
+                    $class = ' class="new"';
+                } elseif ($media_object->isPendingDeletion()) {
+                    $class = ' class="old"';
+                } else {
+                    $class = '';
+                }
+                $html .= '<tr' . $class . '>';
+                // Media object thumbnail
+                $html .= '<td>' . $media_object->displayImage() . '</td>';
+                // Media object name(s)
+                $html .= '<td data-sort="' . Filter::escapeHtml($media_object->getSortName()) . '">';
+                $html .= '<a href="' . $media_object->getHtmlUrl() . '" class="list_item name2">';
+                $html .= FunctionsPrint::highlightSearchHits($name) . '</a>';
+                if (Auth::isEditor($media_object->getTree())) {
+                    $html .= '<br><a href="' . $media_object->getHtmlUrl() . '">' . basename($media_object->getFilename()) . '</a>';
+                }
+                $html .= '</td>';
+
+                // Count of linked individuals
+                $num = count($media_object->linkedIndividuals('OBJE'));
+                $html .= '<td class="center" data-sort="' . $num . '">' . I18N::number($num) . '</td>';
+                // Count of linked families
+                $num = count($media_object->linkedFamilies('OBJE'));
+                $html .= '<td class="center" data-sort="' . $num . '">' . I18N::number($num) . '</td>';
+                // Count of linked sources
+                $num = count($media_object->linkedSources('OBJE'));
+                $html .= '<td class="center" data-sort="' . $num . '">' . I18N::number($num) . '</td>';
+                // Last change
+                $html .= '<td data-sort="' . $media_object->lastChangeTimestamp(true) . '">' . $media_object->lastChangeTimestamp() . '</td>';
+                $html .= '</tr>';
+            }
+        }
+        $html .= '</tbody></table></div>';
+
+        return $html;
+    }
+
+    /**
+     * Print a table of surnames, for the top surnames block, the indi/fam lists, etc.
+     *
+     * @param string[][] $surnames array (of SURN, of array of SPFX_SURN, of array of PID)
+     * @param string $script "indilist.php" (counts of individuals) or "famlist.php" (counts of spouses)
+     * @param Tree $tree generate links for this tree
+     *
+     * @return string
+     */
+    public static function surnameTable($surnames, $script, Tree $tree) {
+        global $controller;
+
+        $html = '';
+        $controller
+            ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+            ->addInlineJavascript('
 				jQuery.fn.dataTableExt.oSort["text-asc"] = textCompareAsc;
 				jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
 				jQuery(".surname-list").dataTable({
@@ -1422,203 +1422,203 @@ 
 				});
 			');
 
-		if ($script == 'famlist.php') {
-			$col_heading = I18N::translate('Spouses');
-		} else {
-			$col_heading = I18N::translate('Individuals');
-		}
-
-		$html .=
-			'<table class="surname-list">' .
-			'<thead>' .
-			'<tr>' .
-			'<th>' . GedcomTag::getLabel('SURN') . '</th>' .
-			'<th>' . $col_heading . '</th>' .
-			'</tr>' .
-			'</thead>';
-
-		$html .= '<tbody>';
-		foreach ($surnames as $surn => $surns) {
-			// Each surname links back to the indi/fam surname list
-			if ($surn) {
-				$url = $script . '?surname=' . rawurlencode($surn) . '&amp;ged=' . $tree->getNameUrl();
-			} else {
-				$url = $script . '?alpha=,&amp;ged=' . $tree->getNameUrl();
-			}
-			$html .= '<tr>';
-			// Surname
-			$html .= '<td data-sort="' . Filter::escapeHtml($surn) . '">';
-			// Multiple surname variants, e.g. von Groot, van Groot, van der Groot, etc.
-			foreach ($surns as $spfxsurn => $indis) {
-				if ($spfxsurn) {
-					$html .= '<a href="' . $url . '" dir="auto">' . Filter::escapeHtml($spfxsurn) . '</a><br>';
-				} else {
-					// No surname, but a value from "2 SURN"? A common workaround for toponyms, etc.
-					$html .= '<a href="' . $url . '" dir="auto">' . Filter::escapeHtml($surn) . '</a><br>';
-				}
-			}
-			$html .= '</td>';
-			// Surname count
-			$subtotal = 0;
-			foreach ($surns as $indis) {
-				$subtotal += count($indis);
-			}
-			$html .= '<td class="center" data-sort="' . $subtotal . '">';
-			foreach ($surns as $indis) {
-				$html .= I18N::number(count($indis)) . '<br>';
-			}
-			if (count($surns) > 1) {
-				// More than one surname variant? Show a subtotal
-				$html .= I18N::number($subtotal);
-			}
-			$html .= '</td>';
-			$html .= '</tr>';
-		}
-		$html .= '</tbody></table>';
-
-		return $html;
-	}
-
-	/**
-	 * Print a tagcloud of surnames.
-	 *
-	 * @param string[][] $surnames array (of SURN, of array of SPFX_SURN, of array of PID)
-	 * @param string $script indilist or famlist
-	 * @param bool $totals show totals after each name
-	 * @param Tree $tree generate links to this tree
-	 *
-	 * @return string
-	 */
-	public static function surnameTagCloud($surnames, $script, $totals, Tree $tree) {
-		$minimum = PHP_INT_MAX;
-		$maximum = 1;
-		foreach ($surnames as $surn => $surns) {
-			foreach ($surns as $spfxsurn => $indis) {
-				$maximum = max($maximum, count($indis));
-				$minimum = min($minimum, count($indis));
-			}
-		}
-
-		$html = '';
-		foreach ($surnames as $surn => $surns) {
-			foreach ($surns as $spfxsurn => $indis) {
-				if ($maximum === $minimum) {
-					// All surnames occur the same number of times
-					$size = 150.0;
-				} else {
-					$size = 75.0 + 125.0 * (count($indis) - $minimum) / ($maximum - $minimum);
-				}
-				$html .= '<a style="font-size:' . $size . '%" href="' . $script . '?surname=' . Filter::escapeUrl($surn) . '&amp;ged=' . $tree->getNameUrl() . '">';
-				if ($totals) {
-					$html .= I18N::translate('%1$s (%2$s)', '<span dir="auto">' . $spfxsurn . '</span>', I18N::number(count($indis)));
-				} else {
-					$html .= $spfxsurn;
-				}
-				$html .= '</a> ';
-			}
-		}
-
-		return '<div class="tag_cloud">' . $html . '</div>';
-	}
-
-	/**
-	 * Print a list of surnames.
-	 *
-	 * @param string[][] $surnames array (of SURN, of array of SPFX_SURN, of array of PID)
-	 * @param int $style 1=bullet list, 2=semicolon-separated list, 3=tabulated list with up to 4 columns
-	 * @param bool $totals show totals after each name
-	 * @param string $script indilist or famlist
-	 * @param Tree $tree Link back to the individual list in this tree
-	 *
-	 * @return string
-	 */
-	public static function surnameList($surnames, $style, $totals, $script, Tree $tree) {
-		$html = array();
-		foreach ($surnames as $surn => $surns) {
-			// Each surname links back to the indilist
-			if ($surn) {
-				$url = $script . '?surname=' . urlencode($surn) . '&amp;ged=' . $tree->getNameUrl();
-			} else {
-				$url = $script . '?alpha=,&amp;ged=' . $tree->getNameUrl();
-			}
-			// If all the surnames are just case variants, then merge them into one
-			// Comment out this block if you want SMITH listed separately from Smith
-			$first_spfxsurn = null;
-			foreach ($surns as $spfxsurn => $indis) {
-				if ($first_spfxsurn) {
-					if (I18N::strtoupper($spfxsurn) == I18N::strtoupper($first_spfxsurn)) {
-						$surns[$first_spfxsurn] = array_merge($surns[$first_spfxsurn], $surns[$spfxsurn]);
-						unset($surns[$spfxsurn]);
-					}
-				} else {
-					$first_spfxsurn = $spfxsurn;
-				}
-			}
-			$subhtml = '<a href="' . $url . '" dir="auto">' . Filter::escapeHtml(implode(I18N::$list_separator, array_keys($surns))) . '</a>';
-
-			if ($totals) {
-				$subtotal = 0;
-				foreach ($surns as $indis) {
-					$subtotal += count($indis);
-				}
-				$subhtml .= '&nbsp;(' . I18N::number($subtotal) . ')';
-			}
-			$html[] = $subhtml;
-
-		}
-		switch ($style) {
-		case 1:
-			return '<ul><li>' . implode('</li><li>', $html) . '</li></ul>';
-		case 2:
-			return implode(I18N::$list_separator, $html);
-		case 3:
-			$i     = 0;
-			$count = count($html);
-			if ($count > 36) {
-				$col = 4;
-			} elseif ($count > 18) {
-				$col = 3;
-			} elseif ($count > 6) {
-				$col = 2;
-			} else {
-				$col = 1;
-			}
-			$newcol = ceil($count / $col);
-			$html2  = '<table class="list_table"><tr>';
-			$html2 .= '<td class="list_value" style="padding: 14px;">';
-
-			foreach ($html as $surns) {
-				$html2 .= $surns . '<br>';
-				$i++;
-				if ($i == $newcol && $i < $count) {
-					$html2 .= '</td><td class="list_value" style="padding: 14px;">';
-					$newcol = $i + ceil($count / $col);
-				}
-			}
-			$html2 .= '</td></tr></table>';
-
-			return $html2;
-		}
-	}
-	/**
-	 * Print a table of events
-	 *
-	 * @param int $startjd
-	 * @param int $endjd
-	 * @param string $events
-	 * @param bool $only_living
-	 * @param string $sort_by
-	 *
-	 * @return string
-	 */
-	public static function eventsTable($startjd, $endjd, $events = 'BIRT MARR DEAT', $only_living = false, $sort_by = 'anniv') {
-		global $controller, $WT_TREE;
-
-		$html     = '';
-		$table_id = 'table-even-' . Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
-		$controller
-			->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-			->addInlineJavascript('
+        if ($script == 'famlist.php') {
+            $col_heading = I18N::translate('Spouses');
+        } else {
+            $col_heading = I18N::translate('Individuals');
+        }
+
+        $html .=
+            '<table class="surname-list">' .
+            '<thead>' .
+            '<tr>' .
+            '<th>' . GedcomTag::getLabel('SURN') . '</th>' .
+            '<th>' . $col_heading . '</th>' .
+            '</tr>' .
+            '</thead>';
+
+        $html .= '<tbody>';
+        foreach ($surnames as $surn => $surns) {
+            // Each surname links back to the indi/fam surname list
+            if ($surn) {
+                $url = $script . '?surname=' . rawurlencode($surn) . '&amp;ged=' . $tree->getNameUrl();
+            } else {
+                $url = $script . '?alpha=,&amp;ged=' . $tree->getNameUrl();
+            }
+            $html .= '<tr>';
+            // Surname
+            $html .= '<td data-sort="' . Filter::escapeHtml($surn) . '">';
+            // Multiple surname variants, e.g. von Groot, van Groot, van der Groot, etc.
+            foreach ($surns as $spfxsurn => $indis) {
+                if ($spfxsurn) {
+                    $html .= '<a href="' . $url . '" dir="auto">' . Filter::escapeHtml($spfxsurn) . '</a><br>';
+                } else {
+                    // No surname, but a value from "2 SURN"? A common workaround for toponyms, etc.
+                    $html .= '<a href="' . $url . '" dir="auto">' . Filter::escapeHtml($surn) . '</a><br>';
+                }
+            }
+            $html .= '</td>';
+            // Surname count
+            $subtotal = 0;
+            foreach ($surns as $indis) {
+                $subtotal += count($indis);
+            }
+            $html .= '<td class="center" data-sort="' . $subtotal . '">';
+            foreach ($surns as $indis) {
+                $html .= I18N::number(count($indis)) . '<br>';
+            }
+            if (count($surns) > 1) {
+                // More than one surname variant? Show a subtotal
+                $html .= I18N::number($subtotal);
+            }
+            $html .= '</td>';
+            $html .= '</tr>';
+        }
+        $html .= '</tbody></table>';
+
+        return $html;
+    }
+
+    /**
+     * Print a tagcloud of surnames.
+     *
+     * @param string[][] $surnames array (of SURN, of array of SPFX_SURN, of array of PID)
+     * @param string $script indilist or famlist
+     * @param bool $totals show totals after each name
+     * @param Tree $tree generate links to this tree
+     *
+     * @return string
+     */
+    public static function surnameTagCloud($surnames, $script, $totals, Tree $tree) {
+        $minimum = PHP_INT_MAX;
+        $maximum = 1;
+        foreach ($surnames as $surn => $surns) {
+            foreach ($surns as $spfxsurn => $indis) {
+                $maximum = max($maximum, count($indis));
+                $minimum = min($minimum, count($indis));
+            }
+        }
+
+        $html = '';
+        foreach ($surnames as $surn => $surns) {
+            foreach ($surns as $spfxsurn => $indis) {
+                if ($maximum === $minimum) {
+                    // All surnames occur the same number of times
+                    $size = 150.0;
+                } else {
+                    $size = 75.0 + 125.0 * (count($indis) - $minimum) / ($maximum - $minimum);
+                }
+                $html .= '<a style="font-size:' . $size . '%" href="' . $script . '?surname=' . Filter::escapeUrl($surn) . '&amp;ged=' . $tree->getNameUrl() . '">';
+                if ($totals) {
+                    $html .= I18N::translate('%1$s (%2$s)', '<span dir="auto">' . $spfxsurn . '</span>', I18N::number(count($indis)));
+                } else {
+                    $html .= $spfxsurn;
+                }
+                $html .= '</a> ';
+            }
+        }
+
+        return '<div class="tag_cloud">' . $html . '</div>';
+    }
+
+    /**
+     * Print a list of surnames.
+     *
+     * @param string[][] $surnames array (of SURN, of array of SPFX_SURN, of array of PID)
+     * @param int $style 1=bullet list, 2=semicolon-separated list, 3=tabulated list with up to 4 columns
+     * @param bool $totals show totals after each name
+     * @param string $script indilist or famlist
+     * @param Tree $tree Link back to the individual list in this tree
+     *
+     * @return string
+     */
+    public static function surnameList($surnames, $style, $totals, $script, Tree $tree) {
+        $html = array();
+        foreach ($surnames as $surn => $surns) {
+            // Each surname links back to the indilist
+            if ($surn) {
+                $url = $script . '?surname=' . urlencode($surn) . '&amp;ged=' . $tree->getNameUrl();
+            } else {
+                $url = $script . '?alpha=,&amp;ged=' . $tree->getNameUrl();
+            }
+            // If all the surnames are just case variants, then merge them into one
+            // Comment out this block if you want SMITH listed separately from Smith
+            $first_spfxsurn = null;
+            foreach ($surns as $spfxsurn => $indis) {
+                if ($first_spfxsurn) {
+                    if (I18N::strtoupper($spfxsurn) == I18N::strtoupper($first_spfxsurn)) {
+                        $surns[$first_spfxsurn] = array_merge($surns[$first_spfxsurn], $surns[$spfxsurn]);
+                        unset($surns[$spfxsurn]);
+                    }
+                } else {
+                    $first_spfxsurn = $spfxsurn;
+                }
+            }
+            $subhtml = '<a href="' . $url . '" dir="auto">' . Filter::escapeHtml(implode(I18N::$list_separator, array_keys($surns))) . '</a>';
+
+            if ($totals) {
+                $subtotal = 0;
+                foreach ($surns as $indis) {
+                    $subtotal += count($indis);
+                }
+                $subhtml .= '&nbsp;(' . I18N::number($subtotal) . ')';
+            }
+            $html[] = $subhtml;
+
+        }
+        switch ($style) {
+        case 1:
+            return '<ul><li>' . implode('</li><li>', $html) . '</li></ul>';
+        case 2:
+            return implode(I18N::$list_separator, $html);
+        case 3:
+            $i     = 0;
+            $count = count($html);
+            if ($count > 36) {
+                $col = 4;
+            } elseif ($count > 18) {
+                $col = 3;
+            } elseif ($count > 6) {
+                $col = 2;
+            } else {
+                $col = 1;
+            }
+            $newcol = ceil($count / $col);
+            $html2  = '<table class="list_table"><tr>';
+            $html2 .= '<td class="list_value" style="padding: 14px;">';
+
+            foreach ($html as $surns) {
+                $html2 .= $surns . '<br>';
+                $i++;
+                if ($i == $newcol && $i < $count) {
+                    $html2 .= '</td><td class="list_value" style="padding: 14px;">';
+                    $newcol = $i + ceil($count / $col);
+                }
+            }
+            $html2 .= '</td></tr></table>';
+
+            return $html2;
+        }
+    }
+    /**
+     * Print a table of events
+     *
+     * @param int $startjd
+     * @param int $endjd
+     * @param string $events
+     * @param bool $only_living
+     * @param string $sort_by
+     *
+     * @return string
+     */
+    public static function eventsTable($startjd, $endjd, $events = 'BIRT MARR DEAT', $only_living = false, $sort_by = 'anniv') {
+        global $controller, $WT_TREE;
+
+        $html     = '';
+        $table_id = 'table-even-' . Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
+        $controller
+            ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+            ->addInlineJavascript('
 				jQuery.fn.dataTableExt.oSort["text-asc"] = textCompareAsc;
 				jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
 				jQuery("#' . $table_id . '").dataTable({
@@ -1640,341 +1640,341 @@ 
 				});
 			');
 
-		// Did we have any output? Did we skip anything?
-		$filter          = 0;
-		$filtered_events = array();
-
-		foreach (FunctionsDb::getEventsList($startjd, $endjd, $events, $WT_TREE) as $fact) {
-			$record = $fact->getParent();
-			// Only living people ?
-			if ($only_living) {
-				if ($record instanceof Individual && $record->isDead()) {
-					$filter++;
-					continue;
-				}
-				if ($record instanceof Family) {
-					$husb = $record->getHusband();
-					if (is_null($husb) || $husb->isDead()) {
-						$filter++;
-						continue;
-					}
-					$wife = $record->getWife();
-					if (is_null($wife) || $wife->isDead()) {
-						$filter++;
-						continue;
-					}
-				}
-			}
-
-			$filtered_events[] = $fact;
-		}
-
-		if (!empty($filtered_events)) {
-			$html .= '<table id="' . $table_id . '" class="width100">';
-			$html .= '<thead><tr>';
-			$html .= '<th>' . I18N::translate('Record') . '</th>';
-			$html .= '<th>' . GedcomTag::getLabel('DATE') . '</th>';
-			$html .= '<th><i class="icon-reminder" title="' . I18N::translate('Anniversary') . '"></i></th>';
-			$html .= '<th>' . GedcomTag::getLabel('EVEN') . '</th>';
-			$html .= '</tr></thead><tbody>';
-
-			foreach ($filtered_events as $n => $fact) {
-				$record = $fact->getParent();
-				$html .= '<tr>';
-				$html .= '<td data-sort="' . Filter::escapeHtml($record->getSortName()) . '">';
-				$html .= '<a href="' . $record->getHtmlUrl() . '">' . $record->getFullName() . '</a>';
-				if ($record instanceof Individual) {
-					$html .= $record->getSexImage();
-				}
-				$html .= '</td>';
-				$html .= '<td data-sort="' . $fact->getDate()->minimumJulianDay() . '">';
-				$html .= $fact->getDate()->display();
-				$html .= '</td>';
-				$html .= '<td class="center" data-sort="' . $fact->anniv . '">';
-				$html .= ($fact->anniv ? I18N::number($fact->anniv) : '');
-				$html .= '</td>';
-				$html .= '<td class="center">' . $fact->getLabel() . '</td>';
-				$html .= '</tr>';
-			}
-
-			$html .= '</tbody></table>';
-		} else {
-			if ($endjd === WT_CLIENT_JD) {
-				// We're dealing with the Today’s Events block
-				if ($filter === 0) {
-					$html .=  I18N::translate('No events exist for today.');
-				} else {
-					$html .=  I18N::translate('No events for living individuals exist for today.');
-				}
-			} else {
-				// We're dealing with the Upcoming Events block
-				if ($filter === 0) {
-					if ($endjd === $startjd) {
-						$html .=  I18N::translate('No events exist for tomorrow.');
-					} else {
-						$html .=  /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
-					}
-				} else {
-					if ($endjd === $startjd) {
-						$html .=  I18N::translate('No events for living individuals exist for tomorrow.');
-					} else {
-						// I18N: translation for %s==1 is unused; it is translated separately as “tomorrow”
-						$html .=  I18N::plural('No events for living people exist for the next %s day.', 'No events for living people exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
-					}
-				}
-			}
-		}
-
-		return $html;
-	}
-
-	/**
-	 * Print a list of events
-	 *
-	 * This performs the same function as print_events_table(), but formats the output differently.
-	 *
-	 * @param int $startjd
-	 * @param int $endjd
-	 * @param string $events
-	 * @param bool $only_living
-	 * @param string $sort_by
-	 *
-	 * @return string
-	 */
-	public static function eventsList($startjd, $endjd, $events = 'BIRT MARR DEAT', $only_living = false, $sort_by = 'anniv') {
-		global $WT_TREE;
-
-		// Did we have any output? Did we skip anything?
-		$output          = 0;
-		$filter          = 0;
-		$filtered_events = array();
-		$html            = '';
-		foreach (FunctionsDb::getEventsList($startjd, $endjd, $events, $WT_TREE) as $fact) {
-			$record = $fact->getParent();
-			// only living people ?
-			if ($only_living) {
-				if ($record instanceof Individual && $record->isDead()) {
-					$filter++;
-					continue;
-				}
-				if ($record instanceof Family) {
-					$husb = $record->getHusband();
-					if (is_null($husb) || $husb->isDead()) {
-						$filter++;
-						continue;
-					}
-					$wife = $record->getWife();
-					if (is_null($wife) || $wife->isDead()) {
-						$filter++;
-						continue;
-					}
-				}
-			}
-
-			$output++;
-
-			$filtered_events[] = $fact;
-		}
-
-		// Now we've filtered the list, we can sort by event, if required
-		switch ($sort_by) {
-		case 'anniv':
-			// Data is already sorted by anniversary date
-			break;
-		case 'alpha':
-			uasort($filtered_events, function (Fact $x, Fact $y) {
-				return GedcomRecord::compare($x->getParent(), $y->getParent());
-			});
-			break;
-		}
-
-		foreach ($filtered_events as $fact) {
-			$record = $fact->getParent();
-			$html .= '<a href="' . $record->getHtmlUrl() . '" class="list_item name2">' . $record->getFullName() . '</a>';
-			if ($record instanceof Individual) {
-				$html .= $record->getSexImage();
-			}
-			$html .= '<br><div class="indent">';
-			$html .= $fact->getLabel() . ' — ' . $fact->getDate()->display(true);
-			if ($fact->anniv) {
-				$html .= ' (' . I18N::translate('%s year anniversary', I18N::number($fact->anniv)) . ')';
-			}
-			if (!$fact->getPlace()->isEmpty()) {
-				$html .= ' — <a href="' . $fact->getPlace()->getURL() . '">' . $fact->getPlace()->getFullName() . '</a>';
-			}
-			$html .= '</div>';
-		}
-
-		// Print a final summary message about restricted/filtered facts
-		$summary = '';
-		if ($endjd == WT_CLIENT_JD) {
-			// We're dealing with the Today’s Events block
-			if ($output == 0) {
-				if ($filter == 0) {
-					$summary = I18N::translate('No events exist for today.');
-				} else {
-					$summary = I18N::translate('No events for living individuals exist for today.');
-				}
-			}
-		} else {
-			// We're dealing with the Upcoming Events block
-			if ($output == 0) {
-				if ($filter == 0) {
-					if ($endjd == $startjd) {
-						$summary = I18N::translate('No events exist for tomorrow.');
-					} else {
-						// I18N: translation for %s==1 is unused; it is translated separately as “tomorrow”
-						$summary = I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
-					}
-				} else {
-					if ($endjd == $startjd) {
-						$summary = I18N::translate('No events for living individuals exist for tomorrow.');
-					} else {
-						// I18N: translation for %s==1 is unused; it is translated separately as “tomorrow”
-						$summary = I18N::plural('No events for living people exist for the next %s day.', 'No events for living people exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
-					}
-				}
-			}
-		}
-		if ($summary) {
-			$html .= '<b>' . $summary . '</b>';
-		}
-
-		return $html;
-	}
-
-	/**
-	 * Print a chart by age using Google chart API
-	 *
-	 * @param int[] $data
-	 * @param string $title
-	 *
-	 * @return string
-	 */
-	public static function chartByAge($data, $title) {
-		$count  = 0;
-		$agemax = 0;
-		$vmax   = 0;
-		$avg    = 0;
-		foreach ($data as $age => $v) {
-			$n      = strlen($v);
-			$vmax   = max($vmax, $n);
-			$agemax = max($agemax, $age);
-			$count += $n;
-			$avg += $age * $n;
-		}
-		if ($count < 1) {
-			return '';
-		}
-		$avg       = round($avg / $count);
-		$chart_url = "https://chart.googleapis.com/chart?cht=bvs"; // chart type
-		$chart_url .= "&amp;chs=725x150"; // size
-		$chart_url .= "&amp;chbh=3,2,2"; // bvg : 4,1,2
-		$chart_url .= "&amp;chf=bg,s,FFFFFF99"; //background color
-		$chart_url .= "&amp;chco=0000FF,FFA0CB,FF0000"; // bar color
-		$chart_url .= "&amp;chdl=" . rawurlencode(I18N::translate('Males')) . "|" . rawurlencode(I18N::translate('Females')) . "|" . rawurlencode(I18N::translate('Average age') . ": " . $avg); // legend & average age
-		$chart_url .= "&amp;chtt=" . rawurlencode($title); // title
-		$chart_url .= "&amp;chxt=x,y,r"; // axis labels specification
-		$chart_url .= "&amp;chm=V,FF0000,0," . ($avg - 0.3) . ",1"; // average age line marker
-		$chart_url .= "&amp;chxl=0:|"; // label
-		for ($age = 0; $age <= $agemax; $age += 5) {
-			$chart_url .= $age . "|||||"; // x axis
-		}
-		$chart_url .= "|1:||" . rawurlencode(I18N::percentage($vmax / $count)); // y axis
-		$chart_url .= "|2:||";
-		$step = $vmax;
-		for ($d = $vmax; $d > 0; $d--) {
-			if ($vmax < ($d * 10 + 1) && ($vmax % $d) == 0) {
-				$step = $d;
-			}
-		}
-		if ($step == $vmax) {
-			for ($d = $vmax - 1; $d > 0; $d--) {
-				if (($vmax - 1) < ($d * 10 + 1) && (($vmax - 1) % $d) == 0) {
-					$step = $d;
-				}
-			}
-		}
-		for ($n = $step; $n < $vmax; $n += $step) {
-			$chart_url .= $n . "|";
-		}
-		$chart_url .= rawurlencode($vmax . " / " . $count); // r axis
-		$chart_url .= "&amp;chg=100," . round(100 * $step / $vmax, 1) . ",1,5"; // grid
-		$chart_url .= "&amp;chd=s:"; // data : simple encoding from A=0 to 9=61
-		$CHART_ENCODING61 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-		for ($age = 0; $age <= $agemax; $age++) {
-			$chart_url .= $CHART_ENCODING61[(int) (substr_count($data[$age], "M") * 61 / $vmax)];
-		}
-		$chart_url .= ",";
-		for ($age = 0; $age <= $agemax; $age++) {
-			$chart_url .= $CHART_ENCODING61[(int) (substr_count($data[$age], "F") * 61 / $vmax)];
-		}
-		$html = '<img src="' . $chart_url . '" alt="' . $title . '" title="' . $title . '" class="gchart">';
-
-		return $html;
-	}
-
-	/**
-	 * Print a chart by decade using Google chart API
-	 *
-	 * @param int[] $data
-	 * @param string $title
-	 *
-	 * @return string
-	 */
-	public static function chartByDecade($data, $title) {
-		$count = 0;
-		$vmax  = 0;
-		foreach ($data as $v) {
-			$n    = strlen($v);
-			$vmax = max($vmax, $n);
-			$count += $n;
-		}
-		if ($count < 1) {
-			return '';
-		}
-		$chart_url = "https://chart.googleapis.com/chart?cht=bvs"; // chart type
-		$chart_url .= "&amp;chs=360x150"; // size
-		$chart_url .= "&amp;chbh=3,3"; // bvg : 4,1,2
-		$chart_url .= "&amp;chf=bg,s,FFFFFF99"; //background color
-		$chart_url .= "&amp;chco=0000FF,FFA0CB"; // bar color
-		$chart_url .= "&amp;chtt=" . rawurlencode($title); // title
-		$chart_url .= "&amp;chxt=x,y,r"; // axis labels specification
-		$chart_url .= "&amp;chxl=0:|&lt;|||"; // <1570
-		for ($y = 1600; $y < 2030; $y += 50) {
-			$chart_url .= $y . "|||||"; // x axis
-		}
-		$chart_url .= "|1:||" . rawurlencode(I18N::percentage($vmax / $count)); // y axis
-		$chart_url .= "|2:||";
-		$step = $vmax;
-		for ($d = $vmax; $d > 0; $d--) {
-			if ($vmax < ($d * 10 + 1) && ($vmax % $d) == 0) {
-				$step = $d;
-			}
-		}
-		if ($step == $vmax) {
-			for ($d = $vmax - 1; $d > 0; $d--) {
-				if (($vmax - 1) < ($d * 10 + 1) && (($vmax - 1) % $d) == 0) {
-					$step = $d;
-				}
-			}
-		}
-		for ($n = $step; $n < $vmax; $n += $step) {
-			$chart_url .= $n . "|";
-		}
-		$chart_url .= rawurlencode($vmax . " / " . $count); // r axis
-		$chart_url .= "&amp;chg=100," . round(100 * $step / $vmax, 1) . ",1,5"; // grid
-		$chart_url .= "&amp;chd=s:"; // data : simple encoding from A=0 to 9=61
-		$CHART_ENCODING61 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-		for ($y = 1570; $y < 2030; $y += 10) {
-			$chart_url .= $CHART_ENCODING61[(int) (substr_count($data[$y], "M") * 61 / $vmax)];
-		}
-		$chart_url .= ",";
-		for ($y = 1570; $y < 2030; $y += 10) {
-			$chart_url .= $CHART_ENCODING61[(int) (substr_count($data[$y], "F") * 61 / $vmax)];
-		}
-		$html = '<img src="' . $chart_url . '" alt="' . $title . '" title="' . $title . '" class="gchart">';
-
-		return $html;
-	}
+        // Did we have any output? Did we skip anything?
+        $filter          = 0;
+        $filtered_events = array();
+
+        foreach (FunctionsDb::getEventsList($startjd, $endjd, $events, $WT_TREE) as $fact) {
+            $record = $fact->getParent();
+            // Only living people ?
+            if ($only_living) {
+                if ($record instanceof Individual && $record->isDead()) {
+                    $filter++;
+                    continue;
+                }
+                if ($record instanceof Family) {
+                    $husb = $record->getHusband();
+                    if (is_null($husb) || $husb->isDead()) {
+                        $filter++;
+                        continue;
+                    }
+                    $wife = $record->getWife();
+                    if (is_null($wife) || $wife->isDead()) {
+                        $filter++;
+                        continue;
+                    }
+                }
+            }
+
+            $filtered_events[] = $fact;
+        }
+
+        if (!empty($filtered_events)) {
+            $html .= '<table id="' . $table_id . '" class="width100">';
+            $html .= '<thead><tr>';
+            $html .= '<th>' . I18N::translate('Record') . '</th>';
+            $html .= '<th>' . GedcomTag::getLabel('DATE') . '</th>';
+            $html .= '<th><i class="icon-reminder" title="' . I18N::translate('Anniversary') . '"></i></th>';
+            $html .= '<th>' . GedcomTag::getLabel('EVEN') . '</th>';
+            $html .= '</tr></thead><tbody>';
+
+            foreach ($filtered_events as $n => $fact) {
+                $record = $fact->getParent();
+                $html .= '<tr>';
+                $html .= '<td data-sort="' . Filter::escapeHtml($record->getSortName()) . '">';
+                $html .= '<a href="' . $record->getHtmlUrl() . '">' . $record->getFullName() . '</a>';
+                if ($record instanceof Individual) {
+                    $html .= $record->getSexImage();
+                }
+                $html .= '</td>';
+                $html .= '<td data-sort="' . $fact->getDate()->minimumJulianDay() . '">';
+                $html .= $fact->getDate()->display();
+                $html .= '</td>';
+                $html .= '<td class="center" data-sort="' . $fact->anniv . '">';
+                $html .= ($fact->anniv ? I18N::number($fact->anniv) : '');
+                $html .= '</td>';
+                $html .= '<td class="center">' . $fact->getLabel() . '</td>';
+                $html .= '</tr>';
+            }
+
+            $html .= '</tbody></table>';
+        } else {
+            if ($endjd === WT_CLIENT_JD) {
+                // We're dealing with the Today’s Events block
+                if ($filter === 0) {
+                    $html .=  I18N::translate('No events exist for today.');
+                } else {
+                    $html .=  I18N::translate('No events for living individuals exist for today.');
+                }
+            } else {
+                // We're dealing with the Upcoming Events block
+                if ($filter === 0) {
+                    if ($endjd === $startjd) {
+                        $html .=  I18N::translate('No events exist for tomorrow.');
+                    } else {
+                        $html .=  /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
+                    }
+                } else {
+                    if ($endjd === $startjd) {
+                        $html .=  I18N::translate('No events for living individuals exist for tomorrow.');
+                    } else {
+                        // I18N: translation for %s==1 is unused; it is translated separately as “tomorrow”
+                        $html .=  I18N::plural('No events for living people exist for the next %s day.', 'No events for living people exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
+                    }
+                }
+            }
+        }
+
+        return $html;
+    }
+
+    /**
+     * Print a list of events
+     *
+     * This performs the same function as print_events_table(), but formats the output differently.
+     *
+     * @param int $startjd
+     * @param int $endjd
+     * @param string $events
+     * @param bool $only_living
+     * @param string $sort_by
+     *
+     * @return string
+     */
+    public static function eventsList($startjd, $endjd, $events = 'BIRT MARR DEAT', $only_living = false, $sort_by = 'anniv') {
+        global $WT_TREE;
+
+        // Did we have any output? Did we skip anything?
+        $output          = 0;
+        $filter          = 0;
+        $filtered_events = array();
+        $html            = '';
+        foreach (FunctionsDb::getEventsList($startjd, $endjd, $events, $WT_TREE) as $fact) {
+            $record = $fact->getParent();
+            // only living people ?
+            if ($only_living) {
+                if ($record instanceof Individual && $record->isDead()) {
+                    $filter++;
+                    continue;
+                }
+                if ($record instanceof Family) {
+                    $husb = $record->getHusband();
+                    if (is_null($husb) || $husb->isDead()) {
+                        $filter++;
+                        continue;
+                    }
+                    $wife = $record->getWife();
+                    if (is_null($wife) || $wife->isDead()) {
+                        $filter++;
+                        continue;
+                    }
+                }
+            }
+
+            $output++;
+
+            $filtered_events[] = $fact;
+        }
+
+        // Now we've filtered the list, we can sort by event, if required
+        switch ($sort_by) {
+        case 'anniv':
+            // Data is already sorted by anniversary date
+            break;
+        case 'alpha':
+            uasort($filtered_events, function (Fact $x, Fact $y) {
+                return GedcomRecord::compare($x->getParent(), $y->getParent());
+            });
+            break;
+        }
+
+        foreach ($filtered_events as $fact) {
+            $record = $fact->getParent();
+            $html .= '<a href="' . $record->getHtmlUrl() . '" class="list_item name2">' . $record->getFullName() . '</a>';
+            if ($record instanceof Individual) {
+                $html .= $record->getSexImage();
+            }
+            $html .= '<br><div class="indent">';
+            $html .= $fact->getLabel() . ' — ' . $fact->getDate()->display(true);
+            if ($fact->anniv) {
+                $html .= ' (' . I18N::translate('%s year anniversary', I18N::number($fact->anniv)) . ')';
+            }
+            if (!$fact->getPlace()->isEmpty()) {
+                $html .= ' — <a href="' . $fact->getPlace()->getURL() . '">' . $fact->getPlace()->getFullName() . '</a>';
+            }
+            $html .= '</div>';
+        }
+
+        // Print a final summary message about restricted/filtered facts
+        $summary = '';
+        if ($endjd == WT_CLIENT_JD) {
+            // We're dealing with the Today’s Events block
+            if ($output == 0) {
+                if ($filter == 0) {
+                    $summary = I18N::translate('No events exist for today.');
+                } else {
+                    $summary = I18N::translate('No events for living individuals exist for today.');
+                }
+            }
+        } else {
+            // We're dealing with the Upcoming Events block
+            if ($output == 0) {
+                if ($filter == 0) {
+                    if ($endjd == $startjd) {
+                        $summary = I18N::translate('No events exist for tomorrow.');
+                    } else {
+                        // I18N: translation for %s==1 is unused; it is translated separately as “tomorrow”
+                        $summary = I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
+                    }
+                } else {
+                    if ($endjd == $startjd) {
+                        $summary = I18N::translate('No events for living individuals exist for tomorrow.');
+                    } else {
+                        // I18N: translation for %s==1 is unused; it is translated separately as “tomorrow”
+                        $summary = I18N::plural('No events for living people exist for the next %s day.', 'No events for living people exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
+                    }
+                }
+            }
+        }
+        if ($summary) {
+            $html .= '<b>' . $summary . '</b>';
+        }
+
+        return $html;
+    }
+
+    /**
+     * Print a chart by age using Google chart API
+     *
+     * @param int[] $data
+     * @param string $title
+     *
+     * @return string
+     */
+    public static function chartByAge($data, $title) {
+        $count  = 0;
+        $agemax = 0;
+        $vmax   = 0;
+        $avg    = 0;
+        foreach ($data as $age => $v) {
+            $n      = strlen($v);
+            $vmax   = max($vmax, $n);
+            $agemax = max($agemax, $age);
+            $count += $n;
+            $avg += $age * $n;
+        }
+        if ($count < 1) {
+            return '';
+        }
+        $avg       = round($avg / $count);
+        $chart_url = "https://chart.googleapis.com/chart?cht=bvs"; // chart type
+        $chart_url .= "&amp;chs=725x150"; // size
+        $chart_url .= "&amp;chbh=3,2,2"; // bvg : 4,1,2
+        $chart_url .= "&amp;chf=bg,s,FFFFFF99"; //background color
+        $chart_url .= "&amp;chco=0000FF,FFA0CB,FF0000"; // bar color
+        $chart_url .= "&amp;chdl=" . rawurlencode(I18N::translate('Males')) . "|" . rawurlencode(I18N::translate('Females')) . "|" . rawurlencode(I18N::translate('Average age') . ": " . $avg); // legend & average age
+        $chart_url .= "&amp;chtt=" . rawurlencode($title); // title
+        $chart_url .= "&amp;chxt=x,y,r"; // axis labels specification
+        $chart_url .= "&amp;chm=V,FF0000,0," . ($avg - 0.3) . ",1"; // average age line marker
+        $chart_url .= "&amp;chxl=0:|"; // label
+        for ($age = 0; $age <= $agemax; $age += 5) {
+            $chart_url .= $age . "|||||"; // x axis
+        }
+        $chart_url .= "|1:||" . rawurlencode(I18N::percentage($vmax / $count)); // y axis
+        $chart_url .= "|2:||";
+        $step = $vmax;
+        for ($d = $vmax; $d > 0; $d--) {
+            if ($vmax < ($d * 10 + 1) && ($vmax % $d) == 0) {
+                $step = $d;
+            }
+        }
+        if ($step == $vmax) {
+            for ($d = $vmax - 1; $d > 0; $d--) {
+                if (($vmax - 1) < ($d * 10 + 1) && (($vmax - 1) % $d) == 0) {
+                    $step = $d;
+                }
+            }
+        }
+        for ($n = $step; $n < $vmax; $n += $step) {
+            $chart_url .= $n . "|";
+        }
+        $chart_url .= rawurlencode($vmax . " / " . $count); // r axis
+        $chart_url .= "&amp;chg=100," . round(100 * $step / $vmax, 1) . ",1,5"; // grid
+        $chart_url .= "&amp;chd=s:"; // data : simple encoding from A=0 to 9=61
+        $CHART_ENCODING61 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+        for ($age = 0; $age <= $agemax; $age++) {
+            $chart_url .= $CHART_ENCODING61[(int) (substr_count($data[$age], "M") * 61 / $vmax)];
+        }
+        $chart_url .= ",";
+        for ($age = 0; $age <= $agemax; $age++) {
+            $chart_url .= $CHART_ENCODING61[(int) (substr_count($data[$age], "F") * 61 / $vmax)];
+        }
+        $html = '<img src="' . $chart_url . '" alt="' . $title . '" title="' . $title . '" class="gchart">';
+
+        return $html;
+    }
+
+    /**
+     * Print a chart by decade using Google chart API
+     *
+     * @param int[] $data
+     * @param string $title
+     *
+     * @return string
+     */
+    public static function chartByDecade($data, $title) {
+        $count = 0;
+        $vmax  = 0;
+        foreach ($data as $v) {
+            $n    = strlen($v);
+            $vmax = max($vmax, $n);
+            $count += $n;
+        }
+        if ($count < 1) {
+            return '';
+        }
+        $chart_url = "https://chart.googleapis.com/chart?cht=bvs"; // chart type
+        $chart_url .= "&amp;chs=360x150"; // size
+        $chart_url .= "&amp;chbh=3,3"; // bvg : 4,1,2
+        $chart_url .= "&amp;chf=bg,s,FFFFFF99"; //background color
+        $chart_url .= "&amp;chco=0000FF,FFA0CB"; // bar color
+        $chart_url .= "&amp;chtt=" . rawurlencode($title); // title
+        $chart_url .= "&amp;chxt=x,y,r"; // axis labels specification
+        $chart_url .= "&amp;chxl=0:|&lt;|||"; // <1570
+        for ($y = 1600; $y < 2030; $y += 50) {
+            $chart_url .= $y . "|||||"; // x axis
+        }
+        $chart_url .= "|1:||" . rawurlencode(I18N::percentage($vmax / $count)); // y axis
+        $chart_url .= "|2:||";
+        $step = $vmax;
+        for ($d = $vmax; $d > 0; $d--) {
+            if ($vmax < ($d * 10 + 1) && ($vmax % $d) == 0) {
+                $step = $d;
+            }
+        }
+        if ($step == $vmax) {
+            for ($d = $vmax - 1; $d > 0; $d--) {
+                if (($vmax - 1) < ($d * 10 + 1) && (($vmax - 1) % $d) == 0) {
+                    $step = $d;
+                }
+            }
+        }
+        for ($n = $step; $n < $vmax; $n += $step) {
+            $chart_url .= $n . "|";
+        }
+        $chart_url .= rawurlencode($vmax . " / " . $count); // r axis
+        $chart_url .= "&amp;chg=100," . round(100 * $step / $vmax, 1) . ",1,5"; // grid
+        $chart_url .= "&amp;chd=s:"; // data : simple encoding from A=0 to 9=61
+        $CHART_ENCODING61 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+        for ($y = 1570; $y < 2030; $y += 10) {
+            $chart_url .= $CHART_ENCODING61[(int) (substr_count($data[$y], "M") * 61 / $vmax)];
+        }
+        $chart_url .= ",";
+        for ($y = 1570; $y < 2030; $y += 10) {
+            $chart_url .= $CHART_ENCODING61[(int) (substr_count($data[$y], "F") * 61 / $vmax)];
+        }
+        $html = '<img src="' . $chart_url . '" alt="' . $title . '" title="' . $title . '" class="gchart">';
+
+        return $html;
+    }
 }

app/Family.php

Spacing +2 added lines, -2 removed lines

@@ -343,7 +343,7 @@ 
 			// Check the script used by each name, so we can match cyrillic with cyrillic, greek with greek, etc.
 			$husb_names = array();
 			if ($this->husb) {
-				$husb_names = array_filter($this->husb->getAllNames(), function(array $x) { return $x['type'] !== '_MARNM'; } );
+				$husb_names = array_filter($this->husb->getAllNames(), function (array $x) { return $x['type'] !== '_MARNM'; } );
 			}
 			// If the individual only has married names, create a dummy birth name.
 			if (empty($husb_names)) {
@@ -359,7 +359,7 @@ 
 
 			$wife_names = array();
 			if ($this->wife) {
-				$wife_names = array_filter($this->wife->getAllNames(), function(array $x) { return $x['type'] !== '_MARNM'; } );
+				$wife_names = array_filter($this->wife->getAllNames(), function (array $x) { return $x['type'] !== '_MARNM'; } );
 			}
 			// If the individual only has married names, create a dummy birth name.
 			if (empty($wife_names)) {

Indentation +397 added lines, -397 removed lines

@@ -19,401 +19,401 @@
  * A GEDCOM family (FAM) object.
  */
 class Family extends GedcomRecord {
-	const RECORD_TYPE = 'FAM';
-	const URL_PREFIX  = 'family.php?famid=';
-
-	/** @var Individual|null The husband (or first spouse for same-sex couples) */
-	private $husb;
-
-	/** @var Individual|null The wife (or second spouse for same-sex couples) */
-	private $wife;
-
-	/**
-	 * Create a GedcomRecord object from raw GEDCOM data.
-	 *
-	 * @param string      $xref
-	 * @param string      $gedcom  an empty string for new/pending records
-	 * @param string|null $pending null for a record with no pending edits,
-	 *                             empty string for records with pending deletions
-	 * @param Tree        $tree
-	 */
-	public function __construct($xref, $gedcom, $pending, $tree) {
-		parent::__construct($xref, $gedcom, $pending, $tree);
-
-		// Fetch family members
-		if (preg_match_all('/^1 (?:HUSB|WIFE|CHIL) @(.+)@/m', $gedcom . $pending, $match)) {
-			Individual::load($tree, $match[1]);
-		}
-
-		if (preg_match('/^1 HUSB @(.+)@/m', $gedcom . $pending, $match)) {
-			$this->husb = Individual::getInstance($match[1], $tree);
-		}
-		if (preg_match('/^1 WIFE @(.+)@/m', $gedcom . $pending, $match)) {
-			$this->wife = Individual::getInstance($match[1], $tree);
-		}
-
-		// Make sure husb/wife are the right way round.
-		if ($this->husb && $this->husb->getSex() === 'F' || $this->wife && $this->wife->getSex() === 'M') {
-			list($this->husb, $this->wife) = array($this->wife, $this->husb);
-		}
-	}
-
-	/**
-	 * Generate a private version of this record
-	 *
-	 * @param int $access_level
-	 *
-	 * @return string
-	 */
-	protected function createPrivateGedcomRecord($access_level) {
-		$SHOW_PRIVATE_RELATIONSHIPS = $this->tree->getPreference('SHOW_PRIVATE_RELATIONSHIPS');
-
-		$rec = '0 @' . $this->xref . '@ FAM';
-		// Just show the 1 CHIL/HUSB/WIFE tag, not any subtags, which may contain private data
-		preg_match_all('/\n1 (?:CHIL|HUSB|WIFE) @(' . WT_REGEX_XREF . ')@/', $this->gedcom, $matches, PREG_SET_ORDER);
-		foreach ($matches as $match) {
-			$rela = Individual::getInstance($match[1], $this->tree);
-			if ($rela && ($SHOW_PRIVATE_RELATIONSHIPS || $rela->canShow($access_level))) {
-				$rec .= $match[0];
-			}
-		}
-
-		return $rec;
-	}
-
-	/**
-	 * Fetch data from the database
-	 *
-	 * @param string $xref
-	 * @param int    $tree_id
-	 *
-	 * @return null|string
-	 */
-	protected static function fetchGedcomRecord($xref, $tree_id) {
-		return Database::prepare(
-			"SELECT f_gedcom FROM `##families` WHERE f_id = :xref AND f_file = :tree_id"
-		)->execute(array(
-			'xref'    => $xref,
-			'tree_id' => $tree_id,
-		))->fetchOne();
-	}
-
-	/**
-	 * Get the male (or first female) partner of the family
-	 *
-	 * @param $access_level int|null
-	 *
-	 * @return Individual|null
-	 */
-	public function getHusband($access_level = null) {
-		$SHOW_PRIVATE_RELATIONSHIPS = $this->tree->getPreference('SHOW_PRIVATE_RELATIONSHIPS');
-
-		if ($this->husb && ($SHOW_PRIVATE_RELATIONSHIPS || $this->husb->canShowName($access_level))) {
-			return $this->husb;
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Get the female (or second male) partner of the family
-	 *
-	 * @param $access_level int|null
-	 *
-	 * @return Individual|null
-	 */
-	public function getWife($access_level = null) {
-		$SHOW_PRIVATE_RELATIONSHIPS = $this->tree->getPreference('SHOW_PRIVATE_RELATIONSHIPS');
-
-		if ($this->wife && ($SHOW_PRIVATE_RELATIONSHIPS || $this->wife->canShowName($access_level))) {
-			return $this->wife;
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Each object type may have its own special rules, and re-implement this function.
-	 *
-	 * @param int $access_level
-	 *
-	 * @return bool
-	 */
-	protected function canShowByType($access_level) {
-		// Hide a family if any member is private
-		preg_match_all('/\n1 (?:CHIL|HUSB|WIFE) @(' . WT_REGEX_XREF . ')@/', $this->gedcom, $matches);
-		foreach ($matches[1] as $match) {
-			$person = Individual::getInstance($match, $this->tree);
-			if ($person && !$person->canShow($access_level)) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Can the name of this record be shown?
-	 *
-	 * @param int|null $access_level
-	 *
-	 * @return bool
-	 */
-	public function canShowName($access_level = null) {
-		// We can always see the name (Husband-name + Wife-name), however,
-		// the name will often be "private + private"
-		return true;
-	}
-
-	/**
-	 * Find the spouse of a person.
-	 *
-	 * @param Individual $person
-	 * @param int|null   $access_level
-	 *
-	 * @return Individual|null
-	 */
-	public function getSpouse(Individual $person, $access_level = null) {
-		if ($person === $this->wife) {
-			return $this->getHusband($access_level);
-		} else {
-			return $this->getWife($access_level);
-		}
-	}
-
-	/**
-	 * Get the (zero, one or two) spouses from this family.
-	 *
-	 * @param int|null $access_level
-	 *
-	 * @return Individual[]
-	 */
-	public function getSpouses($access_level = null) {
-		return array_filter(array(
-			$this->getHusband($access_level),
-			$this->getWife($access_level),
-		));
-	}
-
-	/**
-	 * Get a list of this family’s children.
-	 *
-	 * @param int|null $access_level
-	 *
-	 * @return Individual[]
-	 */
-	public function getChildren($access_level = null) {
-		if ($access_level === null) {
-			$access_level = Auth::accessLevel($this->tree);
-		}
-
-		$SHOW_PRIVATE_RELATIONSHIPS = $this->tree->getPreference('SHOW_PRIVATE_RELATIONSHIPS');
-
-		$children = array();
-		foreach ($this->getFacts('CHIL', false, $access_level, $SHOW_PRIVATE_RELATIONSHIPS) as $fact) {
-			$child = $fact->getTarget();
-			if ($child && ($SHOW_PRIVATE_RELATIONSHIPS || $child->canShowName($access_level))) {
-				$children[] = $child;
-			}
-		}
-
-		return $children;
-	}
-
-	/**
-	 * Static helper function to sort an array of families by marriage date
-	 *
-	 * @param Family $x
-	 * @param Family $y
-	 *
-	 * @return int
-	 */
-	public static function compareMarrDate(Family $x, Family $y) {
-		return Date::compare($x->getMarriageDate(), $y->getMarriageDate());
-	}
-
-	/**
-	 * Number of children - for the individual list
-	 *
-	 * @return int
-	 */
-	public function getNumberOfChildren() {
-		$nchi = count($this->getChildren());
-		foreach ($this->getFacts('NCHI') as $fact) {
-			$nchi = max($nchi, (int) $fact->getValue());
-		}
-
-		return $nchi;
-	}
-
-	/**
-	 * get the marriage event
-	 *
-	 * @return Fact
-	 */
-	public function getMarriage() {
-		return $this->getFirstFact('MARR');
-	}
-
-	/**
-	 * Get marriage date
-	 *
-	 * @return Date
-	 */
-	public function getMarriageDate() {
-		$marriage = $this->getMarriage();
-		if ($marriage) {
-			return $marriage->getDate();
-		} else {
-			return new Date('');
-		}
-	}
-
-	/**
-	 * Get the marriage year - displayed on lists of families
-	 *
-	 * @return int
-	 */
-	public function getMarriageYear() {
-		return $this->getMarriageDate()->minimumDate()->y;
-	}
-
-	/**
-	 * Get the type for this marriage
-	 *
-	 * @return string|null
-	 */
-	public function getMarriageType() {
-		$marriage = $this->getMarriage();
-		if ($marriage) {
-			return $marriage->getAttribute('TYPE');
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Get the marriage place
-	 *
-	 * @return Place
-	 */
-	public function getMarriagePlace() {
-		$marriage = $this->getMarriage();
-
-		return $marriage->getPlace();
-	}
-
-	/**
-	 * Get a list of all marriage dates - for the family lists.
-	 *
-	 * @return Date[]
-	 */
-	public function getAllMarriageDates() {
-		foreach (explode('|', WT_EVENTS_MARR) as $event) {
-			if ($array = $this->getAllEventDates($event)) {
-				return $array;
-			}
-		}
-
-		return array();
-	}
-
-	/**
-	 * Get a list of all marriage places - for the family lists.
-	 *
-	 * @return string[]
-	 */
-	public function getAllMarriagePlaces() {
-		foreach (explode('|', WT_EVENTS_MARR) as $event) {
-			if ($array = $this->getAllEventPlaces($event)) {
-				return $array;
-			}
-		}
-
-		return array();
-	}
-
-	/**
-	 * Derived classes should redefine this function, otherwise the object will have no name
-	 *
-	 * @return string[][]
-	 */
-	public function getAllNames() {
-		if (is_null($this->_getAllNames)) {
-			// Check the script used by each name, so we can match cyrillic with cyrillic, greek with greek, etc.
-			$husb_names = array();
-			if ($this->husb) {
-				$husb_names = array_filter($this->husb->getAllNames(), function(array $x) { return $x['type'] !== '_MARNM'; } );
-			}
-			// If the individual only has married names, create a dummy birth name.
-			if (empty($husb_names)) {
-				$husb_names[] = array(
-					'type' => 'BIRT',
-					'sort' => '@N.N.',
-					'full' => I18N::translateContext('Unknown given name', '…') . ' ' . I18N::translateContext('Unknown surname', '…'),
-				);
-			}
-			foreach ($husb_names as $n => $husb_name) {
-				$husb_names[$n]['script'] = I18N::textScript($husb_name['full']);
-			}
-
-			$wife_names = array();
-			if ($this->wife) {
-				$wife_names = array_filter($this->wife->getAllNames(), function(array $x) { return $x['type'] !== '_MARNM'; } );
-			}
-			// If the individual only has married names, create a dummy birth name.
-			if (empty($wife_names)) {
-				$wife_names[] = array(
-					'type' => 'BIRT',
-					'sort' => '@N.N.',
-					'full' => I18N::translateContext('Unknown given name', '…') . ' ' . I18N::translateContext('Unknown surname', '…'),
-				);
-			}
-			foreach ($wife_names as $n => $wife_name) {
-				$wife_names[$n]['script'] = I18N::textScript($wife_name['full']);
-			}
-
-			// Add the matched names first
-			foreach ($husb_names as $husb_name) {
-				foreach ($wife_names as $wife_name) {
-					if ($husb_name['script'] == $wife_name['script']) {
-						$this->_getAllNames[] = array(
-							'type' => $husb_name['type'],
-							'sort' => $husb_name['sort'] . ' + ' . $wife_name['sort'],
-							'full' => $husb_name['full'] . ' + ' . $wife_name['full'],
-							// No need for a fullNN entry - we do not currently store FAM names in the database
-						);
-					}
-				}
-			}
-
-			// Add the unmatched names second (there may be no matched names)
-			foreach ($husb_names as $husb_name) {
-				foreach ($wife_names as $wife_name) {
-					if ($husb_name['script'] != $wife_name['script']) {
-						$this->_getAllNames[] = array(
-							'type' => $husb_name['type'],
-							'sort' => $husb_name['sort'] . ' + ' . $wife_name['sort'],
-							'full' => $husb_name['full'] . ' + ' . $wife_name['full'],
-							// No need for a fullNN entry - we do not currently store FAM names in the database
-						);
-					}
-				}
-			}
-		}
-
-		return $this->_getAllNames;
-	}
-
-	/**
-	 * This function should be redefined in derived classes to show any major
-	 * identifying characteristics of this record.
-	 *
-	 * @return string
-	 */
-	public function formatListDetails() {
-		return
-			$this->formatFirstMajorFact(WT_EVENTS_MARR, 1) .
-			$this->formatFirstMajorFact(WT_EVENTS_DIV, 1);
-	}
+    const RECORD_TYPE = 'FAM';
+    const URL_PREFIX  = 'family.php?famid=';
+
+    /** @var Individual|null The husband (or first spouse for same-sex couples) */
+    private $husb;
+
+    /** @var Individual|null The wife (or second spouse for same-sex couples) */
+    private $wife;
+
+    /**
+     * Create a GedcomRecord object from raw GEDCOM data.
+     *
+     * @param string      $xref
+     * @param string      $gedcom  an empty string for new/pending records
+     * @param string|null $pending null for a record with no pending edits,
+     *                             empty string for records with pending deletions
+     * @param Tree        $tree
+     */
+    public function __construct($xref, $gedcom, $pending, $tree) {
+        parent::__construct($xref, $gedcom, $pending, $tree);
+
+        // Fetch family members
+        if (preg_match_all('/^1 (?:HUSB|WIFE|CHIL) @(.+)@/m', $gedcom . $pending, $match)) {
+            Individual::load($tree, $match[1]);
+        }
+
+        if (preg_match('/^1 HUSB @(.+)@/m', $gedcom . $pending, $match)) {
+            $this->husb = Individual::getInstance($match[1], $tree);
+        }
+        if (preg_match('/^1 WIFE @(.+)@/m', $gedcom . $pending, $match)) {
+            $this->wife = Individual::getInstance($match[1], $tree);
+        }
+
+        // Make sure husb/wife are the right way round.
+        if ($this->husb && $this->husb->getSex() === 'F' || $this->wife && $this->wife->getSex() === 'M') {
+            list($this->husb, $this->wife) = array($this->wife, $this->husb);
+        }
+    }
+
+    /**
+     * Generate a private version of this record
+     *
+     * @param int $access_level
+     *
+     * @return string
+     */
+    protected function createPrivateGedcomRecord($access_level) {
+        $SHOW_PRIVATE_RELATIONSHIPS = $this->tree->getPreference('SHOW_PRIVATE_RELATIONSHIPS');
+
+        $rec = '0 @' . $this->xref . '@ FAM';
+        // Just show the 1 CHIL/HUSB/WIFE tag, not any subtags, which may contain private data
+        preg_match_all('/\n1 (?:CHIL|HUSB|WIFE) @(' . WT_REGEX_XREF . ')@/', $this->gedcom, $matches, PREG_SET_ORDER);
+        foreach ($matches as $match) {
+            $rela = Individual::getInstance($match[1], $this->tree);
+            if ($rela && ($SHOW_PRIVATE_RELATIONSHIPS || $rela->canShow($access_level))) {
+                $rec .= $match[0];
+            }
+        }
+
+        return $rec;
+    }
+
+    /**
+     * Fetch data from the database
+     *
+     * @param string $xref
+     * @param int    $tree_id
+     *
+     * @return null|string
+     */
+    protected static function fetchGedcomRecord($xref, $tree_id) {
+        return Database::prepare(
+            "SELECT f_gedcom FROM `##families` WHERE f_id = :xref AND f_file = :tree_id"
+        )->execute(array(
+            'xref'    => $xref,
+            'tree_id' => $tree_id,
+        ))->fetchOne();
+    }
+
+    /**
+     * Get the male (or first female) partner of the family
+     *
+     * @param $access_level int|null
+     *
+     * @return Individual|null
+     */
+    public function getHusband($access_level = null) {
+        $SHOW_PRIVATE_RELATIONSHIPS = $this->tree->getPreference('SHOW_PRIVATE_RELATIONSHIPS');
+
+        if ($this->husb && ($SHOW_PRIVATE_RELATIONSHIPS || $this->husb->canShowName($access_level))) {
+            return $this->husb;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Get the female (or second male) partner of the family
+     *
+     * @param $access_level int|null
+     *
+     * @return Individual|null
+     */
+    public function getWife($access_level = null) {
+        $SHOW_PRIVATE_RELATIONSHIPS = $this->tree->getPreference('SHOW_PRIVATE_RELATIONSHIPS');
+
+        if ($this->wife && ($SHOW_PRIVATE_RELATIONSHIPS || $this->wife->canShowName($access_level))) {
+            return $this->wife;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Each object type may have its own special rules, and re-implement this function.
+     *
+     * @param int $access_level
+     *
+     * @return bool
+     */
+    protected function canShowByType($access_level) {
+        // Hide a family if any member is private
+        preg_match_all('/\n1 (?:CHIL|HUSB|WIFE) @(' . WT_REGEX_XREF . ')@/', $this->gedcom, $matches);
+        foreach ($matches[1] as $match) {
+            $person = Individual::getInstance($match, $this->tree);
+            if ($person && !$person->canShow($access_level)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Can the name of this record be shown?
+     *
+     * @param int|null $access_level
+     *
+     * @return bool
+     */
+    public function canShowName($access_level = null) {
+        // We can always see the name (Husband-name + Wife-name), however,
+        // the name will often be "private + private"
+        return true;
+    }
+
+    /**
+     * Find the spouse of a person.
+     *
+     * @param Individual $person
+     * @param int|null   $access_level
+     *
+     * @return Individual|null
+     */
+    public function getSpouse(Individual $person, $access_level = null) {
+        if ($person === $this->wife) {
+            return $this->getHusband($access_level);
+        } else {
+            return $this->getWife($access_level);
+        }
+    }
+
+    /**
+     * Get the (zero, one or two) spouses from this family.
+     *
+     * @param int|null $access_level
+     *
+     * @return Individual[]
+     */
+    public function getSpouses($access_level = null) {
+        return array_filter(array(
+            $this->getHusband($access_level),
+            $this->getWife($access_level),
+        ));
+    }
+
+    /**
+     * Get a list of this family’s children.
+     *
+     * @param int|null $access_level
+     *
+     * @return Individual[]
+     */
+    public function getChildren($access_level = null) {
+        if ($access_level === null) {
+            $access_level = Auth::accessLevel($this->tree);
+        }
+
+        $SHOW_PRIVATE_RELATIONSHIPS = $this->tree->getPreference('SHOW_PRIVATE_RELATIONSHIPS');
+
+        $children = array();
+        foreach ($this->getFacts('CHIL', false, $access_level, $SHOW_PRIVATE_RELATIONSHIPS) as $fact) {
+            $child = $fact->getTarget();
+            if ($child && ($SHOW_PRIVATE_RELATIONSHIPS || $child->canShowName($access_level))) {
+                $children[] = $child;
+            }
+        }
+
+        return $children;
+    }
+
+    /**
+     * Static helper function to sort an array of families by marriage date
+     *
+     * @param Family $x
+     * @param Family $y
+     *
+     * @return int
+     */
+    public static function compareMarrDate(Family $x, Family $y) {
+        return Date::compare($x->getMarriageDate(), $y->getMarriageDate());
+    }
+
+    /**
+     * Number of children - for the individual list
+     *
+     * @return int
+     */
+    public function getNumberOfChildren() {
+        $nchi = count($this->getChildren());
+        foreach ($this->getFacts('NCHI') as $fact) {
+            $nchi = max($nchi, (int) $fact->getValue());
+        }
+
+        return $nchi;
+    }
+
+    /**
+     * get the marriage event
+     *
+     * @return Fact
+     */
+    public function getMarriage() {
+        return $this->getFirstFact('MARR');
+    }
+
+    /**
+     * Get marriage date
+     *
+     * @return Date
+     */
+    public function getMarriageDate() {
+        $marriage = $this->getMarriage();
+        if ($marriage) {
+            return $marriage->getDate();
+        } else {
+            return new Date('');
+        }
+    }
+
+    /**
+     * Get the marriage year - displayed on lists of families
+     *
+     * @return int
+     */
+    public function getMarriageYear() {
+        return $this->getMarriageDate()->minimumDate()->y;
+    }
+
+    /**
+     * Get the type for this marriage
+     *
+     * @return string|null
+     */
+    public function getMarriageType() {
+        $marriage = $this->getMarriage();
+        if ($marriage) {
+            return $marriage->getAttribute('TYPE');
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Get the marriage place
+     *
+     * @return Place
+     */
+    public function getMarriagePlace() {
+        $marriage = $this->getMarriage();
+
+        return $marriage->getPlace();
+    }
+
+    /**
+     * Get a list of all marriage dates - for the family lists.
+     *
+     * @return Date[]
+     */
+    public function getAllMarriageDates() {
+        foreach (explode('|', WT_EVENTS_MARR) as $event) {
+            if ($array = $this->getAllEventDates($event)) {
+                return $array;
+            }
+        }
+
+        return array();
+    }
+
+    /**
+     * Get a list of all marriage places - for the family lists.
+     *
+     * @return string[]
+     */
+    public function getAllMarriagePlaces() {
+        foreach (explode('|', WT_EVENTS_MARR) as $event) {
+            if ($array = $this->getAllEventPlaces($event)) {
+                return $array;
+            }
+        }
+
+        return array();
+    }
+
+    /**
+     * Derived classes should redefine this function, otherwise the object will have no name
+     *
+     * @return string[][]
+     */
+    public function getAllNames() {
+        if (is_null($this->_getAllNames)) {
+            // Check the script used by each name, so we can match cyrillic with cyrillic, greek with greek, etc.
+            $husb_names = array();
+            if ($this->husb) {
+                $husb_names = array_filter($this->husb->getAllNames(), function(array $x) { return $x['type'] !== '_MARNM'; } );
+            }
+            // If the individual only has married names, create a dummy birth name.
+            if (empty($husb_names)) {
+                $husb_names[] = array(
+                    'type' => 'BIRT',
+                    'sort' => '@N.N.',
+                    'full' => I18N::translateContext('Unknown given name', '…') . ' ' . I18N::translateContext('Unknown surname', '…'),
+                );
+            }
+            foreach ($husb_names as $n => $husb_name) {
+                $husb_names[$n]['script'] = I18N::textScript($husb_name['full']);
+            }
+
+            $wife_names = array();
+            if ($this->wife) {
+                $wife_names = array_filter($this->wife->getAllNames(), function(array $x) { return $x['type'] !== '_MARNM'; } );
+            }
+            // If the individual only has married names, create a dummy birth name.
+            if (empty($wife_names)) {
+                $wife_names[] = array(
+                    'type' => 'BIRT',
+                    'sort' => '@N.N.',
+                    'full' => I18N::translateContext('Unknown given name', '…') . ' ' . I18N::translateContext('Unknown surname', '…'),
+                );
+            }
+            foreach ($wife_names as $n => $wife_name) {
+                $wife_names[$n]['script'] = I18N::textScript($wife_name['full']);
+            }
+
+            // Add the matched names first
+            foreach ($husb_names as $husb_name) {
+                foreach ($wife_names as $wife_name) {
+                    if ($husb_name['script'] == $wife_name['script']) {
+                        $this->_getAllNames[] = array(
+                            'type' => $husb_name['type'],
+                            'sort' => $husb_name['sort'] . ' + ' . $wife_name['sort'],
+                            'full' => $husb_name['full'] . ' + ' . $wife_name['full'],
+                            // No need for a fullNN entry - we do not currently store FAM names in the database
+                        );
+                    }
+                }
+            }
+
+            // Add the unmatched names second (there may be no matched names)
+            foreach ($husb_names as $husb_name) {
+                foreach ($wife_names as $wife_name) {
+                    if ($husb_name['script'] != $wife_name['script']) {
+                        $this->_getAllNames[] = array(
+                            'type' => $husb_name['type'],
+                            'sort' => $husb_name['sort'] . ' + ' . $wife_name['sort'],
+                            'full' => $husb_name['full'] . ' + ' . $wife_name['full'],
+                            // No need for a fullNN entry - we do not currently store FAM names in the database
+                        );
+                    }
+                }
+            }
+        }
+
+        return $this->_getAllNames;
+    }
+
+    /**
+     * This function should be redefined in derived classes to show any major
+     * identifying characteristics of this record.
+     *
+     * @return string
+     */
+    public function formatListDetails() {
+        return
+            $this->formatFirstMajorFact(WT_EVENTS_MARR, 1) .
+            $this->formatFirstMajorFact(WT_EVENTS_DIV, 1);
+    }
 }

admin_trees_renumber.php

Indentation +236 added lines, -236 removed lines

@@ -29,259 +29,259 @@
 
 $controller = new PageController;
 $controller
-	->restrictAccess(Auth::isManager($WT_TREE))
-	->setPageTitle(I18N::translate(/* I18N: Renumber the records in a family tree */ 'Renumber family tree') . ' — ' . $WT_TREE->getTitleHtml())
-	->pageHeader();
+    ->restrictAccess(Auth::isManager($WT_TREE))
+    ->setPageTitle(I18N::translate(/* I18N: Renumber the records in a family tree */ 'Renumber family tree') . ' — ' . $WT_TREE->getTitleHtml())
+    ->pageHeader();
 
 // Every XREF used by this tree and also used by some other tree
 $xrefs = Database::prepare(
-	"SELECT xref, type FROM (" .
-	" SELECT i_id AS xref, 'INDI' AS type FROM `##individuals` WHERE i_file = ?" .
-	"  UNION " .
-	" SELECT f_id AS xref, 'FAM' AS type FROM `##families` WHERE f_file = ?" .
-	"  UNION " .
-	" SELECT s_id AS xref, 'SOUR' AS type FROM `##sources` WHERE s_file = ?" .
-	"  UNION " .
-	" SELECT m_id AS xref, 'OBJE' AS type FROM `##media` WHERE m_file = ?" .
-	"  UNION " .
-	" SELECT o_id AS xref, o_type AS type FROM `##other` WHERE o_file = ? AND o_type NOT IN ('HEAD', 'TRLR')" .
-	") AS this_tree JOIN (" .
-	" SELECT xref FROM `##change` WHERE gedcom_id <> ?" .
-	"  UNION " .
-	" SELECT i_id AS xref FROM `##individuals` WHERE i_file <> ?" .
-	"  UNION " .
-	" SELECT f_id AS xref FROM `##families` WHERE f_file <> ?" .
-	"  UNION " .
-	" SELECT s_id AS xref FROM `##sources` WHERE s_file <> ?" .
-	"  UNION " .
-	" SELECT m_id AS xref FROM `##media` WHERE m_file <> ?" .
-	"  UNION " .
-	" SELECT o_id AS xref FROM `##other` WHERE o_file <> ? AND o_type NOT IN ('HEAD', 'TRLR')" .
-	") AS other_trees USING (xref)"
+    "SELECT xref, type FROM (" .
+    " SELECT i_id AS xref, 'INDI' AS type FROM `##individuals` WHERE i_file = ?" .
+    "  UNION " .
+    " SELECT f_id AS xref, 'FAM' AS type FROM `##families` WHERE f_file = ?" .
+    "  UNION " .
+    " SELECT s_id AS xref, 'SOUR' AS type FROM `##sources` WHERE s_file = ?" .
+    "  UNION " .
+    " SELECT m_id AS xref, 'OBJE' AS type FROM `##media` WHERE m_file = ?" .
+    "  UNION " .
+    " SELECT o_id AS xref, o_type AS type FROM `##other` WHERE o_file = ? AND o_type NOT IN ('HEAD', 'TRLR')" .
+    ") AS this_tree JOIN (" .
+    " SELECT xref FROM `##change` WHERE gedcom_id <> ?" .
+    "  UNION " .
+    " SELECT i_id AS xref FROM `##individuals` WHERE i_file <> ?" .
+    "  UNION " .
+    " SELECT f_id AS xref FROM `##families` WHERE f_file <> ?" .
+    "  UNION " .
+    " SELECT s_id AS xref FROM `##sources` WHERE s_file <> ?" .
+    "  UNION " .
+    " SELECT m_id AS xref FROM `##media` WHERE m_file <> ?" .
+    "  UNION " .
+    " SELECT o_id AS xref FROM `##other` WHERE o_file <> ? AND o_type NOT IN ('HEAD', 'TRLR')" .
+    ") AS other_trees USING (xref)"
 )->execute(array(
-	$WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(),
-	$WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(),
+    $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(),
+    $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(), $WT_TREE->getTreeId(),
 ))->fetchAssoc();
 
 echo '<h1>', $controller->getPageTitle(), '</h1>';
 
 if (Filter::get('action') === 'renumber') {
-	foreach ($xrefs as $old_xref => $type) {
-		Database::beginTransaction();
-		Database::exec(
-			"LOCK TABLE `##individuals` WRITE," .
-			" `##families` WRITE," .
-			" `##sources` WRITE," .
-			" `##media` WRITE," .
-			" `##other` WRITE," .
-			" `##name` WRITE," .
-			" `##placelinks` WRITE," .
-			" `##change` WRITE," .
-			" `##next_id` WRITE," .
-			" `##dates` WRITE," .
-			" `##default_resn` WRITE," .
-			" `##hit_counter` WRITE," .
-			" `##link` WRITE," .
-			" `##user_gedcom_setting` WRITE"
-		);
-		$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;
-		}
-		Database::prepare(
-			"UPDATE `##name` SET n_id = ? WHERE n_id = ? AND n_file = ?"
-		)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-		Database::prepare(
-			"UPDATE `##default_resn` SET xref = ? WHERE xref = ? AND gedcom_id = ?"
-		)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-		Database::prepare(
-			"UPDATE `##hit_counter` SET page_parameter = ? WHERE page_parameter = ? AND gedcom_id = ?"
-		)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-		Database::prepare(
-			"UPDATE `##link` SET l_from = ? WHERE l_from = ? AND l_file = ?"
-		)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-		Database::prepare(
-			"UPDATE `##link` SET l_to = ? WHERE l_to = ? AND l_file = ?"
-		)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-		echo '<p>', I18N::translate('The record %1$s has been renamed to %2$s.', $old_xref, $new_xref), '</p>';
-		unset($xrefs[$old_xref]);
-		Database::exec("UNLOCK TABLES");
-		Database::commit();
+    foreach ($xrefs as $old_xref => $type) {
+        Database::beginTransaction();
+        Database::exec(
+            "LOCK TABLE `##individuals` WRITE," .
+            " `##families` WRITE," .
+            " `##sources` WRITE," .
+            " `##media` WRITE," .
+            " `##other` WRITE," .
+            " `##name` WRITE," .
+            " `##placelinks` WRITE," .
+            " `##change` WRITE," .
+            " `##next_id` WRITE," .
+            " `##dates` WRITE," .
+            " `##default_resn` WRITE," .
+            " `##hit_counter` WRITE," .
+            " `##link` WRITE," .
+            " `##user_gedcom_setting` WRITE"
+        );
+        $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;
+        }
+        Database::prepare(
+            "UPDATE `##name` SET n_id = ? WHERE n_id = ? AND n_file = ?"
+        )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+        Database::prepare(
+            "UPDATE `##default_resn` SET xref = ? WHERE xref = ? AND gedcom_id = ?"
+        )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+        Database::prepare(
+            "UPDATE `##hit_counter` SET page_parameter = ? WHERE page_parameter = ? AND gedcom_id = ?"
+        )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+        Database::prepare(
+            "UPDATE `##link` SET l_from = ? WHERE l_from = ? AND l_file = ?"
+        )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+        Database::prepare(
+            "UPDATE `##link` SET l_to = ? WHERE l_to = ? AND l_file = ?"
+        )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+        echo '<p>', I18N::translate('The record %1$s has been renamed to %2$s.', $old_xref, $new_xref), '</p>';
+        unset($xrefs[$old_xref]);
+        Database::exec("UNLOCK TABLES");
+        Database::commit();
 
-		try {
-			Database::prepare(
-				"UPDATE `##favorite` SET xref = ? WHERE xref = ? AND gedcom_id = ?"
-			)->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
-		} catch (\Exception $ex) {
-			// Perhaps the favorites module was not installed?
-		}
+        try {
+            Database::prepare(
+                "UPDATE `##favorite` SET xref = ? WHERE xref = ? AND gedcom_id = ?"
+            )->execute(array($new_xref, $old_xref, $WT_TREE->getTreeId()));
+        } catch (\Exception $ex) {
+            // Perhaps the favorites module was not installed?
+        }
 
-		// How much time do we have left?
-		if (microtime(true) - WT_START_TIME > ini_get('max_execution_time') - 2) {
-			echo '<p>', I18N::translate('The server’s time limit has been reached.'), '</p>';
-			break;
-		}
-	}
-	if ($xrefs) {
+        // How much time do we have left?
+        if (microtime(true) - WT_START_TIME > ini_get('max_execution_time') - 2) {
+            echo '<p>', I18N::translate('The server’s time limit has been reached.'), '</p>';
+            break;
+        }
+    }
+    if ($xrefs) {
 
-	}
+    }
 } else {
-	echo '<p>', I18N::translate('In a family tree, each record has an internal reference number (called an “XREF”) such as “F123” or “R14”.'), '</p>';
-	echo '<p>', I18N::translate('You can renumber the records in a family tree, so that these internal reference numbers are not duplicated in any other family tree.'), '</p>';
+    echo '<p>', I18N::translate('In a family tree, each record has an internal reference number (called an “XREF”) such as “F123” or “R14”.'), '</p>';
+    echo '<p>', I18N::translate('You can renumber the records in a family tree, so that these internal reference numbers are not duplicated in any other family tree.'), '</p>';
 }
 
 echo '<p>', I18N::plural(
-	'This family tree has %s record which uses the same “XREF” as another family tree.',
-	'This family tree has %s records which use the same “XREF” as another family tree.',
-	count($xrefs), count($xrefs)
+    'This family tree has %s record which uses the same “XREF” as another family tree.',
+    'This family tree has %s records which use the same “XREF” as another family tree.',
+    count($xrefs), count($xrefs)
 ), '</p>';
 
 if ($xrefs) {
-	// We use GET (not POST) for this update operation - because we want the user to
-	// be able to press F5 to continue after a timeout.
-	echo '<form>';
-	echo '<p>', I18N::translate('You can renumber this family tree.'), '</p>';
-	echo '<button type="submit" class="btn btn-primary">';
-	echo '<i class="fa fa-check"></i> ', /* I18N: A button label. */ I18N::translate('continue');
-	echo '</button>';
-	echo '<input type="hidden" name="action" value="renumber">';
-	echo '<input type="hidden" name="ged" value="', $WT_TREE->getNameHtml(), '">';
-	echo '</form>';
-	echo '<p>', I18N::translate('Caution! This may take a long time. Be patient.'), '</p>';
+    // We use GET (not POST) for this update operation - because we want the user to
+    // be able to press F5 to continue after a timeout.
+    echo '<form>';
+    echo '<p>', I18N::translate('You can renumber this family tree.'), '</p>';
+    echo '<button type="submit" class="btn btn-primary">';
+    echo '<i class="fa fa-check"></i> ', /* I18N: A button label. */ I18N::translate('continue');
+    echo '</button>';
+    echo '<input type="hidden" name="action" value="renumber">';
+    echo '<input type="hidden" name="ged" value="', $WT_TREE->getNameHtml(), '">';
+    echo '</form>';
+    echo '<p>', I18N::translate('Caution! This may take a long time. Be patient.'), '</p>';
 }

admin_module_reports.php

Indentation +13 added lines, -13 removed lines

@@ -24,29 +24,29 @@
 
 $controller = new PageController;
 $controller
-	->restrictAccess(Auth::isAdmin())
-	->setPageTitle(I18N::translate('Reports'));
+    ->restrictAccess(Auth::isAdmin())
+    ->setPageTitle(I18N::translate('Reports'));
 
 $action  = Filter::post('action');
 $modules = Module::getAllModulesByComponent('report');
 
 if ($action === 'update_mods' && Filter::checkCsrf()) {
-	foreach ($modules as $module) {
-		foreach (Tree::getAll() as $tree) {
-			$access_level = Filter::post('access-' . $module->getName() . '-' . $tree->getTreeId(), WT_REGEX_INTEGER, $module->defaultAccessLevel());
-			Database::prepare(
-				"REPLACE INTO `##module_privacy` (module_name, gedcom_id, component, access_level) VALUES (?, ?, 'report', ?)"
-			)->execute(array($module->getName(), $tree->getTreeId(), $access_level));
-		}
-	}
+    foreach ($modules as $module) {
+        foreach (Tree::getAll() as $tree) {
+            $access_level = Filter::post('access-' . $module->getName() . '-' . $tree->getTreeId(), WT_REGEX_INTEGER, $module->defaultAccessLevel());
+            Database::prepare(
+                "REPLACE INTO `##module_privacy` (module_name, gedcom_id, component, access_level) VALUES (?, ?, 'report', ?)"
+            )->execute(array($module->getName(), $tree->getTreeId(), $access_level));
+        }
+    }
 
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
 
-	return;
+    return;
 }
 
 $controller
-	->pageHeader();
+    ->pageHeader();
 
 ?>
 <ol class="breadcrumb small">

editnews.php

Indentation +39 added lines, -39 removed lines

@@ -31,9 +31,9 @@ 
 
 $controller = new SimpleController;
 $controller
-	->setPageTitle(I18N::translate('Add/edit a journal/news entry'))
-	->restrictAccess(Auth::isMember($WT_TREE))
-	->pageHeader();
+    ->setPageTitle(I18N::translate('Add/edit a journal/news entry'))
+    ->restrictAccess(Auth::isMember($WT_TREE))
+    ->pageHeader();
 
 $action    = Filter::get('action', 'compose|save', 'compose');
 $news_id   = Filter::getInteger('news_id');
@@ -45,43 +45,43 @@ 
 
 switch ($action) {
 case 'compose':
-	if (Module::getModuleByName('ckeditor')) {
-		CkeditorModule::enableEditor($controller);
-	}
+    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;
+    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));
-	}
+    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;
 }