fisharebest / webtrees

app/Module/LifespansChartModule.php

Indentation +47 added lines, -47 removed lines

@@ -24,55 +24,55 @@
  * Class LifespansChartModule
  */
 class LifespansChartModule extends AbstractModule implements ModuleChartInterface {
-	/**
-	 * How should this module be labelled on tabs, menus, etc.?
-	 *
-	 * @return string
-	 */
-	public function getTitle() {
-		return /* I18N: Name of a module/chart */ I18N::translate('Lifespans');
-	}
+    /**
+     * How should this module be labelled on tabs, menus, etc.?
+     *
+     * @return string
+     */
+    public function getTitle() {
+        return /* I18N: Name of a module/chart */ I18N::translate('Lifespans');
+    }
 
-	/**
-	 * A sentence describing what this module does.
-	 *
-	 * @return string
-	 */
-	public function getDescription() {
-		return /* I18N: Description of the “LifespansChart” module */ I18N::translate('A chart of individuals’ lifespans.');
-	}
+    /**
+     * A sentence describing what this module does.
+     *
+     * @return string
+     */
+    public function getDescription() {
+        return /* I18N: Description of the “LifespansChart” module */ I18N::translate('A chart of individuals’ lifespans.');
+    }
 
-	/**
-	 * What is the default access level for this module?
-	 *
-	 * Some modules are aimed at admins or managers, and are not generally shown to users.
-	 *
-	 * @return int
-	 */
-	public function defaultAccessLevel() {
-		return Auth::PRIV_PRIVATE;
-	}
+    /**
+     * What is the default access level for this module?
+     *
+     * Some modules are aimed at admins or managers, and are not generally shown to users.
+     *
+     * @return int
+     */
+    public function defaultAccessLevel() {
+        return Auth::PRIV_PRIVATE;
+    }
 
-	/**
-	 * Return a menu item for this chart.
-	 *
-	 * @return Menu|null
-	 */
-	public function getChartMenu(Individual $individual) {
-		return new Menu(
-			$this->getTitle(),
-			'lifespan.php',
-			'menu-chart-lifespan',
-			array('rel' => 'nofollow')
-		);
-	}
+    /**
+     * Return a menu item for this chart.
+     *
+     * @return Menu|null
+     */
+    public function getChartMenu(Individual $individual) {
+        return new Menu(
+            $this->getTitle(),
+            'lifespan.php',
+            'menu-chart-lifespan',
+            array('rel' => 'nofollow')
+        );
+    }
 
-	/**
-	 * Return a menu item for this chart - for use in individual boxes.
-	 *
-	 * @return Menu|null
-	 */
-	public function getBoxChartMenu(Individual $individual) {
-		return null;
-	}
+    /**
+     * Return a menu item for this chart - for use in individual boxes.
+     *
+     * @return Menu|null
+     */
+    public function getBoxChartMenu(Individual $individual) {
+        return null;
+    }
 }

Braces +12 added lines, -6 removed lines

@@ -23,13 +23,15 @@ 
 /**
  * Class LifespansChartModule
  */
-class LifespansChartModule extends AbstractModule implements ModuleChartInterface {
+class LifespansChartModule extends AbstractModule implements ModuleChartInterface
+{
 	/**
 	 * How should this module be labelled on tabs, menus, etc.?
 	 *
 	 * @return string
 	 */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module/chart */ I18N::translate('Lifespans');
 	}
 
@@ -38,7 +40,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “LifespansChart” module */ I18N::translate('A chart of individuals’ lifespans.');
 	}
 
@@ -49,7 +52,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultAccessLevel() {
+	public function defaultAccessLevel()
+	{
 		return Auth::PRIV_PRIVATE;
 	}
 
@@ -58,7 +62,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getChartMenu(Individual $individual) {
+	public function getChartMenu(Individual $individual)
+	{
 		return new Menu(
 			$this->getTitle(),
 			'lifespan.php',
@@ -72,7 +77,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getBoxChartMenu(Individual $individual) {
+	public function getBoxChartMenu(Individual $individual)
+	{
 		return null;
 	}
 }

app/Session.php

Indentation +89 added lines, -89 removed lines

@@ -19,100 +19,100 @@
  * Temporary class to migrate to Symfony-based sessions, which need PHP 5.4.
  */
 class Session {
-	/**
-	 * Start a session
-	 *
-	 * @param array $config
-	 */
-	public static function start(array $config = array()) {
-		$default_config = array(
-			'use_cookies'     => 1,
-			'name'            => 'WT_SESSION',
-			'cookie_lifetime' => 0,
-			'gc_maxlifetime'  => 7200,
-			'gc_probability'  => 1,
-			'gc_divisor'      => 100,
-			'cookie_path'     => '',
-			'cookie_httponly' => true,
-		);
-		session_register_shutdown();
-		foreach ($config + $default_config as $key => $value) {
-			ini_set('session.' . $key, $value);
-		}
-		session_start();
-	}
+    /**
+     * Start a session
+     *
+     * @param array $config
+     */
+    public static function start(array $config = array()) {
+        $default_config = array(
+            'use_cookies'     => 1,
+            'name'            => 'WT_SESSION',
+            'cookie_lifetime' => 0,
+            'gc_maxlifetime'  => 7200,
+            'gc_probability'  => 1,
+            'gc_divisor'      => 100,
+            'cookie_path'     => '',
+            'cookie_httponly' => true,
+        );
+        session_register_shutdown();
+        foreach ($config + $default_config as $key => $value) {
+            ini_set('session.' . $key, $value);
+        }
+        session_start();
+    }
 
-	/**
-	 * Read a value from the session
-	 *
-	 * @param string $name
-	 * @param mixed  $default
-	 *
-	 * @return mixed
-	 */
-	public static function get($name, $default = null) {
-		if (isset($_SESSION[$name])) {
-			return $_SESSION[$name];
-		} else {
-			return $default;
-		}
-	}
+    /**
+     * Read a value from the session
+     *
+     * @param string $name
+     * @param mixed  $default
+     *
+     * @return mixed
+     */
+    public static function get($name, $default = null) {
+        if (isset($_SESSION[$name])) {
+            return $_SESSION[$name];
+        } else {
+            return $default;
+        }
+    }
 
-	/**
-	 * Write a value to the session
-	 *
-	 * @param string $name
-	 * @param mixed  $value
-	 */
-	public static function put($name, $value) {
-		$_SESSION[$name] = $value;
-	}
+    /**
+     * Write a value to the session
+     *
+     * @param string $name
+     * @param mixed  $value
+     */
+    public static function put($name, $value) {
+        $_SESSION[$name] = $value;
+    }
 
-	/**
-	 * Remove a value from the session
-	 *
-	 * @param string $name
-	 */
-	public static function forget($name) {
-		unset($_SESSION[$name]);
-	}
+    /**
+     * Remove a value from the session
+     *
+     * @param string $name
+     */
+    public static function forget($name) {
+        unset($_SESSION[$name]);
+    }
 
-	/**
-	 * Does a session variable exist?
-	 *
-	 * @param string $name
-	 *
-	 * @return bool
-	 */
-	public static function has($name) {
-		return isset($_SESSION[$name]);
-	}
+    /**
+     * Does a session variable exist?
+     *
+     * @param string $name
+     *
+     * @return bool
+     */
+    public static function has($name) {
+        return isset($_SESSION[$name]);
+    }
 
-	/**
-	 * Remove all stored data from the session.
-	 */
-	public static function clear() {
-		$_SESSION = array();
-	}
+    /**
+     * Remove all stored data from the session.
+     */
+    public static function clear() {
+        $_SESSION = array();
+    }
 
-	/**
-	 * After any change in authentication level, we should use a new session ID.
-	 *
-	 * @param bool $destroy
-	 */
-	public static function regenerate($destroy = false) {
-		if ($destroy) {
-			self::clear();
-		}
-		session_regenerate_id($destroy);
-	}
+    /**
+     * After any change in authentication level, we should use a new session ID.
+     *
+     * @param bool $destroy
+     */
+    public static function regenerate($destroy = false) {
+        if ($destroy) {
+            self::clear();
+        }
+        session_regenerate_id($destroy);
+    }
 
-	/**
-	 * Set an explicit session ID. Typically used for search robots.
-	 *
-	 * @param string $id
-	 */
-	public static function setId($id) {
-		session_id($id);
-	}
+    /**
+     * Set an explicit session ID. Typically used for search robots.
+     *
+     * @param string $id
+     */
+    public static function setId($id) {
+        session_id($id);
+    }
 }

Braces +18 added lines, -9 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Temporary class to migrate to Symfony-based sessions, which need PHP 5.4.
  */
-class Session {
+class Session
+{
 	/**
 	 * Start a session
 	 *
 	 * @param array $config
 	 */
-	public static function start(array $config = array()) {
+	public static function start(array $config = array())
+	{
 		$default_config = array(
 			'use_cookies'     => 1,
 			'name'            => 'WT_SESSION',
@@ -50,7 +52,8 @@ 
 	 *
 	 * @return mixed
 	 */
-	public static function get($name, $default = null) {
+	public static function get($name, $default = null)
+	{
 		if (isset($_SESSION[$name])) {
 			return $_SESSION[$name];
 		} else {
@@ -64,7 +67,8 @@ 
 	 * @param string $name
 	 * @param mixed  $value
 	 */
-	public static function put($name, $value) {
+	public static function put($name, $value)
+	{
 		$_SESSION[$name] = $value;
 	}
 
@@ -73,7 +77,8 @@ 
 	 *
 	 * @param string $name
 	 */
-	public static function forget($name) {
+	public static function forget($name)
+	{
 		unset($_SESSION[$name]);
 	}
 
@@ -84,14 +89,16 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function has($name) {
+	public static function has($name)
+	{
 		return isset($_SESSION[$name]);
 	}
 
 	/**
 	 * Remove all stored data from the session.
 	 */
-	public static function clear() {
+	public static function clear()
+	{
 		$_SESSION = array();
 	}
 
@@ -100,7 +107,8 @@ 
 	 *
 	 * @param bool $destroy
 	 */
-	public static function regenerate($destroy = false) {
+	public static function regenerate($destroy = false)
+	{
 		if ($destroy) {
 			self::clear();
 		}
@@ -112,7 +120,8 @@ 
 	 *
 	 * @param string $id
 	 */
-	public static function setId($id) {
+	public static function setId($id)
+	{
 		session_id($id);
 	}
 }

app/Query/QueryName.php

Indentation +507 added lines, -507 removed lines

@@ -25,511 +25,511 @@
  * Generate lists for indilist.php and famlist.php
  */
 class QueryName {
-	/**
-	 * Get a list of initial letters, for lists of names.
-	 *
-	 * @param string $locale Return the alphabet for this locale
-	 *
-	 * @return string[]
-	 */
-	private static function getAlphabetForLocale($locale) {
-		switch ($locale) {
-		case 'ar':
-			return array(
-				'ا', 'ب', 'ت', 'ث', 'ج', 'ح', 'خ', 'د', 'ذ', 'ر', 'ز', 'س', 'ش', 'ص', 'ض', 'ط', 'ظ', 'ع', 'غ', 'ف', 'ق', 'ك', 'ل', 'م', 'ن', 'ه', 'و', 'ي', 'آ', 'ة', 'ى', 'ی',
-			);
-		case 'cs':
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'CH', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-			);
-		case 'da':
-		case 'nb':
-		case 'nn':
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Æ', 'Ø', 'Å',
-			);
-		case 'el':
-			return array(
-				'Α', 'Β', 'Γ', 'Δ', 'Ε', 'Ζ', 'Η', 'Θ', 'Ι', 'Κ', 'Λ', 'Μ', 'Ν', 'Ξ', 'Ο', 'Π', 'Ρ', 'Σ', 'Τ', 'Υ', 'Φ', 'Χ', 'Ψ', 'Ω',
-			);
-		case 'es':
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'Ñ', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-			);
-		case 'et':
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Š', 'Z', 'Ž', 'T', 'U', 'V', 'W', 'Õ', 'Ä', 'Ö', 'Ü', 'X', 'Y',
-			);
-		case 'fi':
-		case 'sv':
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Å', 'Ä', 'Ö',
-			);
-		case 'he':
-			return array(
-				'א', 'ב', 'ג', 'ד', 'ה', 'ו', 'ז', 'ח', 'ט', 'י', 'כ', 'ל', 'מ', 'נ', 'ס', 'ע', 'פ', 'צ', 'ק', 'ר', 'ש', 'ת',
-			);
-		case 'hu':
-			return array(
-				'A', 'B', 'C', 'CS', 'D', 'DZ', 'DZS', 'E', 'F', 'G', 'GY', 'H', 'I', 'J', 'K', 'L', 'LY', 'M', 'N', 'NY', 'O', 'Ö', 'P', 'Q', 'R', 'S', 'SZ', 'T', 'TY', 'U', 'Ü', 'V', 'W', 'X', 'Y', 'Z', 'ZS',
-			);
-		case 'lt':
-			return array(
-				'A', 'Ą', 'B', 'C', 'Č', 'D', 'E', 'Ę', 'Ė', 'F', 'G', 'H', 'I', 'Y', 'Į', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'R', 'S', 'Š', 'T', 'U', 'Ų', 'Ū', 'V', 'Z', 'Ž',
-			);
-		case 'nl':
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'IJ',
-			);
-		case 'pl':
-			return array(
-				'A', 'B', 'C', 'Ć', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'Ł', 'M', 'N', 'O', 'Ó', 'P', 'Q', 'R', 'S', 'Ś', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ź', 'Ż',
-			);
-		case 'ro':
-			return array(
-				'A', 'Ă', 'Â', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'Î', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Ş', 'T', 'Ţ', 'U', 'V', 'W', 'X', 'Y', 'Z',
-			);
-		case 'ru':
-			return array(
-				'А', 'Б', 'В', 'Г', 'Д', 'Е', 'Ё', 'Ж', 'З', 'И', 'Й', 'К', 'Л', 'М', 'Н', 'О', 'П', 'Р', 'С', 'Т', 'У', 'Ф', 'Х', 'Ц', 'Ч', 'Ш', 'Щ', 'Ъ', 'Ы', 'Ь', 'Э', 'Ю', 'Я',
-			);
-		case 'sk':
-			return array(
-				'A', 'Á', 'Ä', 'B', 'C', 'Č', 'D', 'Ď', 'E', 'É', 'F', 'G', 'H', 'I', 'Í', 'J', 'K', 'L', 'Ľ', 'Ĺ', 'M', 'N', 'Ň', 'O', 'Ó', 'Ô', 'P', 'Q', 'R', 'Ŕ', 'S', 'Š', 'T', 'Ť', 'U', 'Ú', 'V', 'W', 'X', 'Y', 'Ý', 'Z', 'Ž',
-			);
-		case 'sl':
-			return array(
-				'A', 'B', 'C', 'Č', 'Ć', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Š', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ž',
-			);
-		case 'sr':
-			return array(
-				'A', 'B', 'C', 'Č', 'Ć', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Š', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ž',
-			);
-		case 'tr':
-			return array(
-				'A', 'B', 'C', 'Ç', 'D', 'E', 'F', 'G', 'Ğ', 'H', 'I', 'İ', 'J', 'K', 'L', 'M', 'N', 'O', 'Ö', 'P', 'R', 'S', 'Ş', 'T', 'U', 'Ü', 'V', 'Y', 'Z',
-			);
-		default:
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-			);
-		}
-	}
-
-	/**
-	 * Get the initial letter of a name, taking care of multi-letter sequences and equivalences.
-	 *
-	 * @param string $name
-	 *
-	 * @return string
-	 */
-	public static function initialLetter($name) {
-		$name = I18N::strtoupper($name);
-		switch (WT_LOCALE) {
-		case 'cs':
-			if (substr($name, 0, 2) == 'CH') {
-				return 'CH';
-			}
-			break;
-		case 'da':
-		case 'nb':
-		case 'nn':
-			if (substr($name, 0, 2) == 'AA') {
-				return 'Å';
-			}
-			break;
-		case 'hu':
-			if (substr($name, 0, 2) == 'CS') {
-				return 'CS';
-			} elseif (substr($name, 0, 3) == 'DZS') {
-				return 'DZS';
-			} elseif (substr($name, 0, 2) == 'DZ') {
-				return 'DZ';
-			} elseif (substr($name, 0, 2) == 'GY') {
-				return 'GY';
-			} elseif (substr($name, 0, 2) == 'LY') {
-				return 'LY';
-			} elseif (substr($name, 0, 2) == 'NY') {
-				return 'NY';
-			} elseif (substr($name, 0, 2) == 'SZ') {
-				return 'SZ';
-			} elseif (substr($name, 0, 2) == 'TY') {
-				return 'TY';
-			} elseif (substr($name, 0, 2) == 'ZS') {
-				return 'ZS';
-			}
-			break;
-		case 'nl':
-			if (substr($name, 0, 2) == 'IJ') {
-				return 'IJ';
-			}
-			break;
-		}
-		// No special rules - just take the first character
-		return mb_substr($name, 0, 1);
-	}
-
-	/**
-	 * Generate SQL to match a given letter, taking care of cases that
-	 * are not covered by the collation setting.
-	 *
-	 * We must consider:
-	 * potential substrings, such as Czech "CH" and "C"
-	 * equivalent letters, such as Danish "AA" and "Å"
-	 *
-	 * We COULD write something that handles all languages generically,
-	 * but its performance would most likely be poor.
-	 *
-	 * For languages that don't appear in this list, we could write
-	 * simpler versions of the surnameAlpha() and givenAlpha() functions,
-	 * but it gives no noticable improvement in performance.
-	 *
-	 * @param string $field
-	 * @param string $letter
-	 *
-	 * @return string
-	 */
-	private static function getInitialSql($field, $letter) {
-		switch (WT_LOCALE) {
-		case 'cs':
-			switch ($letter) {
-			case 'C': return $field . " LIKE 'C%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'CH%' COLLATE " . I18N::collation();
-			}
-			break;
-		case 'da':
-		case 'nb':
-		case 'nn':
-			switch ($letter) {
-			// AA gets listed under Å
-			case 'A': return $field . " LIKE 'A%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'AA%' COLLATE " . I18N::collation();
-			case 'Å': return "(" . $field . " LIKE 'Å%' COLLATE " . I18N::collation() . " OR " . $field . " LIKE 'AA%' COLLATE " . I18N::collation() . ")";
-			}
-			break;
-		case 'hu':
-			switch ($letter) {
-			case 'C':  return $field . " LIKE 'C%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'CS%' COLLATE " . I18N::collation();
-			case 'D':  return $field . " LIKE 'D%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'DZ%' COLLATE " . I18N::collation();
-			case 'DZ': return $field . " LIKE 'DZ%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'DZS%' COLLATE " . I18N::collation();
-			case 'G':  return $field . " LIKE 'G%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'GY%' COLLATE " . I18N::collation();
-			case 'L':  return $field . " LIKE 'L%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'LY%' COLLATE " . I18N::collation();
-			case 'N':  return $field . " LIKE 'N%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'NY%' COLLATE " . I18N::collation();
-			case 'S':  return $field . " LIKE 'S%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'SZ%' COLLATE " . I18N::collation();
-			case 'T':  return $field . " LIKE 'T%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'TY%' COLLATE " . I18N::collation();
-			case 'Z':  return $field . " LIKE 'Z%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'ZS%' COLLATE " . I18N::collation();
-			}
-			break;
-		case 'nl':
-			switch ($letter) {
-			case 'I': return $field . " LIKE 'I%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'IJ%' COLLATE " . I18N::collation();
-			}
-			break;
-		}
-
-		// Easy cases: the MySQL collation rules take care of it
-		return "$field LIKE CONCAT('@'," . Database::quote($letter) . ",'%') COLLATE " . I18N::collation() . " ESCAPE '@'";
-	}
-
-	/**
-	 * Get a list of initial surname letters for indilist.php and famlist.php
-	 *
-	 * @param Tree $tree   Find surnames from this tree
-	 * @param bool $marnm  if set, include married names
-	 * @param bool $fams   if set, only consider individuals with FAMS records
-	 * @param bool $totals if set, count the number of names beginning with each letter
-	 *
-	 * @return int[]
-	 */
-	public static function surnameAlpha(Tree $tree, $marnm, $fams, $totals = true) {
-		$alphas = array();
-
-		$sql =
-			"SELECT COUNT(n_id)" .
-			" FROM `##name` " .
-			($fams ? " JOIN `##link` ON (n_id=l_from AND n_file=l_file AND l_type='FAMS') " : "") .
-			" WHERE n_file=" . $tree->getTreeId() .
-			($marnm ? "" : " AND n_type!='_MARNM'");
-
-		// Fetch all the letters in our alphabet, whether or not there
-		// are any names beginning with that letter. It looks better to
-		// show the full alphabet, rather than omitting rare letters such as X
-		foreach (self::getAlphabetForLocale(WT_LOCALE) as $letter) {
-			$count = 1;
-			if ($totals) {
-				$count = Database::prepare($sql . " AND " . self::getInitialSql('n_surn', $letter))->fetchOne();
-			}
-			$alphas[$letter] = $count;
-		}
-
-		// Now fetch initial letters that are not in our alphabet,
-		// including "@" (for "@N.N.") and "" for no surname.
-		$sql =
-			"SELECT initial, count FROM (SELECT UPPER(LEFT(n_surn, 1)) AS initial, COUNT(n_id) AS count" .
-			" FROM `##name` " .
-			($fams ? " JOIN `##link` ON n_id = l_from AND n_file = l_file AND l_type = 'FAMS' " : "") .
-			" WHERE n_file = :tree_id AND n_surn <> ''" .
-			($marnm ? "" : " AND n_type != '_MARNM'");
-
-		$args = array(
-			'tree_id' => $tree->getTreeId(),
-		);
-
-		foreach (self::getAlphabetForLocale(WT_LOCALE) as $n => $letter) {
-			$sql .= " AND n_surn COLLATE :collate_" . $n . " NOT LIKE :letter_" . $n;
-			$args['collate_' . $n] = I18N::collation();
-			$args['letter_' . $n]  = $letter . '%';
-		}
-		$sql .= " GROUP BY UPPER(LEFT(n_surn, 1))) AS subquery ORDER BY initial = '', initial = '@', initial";
-		foreach (Database::prepare($sql)->execute($args)->fetchAssoc() as $alpha => $count) {
-			$alphas[$alpha] = $count;
-		}
-
-		// Names with no surname
-		$sql =
-			"SELECT COUNT(n_id)" .
-			" FROM `##name` " .
-			($fams ? " JOIN `##link` ON n_id = l_from AND n_file = l_file AND l_type = 'FAMS' " : "") .
-			" WHERE n_file = :tree_id AND n_surn = ''" .
-			($marnm ? "" : " AND n_type != '_MARNM'");
-
-		$args = array(
-			'tree_id' => $tree->getTreeId(),
-		);
-
-		$num_none = Database::prepare($sql)->execute($args)->fetchOne();
-		if ($num_none) {
-			// Special code to indicate "no surname"
-			$alphas[','] = $num_none;
-		}
-
-		return $alphas;
-	}
-
-	/**
-	 * Get a list of initial given name letters for indilist.php and famlist.php
-	 *
-	 * @param Tree   $tree   Find names in this tree
-	 * @param string $surn   if set, only consider people with this surname
-	 * @param string $salpha if set, only consider surnames starting with this letter
-	 * @param bool   $marnm  if set, include married names
-	 * @param bool   $fams   if set, only consider individuals with FAMS records
-	 *
-	 * @return int[]
-	 */
-	public static function givenAlpha(Tree $tree, $surn, $salpha, $marnm, $fams) {
-		$alphas = array();
-
-		$sql =
-			"SELECT COUNT(DISTINCT n_id)" .
-			" FROM `##name`" .
-			($fams ? " JOIN `##link` ON (n_id=l_from AND n_file=l_file AND l_type='FAMS') " : "") .
-			" WHERE n_file=" . $tree->getTreeId() . " " .
-			($marnm ? "" : " AND n_type!='_MARNM'");
-
-		if ($surn) {
-			$sql .= " AND n_surn=" . Database::quote($surn) . " COLLATE '" . I18N::collation() . "'";
-		} elseif ($salpha == ',') {
-			$sql .= " AND n_surn=''";
-		} elseif ($salpha == '@') {
-			$sql .= " AND n_surn='@N.N.'";
-		} elseif ($salpha) {
-			$sql .= " AND " . self::getInitialSql('n_surn', $salpha);
-		} else {
-			// All surnames
-			$sql .= " AND n_surn NOT IN ('', '@N.N.')";
-		}
-
-		// Fetch all the letters in our alphabet, whether or not there
-		// are any names beginning with that letter. It looks better to
-		// show the full alphabet, rather than omitting rare letters such as X
-		foreach (self::getAlphabetForLocale(WT_LOCALE) as $letter) {
-			$count           = Database::prepare($sql . " AND " . self::getInitialSql('n_givn', $letter))->fetchOne();
-			$alphas[$letter] = $count;
-		}
-
-		// Now fetch initial letters that are not in our alphabet,
-		// including "@" (for "@N.N.") and "" for no surname
-		$sql =
-			"SELECT initial, total FROM (SELECT UPPER(LEFT(n_givn, 1)) AS initial, COUNT(DISTINCT n_id) AS total" .
-			" FROM `##name` " .
-			($fams ? " JOIN `##link` ON (n_id = l_from AND n_file = l_file AND l_type = 'FAMS') " : "") .
-			" WHERE n_file = :tree_id" .
-			($marnm ? "" : " AND n_type != '_MARNM'");
-
-		$args = array(
-			'tree_id' => $tree->getTreeId(),
-		);
-
-		if ($surn) {
-			$sql .= " AND n_surn COLLATE :collate_1 = :surn";
-			$args['collate_1'] = I18N::collation();
-			$args['surn']      = $surn;
-		} elseif ($salpha === ',') {
-			$sql .= " AND n_surn = ''";
-		} elseif ($salpha === '@') {
-			$sql .= " AND n_surn = '@N.N.'";
-		} elseif ($salpha) {
-			$sql .= " AND " . self::getInitialSql('n_surn', $salpha);
-		} else {
-			// All surnames
-			$sql .= " AND n_surn NOT IN ('', '@N.N.')";
-		}
-
-		foreach (self::getAlphabetForLocale(WT_LOCALE) as $letter) {
-			$sql .= " AND n_givn NOT LIKE '" . $letter . "%' COLLATE " . I18N::collation();
-		}
-		$sql .= " GROUP BY UPPER(LEFT(n_givn, 1))) AS subquery ORDER BY initial = '@', initial = '', initial";
-
-		foreach (Database::prepare($sql)->execute($args)->fetchAssoc() as $alpha => $count) {
-			$alphas[$alpha] = $count;
-		}
-
-		return $alphas;
-	}
-
-	/**
-	 * Get a list of actual surnames and variants, based on a "root" surname.
-	 *
-	 * @param Tree   $tree   only fetch individuals from this tree
-	 * @param string $surn   if set, only fetch people with this surname
-	 * @param string $salpha if set, only consider surnames starting with this letter
-	 * @param bool   $marnm  if set, include married names
-	 * @param bool   $fams   if set, only consider individuals with FAMS records
-	 *
-	 * @return array
-	 */
-	public static function surnames(Tree $tree, $surn, $salpha, $marnm, $fams) {
-		$sql =
-			"SELECT n2.n_surn, n1.n_surname, n1.n_id" .
-			" FROM `##name` n1 " .
-			($fams ? " JOIN `##link` ON n_id = l_from AND n_file = l_file AND l_type = 'FAMS' " : "") .
-			" JOIN (SELECT n_surn COLLATE :collate_0 AS n_surn, n_file FROM `##name`" .
-			" WHERE n_file = :tree_id" .
-			($marnm ? "" : " AND n_type != '_MARNM'");
-
-		$args = array(
-			'tree_id'   => $tree->getTreeId(),
-			'collate_0' => I18N::collation(),
-		);
-
-		if ($surn) {
-			$sql .= " AND n_surn COLLATE :collate_1 = :surn";
-			$args['collate_1'] = I18N::collation();
-			$args['surn']      = $surn;
-		} elseif ($salpha === ',') {
-			$sql .= " AND n_surn = ''";
-		} elseif ($salpha === '@') {
-			$sql .= " AND n_surn = '@N.N.'";
-		} elseif ($salpha) {
-			$sql .= " AND " . self::getInitialSql('n_surn', $salpha);
-		} else {
-			// All surnames
-			$sql .= " AND n_surn NOT IN ('', '@N.N.')";
-		}
-		$sql .= " GROUP BY n_surn COLLATE :collate_2, n_file) AS n2 ON (n1.n_surn = n2.n_surn COLLATE :collate_3 AND n1.n_file = n2.n_file)";
-		$args['collate_2'] = I18N::collation();
-		$args['collate_3'] = I18N::collation();
-
-		$list = array();
-		foreach (Database::prepare($sql)->execute($args)->fetchAll() as $row) {
-			$list[I18N::strtoupper($row->n_surn)][$row->n_surname][$row->n_id] = true;
-		}
-
-		return $list;
-	}
-
-	/**
-	 * Fetch a list of individuals with specified names
-	 *
-	 * To search for unknown names, use $surn="@N.N.", $salpha="@" or $galpha="@"
-	 * To search for names with no surnames, use $salpha=","
-	 *
-	 * @param Tree   $tree   only fetch individuals from this tree
-	 * @param string $surn   if set, only fetch people with this surname
-	 * @param string $salpha if set, only fetch surnames starting with this letter
-	 * @param string  $galpha if set, only fetch given names starting with this letter
-	 * @param bool   $marnm  if set, include married names
-	 * @param bool   $fams   if set, only fetch individuals with FAMS records
-	 *
-	 * @return Individual[]
-	 */
-	public static function individuals(Tree $tree, $surn, $salpha, $galpha, $marnm, $fams) {
-		$sql =
-			"SELECT i_id AS xref, i_gedcom AS gedcom, n_full " .
-			"FROM `##individuals` " .
-			"JOIN `##name` ON n_id = i_id AND n_file = i_file " .
-			($fams ? "JOIN `##link` ON n_id = l_from AND n_file = l_file AND l_type = 'FAMS' " : "") .
-			"WHERE n_file = :tree_id " .
-			($marnm ? "" : "AND n_type != '_MARNM'");
-
-		$args = array(
-			'tree_id' => $tree->getTreeId(),
-		);
-
-		if ($surn) {
-			$sql .= " AND n_surn COLLATE :collate_1 = :surn";
-			$args['collate_1'] = I18N::collation();
-			$args['surn']      = $surn;
-		} elseif ($salpha === ',') {
-			$sql .= " AND n_surn = ''";
-		} elseif ($salpha === '@') {
-			$sql .= " AND n_surn = '@N.N.'";
-		} elseif ($salpha) {
-			$sql .= " AND " . self::getInitialSql('n_surn', $salpha);
-		} else {
-			// All surnames
-			$sql .= " AND n_surn NOT IN ('', '@N.N.')";
-		}
-		if ($galpha) {
-			$sql .= " AND " . self::getInitialSql('n_givn', $galpha);
-		}
-
-		$sql .= " ORDER BY CASE n_surn WHEN '@N.N.' THEN 1 ELSE 0 END, n_surn COLLATE :collate_2, CASE n_givn WHEN '@P.N.' THEN 1 ELSE 0 END, n_givn COLLATE :collate_3";
-		$args['collate_2'] = I18N::collation();
-		$args['collate_3'] = I18N::collation();
-
-		$list = array();
-		$rows = Database::prepare($sql)->execute($args)->fetchAll();
-		foreach ($rows as $row) {
-			$person = Individual::getInstance($row->xref, $tree, $row->gedcom);
-			// The name from the database may be private - check the filtered list...
-			foreach ($person->getAllNames() as $n => $name) {
-				if ($name['fullNN'] == $row->n_full) {
-					$person->setPrimaryName($n);
-					// We need to clone $person, as we may have multiple references to the
-					// same person in this list, and the "primary name" would otherwise
-					// be shared amongst all of them.
-					$list[] = clone $person;
-					break;
-				}
-			}
-		}
-
-		return $list;
-	}
-
-	/**
-	 * Fetch a list of families with specified names
-	 *
-	 * To search for unknown names, use $surn="@N.N.", $salpha="@" or $galpha="@"
-	 * To search for names with no surnames, use $salpha=","
-	 *
-	 * @param Tree   $tree   only fetch individuals from this tree
-	 * @param string $surn   if set, only fetch people with this surname
-	 * @param string $salpha if set, only fetch surnames starting with this letter
-	 * @param string $galpha if set, only fetch given names starting with this letter
-	 * @param bool   $marnm  if set, include married names
-	 *
-	 * @return Family[]
-	 */
-	public static function families(Tree $tree, $surn, $salpha, $galpha, $marnm) {
-		$list = array();
-		foreach (self::individuals($tree, $surn, $salpha, $galpha, $marnm, true) as $indi) {
-			foreach ($indi->getSpouseFamilies() as $family) {
-				$list[$family->getXref()] = $family;
-			}
-		}
-		usort($list, '\Fisharebest\Webtrees\GedcomRecord::compare');
-
-		return $list;
-	}
+    /**
+     * Get a list of initial letters, for lists of names.
+     *
+     * @param string $locale Return the alphabet for this locale
+     *
+     * @return string[]
+     */
+    private static function getAlphabetForLocale($locale) {
+        switch ($locale) {
+        case 'ar':
+            return array(
+                'ا', 'ب', 'ت', 'ث', 'ج', 'ح', 'خ', 'د', 'ذ', 'ر', 'ز', 'س', 'ش', 'ص', 'ض', 'ط', 'ظ', 'ع', 'غ', 'ف', 'ق', 'ك', 'ل', 'م', 'ن', 'ه', 'و', 'ي', 'آ', 'ة', 'ى', 'ی',
+            );
+        case 'cs':
+            return array(
+                'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'CH', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+            );
+        case 'da':
+        case 'nb':
+        case 'nn':
+            return array(
+                'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Æ', 'Ø', 'Å',
+            );
+        case 'el':
+            return array(
+                'Α', 'Β', 'Γ', 'Δ', 'Ε', 'Ζ', 'Η', 'Θ', 'Ι', 'Κ', 'Λ', 'Μ', 'Ν', 'Ξ', 'Ο', 'Π', 'Ρ', 'Σ', 'Τ', 'Υ', 'Φ', 'Χ', 'Ψ', 'Ω',
+            );
+        case 'es':
+            return array(
+                'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'Ñ', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+            );
+        case 'et':
+            return array(
+                'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Š', 'Z', 'Ž', 'T', 'U', 'V', 'W', 'Õ', 'Ä', 'Ö', 'Ü', 'X', 'Y',
+            );
+        case 'fi':
+        case 'sv':
+            return array(
+                'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Å', 'Ä', 'Ö',
+            );
+        case 'he':
+            return array(
+                'א', 'ב', 'ג', 'ד', 'ה', 'ו', 'ז', 'ח', 'ט', 'י', 'כ', 'ל', 'מ', 'נ', 'ס', 'ע', 'פ', 'צ', 'ק', 'ר', 'ש', 'ת',
+            );
+        case 'hu':
+            return array(
+                'A', 'B', 'C', 'CS', 'D', 'DZ', 'DZS', 'E', 'F', 'G', 'GY', 'H', 'I', 'J', 'K', 'L', 'LY', 'M', 'N', 'NY', 'O', 'Ö', 'P', 'Q', 'R', 'S', 'SZ', 'T', 'TY', 'U', 'Ü', 'V', 'W', 'X', 'Y', 'Z', 'ZS',
+            );
+        case 'lt':
+            return array(
+                'A', 'Ą', 'B', 'C', 'Č', 'D', 'E', 'Ę', 'Ė', 'F', 'G', 'H', 'I', 'Y', 'Į', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'R', 'S', 'Š', 'T', 'U', 'Ų', 'Ū', 'V', 'Z', 'Ž',
+            );
+        case 'nl':
+            return array(
+                'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'IJ',
+            );
+        case 'pl':
+            return array(
+                'A', 'B', 'C', 'Ć', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'Ł', 'M', 'N', 'O', 'Ó', 'P', 'Q', 'R', 'S', 'Ś', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ź', 'Ż',
+            );
+        case 'ro':
+            return array(
+                'A', 'Ă', 'Â', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'Î', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Ş', 'T', 'Ţ', 'U', 'V', 'W', 'X', 'Y', 'Z',
+            );
+        case 'ru':
+            return array(
+                'А', 'Б', 'В', 'Г', 'Д', 'Е', 'Ё', 'Ж', 'З', 'И', 'Й', 'К', 'Л', 'М', 'Н', 'О', 'П', 'Р', 'С', 'Т', 'У', 'Ф', 'Х', 'Ц', 'Ч', 'Ш', 'Щ', 'Ъ', 'Ы', 'Ь', 'Э', 'Ю', 'Я',
+            );
+        case 'sk':
+            return array(
+                'A', 'Á', 'Ä', 'B', 'C', 'Č', 'D', 'Ď', 'E', 'É', 'F', 'G', 'H', 'I', 'Í', 'J', 'K', 'L', 'Ľ', 'Ĺ', 'M', 'N', 'Ň', 'O', 'Ó', 'Ô', 'P', 'Q', 'R', 'Ŕ', 'S', 'Š', 'T', 'Ť', 'U', 'Ú', 'V', 'W', 'X', 'Y', 'Ý', 'Z', 'Ž',
+            );
+        case 'sl':
+            return array(
+                'A', 'B', 'C', 'Č', 'Ć', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Š', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ž',
+            );
+        case 'sr':
+            return array(
+                'A', 'B', 'C', 'Č', 'Ć', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Š', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ž',
+            );
+        case 'tr':
+            return array(
+                'A', 'B', 'C', 'Ç', 'D', 'E', 'F', 'G', 'Ğ', 'H', 'I', 'İ', 'J', 'K', 'L', 'M', 'N', 'O', 'Ö', 'P', 'R', 'S', 'Ş', 'T', 'U', 'Ü', 'V', 'Y', 'Z',
+            );
+        default:
+            return array(
+                'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+            );
+        }
+    }
+
+    /**
+     * Get the initial letter of a name, taking care of multi-letter sequences and equivalences.
+     *
+     * @param string $name
+     *
+     * @return string
+     */
+    public static function initialLetter($name) {
+        $name = I18N::strtoupper($name);
+        switch (WT_LOCALE) {
+        case 'cs':
+            if (substr($name, 0, 2) == 'CH') {
+                return 'CH';
+            }
+            break;
+        case 'da':
+        case 'nb':
+        case 'nn':
+            if (substr($name, 0, 2) == 'AA') {
+                return 'Å';
+            }
+            break;
+        case 'hu':
+            if (substr($name, 0, 2) == 'CS') {
+                return 'CS';
+            } elseif (substr($name, 0, 3) == 'DZS') {
+                return 'DZS';
+            } elseif (substr($name, 0, 2) == 'DZ') {
+                return 'DZ';
+            } elseif (substr($name, 0, 2) == 'GY') {
+                return 'GY';
+            } elseif (substr($name, 0, 2) == 'LY') {
+                return 'LY';
+            } elseif (substr($name, 0, 2) == 'NY') {
+                return 'NY';
+            } elseif (substr($name, 0, 2) == 'SZ') {
+                return 'SZ';
+            } elseif (substr($name, 0, 2) == 'TY') {
+                return 'TY';
+            } elseif (substr($name, 0, 2) == 'ZS') {
+                return 'ZS';
+            }
+            break;
+        case 'nl':
+            if (substr($name, 0, 2) == 'IJ') {
+                return 'IJ';
+            }
+            break;
+        }
+        // No special rules - just take the first character
+        return mb_substr($name, 0, 1);
+    }
+
+    /**
+     * Generate SQL to match a given letter, taking care of cases that
+     * are not covered by the collation setting.
+     *
+     * We must consider:
+     * potential substrings, such as Czech "CH" and "C"
+     * equivalent letters, such as Danish "AA" and "Å"
+     *
+     * We COULD write something that handles all languages generically,
+     * but its performance would most likely be poor.
+     *
+     * For languages that don't appear in this list, we could write
+     * simpler versions of the surnameAlpha() and givenAlpha() functions,
+     * but it gives no noticable improvement in performance.
+     *
+     * @param string $field
+     * @param string $letter
+     *
+     * @return string
+     */
+    private static function getInitialSql($field, $letter) {
+        switch (WT_LOCALE) {
+        case 'cs':
+            switch ($letter) {
+            case 'C': return $field . " LIKE 'C%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'CH%' COLLATE " . I18N::collation();
+            }
+            break;
+        case 'da':
+        case 'nb':
+        case 'nn':
+            switch ($letter) {
+            // AA gets listed under Å
+            case 'A': return $field . " LIKE 'A%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'AA%' COLLATE " . I18N::collation();
+            case 'Å': return "(" . $field . " LIKE 'Å%' COLLATE " . I18N::collation() . " OR " . $field . " LIKE 'AA%' COLLATE " . I18N::collation() . ")";
+            }
+            break;
+        case 'hu':
+            switch ($letter) {
+            case 'C':  return $field . " LIKE 'C%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'CS%' COLLATE " . I18N::collation();
+            case 'D':  return $field . " LIKE 'D%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'DZ%' COLLATE " . I18N::collation();
+            case 'DZ': return $field . " LIKE 'DZ%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'DZS%' COLLATE " . I18N::collation();
+            case 'G':  return $field . " LIKE 'G%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'GY%' COLLATE " . I18N::collation();
+            case 'L':  return $field . " LIKE 'L%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'LY%' COLLATE " . I18N::collation();
+            case 'N':  return $field . " LIKE 'N%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'NY%' COLLATE " . I18N::collation();
+            case 'S':  return $field . " LIKE 'S%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'SZ%' COLLATE " . I18N::collation();
+            case 'T':  return $field . " LIKE 'T%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'TY%' COLLATE " . I18N::collation();
+            case 'Z':  return $field . " LIKE 'Z%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'ZS%' COLLATE " . I18N::collation();
+            }
+            break;
+        case 'nl':
+            switch ($letter) {
+            case 'I': return $field . " LIKE 'I%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'IJ%' COLLATE " . I18N::collation();
+            }
+            break;
+        }
+
+        // Easy cases: the MySQL collation rules take care of it
+        return "$field LIKE CONCAT('@'," . Database::quote($letter) . ",'%') COLLATE " . I18N::collation() . " ESCAPE '@'";
+    }
+
+    /**
+     * Get a list of initial surname letters for indilist.php and famlist.php
+     *
+     * @param Tree $tree   Find surnames from this tree
+     * @param bool $marnm  if set, include married names
+     * @param bool $fams   if set, only consider individuals with FAMS records
+     * @param bool $totals if set, count the number of names beginning with each letter
+     *
+     * @return int[]
+     */
+    public static function surnameAlpha(Tree $tree, $marnm, $fams, $totals = true) {
+        $alphas = array();
+
+        $sql =
+            "SELECT COUNT(n_id)" .
+            " FROM `##name` " .
+            ($fams ? " JOIN `##link` ON (n_id=l_from AND n_file=l_file AND l_type='FAMS') " : "") .
+            " WHERE n_file=" . $tree->getTreeId() .
+            ($marnm ? "" : " AND n_type!='_MARNM'");
+
+        // Fetch all the letters in our alphabet, whether or not there
+        // are any names beginning with that letter. It looks better to
+        // show the full alphabet, rather than omitting rare letters such as X
+        foreach (self::getAlphabetForLocale(WT_LOCALE) as $letter) {
+            $count = 1;
+            if ($totals) {
+                $count = Database::prepare($sql . " AND " . self::getInitialSql('n_surn', $letter))->fetchOne();
+            }
+            $alphas[$letter] = $count;
+        }
+
+        // Now fetch initial letters that are not in our alphabet,
+        // including "@" (for "@N.N.") and "" for no surname.
+        $sql =
+            "SELECT initial, count FROM (SELECT UPPER(LEFT(n_surn, 1)) AS initial, COUNT(n_id) AS count" .
+            " FROM `##name` " .
+            ($fams ? " JOIN `##link` ON n_id = l_from AND n_file = l_file AND l_type = 'FAMS' " : "") .
+            " WHERE n_file = :tree_id AND n_surn <> ''" .
+            ($marnm ? "" : " AND n_type != '_MARNM'");
+
+        $args = array(
+            'tree_id' => $tree->getTreeId(),
+        );
+
+        foreach (self::getAlphabetForLocale(WT_LOCALE) as $n => $letter) {
+            $sql .= " AND n_surn COLLATE :collate_" . $n . " NOT LIKE :letter_" . $n;
+            $args['collate_' . $n] = I18N::collation();
+            $args['letter_' . $n]  = $letter . '%';
+        }
+        $sql .= " GROUP BY UPPER(LEFT(n_surn, 1))) AS subquery ORDER BY initial = '', initial = '@', initial";
+        foreach (Database::prepare($sql)->execute($args)->fetchAssoc() as $alpha => $count) {
+            $alphas[$alpha] = $count;
+        }
+
+        // Names with no surname
+        $sql =
+            "SELECT COUNT(n_id)" .
+            " FROM `##name` " .
+            ($fams ? " JOIN `##link` ON n_id = l_from AND n_file = l_file AND l_type = 'FAMS' " : "") .
+            " WHERE n_file = :tree_id AND n_surn = ''" .
+            ($marnm ? "" : " AND n_type != '_MARNM'");
+
+        $args = array(
+            'tree_id' => $tree->getTreeId(),
+        );
+
+        $num_none = Database::prepare($sql)->execute($args)->fetchOne();
+        if ($num_none) {
+            // Special code to indicate "no surname"
+            $alphas[','] = $num_none;
+        }
+
+        return $alphas;
+    }
+
+    /**
+     * Get a list of initial given name letters for indilist.php and famlist.php
+     *
+     * @param Tree   $tree   Find names in this tree
+     * @param string $surn   if set, only consider people with this surname
+     * @param string $salpha if set, only consider surnames starting with this letter
+     * @param bool   $marnm  if set, include married names
+     * @param bool   $fams   if set, only consider individuals with FAMS records
+     *
+     * @return int[]
+     */
+    public static function givenAlpha(Tree $tree, $surn, $salpha, $marnm, $fams) {
+        $alphas = array();
+
+        $sql =
+            "SELECT COUNT(DISTINCT n_id)" .
+            " FROM `##name`" .
+            ($fams ? " JOIN `##link` ON (n_id=l_from AND n_file=l_file AND l_type='FAMS') " : "") .
+            " WHERE n_file=" . $tree->getTreeId() . " " .
+            ($marnm ? "" : " AND n_type!='_MARNM'");
+
+        if ($surn) {
+            $sql .= " AND n_surn=" . Database::quote($surn) . " COLLATE '" . I18N::collation() . "'";
+        } elseif ($salpha == ',') {
+            $sql .= " AND n_surn=''";
+        } elseif ($salpha == '@') {
+            $sql .= " AND n_surn='@N.N.'";
+        } elseif ($salpha) {
+            $sql .= " AND " . self::getInitialSql('n_surn', $salpha);
+        } else {
+            // All surnames
+            $sql .= " AND n_surn NOT IN ('', '@N.N.')";
+        }
+
+        // Fetch all the letters in our alphabet, whether or not there
+        // are any names beginning with that letter. It looks better to
+        // show the full alphabet, rather than omitting rare letters such as X
+        foreach (self::getAlphabetForLocale(WT_LOCALE) as $letter) {
+            $count           = Database::prepare($sql . " AND " . self::getInitialSql('n_givn', $letter))->fetchOne();
+            $alphas[$letter] = $count;
+        }
+
+        // Now fetch initial letters that are not in our alphabet,
+        // including "@" (for "@N.N.") and "" for no surname
+        $sql =
+            "SELECT initial, total FROM (SELECT UPPER(LEFT(n_givn, 1)) AS initial, COUNT(DISTINCT n_id) AS total" .
+            " FROM `##name` " .
+            ($fams ? " JOIN `##link` ON (n_id = l_from AND n_file = l_file AND l_type = 'FAMS') " : "") .
+            " WHERE n_file = :tree_id" .
+            ($marnm ? "" : " AND n_type != '_MARNM'");
+
+        $args = array(
+            'tree_id' => $tree->getTreeId(),
+        );
+
+        if ($surn) {
+            $sql .= " AND n_surn COLLATE :collate_1 = :surn";
+            $args['collate_1'] = I18N::collation();
+            $args['surn']      = $surn;
+        } elseif ($salpha === ',') {
+            $sql .= " AND n_surn = ''";
+        } elseif ($salpha === '@') {
+            $sql .= " AND n_surn = '@N.N.'";
+        } elseif ($salpha) {
+            $sql .= " AND " . self::getInitialSql('n_surn', $salpha);
+        } else {
+            // All surnames
+            $sql .= " AND n_surn NOT IN ('', '@N.N.')";
+        }
+
+        foreach (self::getAlphabetForLocale(WT_LOCALE) as $letter) {
+            $sql .= " AND n_givn NOT LIKE '" . $letter . "%' COLLATE " . I18N::collation();
+        }
+        $sql .= " GROUP BY UPPER(LEFT(n_givn, 1))) AS subquery ORDER BY initial = '@', initial = '', initial";
+
+        foreach (Database::prepare($sql)->execute($args)->fetchAssoc() as $alpha => $count) {
+            $alphas[$alpha] = $count;
+        }
+
+        return $alphas;
+    }
+
+    /**
+     * Get a list of actual surnames and variants, based on a "root" surname.
+     *
+     * @param Tree   $tree   only fetch individuals from this tree
+     * @param string $surn   if set, only fetch people with this surname
+     * @param string $salpha if set, only consider surnames starting with this letter
+     * @param bool   $marnm  if set, include married names
+     * @param bool   $fams   if set, only consider individuals with FAMS records
+     *
+     * @return array
+     */
+    public static function surnames(Tree $tree, $surn, $salpha, $marnm, $fams) {
+        $sql =
+            "SELECT n2.n_surn, n1.n_surname, n1.n_id" .
+            " FROM `##name` n1 " .
+            ($fams ? " JOIN `##link` ON n_id = l_from AND n_file = l_file AND l_type = 'FAMS' " : "") .
+            " JOIN (SELECT n_surn COLLATE :collate_0 AS n_surn, n_file FROM `##name`" .
+            " WHERE n_file = :tree_id" .
+            ($marnm ? "" : " AND n_type != '_MARNM'");
+
+        $args = array(
+            'tree_id'   => $tree->getTreeId(),
+            'collate_0' => I18N::collation(),
+        );
+
+        if ($surn) {
+            $sql .= " AND n_surn COLLATE :collate_1 = :surn";
+            $args['collate_1'] = I18N::collation();
+            $args['surn']      = $surn;
+        } elseif ($salpha === ',') {
+            $sql .= " AND n_surn = ''";
+        } elseif ($salpha === '@') {
+            $sql .= " AND n_surn = '@N.N.'";
+        } elseif ($salpha) {
+            $sql .= " AND " . self::getInitialSql('n_surn', $salpha);
+        } else {
+            // All surnames
+            $sql .= " AND n_surn NOT IN ('', '@N.N.')";
+        }
+        $sql .= " GROUP BY n_surn COLLATE :collate_2, n_file) AS n2 ON (n1.n_surn = n2.n_surn COLLATE :collate_3 AND n1.n_file = n2.n_file)";
+        $args['collate_2'] = I18N::collation();
+        $args['collate_3'] = I18N::collation();
+
+        $list = array();
+        foreach (Database::prepare($sql)->execute($args)->fetchAll() as $row) {
+            $list[I18N::strtoupper($row->n_surn)][$row->n_surname][$row->n_id] = true;
+        }
+
+        return $list;
+    }
+
+    /**
+     * Fetch a list of individuals with specified names
+     *
+     * To search for unknown names, use $surn="@N.N.", $salpha="@" or $galpha="@"
+     * To search for names with no surnames, use $salpha=","
+     *
+     * @param Tree   $tree   only fetch individuals from this tree
+     * @param string $surn   if set, only fetch people with this surname
+     * @param string $salpha if set, only fetch surnames starting with this letter
+     * @param string  $galpha if set, only fetch given names starting with this letter
+     * @param bool   $marnm  if set, include married names
+     * @param bool   $fams   if set, only fetch individuals with FAMS records
+     *
+     * @return Individual[]
+     */
+    public static function individuals(Tree $tree, $surn, $salpha, $galpha, $marnm, $fams) {
+        $sql =
+            "SELECT i_id AS xref, i_gedcom AS gedcom, n_full " .
+            "FROM `##individuals` " .
+            "JOIN `##name` ON n_id = i_id AND n_file = i_file " .
+            ($fams ? "JOIN `##link` ON n_id = l_from AND n_file = l_file AND l_type = 'FAMS' " : "") .
+            "WHERE n_file = :tree_id " .
+            ($marnm ? "" : "AND n_type != '_MARNM'");
+
+        $args = array(
+            'tree_id' => $tree->getTreeId(),
+        );
+
+        if ($surn) {
+            $sql .= " AND n_surn COLLATE :collate_1 = :surn";
+            $args['collate_1'] = I18N::collation();
+            $args['surn']      = $surn;
+        } elseif ($salpha === ',') {
+            $sql .= " AND n_surn = ''";
+        } elseif ($salpha === '@') {
+            $sql .= " AND n_surn = '@N.N.'";
+        } elseif ($salpha) {
+            $sql .= " AND " . self::getInitialSql('n_surn', $salpha);
+        } else {
+            // All surnames
+            $sql .= " AND n_surn NOT IN ('', '@N.N.')";
+        }
+        if ($galpha) {
+            $sql .= " AND " . self::getInitialSql('n_givn', $galpha);
+        }
+
+        $sql .= " ORDER BY CASE n_surn WHEN '@N.N.' THEN 1 ELSE 0 END, n_surn COLLATE :collate_2, CASE n_givn WHEN '@P.N.' THEN 1 ELSE 0 END, n_givn COLLATE :collate_3";
+        $args['collate_2'] = I18N::collation();
+        $args['collate_3'] = I18N::collation();
+
+        $list = array();
+        $rows = Database::prepare($sql)->execute($args)->fetchAll();
+        foreach ($rows as $row) {
+            $person = Individual::getInstance($row->xref, $tree, $row->gedcom);
+            // The name from the database may be private - check the filtered list...
+            foreach ($person->getAllNames() as $n => $name) {
+                if ($name['fullNN'] == $row->n_full) {
+                    $person->setPrimaryName($n);
+                    // We need to clone $person, as we may have multiple references to the
+                    // same person in this list, and the "primary name" would otherwise
+                    // be shared amongst all of them.
+                    $list[] = clone $person;
+                    break;
+                }
+            }
+        }
+
+        return $list;
+    }
+
+    /**
+     * Fetch a list of families with specified names
+     *
+     * To search for unknown names, use $surn="@N.N.", $salpha="@" or $galpha="@"
+     * To search for names with no surnames, use $salpha=","
+     *
+     * @param Tree   $tree   only fetch individuals from this tree
+     * @param string $surn   if set, only fetch people with this surname
+     * @param string $salpha if set, only fetch surnames starting with this letter
+     * @param string $galpha if set, only fetch given names starting with this letter
+     * @param bool   $marnm  if set, include married names
+     *
+     * @return Family[]
+     */
+    public static function families(Tree $tree, $surn, $salpha, $galpha, $marnm) {
+        $list = array();
+        foreach (self::individuals($tree, $surn, $salpha, $galpha, $marnm, true) as $indi) {
+            foreach ($indi->getSpouseFamilies() as $family) {
+                $list[$family->getXref()] = $family;
+            }
+        }
+        usort($list, '\Fisharebest\Webtrees\GedcomRecord::compare');
+
+        return $list;
+    }
 }

Switch Indentation +145 added lines, -145 removed lines

@@ -34,85 +34,85 @@ 
 	 */
 	private static function getAlphabetForLocale($locale) {
 		switch ($locale) {
-		case 'ar':
-			return array(
-				'ا', 'ب', 'ت', 'ث', 'ج', 'ح', 'خ', 'د', 'ذ', 'ر', 'ز', 'س', 'ش', 'ص', 'ض', 'ط', 'ظ', 'ع', 'غ', 'ف', 'ق', 'ك', 'ل', 'م', 'ن', 'ه', 'و', 'ي', 'آ', 'ة', 'ى', 'ی',
-			);
-		case 'cs':
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'CH', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-			);
-		case 'da':
-		case 'nb':
-		case 'nn':
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Æ', 'Ø', 'Å',
-			);
-		case 'el':
-			return array(
-				'Α', 'Β', 'Γ', 'Δ', 'Ε', 'Ζ', 'Η', 'Θ', 'Ι', 'Κ', 'Λ', 'Μ', 'Ν', 'Ξ', 'Ο', 'Π', 'Ρ', 'Σ', 'Τ', 'Υ', 'Φ', 'Χ', 'Ψ', 'Ω',
-			);
-		case 'es':
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'Ñ', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-			);
-		case 'et':
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Š', 'Z', 'Ž', 'T', 'U', 'V', 'W', 'Õ', 'Ä', 'Ö', 'Ü', 'X', 'Y',
-			);
-		case 'fi':
-		case 'sv':
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Å', 'Ä', 'Ö',
-			);
-		case 'he':
-			return array(
-				'א', 'ב', 'ג', 'ד', 'ה', 'ו', 'ז', 'ח', 'ט', 'י', 'כ', 'ל', 'מ', 'נ', 'ס', 'ע', 'פ', 'צ', 'ק', 'ר', 'ש', 'ת',
-			);
-		case 'hu':
-			return array(
-				'A', 'B', 'C', 'CS', 'D', 'DZ', 'DZS', 'E', 'F', 'G', 'GY', 'H', 'I', 'J', 'K', 'L', 'LY', 'M', 'N', 'NY', 'O', 'Ö', 'P', 'Q', 'R', 'S', 'SZ', 'T', 'TY', 'U', 'Ü', 'V', 'W', 'X', 'Y', 'Z', 'ZS',
-			);
-		case 'lt':
-			return array(
-				'A', 'Ą', 'B', 'C', 'Č', 'D', 'E', 'Ę', 'Ė', 'F', 'G', 'H', 'I', 'Y', 'Į', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'R', 'S', 'Š', 'T', 'U', 'Ų', 'Ū', 'V', 'Z', 'Ž',
-			);
-		case 'nl':
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'IJ',
-			);
-		case 'pl':
-			return array(
-				'A', 'B', 'C', 'Ć', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'Ł', 'M', 'N', 'O', 'Ó', 'P', 'Q', 'R', 'S', 'Ś', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ź', 'Ż',
-			);
-		case 'ro':
-			return array(
-				'A', 'Ă', 'Â', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'Î', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Ş', 'T', 'Ţ', 'U', 'V', 'W', 'X', 'Y', 'Z',
-			);
-		case 'ru':
-			return array(
-				'А', 'Б', 'В', 'Г', 'Д', 'Е', 'Ё', 'Ж', 'З', 'И', 'Й', 'К', 'Л', 'М', 'Н', 'О', 'П', 'Р', 'С', 'Т', 'У', 'Ф', 'Х', 'Ц', 'Ч', 'Ш', 'Щ', 'Ъ', 'Ы', 'Ь', 'Э', 'Ю', 'Я',
-			);
-		case 'sk':
-			return array(
-				'A', 'Á', 'Ä', 'B', 'C', 'Č', 'D', 'Ď', 'E', 'É', 'F', 'G', 'H', 'I', 'Í', 'J', 'K', 'L', 'Ľ', 'Ĺ', 'M', 'N', 'Ň', 'O', 'Ó', 'Ô', 'P', 'Q', 'R', 'Ŕ', 'S', 'Š', 'T', 'Ť', 'U', 'Ú', 'V', 'W', 'X', 'Y', 'Ý', 'Z', 'Ž',
-			);
-		case 'sl':
-			return array(
-				'A', 'B', 'C', 'Č', 'Ć', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Š', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ž',
-			);
-		case 'sr':
-			return array(
-				'A', 'B', 'C', 'Č', 'Ć', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Š', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ž',
-			);
-		case 'tr':
-			return array(
-				'A', 'B', 'C', 'Ç', 'D', 'E', 'F', 'G', 'Ğ', 'H', 'I', 'İ', 'J', 'K', 'L', 'M', 'N', 'O', 'Ö', 'P', 'R', 'S', 'Ş', 'T', 'U', 'Ü', 'V', 'Y', 'Z',
-			);
-		default:
-			return array(
-				'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-			);
+		    case 'ar':
+			    return array(
+				    'ا', 'ب', 'ت', 'ث', 'ج', 'ح', 'خ', 'د', 'ذ', 'ر', 'ز', 'س', 'ش', 'ص', 'ض', 'ط', 'ظ', 'ع', 'غ', 'ف', 'ق', 'ك', 'ل', 'م', 'ن', 'ه', 'و', 'ي', 'آ', 'ة', 'ى', 'ی',
+			    );
+		    case 'cs':
+			    return array(
+				    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'CH', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+			    );
+		    case 'da':
+		    case 'nb':
+		    case 'nn':
+			    return array(
+				    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Æ', 'Ø', 'Å',
+			    );
+		    case 'el':
+			    return array(
+				    'Α', 'Β', 'Γ', 'Δ', 'Ε', 'Ζ', 'Η', 'Θ', 'Ι', 'Κ', 'Λ', 'Μ', 'Ν', 'Ξ', 'Ο', 'Π', 'Ρ', 'Σ', 'Τ', 'Υ', 'Φ', 'Χ', 'Ψ', 'Ω',
+			    );
+		    case 'es':
+			    return array(
+				    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'Ñ', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+			    );
+		    case 'et':
+			    return array(
+				    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Š', 'Z', 'Ž', 'T', 'U', 'V', 'W', 'Õ', 'Ä', 'Ö', 'Ü', 'X', 'Y',
+			    );
+		    case 'fi':
+		    case 'sv':
+			    return array(
+				    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Å', 'Ä', 'Ö',
+			    );
+		    case 'he':
+			    return array(
+				    'א', 'ב', 'ג', 'ד', 'ה', 'ו', 'ז', 'ח', 'ט', 'י', 'כ', 'ל', 'מ', 'נ', 'ס', 'ע', 'פ', 'צ', 'ק', 'ר', 'ש', 'ת',
+			    );
+		    case 'hu':
+			    return array(
+				    'A', 'B', 'C', 'CS', 'D', 'DZ', 'DZS', 'E', 'F', 'G', 'GY', 'H', 'I', 'J', 'K', 'L', 'LY', 'M', 'N', 'NY', 'O', 'Ö', 'P', 'Q', 'R', 'S', 'SZ', 'T', 'TY', 'U', 'Ü', 'V', 'W', 'X', 'Y', 'Z', 'ZS',
+			    );
+		    case 'lt':
+			    return array(
+				    'A', 'Ą', 'B', 'C', 'Č', 'D', 'E', 'Ę', 'Ė', 'F', 'G', 'H', 'I', 'Y', 'Į', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'R', 'S', 'Š', 'T', 'U', 'Ų', 'Ū', 'V', 'Z', 'Ž',
+			    );
+		    case 'nl':
+			    return array(
+				    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'IJ',
+			    );
+		    case 'pl':
+			    return array(
+				    'A', 'B', 'C', 'Ć', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'Ł', 'M', 'N', 'O', 'Ó', 'P', 'Q', 'R', 'S', 'Ś', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ź', 'Ż',
+			    );
+		    case 'ro':
+			    return array(
+				    'A', 'Ă', 'Â', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'Î', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Ş', 'T', 'Ţ', 'U', 'V', 'W', 'X', 'Y', 'Z',
+			    );
+		    case 'ru':
+			    return array(
+				    'А', 'Б', 'В', 'Г', 'Д', 'Е', 'Ё', 'Ж', 'З', 'И', 'Й', 'К', 'Л', 'М', 'Н', 'О', 'П', 'Р', 'С', 'Т', 'У', 'Ф', 'Х', 'Ц', 'Ч', 'Ш', 'Щ', 'Ъ', 'Ы', 'Ь', 'Э', 'Ю', 'Я',
+			    );
+		    case 'sk':
+			    return array(
+				    'A', 'Á', 'Ä', 'B', 'C', 'Č', 'D', 'Ď', 'E', 'É', 'F', 'G', 'H', 'I', 'Í', 'J', 'K', 'L', 'Ľ', 'Ĺ', 'M', 'N', 'Ň', 'O', 'Ó', 'Ô', 'P', 'Q', 'R', 'Ŕ', 'S', 'Š', 'T', 'Ť', 'U', 'Ú', 'V', 'W', 'X', 'Y', 'Ý', 'Z', 'Ž',
+			    );
+		    case 'sl':
+			    return array(
+				    'A', 'B', 'C', 'Č', 'Ć', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Š', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ž',
+			    );
+		    case 'sr':
+			    return array(
+				    'A', 'B', 'C', 'Č', 'Ć', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'Š', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ž',
+			    );
+		    case 'tr':
+			    return array(
+				    'A', 'B', 'C', 'Ç', 'D', 'E', 'F', 'G', 'Ğ', 'H', 'I', 'İ', 'J', 'K', 'L', 'M', 'N', 'O', 'Ö', 'P', 'R', 'S', 'Ş', 'T', 'U', 'Ü', 'V', 'Y', 'Z',
+			    );
+		    default:
+			    return array(
+				    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+			    );
 		}
 	}
 
@@ -126,44 +126,44 @@ 
 	public static function initialLetter($name) {
 		$name = I18N::strtoupper($name);
 		switch (WT_LOCALE) {
-		case 'cs':
-			if (substr($name, 0, 2) == 'CH') {
-				return 'CH';
-			}
-			break;
-		case 'da':
-		case 'nb':
-		case 'nn':
-			if (substr($name, 0, 2) == 'AA') {
-				return 'Å';
-			}
-			break;
-		case 'hu':
-			if (substr($name, 0, 2) == 'CS') {
-				return 'CS';
-			} elseif (substr($name, 0, 3) == 'DZS') {
-				return 'DZS';
-			} elseif (substr($name, 0, 2) == 'DZ') {
-				return 'DZ';
-			} elseif (substr($name, 0, 2) == 'GY') {
-				return 'GY';
-			} elseif (substr($name, 0, 2) == 'LY') {
-				return 'LY';
-			} elseif (substr($name, 0, 2) == 'NY') {
-				return 'NY';
-			} elseif (substr($name, 0, 2) == 'SZ') {
-				return 'SZ';
-			} elseif (substr($name, 0, 2) == 'TY') {
-				return 'TY';
-			} elseif (substr($name, 0, 2) == 'ZS') {
-				return 'ZS';
-			}
-			break;
-		case 'nl':
-			if (substr($name, 0, 2) == 'IJ') {
-				return 'IJ';
-			}
-			break;
+		    case 'cs':
+			    if (substr($name, 0, 2) == 'CH') {
+				    return 'CH';
+			    }
+			    break;
+		    case 'da':
+		    case 'nb':
+		    case 'nn':
+			    if (substr($name, 0, 2) == 'AA') {
+				    return 'Å';
+			    }
+			    break;
+		    case 'hu':
+			    if (substr($name, 0, 2) == 'CS') {
+				    return 'CS';
+			    } elseif (substr($name, 0, 3) == 'DZS') {
+				    return 'DZS';
+			    } elseif (substr($name, 0, 2) == 'DZ') {
+				    return 'DZ';
+			    } elseif (substr($name, 0, 2) == 'GY') {
+				    return 'GY';
+			    } elseif (substr($name, 0, 2) == 'LY') {
+				    return 'LY';
+			    } elseif (substr($name, 0, 2) == 'NY') {
+				    return 'NY';
+			    } elseif (substr($name, 0, 2) == 'SZ') {
+				    return 'SZ';
+			    } elseif (substr($name, 0, 2) == 'TY') {
+				    return 'TY';
+			    } elseif (substr($name, 0, 2) == 'ZS') {
+				    return 'ZS';
+			    }
+			    break;
+		    case 'nl':
+			    if (substr($name, 0, 2) == 'IJ') {
+				    return 'IJ';
+			    }
+			    break;
 		}
 		// No special rules - just take the first character
 		return mb_substr($name, 0, 1);
@@ -191,37 +191,37 @@ 
 	 */
 	private static function getInitialSql($field, $letter) {
 		switch (WT_LOCALE) {
-		case 'cs':
-			switch ($letter) {
-			case 'C': return $field . " LIKE 'C%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'CH%' COLLATE " . I18N::collation();
-			}
+		    case 'cs':
+			    switch ($letter) {
+			        case 'C': return $field . " LIKE 'C%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'CH%' COLLATE " . I18N::collation();
+			    }
 			break;
-		case 'da':
-		case 'nb':
-		case 'nn':
-			switch ($letter) {
-			// AA gets listed under Å
-			case 'A': return $field . " LIKE 'A%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'AA%' COLLATE " . I18N::collation();
-			case 'Å': return "(" . $field . " LIKE 'Å%' COLLATE " . I18N::collation() . " OR " . $field . " LIKE 'AA%' COLLATE " . I18N::collation() . ")";
-			}
+		    case 'da':
+		    case 'nb':
+		    case 'nn':
+			    switch ($letter) {
+			    // AA gets listed under Å
+			        case 'A': return $field . " LIKE 'A%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'AA%' COLLATE " . I18N::collation();
+			        case 'Å': return "(" . $field . " LIKE 'Å%' COLLATE " . I18N::collation() . " OR " . $field . " LIKE 'AA%' COLLATE " . I18N::collation() . ")";
+			    }
 			break;
-		case 'hu':
-			switch ($letter) {
-			case 'C':  return $field . " LIKE 'C%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'CS%' COLLATE " . I18N::collation();
-			case 'D':  return $field . " LIKE 'D%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'DZ%' COLLATE " . I18N::collation();
-			case 'DZ': return $field . " LIKE 'DZ%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'DZS%' COLLATE " . I18N::collation();
-			case 'G':  return $field . " LIKE 'G%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'GY%' COLLATE " . I18N::collation();
-			case 'L':  return $field . " LIKE 'L%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'LY%' COLLATE " . I18N::collation();
-			case 'N':  return $field . " LIKE 'N%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'NY%' COLLATE " . I18N::collation();
-			case 'S':  return $field . " LIKE 'S%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'SZ%' COLLATE " . I18N::collation();
-			case 'T':  return $field . " LIKE 'T%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'TY%' COLLATE " . I18N::collation();
-			case 'Z':  return $field . " LIKE 'Z%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'ZS%' COLLATE " . I18N::collation();
-			}
+		    case 'hu':
+			    switch ($letter) {
+			        case 'C':  return $field . " LIKE 'C%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'CS%' COLLATE " . I18N::collation();
+			        case 'D':  return $field . " LIKE 'D%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'DZ%' COLLATE " . I18N::collation();
+			        case 'DZ': return $field . " LIKE 'DZ%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'DZS%' COLLATE " . I18N::collation();
+			        case 'G':  return $field . " LIKE 'G%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'GY%' COLLATE " . I18N::collation();
+			        case 'L':  return $field . " LIKE 'L%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'LY%' COLLATE " . I18N::collation();
+			        case 'N':  return $field . " LIKE 'N%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'NY%' COLLATE " . I18N::collation();
+			        case 'S':  return $field . " LIKE 'S%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'SZ%' COLLATE " . I18N::collation();
+			        case 'T':  return $field . " LIKE 'T%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'TY%' COLLATE " . I18N::collation();
+			        case 'Z':  return $field . " LIKE 'Z%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'ZS%' COLLATE " . I18N::collation();
+			    }
 			break;
-		case 'nl':
-			switch ($letter) {
-			case 'I': return $field . " LIKE 'I%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'IJ%' COLLATE " . I18N::collation();
-			}
+		    case 'nl':
+			    switch ($letter) {
+			        case 'I': return $field . " LIKE 'I%' COLLATE " . I18N::collation() . " AND " . $field . " NOT LIKE 'IJ%' COLLATE " . I18N::collation();
+			    }
 			break;
 		}
 

Braces +18 added lines, -9 removed lines

@@ -24,7 +24,8 @@ 
 /**
  * Generate lists for indilist.php and famlist.php
  */
-class QueryName {
+class QueryName
+{
 	/**
 	 * Get a list of initial letters, for lists of names.
 	 *
@@ -32,7 +33,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	private static function getAlphabetForLocale($locale) {
+	private static function getAlphabetForLocale($locale)
+	{
 		switch ($locale) {
 		case 'ar':
 			return array(
@@ -123,7 +125,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function initialLetter($name) {
+	public static function initialLetter($name)
+	{
 		$name = I18N::strtoupper($name);
 		switch (WT_LOCALE) {
 		case 'cs':
@@ -189,7 +192,8 @@ 
 	 *
 	 * @return string
 	 */
-	private static function getInitialSql($field, $letter) {
+	private static function getInitialSql($field, $letter)
+	{
 		switch (WT_LOCALE) {
 		case 'cs':
 			switch ($letter) {
@@ -239,7 +243,8 @@ 
 	 *
 	 * @return int[]
 	 */
-	public static function surnameAlpha(Tree $tree, $marnm, $fams, $totals = true) {
+	public static function surnameAlpha(Tree $tree, $marnm, $fams, $totals = true)
+	{
 		$alphas = array();
 
 		$sql =
@@ -315,7 +320,8 @@ 
 	 *
 	 * @return int[]
 	 */
-	public static function givenAlpha(Tree $tree, $surn, $salpha, $marnm, $fams) {
+	public static function givenAlpha(Tree $tree, $surn, $salpha, $marnm, $fams)
+	{
 		$alphas = array();
 
 		$sql =
@@ -397,7 +403,8 @@ 
 	 *
 	 * @return array
 	 */
-	public static function surnames(Tree $tree, $surn, $salpha, $marnm, $fams) {
+	public static function surnames(Tree $tree, $surn, $salpha, $marnm, $fams)
+	{
 		$sql =
 			"SELECT n2.n_surn, n1.n_surname, n1.n_id" .
 			" FROM `##name` n1 " .
@@ -452,7 +459,8 @@ 
 	 *
 	 * @return Individual[]
 	 */
-	public static function individuals(Tree $tree, $surn, $salpha, $galpha, $marnm, $fams) {
+	public static function individuals(Tree $tree, $surn, $salpha, $galpha, $marnm, $fams)
+	{
 		$sql =
 			"SELECT i_id AS xref, i_gedcom AS gedcom, n_full " .
 			"FROM `##individuals` " .
@@ -521,7 +529,8 @@ 
 	 *
 	 * @return Family[]
 	 */
-	public static function families(Tree $tree, $surn, $salpha, $galpha, $marnm) {
+	public static function families(Tree $tree, $surn, $salpha, $galpha, $marnm)
+	{
 		$list = array();
 		foreach (self::individuals($tree, $surn, $salpha, $galpha, $marnm, true) as $indi) {
 			foreach ($indi->getSpouseFamilies() as $family) {

app/Query/QueryMedia.php

Indentation +128 added lines, -128 removed lines

@@ -23,132 +23,132 @@
  * Generate lists of files for admin_media.php
  */
 class QueryMedia {
-	/**
-	 * Generate a list of all the folders in the current tree - for the media list.
-	 *
-	 * @return string[]
-	 */
-	public static function folderList() {
-		global $WT_TREE;
-
-		$folders = Database::prepare(
-			"SELECT LEFT(m_filename, CHAR_LENGTH(m_filename) - CHAR_LENGTH(SUBSTRING_INDEX(m_filename, '/', -1))) AS media_path" .
-			" FROM  `##media`" .
-			" WHERE m_file = ?" .
-			" AND   m_filename NOT LIKE 'http://%'" .
-			" AND   m_filename NOT LIKE 'https://%'" .
-			" GROUP BY 1" .
-			" ORDER BY 1"
-		)->execute(array($WT_TREE->getTreeId()))->fetchOneColumn();
-
-		if (!$folders || reset($folders) != '') {
-			array_unshift($folders, '');
-		}
-
-		return array_combine($folders, $folders);
-	}
-
-	/**
-	 * Generate a list of all folders from all the trees - for the media admin.
-	 *
-	 * @return array
-	 */
-	public static function folderListAll() {
-		$folders = Database::prepare(
-			"SELECT LEFT(m_filename, CHAR_LENGTH(m_filename) - CHAR_LENGTH(SUBSTRING_INDEX(m_filename, '/', -1))) AS media_path" .
-			" FROM  `##media`" .
-			" WHERE m_filename NOT LIKE 'http://%'" .
-			" AND   m_filename NOT LIKE 'https://%'" .
-			" GROUP BY 1" .
-			" ORDER BY 1"
-		)->execute()->fetchOneColumn();
-
-		if ($folders) {
-			return array_combine($folders, $folders);
-		} else {
-			return array();
-		}
-	}
-
-	/**
-	 * Generate a filtered, sourced, privacy-checked list of media objects - for the media list.
-	 *
-	 * @param string $folder     folder to search
-	 * @param string $subfolders either "include" or "exclude"
-	 * @param string $sort       either "file" or "title"
-	 * @param string $filter     optional search string
-	 * @param string $form_type  option OBJE/FILE/FORM/TYPE
-	 *
-	 * @throws \Exception
-	 *
-	 * @return Media[]
-	 */
-	public static function mediaList($folder, $subfolders, $sort, $filter, $form_type) {
-		global $WT_TREE;
-
-		// All files in the folder, plus external files
-		$sql =
-			"SELECT m_id AS xref, m_gedcom AS gedcom" .
-			" FROM `##media`" .
-			" WHERE m_file=?";
-		$args = array(
-			$WT_TREE->getTreeId(),
-		);
-
-		// Only show external files when we are looking at the root folder
-		if ($folder == '') {
-			$sql_external = " OR m_filename LIKE 'http://%' OR m_filename LIKE 'https://%'";
-		} else {
-			$sql_external = "";
-		}
-
-		// Include / exclude subfolders (but always include external)
-		switch ($subfolders) {
-		case 'include':
-			$sql .= " AND (m_filename LIKE CONCAT(?, '%') $sql_external)";
-			$args[] = Filter::escapeLike($folder);
-			break;
-		case 'exclude':
-			$sql .= " AND (m_filename LIKE CONCAT(?, '%')  AND m_filename NOT LIKE CONCAT(?, '%/%') $sql_external)";
-			$args[] = Filter::escapeLike($folder);
-			$args[] = Filter::escapeLike($folder);
-			break;
-		default:
-			throw new \Exception('Bad argument (subfolders=' . $subfolders . ') in QueryMedia::mediaList()');
-		}
-
-		// Apply search terms
-		if ($filter) {
-			$sql .= " AND (SUBSTRING_INDEX(m_filename, '/', -1) LIKE CONCAT('%', ?, '%') OR m_titl LIKE CONCAT('%', ?, '%'))";
-			$args[] = Filter::escapeLike($filter);
-			$args[] = Filter::escapeLike($filter);
-		}
-
-		if ($form_type) {
-			$sql .= " AND (m_gedcom LIKE CONCAT('%\n3 TYPE ', ?, '%'))";
-			$args[] = $form_type;
-		}
-
-		switch ($sort) {
-		case 'file':
-			$sql .= " ORDER BY m_filename";
-			break;
-		case 'title':
-			$sql .= " ORDER BY m_titl";
-			break;
-		default:
-			throw new \Exception('Bad argument (sort=' . $sort . ') in QueryMedia::mediaList()');
-		}
-
-		$rows = Database::prepare($sql)->execute($args)->fetchAll();
-		$list = array();
-		foreach ($rows as $row) {
-			$media = Media::getInstance($row->xref, $WT_TREE, $row->gedcom);
-			if ($media->canShow()) {
-				$list[] = $media;
-			}
-		}
-
-		return $list;
-	}
+    /**
+     * Generate a list of all the folders in the current tree - for the media list.
+     *
+     * @return string[]
+     */
+    public static function folderList() {
+        global $WT_TREE;
+
+        $folders = Database::prepare(
+            "SELECT LEFT(m_filename, CHAR_LENGTH(m_filename) - CHAR_LENGTH(SUBSTRING_INDEX(m_filename, '/', -1))) AS media_path" .
+            " FROM  `##media`" .
+            " WHERE m_file = ?" .
+            " AND   m_filename NOT LIKE 'http://%'" .
+            " AND   m_filename NOT LIKE 'https://%'" .
+            " GROUP BY 1" .
+            " ORDER BY 1"
+        )->execute(array($WT_TREE->getTreeId()))->fetchOneColumn();
+
+        if (!$folders || reset($folders) != '') {
+            array_unshift($folders, '');
+        }
+
+        return array_combine($folders, $folders);
+    }
+
+    /**
+     * Generate a list of all folders from all the trees - for the media admin.
+     *
+     * @return array
+     */
+    public static function folderListAll() {
+        $folders = Database::prepare(
+            "SELECT LEFT(m_filename, CHAR_LENGTH(m_filename) - CHAR_LENGTH(SUBSTRING_INDEX(m_filename, '/', -1))) AS media_path" .
+            " FROM  `##media`" .
+            " WHERE m_filename NOT LIKE 'http://%'" .
+            " AND   m_filename NOT LIKE 'https://%'" .
+            " GROUP BY 1" .
+            " ORDER BY 1"
+        )->execute()->fetchOneColumn();
+
+        if ($folders) {
+            return array_combine($folders, $folders);
+        } else {
+            return array();
+        }
+    }
+
+    /**
+     * Generate a filtered, sourced, privacy-checked list of media objects - for the media list.
+     *
+     * @param string $folder     folder to search
+     * @param string $subfolders either "include" or "exclude"
+     * @param string $sort       either "file" or "title"
+     * @param string $filter     optional search string
+     * @param string $form_type  option OBJE/FILE/FORM/TYPE
+     *
+     * @throws \Exception
+     *
+     * @return Media[]
+     */
+    public static function mediaList($folder, $subfolders, $sort, $filter, $form_type) {
+        global $WT_TREE;
+
+        // All files in the folder, plus external files
+        $sql =
+            "SELECT m_id AS xref, m_gedcom AS gedcom" .
+            " FROM `##media`" .
+            " WHERE m_file=?";
+        $args = array(
+            $WT_TREE->getTreeId(),
+        );
+
+        // Only show external files when we are looking at the root folder
+        if ($folder == '') {
+            $sql_external = " OR m_filename LIKE 'http://%' OR m_filename LIKE 'https://%'";
+        } else {
+            $sql_external = "";
+        }
+
+        // Include / exclude subfolders (but always include external)
+        switch ($subfolders) {
+        case 'include':
+            $sql .= " AND (m_filename LIKE CONCAT(?, '%') $sql_external)";
+            $args[] = Filter::escapeLike($folder);
+            break;
+        case 'exclude':
+            $sql .= " AND (m_filename LIKE CONCAT(?, '%')  AND m_filename NOT LIKE CONCAT(?, '%/%') $sql_external)";
+            $args[] = Filter::escapeLike($folder);
+            $args[] = Filter::escapeLike($folder);
+            break;
+        default:
+            throw new \Exception('Bad argument (subfolders=' . $subfolders . ') in QueryMedia::mediaList()');
+        }
+
+        // Apply search terms
+        if ($filter) {
+            $sql .= " AND (SUBSTRING_INDEX(m_filename, '/', -1) LIKE CONCAT('%', ?, '%') OR m_titl LIKE CONCAT('%', ?, '%'))";
+            $args[] = Filter::escapeLike($filter);
+            $args[] = Filter::escapeLike($filter);
+        }
+
+        if ($form_type) {
+            $sql .= " AND (m_gedcom LIKE CONCAT('%\n3 TYPE ', ?, '%'))";
+            $args[] = $form_type;
+        }
+
+        switch ($sort) {
+        case 'file':
+            $sql .= " ORDER BY m_filename";
+            break;
+        case 'title':
+            $sql .= " ORDER BY m_titl";
+            break;
+        default:
+            throw new \Exception('Bad argument (sort=' . $sort . ') in QueryMedia::mediaList()');
+        }
+
+        $rows = Database::prepare($sql)->execute($args)->fetchAll();
+        $list = array();
+        foreach ($rows as $row) {
+            $media = Media::getInstance($row->xref, $WT_TREE, $row->gedcom);
+            if ($media->canShow()) {
+                $list[] = $media;
+            }
+        }
+
+        return $list;
+    }
 }

Switch Indentation +19 added lines, -19 removed lines

@@ -104,17 +104,17 @@ 
 
 		// Include / exclude subfolders (but always include external)
 		switch ($subfolders) {
-		case 'include':
-			$sql .= " AND (m_filename LIKE CONCAT(?, '%') $sql_external)";
-			$args[] = Filter::escapeLike($folder);
-			break;
-		case 'exclude':
-			$sql .= " AND (m_filename LIKE CONCAT(?, '%')  AND m_filename NOT LIKE CONCAT(?, '%/%') $sql_external)";
-			$args[] = Filter::escapeLike($folder);
-			$args[] = Filter::escapeLike($folder);
-			break;
-		default:
-			throw new \Exception('Bad argument (subfolders=' . $subfolders . ') in QueryMedia::mediaList()');
+		    case 'include':
+			    $sql .= " AND (m_filename LIKE CONCAT(?, '%') $sql_external)";
+			    $args[] = Filter::escapeLike($folder);
+			    break;
+		    case 'exclude':
+			    $sql .= " AND (m_filename LIKE CONCAT(?, '%')  AND m_filename NOT LIKE CONCAT(?, '%/%') $sql_external)";
+			    $args[] = Filter::escapeLike($folder);
+			    $args[] = Filter::escapeLike($folder);
+			    break;
+		    default:
+			    throw new \Exception('Bad argument (subfolders=' . $subfolders . ') in QueryMedia::mediaList()');
 		}
 
 		// Apply search terms
@@ -130,14 +130,14 @@ 
 		}
 
 		switch ($sort) {
-		case 'file':
-			$sql .= " ORDER BY m_filename";
-			break;
-		case 'title':
-			$sql .= " ORDER BY m_titl";
-			break;
-		default:
-			throw new \Exception('Bad argument (sort=' . $sort . ') in QueryMedia::mediaList()');
+		    case 'file':
+			    $sql .= " ORDER BY m_filename";
+			    break;
+		    case 'title':
+			    $sql .= " ORDER BY m_titl";
+			    break;
+		    default:
+			    throw new \Exception('Bad argument (sort=' . $sort . ') in QueryMedia::mediaList()');
 		}
 
 		$rows = Database::prepare($sql)->execute($args)->fetchAll();

Braces +8 added lines, -4 removed lines

@@ -22,13 +22,15 @@ 
 /**
  * Generate lists of files for admin_media.php
  */
-class QueryMedia {
+class QueryMedia
+{
 	/**
 	 * Generate a list of all the folders in the current tree - for the media list.
 	 *
 	 * @return string[]
 	 */
-	public static function folderList() {
+	public static function folderList()
+	{
 		global $WT_TREE;
 
 		$folders = Database::prepare(
@@ -53,7 +55,8 @@ 
 	 *
 	 * @return array
 	 */
-	public static function folderListAll() {
+	public static function folderListAll()
+	{
 		$folders = Database::prepare(
 			"SELECT LEFT(m_filename, CHAR_LENGTH(m_filename) - CHAR_LENGTH(SUBSTRING_INDEX(m_filename, '/', -1))) AS media_path" .
 			" FROM  `##media`" .
@@ -83,7 +86,8 @@ 
 	 *
 	 * @return Media[]
 	 */
-	public static function mediaList($folder, $subfolders, $sort, $filter, $form_type) {
+	public static function mediaList($folder, $subfolders, $sort, $filter, $form_type)
+	{
 		global $WT_TREE;
 
 		// All files in the folder, plus external files

app/Note.php

Indentation +80 added lines, -80 removed lines

@@ -19,92 +19,92 @@
  * A GEDCOM note (NOTE) object.
  */
 class Note extends GedcomRecord {
-	const RECORD_TYPE = 'NOTE';
-	const URL_PREFIX  = 'note.php?nid=';
+    const RECORD_TYPE = 'NOTE';
+    const URL_PREFIX  = 'note.php?nid=';
 
-	/**
-	 * Get the text contents of the note
-	 *
-	 * @return string|null
-	 */
-	public function getNote() {
-		if (preg_match('/^0 @' . WT_REGEX_XREF . '@ NOTE ?(.*(?:\n1 CONT ?.*)*)/', $this->gedcom . $this->pending, $match)) {
-			return preg_replace("/\n1 CONT ?/", "\n", $match[1]);
-		} else {
-			return null;
-		}
-	}
+    /**
+     * Get the text contents of the note
+     *
+     * @return string|null
+     */
+    public function getNote() {
+        if (preg_match('/^0 @' . WT_REGEX_XREF . '@ NOTE ?(.*(?:\n1 CONT ?.*)*)/', $this->gedcom . $this->pending, $match)) {
+            return preg_replace("/\n1 CONT ?/", "\n", $match[1]);
+        } 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 notes if they are attached to private records
-		$linked_ids = Database::prepare(
-			"SELECT l_from FROM `##link` WHERE l_to=? AND l_file=?"
-		)->execute(array(
-			$this->xref, $this->tree->getTreeId(),
-		))->fetchOneColumn();
-		foreach ($linked_ids as $linked_id) {
-			$linked_record = GedcomRecord::getInstance($linked_id, $this->tree);
-			if ($linked_record && !$linked_record->canShow($access_level)) {
-				return false;
-			}
-		}
+    /**
+     * 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 notes if they are attached to private records
+        $linked_ids = Database::prepare(
+            "SELECT l_from FROM `##link` WHERE l_to=? AND l_file=?"
+        )->execute(array(
+            $this->xref, $this->tree->getTreeId(),
+        ))->fetchOneColumn();
+        foreach ($linked_ids as $linked_id) {
+            $linked_record = GedcomRecord::getInstance($linked_id, $this->tree);
+            if ($linked_record && !$linked_record->canShow($access_level)) {
+                return false;
+            }
+        }
 
-		// Apply default behaviour
-		return parent::canShowByType($access_level);
-	}
+        // Apply default behaviour
+        return parent::canShowByType($access_level);
+    }
 
-	/**
-	 * Generate a private version of this record
-	 *
-	 * @param int $access_level
-	 *
-	 * @return string
-	 */
-	protected function createPrivateGedcomRecord($access_level) {
-		return '0 @' . $this->xref . '@ NOTE ' . I18N::translate('Private');
-	}
+    /**
+     * Generate a private version of this record
+     *
+     * @param int $access_level
+     *
+     * @return string
+     */
+    protected function createPrivateGedcomRecord($access_level) {
+        return '0 @' . $this->xref . '@ NOTE ' . I18N::translate('Private');
+    }
 
-	/**
-	 * 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 o_gedcom FROM `##other` WHERE o_id = :xref AND o_file = :tree_id AND o_type = 'NOTE'"
-		)->execute(array(
-			'xref'    => $xref,
-			'tree_id' => $tree_id,
-		))->fetchOne();
-	}
+    /**
+     * 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 o_gedcom FROM `##other` WHERE o_id = :xref AND o_file = :tree_id AND o_type = 'NOTE'"
+        )->execute(array(
+            'xref'    => $xref,
+            'tree_id' => $tree_id,
+        ))->fetchOne();
+    }
 
-	/**
-	 * Create a name for this note - apply (and remove) markup, then take
-	 * a maximum of 100 characters from the first line.
-	 */
-	public function extractNames() {
-		$text = $this->getNote();
+    /**
+     * Create a name for this note - apply (and remove) markup, then take
+     * a maximum of 100 characters from the first line.
+     */
+    public function extractNames() {
+        $text = $this->getNote();
 
-		if ($text) {
-			switch ($this->getTree()->getPreference('FORMAT_TEXT')) {
-			case 'markdown':
-				$text = Filter::markdown($text);
-				$text = Filter::unescapeHtml($text);
-				break;
-			}
+        if ($text) {
+            switch ($this->getTree()->getPreference('FORMAT_TEXT')) {
+            case 'markdown':
+                $text = Filter::markdown($text);
+                $text = Filter::unescapeHtml($text);
+                break;
+            }
 
-			list($text) = explode("\n", $text);
-			$this->addName('NOTE', strlen($text) > 100 ? mb_substr($text, 0, 100) . I18N::translate('…') : $text, $this->getGedcom());
-		}
-	}
+            list($text) = explode("\n", $text);
+            $this->addName('NOTE', strlen($text) > 100 ? mb_substr($text, 0, 100) . I18N::translate('…') : $text, $this->getGedcom());
+        }
+    }
 }

Switch Indentation +4 added lines, -4 removed lines

@@ -97,10 +97,10 @@
 
 		if ($text) {
 			switch ($this->getTree()->getPreference('FORMAT_TEXT')) {
-			case 'markdown':
-				$text = Filter::markdown($text);
-				$text = Filter::unescapeHtml($text);
-				break;
+			    case 'markdown':
+				    $text = Filter::markdown($text);
+				    $text = Filter::unescapeHtml($text);
+				    break;
 			}
 
 			list($text) = explode("\n", $text);

Braces +12 added lines, -6 removed lines

@@ -18,7 +18,8 @@ 
 /**
  * A GEDCOM note (NOTE) object.
  */
-class Note extends GedcomRecord {
+class Note extends GedcomRecord
+{
 	const RECORD_TYPE = 'NOTE';
 	const URL_PREFIX  = 'note.php?nid=';
 
@@ -27,7 +28,8 @@ 
 	 *
 	 * @return string|null
 	 */
-	public function getNote() {
+	public function getNote()
+	{
 		if (preg_match('/^0 @' . WT_REGEX_XREF . '@ NOTE ?(.*(?:\n1 CONT ?.*)*)/', $this->gedcom . $this->pending, $match)) {
 			return preg_replace("/\n1 CONT ?/", "\n", $match[1]);
 		} else {
@@ -42,7 +44,8 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function canShowByType($access_level) {
+	protected function canShowByType($access_level)
+	{
 		// Hide notes if they are attached to private records
 		$linked_ids = Database::prepare(
 			"SELECT l_from FROM `##link` WHERE l_to=? AND l_file=?"
@@ -67,7 +70,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function createPrivateGedcomRecord($access_level) {
+	protected function createPrivateGedcomRecord($access_level)
+	{
 		return '0 @' . $this->xref . '@ NOTE ' . I18N::translate('Private');
 	}
 
@@ -79,7 +83,8 @@ 
 	 *
 	 * @return null|string
 	 */
-	protected static function fetchGedcomRecord($xref, $tree_id) {
+	protected static function fetchGedcomRecord($xref, $tree_id)
+	{
 		return Database::prepare(
 			"SELECT o_gedcom FROM `##other` WHERE o_id = :xref AND o_file = :tree_id AND o_type = 'NOTE'"
 		)->execute(array(
@@ -92,7 +97,8 @@ 
 	 * Create a name for this note - apply (and remove) markup, then take
 	 * a maximum of 100 characters from the first line.
 	 */
-	public function extractNames() {
+	public function extractNames()
+	{
 		$text = $this->getNote();
 
 		if ($text) {

app/HitCounter.php

Indentation +64 added lines, -64 removed lines

@@ -19,74 +19,74 @@
  * Measure page popularity.
  */
 class HitCounter {
-	/**
-	 * Count the number of times this page has been viewed.
-	 *
-	 * @param Tree   $tree
-	 * @param string $page
-	 * @param string $parameter
-	 *
-	 * @return int
-	 */
-	public static function countHit(Tree $tree, $page, $parameter) {
-		// Don't increment the counter while we stay on the same page.
-		if (
-			Session::get('last_tree_id') === $tree->getTreeId() &&
-			Session::get('last_page') === $page &&
-			Session::get('last_parameter') === $parameter
-		) {
-			return Session::get('last_count');
-		}
+    /**
+     * Count the number of times this page has been viewed.
+     *
+     * @param Tree   $tree
+     * @param string $page
+     * @param string $parameter
+     *
+     * @return int
+     */
+    public static function countHit(Tree $tree, $page, $parameter) {
+        // Don't increment the counter while we stay on the same page.
+        if (
+            Session::get('last_tree_id') === $tree->getTreeId() &&
+            Session::get('last_page') === $page &&
+            Session::get('last_parameter') === $parameter
+        ) {
+            return Session::get('last_count');
+        }
 
-		$page_count = self::getCount($tree, $page, $parameter);
+        $page_count = self::getCount($tree, $page, $parameter);
 
-		if ($page_count === 0) {
-			Database::prepare(
-				"INSERT INTO `##hit_counter` (gedcom_id, page_name, page_parameter, page_count)" .
-				" VALUES (:tree_id, :page, :parameter, 1)"
-			)->execute(array(
-				'tree_id'   => $tree->getTreeId(),
-				'page'      => $page,
-				'parameter' => $parameter,
-			));
-		} else {
-			Database::prepare(
-				"UPDATE `##hit_counter` SET page_count = page_count + 1" .
-				" WHERE gedcom_id = :tree_id AND page_name = :page AND page_parameter = :parameter"
-			)->execute(array(
-				'tree_id'   => $tree->getTreeId(),
-				'page'      => $page,
-				'parameter' => $parameter,
-			));
-		}
+        if ($page_count === 0) {
+            Database::prepare(
+                "INSERT INTO `##hit_counter` (gedcom_id, page_name, page_parameter, page_count)" .
+                " VALUES (:tree_id, :page, :parameter, 1)"
+            )->execute(array(
+                'tree_id'   => $tree->getTreeId(),
+                'page'      => $page,
+                'parameter' => $parameter,
+            ));
+        } else {
+            Database::prepare(
+                "UPDATE `##hit_counter` SET page_count = page_count + 1" .
+                " WHERE gedcom_id = :tree_id AND page_name = :page AND page_parameter = :parameter"
+            )->execute(array(
+                'tree_id'   => $tree->getTreeId(),
+                'page'      => $page,
+                'parameter' => $parameter,
+            ));
+        }
 
-		$page_count++;
+        $page_count++;
 
-		Session::put('last_tree_id', $tree->getTreeId());
-		Session::put('last_page', $page);
-		Session::put('last_parameter', $parameter);
-		Session::put('last_count', $page_count);
+        Session::put('last_tree_id', $tree->getTreeId());
+        Session::put('last_page', $page);
+        Session::put('last_parameter', $parameter);
+        Session::put('last_count', $page_count);
 
-		return $page_count;
-	}
+        return $page_count;
+    }
 
-	/**
-	 * How many times has a page been viewed
-	 *
-	 * @param Tree   $tree
-	 * @param string $page
-	 * @param string $parameter
-	 *
-	 * @return int
-	 */
-	public static function getCount(Tree $tree, $page, $parameter) {
-		return (int) Database::prepare(
-			"SELECT page_count FROM `##hit_counter`" .
-			" WHERE gedcom_id = :tree_id AND page_name = :page AND page_parameter = :parameter"
-		)->execute(array(
-			'tree_id'   => $tree->getTreeId(),
-			'page'      => $page,
-			'parameter' => $parameter,
-		))->fetchOne();
-	}
+    /**
+     * How many times has a page been viewed
+     *
+     * @param Tree   $tree
+     * @param string $page
+     * @param string $parameter
+     *
+     * @return int
+     */
+    public static function getCount(Tree $tree, $page, $parameter) {
+        return (int) Database::prepare(
+            "SELECT page_count FROM `##hit_counter`" .
+            " WHERE gedcom_id = :tree_id AND page_name = :page AND page_parameter = :parameter"
+        )->execute(array(
+            'tree_id'   => $tree->getTreeId(),
+            'page'      => $page,
+            'parameter' => $parameter,
+        ))->fetchOne();
+    }
 }

Braces +6 added lines, -3 removed lines

@@ -18,7 +18,8 @@ 
 /**
  * Measure page popularity.
  */
-class HitCounter {
+class HitCounter
+{
 	/**
 	 * Count the number of times this page has been viewed.
 	 *
@@ -28,7 +29,8 @@ 
 	 *
 	 * @return int
 	 */
-	public static function countHit(Tree $tree, $page, $parameter) {
+	public static function countHit(Tree $tree, $page, $parameter)
+	{
 		// Don't increment the counter while we stay on the same page.
 		if (
 			Session::get('last_tree_id') === $tree->getTreeId() &&
@@ -79,7 +81,8 @@ 
 	 *
 	 * @return int
 	 */
-	public static function getCount(Tree $tree, $page, $parameter) {
+	public static function getCount(Tree $tree, $page, $parameter)
+	{
 		return (int) Database::prepare(
 			"SELECT page_count FROM `##hit_counter`" .
 			" WHERE gedcom_id = :tree_id AND page_name = :page AND page_parameter = :parameter"

app/Html.php

Indentation +10 added lines, -10 removed lines

@@ -19,14 +19,14 @@
  * Class Html - Add HTML markup to elements consistently.
  */
 class Html {
-	/**
-	 * Filenames are (almost?) always LTR, even on RTL systems.
-	 *
-	 * @param string $filename
-	 *
-	 * @return string
-	 */
-	public static function filename($filename) {
-		return '<samp class="filename" dir="ltr">' . Filter::escapeHtml($filename) . '</samp>';
-	}
+    /**
+     * Filenames are (almost?) always LTR, even on RTL systems.
+     *
+     * @param string $filename
+     *
+     * @return string
+     */
+    public static function filename($filename) {
+        return '<samp class="filename" dir="ltr">' . Filter::escapeHtml($filename) . '</samp>';
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -18,7 +18,8 @@ 
 /**
  * Class Html - Add HTML markup to elements consistently.
  */
-class Html {
+class Html
+{
 	/**
 	 * Filenames are (almost?) always LTR, even on RTL systems.
 	 *
@@ -26,7 +27,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function filename($filename) {
+	public static function filename($filename)
+	{
 		return '<samp class="filename" dir="ltr">' . Filter::escapeHtml($filename) . '</samp>';
 	}
 }

app/Theme/CloudsTheme.php

Indentation +156 added lines, -156 removed lines

@@ -23,160 +23,160 @@
  * The clouds theme.
  */
 class CloudsTheme extends AbstractTheme implements ThemeInterface {
-	/**
-	 * Where are our CSS, JS and other assets?
-	 *
-	 * @return string A relative path, such as "themes/foo/"
-	 */
-	public function assetUrl() {
-		return 'themes/clouds/css-1.7.8/';
-	}
-
-	/**
-	 * Add markup to a flash message.
-	 *
-	 * @param \stdClass $message
-	 *
-	 * @return string
-	 */
-	protected function flashMessageContainer(\stdClass $message) {
-		// This theme uses jQueryUI markup.
-		switch ($message->status) {
-		case 'danger':
-			return '<p class="ui-state-error">' . $message->text . '</p>';
-		default:
-			return '<p class="ui-state-highlight">' . $message->text . '</p>';
-		}
-	}
-
-	/**
-	 * Format the contents of a variable-height home-page block.
-	 *
-	 * @param string $id
-	 * @param string $title
-	 * @param string $class
-	 * @param string $content
-	 *
-	 * @return string
-	 */
-	public function formatBlock($id, $title, $class, $content) {
-		return
-			'<div id="' . $id . '" class="block" >' .
-			'<table class="blockheader"><tr><td class="blockh1"></td><td class="blockh2">' .
-			'<div class="blockhc"><b>' . $title . '</b></div>' .
-			'</td><td class="blockh3"></td></tr></table>' .
-			'<div class="blockcontent normal_inner_block ' . $class . '">' . $content . '</div>' .
-			'</div>';
-	}
-
-	/**
-	 * Create a search field and submit button for the quick search form in the header.
-	 *
-	 * @return string
-	 */
-	protected function formQuickSearchFields() {
-		return
-			'<input type="search" name="query" size="15" placeholder="' . I18N::translate('Search') . '">' .
-			'<input class="search-icon" type="image" src="' . $this->assetUrl() . 'images/go.png" alt="' . I18N::translate('Search') . '" title="' . I18N::translate('Search') . '">';
-	}
-
-	/**
-	 * Allow themes to add extra scripts to the page footer.
-	 *
-	 * @return string
-	 */
-	public function hookFooterExtraJavascript() {
-		return
-			'<script src="' . WT_JQUERY_COLORBOX_URL . '"></script>' .
-			'<script src="' . WT_JQUERY_WHEELZOOM_URL . '"></script>' .
-			'<script>' .
-			'activate_colorbox();' .
-			'jQuery.extend(jQuery.colorbox.settings, {' .
-			' width: "85%",' .
-			' height: "85%",' .
-			' transition: "none",' .
-			' slideshowStart: "' . I18N::translate('Play') . '",' .
-			' slideshowStop: "' . I18N::translate('Stop') . '",' .
-			' title: function() { return jQuery(this).data("title"); }' .
-			'});' .
-			'</script>';
-	}
-
-	/**
-	 * Misecellaneous dimensions, fonts, styles, etc.
-	 *
-	 * @param string $parameter_name
-	 *
-	 * @return string|int|float
-	 */
-	public function parameter($parameter_name) {
-		$parameters = array(
-			'chart-background-f'             => 'e9daf1',
-			'chart-background-m'             => 'b1cff0',
-			'chart-spacing-x'                => 4,
-			'distribution-chart-high-values' => '95b8e0',
-			'distribution-chart-low-values'  => 'c8e7ff',
-		);
-
-		if (array_key_exists($parameter_name, $parameters)) {
-			return $parameters[$parameter_name];
-		} else {
-			return parent::parameter($parameter_name);
-		}
-	}
-
-	/**
-	 * Create the primary menu.
-	 *
-	 * @param Menu[] $menus
-	 *
-	 * @return string
-	 */
-	protected function primaryMenuContent(array $menus) {
-		$html = '';
-
-		foreach ($menus as $menu) {
-			// Create an inert menu - to use as a label
-			$tmp = new Menu($menu->getLabel(), '');
-
-			// Insert the label into the submenu
-			$submenus = $menu->getSubmenus();
-			array_unshift($submenus, $tmp);
-			$menu->setSubmenus($submenus);
-
-			$html .= $menu->getMenuAsList();
-		}
-
-		return $html;
-	}
-
-	/**
-	 * A list of CSS files to include for this page.
-	 *
-	 * @return string[]
-	 */
-	protected function stylesheets() {
-		return array(
-			'themes/clouds/jquery-ui-1.11.2/jquery-ui.css',
-			$this->assetUrl() . 'style.css',
-		);
-	}
-
-	/**
-	 * A fixed string to identify this theme, in settings, etc.
-	 *
-	 * @return string
-	 */
-	public function themeId() {
-		return 'clouds';
-	}
-
-	/**
-	 * What is this theme called?
-	 *
-	 * @return string
-	 */
-	public function themeName() {
-		return /* I18N: Name of a theme. */ I18N::translate('clouds');
-	}
+    /**
+     * Where are our CSS, JS and other assets?
+     *
+     * @return string A relative path, such as "themes/foo/"
+     */
+    public function assetUrl() {
+        return 'themes/clouds/css-1.7.8/';
+    }
+
+    /**
+     * Add markup to a flash message.
+     *
+     * @param \stdClass $message
+     *
+     * @return string
+     */
+    protected function flashMessageContainer(\stdClass $message) {
+        // This theme uses jQueryUI markup.
+        switch ($message->status) {
+        case 'danger':
+            return '<p class="ui-state-error">' . $message->text . '</p>';
+        default:
+            return '<p class="ui-state-highlight">' . $message->text . '</p>';
+        }
+    }
+
+    /**
+     * Format the contents of a variable-height home-page block.
+     *
+     * @param string $id
+     * @param string $title
+     * @param string $class
+     * @param string $content
+     *
+     * @return string
+     */
+    public function formatBlock($id, $title, $class, $content) {
+        return
+            '<div id="' . $id . '" class="block" >' .
+            '<table class="blockheader"><tr><td class="blockh1"></td><td class="blockh2">' .
+            '<div class="blockhc"><b>' . $title . '</b></div>' .
+            '</td><td class="blockh3"></td></tr></table>' .
+            '<div class="blockcontent normal_inner_block ' . $class . '">' . $content . '</div>' .
+            '</div>';
+    }
+
+    /**
+     * Create a search field and submit button for the quick search form in the header.
+     *
+     * @return string
+     */
+    protected function formQuickSearchFields() {
+        return
+            '<input type="search" name="query" size="15" placeholder="' . I18N::translate('Search') . '">' .
+            '<input class="search-icon" type="image" src="' . $this->assetUrl() . 'images/go.png" alt="' . I18N::translate('Search') . '" title="' . I18N::translate('Search') . '">';
+    }
+
+    /**
+     * Allow themes to add extra scripts to the page footer.
+     *
+     * @return string
+     */
+    public function hookFooterExtraJavascript() {
+        return
+            '<script src="' . WT_JQUERY_COLORBOX_URL . '"></script>' .
+            '<script src="' . WT_JQUERY_WHEELZOOM_URL . '"></script>' .
+            '<script>' .
+            'activate_colorbox();' .
+            'jQuery.extend(jQuery.colorbox.settings, {' .
+            ' width: "85%",' .
+            ' height: "85%",' .
+            ' transition: "none",' .
+            ' slideshowStart: "' . I18N::translate('Play') . '",' .
+            ' slideshowStop: "' . I18N::translate('Stop') . '",' .
+            ' title: function() { return jQuery(this).data("title"); }' .
+            '});' .
+            '</script>';
+    }
+
+    /**
+     * Misecellaneous dimensions, fonts, styles, etc.
+     *
+     * @param string $parameter_name
+     *
+     * @return string|int|float
+     */
+    public function parameter($parameter_name) {
+        $parameters = array(
+            'chart-background-f'             => 'e9daf1',
+            'chart-background-m'             => 'b1cff0',
+            'chart-spacing-x'                => 4,
+            'distribution-chart-high-values' => '95b8e0',
+            'distribution-chart-low-values'  => 'c8e7ff',
+        );
+
+        if (array_key_exists($parameter_name, $parameters)) {
+            return $parameters[$parameter_name];
+        } else {
+            return parent::parameter($parameter_name);
+        }
+    }
+
+    /**
+     * Create the primary menu.
+     *
+     * @param Menu[] $menus
+     *
+     * @return string
+     */
+    protected function primaryMenuContent(array $menus) {
+        $html = '';
+
+        foreach ($menus as $menu) {
+            // Create an inert menu - to use as a label
+            $tmp = new Menu($menu->getLabel(), '');
+
+            // Insert the label into the submenu
+            $submenus = $menu->getSubmenus();
+            array_unshift($submenus, $tmp);
+            $menu->setSubmenus($submenus);
+
+            $html .= $menu->getMenuAsList();
+        }
+
+        return $html;
+    }
+
+    /**
+     * A list of CSS files to include for this page.
+     *
+     * @return string[]
+     */
+    protected function stylesheets() {
+        return array(
+            'themes/clouds/jquery-ui-1.11.2/jquery-ui.css',
+            $this->assetUrl() . 'style.css',
+        );
+    }
+
+    /**
+     * A fixed string to identify this theme, in settings, etc.
+     *
+     * @return string
+     */
+    public function themeId() {
+        return 'clouds';
+    }
+
+    /**
+     * What is this theme called?
+     *
+     * @return string
+     */
+    public function themeName() {
+        return /* I18N: Name of a theme. */ I18N::translate('clouds');
+    }
 }

Switch Indentation +4 added lines, -4 removed lines

@@ -42,10 +42,10 @@
 	protected function flashMessageContainer(\stdClass $message) {
 		// This theme uses jQueryUI markup.
 		switch ($message->status) {
-		case 'danger':
-			return '<p class="ui-state-error">' . $message->text . '</p>';
-		default:
-			return '<p class="ui-state-highlight">' . $message->text . '</p>';
+		    case 'danger':
+			    return '<p class="ui-state-error">' . $message->text . '</p>';
+		    default:
+			    return '<p class="ui-state-highlight">' . $message->text . '</p>';
 		}
 	}
 

Braces +22 added lines, -11 removed lines

@@ -22,13 +22,15 @@ 
 /**
  * The clouds theme.
  */
-class CloudsTheme extends AbstractTheme implements ThemeInterface {
+class CloudsTheme extends AbstractTheme implements ThemeInterface
+{
 	/**
 	 * Where are our CSS, JS and other assets?
 	 *
 	 * @return string A relative path, such as "themes/foo/"
 	 */
-	public function assetUrl() {
+	public function assetUrl()
+	{
 		return 'themes/clouds/css-1.7.8/';
 	}
 
@@ -39,7 +41,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function flashMessageContainer(\stdClass $message) {
+	protected function flashMessageContainer(\stdClass $message)
+	{
 		// This theme uses jQueryUI markup.
 		switch ($message->status) {
 		case 'danger':
@@ -59,7 +62,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function formatBlock($id, $title, $class, $content) {
+	public function formatBlock($id, $title, $class, $content)
+	{
 		return
 			'<div id="' . $id . '" class="block" >' .
 			'<table class="blockheader"><tr><td class="blockh1"></td><td class="blockh2">' .
@@ -74,7 +78,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formQuickSearchFields() {
+	protected function formQuickSearchFields()
+	{
 		return
 			'<input type="search" name="query" size="15" placeholder="' . I18N::translate('Search') . '">' .
 			'<input class="search-icon" type="image" src="' . $this->assetUrl() . 'images/go.png" alt="' . I18N::translate('Search') . '" title="' . I18N::translate('Search') . '">';
@@ -85,7 +90,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function hookFooterExtraJavascript() {
+	public function hookFooterExtraJavascript()
+	{
 		return
 			'<script src="' . WT_JQUERY_COLORBOX_URL . '"></script>' .
 			'<script src="' . WT_JQUERY_WHEELZOOM_URL . '"></script>' .
@@ -109,7 +115,8 @@ 
 	 *
 	 * @return string|int|float
 	 */
-	public function parameter($parameter_name) {
+	public function parameter($parameter_name)
+	{
 		$parameters = array(
 			'chart-background-f'             => 'e9daf1',
 			'chart-background-m'             => 'b1cff0',
@@ -132,7 +139,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function primaryMenuContent(array $menus) {
+	protected function primaryMenuContent(array $menus)
+	{
 		$html = '';
 
 		foreach ($menus as $menu) {
@@ -155,7 +163,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	protected function stylesheets() {
+	protected function stylesheets()
+	{
 		return array(
 			'themes/clouds/jquery-ui-1.11.2/jquery-ui.css',
 			$this->assetUrl() . 'style.css',
@@ -167,7 +176,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function themeId() {
+	public function themeId()
+	{
 		return 'clouds';
 	}
 
@@ -176,7 +186,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function themeName() {
+	public function themeName()
+	{
 		return /* I18N: Name of a theme. */ I18N::translate('clouds');
 	}
 }

app/Theme/ColorsTheme.php

Indentation +156 added lines, -156 removed lines

@@ -26,173 +26,173 @@
  * The colors theme.
  */
 class ColorsTheme extends CloudsTheme implements ThemeInterface {
-	/** @var string[] A list of color palettes */
-	protected $palettes;
+    /** @var string[] A list of color palettes */
+    protected $palettes;
 
-	/** @var string Which of the color palettes to use on this page */
-	protected $palette;
+    /** @var string Which of the color palettes to use on this page */
+    protected $palette;
 
-	/**
-	 * Where are our CSS, JS and other assets?
-	 *
-	 * @return string A relative path, such as "themes/foo/"
-	 */
-	public function assetUrl() {
-		return 'themes/colors/css-1.7.8/';
-	}
+    /**
+     * Where are our CSS, JS and other assets?
+     *
+     * @return string A relative path, such as "themes/foo/"
+     */
+    public function assetUrl() {
+        return 'themes/colors/css-1.7.8/';
+    }
 
-	/**
-	 * Add markup to the secondary menu.
-	 *
-	 * @return string
-	 */
-	protected function formatSecondaryMenu() {
-		return
-			'<ul class="secondary-menu">' .
-			implode('', $this->secondaryMenu()) .
-			'<li>' .
-			$this->formQuickSearch() .
-			'</li>' .
-			'</ul>';
-	}
+    /**
+     * Add markup to the secondary menu.
+     *
+     * @return string
+     */
+    protected function formatSecondaryMenu() {
+        return
+            '<ul class="secondary-menu">' .
+            implode('', $this->secondaryMenu()) .
+            '<li>' .
+            $this->formQuickSearch() .
+            '</li>' .
+            '</ul>';
+    }
 
-	/**
-	 * Create the contents of the <header> tag.
-	 *
-	 * @return string
-	 */
-	protected function headerContent() {
-		return
-			//$this->accessibilityLinks() .
-			$this->formatTreeTitle() .
-			$this->formatSecondaryMenu();
-	}
+    /**
+     * Create the contents of the <header> tag.
+     *
+     * @return string
+     */
+    protected function headerContent() {
+        return
+            //$this->accessibilityLinks() .
+            $this->formatTreeTitle() .
+            $this->formatSecondaryMenu();
+    }
 
-	/**
-	 * Create resources for the colors theme.
-	 */
-	public function hookAfterInit() {
-		$this->palettes = array(
-			'aquamarine'       => /* I18N: The name of a colour-scheme */ I18N::translate('Aqua Marine'),
-			'ash'              => /* I18N: The name of a colour-scheme */ I18N::translate('Ash'),
-			'belgianchocolate' => /* I18N: The name of a colour-scheme */ I18N::translate('Belgian Chocolate'),
-			'bluelagoon'       => /* I18N: The name of a colour-scheme */ I18N::translate('Blue Lagoon'),
-			'bluemarine'       => /* I18N: The name of a colour-scheme */ I18N::translate('Blue Marine'),
-			'coffeeandcream'   => /* I18N: The name of a colour-scheme */ I18N::translate('Coffee and Cream'),
-			'coldday'          => /* I18N: The name of a colour-scheme */ I18N::translate('Cold Day'),
-			'greenbeam'        => /* I18N: The name of a colour-scheme */ I18N::translate('Green Beam'),
-			'mediterranio'     => /* I18N: The name of a colour-scheme */ I18N::translate('Mediterranio'),
-			'mercury'          => /* I18N: The name of a colour-scheme */ I18N::translate('Mercury'),
-			'nocturnal'        => /* I18N: The name of a colour-scheme */ I18N::translate('Nocturnal'),
-			'olivia'           => /* I18N: The name of a colour-scheme */ I18N::translate('Olivia'),
-			'pinkplastic'      => /* I18N: The name of a colour-scheme */ I18N::translate('Pink Plastic'),
-			'sage'             => /* I18N: The name of a colour-scheme */ I18N::translate('Sage'),
-			'shinytomato'      => /* I18N: The name of a colour-scheme */ I18N::translate('Shiny Tomato'),
-			'tealtop'          => /* I18N: The name of a colour-scheme */ I18N::translate('Teal Top'),
-		);
-		uasort($this->palettes, '\Fisharebest\Webtrees\I18N::strcasecmp');
+    /**
+     * Create resources for the colors theme.
+     */
+    public function hookAfterInit() {
+        $this->palettes = array(
+            'aquamarine'       => /* I18N: The name of a colour-scheme */ I18N::translate('Aqua Marine'),
+            'ash'              => /* I18N: The name of a colour-scheme */ I18N::translate('Ash'),
+            'belgianchocolate' => /* I18N: The name of a colour-scheme */ I18N::translate('Belgian Chocolate'),
+            'bluelagoon'       => /* I18N: The name of a colour-scheme */ I18N::translate('Blue Lagoon'),
+            'bluemarine'       => /* I18N: The name of a colour-scheme */ I18N::translate('Blue Marine'),
+            'coffeeandcream'   => /* I18N: The name of a colour-scheme */ I18N::translate('Coffee and Cream'),
+            'coldday'          => /* I18N: The name of a colour-scheme */ I18N::translate('Cold Day'),
+            'greenbeam'        => /* I18N: The name of a colour-scheme */ I18N::translate('Green Beam'),
+            'mediterranio'     => /* I18N: The name of a colour-scheme */ I18N::translate('Mediterranio'),
+            'mercury'          => /* I18N: The name of a colour-scheme */ I18N::translate('Mercury'),
+            'nocturnal'        => /* I18N: The name of a colour-scheme */ I18N::translate('Nocturnal'),
+            'olivia'           => /* I18N: The name of a colour-scheme */ I18N::translate('Olivia'),
+            'pinkplastic'      => /* I18N: The name of a colour-scheme */ I18N::translate('Pink Plastic'),
+            'sage'             => /* I18N: The name of a colour-scheme */ I18N::translate('Sage'),
+            'shinytomato'      => /* I18N: The name of a colour-scheme */ I18N::translate('Shiny Tomato'),
+            'tealtop'          => /* I18N: The name of a colour-scheme */ I18N::translate('Teal Top'),
+        );
+        uasort($this->palettes, '\Fisharebest\Webtrees\I18N::strcasecmp');
 
-		// If we've selected a new palette, and we are logged in, set this value as a default.
-		if (isset($_GET['themecolor']) && array_key_exists($_GET['themecolor'], $this->palettes)) {
-			// Request to change color
-			$this->palette = $_GET['themecolor'];
-			Auth::user()->setPreference('themecolor', $this->palette);
-			if (Auth::isAdmin()) {
-				Site::setPreference('DEFAULT_COLOR_PALETTE', $this->palette);
-			}
-			unset($_GET['themecolor']);
-			// Rember that we have selected a value
-			Session::put('subColor', $this->palette);
-		}
-		// If we are logged in, use our preference
-		$this->palette = Auth::user()->getPreference('themecolor');
-		// If not logged in or no preference, use one we selected earlier in the session?
-		if (!$this->palette) {
-			$this->palette = Session::get('subColor');
-		}
-		// We haven't selected one this session? Use the site default
-		if (!$this->palette) {
-			$this->palette = Site::getPreference('DEFAULT_COLOR_PALETTE');
-		}
-		// Make sure our selected palette actually exists
-		if (!array_key_exists($this->palette, $this->palettes)) {
-			$this->palette = 'ash';
-		}
-	}
+        // If we've selected a new palette, and we are logged in, set this value as a default.
+        if (isset($_GET['themecolor']) && array_key_exists($_GET['themecolor'], $this->palettes)) {
+            // Request to change color
+            $this->palette = $_GET['themecolor'];
+            Auth::user()->setPreference('themecolor', $this->palette);
+            if (Auth::isAdmin()) {
+                Site::setPreference('DEFAULT_COLOR_PALETTE', $this->palette);
+            }
+            unset($_GET['themecolor']);
+            // Rember that we have selected a value
+            Session::put('subColor', $this->palette);
+        }
+        // If we are logged in, use our preference
+        $this->palette = Auth::user()->getPreference('themecolor');
+        // If not logged in or no preference, use one we selected earlier in the session?
+        if (!$this->palette) {
+            $this->palette = Session::get('subColor');
+        }
+        // We haven't selected one this session? Use the site default
+        if (!$this->palette) {
+            $this->palette = Site::getPreference('DEFAULT_COLOR_PALETTE');
+        }
+        // Make sure our selected palette actually exists
+        if (!array_key_exists($this->palette, $this->palettes)) {
+            $this->palette = 'ash';
+        }
+    }
 
-	/**
-	 * Generate a list of items for the user menu.
-	 *
-	 * @return Menu[]
-	 */
-	protected function secondaryMenu() {
-		return array_filter(array(
-			$this->menuPendingChanges(),
-			$this->menuMyPages(),
-			$this->menuFavorites(),
-			$this->menuThemes(),
-			$this->menuPalette(),
-			$this->menuLanguages(),
-			$this->menuLogin(),
-			$this->menuLogout(),
-		));
-	}
+    /**
+     * Generate a list of items for the user menu.
+     *
+     * @return Menu[]
+     */
+    protected function secondaryMenu() {
+        return array_filter(array(
+            $this->menuPendingChanges(),
+            $this->menuMyPages(),
+            $this->menuFavorites(),
+            $this->menuThemes(),
+            $this->menuPalette(),
+            $this->menuLanguages(),
+            $this->menuLogin(),
+            $this->menuLogout(),
+        ));
+    }
 
-	/**
-	 * Create a menu of palette options
-	 *
-	 * @return Menu
-	 */
-	protected function menuPalette() {
-		if ($this->tree && Site::getPreference('ALLOW_USER_THEMES') && $this->tree->getPreference('ALLOW_THEME_DROPDOWN')) {
-			$menu = new Menu(/* I18N: A colour scheme */
-				I18N::translate('Palette'), '#', 'menu-color');
+    /**
+     * Create a menu of palette options
+     *
+     * @return Menu
+     */
+    protected function menuPalette() {
+        if ($this->tree && Site::getPreference('ALLOW_USER_THEMES') && $this->tree->getPreference('ALLOW_THEME_DROPDOWN')) {
+            $menu = new Menu(/* I18N: A colour scheme */
+                I18N::translate('Palette'), '#', 'menu-color');
 
-			foreach ($this->palettes as $palette_id => $palette_name) {
-				$menu->addSubmenu(new Menu(
-					$palette_name,
-					'#',
-					'menu-color-' . $palette_id . ($this->palette === $palette_id ? ' active' : ''),
-					array(
-						'onclick' => 'document.location=\'' . Functions::getQueryUrl(array('themecolor' => $palette_id), '&') . '\'',
-					)
-				));
-			}
+            foreach ($this->palettes as $palette_id => $palette_name) {
+                $menu->addSubmenu(new Menu(
+                    $palette_name,
+                    '#',
+                    'menu-color-' . $palette_id . ($this->palette === $palette_id ? ' active' : ''),
+                    array(
+                        'onclick' => 'document.location=\'' . Functions::getQueryUrl(array('themecolor' => $palette_id), '&') . '\'',
+                    )
+                ));
+            }
 
-			return $menu;
-		} else {
-			return null;
-		}
-	}
+            return $menu;
+        } else {
+            return null;
+        }
+    }
 
-	/**
-	 * A list of CSS files to include for this page.
-	 *
-	 * @return string[]
-	 */
-	protected function stylesheets() {
-		return array(
-			'themes/colors/jquery-ui-1.11.2/jquery-ui.css',
-			$this->assetUrl() . 'style.css',
-			$this->assetUrl() . 'palette/' . $this->palette . '.css',
-		);
-	}
+    /**
+     * A list of CSS files to include for this page.
+     *
+     * @return string[]
+     */
+    protected function stylesheets() {
+        return array(
+            'themes/colors/jquery-ui-1.11.2/jquery-ui.css',
+            $this->assetUrl() . 'style.css',
+            $this->assetUrl() . 'palette/' . $this->palette . '.css',
+        );
+    }
 
-	/**
-	 * A fixed string to identify this theme, in settings, etc.
-	 *
-	 * @return string
-	 */
-	public function themeId() {
-		return 'colors';
-	}
+    /**
+     * A fixed string to identify this theme, in settings, etc.
+     *
+     * @return string
+     */
+    public function themeId() {
+        return 'colors';
+    }
 
-	/**
-	 * What is this theme called?
-	 *
-	 * @return string
-	 */
-	public function themeName() {
-		return /* I18N: Name of a theme. */ I18N::translate('colors');
-	}
+    /**
+     * What is this theme called?
+     *
+     * @return string
+     */
+    public function themeName() {
+        return /* I18N: Name of a theme. */ I18N::translate('colors');
+    }
 }

Braces +20 added lines, -10 removed lines

@@ -25,7 +25,8 @@ 
 /**
  * The colors theme.
  */
-class ColorsTheme extends CloudsTheme implements ThemeInterface {
+class ColorsTheme extends CloudsTheme implements ThemeInterface
+{
 	/** @var string[] A list of color palettes */
 	protected $palettes;
 
@@ -37,7 +38,8 @@ 
 	 *
 	 * @return string A relative path, such as "themes/foo/"
 	 */
-	public function assetUrl() {
+	public function assetUrl()
+	{
 		return 'themes/colors/css-1.7.8/';
 	}
 
@@ -46,7 +48,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function formatSecondaryMenu() {
+	protected function formatSecondaryMenu()
+	{
 		return
 			'<ul class="secondary-menu">' .
 			implode('', $this->secondaryMenu()) .
@@ -61,7 +64,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function headerContent() {
+	protected function headerContent()
+	{
 		return
 			//$this->accessibilityLinks() .
 			$this->formatTreeTitle() .
@@ -71,7 +75,8 @@ 
 	/**
 	 * Create resources for the colors theme.
 	 */
-	public function hookAfterInit() {
+	public function hookAfterInit()
+	{
 		$this->palettes = array(
 			'aquamarine'       => /* I18N: The name of a colour-scheme */ I18N::translate('Aqua Marine'),
 			'ash'              => /* I18N: The name of a colour-scheme */ I18N::translate('Ash'),
@@ -125,7 +130,8 @@ 
 	 *
 	 * @return Menu[]
 	 */
-	protected function secondaryMenu() {
+	protected function secondaryMenu()
+	{
 		return array_filter(array(
 			$this->menuPendingChanges(),
 			$this->menuMyPages(),
@@ -143,7 +149,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	protected function menuPalette() {
+	protected function menuPalette()
+	{
 		if ($this->tree && Site::getPreference('ALLOW_USER_THEMES') && $this->tree->getPreference('ALLOW_THEME_DROPDOWN')) {
 			$menu = new Menu(/* I18N: A colour scheme */
 				I18N::translate('Palette'), '#', 'menu-color');
@@ -170,7 +177,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	protected function stylesheets() {
+	protected function stylesheets()
+	{
 		return array(
 			'themes/colors/jquery-ui-1.11.2/jquery-ui.css',
 			$this->assetUrl() . 'style.css',
@@ -183,7 +191,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function themeId() {
+	public function themeId()
+	{
 		return 'colors';
 	}
 
@@ -192,7 +201,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function themeName() {
+	public function themeName()
+	{
 		return /* I18N: Name of a theme. */ I18N::translate('colors');
 	}
 }