jon48 / webtrees-lib

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

Braces +77 added lines, -30 removed lines

@@ -84,21 +84,25 @@ 
      * @param User $user
      */
     public function __construct(Tree $tree, User $user = null) {
-        if(self::$default_user === null) 
-            self::$default_user = User::find(-1);
+        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;
+        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 {
+            } else {
                 $this->user = self::$default_user;
                 $this->is_setup = $this->getRootIndiId() === null;
             }            
@@ -141,7 +145,9 @@ 
      * Remove all Sosa entries related to the gedcom file and user
      */
     public function deleteAll() {
-        if(!$this->is_setup) return;
+        if(!$this->is_setup) {
+        	return;
+        }
         Database::prepare(
             'DELETE FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id= :tree_id and majs_user_id = :user_id ')
@@ -157,7 +163,9 @@ 
      * @param int $sosa
      */
     public function deleteAncestors($sosa) {
-        if(!$this->is_setup) return;
+        if(!$this->is_setup) {
+        	return;
+        }
         $gen = Functions::getGeneration($sosa);
         Database::prepare(
             'DELETE FROM `##maj_sosa`'.
@@ -177,7 +185,9 @@ 
      * @param array $sosa_records
      */
     public function insertOrUpdate($sosa_records) {
-        if(!$this->is_setup) return;
+        if(!$this->is_setup) {
+        	return;
+        }
         
         $treeid = $this->tree->getTreeId();
         $userid = $this->user->getUserId();
@@ -224,7 +234,9 @@ 
      * @return array Array of sosa numbers
      */
     public function getSosaNumbers(Individual $indi) {
-        if(!$this->is_setup) return array();
+        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'
@@ -241,7 +253,9 @@ 
      * @return number Last generation if found, 1 otherwise
      */
     public function getLastGeneration() {
-        if(!$this->is_setup) return;
+        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'
@@ -261,7 +275,9 @@ 
      * @return array Associative array of Sosa ancestors, with their generation, comma separated
      */
     public function getAllSosaWithGenerations(){
-        if(!$this->is_setup) return array();
+        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' .
@@ -281,9 +297,12 @@ 
      * @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(!$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])){
@@ -312,9 +331,12 @@ 
      * @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(!$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])){
@@ -348,7 +370,9 @@ 
      * @return array Array of Sosa individuals
      */
     public function getMissingSosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();    
+        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'.
@@ -386,7 +410,9 @@ 
      * @return array Statistics array
      */
     public function getStatisticsByGeneration() {
-        if(!$this->is_setup) return array();
+        if(!$this->is_setup) {
+        	return array();
+        }
         if(!$this->statistics_tab) {
             $this->statistics_tab = array();
             if($maxGeneration = $this->getLastGeneration()) {
@@ -412,7 +438,9 @@ 
 	 * @return int
 	 */
 	public function getTotalIndividuals() {
-	    if(!$this->is_setup) return 0;
+	    if(!$this->is_setup) {
+	    	return 0;
+	    }
 	    return Database::prepare(
 	        'SELECT SQL_CACHE COUNT(*) FROM `##individuals`' .
 	        ' WHERE i_file = :tree_id')
@@ -426,7 +454,9 @@ 
      * @return number Number of Sosas
      */
     public function getSosaCount(){
-        if(!$this->is_setup) return 0;
+        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')
@@ -443,7 +473,9 @@ 
      * @return number Number of Sosas in generation
      */
     public function getSosaCountAtGeneration($gen){
-        if(!$this->is_setup) return 0;
+        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'.
@@ -462,7 +494,9 @@ 
      * @return number Total number of Sosas up to generation
      */
     public function getSosaCountUpToGeneration($gen){
-        if(!$this->is_setup) return 0;
+        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'.
@@ -480,7 +514,9 @@ 
      * @return number Total number of distinct individual
      */
     public function getDifferentSosaCount(){
-        if(!$this->is_setup) return 0;
+        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')
@@ -497,7 +533,9 @@ 
      * @return number Number of distinct Sosa individuals up to generation
      */
     public function getDifferentSosaCountUpToGeneration($gen){
-        if(!$this->is_setup) return 0;
+        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'.
@@ -520,7 +558,9 @@ 
      * @return array Birth statistics array
      */
     public function getStatsBirthYearInGeneration($gen){
-        if(!$this->is_setup) return array('first' => 0, 'avg' => 0, 'last' => 0);
+        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`' .
@@ -540,7 +580,9 @@ 
      * @return number|NULL Mean generation time
      */
     public function getMeanGenerationTime(){
-        if(!$this->is_setup) return;
+        if(!$this->is_setup) {
+        	return;
+        }
         if(!$this->statistics_tab){
             $this->getStatisticsByGeneration();
         }
@@ -586,7 +628,10 @@ 
      * @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
+        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 ('.
@@ -626,7 +671,9 @@ 
      * @return array 
      */
     public function getTopMultiSosaAncestorsNoTies($limit) {
-        if(!$this->is_setup) return array();
+        if(!$this->is_setup) {
+        	return array();
+        }
         return Database::prepare(
             'SELECT sosa_i_id, sosa_count FROM ('.
             '   SELECT'.