jon48 / webtrees-lib

src/Webtrees/Module/Sosa/Model/SosaProvider.php

Doc Comments +8 added lines, -8 removed lines

@@ -277,7 +277,7 @@ 
     /**
      * Get an associative array of Sosa individuals in generation G. Keys are Sosa numbers, values individuals.
      *
-     * @param number $gen Generation
+     * @param integer $gen Generation
      * @return array Array of Sosa individuals
      */
     public function getSosaListAtGeneration($gen){
@@ -308,7 +308,7 @@ 
     /**
      * Get an associative array of Sosa families in generation G. Keys are Sosa numbers for the husband, values families.
      *
-     * @param number $gen Generation
+     * @param integer $gen Generation
      * @return array Array of Sosa families
      */
     public function getFamilySosaListAtGeneration($gen){
@@ -344,7 +344,7 @@ 
     /**
      * Get an associative array of Sosa individuals in generation G who are missing parents. Keys are Sosa numbers, values individuals.
      *
-     * @param number $gen Generation
+     * @param integer $gen Generation
      * @return array Array of Sosa individuals
      */
     public function getMissingSosaListAtGeneration($gen){
@@ -439,8 +439,8 @@ 
     /**
      * Get the number of Sosa in a specific generation.
      *
-     * @param number $gen Generation
-     * @return number Number of Sosas in generation
+     * @param integer $gen Generation
+     * @return integer Number of Sosas in generation
      */
     public function getSosaCountAtGeneration($gen){
         if(!$this->is_setup) return 0;
@@ -458,7 +458,7 @@ 
     /**
      * Get the total number of Sosa up to a specific generation.
      *
-     * @param number $gen Generation
+     * @param integer $gen Generation
      * @return number Total number of Sosas up to generation
      */
     public function getSosaCountUpToGeneration($gen){
@@ -493,7 +493,7 @@ 
     /**
      * Get the number of distinct Sosa individual up to a specific generation.
      *
-     * @param number $gen Generation
+     * @param integer $gen Generation
      * @return number Number of distinct Sosa individuals up to generation
      */
     public function getDifferentSosaCountUpToGeneration($gen){
@@ -516,7 +516,7 @@ 
      *  - last : Last birth year in generation
      *  - avg : Average birth year
      *
-     * @param number $gen Generation
+     * @param integer $gen Generation
      * @return array Birth statistics array
      */
     public function getStatsBirthYearInGeneration($gen){

Indentation +560 added lines, -560 removed lines

@@ -22,389 +22,389 @@ 
  */
 class SosaProvider {
     
-    /**
-     * Maximum number of generation the database is able to hold.
-     * @var int MAX_DB_GENERATIONS
-     */
-    const MAX_DB_GENERATIONS = 64;
-    
-    /**
-     * System's default user (ID -1 in the database
-     * @var User $default_user
-     */
-    protected static $default_user;
-    
-    /**
-     * Reference user
-     * @var User $user
-     */
-    protected $user;
-    
-    /**
-     * Reference tree
-     * @var Tree $tree
-     */
-    protected $tree;
-    
-    /**
-     * Cached list of Sosa Individuals by generation
-     * Format: key = generation, value = array ( sosa => Individual ID)
-     * @var array $sosa_list_by_gen
-     */
-    protected $sosa_list_by_gen;
-    
-    /**
-     * Cached list of Sosa Families by generation
-     * Format: key = generation, value = array ( sosa => Family ID)
-     * @var unknown $sosa_fam_list_by_gen
-     */
-    protected $sosa_fam_list_by_gen;
-    
-    /**
-     * Cached array of statistics by generation
-     * Format:  key = generation, 
-     *          value = array(
-     *              sosaCount, sosaTotalCount, diffSosaTotalCount, firstBirth, lastBirth, avgBirth
-     *           )
-     * @var array $statistics_tab
-     */
-    protected $statistics_tab;
-    
-    /**
-     * Has the provider's initialisation completed
-     * @var bool $is_setup
-     */
-    protected $is_setup;
-    
-    /**
-     * Constructor for Sosa Provider.
-     * A provider is defined in relation to a specific tree and reference user.
-     * 
-     * @param Tree $tree
-     * @param User $user
-     */
-    public function __construct(Tree $tree, User $user = null) {
-        if(self::$default_user === null) 
-            self::$default_user = User::find(-1);
+	/**
+	 * Maximum number of generation the database is able to hold.
+	 * @var int MAX_DB_GENERATIONS
+	 */
+	const MAX_DB_GENERATIONS = 64;
+    
+	/**
+	 * System's default user (ID -1 in the database
+	 * @var User $default_user
+	 */
+	protected static $default_user;
+    
+	/**
+	 * Reference user
+	 * @var User $user
+	 */
+	protected $user;
+    
+	/**
+	 * Reference tree
+	 * @var Tree $tree
+	 */
+	protected $tree;
+    
+	/**
+	 * Cached list of Sosa Individuals by generation
+	 * Format: key = generation, value = array ( sosa => Individual ID)
+	 * @var array $sosa_list_by_gen
+	 */
+	protected $sosa_list_by_gen;
+    
+	/**
+	 * Cached list of Sosa Families by generation
+	 * Format: key = generation, value = array ( sosa => Family ID)
+	 * @var unknown $sosa_fam_list_by_gen
+	 */
+	protected $sosa_fam_list_by_gen;
+    
+	/**
+	 * Cached array of statistics by generation
+	 * Format:  key = generation, 
+	 *          value = array(
+	 *              sosaCount, sosaTotalCount, diffSosaTotalCount, firstBirth, lastBirth, avgBirth
+	 *           )
+	 * @var array $statistics_tab
+	 */
+	protected $statistics_tab;
+    
+	/**
+	 * Has the provider's initialisation completed
+	 * @var bool $is_setup
+	 */
+	protected $is_setup;
+    
+	/**
+	 * Constructor for Sosa Provider.
+	 * A provider is defined in relation to a specific tree and reference user.
+	 * 
+	 * @param Tree $tree
+	 * @param User $user
+	 */
+	public function __construct(Tree $tree, User $user = null) {
+		if(self::$default_user === null) 
+			self::$default_user = User::find(-1);
         
-        $this->tree = $tree;
-        $this->user = $user;
-        $this->is_setup = true;
-        if($this->user === null) $this->user = Auth::user();
-        if(strlen($this->user->getUserId()) == 0) $this->user = self::$default_user;
+		$this->tree = $tree;
+		$this->user = $user;
+		$this->is_setup = true;
+		if($this->user === null) $this->user = Auth::user();
+		if(strlen($this->user->getUserId()) == 0) $this->user = self::$default_user;
         
-        // Check if the user, or the default user, has a root already setup;
-        if(empty($this->getRootIndiId())) {
-            if($this->user == self::$default_user) {  // If the default user is not setup
-                $this->is_setup = false;
-            }
-            else {
-                $this->user = self::$default_user;
-                $this->is_setup = $this->getRootIndiId() === null;
-            }            
-        }
-    }
-    
-    /**
-     * Returns is the Provider has been successfully set up
-     * @return bool
-     */
-    public function isSetup() {
-        return $this->is_setup;
-    }
-    
-    /**
-     * Return the root individual ID for the reference tree and user.
-     * @return string Individual ID
-     */
-    public function getRootIndiId() {
-        return $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');
-    }
-    
-    /**
-     * Return the root individual for the reference tree and user.
-     * @return Individual Individual
-     */
-    public function getRootIndi() {
-        $root_indi_id = $this->getRootIndiId();
-        if(!empty($root_indi_id)) {
-            return Individual::getInstance($root_indi_id, $this->tree);
-        }
-        return null;
-    }
+		// Check if the user, or the default user, has a root already setup;
+		if(empty($this->getRootIndiId())) {
+			if($this->user == self::$default_user) {  // If the default user is not setup
+				$this->is_setup = false;
+			}
+			else {
+				$this->user = self::$default_user;
+				$this->is_setup = $this->getRootIndiId() === null;
+			}            
+		}
+	}
+    
+	/**
+	 * Returns is the Provider has been successfully set up
+	 * @return bool
+	 */
+	public function isSetup() {
+		return $this->is_setup;
+	}
+    
+	/**
+	 * Return the root individual ID for the reference tree and user.
+	 * @return string Individual ID
+	 */
+	public function getRootIndiId() {
+		return $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');
+	}
+    
+	/**
+	 * Return the root individual for the reference tree and user.
+	 * @return Individual Individual
+	 */
+	public function getRootIndi() {
+		$root_indi_id = $this->getRootIndiId();
+		if(!empty($root_indi_id)) {
+			return Individual::getInstance($root_indi_id, $this->tree);
+		}
+		return null;
+	}
        
-    /*****************
+	/*****************
      * DATA CRUD LAYER
      *****************/
     
-    /**
-     * Remove all Sosa entries related to the gedcom file and user
-     */
-    public function deleteAll() {
-        if(!$this->is_setup) return;
-        Database::prepare(
-            'DELETE FROM `##maj_sosa`'.
-            ' WHERE majs_gedcom_id= :tree_id and majs_user_id = :user_id ')
-            ->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId()                
-            ));
-    }
-    
-    /**
-     * Remove all ancestors of a sosa number
-     * 
-     * @param int $sosa
-     */
-    public function deleteAncestors($sosa) {
-        if(!$this->is_setup) return;
-        $gen = Functions::getGeneration($sosa);
-        Database::prepare(
-            'DELETE FROM `##maj_sosa`'.
-            ' WHERE majs_gedcom_id=:tree_id and majs_user_id = :user_id' .
-            ' AND majs_gen >= :gen' .
-            ' AND FLOOR(majs_sosa / (POW(2, (majs_gen - :gen)))) = :sosa'
-        )->execute(array(
-            'tree_id' => $this->tree->getTreeId(), 
-            'user_id' => $this->user->getUserId(),
-            'gen' => $gen,
-            'sosa' => $sosa
-        ));
-    }    
-    
-    /**
-     * Insert (or update if already existing) a list of Sosa individuals
-     * @param array $sosa_records
-     */
-    public function insertOrUpdate($sosa_records) {
-        if(!$this->is_setup) return;
+	/**
+	 * Remove all Sosa entries related to the gedcom file and user
+	 */
+	public function deleteAll() {
+		if(!$this->is_setup) return;
+		Database::prepare(
+			'DELETE FROM `##maj_sosa`'.
+			' WHERE majs_gedcom_id= :tree_id and majs_user_id = :user_id ')
+			->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId()                
+			));
+	}
+    
+	/**
+	 * Remove all ancestors of a sosa number
+	 * 
+	 * @param int $sosa
+	 */
+	public function deleteAncestors($sosa) {
+		if(!$this->is_setup) return;
+		$gen = Functions::getGeneration($sosa);
+		Database::prepare(
+			'DELETE FROM `##maj_sosa`'.
+			' WHERE majs_gedcom_id=:tree_id and majs_user_id = :user_id' .
+			' AND majs_gen >= :gen' .
+			' AND FLOOR(majs_sosa / (POW(2, (majs_gen - :gen)))) = :sosa'
+		)->execute(array(
+			'tree_id' => $this->tree->getTreeId(), 
+			'user_id' => $this->user->getUserId(),
+			'gen' => $gen,
+			'sosa' => $sosa
+		));
+	}    
+    
+	/**
+	 * Insert (or update if already existing) a list of Sosa individuals
+	 * @param array $sosa_records
+	 */
+	public function insertOrUpdate($sosa_records) {
+		if(!$this->is_setup) return;
         
-        $treeid = $this->tree->getTreeId();
-        $userid = $this->user->getUserId();
-        $questionmarks_table = array();
-        $values_table = array();
+		$treeid = $this->tree->getTreeId();
+		$userid = $this->user->getUserId();
+		$questionmarks_table = array();
+		$values_table = array();
         
-        $i = 0;
-        foreach  ($sosa_records as $row) {
-            $gen = Functions::getGeneration($row['sosa']);
-            if($gen <= self::MAX_DB_GENERATIONS) {
-                $questionmarks_table[] = 
-                    '(:tree_id'.$i.', :user_id'.$i.', :sosa'.$i.', :indi_id'.$i.', :gen'.$i.', :byear'.$i.', :dyear'.$i.')';
-                $values_table = array_merge(
-                    $values_table, 
-                    array(
-                        'tree_id'.$i => $treeid, 
-                        'user_id'.$i => $userid, 
-                        'sosa'.$i => $row['sosa'], 
-                        'indi_id'.$i => $row['indi'], 
-                        'gen'.$i => Functions::getGeneration($row['sosa']),
-                        'byear'.$i => $row['birth_year'],
-                        'dyear'.$i => $row['death_year']
-                    )
-                );
-            }
-            $i++;
-        }
+		$i = 0;
+		foreach  ($sosa_records as $row) {
+			$gen = Functions::getGeneration($row['sosa']);
+			if($gen <= self::MAX_DB_GENERATIONS) {
+				$questionmarks_table[] = 
+					'(:tree_id'.$i.', :user_id'.$i.', :sosa'.$i.', :indi_id'.$i.', :gen'.$i.', :byear'.$i.', :dyear'.$i.')';
+				$values_table = array_merge(
+					$values_table, 
+					array(
+						'tree_id'.$i => $treeid, 
+						'user_id'.$i => $userid, 
+						'sosa'.$i => $row['sosa'], 
+						'indi_id'.$i => $row['indi'], 
+						'gen'.$i => Functions::getGeneration($row['sosa']),
+						'byear'.$i => $row['birth_year'],
+						'dyear'.$i => $row['death_year']
+					)
+				);
+			}
+			$i++;
+		}
         
-        $sql = 'REPLACE INTO `##maj_sosa`' .
-            ' (majs_gedcom_id, majs_user_id, majs_sosa, majs_i_id, majs_gen, majs_birth_year, majs_death_year)' .
-            ' VALUES '. implode(',', $questionmarks_table);
-        Database::prepare($sql)->execute($values_table);
-    }
+		$sql = 'REPLACE INTO `##maj_sosa`' .
+			' (majs_gedcom_id, majs_user_id, majs_sosa, majs_i_id, majs_gen, majs_birth_year, majs_death_year)' .
+			' VALUES '. implode(',', $questionmarks_table);
+		Database::prepare($sql)->execute($values_table);
+	}
     
-    /****************
+	/****************
      * SIMPLE QUERIES
      ****************/
     
-    /**
-     * Returns the list of Sosa numbers to which an individual is related.
-     * Format: key = sosa number, value = generation for the Sosa number
-     * 
-     * @param Individual $indi
-     * @return array Array of sosa numbers
-     */
-    public function getSosaNumbers(Individual $indi) {
-        if(!$this->is_setup) return array();
-        return Database::prepare(
-                'SELECT majs_sosa, majs_gen FROM `##maj_sosa`'.
-                ' WHERE majs_i_id=:indi_id AND majs_gedcom_id=:tree_id AND majs_user_id=:user_id'
-            )->execute(array(
-                'indi_id' => $indi->getXref(), 
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId()
-            ))->fetchAssoc();
-    }
-    
-    /**
-     * Get the last generation of Sosa ancestors
-     *
-     * @return number Last generation if found, 1 otherwise
-     */
-    public function getLastGeneration() {
-        if(!$this->is_setup) return;
-        return Database::prepare(
-                'SELECT MAX(majs_gen) FROM `##maj_sosa`'.
-                ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'
-            )->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId()                
-            ))->fetchOne() ?: 1;
-    }
-    
-    /*************
+	/**
+	 * Returns the list of Sosa numbers to which an individual is related.
+	 * Format: key = sosa number, value = generation for the Sosa number
+	 * 
+	 * @param Individual $indi
+	 * @return array Array of sosa numbers
+	 */
+	public function getSosaNumbers(Individual $indi) {
+		if(!$this->is_setup) return array();
+		return Database::prepare(
+				'SELECT majs_sosa, majs_gen FROM `##maj_sosa`'.
+				' WHERE majs_i_id=:indi_id AND majs_gedcom_id=:tree_id AND majs_user_id=:user_id'
+			)->execute(array(
+				'indi_id' => $indi->getXref(), 
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId()
+			))->fetchAssoc();
+	}
+    
+	/**
+	 * Get the last generation of Sosa ancestors
+	 *
+	 * @return number Last generation if found, 1 otherwise
+	 */
+	public function getLastGeneration() {
+		if(!$this->is_setup) return;
+		return Database::prepare(
+				'SELECT MAX(majs_gen) FROM `##maj_sosa`'.
+				' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'
+			)->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId()                
+			))->fetchOne() ?: 1;
+	}
+    
+	/*************
      * SOSA LISTS
      *************/
     
-    /**
-     * Return the list of all sosas, with the generations it belongs to
-     *
-     * @return array Associative array of Sosa ancestors, with their generation, comma separated
-     */
-    public function getAllSosaWithGenerations(){
-        if(!$this->is_setup) return array();
-        return Database::prepare(
-            'SELECT majs_i_id AS indi,' .
-            ' GROUP_CONCAT(DISTINCT majs_gen ORDER BY majs_gen ASC SEPARATOR ",") AS generations' .
-            ' FROM `##maj_sosa`' .
-            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id' .
-            ' GROUP BY majs_i_id'
-        )->execute(array(
-            'tree_id' => $this->tree->getTreeId(),
-            'user_id' => $this->user->getUserId()
-        ))->fetchAssoc();
-    }
-    
-    /**
-     * Get an associative array of Sosa individuals in generation G. Keys are Sosa numbers, values individuals.
-     *
-     * @param number $gen Generation
-     * @return array Array of Sosa individuals
-     */
-    public function getSosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();
-        if(!$this->sosa_list_by_gen)
-            $this->sosa_list_by_gen = array();
+	/**
+	 * Return the list of all sosas, with the generations it belongs to
+	 *
+	 * @return array Associative array of Sosa ancestors, with their generation, comma separated
+	 */
+	public function getAllSosaWithGenerations(){
+		if(!$this->is_setup) return array();
+		return Database::prepare(
+			'SELECT majs_i_id AS indi,' .
+			' GROUP_CONCAT(DISTINCT majs_gen ORDER BY majs_gen ASC SEPARATOR ",") AS generations' .
+			' FROM `##maj_sosa`' .
+			' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id' .
+			' GROUP BY majs_i_id'
+		)->execute(array(
+			'tree_id' => $this->tree->getTreeId(),
+			'user_id' => $this->user->getUserId()
+		))->fetchAssoc();
+	}
+    
+	/**
+	 * Get an associative array of Sosa individuals in generation G. Keys are Sosa numbers, values individuals.
+	 *
+	 * @param number $gen Generation
+	 * @return array Array of Sosa individuals
+	 */
+	public function getSosaListAtGeneration($gen){
+		if(!$this->is_setup) return array();
+		if(!$this->sosa_list_by_gen)
+			$this->sosa_list_by_gen = array();
         
-        if($gen){
-            if(!isset($this->sosa_list_by_gen[$gen])){
-                $this->sosa_list_by_gen[$gen] = Database::prepare(
-                    'SELECT majs_sosa AS sosa, majs_i_id AS indi'.
-                    ' FROM `##maj_sosa`'.
-                    ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
-                    ' AND majs_gen = :gen'.
-                    ' ORDER BY majs_sosa ASC')
-                ->execute(array(
-                    'tree_id' => $this->tree->getTreeId(),
-                    'user_id' => $this->user->getUserId(),
-                    'gen' => $gen
-                ))
-                ->fetchAssoc();
-            }
-            return $this->sosa_list_by_gen[$gen];
-        }
-        return array();
-    }
-    
-    /**
-     * Get an associative array of Sosa families in generation G. Keys are Sosa numbers for the husband, values families.
-     *
-     * @param number $gen Generation
-     * @return array Array of Sosa families
-     */
-    public function getFamilySosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();
-        if(!$this->sosa_fam_list_by_gen)
-            $this->sosa_fam_list_by_gen = array();
+		if($gen){
+			if(!isset($this->sosa_list_by_gen[$gen])){
+				$this->sosa_list_by_gen[$gen] = Database::prepare(
+					'SELECT majs_sosa AS sosa, majs_i_id AS indi'.
+					' FROM `##maj_sosa`'.
+					' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
+					' AND majs_gen = :gen'.
+					' ORDER BY majs_sosa ASC')
+				->execute(array(
+					'tree_id' => $this->tree->getTreeId(),
+					'user_id' => $this->user->getUserId(),
+					'gen' => $gen
+				))
+				->fetchAssoc();
+			}
+			return $this->sosa_list_by_gen[$gen];
+		}
+		return array();
+	}
+    
+	/**
+	 * Get an associative array of Sosa families in generation G. Keys are Sosa numbers for the husband, values families.
+	 *
+	 * @param number $gen Generation
+	 * @return array Array of Sosa families
+	 */
+	public function getFamilySosaListAtGeneration($gen){
+		if(!$this->is_setup) return array();
+		if(!$this->sosa_fam_list_by_gen)
+			$this->sosa_fam_list_by_gen = array();
         
-        if($gen){
-            if(!isset($this->sosa_fam_list_by_gen[$gen])){
-                $this->sosa_fam_list_by_gen[$gen] = Database::prepare(
-                    'SELECT s1.majs_sosa AS sosa, f_id AS fam'.
-                    ' FROM `##families`'.
-                    ' INNER JOIN `##maj_sosa` AS s1 ON (`##families`.f_husb = s1.majs_i_id AND `##families`.f_file = s1.majs_gedcom_id)'.
-                    ' INNER JOIN `##maj_sosa` AS s2 ON (`##families`.f_wife = s2.majs_i_id AND `##families`.f_file = s2.majs_gedcom_id)'.
-                    ' WHERE s1.majs_sosa + 1 = s2.majs_sosa'.
-                    ' AND s1.majs_gedcom_id= :tree_id AND s1.majs_user_id=:user_id'.
-                    ' AND s2.majs_gedcom_id= :tree_id AND s2.majs_user_id=:user_id'.
-                    ' AND s1.majs_gen = :gen'.
-                    ' ORDER BY s1.majs_sosa ASC'
-                    )
-                    ->execute(array(
-                        'tree_id' => $this->tree->getTreeId(),
-                        'user_id' => $this->user->getUserId(),
-                        'gen' => $gen
-                    ))
-                    ->fetchAssoc();
-            }
-            return $this->sosa_fam_list_by_gen[$gen];
-        }
-        return array();
-    }
-    
-    /**
-     * Get an associative array of Sosa individuals in generation G who are missing parents. Keys are Sosa numbers, values individuals.
-     *
-     * @param number $gen Generation
-     * @return array Array of Sosa individuals
-     */
-    public function getMissingSosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();    
-        if($gen){
-            return $this->sosa_list_by_gen[$gen] = Database::prepare(
-                'SELECT schild.majs_sosa sosa, schild.majs_i_id indi, sfat.majs_sosa IS NOT NULL has_father, smot.majs_sosa IS NOT NULL has_mother'.
-                ' FROM `##maj_sosa` schild'.
-                ' LEFT JOIN `##maj_sosa` sfat ON ((schild.majs_sosa * 2) = sfat.majs_sosa AND schild.majs_gedcom_id = sfat.majs_gedcom_id AND schild.majs_user_id = sfat.majs_user_id)'.
-                ' LEFT JOIN `##maj_sosa` smot ON ((schild.majs_sosa * 2 + 1) = smot.majs_sosa AND schild.majs_gedcom_id = smot.majs_gedcom_id AND schild.majs_user_id = smot.majs_user_id)'.
-                ' WHERE schild.majs_gedcom_id = :tree_id AND schild.majs_user_id = :user_id'.
-                ' AND schild.majs_gen = :gen'.
-                ' AND (sfat.majs_sosa IS NULL OR smot.majs_sosa IS NULL)'.
-                ' ORDER BY schild.majs_sosa ASC')
-                ->execute(array(
-                    'tree_id' => $this->tree->getTreeId(),
-                    'user_id' => $this->user->getUserId(),
-                    'gen' => $gen - 1
-                ))->fetchAll(\PDO::FETCH_ASSOC);
-        }
-        return array();
-    }
-    
-    
-    
-    /*************
+		if($gen){
+			if(!isset($this->sosa_fam_list_by_gen[$gen])){
+				$this->sosa_fam_list_by_gen[$gen] = Database::prepare(
+					'SELECT s1.majs_sosa AS sosa, f_id AS fam'.
+					' FROM `##families`'.
+					' INNER JOIN `##maj_sosa` AS s1 ON (`##families`.f_husb = s1.majs_i_id AND `##families`.f_file = s1.majs_gedcom_id)'.
+					' INNER JOIN `##maj_sosa` AS s2 ON (`##families`.f_wife = s2.majs_i_id AND `##families`.f_file = s2.majs_gedcom_id)'.
+					' WHERE s1.majs_sosa + 1 = s2.majs_sosa'.
+					' AND s1.majs_gedcom_id= :tree_id AND s1.majs_user_id=:user_id'.
+					' AND s2.majs_gedcom_id= :tree_id AND s2.majs_user_id=:user_id'.
+					' AND s1.majs_gen = :gen'.
+					' ORDER BY s1.majs_sosa ASC'
+					)
+					->execute(array(
+						'tree_id' => $this->tree->getTreeId(),
+						'user_id' => $this->user->getUserId(),
+						'gen' => $gen
+					))
+					->fetchAssoc();
+			}
+			return $this->sosa_fam_list_by_gen[$gen];
+		}
+		return array();
+	}
+    
+	/**
+	 * Get an associative array of Sosa individuals in generation G who are missing parents. Keys are Sosa numbers, values individuals.
+	 *
+	 * @param number $gen Generation
+	 * @return array Array of Sosa individuals
+	 */
+	public function getMissingSosaListAtGeneration($gen){
+		if(!$this->is_setup) return array();    
+		if($gen){
+			return $this->sosa_list_by_gen[$gen] = Database::prepare(
+				'SELECT schild.majs_sosa sosa, schild.majs_i_id indi, sfat.majs_sosa IS NOT NULL has_father, smot.majs_sosa IS NOT NULL has_mother'.
+				' FROM `##maj_sosa` schild'.
+				' LEFT JOIN `##maj_sosa` sfat ON ((schild.majs_sosa * 2) = sfat.majs_sosa AND schild.majs_gedcom_id = sfat.majs_gedcom_id AND schild.majs_user_id = sfat.majs_user_id)'.
+				' LEFT JOIN `##maj_sosa` smot ON ((schild.majs_sosa * 2 + 1) = smot.majs_sosa AND schild.majs_gedcom_id = smot.majs_gedcom_id AND schild.majs_user_id = smot.majs_user_id)'.
+				' WHERE schild.majs_gedcom_id = :tree_id AND schild.majs_user_id = :user_id'.
+				' AND schild.majs_gen = :gen'.
+				' AND (sfat.majs_sosa IS NULL OR smot.majs_sosa IS NULL)'.
+				' ORDER BY schild.majs_sosa ASC')
+				->execute(array(
+					'tree_id' => $this->tree->getTreeId(),
+					'user_id' => $this->user->getUserId(),
+					'gen' => $gen - 1
+				))->fetchAll(\PDO::FETCH_ASSOC);
+		}
+		return array();
+	}
+    
+    
+    
+	/*************
      * STATISTICS
      *************/
-    /**
-     * Get the statistic array detailed by generation.
-     * Statistics for each generation are:
-     * 	- The number of Sosa in generation
-     * 	- The number of Sosa up to generation
-     *  - The number of distinct Sosa up to generation
-     *  - The year of the first birth in generation
-     *  - The year of the last birth in generation
-     *  - The average year of birth in generation
-     *
-     * @return array Statistics array
-     */
-    public function getStatisticsByGeneration() {
-        if(!$this->is_setup) return array();
-        if(!$this->statistics_tab) {
-            $this->statistics_tab = array();
-            if($maxGeneration = $this->getLastGeneration()) {
-                for ($gen = 1; $gen <= $maxGeneration; $gen++) {
-                    $birthStats = $this->getStatsBirthYearInGeneration($gen);
-                    $this->statistics_tab[$gen] = array(
-                        'sosaCount'				=>	$this->getSosaCountAtGeneration($gen),
-                        'sosaTotalCount'		=>	$this->getSosaCountUpToGeneration($gen),
-                        'diffSosaTotalCount'	=>	$this->getDifferentSosaCountUpToGeneration($gen),
-                        'firstBirth'			=>	$birthStats['first'],
-                        'lastBirth'				=>	$birthStats['last'],
-                        'avgBirth'				=>	$birthStats['avg']
-                    );
-                }
-            }
-        }
-        return $this->statistics_tab;        
-    }
+	/**
+	 * Get the statistic array detailed by generation.
+	 * Statistics for each generation are:
+	 * 	- The number of Sosa in generation
+	 * 	- The number of Sosa up to generation
+	 *  - The number of distinct Sosa up to generation
+	 *  - The year of the first birth in generation
+	 *  - The year of the last birth in generation
+	 *  - The average year of birth in generation
+	 *
+	 * @return array Statistics array
+	 */
+	public function getStatisticsByGeneration() {
+		if(!$this->is_setup) return array();
+		if(!$this->statistics_tab) {
+			$this->statistics_tab = array();
+			if($maxGeneration = $this->getLastGeneration()) {
+				for ($gen = 1; $gen <= $maxGeneration; $gen++) {
+					$birthStats = $this->getStatsBirthYearInGeneration($gen);
+					$this->statistics_tab[$gen] = array(
+						'sosaCount'				=>	$this->getSosaCountAtGeneration($gen),
+						'sosaTotalCount'		=>	$this->getSosaCountUpToGeneration($gen),
+						'diffSosaTotalCount'	=>	$this->getDifferentSosaCountUpToGeneration($gen),
+						'firstBirth'			=>	$birthStats['first'],
+						'lastBirth'				=>	$birthStats['last'],
+						'avgBirth'				=>	$birthStats['avg']
+					);
+				}
+			}
+		}
+		return $this->statistics_tab;        
+	}
     
 	/**
 	 * How many individuals exist in the tree.
@@ -412,205 +412,205 @@ 
 	 * @return int
 	 */
 	public function getTotalIndividuals() {
-	    if(!$this->is_setup) return 0;
-	    return Database::prepare(
-	        'SELECT SQL_CACHE COUNT(*) FROM `##individuals`' .
-	        ' WHERE i_file = :tree_id')
-	        ->execute(array('tree_id' => $this->tree->getTreeId()))
-	        ->fetchOne() ?: 0;
+		if(!$this->is_setup) return 0;
+		return Database::prepare(
+			'SELECT SQL_CACHE COUNT(*) FROM `##individuals`' .
+			' WHERE i_file = :tree_id')
+			->execute(array('tree_id' => $this->tree->getTreeId()))
+			->fetchOne() ?: 0;
 	}
     
-    /**
-     * Get the total Sosa count for all generations
-     *
-     * @return number Number of Sosas
-     */
-    public function getSosaCount(){
-        if(!$this->is_setup) return 0;
-        return Database::prepare(
-            'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`' .
-            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id')
-            ->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId() 
-            ))->fetchOne() ?: 0;
-    }
-    
-    /**
-     * Get the number of Sosa in a specific generation.
-     *
-     * @param number $gen Generation
-     * @return number Number of Sosas in generation
-     */
-    public function getSosaCountAtGeneration($gen){
-        if(!$this->is_setup) return 0;
-        return Database::prepare(
-            'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`' .
-            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
-            ' AND majs_gen= :gen')
-        ->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId(),
-                'gen' => $gen            
-        ))->fetchOne() ?: 0;
-    }
-    
-    /**
-     * Get the total number of Sosa up to a specific generation.
-     *
-     * @param number $gen Generation
-     * @return number Total number of Sosas up to generation
-     */
-    public function getSosaCountUpToGeneration($gen){
-        if(!$this->is_setup) return 0;
-        return Database::prepare(
-            'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`' .
-            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
-            ' AND majs_gen <= :gen')
-        ->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId(),
-                'gen' => $gen 
-        ))->fetchOne() ?: 0;
-    }
-    
-    /**
-     * Get the total number of distinct Sosa individual for all generations.
-     *
-     * @return number Total number of distinct individual
-     */
-    public function getDifferentSosaCount(){
-        if(!$this->is_setup) return 0;
-        return Database::prepare(
-            'SELECT SQL_CACHE COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
-            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id')
-        ->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId()
-        ))->fetchOne() ?: 0;
-    }
-    
-    /**
-     * Get the number of distinct Sosa individual up to a specific generation.
-     *
-     * @param number $gen Generation
-     * @return number Number of distinct Sosa individuals up to generation
-     */
-    public function getDifferentSosaCountUpToGeneration($gen){
-        if(!$this->is_setup) return 0;
-        return Database::prepare(
-            'SELECT SQL_CACHE COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
-            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
-            ' AND majs_gen <= :gen')
-        ->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId(),
-                'gen' => $gen 
-        ))->fetchOne() ?: 0;
-    }
-    
-    /**
-     * Get an array of birth statistics for a specific generation
-     * Statistics are :
-     * 	- first : First birth year in generation
-     *  - last : Last birth year in generation
-     *  - avg : Average birth year
-     *
-     * @param number $gen Generation
-     * @return array Birth statistics array
-     */
-    public function getStatsBirthYearInGeneration($gen){
-        if(!$this->is_setup) return array('first' => 0, 'avg' => 0, 'last' => 0);
-        return Database::prepare(
-            'SELECT MIN(majs_birth_year) AS first, AVG(majs_birth_year) AS avg, MAX(majs_birth_year) AS last'.
-            ' FROM `##maj_sosa`' .
-            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
-            ' AND majs_gen=:gen AND NOT majs_birth_year = :birth_year')
-            ->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId(),
-                'gen' => $gen,
-                'birth_year' => 0))
-            ->fetchOneRow(\PDO::FETCH_ASSOC) ?: array('first' => 0, 'avg' => 0, 'last' => 0);
-    }
-    
-    /**
-     * Get the mean generation time, based on a linear regression of birth years and generations
-     *
-     * @return number|NULL Mean generation time
-     */
-    public function getMeanGenerationTime(){
-        if(!$this->is_setup) return;
-        if(!$this->statistics_tab){
-            $this->getStatisticsByGeneration();
-        }
-        //Linear regression on x=generation and y=birthdate
-        $sum_xy = 0;
-        $sum_x=0;
-        $sum_y=0;
-        $sum_x2=0;
-        $n=count($this->statistics_tab);
-        foreach($this->statistics_tab as $gen=>$stats){
-            $sum_xy+=$gen*$stats['avgBirth'];
-            $sum_x+=$gen;
-            $sum_y+=$stats['avgBirth'];
-            $sum_x2+=$gen*$gen;
-        }
-        $denom=($n*$sum_x2)-($sum_x*$sum_x);
-        if($denom!=0){
-            return -(($n*$sum_xy)-($sum_x*$sum_y))/($denom);
-        }
-        return null;
-    }
-    
-    /**
-     * Return a computed array of statistics about the dispersion of ancestors across the ancestors
-     * at a specified generation.
-     * This statistics cannot be used for generations above 11, as it would cause a out of range in MySQL
-     * 
-     * Format: 
-     *  - key : a base-2 representation of the ancestor at generation G for which exclusive ancestors have been found,
-     *          -1 is used for shared ancestors
-     *          For instance base2(0100) = base10(4) represent the maternal grand father
-     *  - values: number of ancestors exclusively in the ancestors of the ancestor in key
-     *  
-     *  For instance a result at generation 3 could be :
-     *      array (   -1        =>  12      -> 12 ancestors are shared by the grand-parents
-     *                base10(1) =>  32      -> 32 ancestors are exclusive to the paternal grand-father
-     *                base10(2) =>  25      -> 25 ancestors are exclusive to the paternal grand-mother
-     *                base10(4) =>  12      -> 12 ancestors are exclusive to the maternal grand-father
-     *                base10(8) =>  30      -> 30 ancestors are exclusive to the maternal grand-mother
-     *            )
-     *  
-     * @param int $gen Reference generation
-     * @return array
-     */
-    public function getAncestorDispersionForGen($gen) {
-        if(!$this->is_setup || $gen > 11) return array();  // Going further than 11 gen will be out of range in the query
-        return Database::prepare(
-            'SELECT branches, count(i_id)'.
-            ' FROM ('.
-            '   SELECT i_id,'.
-            '       CASE'.
-            '           WHEN CEIL(LOG2(SUM(branch))) = LOG2(SUM(branch)) THEN SUM(branch)'.
-            '           ELSE -1'.   // We put all ancestors shared between some branches in the same bucket
-            '       END branches'.
-            '   FROM ('.
-            '       SELECT DISTINCT majs_i_id i_id,'.
-            '           POW(2, FLOOR(majs_sosa / POW(2, (majs_gen - :gen))) - POW(2, :gen -1)) branch'.
-            '       FROM `##maj_sosa`'.
-            '       WHERE majs_gedcom_id = :tree_id AND majs_user_id = :user_id'.
-            '           AND majs_gen >= :gen'.
-            '   ) indistat'.
-            '   GROUP BY i_id'.
-            ') grouped'.
-            ' GROUP BY branches')
-            ->execute(array(
-                'tree_id' => $this->tree->getTreeId(), 
-                'user_id' => $this->user->getUserId(),
-                'gen' => $gen
-            ))->fetchAssoc() ?: array();
-    }
+	/**
+	 * Get the total Sosa count for all generations
+	 *
+	 * @return number Number of Sosas
+	 */
+	public function getSosaCount(){
+		if(!$this->is_setup) return 0;
+		return Database::prepare(
+			'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`' .
+			' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id')
+			->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId() 
+			))->fetchOne() ?: 0;
+	}
+    
+	/**
+	 * Get the number of Sosa in a specific generation.
+	 *
+	 * @param number $gen Generation
+	 * @return number Number of Sosas in generation
+	 */
+	public function getSosaCountAtGeneration($gen){
+		if(!$this->is_setup) return 0;
+		return Database::prepare(
+			'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`' .
+			' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
+			' AND majs_gen= :gen')
+		->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId(),
+				'gen' => $gen            
+		))->fetchOne() ?: 0;
+	}
+    
+	/**
+	 * Get the total number of Sosa up to a specific generation.
+	 *
+	 * @param number $gen Generation
+	 * @return number Total number of Sosas up to generation
+	 */
+	public function getSosaCountUpToGeneration($gen){
+		if(!$this->is_setup) return 0;
+		return Database::prepare(
+			'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`' .
+			' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
+			' AND majs_gen <= :gen')
+		->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId(),
+				'gen' => $gen 
+		))->fetchOne() ?: 0;
+	}
+    
+	/**
+	 * Get the total number of distinct Sosa individual for all generations.
+	 *
+	 * @return number Total number of distinct individual
+	 */
+	public function getDifferentSosaCount(){
+		if(!$this->is_setup) return 0;
+		return Database::prepare(
+			'SELECT SQL_CACHE COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
+			' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id')
+		->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId()
+		))->fetchOne() ?: 0;
+	}
+    
+	/**
+	 * Get the number of distinct Sosa individual up to a specific generation.
+	 *
+	 * @param number $gen Generation
+	 * @return number Number of distinct Sosa individuals up to generation
+	 */
+	public function getDifferentSosaCountUpToGeneration($gen){
+		if(!$this->is_setup) return 0;
+		return Database::prepare(
+			'SELECT SQL_CACHE COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
+			' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
+			' AND majs_gen <= :gen')
+		->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId(),
+				'gen' => $gen 
+		))->fetchOne() ?: 0;
+	}
+    
+	/**
+	 * Get an array of birth statistics for a specific generation
+	 * Statistics are :
+	 * 	- first : First birth year in generation
+	 *  - last : Last birth year in generation
+	 *  - avg : Average birth year
+	 *
+	 * @param number $gen Generation
+	 * @return array Birth statistics array
+	 */
+	public function getStatsBirthYearInGeneration($gen){
+		if(!$this->is_setup) return array('first' => 0, 'avg' => 0, 'last' => 0);
+		return Database::prepare(
+			'SELECT MIN(majs_birth_year) AS first, AVG(majs_birth_year) AS avg, MAX(majs_birth_year) AS last'.
+			' FROM `##maj_sosa`' .
+			' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
+			' AND majs_gen=:gen AND NOT majs_birth_year = :birth_year')
+			->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId(),
+				'gen' => $gen,
+				'birth_year' => 0))
+			->fetchOneRow(\PDO::FETCH_ASSOC) ?: array('first' => 0, 'avg' => 0, 'last' => 0);
+	}
+    
+	/**
+	 * Get the mean generation time, based on a linear regression of birth years and generations
+	 *
+	 * @return number|NULL Mean generation time
+	 */
+	public function getMeanGenerationTime(){
+		if(!$this->is_setup) return;
+		if(!$this->statistics_tab){
+			$this->getStatisticsByGeneration();
+		}
+		//Linear regression on x=generation and y=birthdate
+		$sum_xy = 0;
+		$sum_x=0;
+		$sum_y=0;
+		$sum_x2=0;
+		$n=count($this->statistics_tab);
+		foreach($this->statistics_tab as $gen=>$stats){
+			$sum_xy+=$gen*$stats['avgBirth'];
+			$sum_x+=$gen;
+			$sum_y+=$stats['avgBirth'];
+			$sum_x2+=$gen*$gen;
+		}
+		$denom=($n*$sum_x2)-($sum_x*$sum_x);
+		if($denom!=0){
+			return -(($n*$sum_xy)-($sum_x*$sum_y))/($denom);
+		}
+		return null;
+	}
+    
+	/**
+	 * Return a computed array of statistics about the dispersion of ancestors across the ancestors
+	 * at a specified generation.
+	 * This statistics cannot be used for generations above 11, as it would cause a out of range in MySQL
+	 * 
+	 * Format: 
+	 *  - key : a base-2 representation of the ancestor at generation G for which exclusive ancestors have been found,
+	 *          -1 is used for shared ancestors
+	 *          For instance base2(0100) = base10(4) represent the maternal grand father
+	 *  - values: number of ancestors exclusively in the ancestors of the ancestor in key
+	 *  
+	 *  For instance a result at generation 3 could be :
+	 *      array (   -1        =>  12      -> 12 ancestors are shared by the grand-parents
+	 *                base10(1) =>  32      -> 32 ancestors are exclusive to the paternal grand-father
+	 *                base10(2) =>  25      -> 25 ancestors are exclusive to the paternal grand-mother
+	 *                base10(4) =>  12      -> 12 ancestors are exclusive to the maternal grand-father
+	 *                base10(8) =>  30      -> 30 ancestors are exclusive to the maternal grand-mother
+	 *            )
+	 *  
+	 * @param int $gen Reference generation
+	 * @return array
+	 */
+	public function getAncestorDispersionForGen($gen) {
+		if(!$this->is_setup || $gen > 11) return array();  // Going further than 11 gen will be out of range in the query
+		return Database::prepare(
+			'SELECT branches, count(i_id)'.
+			' FROM ('.
+			'   SELECT i_id,'.
+			'       CASE'.
+			'           WHEN CEIL(LOG2(SUM(branch))) = LOG2(SUM(branch)) THEN SUM(branch)'.
+			'           ELSE -1'.   // We put all ancestors shared between some branches in the same bucket
+			'       END branches'.
+			'   FROM ('.
+			'       SELECT DISTINCT majs_i_id i_id,'.
+			'           POW(2, FLOOR(majs_sosa / POW(2, (majs_gen - :gen))) - POW(2, :gen -1)) branch'.
+			'       FROM `##maj_sosa`'.
+			'       WHERE majs_gedcom_id = :tree_id AND majs_user_id = :user_id'.
+			'           AND majs_gen >= :gen'.
+			'   ) indistat'.
+			'   GROUP BY i_id'.
+			') grouped'.
+			' GROUP BY branches')
+			->execute(array(
+				'tree_id' => $this->tree->getTreeId(), 
+				'user_id' => $this->user->getUserId(),
+				'gen' => $gen
+			))->fetchAssoc() ?: array();
+	}
     
                
 }

src/Webtrees/Functions/FunctionsPrint.php

Spacing +42 added lines, -42 removed lines

@@ -31,7 +31,7 @@ 
 	 * @return string List of elements
 	 */
 	public static function getListFromArray(array $array) {
-		$n=count($array);
+		$n = count($array);
 		switch ($n) {
 			case 0:
 				return '';
@@ -40,10 +40,10 @@ 
 			default:
 				return implode(
 						/* I18N: list separator */ I18N::translate(', '), 
-						array_slice($array, 0, $n-1)
-					) .
-					/* I18N: last list separator, " and " in English, " et " in French  */ I18N::translate(' and ') . 
-					$array[$n-1];
+						array_slice($array, 0, $n - 1)
+					).
+					/* I18N: last list separator, " and " in English, " et " in French  */ I18N::translate(' and '). 
+					$array[$n - 1];
 		}
 	}
 
@@ -59,10 +59,10 @@ 
 			\MyArtJaub\Webtrees\Map\MapProviderInterface $mapProvider
 	) {
 		$place = $fact->getPlace();
-		if(!$place->isEmpty()) {
-			$iconPlace= $mapProvider->getPlaceIcon($place);	
-			if($iconPlace && strlen($iconPlace) > 0){
-				return	'<div class="fact_flag">'. self::htmlPlaceIcon($place, $iconPlace, 50). '</div>';
+		if (!$place->isEmpty()) {
+			$iconPlace = $mapProvider->getPlaceIcon($place);	
+			if ($iconPlace && strlen($iconPlace) > 0) {
+				return	'<div class="fact_flag">'.self::htmlPlaceIcon($place, $iconPlace, 50).'</div>';
 			}
 		}
 		return '';
@@ -76,8 +76,8 @@ 
 	 * @param number $size
 	 * @return string HTML code of the inserted flag
 	 */
-	public static function htmlPlaceIcon(\Fisharebest\Webtrees\Place $place, $icon_path , $size = 50) {
-	    return '<img class="flag_gm_h'. $size . '" src="' . $icon_path . '" title="' . $place->getGedcomName() . '" alt="' . $place->getGedcomName() . '" />';
+	public static function htmlPlaceIcon(\Fisharebest\Webtrees\Place $place, $icon_path, $size = 50) {
+	    return '<img class="flag_gm_h'.$size.'" src="'.$icon_path.'" title="'.$place->getGedcomName().'" alt="'.$place->getGedcomName().'" />';
 	}
 	
 	/**
@@ -95,7 +95,7 @@ 
 		$minimum = PHP_INT_MAX;
 		$maximum = 1;
 		foreach ($list as $params) {
-			if(array_key_exists('count', $params)) {
+			if (array_key_exists('count', $params)) {
 				$maximum = max($maximum, $params['count']);
 				$minimum = min($minimum, $params['count']);
 			}
@@ -113,15 +113,15 @@ 
 				$size = 75.0 + 125.0 * ($count - $minimum) / ($maximum - $minimum);
 			}
 			
-			$html .= '<a style="font-size:' . $size . '%" href="' . $url . '">';
+			$html .= '<a style="font-size:'.$size.'%" href="'.$url.'">';
 			if ($totals) {
-				$html .= I18N::translate('%1$s (%2$s)', '<span dir="auto">' . $text . '</span>', I18N::number($count));
+				$html .= I18N::translate('%1$s (%2$s)', '<span dir="auto">'.$text.'</span>', I18N::number($count));
 			} else {
 				$html .= $text;
 			}
 			$html .= '</a>';
 		}
-		return '<div class="tag_cloud">' . $html . '</div>';
+		return '<div class="tag_cloud">'.$html.'</div>';
 	}
 	
 
@@ -156,11 +156,11 @@ 
 	 * @param bool $isStrong Bolden the name ?
 	 * @return string HTML Code for individual item
 	 */
-	public static function htmlIndividualForList(\Fisharebest\Webtrees\Individual $individual, $isStrong = true){
+	public static function htmlIndividualForList(\Fisharebest\Webtrees\Individual $individual, $isStrong = true) {
 		$html = '';
 		$tag = 'em';
-		if($isStrong) $tag = 'strong';
-		if($individual && $individual->canShow()){
+		if ($isStrong) $tag = 'strong';
+		if ($individual && $individual->canShow()) {
 			$dindi = new Individual($individual);
 			$html = $individual->getSexImage();
 			$html .= '<a class="list_item" href="'.
@@ -175,7 +175,7 @@ 
 			$html .= '</a>';
 		}
 		else {
-			$html .= '<span class=\"list_item\"><'.$tag.'>' . I18N::translate('Private') . '</'.$tag.'></span>';
+			$html .= '<span class=\"list_item\"><'.$tag.'>'.I18N::translate('Private').'</'.$tag.'></span>';
 		}
 		return $html;
 	}
@@ -187,22 +187,22 @@ 
 	 * @param boolean $anchor option to print a link to calendar
 	 * @return string HTML code for short date
 	 */
-	public static function formatFactDateShort(\Fisharebest\Webtrees\Fact $fact, $anchor=false) {
+	public static function formatFactDateShort(\Fisharebest\Webtrees\Fact $fact, $anchor = false) {
 		global $SEARCH_SPIDER;
 
-		$html='';
+		$html = '';
 		$date = $fact->getDate();
-		if($date->isOK()){
-			$html.=' '.$date->Display($anchor && !$SEARCH_SPIDER, '%Y');
+		if ($date->isOK()) {
+			$html .= ' '.$date->Display($anchor && !$SEARCH_SPIDER, '%Y');
 		}
-		else{
+		else {
 			// 1 DEAT Y with no DATE => print YES
 			// 1 BIRT 2 SOUR @S1@ => print YES
 			// 1 DEAT N is not allowed
 			// It is not proper GEDCOM form to use a N(o) value with an event tag to infer that it did not happen.
 			$factdetail = explode(' ', trim($fact->getGedcom()));
 			if (isset($factdetail) && (count($factdetail) == 3 && strtoupper($factdetail[2]) == 'Y') || (count($factdetail) == 4 && $factdetail[2] == 'SOUR')) {
-				$html.=I18N::translate('yes');
+				$html .= I18N::translate('yes');
 			}
 		}
 		return $html;
@@ -216,12 +216,12 @@ 
 	 * @param boolean $anchor option to print a link to placelist
 	 * @return string HTML code for short place
 	 */
-	public static function formatFactPlaceShort(\Fisharebest\Webtrees\Fact $fact, $format, $anchor=false){
-		$html='';
+	public static function formatFactPlaceShort(\Fisharebest\Webtrees\Fact $fact, $format, $anchor = false) {
+		$html = '';
 		
 		if ($fact === null) return $html;
 		$place = $fact->getPlace();
-		if($place){
+		if ($place) {
 			$dplace = new Place($place);
 			$html .= $dplace->htmlFormattedName($format, $anchor);
 		}
@@ -239,21 +239,21 @@ 
 	 * @param string $size CSS size for the icon. A CSS style css_$size is required
 	 * @return string HTML code for the formatted Sosa numbers
 	 */
-	public static function formatSosaNumbers(array $sosatab, $format = 1, $size = 'small'){
+	public static function formatSosaNumbers(array $sosatab, $format = 1, $size = 'small') {
 		$html = '';
-		switch($format){
+		switch ($format) {
 			case 1:
-				if(count($sosatab)>0){
+				if (count($sosatab) > 0) {
 					$html = '<i class="icon-maj-sosa_'.$size.'" title="'.I18N::translate('Sosa').'"></i>';
 				}
 				break;
 			case 2:
-				if(count($sosatab)>0){
+				if (count($sosatab) > 0) {
 					ksort($sosatab);
 					$tmp_html = array();
 					foreach ($sosatab as $sosa => $gen) {
 						$tmp_html[] = sprintf(
-								'<i class="icon-maj-sosa_%1$s" title="'.I18N::translate('Sosa').'"></i>&nbsp;<strong>%2$d&nbsp;'.I18N::translate('(G%s)', $gen) .'</strong>',
+								'<i class="icon-maj-sosa_%1$s" title="'.I18N::translate('Sosa').'"></i>&nbsp;<strong>%2$d&nbsp;'.I18N::translate('(G%s)', $gen).'</strong>',
 								$size,
 								$sosa
 							);
@@ -279,15 +279,15 @@ 
 	 * @param string $size CSS size for the icon. A CSS style css_$size is required
 	 * @return string HTML code for IsSourced icon
 	 */
-	public static function formatIsSourcedIcon($sourceType, $isSourced, $tag='EVEN', $format = 1, $size='normal'){
-		$html='';
-		$image=null;
-		$title=null;
-		switch($format){
+	public static function formatIsSourcedIcon($sourceType, $isSourced, $tag = 'EVEN', $format = 1, $size = 'normal') {
+		$html = '';
+		$image = null;
+		$title = null;
+		switch ($format) {
 			case 1:
-				switch($sourceType){
+				switch ($sourceType) {
 					case 'E':
-						switch($isSourced){
+						switch ($isSourced) {
 							case 0:
 								$image = 'event_unknown';
 								$title = I18N::translate('%s not found', GedcomTag::getLabel($tag));
@@ -317,7 +317,7 @@ 
 						}
 						break;
 					case 'R':
-						switch($isSourced){
+						switch ($isSourced) {
 							case -1:
 								$image = 'record_notsourced';
 								$title = I18N::translate('%s not sourced', GedcomTag::getLabel($tag));
@@ -337,7 +337,7 @@ 
 					default:
 						break;
 				}
-				if($image && $title) $html = '<i class="icon-maj-sourced-'.$size.'_'.$image.'" title="'.$title.'"></i>';
+				if ($image && $title) $html = '<i class="icon-maj-sourced-'.$size.'_'.$image.'" title="'.$title.'"></i>';
 				break;
 			default:
 				break;

src/Webtrees/Map/GoogleMapsProvider.php

Spacing +7 added lines, -7 removed lines

@@ -25,14 +25,14 @@ 
 	 * @see \MyArtJaub\Webtrees\Map\MapProviderInterface::getProviderPlaceId()
 	 */
 	public function getProviderPlaceId(\Fisharebest\Webtrees\Place $place) {
-		if(!$place->isEmpty()) {
-			$parent = array_reverse(explode (',', $place->getGedcomName()));
+		if (!$place->isEmpty()) {
+			$parent = array_reverse(explode(',', $place->getGedcomName()));
 			$place_id = 0;
 			$nb_levels = count($parent);
-			for ($i=0; $i < $nb_levels; $i++) {
+			for ($i = 0; $i < $nb_levels; $i++) {
 				$parent[$i] = trim($parent[$i]);
-				if (empty($parent[$i])) $parent[$i]='unknown';// GoogleMap module uses "unknown" while GEDCOM uses , ,
-				$pl_id=Database::prepare('SELECT pl_id FROM `##placelocation` WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place')
+				if (empty($parent[$i])) $parent[$i] = 'unknown'; // GoogleMap module uses "unknown" while GEDCOM uses , ,
+				$pl_id = Database::prepare('SELECT pl_id FROM `##placelocation` WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place')
 					->execute(array($i, $place_id, $parent[$i]))
 					->fetchOne();
 				if (empty($pl_id)) break;
@@ -48,12 +48,12 @@ 
 	 * @see \MyArtJaub\Webtrees\Map\MapProviderInterface::getPlaceIcon()
 	 */
 	public function getPlaceIcon(\Fisharebest\Webtrees\Place $place) {
-		if(!$place->isEmpty()){
+		if (!$place->isEmpty()) {
 			$place_details =
 				Database::prepare('SELECT SQL_CACHE pl_icon FROM `##placelocation` WHERE pl_id=? ORDER BY pl_place')	
 				->execute(array($this->getProviderPlaceId($place)))
 				->fetchOneRow();
-			if($place_details){
+			if ($place_details) {
 				return WT_MODULES_DIR.'googlemap/'.$place_details->pl_icon;
 			}
 		}

src/Webtrees/Module/Sosa/Views/SosaListIndiView.php

Indentation +86 added lines, -86 removed lines

@@ -30,11 +30,11 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() { 
+	protected function renderContent() { 
         
-        if($this->data->get('has_sosa', false)) {
-            $table_id = $this->data->get('table_id');            
-        ?>   
+		if($this->data->get('has_sosa', false)) {
+			$table_id = $this->data->get('table_id');            
+		?>   
         
         <div id="sosa-indi-list" class="sosa-list">
         	<table id="<?php echo $table_id;?>">
@@ -185,42 +185,42 @@ 
 			<tbody>
 			
 			<?php foreach($this->data->get('sosa_list') as $sosa => $person) {
-			    /** @var \Fisharebest\Webtrees\Individual $person */
-			    if ($person->isPendingAddtion()) {
-			        $class = ' class="new"';
-			    } elseif ($person->isPendingDeletion()) {
-			        $class = ' class="old"';
-			    } else {
-			        $class = '';
-			    }
-			    $dperson = new \MyArtJaub\Webtrees\Individual($person);
-			    ?>			
+				/** @var \Fisharebest\Webtrees\Individual $person */
+				if ($person->isPendingAddtion()) {
+					$class = ' class="new"';
+				} elseif ($person->isPendingDeletion()) {
+					$class = ' class="old"';
+				} else {
+					$class = '';
+				}
+				$dperson = new \MyArtJaub\Webtrees\Individual($person);
+				?>			
         		<tr <?php echo $class?>>
         			<td class="transparent"><?php echo $sosa; ?></td>
         			<td class="transparent"><?php echo $person->getXref(); ?></td>
         			<td colspan="2">
         			<?php foreach ($person->getAllNames() as $num=>$name) {
-        				if ($name['type']=='NAME') {
-        					$title='';
-        				} else {
-        					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
-        				}
-        				if ($num==$person->getPrimaryName()) {
-        					$class=' class="name2"';
-        					$sex_image=$person->getSexImage();
-        					list($surn, $givn)=explode(',', $name['sort']);
-        				} else {
-        					$class='';
-        					$sex_image='';
-        				} ?>
+						if ($name['type']=='NAME') {
+							$title='';
+						} else {
+							$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
+						}
+						if ($num==$person->getPrimaryName()) {
+							$class=' class="name2"';
+							$sex_image=$person->getSexImage();
+							list($surn, $givn)=explode(',', $name['sort']);
+						} else {
+							$class='';
+							$sex_image='';
+						} ?>
         				<a <?php echo $title.' '.$class; ?> href="<?php echo $person->getHtmlUrl(); ?>">
         					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?>
         				</a>
         				<?php echo $sex_image.FunctionsPrint::formatSosaNumbers($dperson->getSosaNumbers(), 1, 'smaller'); ?>
         				<br/>
             		<?php }
-            		echo $person->getPrimaryParentsNames('parents details1', 'none');
-            		?>
+					echo $person->getPrimaryParentsNames('parents details1', 'none');
+					?>
             		</td>
             		<td style="display:none;"></td>
             		<td>
@@ -231,35 +231,35 @@ 
             		</td>
             		<td>
             		<?php 
-            		if ($birth_dates=$person->getAllBirthDates()) {
-			            foreach ($birth_dates as $num=>$birth_date) {
-    					   if ($num) { ?><br/><?php } ?>
+					if ($birth_dates=$person->getAllBirthDates()) {
+						foreach ($birth_dates as $num=>$birth_date) {
+						   if ($num) { ?><br/><?php } ?>
     						<?php  echo $birth_date->display(true);
-			            }
-            		} else {
-            		    $birth_date = new Date('');
-            		    if ($person->getTree()->getPreference('SHOW_EST_LIST_DATES')) {
-            		        $birth_date=$person->getEstimatedBirthDate();
-            		        echo $birth_date->display(true);
-            		    } else {
-            		        echo '&nbsp;';
-            		    }
-            		    $birth_dates[0] = new Date('');
-            		}
-            		?>
+						}
+					} else {
+						$birth_date = new Date('');
+						if ($person->getTree()->getPreference('SHOW_EST_LIST_DATES')) {
+							$birth_date=$person->getEstimatedBirthDate();
+							echo $birth_date->display(true);
+						} else {
+							echo '&nbsp;';
+						}
+						$birth_dates[0] = new Date('');
+					}
+					?>
             		</td>
             		<td><?php echo $birth_date->julianDay();?></td>
         			<td>
         			<?php foreach ($person->getAllBirthPlaces() as $n => $birth_place) {
-				        $tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree());
-        				if ($n) { ?><br><?php } ?>
+						$tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree());
+						if ($n) { ?><br><?php } ?>
         				<a href="'<?php echo $tmp->getURL(); ?>" title="<?php echo strip_tags($tmp->getFullName()); ?>">
         					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()); ?>
         				</a>
         			<?php } ?>
         			</td>
         			<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
-				        $isBSourced = $dperson->isBirthSourced(); ?>
+						$isBSourced = $dperson->isBirthSourced(); ?>
 				   	<td><?php echo FunctionsPrint::formatIsSourcedIcon('E', $isBSourced, 'BIRT', 1, 'medium'); ?></td>
 					<td><?php echo $isBSourced; ?></td>
 					<?php } else { ?>
@@ -269,38 +269,38 @@ 
 					<td>
 					<?php 
 					if ($death_dates = $person->getAllDeathDates()) {
-				        foreach ($death_dates as $num => $death_date) {
-					       if ($num) { ?><br/><?php } ?>
+						foreach ($death_dates as $num => $death_date) {
+						   if ($num) { ?><br/><?php } ?>
 					 		<?php echo $death_date->display(true); 
-				        }
-			         } else {
-				        $death_date = $person->getEstimatedDeathDate();
-				        if ($person->getTree()->getPreference('SHOW_EST_LIST_DATES') && $death_date->minimumJulianDay() < WT_CLIENT_JD) {
-					       echo $death_date->display(true);
-        				} elseif ($person->isDead()) {
-        					echo I18N::translate('yes');
-        					$death_date = new Date('');
-        				} else {
-        					echo '&nbsp;';
-        					$death_date = new Date('');
-        				}
-        				$death_dates[0] = new Date('');
-			         } ?>
+						}
+					 } else {
+						$death_date = $person->getEstimatedDeathDate();
+						if ($person->getTree()->getPreference('SHOW_EST_LIST_DATES') && $death_date->minimumJulianDay() < WT_CLIENT_JD) {
+						   echo $death_date->display(true);
+						} elseif ($person->isDead()) {
+							echo I18N::translate('yes');
+							$death_date = new Date('');
+						} else {
+							echo '&nbsp;';
+							$death_date = new Date('');
+						}
+						$death_dates[0] = new Date('');
+					 } ?>
 			         </td>
 			         <td><?php echo $death_date->julianDay(); ?></td>
 			         <td><?php echo Date::getAge($birth_dates[0], $death_dates[0], 2); ?></td>
 			         <td><?php echo Date::getAge($birth_dates[0], $death_dates[0], 1); ?></td>
 			         <td>
         			 <?php foreach ($person->getAllDeathPlaces() as $n => $death_place) {
-        				$tmp = new Place($death_place, $person->getTree());
-        				if ($n) { ?><br><?php } ?>
+						$tmp = new Place($death_place, $person->getTree());
+						if ($n) { ?><br><?php } ?>
         				<a href="'<?php echo $tmp->getURL(); ?>" title="<?php echo strip_tags($tmp->getFullName()); ?>">
         					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()); ?>
         				</a>
         			<?php } ?>
         			</td>
         			<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
-				        $isDSourced = $dperson->isDeathSourced(); ?>
+						$isDSourced = $dperson->isDeathSourced(); ?>
 				   	<td><?php echo FunctionsPrint::formatIsSourcedIcon('E', $isDSourced, 'DEAT', 1, 'medium'); ?></td>
 					<td><?php echo $isDSourced; ?></td>
 					<?php } else { ?>
@@ -310,29 +310,29 @@ 
 					<td><?php  echo $person->getSex(); ?></td>
 					<td>
 					<?php if (!$person->canShow() || Date::compare($birth_date, new Date(date('Y') - 100)) > 0) {
-					    echo 'Y100';
-        			} else {
-        				echo 'YES';
-        			} ?>
+						echo 'Y100';
+					} else {
+						echo 'YES';
+					} ?>
         			</td>
         			<td>
         			<?php if (Date::compare($death_dates[0], new Date(date('Y') - 100)) > 0) {
-				        echo 'Y100';
-        			} elseif ($death_dates[0]->minimumJulianDay() || $person->isDead()) {
-				        echo 'YES';
-        			} else {
-				        echo 'N';
-			         } ?>
+						echo 'Y100';
+					} elseif ($death_dates[0]->minimumJulianDay() || $person->isDead()) {
+						echo 'YES';
+					} else {
+						echo 'N';
+					 } ?>
 			         </td>
 			         <td>
 					<?php if (!$person->getChildFamilies()) {
-					    echo 'R';
+						echo 'R';
 					}  // roots
 					elseif (!$person->isDead() && $person->getNumberOfChildren() < 1) {
-            			echo 'L';
+						echo 'L';
 					} // leaves
 					else {
-					    echo '&nbsp;';
+						echo '&nbsp;';
 					} ?>
 					</td>
 				</tr>
@@ -343,12 +343,12 @@ 
 					<th class="ui-state-default" colspan="22">
 						<div class="center">
 							<?php echo I18N::translate('Number of Sosa ancestors: %1$s known / %2$s theoretical (%3$s)',
-							    I18N::number($this->data->get('sosa_count')),
-							    I18N::number($this->data->get('sosa_theo')), 
-							    I18N::percentage($this->data->get('sosa_ratio'),2)
-							    ); ?>
+								I18N::number($this->data->get('sosa_count')),
+								I18N::number($this->data->get('sosa_theo')), 
+								I18N::percentage($this->data->get('sosa_ratio'),2)
+								); ?>
 							<?php if($this->data->get('sosa_hidden') > 0) {
-							    echo '['. I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']';
+								echo '['. I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']';
 							} ?>
 						</div>
 					</th>
@@ -382,8 +382,8 @@ 
 				</div>
 			</div>
 		<?php 
-        }
-    }
+		}
+	}
     
 }
  
\ No newline at end of file

Spacing +21 added lines, -21 removed lines

@@ -32,12 +32,12 @@ 
 	 */
     protected function renderContent() { 
         
-        if($this->data->get('has_sosa', false)) {
+        if ($this->data->get('has_sosa', false)) {
             $table_id = $this->data->get('table_id');            
         ?>   
         
         <div id="sosa-indi-list" class="sosa-list">
-        	<table id="<?php echo $table_id;?>">
+        	<table id="<?php echo $table_id; ?>">
 				<thead>
     				<tr>
     					<th colspan="22">
@@ -184,7 +184,7 @@ 
 				</thead>
 			<tbody>
 			
-			<?php foreach($this->data->get('sosa_list') as $sosa => $person) {
+			<?php foreach ($this->data->get('sosa_list') as $sosa => $person) {
 			    /** @var \Fisharebest\Webtrees\Individual $person */
 			    if ($person->isPendingAddtion()) {
 			        $class = ' class="new"';
@@ -200,18 +200,18 @@ 
         			<td class="transparent"><?php echo $person->getXref(); ?></td>
         			<td colspan="2">
         			<?php foreach ($person->getAllNames() as $num=>$name) {
-        				if ($name['type']=='NAME') {
-        					$title='';
+        				if ($name['type'] == 'NAME') {
+        					$title = '';
         				} else {
-        					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
+        					$title = 'title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
         				}
-        				if ($num==$person->getPrimaryName()) {
-        					$class=' class="name2"';
-        					$sex_image=$person->getSexImage();
-        					list($surn, $givn)=explode(',', $name['sort']);
+        				if ($num == $person->getPrimaryName()) {
+        					$class = ' class="name2"';
+        					$sex_image = $person->getSexImage();
+        					list($surn, $givn) = explode(',', $name['sort']);
         				} else {
-        					$class='';
-        					$sex_image='';
+        					$class = '';
+        					$sex_image = '';
         				} ?>
         				<a <?php echo $title.' '.$class; ?> href="<?php echo $person->getHtmlUrl(); ?>">
         					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?>
@@ -224,14 +224,14 @@ 
             		</td>
             		<td style="display:none;"></td>
             		<td>
-            			<?php echo Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)) . 'AAAA' . Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)); ?>
+            			<?php echo Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)).'AAAA'.Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)); ?>
             		</td>
             		<td>
-            			<?php echo Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)) . 'AAAA' . Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)); ?>
+            			<?php echo Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)).'AAAA'.Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)); ?>
             		</td>
             		<td>
             		<?php 
-            		if ($birth_dates=$person->getAllBirthDates()) {
+            		if ($birth_dates = $person->getAllBirthDates()) {
 			            foreach ($birth_dates as $num=>$birth_date) {
     					   if ($num) { ?><br/><?php } ?>
     						<?php  echo $birth_date->display(true);
@@ -239,7 +239,7 @@ 
             		} else {
             		    $birth_date = new Date('');
             		    if ($person->getTree()->getPreference('SHOW_EST_LIST_DATES')) {
-            		        $birth_date=$person->getEstimatedBirthDate();
+            		        $birth_date = $person->getEstimatedBirthDate();
             		        echo $birth_date->display(true);
             		    } else {
             		        echo '&nbsp;';
@@ -248,7 +248,7 @@ 
             		}
             		?>
             		</td>
-            		<td><?php echo $birth_date->julianDay();?></td>
+            		<td><?php echo $birth_date->julianDay(); ?></td>
         			<td>
         			<?php foreach ($person->getAllBirthPlaces() as $n => $birth_place) {
 				        $tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree());
@@ -345,10 +345,10 @@ 
 							<?php echo I18N::translate('Number of Sosa ancestors: %1$s known / %2$s theoretical (%3$s)',
 							    I18N::number($this->data->get('sosa_count')),
 							    I18N::number($this->data->get('sosa_theo')), 
-							    I18N::percentage($this->data->get('sosa_ratio'),2)
+							    I18N::percentage($this->data->get('sosa_ratio'), 2)
 							    ); ?>
-							<?php if($this->data->get('sosa_hidden') > 0) {
-							    echo '['. I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']';
+							<?php if ($this->data->get('sosa_hidden') > 0) {
+							    echo '['.I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']';
 							} ?>
 						</div>
 					</th>
@@ -360,7 +360,7 @@ 
 								<button type="button" class="ui-state-default btn-toggle-parents">
 									<?php echo I18N::translate('Show parents') ?>
 								</button>
-								<button id="btn-toggle-statistics-<?php echo $table_id ;?>" type="button" class="ui-state-default btn-toggle-statistics">
+								<button id="btn-toggle-statistics-<?php echo $table_id; ?>" type="button" class="ui-state-default btn-toggle-statistics">
 									<?php echo I18N::translate('Show statistics charts') ?>
 								</button>
 							</div>

src/Webtrees/Module/Sosa/Views/SosaConfigView.php

Indentation +8 added lines, -8 removed lines

@@ -24,9 +24,9 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
+	protected function renderContent() {
         
-        ?>        
+		?>        
         
         <div id="maj-sosa-config-page">
 			<h2><?php echo $this->data->get('title'); ?></h2>
@@ -46,9 +46,9 @@ 
         			</div>
         			<div class="value">
         				<?php 
-        				    $users = $this->data->get('users_settings');
-        				    if(count($users) == 1) {
-        				        $root_indi = $users[0]['rootid'];  ?>
+							$users = $this->data->get('users_settings');
+							if(count($users) == 1) {
+								$root_indi = $users[0]['rootid'];  ?>
         					<label>
         						<input id="maj_sosa_input_userid" type="hidden" name="userid" value="<?php echo $users[0]['user']->getUserId(); ?>" />
         						<?php echo $users[0]['user']->getRealNameHtml() ?>
@@ -56,8 +56,8 @@ 
         				<?php  } else if(count($users) > 1) { ?>
         					<select id='maj-sosa-config-select' name="userid">
         					<?php 
-        					   $root_indi = $users[0]['rootid'];
-        					   foreach ($this->data->get('users_settings') as $user) { ?>
+							   $root_indi = $users[0]['rootid'];
+							   foreach ($this->data->get('users_settings') as $user) { ?>
         						<option value="<?php echo $user['user']->getUserId(); ?>"><?php echo $user['user']->getRealNameHtml() ?></option>
         					<?php  } ?>
         					</select>
@@ -80,7 +80,7 @@ 
 			</form>	
 		
 		<?php        
-    }
+	}
     
 }
  
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -47,13 +47,13 @@
         			<div class="value">
         				<?php 
         				    $users = $this->data->get('users_settings');
-        				    if(count($users) == 1) {
-        				        $root_indi = $users[0]['rootid'];  ?>
+        				    if (count($users) == 1) {
+        				        $root_indi = $users[0]['rootid']; ?>
         					<label>
         						<input id="maj_sosa_input_userid" type="hidden" name="userid" value="<?php echo $users[0]['user']->getUserId(); ?>" />
         						<?php echo $users[0]['user']->getRealNameHtml() ?>
         					</label>
-        				<?php  } else if(count($users) > 1) { ?>
+        				<?php  } else if (count($users) > 1) { ?>
         					<select id='maj-sosa-config-select' name="userid">
         					<?php 
         					   $root_indi = $users[0]['rootid'];

src/Webtrees/Module/Sosa/Views/SosaListMissingView.php

Indentation +53 added lines, -53 removed lines

@@ -29,16 +29,16 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
-        ?>
+	protected function renderContent() {
+		?>
             <div id="maj-sosa-missing-page" class="center">
     			<h2><?php echo $this->data->get('title'); ?></h2>
     			
     			<?php  if($this->data->get('is_setup')) { 
-    			    $this->renderSosaHeader();
-    			    if($this->data->get('has_missing', false)) {
-    			        $table_id = $this->data->get('table_id');
-    			        ?>
+					$this->renderSosaHeader();
+					if($this->data->get('has_missing', false)) {
+						$table_id = $this->data->get('table_id');
+						?>
     			<div id="sosa-indi-missing" class="smissing-list">
                 	<table id="<?php echo $table_id;?>">
         				<thead>     
@@ -109,44 +109,44 @@ 
         			<tbody>
         			
         			<?php foreach($this->data->get('missing_list') as $missing_tab) {
-        			    $person = $missing_tab['indi'];
+						$person = $missing_tab['indi'];
         			    
-        			    /** @var \Fisharebest\Webtrees\Individual $person */
-        			    if ($person->isPendingAddtion()) {
-        			        $class = ' class="new"';
-        			    } elseif ($person->isPendingDeletion()) {
-        			        $class = ' class="old"';
-        			    } else {
-        			        $class = '';
-        			    }
-        			    $dperson = new \MyArtJaub\Webtrees\Individual($person);
-        			    ?>			
+						/** @var \Fisharebest\Webtrees\Individual $person */
+						if ($person->isPendingAddtion()) {
+							$class = ' class="new"';
+						} elseif ($person->isPendingDeletion()) {
+							$class = ' class="old"';
+						} else {
+							$class = '';
+						}
+						$dperson = new \MyArtJaub\Webtrees\Individual($person);
+						?>			
                 		<tr <?php echo $class?>>
                 			<td class="transparent"><?php echo $missing_tab['sosa']; ?></td>
                 			<td class="transparent"><?php echo $person->getXref(); ?></td>
                 			<td colspan="2">
                 			<?php foreach ($person->getAllNames() as $num=>$name) {
-                				if ($name['type']=='NAME') {
-                					$title='';
-                				} else {
-                					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
-                				}
-                				if ($num==$person->getPrimaryName()) {
-                					$class=' class="name2"';
-                					$sex_image=$person->getSexImage();
-                					list($surn, $givn)=explode(',', $name['sort']);
-                				} else {
-                					$class='';
-                					$sex_image='';
-                				} ?>
+								if ($name['type']=='NAME') {
+									$title='';
+								} else {
+									$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
+								}
+								if ($num==$person->getPrimaryName()) {
+									$class=' class="name2"';
+									$sex_image=$person->getSexImage();
+									list($surn, $givn)=explode(',', $name['sort']);
+								} else {
+									$class='';
+									$sex_image='';
+								} ?>
                 				<a <?php echo $title.' '.$class; ?> href="<?php echo $person->getHtmlUrl(); ?>">
                 					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?>
                 				</a>
                 				<?php echo $sex_image.FunctionsPrint::formatSosaNumbers($dperson->getSosaNumbers(), 1, 'smaller'); ?>
                 				<br/>
                     		<?php }
-                    		echo $person->getPrimaryParentsNames('parents details1', 'none');
-                    		?>
+							echo $person->getPrimaryParentsNames('parents details1', 'none');
+							?>
                     		</td>
                     		<td style="display:none;"></td>
                     		<td>
@@ -156,7 +156,7 @@ 
                     			<?php echo Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)) . 'AAAA' . Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)); ?>
                     		</td>                    		
                 			<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
-        				        $isISourced = $dperson->isSourced(); ?>
+								$isISourced = $dperson->isSourced(); ?>
         				   	<td><?php echo FunctionsPrint::formatIsSourcedIcon('R', $isISourced, 'INDI', 1, 'medium'); ?></td>
         					<td><?php echo $isISourced; ?></td>
         					<?php } else { ?>
@@ -167,35 +167,35 @@ 
         					<td><?php echo $missing_tab['has_mother'] ? '&nbsp;' : 'X';?></td>
         					<td>
                     		<?php 
-                    		if ($birth_dates=$person->getAllBirthDates()) {
-        			            foreach ($birth_dates as $num=>$birth_date) {
-            					   if ($num) { ?><br/><?php } ?>
+							if ($birth_dates=$person->getAllBirthDates()) {
+								foreach ($birth_dates as $num=>$birth_date) {
+								   if ($num) { ?><br/><?php } ?>
             						<?php  echo $birth_date->display(true);
-        			            }
-                    		} else {
-                    		    $birth_date = new Date('');
-                    		    if ($person->getTree()->getPreference('SHOW_EST_LIST_DATES')) {
-                    		        $birth_date=$person->getEstimatedBirthDate();
-                    		        echo $birth_date->display(true);
-                    		    } else {
-                    		        echo '&nbsp;';
-                    		    }
-                    		    $birth_dates[0] = new Date('');
-                    		}
-                    		?>
+								}
+							} else {
+								$birth_date = new Date('');
+								if ($person->getTree()->getPreference('SHOW_EST_LIST_DATES')) {
+									$birth_date=$person->getEstimatedBirthDate();
+									echo $birth_date->display(true);
+								} else {
+									echo '&nbsp;';
+								}
+								$birth_dates[0] = new Date('');
+							}
+							?>
                     		</td>
                     		<td><?php echo $birth_date->julianDay();?></td>
                 			<td>
                 			<?php foreach ($person->getAllBirthPlaces() as $n => $birth_place) {
-        				        $tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree());
-                				if ($n) { ?><br><?php } ?>
+								$tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree());
+								if ($n) { ?><br><?php } ?>
                 				<a href="'<?php echo $tmp->getURL(); ?>" title="<?php echo strip_tags($tmp->getFullName()); ?>">
                 					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()); ?>
                 				</a>
                 			<?php } ?>
                 			</td>
         					<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
-        				        $isBSourced = $dperson->isBirthSourced(); ?>
+								$isBSourced = $dperson->isBirthSourced(); ?>
         				   	<td><?php echo FunctionsPrint::formatIsSourcedIcon('E', $isBSourced, 'BIRT', 1, 'medium'); ?></td>
         					<td><?php echo $isBSourced; ?></td>
         					<?php } else { ?>
@@ -222,7 +222,7 @@ 
     			 <?php } else if ($this->data->get('generation', 0) > 0) { ?> 
     			<p><?php echo I18N::translate('No ancestors are missing for this generation. Generation complete at %s.', I18N::percentage($this->data->get('perc_sosa'), 2)); ?></p>
     			    <?php }   			    
-    			} else { ?>
+				} else { ?>
     			<p class="warning"><?php echo I18N::translate('The list could not be displayed. Reasons might be:'); ?><br/>
     				<ul>
     					<li><?php echo I18N::translate('No Sosa root individual has been defined.'); ?></li>
@@ -233,6 +233,6 @@ 
     			<?php } ?>
     		</div> 
     		<?php 
-        }
+		}
 }
  
\ No newline at end of file

Spacing +23 added lines, -23 removed lines

@@ -34,13 +34,13 @@ 
             <div id="maj-sosa-missing-page" class="center">
     			<h2><?php echo $this->data->get('title'); ?></h2>
     			
-    			<?php  if($this->data->get('is_setup')) { 
+    			<?php  if ($this->data->get('is_setup')) { 
     			    $this->renderSosaHeader();
-    			    if($this->data->get('has_missing', false)) {
+    			    if ($this->data->get('has_missing', false)) {
     			        $table_id = $this->data->get('table_id');
     			        ?>
     			<div id="sosa-indi-missing" class="smissing-list">
-                	<table id="<?php echo $table_id;?>">
+                	<table id="<?php echo $table_id; ?>">
         				<thead>     
             				<tr>
     							<th colspan="16">
@@ -108,7 +108,7 @@ 
         				</thead>
         			<tbody>
         			
-        			<?php foreach($this->data->get('missing_list') as $missing_tab) {
+        			<?php foreach ($this->data->get('missing_list') as $missing_tab) {
         			    $person = $missing_tab['indi'];
         			    
         			    /** @var \Fisharebest\Webtrees\Individual $person */
@@ -126,18 +126,18 @@ 
                 			<td class="transparent"><?php echo $person->getXref(); ?></td>
                 			<td colspan="2">
                 			<?php foreach ($person->getAllNames() as $num=>$name) {
-                				if ($name['type']=='NAME') {
-                					$title='';
+                				if ($name['type'] == 'NAME') {
+                					$title = '';
                 				} else {
-                					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
+                					$title = 'title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
                 				}
-                				if ($num==$person->getPrimaryName()) {
-                					$class=' class="name2"';
-                					$sex_image=$person->getSexImage();
-                					list($surn, $givn)=explode(',', $name['sort']);
+                				if ($num == $person->getPrimaryName()) {
+                					$class = ' class="name2"';
+                					$sex_image = $person->getSexImage();
+                					list($surn, $givn) = explode(',', $name['sort']);
                 				} else {
-                					$class='';
-                					$sex_image='';
+                					$class = '';
+                					$sex_image = '';
                 				} ?>
                 				<a <?php echo $title.' '.$class; ?> href="<?php echo $person->getHtmlUrl(); ?>">
                 					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?>
@@ -150,10 +150,10 @@ 
                     		</td>
                     		<td style="display:none;"></td>
                     		<td>
-                    			<?php echo Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)) . 'AAAA' . Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)); ?>
+                    			<?php echo Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)).'AAAA'.Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)); ?>
                     		</td>
                     		<td>
-                    			<?php echo Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)) . 'AAAA' . Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)); ?>
+                    			<?php echo Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)).'AAAA'.Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)); ?>
                     		</td>                    		
                 			<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
         				        $isISourced = $dperson->isSourced(); ?>
@@ -163,11 +163,11 @@ 
         					<td>&nbsp;</td>
         					<td></td>
         					<?php } ?>
-        					<td><?php echo $missing_tab['has_father'] ? '&nbsp;' : 'X';?></td>
-        					<td><?php echo $missing_tab['has_mother'] ? '&nbsp;' : 'X';?></td>
+        					<td><?php echo $missing_tab['has_father'] ? '&nbsp;' : 'X'; ?></td>
+        					<td><?php echo $missing_tab['has_mother'] ? '&nbsp;' : 'X'; ?></td>
         					<td>
                     		<?php 
-                    		if ($birth_dates=$person->getAllBirthDates()) {
+                    		if ($birth_dates = $person->getAllBirthDates()) {
         			            foreach ($birth_dates as $num=>$birth_date) {
             					   if ($num) { ?><br/><?php } ?>
             						<?php  echo $birth_date->display(true);
@@ -175,7 +175,7 @@ 
                     		} else {
                     		    $birth_date = new Date('');
                     		    if ($person->getTree()->getPreference('SHOW_EST_LIST_DATES')) {
-                    		        $birth_date=$person->getEstimatedBirthDate();
+                    		        $birth_date = $person->getEstimatedBirthDate();
                     		        echo $birth_date->display(true);
                     		    } else {
                     		        echo '&nbsp;';
@@ -184,7 +184,7 @@ 
                     		}
                     		?>
                     		</td>
-                    		<td><?php echo $birth_date->julianDay();?></td>
+                    		<td><?php echo $birth_date->julianDay(); ?></td>
                 			<td>
                 			<?php foreach ($person->getAllBirthPlaces() as $n => $birth_place) {
         				        $tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree());
@@ -211,9 +211,9 @@ 
 							<td class="ui-state-default" colspan="16">
 								<div class="center">
 									<?php echo I18N::translate('Number of different missing ancestors: %s', I18N::number($this->data->get('missing_diff_count'))); ?>
-									<?php if($this->data->get('missing_hidden') > 0) echo ' ['. I18N::translate('%s hidden', I18N::number($this->data->get('missing_hidden'))).']'; ?>
-									<?php echo ' - ' . I18N::translate('Generation complete at %s', I18N::percentage($this->data->get('perc_sosa'), 2)); ?>
-									<?php echo ' [' . I18N::translate('Potential %s', I18N::percentage($this->data->get('perc_sosa_potential'),2)).']'; ?>
+									<?php if ($this->data->get('missing_hidden') > 0) echo ' ['.I18N::translate('%s hidden', I18N::number($this->data->get('missing_hidden'))).']'; ?>
+									<?php echo ' - '.I18N::translate('Generation complete at %s', I18N::percentage($this->data->get('perc_sosa'), 2)); ?>
+									<?php echo ' ['.I18N::translate('Potential %s', I18N::percentage($this->data->get('perc_sosa_potential'), 2)).']'; ?>
 								</div>
 							</td>
 						</tr>

src/Webtrees/Module/SosaModule.php

Indentation +163 added lines, -163 removed lines

@@ -31,116 +31,116 @@ 
  * Sosa Module.
  */
 class SosaModule 
-    extends AbstractModule 
-    implements  ModuleMenuInterface, 
-                ModuleConfigInterface,
-                HookSubscriberInterface,
-                IndividualHeaderExtenderInterface,
-                RecordNameTextExtenderInterface
+	extends AbstractModule 
+	implements  ModuleMenuInterface, 
+				ModuleConfigInterface,
+				HookSubscriberInterface,
+				IndividualHeaderExtenderInterface,
+				RecordNameTextExtenderInterface
 {
-    // How to update the database schema for this module
-    const SCHEMA_TARGET_VERSION   = 1;
-    const SCHEMA_SETTING_NAME     = 'MAJ_SOSA_SCHEMA_VERSION';
-    const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\Sosa\Schema';
+	// How to update the database schema for this module
+	const SCHEMA_TARGET_VERSION   = 1;
+	const SCHEMA_SETTING_NAME     = 'MAJ_SOSA_SCHEMA_VERSION';
+	const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\Sosa\Schema';
 
-    /** @var string For custom modules - link for support, upgrades, etc. */
-    const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
-    
-    /**
-     * {@inhericDoc}
-     */
-    public function getTitle() {
-        return /* I18N: Name of the “Sosa” module */ I18N::translate('Sosa');
-    }
-    
-    /**
-     * {@inhericDoc}
-     */
-    public function getDescription() {
-        return /* I18N: Description of the “Sosa” module */ I18N::translate('Calculate and display Sosa ancestors of the root person.');
-    }
-    
-    /**
-     * {@inhericDoc}
-     */
-    public function modAction($mod_action) {
-        Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+	/** @var string For custom modules - link for support, upgrades, etc. */
+	const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
+    
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getTitle() {
+		return /* I18N: Name of the “Sosa” module */ I18N::translate('Sosa');
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getDescription() {
+		return /* I18N: Description of the “Sosa” module */ I18N::translate('Calculate and display Sosa ancestors of the root person.');
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 */
+	public function modAction($mod_action) {
+		Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
         
-        \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
-    }
+		\MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
+	}
     
-    /**********
+	/**********
      * ModuleConfigInterface
      **********/
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
-     */
-    public function getConfigLink() {
-        Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
+	 */
+	public function getConfigLink() {
+		Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
         
-        return 'module.php?mod=' . $this->getName() . '&mod_action=SosaConfig';
-    }
+		return 'module.php?mod=' . $this->getName() . '&mod_action=SosaConfig';
+	}
     
-    /**********
+	/**********
      * ModuleMenuInterface
      **********/
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleMenuInterface::defaultMenuOrder()
-     */
-    public function defaultMenuOrder() {
-        return 5;
-    }
-    
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleMenuInterface::getMenu()
-     */
-    public function getMenu() { 
-        global $WT_TREE, $controller;
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleMenuInterface::defaultMenuOrder()
+	 */
+	public function defaultMenuOrder() {
+		return 5;
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleMenuInterface::getMenu()
+	 */
+	public function getMenu() { 
+		global $WT_TREE, $controller;
         
-        $menu = null;
-        if(ModuleManager::getInstance()->isOperational($this->getName())) {
+		$menu = null;
+		if(ModuleManager::getInstance()->isOperational($this->getName())) {
             
-            $root_url = 'module.php?mod=' . $this->getName() . '&ged=' . $WT_TREE->getNameUrl() . '&';
-            $sosa_stat_menu = new Menu(I18N::translate('Sosa Statistics'), $root_url . 'mod_action=SosaStats', 'menu-maj-sosa-stats');
+			$root_url = 'module.php?mod=' . $this->getName() . '&ged=' . $WT_TREE->getNameUrl() . '&';
+			$sosa_stat_menu = new Menu(I18N::translate('Sosa Statistics'), $root_url . 'mod_action=SosaStats', 'menu-maj-sosa-stats');
             
-            $menu = clone $sosa_stat_menu;
-            $menu->setClass('menu-maj-sosa');
+			$menu = clone $sosa_stat_menu;
+			$menu->setClass('menu-maj-sosa');
             
-            $submenus = array_filter(array(
-                new Menu(I18N::translate('Sosa Ancestors'), $root_url . 'mod_action=SosaList', 'menu-maj-sosa-list', array('rel' => 'nofollow')),
-                new Menu(I18N::translate('Missing Ancestors'), $root_url . 'mod_action=SosaList@missing', 'menu-maj-sosa-missing', array('rel' => 'nofollow')),
-                $sosa_stat_menu                
-            ));
+			$submenus = array_filter(array(
+				new Menu(I18N::translate('Sosa Ancestors'), $root_url . 'mod_action=SosaList', 'menu-maj-sosa-list', array('rel' => 'nofollow')),
+				new Menu(I18N::translate('Missing Ancestors'), $root_url . 'mod_action=SosaList@missing', 'menu-maj-sosa-missing', array('rel' => 'nofollow')),
+				$sosa_stat_menu                
+			));
             
 
-            if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_GEODISP_NAME)
-                && $ga_list = Module::getModuleByName(Constants::MODULE_MAJ_GEODISP_NAME)->getProvider()->getGeoAnalysisList()
-                )
-            {
-                if(count($ga_list) > 0) {
-                    $submenus[] = new Menu(I18N::translate('Geographical Dispersion'), 'module.php?mod=' . Constants::MODULE_MAJ_GEODISP_NAME . '&ged=' . $WT_TREE->getNameUrl() . '&mod_action=GeoAnalysis@listAll', 'menu-maj-sosa-geodispersion');
-                }
-            }
+			if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_GEODISP_NAME)
+				&& $ga_list = Module::getModuleByName(Constants::MODULE_MAJ_GEODISP_NAME)->getProvider()->getGeoAnalysisList()
+				)
+			{
+				if(count($ga_list) > 0) {
+					$submenus[] = new Menu(I18N::translate('Geographical Dispersion'), 'module.php?mod=' . Constants::MODULE_MAJ_GEODISP_NAME . '&ged=' . $WT_TREE->getNameUrl() . '&mod_action=GeoAnalysis@listAll', 'menu-maj-sosa-geodispersion');
+				}
+			}
             
-            if(Auth::check()) {
-                $submenus[] = new Menu(
-                    I18N::translate('Sosa Configuration'),
-                    $this->getConfigLink(),
-                    'menu-maj-sosa-configuration',
-                    array('rel' => 'nofollow'));
-            }
+			if(Auth::check()) {
+				$submenus[] = new Menu(
+					I18N::translate('Sosa Configuration'),
+					$this->getConfigLink(),
+					'menu-maj-sosa-configuration',
+					array('rel' => 'nofollow'));
+			}
                         
-            //-- recompute Sosa submenu
-            if (!empty($controller) && $controller instanceof IndividualController 
-                && Auth::check() && $WT_TREE->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID')
-                ) {
-                $controller
-                    ->addInlineJavascript('
+			//-- recompute Sosa submenu
+			if (!empty($controller) && $controller instanceof IndividualController 
+				&& Auth::check() && $WT_TREE->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID')
+				) {
+				$controller
+					->addInlineJavascript('
                         function majComputeSosaFromIndi(){
                             if($("#computesosadlg").length == 0) {
                                 $("body").append("<div id=\"computesosadlg\" title=\"'. I18N::translate('Sosas computation') .'\"><div id=\"sosaloadingarea\"></div></div>");
@@ -163,87 +163,87 @@ 
 	                         });	
                         }');
                 	
-                $submenus[] = new Menu(
-                    I18N::translate('Complete Sosas'), 
-                    '#', 
-                    'menu-maj-sosa-recompute', 
-                    array(
-                        'rel' => 'nofollow',
-                        'onclick' => 'return majComputeSosaFromIndi();'
-                    ));
-            }
+				$submenus[] = new Menu(
+					I18N::translate('Complete Sosas'), 
+					'#', 
+					'menu-maj-sosa-recompute', 
+					array(
+						'rel' => 'nofollow',
+						'onclick' => 'return majComputeSosaFromIndi();'
+					));
+			}
             
-        }
+		}
         
-        $menu->setSubmenus($submenus);
+		$menu->setSubmenus($submenus);
         
-        return $menu;
+		return $menu;
         
-    }
+	}
     
-    /**********
+	/**********
      * Hooks
      **********/
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
-     */    
-    public function getSubscribedHooks() {
-        return array(
-            'hExtendIndiHeaderIcons' => 20,
-            'hExtendIndiHeaderRight' => 20,
-            'hRecordNameAppend' => 20
-        );
-    }
-    
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderIcons()
-     */
-    public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) {
-        if($ctrlIndi){
-            $dindi = new Individual($ctrlIndi->getSignificantIndividual());
-            return FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 1, 'large');
-        }
-        return '';
-    }
-    
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderLeft()
-     */
-    public function hExtendIndiHeaderLeft(IndividualController $ctrlIndi) { }
-    
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderRight()
-     */
-    public function hExtendIndiHeaderRight(IndividualController $ctrlIndi) {
-        if($ctrlIndi){
-            $dindi = new Individual($ctrlIndi->getSignificantIndividual());
-            return array('indi-header-sosa',  FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 2, 'normal'));
-        }
-        return '';
-    }
-    
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNameAppend()
-     */
-    public function hRecordNameAppend(GedcomRecord $grec) {
-        if($grec instanceof \Fisharebest\Webtrees\Individual){ // Only apply to individuals
-            $dindi = new Individual($grec);
-            return FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 1, 'small');
-        }
-        return '';
-    }
-    
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNamePrepend()
-     */
-    public function hRecordNamePrepend(GedcomRecord $grec) {}
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
+	 */    
+	public function getSubscribedHooks() {
+		return array(
+			'hExtendIndiHeaderIcons' => 20,
+			'hExtendIndiHeaderRight' => 20,
+			'hRecordNameAppend' => 20
+		);
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderIcons()
+	 */
+	public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) {
+		if($ctrlIndi){
+			$dindi = new Individual($ctrlIndi->getSignificantIndividual());
+			return FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 1, 'large');
+		}
+		return '';
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderLeft()
+	 */
+	public function hExtendIndiHeaderLeft(IndividualController $ctrlIndi) { }
+    
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderRight()
+	 */
+	public function hExtendIndiHeaderRight(IndividualController $ctrlIndi) {
+		if($ctrlIndi){
+			$dindi = new Individual($ctrlIndi->getSignificantIndividual());
+			return array('indi-header-sosa',  FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 2, 'normal'));
+		}
+		return '';
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNameAppend()
+	 */
+	public function hRecordNameAppend(GedcomRecord $grec) {
+		if($grec instanceof \Fisharebest\Webtrees\Individual){ // Only apply to individuals
+			$dindi = new Individual($grec);
+			return FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 1, 'small');
+		}
+		return '';
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNamePrepend()
+	 */
+	public function hRecordNamePrepend(GedcomRecord $grec) {}